[pkg-java] r17145 - in trunk/ca-certificates-java: . debian
Damien Raude-Morvan
drazzib at alioth.debian.org
Thu Aug 15 12:43:07 UTC 2013
Author: drazzib
Date: 2013-08-15 12:43:06 +0000 (Thu, 15 Aug 2013)
New Revision: 17145
Added:
trunk/ca-certificates-java/debian/ca-certificates-java.triggers
Modified:
trunk/ca-certificates-java/UpdateCertificatesTest.java
trunk/ca-certificates-java/debian/changelog
trunk/ca-certificates-java/debian/control
trunk/ca-certificates-java/debian/jks-keystore.hook.in
trunk/ca-certificates-java/debian/postinst.in
Log:
* 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).
Modified: trunk/ca-certificates-java/UpdateCertificatesTest.java
===================================================================
--- trunk/ca-certificates-java/UpdateCertificatesTest.java 2013-08-13 21:42:16 UTC (rev 17144)
+++ trunk/ca-certificates-java/UpdateCertificatesTest.java 2013-08-15 12:43:06 UTC (rev 17145)
@@ -33,10 +33,10 @@
*/
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;
Added: trunk/ca-certificates-java/debian/ca-certificates-java.triggers
===================================================================
--- trunk/ca-certificates-java/debian/ca-certificates-java.triggers (rev 0)
+++ trunk/ca-certificates-java/debian/ca-certificates-java.triggers 2013-08-15 12:43:06 UTC (rev 17145)
@@ -0,0 +1 @@
+activate update-ca-certificates
Modified: trunk/ca-certificates-java/debian/changelog
===================================================================
--- trunk/ca-certificates-java/debian/changelog 2013-08-13 21:42:16 UTC (rev 17144)
+++ trunk/ca-certificates-java/debian/changelog 2013-08-15 12:43:06 UTC (rev 17145)
@@ -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 <drazzib at debian.org> 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 <anbe at debian.org> 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 <don at debian.org> 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.
Modified: trunk/ca-certificates-java/debian/control
===================================================================
--- trunk/ca-certificates-java/debian/control 2013-08-13 21:42:16 UTC (rev 17144)
+++ trunk/ca-certificates-java/debian/control 2013-08-15 12:43:06 UTC (rev 17145)
@@ -7,15 +7,14 @@
Damien Raude-Morvan <drazzib at debian.org>,
James Page <james.page at ubuntu.com>
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}
Modified: trunk/ca-certificates-java/debian/jks-keystore.hook.in
===================================================================
--- trunk/ca-certificates-java/debian/jks-keystore.hook.in 2013-08-13 21:42:16 UTC (rev 17144)
+++ trunk/ca-certificates-java/debian/jks-keystore.hook.in 2013-08-15 12:43:06 UTC (rev 17145)
@@ -25,7 +25,7 @@
}
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 @@
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
Modified: trunk/ca-certificates-java/debian/postinst.in
===================================================================
--- trunk/ca-certificates-java/debian/postinst.in 2013-08-13 21:42:16 UTC (rev 17144)
+++ trunk/ca-certificates-java/debian/postinst.in 2013-08-15 12:43:06 UTC (rev 17145)
@@ -38,9 +38,10 @@
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
More information about the pkg-java-commits
mailing list