From d3a8a110b51f2c3fe15e4843bb0f7d3c3f8082c7 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Mon, 9 Aug 2021 02:11:39 +0100 Subject: [PATCH] Update to jdk-11.0.12.0+7 Update release notes to 11.0.12.0+7 Switch to GA mode for final release. Add patch in order to fix java.library.path issue on aarch64 (JDK-8269668) Remove non-Free test from source tarball. Resolves: rhbz#1967815 --- .gitignore | 2 ++ NEWS | 15 +++++++++ generate_source_tarball.sh | 19 +++++++++-- java-11-openjdk.spec | 22 ++++++++++--- ...69668-rh1977671-aarch64_lib_path_fix.patch | 32 +++++++++++++++++++ sources | 2 +- 6 files changed, 85 insertions(+), 7 deletions(-) create mode 100644 jdk8269668-rh1977671-aarch64_lib_path_fix.patch diff --git a/.gitignore b/.gitignore index ed2ebe0..c5224a8 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,5 @@ /jdk-updates-jdk11u-jdk-11.0.12+3-4curve.tar.xz /jdk-updates-jdk11u-jdk-11.0.12+4-4curve.tar.xz /jdk-updates-jdk11u-jdk-11.0.12+6-4curve.tar.xz +/jdk-updates-jdk11u-jdk-11.0.12+7-4curve.tar.xz +/jdk-updates-jdk11u-jdk-11.0.12+7-4curve-clean.tar.xz diff --git a/NEWS b/NEWS index e146c86..26c3f66 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,21 @@ Live versions of these release notes can be found at: * https://bitly.com/openjdk11012 * https://builds.shipilev.net/backports-monitor/release-notes-11.0.12.txt +* Security fixes + - JDK-8256157: Improve bytecode assembly + - JDK-8256491: Better HTTP transport + - JDK-8258432, CVE-2021-2341: Improve file transfers + - JDK-8260453: Improve Font Bounding + - JDK-8260960: Signs of jarsigner signing + - JDK-8260967, CVE-2021-2369: Better jar file validation + - JDK-8262380: Enhance XML processing passes + - JDK-8262403: Enhanced data transfer + - JDK-8262410: Enhanced rules for zones + - JDK-8262477: Enhance String Conclusions + - JDK-8262967: Improve Zip file support + - JDK-8264066, CVE-2021-2388: Enhance compiler validation + - JDK-8264079: Improve abstractions + - JDK-8264460: Improve NTLM support * Other changes - JDK-6847157: java.lang.NullPointerException: HDC for component at sun.java2d.loops.Blit.Blit - JDK-7106851: Test should not use System.exit diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh index 9baaf2c..d8c729b 100755 --- a/generate_source_tarball.sh +++ b/generate_source_tarball.sh @@ -94,12 +94,22 @@ if [ "x$REPO_ROOT" = "x" ] ; then REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}" echo "No repository root specified; default to ${REPO_ROOT}" fi; - if [ "x$TO_COMPRESS" = "x" ] ; then TO_COMPRESS="openjdk" echo "No to be compressed targets specified, ; default to ${TO_COMPRESS}" fi; +echo -e "Settings:" +echo -e "\tVERSION: ${VERSION}" +echo -e "\tPROJECT_NAME: ${PROJECT_NAME}" +echo -e "\tREPO_NAME: ${REPO_NAME}" +echo -e "\tOPENJDK_URL: ${OPENJDK_URL}" +echo -e "\tCOMPRESSION: ${COMPRESSION}" +echo -e "\tFILE_NAME_ROOT: ${FILE_NAME_ROOT}" +echo -e "\tREPO_ROOT: ${REPO_ROOT}" +echo -e "\tTO_COMPRESS: ${TO_COMPRESS}" +echo -e "\tPRTBC01: ${PRTBC01}" + if [ -d ${FILE_NAME_ROOT} ] ; then echo "exists exists exists exists exists exists exists " echo "reusing reusing reusing reusing reusing reusing " @@ -112,6 +122,11 @@ else popd fi pushd "${FILE_NAME_ROOT}" +# UnderlineTaglet.java has a BSD license with a field-of-use restriction, making it non-Free + if [ -d openjdk/test ] ; then + echo "Removing langtools test case with non-Free license" + rm -vf openjdk/test/langtools/tools/javadoc/api/basic/taglets/UnderlineTaglet.java + fi if [ -d openjdk/src ]; then pushd openjdk echo "Removing EC source code we don't build" @@ -148,7 +163,7 @@ pushd "${FILE_NAME_ROOT}" else SWITCH=czf fi - TARBALL_NAME=${FILE_NAME_ROOT}-4curve.tar.${COMPRESSION} + TARBALL_NAME=${FILE_NAME_ROOT}-4curve-clean.tar.${COMPRESSION} tar --exclude-vcs -$SWITCH ${TARBALL_NAME} $TO_COMPRESS mv ${TARBALL_NAME} .. popd diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index d55d121..ea43027 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -342,7 +342,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 6 +%global buildver 7 %global rpmrelease 0 #%%global tagsuffix "" # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit @@ -372,7 +372,7 @@ # Release will be (where N is usually a number starting at 1): # - 0.N%%{?extraver}%%{?dist} for EA releases, # - N%%{?extraver}{?dist} for GA releases -%global is_ga 0 +%global is_ga 1 %if %{is_ga} %global ea_designator "" %global ea_designator_zip "" @@ -1158,7 +1158,7 @@ URL: http://openjdk.java.net/ # to regenerate source0 (jdk) run update_package.sh # update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives -Source0: jdk-updates-jdk%{featurever}u-jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}-4curve.tar.xz +Source0: jdk-updates-jdk%{featurever}u-jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}-4curve-clean.tar.xz # Use 'icedtea_sync.sh' to update the following # They are based on code contained in the IcedTea project (6.x). @@ -1246,13 +1246,15 @@ Patch7: pr3695-toggle_system_crypto_policy.patch ############################################# # -# Patches appearing in 11.0.10 +# Patches appearing in 11.0.13 # # This section includes patches which are present # in the listed OpenJDK 11u release and should be # able to be removed once that release is out # and used by this RPM. ############################################# +# JDK-8269668, RH1977671: [aarch64] java.library.path not including /usr/lib64 +Patch8: jdk8269668-rh1977671-aarch64_lib_path_fix.patch BuildRequires: autoconf BuildRequires: automake @@ -1606,6 +1608,7 @@ pushd %{top_level_dir_name} %patch3 -p1 %patch4 -p1 %patch7 -p1 +%patch8 -p1 popd # openjdk %patch1000 @@ -2307,6 +2310,17 @@ require "copy_jdk_configs.lua" %endif %changelog +* Mon Aug 09 2021 Andrew Hughes - 1:11.0.12.0.7-0 +- Update to jdk-11.0.12.0+7 +- Update release notes to 11.0.12.0+7 +- Switch to GA mode for final release. +- Remove non-Free test from source tarball. +- Resolves: rhbz#1967815 + +* Wed Jul 28 2021 Severin Gehwolf - 1:11.0.12.0.7-0 +- Add patch in order to fix java.library.path issue on aarch64 (JDK-8269668) +- Resolves: rhbz#1967815 + * Tue Jul 20 2021 Andrew Hughes - 1:11.0.12.0.6-0.0.ea - Update to jdk-11.0.12.0+6 - Update release notes to 11.0.12.0+6 diff --git a/jdk8269668-rh1977671-aarch64_lib_path_fix.patch b/jdk8269668-rh1977671-aarch64_lib_path_fix.patch new file mode 100644 index 0000000..ddf686c --- /dev/null +++ b/jdk8269668-rh1977671-aarch64_lib_path_fix.patch @@ -0,0 +1,32 @@ +From ec03fdb752f2dc0833784a6877a4c232a8cdd9d2 Mon Sep 17 00:00:00 2001 +From: Severin Gehwolf +Date: Wed, 14 Jul 2021 12:06:39 +0200 +Subject: [PATCH] Backport e14801cdd9b108aa4ca47d0bc1dc67fca575764c + +--- + src/hotspot/os/linux/os_linux.cpp | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp +index e8baf704e3a..12b75b733b5 100644 +--- a/src/hotspot/os/linux/os_linux.cpp ++++ b/src/hotspot/os/linux/os_linux.cpp +@@ -413,8 +413,15 @@ void os::init_system_properties_values() { + // 7: The default directories, normally /lib and /usr/lib. + #if defined(AMD64) || (defined(_LP64) && defined(SPARC)) || defined(PPC64) || defined(S390) + #define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib" ++#else ++#if defined(AARCH64) ++ // Use 32-bit locations first for AARCH64 (a 64-bit architecture), since some systems ++ // might not adhere to the FHS and it would be a change in behaviour if we used ++ // DEFAULT_LIBPATH of other 64-bit architectures which prefer the 64-bit paths. ++ #define DEFAULT_LIBPATH "/lib:/usr/lib:/usr/lib64:/lib64" + #else + #define DEFAULT_LIBPATH "/lib:/usr/lib" ++#endif // AARCH64 + #endif + + // Base path of extensions installed on the system. +-- +2.31.1 + diff --git a/sources b/sources index af0ae7b..e12eab2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30 -SHA512 (jdk-updates-jdk11u-jdk-11.0.12+6-4curve.tar.xz) = c5dc3101d0315b9cd5407f26142c121b0889aa931772212f717ae2c6de3c5071f16cc7b98728993384e3c9d74126c06d532af911429dd7b5baebe52a8e65d015 +SHA512 (jdk-updates-jdk11u-jdk-11.0.12+7-4curve-clean.tar.xz) = c7180055ef449f2218618049a55fb44ddf4d353d8b32714f092c326387d5e29b49b42e2df2802e01549b086499ade8417e8d0e1b057aa954272072a2c0669151