From 33daef27da6d092e1be5547907d54588a660b42f Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mon, 23 Jul 2018 19:01:24 +0200 Subject: [PATCH] updated to security jdk10+3.13 - deleted patch106 JDK-8193802-npe-jar-getVersionMap.patch - deleted patch400 JDK-8200556-aarch64-slowdebug-crash.patch - deleted patch104 JDK-8201509-s390-atomic_store.patch - deleted patch103 JDK-8201788-bootcycle-images-jobs.patch --- .gitignore | 1 + JDK-8193802-npe-jar-getVersionMap.patch | 72 ----------------------- JDK-8200556-aarch64-slowdebug-crash.patch | 14 ----- JDK-8201509-s390-atomic_store.patch | 18 ------ JDK-8201788-bootcycle-images-jobs.patch | 27 --------- java-openjdk.spec | 36 ++++-------- sources | 2 +- update_package.sh | 2 +- 8 files changed, 14 insertions(+), 158 deletions(-) delete mode 100644 JDK-8193802-npe-jar-getVersionMap.patch delete mode 100644 JDK-8200556-aarch64-slowdebug-crash.patch delete mode 100644 JDK-8201509-s390-atomic_store.patch delete mode 100644 JDK-8201788-bootcycle-images-jobs.patch diff --git a/.gitignore b/.gitignore index 0801e98..554b078 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /systemtap-tapset-3.6.0pre02.tar.xz /jdk-jdk10-jdk-10+46.tar.xz /jdk-updates-jdk10u-jdk-10.0.1+10.tar.xz +/jdk-updates-jdk10u-jdk-10.0.2+13.tar.xz diff --git a/JDK-8193802-npe-jar-getVersionMap.patch b/JDK-8193802-npe-jar-getVersionMap.patch deleted file mode 100644 index 6dc5d81..0000000 --- a/JDK-8193802-npe-jar-getVersionMap.patch +++ /dev/null @@ -1,72 +0,0 @@ -# HG changeset patch -# User sherman -# Date 1525080541 -7200 -# Mon Apr 30 11:29:01 2018 +0200 -# Node ID c3e284205e149a6d786ff5aa7dca9338cf70ba60 -# Parent e541eaa797070bafe8c3dc41f4beec8395c78276 -8193802: NullPointerException from JarFileSystem.getVersionMap() -Reviewed-by: mchung - -diff --git a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java ---- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java -+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -109,7 +109,9 @@ - */ - private Function createVersionedLinks(int version) { - HashMap aliasMap = new HashMap<>(); -- getVersionMap(version, getInode(getBytes("/META-INF/versions"))).values() -+ IndexNode verdir = getInode(getBytes("/META-INF/versions")); -+ if (verdir != null) { -+ getVersionMap(version, verdir).values() - .forEach(versionNode -> { // for each META-INF/versions/{n} directory - // put all the leaf inodes, i.e. entries, into the alias map - // possibly shadowing lower versioned entries -@@ -124,6 +126,7 @@ - } - }); - }); -+ } - return path -> aliasMap.get(IndexNode.keyOf(path)); - } - -diff --git a/test/jdk/jdk/nio/zipfs/MultiReleaseJarTest.java b/test/jdk/jdk/nio/zipfs/MultiReleaseJarTest.java ---- a/test/jdk/jdk/nio/zipfs/MultiReleaseJarTest.java -+++ b/test/jdk/jdk/nio/zipfs/MultiReleaseJarTest.java -@@ -23,7 +23,7 @@ - - /* - * @test -- * @bug 8144355 8144062 8176709 -+ * @bug 8144355 8144062 8176709 8193802 - * @summary Test aliasing additions to ZipFileSystem for multi-release jar files - * @library /lib/testlibrary/java/util/jar - * @build Compiler JarBuilder CreateMultiReleaseTestJars -@@ -205,6 +205,21 @@ - //testCustomMultiReleaseValue("true\r\n true", false); - } - -+ @Test -+ public void testMultiReleaseJarWithNonVersionDir() throws Exception { -+ String jfname = "multi-release-non-ver.jar"; -+ Path jfpath = Paths.get(jfname); -+ URI uri = new URI("jar", jfpath.toUri().toString() , null); -+ JarBuilder jb = new JarBuilder(jfname); -+ jb.addAttribute("Multi-Release", "true"); -+ jb.build(); -+ Map env = Map.of("multi-release", "runtime"); -+ try (FileSystem fs = FileSystems.newFileSystem(uri, env)) { -+ Assert.assertTrue(true); -+ } -+ Files.delete(jfpath); -+ } -+ - private static final AtomicInteger JAR_COUNT = new AtomicInteger(0); - - private void testCustomMultiReleaseValue(String value, boolean expected) diff --git a/JDK-8200556-aarch64-slowdebug-crash.patch b/JDK-8200556-aarch64-slowdebug-crash.patch deleted file mode 100644 index bb5453e..0000000 --- a/JDK-8200556-aarch64-slowdebug-crash.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -r 214a94e9366c src/cpu/aarch64/vm/nativeInst_aarch64.cpp ---- openjdk/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp Mon Jul 17 12:11:32 2017 +0000 -+++ openjdk/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp Mon Jul 24 16:23:14 2017 +0100 -@@ -343,7 +343,7 @@ - CodeBuffer cb(code_pos, instruction_size); - MacroAssembler a(&cb); - -- a.mov(rscratch1, entry); -+ a.movptr(rscratch1, (uintptr_t)entry); - a.br(rscratch1); - - ICache::invalidate_range(code_pos, instruction_size); - - diff --git a/JDK-8201509-s390-atomic_store.patch b/JDK-8201509-s390-atomic_store.patch deleted file mode 100644 index ba7f748..0000000 --- a/JDK-8201509-s390-atomic_store.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp ---- a/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp -+++ b/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp -@@ -50,10 +50,10 @@ - : "Q"(*(volatile long*)src)); - #elif defined(S390) && !defined(_LP64) - double tmp; -- asm volatile ("ld %0, 0(%1)\n" -- "std %0, 0(%2)\n" -- : "=r"(tmp) -- : "a"(src), "a"(dst)); -+ asm volatile ("ld %0, %2\n" -+ "std %0, %1\n" -+ : "=&f"(tmp), "=Q"(*(volatile double*)dst) -+ : "Q"(*(volatile double*)src)); - #else - *(jlong *) dst = *(const jlong *) src; - #endif diff --git a/JDK-8201788-bootcycle-images-jobs.patch b/JDK-8201788-bootcycle-images-jobs.patch deleted file mode 100644 index 05d1a39..0000000 --- a/JDK-8201788-bootcycle-images-jobs.patch +++ /dev/null @@ -1,27 +0,0 @@ -# HG changeset patch -# User sgehwolf -# Date 1524152606 -7200 -# Thu Apr 19 17:43:26 2018 +0200 -# Node ID f7a3ca673e9cc831848fc890a2df3ae9acb447e4 -# Parent dd26184768b0a1c4103a2e9eaa8b4d852a9eca1b -8201788: Number of make jobs wrong for bootcycle-images target -Reviewed-by: erikj, ihse - -diff --git a/make/Init.gmk b/make/Init.gmk ---- a/make/Init.gmk -+++ b/make/Init.gmk -@@ -310,9 +310,13 @@ - ifneq ($(PARALLEL_TARGETS), ) - $(call StartGlobalTimer) - $(call PrepareSmartJavac) -+ # JOBS will only be empty for a bootcycle-images recursive call -+ # or if specified via a make argument directly. In those cases -+ # treat it as NOT using jobs at all. - ( cd $(TOPDIR) && \ - $(NICE) $(MAKE) $(MAKE_ARGS) $(OUTPUT_SYNC_FLAG) \ -- -j $(JOBS) -f make/Main.gmk $(USER_MAKE_VARS) \ -+ $(if $(JOBS), -j $(JOBS)) \ -+ -f make/Main.gmk $(USER_MAKE_VARS) \ - $(PARALLEL_TARGETS) $(COMPARE_BUILD_MAKE) $(BUILD_LOG_PIPE) || \ - ( exitcode=$$? && \ - $(PRINTF) "\nERROR: Build failed for $(TARGET_DESCRIPTION) (exit code $$exitcode) \n" \ diff --git a/java-openjdk.spec b/java-openjdk.spec index b54d98d..3083f07 100644 --- a/java-openjdk.spec +++ b/java-openjdk.spec @@ -185,14 +185,14 @@ # New Version-String scheme-style defines %global majorver 10 -%global securityver 1 +%global securityver 2 # Standard JPackage naming and versioning defines %global origin openjdk %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 10 +%global buildver 13 # priority must be 7 digits in total # setting to 1, so debug ones can have 0 %global priority 00000%{minorver}1 @@ -867,7 +867,7 @@ Provides: java-%{javaver}-%{origin}-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{origin} Version: %{newjavaver}.%{buildver} -Release: 13%{?dist} +Release: 1%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -952,22 +952,6 @@ Patch100: JDK-8201495-s390-java-opts.patch Patch101: sorted-diff.patch # Type fixing for s390 (Zero). Not upstream. Patch102: java-openjdk-s390-size_t.patch -# bootcycle-images target may run out of ressources -# due to bad jobs config. Missing backports. -Patch103: JDK-8201788-bootcycle-images-jobs.patch -# s390 (Zero) build fix. Pending upstream. -Patch104: JDK-8201509-s390-atomic_store.patch -# libjsig.so does not receive extra ld flags when -# being built. Not an issue on JDK 11. Missing fix for -# 10 upstream. -Patch105: JDK-8202262-libjsig.so-extra-link-flags.patch -# NPE from JarFileSystem.getVersionMap. Fixed in JDK 11, -# not backported to JDK 10. See RHBZ#1557375 for the -# downstream issue. Not applicable for JDK 8. -Patch106: JDK-8193802-npe-jar-getVersionMap.patch - -# aarch64 slowdebug build fix. Pending upstream -Patch400: JDK-8200556-aarch64-slowdebug-crash.patch BuildRequires: autoconf BuildRequires: automake @@ -1234,12 +1218,6 @@ pushd %{top_level_dir_name} %patch101 -p1 %patch102 -p1 -%patch103 -p1 -%patch104 -p1 -%patch105 -p1 -%patch106 -p1 - -%patch400 -p1 popd # openjdk @@ -1796,6 +1774,14 @@ require "copy_jdk_configs.lua" %changelog +* Mon Jul 23 2018 Jiri Vanek - 1:10.0.3.13-1 +- updated to security jdk10+3.13 +- deleted patch106 JDK-8193802-npe-jar-getVersionMap.patch +- deleted patch400 JDK-8200556-aarch64-slowdebug-crash.patch +- deleted patch104 JDK-8201509-s390-atomic_store.patch +- deleted patch103 JDK-8201788-bootcycle-images-jobs.patch + + * Fri Jul 13 2018 Fedora Release Engineering - 1:10.0.1.10-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 31d2e7a..e18a3a5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (systemtap-tapset-3.6.0pre02.tar.xz) = 848f42ef7ca751e723fd50e3a6da14c0965ad4da37ea3331568658e27497b7a7e4b9aad3dedd264ad0bb5566c37a92302b905f10258a4e2c89dc4ba609e55481 -SHA512 (jdk-updates-jdk10u-jdk-10.0.1+10.tar.xz) = e57810a4208bb12a6b37f5e8313e30c489e6611ec6be8e7a8fb3c0ae9f1842803a3775bc7cc1f597064444fb4fabae5798a4447712fbf547f7021dd0da384613 +SHA512 (jdk-updates-jdk10u-jdk-10.0.2+13.tar.xz) = e5de419cec42e376ce341126c64370211cb09f326cdfafc64cec52640d2a2780f3ee705d51b6d025af6ca74c1525ed8d4a9d9afbe5b45f9709dd4d2242f1af08 diff --git a/update_package.sh b/update_package.sh index 5d0f330..9750934 100644 --- a/update_package.sh +++ b/update_package.sh @@ -31,7 +31,7 @@ if [ "x$REPO_NAME" = "x" ] ; then REPO_NAME="jdk10u" fi if [ "x$VERSION" = "x" ] ; then - VERSION="jdk-10.0.1+10" + VERSION="jdk-10.0.2+13" fi if [ "x$COMPRESSION" = "x" ] ; then