From 24828bcaef9e4d51dae7cc1189b4f4935adc95f3 Mon Sep 17 00:00:00 2001 From: andrew Date: Mon, 3 Feb 2020 06:24:11 +0000 Subject: [PATCH] 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 | 4 +--- common/autoconf/jdk-options.m4 | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 5093e3b..33690e7 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -4379,7 +4379,7 @@ VS_SDK_PLATFORM_NAME_2017= #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1579517558 +DATE_WHEN_GENERATED=1580709484 ############################################################################### # @@ -19768,8 +19768,6 @@ fi if test "x$with_cacerts_file" != x; then CACERTS_FILE=$with_cacerts_file - else - CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts fi diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4 index 6c84196..6f6c52a 100644 --- a/common/autoconf/jdk-options.m4 +++ b/common/autoconf/jdk-options.m4 @@ -389,8 +389,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS], [specify alternative cacerts file])]) if test "x$with_cacerts_file" != x; then CACERTS_FILE=$with_cacerts_file - else - CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts fi AC_SUBST(CACERTS_FILE) -- GitLab