[23851] in Source-Commits
/svn/athena r23461 - in trunk/debathena/config/ssl-certificates: . debian
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Tue Feb 17 06:42:37 2009
Date: Tue, 17 Feb 2009 06:42:29 -0500
From: Anders Kaseorg <andersk@drugstore.MIT.EDU>
Message-Id: <200902171142.n1HBgTVM007502@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: andersk
Date: 2009-02-17 06:42:29 -0500 (Tue, 17 Feb 2009)
New Revision: 23461
Added:
trunk/debathena/config/ssl-certificates/debian/debathena-ssl-certificates.prerm
trunk/debathena/config/ssl-certificates/mitCA.crt
trunk/debathena/config/ssl-certificates/mitCAclient.crt
Removed:
trunk/debathena/config/ssl-certificates/debian/debathena-ssl-certificates.links
trunk/debathena/config/ssl-certificates/mitCA.pem
trunk/debathena/config/ssl-certificates/mitCAclient.pem
Modified:
trunk/debathena/config/ssl-certificates/debian/changelog
trunk/debathena/config/ssl-certificates/debian/control.in
trunk/debathena/config/ssl-certificates/debian/debathena-ssl-certificates.install
trunk/debathena/config/ssl-certificates/debian/debathena-ssl-certificates.postinst
Log:
In ssl-certificates:
* Let the MIT CA be managed by update-ca-certificates. (This causes the
CA to be added to /etc/ssl/certs/ca-certificates.crt, and also lets
Java use the CA.)
Modified: trunk/debathena/config/ssl-certificates/debian/changelog
===================================================================
--- trunk/debathena/config/ssl-certificates/debian/changelog 2009-02-13 20:33:15 UTC (rev 23460)
+++ trunk/debathena/config/ssl-certificates/debian/changelog 2009-02-17 11:42:29 UTC (rev 23461)
@@ -1,3 +1,11 @@
+debathena-ssl-certificates (1.3) unstable; urgency=low
+
+ * Let the MIT CA be managed by update-ca-certificates. (This causes the
+ CA to be added to /etc/ssl/certs/ca-certificates.crt, and also lets
+ Java use the CA.)
+
+ -- Anders Kaseorg <andersk@mit.edu> Tue, 17 Feb 2009 06:26:17 -0500
+
debathena-ssl-certificates (1.2) unstable; urgency=low
* Remove DEB_AUTO_UPDATE_DEBIAN_CONTROL.
Modified: trunk/debathena/config/ssl-certificates/debian/control.in
===================================================================
--- trunk/debathena/config/ssl-certificates/debian/control.in 2009-02-13 20:33:15 UTC (rev 23460)
+++ trunk/debathena/config/ssl-certificates/debian/control.in 2009-02-17 11:42:29 UTC (rev 23461)
@@ -7,6 +7,6 @@
Package: debathena-ssl-certificates
Architecture: all
-Depends: openssl, ${misc:Depends}
+Depends: ca-certificates, ${misc:Depends}
Description: SSL certificates for Debathena
This packages includes the MIT CA certificates.
Modified: trunk/debathena/config/ssl-certificates/debian/debathena-ssl-certificates.install
===================================================================
--- trunk/debathena/config/ssl-certificates/debian/debathena-ssl-certificates.install 2009-02-13 20:33:15 UTC (rev 23460)
+++ trunk/debathena/config/ssl-certificates/debian/debathena-ssl-certificates.install 2009-02-17 11:42:29 UTC (rev 23461)
@@ -1,2 +1,2 @@
-mitCA.pem usr/share/debathena-ssl-certificates
-mitCAclient.pem usr/share/debathena-ssl-certificates
+mitCA.crt usr/share/ca-certificates/mit.edu
+mitCAclient.crt usr/share/ca-certificates/mit.edu
Deleted: trunk/debathena/config/ssl-certificates/debian/debathena-ssl-certificates.links
Modified: trunk/debathena/config/ssl-certificates/debian/debathena-ssl-certificates.postinst
===================================================================
--- trunk/debathena/config/ssl-certificates/debian/debathena-ssl-certificates.postinst 2009-02-13 20:33:15 UTC (rev 23460)
+++ trunk/debathena/config/ssl-certificates/debian/debathena-ssl-certificates.postinst 2009-02-17 11:42:29 UTC (rev 23461)
@@ -20,7 +20,17 @@
case "$1" in
configure)
- c_rehash
+ perl -0pe '
+s/^### BEGIN debathena-ssl-certificates\n.*?^### END debathena-ssl-certificates\n//msg;
+s/\n?$/\n### BEGIN debathena-ssl-certificates
+# This section is automatically added by the debathena-ssl-certificates
+# package.
+mit.edu\/mitCAclient.crt
+mit.edu\/mitCA.crt
+### END debathena-ssl-certificates
+/;
+' -i /etc/ca-certificates.conf
+ update-ca-certificates
;;
abort-upgrade|abort-remove|abort-deconfigure)
@@ -32,8 +42,9 @@
;;
esac
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
#DEBHELPER#
exit 0
-
-
Added: trunk/debathena/config/ssl-certificates/debian/debathena-ssl-certificates.prerm
===================================================================
--- trunk/debathena/config/ssl-certificates/debian/debathena-ssl-certificates.prerm 2009-02-13 20:33:15 UTC (rev 23460)
+++ trunk/debathena/config/ssl-certificates/debian/debathena-ssl-certificates.prerm 2009-02-17 11:42:29 UTC (rev 23461)
@@ -0,0 +1,52 @@
+#!/bin/sh
+# prerm script for debathena-ssl-certificates
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <prerm> `remove'
+# * <old-prerm> `upgrade' <new-version>
+# * <new-prerm> `failed-upgrade' <old-version>
+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+# * <deconfigured's-prerm> `deconfigure' `in-favour'
+# <package-being-installed> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ remove|deconfigure)
+ perl -0pe '
+s/^### BEGIN debathena-ssl-certificates\n.*?^### END debathena-ssl-certificates\n//msg;
+s/\n?$/\n### BEGIN debathena-ssl-certificates
+# This section is automatically added by the debathena-ssl-certificates
+# package.
+!mit.edu\/mitCAclient.crt
+!mit.edu\/mitCA.crt
+### END debathena-ssl-certificates
+/;
+' -i /etc/ca-certificates.conf
+ update-ca-certificates
+ perl -0pe '
+s/^### BEGIN debathena-ssl-certificates\n.*?^### END debathena-ssl-certificates\n//msg;
+' -i /etc/ca-certificates.conf
+ ;;
+
+ upgrade|failed-upgrade)
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Copied: trunk/debathena/config/ssl-certificates/mitCA.crt (from rev 23460, trunk/debathena/config/ssl-certificates/mitCA.pem)
Property changes on: trunk/debathena/config/ssl-certificates/mitCA.crt
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: trunk/debathena/config/ssl-certificates/mitCA.pem
Copied: trunk/debathena/config/ssl-certificates/mitCAclient.crt (from rev 23460, trunk/debathena/config/ssl-certificates/mitCAclient.pem)
Property changes on: trunk/debathena/config/ssl-certificates/mitCAclient.crt
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: trunk/debathena/config/ssl-certificates/mitCAclient.pem
