Bug#698538: unblock: ca-certificates-java/20121112+nmu2
Followup-For: Bug #698538
Control: retitle -1 unblock: ca-certificates-java/20121112+nmu2
Hi,
fixed also the problem w.r.t to nss.cfg which only uncovered after the
first fix.
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@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@debian.org> Mon, 12 Nov 2012 15:45:50 -0800
Andreas
unblock ca-certificates-java/20121112+nmu2
diffstat for ca-certificates-java-20120721 ca-certificates-java-20121112+nmu2
ca-certificates-java.triggers | 1 +
changelog | 24 ++++++++++++++++++++++++
control | 2 +-
jks-keystore.hook.in | 9 +++++----
postinst.in | 7 ++++---
5 files changed, 35 insertions(+), 8 deletions(-)
diff -Nru ca-certificates-java-20120721/debian/ca-certificates-java.triggers ca-certificates-java-20121112+nmu2/debian/ca-certificates-java.triggers
--- ca-certificates-java-20120721/debian/ca-certificates-java.triggers 1970-01-01 01:00:00.000000000 +0100
+++ ca-certificates-java-20121112+nmu2/debian/ca-certificates-java.triggers 2012-11-13 03:03:54.000000000 +0100
@@ -0,0 +1 @@
+activate update-ca-certificates
diff -Nru ca-certificates-java-20120721/debian/changelog ca-certificates-java-20121112+nmu2/debian/changelog
--- ca-certificates-java-20120721/debian/changelog 2012-07-21 14:05:01.000000000 +0200
+++ ca-certificates-java-20121112+nmu2/debian/changelog 2013-01-27 14:19:41.000000000 +0100
@@ -1,3 +1,27 @@
+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@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@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.
diff -Nru ca-certificates-java-20120721/debian/control ca-certificates-java-20121112+nmu2/debian/control
--- ca-certificates-java-20120721/debian/control 2012-06-09 00:05:19.000000000 +0200
+++ ca-certificates-java-20121112+nmu2/debian/control 2012-11-29 00:43:50.000000000 +0100
@@ -15,7 +15,7 @@
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 -Nru ca-certificates-java-20120721/debian/jks-keystore.hook.in ca-certificates-java-20121112+nmu2/debian/jks-keystore.hook.in
--- ca-certificates-java-20120721/debian/jks-keystore.hook.in 2012-07-21 13:30:21.000000000 +0200
+++ ca-certificates-java-20121112+nmu2/debian/jks-keystore.hook.in 2013-01-23 12:42:16.000000000 +0100
@@ -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
diff -Nru ca-certificates-java-20120721/debian/postinst.in ca-certificates-java-20121112+nmu2/debian/postinst.in
--- ca-certificates-java-20120721/debian/postinst.in 2012-07-21 13:30:13.000000000 +0200
+++ ca-certificates-java-20121112+nmu2/debian/postinst.in 2013-01-23 12:39:51.000000000 +0100
@@ -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
Reply to: