Mon, 03 Feb 2020 06:24:11 +0000
8193255: Root Certificates should be stored in text format and assembled at build time
8235142: JDK-8193255 backport broke bootstrap with JDK 10
Reviewed-by: sgehwolf
common/autoconf/generated-configure.sh | file | annotate | diff | comparison | revisions | |
common/autoconf/jdk-options.m4 | file | annotate | diff | comparison | revisions |
1.1 --- a/common/autoconf/generated-configure.sh Wed Jan 29 07:02:27 2020 +0000 1.2 +++ b/common/autoconf/generated-configure.sh Mon Feb 03 06:24:11 2020 +0000 1.3 @@ -4379,7 +4379,7 @@ 1.4 #CUSTOM_AUTOCONF_INCLUDE 1.5 1.6 # Do not change or remove the following line, it is needed for consistency checks: 1.7 -DATE_WHEN_GENERATED=1579517558 1.8 +DATE_WHEN_GENERATED=1580709484 1.9 1.10 ############################################################################### 1.11 # 1.12 @@ -19768,8 +19768,6 @@ 1.13 1.14 if test "x$with_cacerts_file" != x; then 1.15 CACERTS_FILE=$with_cacerts_file 1.16 - else 1.17 - CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts 1.18 fi 1.19 1.20
2.1 --- a/common/autoconf/jdk-options.m4 Wed Jan 29 07:02:27 2020 +0000 2.2 +++ b/common/autoconf/jdk-options.m4 Mon Feb 03 06:24:11 2020 +0000 2.3 @@ -389,8 +389,6 @@ 2.4 [specify alternative cacerts file])]) 2.5 if test "x$with_cacerts_file" != x; then 2.6 CACERTS_FILE=$with_cacerts_file 2.7 - else 2.8 - CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts 2.9 fi 2.10 AC_SUBST(CACERTS_FILE) 2.11