diff options
| author | Max Rees <maxcrees@me.com> | 2020-05-04 12:37:39 -0500 |
|---|---|---|
| committer | Max Rees <maxcrees@me.com> | 2020-05-04 22:51:42 -0500 |
| commit | 28fdd34de44edcf8d1a08cc45cd564099e9268fc (patch) | |
| tree | 1e7dcb7d13c610594926f65a399b237b653fcead /user/openjdk8/icedtea-jdk-musl.patch | |
| parent | 13df4b4fac8068b1c833c4cff3c49feacc53b26e (diff) | |
| download | packages-28fdd34de44edcf8d1a08cc45cd564099e9268fc.tar.gz packages-28fdd34de44edcf8d1a08cc45cd564099e9268fc.tar.bz2 packages-28fdd34de44edcf8d1a08cc45cd564099e9268fc.tar.xz packages-28fdd34de44edcf8d1a08cc45cd564099e9268fc.zip | |
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
Diffstat (limited to 'user/openjdk8/icedtea-jdk-musl.patch')
| -rw-r--r-- | user/openjdk8/icedtea-jdk-musl.patch | 32 |
1 files changed, 5 insertions, 27 deletions
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 <unistd.h> --#include <sys/sysctl.h> - #include <sys/utsname.h> - #include <netinet/ip.h> - -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 <unistd.h> --#include <sys/sysctl.h> - #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 */ |