openjdk6-slackware15.patch 2.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849
  1. diff -Naur icedtea6-1.13.13.orig/Makefile.am icedtea6-1.13.13/Makefile.am
  2. --- icedtea6-1.13.13.orig/Makefile.am 2017-01-04 15:22:49.112782727 -0500
  3. +++ icedtea6-1.13.13/Makefile.am 2021-05-29 23:06:16.902186221 -0400
  4. @@ -328,6 +328,7 @@
  5. $(UPSTREAMED_PATCHES) \
  6. patches/openjdk/6733501-icedtea_lcms_test.patch \
  7. $(LCMS_PATCHES) \
  8. + patches/openjdk/removed-sysctl-h.patch \
  9. patches/openjdk/7018912-potential_buffer_overruns_in_jpeg.patch \
  10. patches/openjdk/6989760-native_warnings.patch \
  11. patches/openjdk/7013519-integer_overflows.patch \
  12. diff -Naur icedtea6-1.13.13.orig/Makefile.in icedtea6-1.13.13/Makefile.in
  13. --- icedtea6-1.13.13.orig/Makefile.in 2017-01-04 15:23:00.576597287 -0500
  14. +++ icedtea6-1.13.13/Makefile.in 2021-05-29 23:06:15.712176245 -0400
  15. @@ -782,6 +782,7 @@
  16. $(UPSTREAMED_PATCHES) \
  17. patches/openjdk/6733501-icedtea_lcms_test.patch \
  18. $(LCMS_PATCHES) \
  19. + patches/openjdk/removed-sysctl-h.patch \
  20. patches/openjdk/7018912-potential_buffer_overruns_in_jpeg.patch \
  21. patches/openjdk/6989760-native_warnings.patch \
  22. patches/openjdk/7013519-integer_overflows.patch \
  23. diff -Naur icedtea6-1.13.13.orig/patches/openjdk/removed-sysctl-h.patch icedtea6-1.13.13/patches/openjdk/removed-sysctl-h.patch
  24. --- icedtea6-1.13.13.orig/patches/openjdk/removed-sysctl-h.patch 1969-12-31 19:00:00.000000000 -0500
  25. +++ icedtea6-1.13.13/patches/openjdk/removed-sysctl-h.patch 2021-05-29 22:22:09.410666831 -0400
  26. @@ -0,0 +1,22 @@
  27. +diff -Naur openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk.new/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
  28. +--- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2016-12-29 23:30:19.000000000 -0500
  29. ++++ openjdk.new/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2021-05-29 22:20:40.679916383 -0400
  30. +@@ -35,7 +35,6 @@
  31. + #endif
  32. + #ifdef __linux__
  33. + #include <unistd.h>
  34. +-#include <sys/sysctl.h>
  35. + #include <sys/utsname.h>
  36. + #include <netinet/ip.h>
  37. +
  38. +diff -Naur openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk.new/jdk/src/solaris/native/java/net/PlainSocketImpl.c
  39. +--- openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2016-12-29 23:30:19.000000000 -0500
  40. ++++ openjdk.new/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2021-05-29 22:20:23.242768734 -0400
  41. +@@ -43,7 +43,6 @@
  42. + #endif
  43. + #ifdef __linux__
  44. + #include <unistd.h>
  45. +-#include <sys/sysctl.h>
  46. + #endif
  47. +
  48. + #include "jvm.h"