Author: twerner Date: 2011-12-23 13:07:17 +0000 (Fri, 23 Dec 2011) New Revision: 15583
Added: tags/ca-certificates-java/20111223/ tags/ca-certificates-java/20111223/debian/changelog tags/ca-certificates-java/20111223/debian/postinst Removed: tags/ca-certificates-java/20111223/debian/changelog tags/ca-certificates-java/20111223/debian/postinst Log: [svn-buildpackage] Tagging ca-certificates-java 20111223 Deleted: tags/ca-certificates-java/20111223/debian/changelog =================================================================== --- trunk/ca-certificates-java/debian/changelog 2011-12-23 00:48:54 UTC (rev 15581) +++ tags/ca-certificates-java/20111223/debian/changelog 2011-12-23 13:07:17 UTC (rev 15583) @@ -1,146 +0,0 @@ -ca-certificates-java (20110912) unstable; urgency=low - - * Support new multiarch JRE packages in jks-keystore. (Closes: #641306) - * Support OpenJDK 7. (Closes: #641305) - - -- Torsten Werner <twer...@debian.org> Mon, 12 Sep 2011 21:23:22 +0200 - -ca-certificates-java (20110816) unstable; urgency=low - - * Upgrade Recommends: libnss3-1d to a versioned Depends due to multiarch - changes. (Closes: #635571) - * Use the locale C.UTF-8 for the hook script to be more robust. - - -- Torsten Werner <twer...@debian.org> Tue, 16 Aug 2011 11:00:33 +0200 - -ca-certificates-java (20110531) unstable; urgency=low - - * Prepare for multiarch libnss3 update. - - -- Matthias Klose <d...@ubuntu.com> Tue, 31 May 2011 15:20:52 +0200 - -ca-certificates-java (20110426) unstable; urgency=low - - * Test for existing file in postinst before copying it. (Closes: #624152) - * Add Vcs headers to debian/control. - - -- Torsten Werner <twer...@debian.org> Tue, 26 Apr 2011 09:23:03 +0200 - -ca-certificates-java (20110425) unstable; urgency=low - - * Add Java code to update the keystore and support UTF-8 encoded filenames. - (Closes: #607245, #623671) - * Change Maintainer to Debian Java Maintainers and add myself to Uploaders. - * Update Build-Depends. - * Replace old inconsistent keystore aliases. (Closes: #623888) - * Add support for openjdk-7 and remove support for old cacao VM. - * Add a NEWS file explaining the update. - * Update README.Debian. - - -- Torsten Werner <twer...@debian.org> Mon, 25 Apr 2011 15:28:55 +0200 - -ca-certificates-java (20100412) unstable; urgency=low - - * Upload to unstable. - - -- Matthias Klose <d...@ubuntu.com> Mon, 12 Apr 2010 03:15:47 +0200 - -ca-certificates-java (20100406ubuntu1) lucid; urgency=low - - * Make the installation and import of certificates more robust, - if the NSS based security provider is disabled or not built. - - -- Matthias Klose <d...@ubuntu.com> Sun, 11 Apr 2010 20:54:43 +0200 - -ca-certificates-java (20100406) unstable; urgency=low - - * Explicitely fail the installation, if /proc is not mounted. - Currently required by the java tools, changed in OpenJDK7. - Closes: #576453. LP: #556044. - * Print name of JVM in case of errors. - * Set priority to optional, set section to java. Closes: #566855. - * Remove /etc/ssl/certs on package purge, if empty. Closes: #566853. - - -- Matthias Klose <d...@debian.org> Tue, 06 Apr 2010 21:41:39 +0200 - -ca-certificates-java (20091021) unstable; urgency=low - - * Clarify output for keytool errors (although it shouldnn't be - necessary anymore). Closes: #540490. - - -- Matthias Klose <d...@ubuntu.com> Wed, 21 Oct 2009 22:00:53 +0200 - -ca-certificates-java (20090928) karmic; urgency=low - - * Rebuild with OpenJDK supporting PKCS11 cryptography, rebuild with - ca-certificates 20090814. - - -- Matthias Klose <d...@ubuntu.com> Mon, 28 Sep 2009 16:47:09 +0200 - -ca-certificates-java (20090629) unstable; urgency=low - - * debian/rules, debian/postinst, debian/jks-keystore.hook: Filter out - SHA384withECDSA certificates since keytool won't support them. - LP: #392104, closes: #534520. - * Fix typo in hook. Closes: #534533. - * Use java6-runtime-headless as alternative dependency. Closes: #512293. - - -- Matthias Klose <d...@ubuntu.com> Mon, 29 Jun 2009 11:27:59 +0200 - -ca-certificates-java (20081028) unstable; urgency=low - - * Ignore LANG and LC_ALL setting when running keytool. LP: #289934. - - -- Matthias Klose <d...@debian.org> Tue, 28 Oct 2008 07:20:16 +0100 - -ca-certificates-java (20081027) unstable; urgency=medium - - * Merge from Ubuntu: - - Don't try to import certificates, which are listed in - /etc/ca-certificates.conf, but not available on the system. - Just warn about those. LP: #289091. - - Need to run keytool, when the jre is unpacked, but not yet configured. - Create a temporary jvm.cfg for the time in that postinst and the - jks-keystore.hook are run, and remove it afterwards. LP: #289199. - - -- Matthias Klose <d...@debian.org> Mon, 27 Oct 2008 13:58:14 +0100 - -ca-certificates-java (20081024) unstable; urgency=low - - * Install /etc/default/cacerts with mode 600. - - -- Matthias Klose <d...@debian.org> Fri, 24 Oct 2008 15:10:48 +0200 - -ca-certificates-java (20081022) unstable; urgency=low - - * debian/jks-keystore.hook: - - Don't stop after first error during the update. LP: #244412. - Closes: #489748. - - Call keytool with -noprompt. - * On initial install, add locally added certificates. LP: #244410. - Closes: #489748. - * Install /etc/default/cacerts to set options: - - storepass, holding the password for the keystore. - - updates, to enable/disable updates of the keystore. - * Only use the keytool command from OpenJDK or Sun Java. Closes: #496587. - - -- Matthias Klose <d...@ubuntu.com> Wed, 22 Oct 2008 20:51:24 +0200 - -ca-certificates-java (20080712) unstable; urgency=low - - * Upload to main. - - -- Matthias Klose <d...@ubuntu.com> Sat, 12 Jul 2008 12:19:00 +0200 - -ca-certificates-java (20080711) unstable; urgency=low - - * debian/jks-keystore.hook: Fix typo. Closes: #489747, LP: #244408. - - -- Matthias Klose <d...@ubuntu.com> Fri, 11 Jul 2008 20:38:04 +0200 - -ca-certificates-java (20080514) unstable; urgency=low - - * Initial release. - - -- Matthias Klose <d...@ubuntu.com> Mon, 02 Jun 2008 14:52:46 +0000 - Copied: tags/ca-certificates-java/20111223/debian/changelog (from rev 15582, trunk/ca-certificates-java/debian/changelog) =================================================================== --- tags/ca-certificates-java/20111223/debian/changelog (rev 0) +++ tags/ca-certificates-java/20111223/debian/changelog 2011-12-23 13:07:17 UTC (rev 15583) @@ -0,0 +1,152 @@ +ca-certificates-java (20111223) unstable; urgency=low + + * Support new multiarch JRE packages in postinst. + + -- Torsten Werner <twer...@debian.org> Fri, 23 Dec 2011 13:46:15 +0100 + +ca-certificates-java (20110912) unstable; urgency=low + + * Support new multiarch JRE packages in jks-keystore. (Closes: #641306) + * Support OpenJDK 7. (Closes: #641305) + + -- Torsten Werner <twer...@debian.org> Mon, 12 Sep 2011 21:23:22 +0200 + +ca-certificates-java (20110816) unstable; urgency=low + + * Upgrade Recommends: libnss3-1d to a versioned Depends due to multiarch + changes. (Closes: #635571) + * Use the locale C.UTF-8 for the hook script to be more robust. + + -- Torsten Werner <twer...@debian.org> Tue, 16 Aug 2011 11:00:33 +0200 + +ca-certificates-java (20110531) unstable; urgency=low + + * Prepare for multiarch libnss3 update. + + -- Matthias Klose <d...@ubuntu.com> Tue, 31 May 2011 15:20:52 +0200 + +ca-certificates-java (20110426) unstable; urgency=low + + * Test for existing file in postinst before copying it. (Closes: #624152) + * Add Vcs headers to debian/control. + + -- Torsten Werner <twer...@debian.org> Tue, 26 Apr 2011 09:23:03 +0200 + +ca-certificates-java (20110425) unstable; urgency=low + + * Add Java code to update the keystore and support UTF-8 encoded filenames. + (Closes: #607245, #623671) + * Change Maintainer to Debian Java Maintainers and add myself to Uploaders. + * Update Build-Depends. + * Replace old inconsistent keystore aliases. (Closes: #623888) + * Add support for openjdk-7 and remove support for old cacao VM. + * Add a NEWS file explaining the update. + * Update README.Debian. + + -- Torsten Werner <twer...@debian.org> Mon, 25 Apr 2011 15:28:55 +0200 + +ca-certificates-java (20100412) unstable; urgency=low + + * Upload to unstable. + + -- Matthias Klose <d...@ubuntu.com> Mon, 12 Apr 2010 03:15:47 +0200 + +ca-certificates-java (20100406ubuntu1) lucid; urgency=low + + * Make the installation and import of certificates more robust, + if the NSS based security provider is disabled or not built. + + -- Matthias Klose <d...@ubuntu.com> Sun, 11 Apr 2010 20:54:43 +0200 + +ca-certificates-java (20100406) unstable; urgency=low + + * Explicitely fail the installation, if /proc is not mounted. + Currently required by the java tools, changed in OpenJDK7. + Closes: #576453. LP: #556044. + * Print name of JVM in case of errors. + * Set priority to optional, set section to java. Closes: #566855. + * Remove /etc/ssl/certs on package purge, if empty. Closes: #566853. + + -- Matthias Klose <d...@debian.org> Tue, 06 Apr 2010 21:41:39 +0200 + +ca-certificates-java (20091021) unstable; urgency=low + + * Clarify output for keytool errors (although it shouldnn't be + necessary anymore). Closes: #540490. + + -- Matthias Klose <d...@ubuntu.com> Wed, 21 Oct 2009 22:00:53 +0200 + +ca-certificates-java (20090928) karmic; urgency=low + + * Rebuild with OpenJDK supporting PKCS11 cryptography, rebuild with + ca-certificates 20090814. + + -- Matthias Klose <d...@ubuntu.com> Mon, 28 Sep 2009 16:47:09 +0200 + +ca-certificates-java (20090629) unstable; urgency=low + + * debian/rules, debian/postinst, debian/jks-keystore.hook: Filter out + SHA384withECDSA certificates since keytool won't support them. + LP: #392104, closes: #534520. + * Fix typo in hook. Closes: #534533. + * Use java6-runtime-headless as alternative dependency. Closes: #512293. + + -- Matthias Klose <d...@ubuntu.com> Mon, 29 Jun 2009 11:27:59 +0200 + +ca-certificates-java (20081028) unstable; urgency=low + + * Ignore LANG and LC_ALL setting when running keytool. LP: #289934. + + -- Matthias Klose <d...@debian.org> Tue, 28 Oct 2008 07:20:16 +0100 + +ca-certificates-java (20081027) unstable; urgency=medium + + * Merge from Ubuntu: + - Don't try to import certificates, which are listed in + /etc/ca-certificates.conf, but not available on the system. + Just warn about those. LP: #289091. + - Need to run keytool, when the jre is unpacked, but not yet configured. + Create a temporary jvm.cfg for the time in that postinst and the + jks-keystore.hook are run, and remove it afterwards. LP: #289199. + + -- Matthias Klose <d...@debian.org> Mon, 27 Oct 2008 13:58:14 +0100 + +ca-certificates-java (20081024) unstable; urgency=low + + * Install /etc/default/cacerts with mode 600. + + -- Matthias Klose <d...@debian.org> Fri, 24 Oct 2008 15:10:48 +0200 + +ca-certificates-java (20081022) unstable; urgency=low + + * debian/jks-keystore.hook: + - Don't stop after first error during the update. LP: #244412. + Closes: #489748. + - Call keytool with -noprompt. + * On initial install, add locally added certificates. LP: #244410. + Closes: #489748. + * Install /etc/default/cacerts to set options: + - storepass, holding the password for the keystore. + - updates, to enable/disable updates of the keystore. + * Only use the keytool command from OpenJDK or Sun Java. Closes: #496587. + + -- Matthias Klose <d...@ubuntu.com> Wed, 22 Oct 2008 20:51:24 +0200 + +ca-certificates-java (20080712) unstable; urgency=low + + * Upload to main. + + -- Matthias Klose <d...@ubuntu.com> Sat, 12 Jul 2008 12:19:00 +0200 + +ca-certificates-java (20080711) unstable; urgency=low + + * debian/jks-keystore.hook: Fix typo. Closes: #489747, LP: #244408. + + -- Matthias Klose <d...@ubuntu.com> Fri, 11 Jul 2008 20:38:04 +0200 + +ca-certificates-java (20080514) unstable; urgency=low + + * Initial release. + + -- Matthias Klose <d...@ubuntu.com> Mon, 02 Jun 2008 14:52:46 +0000 + Deleted: tags/ca-certificates-java/20111223/debian/postinst =================================================================== --- trunk/ca-certificates-java/debian/postinst 2011-12-23 00:48:54 UTC (rev 15581) +++ tags/ca-certificates-java/20111223/debian/postinst 2011-12-23 13:07:17 UTC (rev 15583) @@ -1,102 +0,0 @@ -#!/bin/bash - -set -e - -storepass='changeit' -if [ -f /etc/default/cacerts ]; then - . /etc/default/cacerts -fi - -setup_path() -{ - for jvm in java-6-openjdk java-7-openjdk java-6-sun; do - if [ -x /usr/lib/jvm/$jvm/bin/java ]; then - break - fi - done - export JAVA_HOME=/usr/lib/jvm/$jvm - PATH=$JAVA_HOME/bin:$PATH - - CLASSPATH=/usr/share/ca-certificates-java - export CLASSPATH -} - -first_install() -{ - if which dpkg-query --version >/dev/null; then - nsspkg=$(dpkg-query -L libnss3 | sed -n 's,\(.*\)/libnss3\.so$,\1,p') - nssjdk=$(sed -n '/nssLibraryDirectory/s/.*= *\(.*\)/\1/p' /etc/$jvm/security/nss.cfg) - if [ "$nsspkg" != "$nssjdk" ]; then - ln -sf $nsspkg/libnss3.so $nssjdk/libnss3.so - fi - fi - - find /etc/ssl/certs -name \*.pem | \ - while read filename; do - alias=$(basename $filename .pem | tr A-Z a-z | tr -cs a-z0-9 _) - alias=${alias%*_} - if [ -n "$FIXOLD" ]; then - echo "-${alias}" - echo "-${alias}_pem" - fi - echo "+${filename}" - done | \ - java UpdateCertificates -storepass "$storepass" - echo "done." -} - -do_cleanup() -{ - [ -z "$temp_jvm_cfg" ] || rm -f $temp_jvm_cfg - if [ "$nsspkg" != "$nssjdk" ]; then - rm -f $nssjdk/libnss3.so - fi -} - -case "$1" in - configure) - if dpkg --compare-versions "$2" le "20100412"; then - FIXOLD="true" - if [ -e /etc/ssl/certs/java/cacerts ]; then - cp -f /etc/ssl/certs/java/cacerts /etc/ssl/certs/java/cacerts.dpkg-old - fi - fi - if [ -z "$2" -o -n "$FIXOLD" ]; then - setup_path - - if ! mountpoint -q /proc; then - echo >&2 "the keytool command requires a mounted proc fs (/proc)." - exit 1 - fi - - if [ ! -f /etc/$jvm/jvm.cfg ]; then - # the jre is not yet configured, but jvm.cfg is needed to run it - temp_jvm_cfg=/etc/$jvm/jvm.cfg - mkdir -p /etc/$jvm - printf -- "-server KNOWN\n" > $temp_jvm_cfg - fi - - if first_install; then - do_cleanup - else - do_cleanup - exit 1 - fi - fi - chmod 600 /etc/default/cacerts || true - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 - - Copied: tags/ca-certificates-java/20111223/debian/postinst (from rev 15582, trunk/ca-certificates-java/debian/postinst) =================================================================== --- tags/ca-certificates-java/20111223/debian/postinst (rev 0) +++ tags/ca-certificates-java/20111223/debian/postinst 2011-12-23 13:07:17 UTC (rev 15583) @@ -0,0 +1,102 @@ +#!/bin/bash + +set -e + +storepass='changeit' +if [ -f /etc/default/cacerts ]; then + . /etc/default/cacerts +fi + +setup_path() +{ + for JAVA_HOME in /usr/lib/jvm/java-[67]-openjdk* /usr/lib/jvm/java-6-sun; do + if [ -x $JAVA_HOME/bin/java ]; then + break + fi + done + jvm=$(basename $JAVA_HOME | sed 's,-openjdk-.*,-openjdk,') # multiarch fixup + PATH=$JAVA_HOME/bin:$PATH + + CLASSPATH=/usr/share/ca-certificates-java + export CLASSPATH +} + +first_install() +{ + if which dpkg-query --version >/dev/null; then + nsspkg=$(dpkg-query -L libnss3 | sed -n 's,\(.*\)/libnss3\.so$,\1,p') + nssjdk=$(sed -n '/nssLibraryDirectory/s/.*= *\(.*\)/\1/p' /etc/$jvm/security/nss.cfg) + if [ "$nsspkg" != "$nssjdk" ]; then + ln -sf $nsspkg/libnss3.so $nssjdk/libnss3.so + fi + fi + + find /etc/ssl/certs -name \*.pem | \ + while read filename; do + alias=$(basename $filename .pem | tr A-Z a-z | tr -cs a-z0-9 _) + alias=${alias%*_} + if [ -n "$FIXOLD" ]; then + echo "-${alias}" + echo "-${alias}_pem" + fi + echo "+${filename}" + done | \ + java UpdateCertificates -storepass "$storepass" + echo "done." +} + +do_cleanup() +{ + [ -z "$temp_jvm_cfg" ] || rm -f $temp_jvm_cfg + if [ "$nsspkg" != "$nssjdk" ]; then + rm -f $nssjdk/libnss3.so + fi +} + +case "$1" in + configure) + if dpkg --compare-versions "$2" le "20100412"; then + FIXOLD="true" + if [ -e /etc/ssl/certs/java/cacerts ]; then + cp -f /etc/ssl/certs/java/cacerts /etc/ssl/certs/java/cacerts.dpkg-old + fi + fi + if [ -z "$2" -o -n "$FIXOLD" ]; then + setup_path + + if ! mountpoint -q /proc; then + echo >&2 "the keytool command requires a mounted proc fs (/proc)." + exit 1 + fi + + if [ ! -f /etc/$jvm/jvm.cfg ]; then + # the jre is not yet configured, but jvm.cfg is needed to run it + temp_jvm_cfg=/etc/$jvm/jvm.cfg + mkdir -p /etc/$jvm + printf -- "-server KNOWN\n" > $temp_jvm_cfg + fi + + if first_install; then + do_cleanup + else + do_cleanup + exit 1 + fi + fi + chmod 600 /etc/default/cacerts || true + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 + + _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits