This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ca-certificates-java.
commit bebd1f0905786326fd56a4abadb5f3316a38bed3 Author: Damien Raude-Morvan <[email protected]> Date: Thu Aug 15 12:43:06 2013 +0000 * Acknowledge NMU done by Don Armstrong and Andreas Beckmann. * Fix tests to works with new cacert certificates names (Closes: #713138). * d/control: Use canonical value for Vcs-* fields. * d/control: Remove deprecated DMUA flag. * d/control: Bump Standards-Version to 3.9.4 (no changes needed). * Non-maintainer upload. * postinst, jks-keystore.hook: Do not fail if nss.cfg does not (yet) exist, i.e. if openjdk-?-jre-headless is unpacked but not yet configured. (Closes: #694888) * Set urgency to medium for RC bugfix. * Non-maintainer upload * Fix test for dpkg-query in postinst; there was an extraneous --version here. [Probably don't even need to bother to check for dpkg-query, but why not.] (Closes: #690204) * Library path for softokn3pkg and nsspkg is potentially wrong if there are multiple different paths; fix it. * Do not run the hook if ca-certificates-java has been removed but not purged. * Use the new trigger support provided by ca-certificates (>=20121114). --- UpdateCertificatesTest.java | 8 ++++---- debian/ca-certificates-java.triggers | 1 + debian/changelog | 35 +++++++++++++++++++++++++++++++++++ debian/control | 9 ++++----- debian/jks-keystore.hook.in | 9 +++++---- debian/postinst.in | 7 ++++--- 6 files changed, 53 insertions(+), 16 deletions(-) diff --git a/UpdateCertificatesTest.java b/UpdateCertificatesTest.java index a35c88a..7451527 100644 --- a/UpdateCertificatesTest.java +++ b/UpdateCertificatesTest.java @@ -33,10 +33,10 @@ import org.junit.Test; */ public class UpdateCertificatesTest { - private static final String ALIAS_CACERT = "debian:cacert.org.crt"; - private static final String INVALID_CACERT = "x/usr/share/ca-certificates/cacert.org/cacert.org.crt"; - private static final String REMOVE_CACERT = "-/usr/share/ca-certificates/cacert.org/cacert.org.crt"; - private static final String ADD_CACERT = "+/usr/share/ca-certificates/cacert.org/cacert.org.crt"; + private static final String ALIAS_CACERT = "debian:cacert.org_class3.crt"; + private static final String INVALID_CACERT = "x/usr/share/ca-certificates/cacert.org/cacert.org_class3.crt"; + private static final String REMOVE_CACERT = "-/usr/share/ca-certificates/cacert.org/cacert.org_class3.crt"; + private static final String ADD_CACERT = "+/usr/share/ca-certificates/cacert.org/cacert.org_class3.crt"; private String ksFilename = null; private String ksPassword = null; diff --git a/debian/ca-certificates-java.triggers b/debian/ca-certificates-java.triggers new file mode 100644 index 0000000..3c86450 --- /dev/null +++ b/debian/ca-certificates-java.triggers @@ -0,0 +1 @@ +activate update-ca-certificates diff --git a/debian/changelog b/debian/changelog index 70e5266..50ee5c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,38 @@ +ca-certificates-java (20130815) unstable; urgency=low + + * Acknowledge NMU done by Don Armstrong and Andreas Beckmann. + * Fix tests to works with new cacert certificates names (Closes: + #713138). + * d/control: Use canonical value for Vcs-* fields. + * d/control: Remove deprecated DMUA flag. + * d/control: Bump Standards-Version to 3.9.4 (no changes needed). + + -- Damien Raude-Morvan <[email protected]> Thu, 15 Aug 2013 13:52:46 +0200 + +ca-certificates-java (20121112+nmu2) unstable; urgency=medium + + * Non-maintainer upload. + * postinst, jks-keystore.hook: Do not fail if nss.cfg does not (yet) exist, + i.e. if openjdk-?-jre-headless is unpacked but not yet configured. + (Closes: #694888) + * Set urgency to medium for RC bugfix. + + -- Andreas Beckmann <[email protected]> Sun, 27 Jan 2013 14:19:41 +0100 + +ca-certificates-java (20121112+nmu1) unstable; urgency=low + + * Non-maintainer upload + * Fix test for dpkg-query in postinst; there was an extraneous --version + here. [Probably don't even need to bother to check for dpkg-query, but + why not.] (Closes: #690204) + * Library path for softokn3pkg and nsspkg is potentially wrong if there + are multiple different paths; fix it. + * Do not run the hook if ca-certificates-java has been removed but not + purged. + * Use the new trigger support provided by ca-certificates (>=20121114). + + -- Don Armstrong <[email protected]> Mon, 12 Nov 2012 15:45:50 -0800 + ca-certificates-java (20120721) unstable; urgency=low * Fix jks-keystore and postinst to work on multi-arch system. diff --git a/debian/control b/debian/control index 848d982..7b85771 100644 --- a/debian/control +++ b/debian/control @@ -7,15 +7,14 @@ Uploaders: Matthias Klose <[email protected]>, Damien Raude-Morvan <[email protected]>, James Page <[email protected]> Build-Depends: debhelper (>= 6), default-jdk, javahelper, junit4 -Standards-Version: 3.9.3 -DM-Upload-Allowed: yes -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ca-certificates-java -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ca-certificates-java/ +Standards-Version: 3.9.4 +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/ca-certificates-java +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/ca-certificates-java/ Package: ca-certificates-java Architecture: all Multi-Arch: foreign -Depends: ca-certificates (>= 20090814), +Depends: ca-certificates (>= 20121114), ${jre:Depends} | java6-runtime-headless, ${misc:Depends}, ${nss:Depends} diff --git a/debian/jks-keystore.hook.in b/debian/jks-keystore.hook.in index 8d99fed..1ea6df2 100644 --- a/debian/jks-keystore.hook.in +++ b/debian/jks-keystore.hook.in @@ -25,7 +25,7 @@ nsslib_name() } echo "" -if [ "$cacerts_updates" != yes ] || [ "$CACERT_UPDATES" = disabled ]; then +if [ "$cacerts_updates" != yes ] || [ "$CACERT_UPDATES" = disabled ] || [ ! -e $JAR ]; then echo "updates of cacerts keystore disabled." exit 0 fi @@ -53,12 +53,13 @@ if [ ! -f /etc/${jvm%-$arch}/jvm-$arch.cfg ]; then fi if dpkg-query --version >/dev/null; then - nsspkg=$(dpkg-query -L "$(nsslib_name)" | sed -n 's,\(.*\)/libnss3\.so$,\1,p') - nssjdk=$(sed -n '/nssLibraryDirectory/s/.*= *\(.*\)/\1/p' /etc/${jvm%-$arch}/security/nss.cfg) + nsspkg=$(dpkg-query -L "$(nsslib_name)" | sed -n 's,\(.*\)/libnss3\.so$,\1,p'|head -n 1) + nsscfg=/etc/${jvm%-$arch}/security/nss.cfg + nssjdk=$(test ! -f $nsscfg || sed -n '/nssLibraryDirectory/s/.*= *\(.*\)/\1/p' $nsscfg) if [ -n "$nsspkg" ] && [ -n "$nssjdk" ] && [ "$nsspkg" != "$nssjdk" ]; then ln -sf $nsspkg/libnss3.so $nssjdk/libnss3.so fi - softokn3pkg=$(dpkg-query -L "$(nsslib_name)" | sed -n 's,\(.*\)/libsoftokn3\.so$,\1,p') + softokn3pkg=$(dpkg-query -L "$(nsslib_name)" | sed -n 's,\(.*\)/libsoftokn3\.so$,\1,p'|head -n 1) if [ -n "$softokn3pkg" ] && [ -n "$nssjdk" ] && [ "$softokn3pkg" != "$nssjdk" ]; then ln -sf $softokn3pkg/libsoftokn3.so $nssjdk/libsoftokn3.so fi diff --git a/debian/postinst.in b/debian/postinst.in index 8425d96..4e897a1 100644 --- a/debian/postinst.in +++ b/debian/postinst.in @@ -38,9 +38,10 @@ setup_path() first_install() { - if which dpkg-query --version >/dev/null; then - nsspkg=$(dpkg-query -L "$(nsslib_name)" | sed -n 's,\(.*\)/libnss3\.so$,\1,p') - nssjdk=$(sed -n '/nssLibraryDirectory/s/.*= *\(.*\)/\1/p' /etc/${jvm%-$arch}/security/nss.cfg) + if which dpkg-query >/dev/null; then + nsspkg=$(dpkg-query -L "$(nsslib_name)" | sed -n 's,\(.*\)/libnss3\.so$,\1,p'|head -n 1) + nsscfg=/etc/${jvm%-$arch}/security/nss.cfg + nssjdk=$(test ! -f $nsscfg || sed -n '/nssLibraryDirectory/s/.*= *\(.*\)/\1/p' $nsscfg) if [ -n "$nsspkg" ] && [ -n "$nssjdk" ] && [ "$nsspkg" != "$nssjdk" ]; then ln -sf $nsspkg/libnss3.so $nssjdk/libnss3.so fi -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ca-certificates-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
