diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-06-12 23:49:34 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-06-12 23:49:34 +0000 |
| commit | 4e53c51f591cbd62817c797c10d240c008182ab3 (patch) | |
| tree | 1daa740f1bb764764e557f913166e6761abb0b86 /user/openjdk8/icedtea-jdk-includes.patch | |
| parent | abeeb94648332a902cc91c0c2c0333e1ae23b49c (diff) | |
| parent | 8907c7de87fa709a23ee19e11bd3d5ef6f1f13b3 (diff) | |
| download | packages-4e53c51f591cbd62817c797c10d240c008182ab3.tar.gz packages-4e53c51f591cbd62817c797c10d240c008182ab3.tar.bz2 packages-4e53c51f591cbd62817c797c10d240c008182ab3.tar.xz packages-4e53c51f591cbd62817c797c10d240c008182ab3.zip | |
Merge branch 'sec/openjdk8' into 'master'
user/openjdk8: [CVE] bump to 8.252.09 (#269)
See merge request adelie/packages!445
Diffstat (limited to 'user/openjdk8/icedtea-jdk-includes.patch')
| -rw-r--r-- | user/openjdk8/icedtea-jdk-includes.patch | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/user/openjdk8/icedtea-jdk-includes.patch b/user/openjdk8/icedtea-jdk-includes.patch index 6443a1973..5acbb9efb 100644 --- a/user/openjdk8/icedtea-jdk-includes.patch +++ b/user/openjdk8/icedtea-jdk-includes.patch @@ -53,17 +53,6 @@ /* O Flags */ ---- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c -+++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c -@@ -28,7 +28,7 @@ - #include <sys/types.h> - #include <sys/socket.h> - #if defined(__linux__) && !defined(USE_SELECT) --#include <sys/poll.h> -+#include <poll.h> - #endif - #include <netinet/tcp.h> /* Defines TCP_NODELAY, needed for 2.6 */ - #include <netinet/in.h> --- openjdk.orig/jdk/src/solaris/native/java/net/bsd_close.c +++ openjdk/jdk/src/solaris/native/java/net/bsd_close.c @@ -36,7 +36,7 @@ @@ -88,14 +77,14 @@ * Stack allocated by thread when doing blocking operation --- openjdk.orig/jdk/src/solaris/native/java/net/net_util_md.h +++ openjdk/jdk/src/solaris/native/java/net/net_util_md.h -@@ -33,7 +33,7 @@ - #include <unistd.h> - - #ifndef USE_SELECT +@@ -27,7 +27,7 @@ + #define NET_UTILS_MD_H + + #include <netdb.h> -#include <sys/poll.h> +#include <poll.h> - #endif - + #include <sys/socket.h> + int NET_Timeout(int s, long timeout); --- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c +++ openjdk/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c |