From 24fd4ddce3fea27905d1383b84a43c6bf214b9ad Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Fri, 20 Jan 2023 00:37:06 +0100 Subject: [PATCH] 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 --- ca-certificates/update.d/jks-keystore | 29 +++++++++++++------------- ssl/certs/java/cacerts | Bin 157050 -> 157050 bytes 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/ca-certificates/update.d/jks-keystore b/ca-certificates/update.d/jks-keystore index e0c3445..b63b656 100755 --- 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 GIT binary patch delta 260 zcmV+f0sH>?$_e_)34pW#m}$3_Zvg=Yx0q=G{ROuSfdQ`rw>*0R&;_@abpfUYlTIWf zx88&S{0X%dEjsYYBw+x#BNEo;5xB+wow^XwMm<6}@!~xC)w_v>i zmj}1S$^kkNm&Bd{BbT^u0S>p{;Q?<0xBuG#uLYB|wi&nM>H&lWw@&2&d%dEjsZaiw+x#BNEo-sw*i<1w^XwMbOg69!vU8Ew_v>i z&IPx{$^kkNx1ZkuuLYOHo&h75yJ-Oqw=moRZv(gM>H&NOleD%Ow`b)6gawxmX8|I& ziSPluGPi&y0(AzrMI!<`1h@4q0=NXXfHeYg1h=g+0@DJw@;L%l47c$~0*C~+NJavw z1GnZ<0tf~HCX?|W9k-WG0#5|DTwwwV1h;ry0^|d??pOkf1Qc<8m=gw01h+m*orjG6 JPN|Fdb0il)W!(S( -- 2.39.5