From 28fdd34de44edcf8d1a08cc45cd564099e9268fc Mon Sep 17 00:00:00 2001 From: Max Rees Date: Mon, 4 May 2020 12:37:39 -0500 Subject: user/openjdk8: [CVE] bump to 8.252.09 (#269) * Bootstrap using openjdk8. Note that it will need to be manually installed when building now... * Cherrypick patch changes from Alpine: icedtea-jdk-tls-nist-curves.patch was integrated upstream, and icedtea-hotspot-musl.patch was rebased for 8u232. https://git.alpinelinux.org/aports/commit/community/openjdk8?id=04ec13ca9caa9a436001be92e674f230b9894894 * Rebase patches for 8u252-ga: In particular, icedtea-jdk-getmntent-buffer.patch is dropped since upstream takes a new approach by allocating a buffer according to the length of the longest line in mtab. https://bugs.openjdk.java.net/browse/JDK-8229872 * Use private variables (_) where applicable --- user/openjdk8/icedtea-jdk-musl.patch | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) (limited to 'user/openjdk8/icedtea-jdk-musl.patch') diff --git a/user/openjdk8/icedtea-jdk-musl.patch b/user/openjdk8/icedtea-jdk-musl.patch index 97946ba42..7dbd6872c 100644 --- a/user/openjdk8/icedtea-jdk-musl.patch +++ b/user/openjdk8/icedtea-jdk-musl.patch @@ -47,32 +47,10 @@ diff -ru openjdk.orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c openjdk #define HAS_GLIBC_GETHOSTBY_R 1 #endif -diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c ---- openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2017-01-25 04:22:03.000000000 +0000 -+++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2017-02-06 11:23:47.047832009 +0000 -@@ -41,7 +41,6 @@ - #endif - #ifdef __linux__ - #include --#include - #include - #include - -diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c ---- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2017-01-25 04:22:03.000000000 +0000 -+++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2017-02-06 11:23:47.047832009 +0000 -@@ -43,7 +43,6 @@ - #endif - #ifdef __linux__ - #include --#include - #endif - - #include "jvm.h" diff -ru openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c openjdk/jdk/src/solaris/native/java/net/linux_close.c ---- openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c 2017-01-25 04:22:03.000000000 +0000 -+++ openjdk/jdk/src/solaris/native/java/net/linux_close.c 2017-02-06 11:23:47.047832009 +0000 -@@ -56,7 +56,7 @@ +--- openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c 2020-04-29 12:33:10.000000000 +0000 ++++ openjdk/jdk/src/solaris/native/java/net/linux_close.c 2020-05-02 19:35:51.590000000 +0000 +@@ -58,7 +58,7 @@ typedef struct { /* * Signal to unblock thread */ @@ -80,8 +58,8 @@ diff -ru openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c openjdk/jdk/ +static int sigWakeup; /* - * The fd table and the number of file descriptors -@@ -95,6 +95,9 @@ + * fdTable holds one entry per file descriptor, up to a certain +@@ -147,6 +147,9 @@ static void __attribute((constructor)) i /* * Setup the signal handler */ -- cgit v1.2.3-70-g09d2