diff -Nru ca-certificates-java-20091021/debian/changelog ca-certificates-java-20100406/debian/changelog --- ca-certificates-java-20091021/debian/changelog 2009-10-21 22:10:40.000000000 +0200 +++ ca-certificates-java-20100406/debian/changelog 2010-04-06 22:24:56.000000000 +0200 @@ -1,3 +1,14 @@ +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 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 diff -Nru ca-certificates-java-20091021/debian/control ca-certificates-java-20100406/debian/control --- ca-certificates-java-20091021/debian/control 2009-10-21 22:11:29.000000000 +0200 +++ ca-certificates-java-20100406/debian/control 2010-04-06 21:59:31.000000000 +0200 @@ -1,10 +1,10 @@ Source: ca-certificates-java -Section: misc +Section: java Priority: optional Maintainer: OpenJDK Team Uploaders: Matthias Klose Build-Depends: debhelper (>= 6), ca-certificates (>= 20090814), openjdk-6-jre-headless (>= 6b16-1.6.1-2) -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Package: ca-certificates-java Architecture: all diff -Nru ca-certificates-java-20091021/debian/jks-keystore.hook ca-certificates-java-20100406/debian/jks-keystore.hook --- ca-certificates-java-20091021/debian/jks-keystore.hook 2009-06-29 12:15:41.000000000 +0200 +++ ca-certificates-java-20100406/debian/jks-keystore.hook 2010-04-06 21:39:59.000000000 +0200 @@ -15,6 +15,11 @@ exit 0 fi +if ! mountpoint -q /proc; then + echo >&2 "the keytool command requires a mounted proc fs (/proc)." + exit 1 +fi + for jvm in java-6-openjdk java-6-sun java-6-cacao; do if [ -x /usr/lib/jvm/$jvm/bin/keytool ]; then break @@ -87,7 +92,7 @@ [ -z "$temp_jvm_cfg" ] || rm -f $temp_jvm_cfg if [ $errors -gt 0 ]; then - echo >&2 "failed." + echo >&2 "failed (VM used: $jvm)." exit 1 fi echo "done." diff -Nru ca-certificates-java-20091021/debian/postinst ca-certificates-java-20100406/debian/postinst --- ca-certificates-java-20091021/debian/postinst 2009-10-21 22:06:59.000000000 +0200 +++ ca-certificates-java-20100406/debian/postinst 2010-04-06 21:41:00.000000000 +0200 @@ -74,7 +74,7 @@ rm -f $log rm -f $pregenerated if [ $errors -gt 0 ]; then - echo >&2 "failed." + echo >&2 "failed (VM used: $jvm)." [ -z "$temp_jvm_cfg" ] || rm -f $temp_jvm_cfg exit 1 fi @@ -87,6 +87,11 @@ if [ -z "$2" ]; 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 diff -Nru ca-certificates-java-20091021/debian/postrm ca-certificates-java-20100406/debian/postrm --- ca-certificates-java-20091021/debian/postrm 2008-06-02 19:48:36.000000000 +0200 +++ ca-certificates-java-20100406/debian/postrm 2010-04-06 22:04:18.000000000 +0200 @@ -6,6 +6,7 @@ purge) rm -f /etc/ca-certificates/update.d/jks-keystore rm -rf /etc/ssl/certs/java + rmdir /etc/ssl/certs 2>/dev/null || true ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;;