committing changes in /etc made by "/usr/bin/apt upgrade ca-certificates-java"

Packages with configuration changes:
-ca-certificates-java 20190909ubuntu1 all
+ca-certificates-java 20190909ubuntu1.1 all

Package changes:
-ca-certificates-java 20190909ubuntu1 all
+ca-certificates-java 20190909ubuntu1.1 all

diff --git a/ca-certificates/update.d/jks-keystore b/ca-certificates/update.d/jks-keystore
index e0c3445ac9bdf8999de9212e0fa346114a24604d..b63b65611a77dc094ce2252c2175bc90d5a43e07 100755 (executable)
--- a/ca-certificates/update.d/jks-keystore
+++ b/ca-certificates/update.d/jks-keystore
@@ -35,21 +35,20 @@ if ! mountpoint -q /proc; then
     exit 1
 fi
 
-for jvm in java-7-openjdk-$arch java-7-openjdk \
-           oracle-java7-jre-$arch oracle-java7-server-jre-$arch oracle-java7-jdk-$arch \
-           java-8-openjdk-$arch java-8-openjdk \
-           oracle-java8-jre-$arch oracle-java8-server-jre-$arch oracle-java8-jdk-$arch \
-           java-9-openjdk-$arch java-9-openjdk \
-           oracle-java9-jre-$arch oracle-java9-server-jre-$arch oracle-java9-jdk-$arch \
-           java-10-openjdk-$arch java-10-openjdk \
-           oracle-java10-jre-$arch oracle-java10-server-jre-$arch oracle-java10-jdk-$arch \
-           java-11-openjdk-$arch java-11-openjdk \
-           oracle-java11-jre-$arch oracle-java11-server-jre-$arch oracle-java11-jdk-$arch; do
-    if [ -x /usr/lib/jvm/$jvm/bin/java ]; then
-        export JAVA_HOME=/usr/lib/jvm/$jvm
-        PATH=$JAVA_HOME/bin:$PATH
-       break
-    fi
+for version in 8 9 10 11 12 13 14 15 16 17 18 19 20 21 ; do
+    for jvm in \
+        java-${version}-openjdk-${arch} \
+        java-${version}-openjdk \
+        oracle-java${version}-jre-${arch} \
+        oracle-java${version}-server-jre-${arch} \
+        oracle-java${version}-jdk-${arch}
+    do
+        if [ -x /usr/lib/jvm/$jvm/bin/java ]; then
+            export JAVA_HOME=/usr/lib/jvm/$jvm
+            PATH=$JAVA_HOME/bin:$PATH
+            break 2
+        fi
+    done
 done
 
 if dpkg-query --version >/dev/null; then

diff --git a/ssl/certs/java/cacerts b/ssl/certs/java/cacerts
index a950cd869d4e0f49313d231fefb3e87e09c7c45f..3e6c89c3879390bb3bbf89a0b98d3d6d5c2d4762 100644 (file)
Binary files a/ssl/certs/java/cacerts and b/ssl/certs/java/cacerts differ