Author: twerner
Date: 2011-09-12 19:29:02 +0000 (Mon, 12 Sep 2011)
New Revision: 14875
Modified:
trunk/ca-certificates-java/debian/changelog
trunk/ca-certificates-java/debian/jks-keystore.hook
Log:
Support OpenJDK 7. (Closes: #641305)
Modified: trunk/ca-certificates-java/debian/changelog
===================================================================
--- trunk/ca-certificates-java/debian/changelog 2011-09-12 18:50:48 UTC (rev
14874)
+++ trunk/ca-certificates-java/debian/changelog 2011-09-12 19:29:02 UTC (rev
14875)
@@ -1,8 +1,9 @@
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 20:49:07 +0200
+ -- Torsten Werner <twer...@debian.org> Mon, 12 Sep 2011 21:23:22 +0200
ca-certificates-java (20110816) unstable; urgency=low
Modified: trunk/ca-certificates-java/debian/jks-keystore.hook
===================================================================
--- trunk/ca-certificates-java/debian/jks-keystore.hook 2011-09-12 18:50:48 UTC
(rev 14874)
+++ trunk/ca-certificates-java/debian/jks-keystore.hook 2011-09-12 19:29:02 UTC
(rev 14875)
@@ -23,12 +23,12 @@
exit 1
fi
-for jvm in java-6-openjdk* java-7-openjdk* java-6-sun; do
- if [ -x /usr/lib/jvm/$jvm/bin/java ]; then
+for jdir in /usr/lib/jvm/java-[67]-openjdk* /usr/lib/jvm/java-6-sun; do
+ if [ -x $jdir/bin/java ]; then
break
fi
done
-export JAVA_HOME=/usr/lib/jvm/$jvm
+export JAVA_HOME=$jdir
PATH=$JAVA_HOME/bin:$PATH
temp_jvm_cfg=
@@ -39,12 +39,16 @@
printf -- "-server KNOWN\n" > $temp_jvm_cfg
fi
-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 dpkg-query --version >/dev/null; then
+ nsspkg=$(dpkg-query -L libnss3-1d | sed -n 's,\(.*\)/libnss3\.so$,\1,p')
+ nssjdk=$(sed -n '/nssLibraryDirectory/s/.*= *\(.*\)/\1/p'
$jdir/jre/lib/security/nss.cfg)
if [ "$nsspkg" != "$nssjdk" ]; then
- ln -sf $nsspkg/libnss3.so $nssjdk/libnss3.so
+ ln -sf $nsspkg/libnss3.so $nssjdk/
fi
+ softokn3pkg=$(dpkg-query -L libnss3-1d | sed -n
's,\(.*\)/libsoftokn3\.so$,\1,p')
+ if [ "$softokn3pkg" != "$nssjdk" ]; then
+ ln -sf $softokn3pkg/libsoftokn3.so $nssjdk/
+ fi
fi
do_cleanup()
@@ -53,6 +57,9 @@
if [ "$nsspkg" != "$nssjdk" ]; then
rm -f $nssjdk/libnss3.so
fi
+ if [ "$softokn3pkg" != "$nssjdk" ]; then
+ rm -f $nssjdk/libsoftokn3.so
+ fi
}
CLASSPATH=/usr/share/ca-certificates-java
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
