[pkg-java] r17919 - trunk/ca-certificates-java/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-03-24 09:09:57 +0000 (Mon, 24 Mar 2014)
New Revision: 17919

Modified:
   trunk/ca-certificates-java/debian/changelog
   trunk/ca-certificates-java/debian/jks-keystore.hook.in
   trunk/ca-certificates-java/debian/postinst.in
Log:
Limit the memory used by java to 64M when updating the certificates



Modified: trunk/ca-certificates-java/debian/changelog
===================================================================
--- trunk/ca-certificates-java/debian/changelog	2014-03-24 08:56:23 UTC (rev 17918)
+++ trunk/ca-certificates-java/debian/changelog	2014-03-24 09:09:57 UTC (rev 17919)
@@ -3,6 +3,8 @@
   * Team upload.
   * Fixed a test failure caused by the removal of the CAcert.org root
     certificate from the ca-certificates package (Closes: #741755)
+  * Limit the memory used by java to 64M when updating the certificates
+    (Closes: 576453)
   * d/control: Standards-Version updated to 3.9.5 (no changes)
   * Switch to debhelper level 9
 

Modified: trunk/ca-certificates-java/debian/jks-keystore.hook.in
===================================================================
--- trunk/ca-certificates-java/debian/jks-keystore.hook.in	2014-03-24 08:56:23 UTC (rev 17918)
+++ trunk/ca-certificates-java/debian/jks-keystore.hook.in	2014-03-24 09:09:57 UTC (rev 17919)
@@ -79,7 +79,7 @@
     fi
 }
 
-if java -jar $JAR -storepass "$storepass"; then
+if java -Xmx64m -jar $JAR -storepass "$storepass"; then
     do_cleanup
 else
     do_cleanup

Modified: trunk/ca-certificates-java/debian/postinst.in
===================================================================
--- trunk/ca-certificates-java/debian/postinst.in	2014-03-24 08:56:23 UTC (rev 17918)
+++ trunk/ca-certificates-java/debian/postinst.in	2014-03-24 09:09:57 UTC (rev 17919)
@@ -50,7 +50,7 @@
     # Forcibly remove diginotar cert (LP: #920758)
     if [ -n "$FIXOLD" ]; then
         echo -e "-diginotar_root_ca\n-diginotar_root_ca_pem" | \
-        java -jar $JAR -storepass "$storepass"
+        java -Xmx64m -jar $JAR -storepass "$storepass"
     fi
 
     find /etc/ssl/certs -name \*.pem | \
@@ -63,7 +63,7 @@
         fi
         echo "+${filename}"
     done | \
-    java -jar $JAR -storepass "$storepass"
+    java -Xmx64m -jar $JAR -storepass "$storepass"
     echo "done."
 }