Updated icedtea7 to 2.6.25 and icedtea8 to 3.19.0

d308e676 · Vladimir Bashkirtsev · 3c84cba1 · d308e676 · d308e676 · 3c84cba1
Commit d308e676 authored Aug 23, 2023 by Vladimir Bashkirtsev
35 changed files
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ build-7:
 	tar xf icedtea-2.6.10.tar.xz
 	patch -Np1 -d icedtea-2.6.10 < icedtea-2.6.10-fixed.patch
 	cp icedtea7/2.6.10/* icedtea-2.6.10
-	cd icedtea-2.6.10 && PATH=/build/usr/bin:/build/ant/bin:/opt/jdk/bin:$$PATH JAVA_HOME=/opt/jdk CLASSPATH=.:/usr/share/java ./configure --prefix=/usr --with-jdk-home=/opt/jdk --without-rhino --disable-system-kerberos --disable-system-gtk --disable-system-pcsc --disable-system-sctp
+	cd icedtea-2.6.10 && PATH=/build/usr/bin:/build/ant/bin:/opt/jdk/bin:$$PATH JAVA_HOME=/opt/jdk CLASSPATH=.:/usr/share/java ./configure --prefix=/usr --with-jdk-home=/opt/jdk --without-rhino --disable-system-kerberos --disable-system-gtk --disable-system-pcsc --disable-system-sctp --disable-compile-against-syscalls
 	$(MAKE) -C icedtea-2.6.10 PATH=/build/usr/bin:/build/ant/bin:/opt/jdk/bin:$$PATH DISABLE_HOTSPOT_OS_VERSION_CHECK=ok
 	cd icedtea-2.6.10 && cp -R openjdk.build/j2sdk-image /opt/icedtea-2.6.10
 	chown -R root:root /opt/icedtea-2.6.10
@@ -58,18 +58,18 @@ build-7:
 	ln -svf /etc/pki/tls/java/cacerts /opt/jdk/jre/lib/security/cacerts
 	rm -rf /opt/icedtea6-1.13.13
 	rm -rf icedtea-2.6.10
-	tar xf icedtea-2.6.22.tar.xz
-	patch -Np1 -d icedtea-2.6.22 < icedtea-2.6.22-fixed.patch
-	cp icedtea7/2.6.22/* icedtea-2.6.22
-	cd icedtea-2.6.22 && PATH=/build/usr/bin:/build/ant/bin:/opt/jdk/bin:$$PATH JAVA_HOME=/opt/jdk CLASSPATH=.:/usr/share/java ./configure --prefix=/usr --with-jdk-home=/opt/jdk --without-rhino --disable-system-kerberos --disable-system-gtk --disable-system-pcsc --disable-system-sctp
-	$(MAKE) -C icedtea-2.6.22 PATH=/build/usr/bin:/build/ant/bin:/opt/jdk/bin:$$PATH DISABLE_HOTSPOT_OS_VERSION_CHECK=ok
-	cd icedtea-2.6.22 && cp -R openjdk.build/j2sdk-image /opt/icedtea-2.6.22
-	chown -R root:root /opt/icedtea-2.6.22
-	ln -sfv -n icedtea-2.6.22 /opt/jdk
+	tar xf icedtea-2.6.25.tar.xz
+	patch -Np1 -d icedtea-2.6.25 < icedtea-2.6.25-fixed.patch
+	cp icedtea7/2.6.25/* icedtea-2.6.25
+	cd icedtea-2.6.25 && PATH=/build/usr/bin:/build/ant/bin:/opt/jdk/bin:$$PATH JAVA_HOME=/opt/jdk CLASSPATH=.:/usr/share/java ./configure --prefix=/usr --with-jdk-home=/opt/jdk --without-rhino --disable-system-kerberos --disable-system-gtk --disable-system-pcsc --disable-system-sctp --disable-compile-against-syscalls
+	$(MAKE) -C icedtea-2.6.25 PATH=/build/usr/bin:/build/ant/bin:/opt/jdk/bin:$$PATH DISABLE_HOTSPOT_OS_VERSION_CHECK=ok
+	cd icedtea-2.6.25 && cp -R openjdk.build/j2sdk-image /opt/icedtea-2.6.25
+	chown -R root:root /opt/icedtea-2.6.25
+	ln -sfv -n icedtea-2.6.25 /opt/jdk
 	rm -f /opt/jdk/jre/lib/security/cacerts
 	ln -svf /etc/pki/tls/java/cacerts /opt/jdk/jre/lib/security/cacerts
 	rm -rf /opt/icedtea-2.6.10
-	rm -rf icedtea-2.6.22
+	rm -rf icedtea-2.6.25
 	rm /usr/bin/head
 	rm /usr/bin/find
 	rm /bin/touch
@@ -83,19 +83,19 @@ build-8:
 	chmod 600 swap
 	mkswap swap
 	swapon swap
-	tar xf icedtea-3.17.0.tar.xz
-	cp icedtea8/3.17.0/* icedtea-3.17.0
+	tar xf icedtea-3.19.0.tar.xz
+	cp icedtea8/3.19.0/* icedtea-3.19.0
 	if [ `uname -m` = 'armv7l' ] ; then \
-	    cp icedtea8/3.17.0/aarch32.tar.xz icedtea-3.17.0/hotspot.tar.xz ; \
+	    cp icedtea8/3.19.0/aarch32.tar.xz icedtea-3.19.0/hotspot.tar.xz ; \
 	fi
-	cd icedtea-3.17.0 && PATH=/build/ant/bin:/opt/jdk/bin:$$PATH JAVA_HOME=/opt/jdk CLASSPATH=.:/usr/share/java ./configure --prefix=/usr --with-jdk-home=/opt/jdk --disable-system-kerberos --disable-system-pcsc --disable-system-sctp
-	$(MAKE) -C icedtea-3.17.0 PATH=/build/ant/bin:/opt/jdk/bin:$$PATH
-	cd icedtea-3.17.0 && cp -R openjdk.build/images/j2sdk-image /opt/icedtea-3.17.0
-	chown -R root:root /opt/icedtea-3.17.0
-	ln -sfv -n icedtea-3.17.0 /opt/jdk
+	cd icedtea-3.19.0 && PATH=/build/ant/bin:/opt/jdk/bin:$$PATH JAVA_HOME=/opt/jdk CLASSPATH=.:/usr/share/java ./configure --prefix=/usr --with-jdk-home=/opt/jdk --disable-system-kerberos --disable-system-pcsc --disable-system-sctp
+	$(MAKE) -C icedtea-3.19.0 PATH=/build/ant/bin:/opt/jdk/bin:$$PATH
+	cd icedtea-3.19.0 && cp -R openjdk.build/images/j2sdk-image /opt/icedtea-3.19.0
+	chown -R root:root /opt/icedtea-3.19.0
+	ln -sfv -n icedtea-3.19.0 /opt/jdk
 	rm -f /opt/jdk/jre/lib/security/cacerts
 	ln -svf /etc/pki/tls/java/cacerts /opt/jdk/jre/lib/security/cacerts
-	rm -rf /opt/icedtea-2.6.22
-	rm -rf icedtea-3.17.0
+	rm -rf /opt/icedtea-2.6.25
+	rm -rf icedtea-3.19.0
 	swapoff swap
 	rm -rf swap
--- a/icedtea-2.6.10-fixed.patch
+++ b/icedtea-2.6.10-fixed.patch
 diff -uNr icedtea-2.6.10/configure icedtea-2.6.10-fixed/configure
--- icedtea-2.6.10/configure	2017-05-17 03:18:59.353452900 +0000
-+++ icedtea-2.6.10-fixed/configure	2020-06-17 02:05:56.356285436 +0000
+--- icedtea-2.6.10/configure	2017-05-17 12:48:59.353452900 +0930
+++ icedtea-2.6.10-fixed/configure	2023-08-15 13:39:41.588036682 +0930
 @@ -15851,7 +15851,7 @@
 fi
 done
@@ -20,32 +20,32 @@ diff -uNr icedtea-2.6.10/configure icedtea-2.6.10-fixed/configure
 
 done
 diff -uNr icedtea-2.6.10/Makefile.am icedtea-2.6.10-fixed/Makefile.am
--- icedtea-2.6.10/Makefile.am	2017-05-17 03:18:00.046401098 +0000
-+++ icedtea-2.6.10-fixed/Makefile.am	2020-06-17 02:16:18.988412611 +0000
+--- icedtea-2.6.10/Makefile.am	2017-05-17 12:48:00.046401098 +0930
+++ icedtea-2.6.10-fixed/Makefile.am	2023-08-15 13:48:06.572034401 +0930
 @@ -372,7 +372,7 @@
 
 # Patch list
 
 -ICEDTEA_PATCHES = 
-+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/jdk-fixed_xattr.patch patches/sharedRuntime_aarch64-fix.patch
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/glibc-deprecated-sysctl.patch patches/jdk-fixed_xattr.patch patches/sharedRuntime_aarch64-fix.patch
 
 # Conditional patches
 
 diff -uNr icedtea-2.6.10/Makefile.in icedtea-2.6.10-fixed/Makefile.in
--- icedtea-2.6.10/Makefile.in	2017-05-17 03:19:00.769430260 +0000
-+++ icedtea-2.6.10-fixed/Makefile.in	2020-06-17 02:16:11.327926074 +0000
+--- icedtea-2.6.10/Makefile.in	2017-05-17 12:49:00.769430260 +0930
+++ icedtea-2.6.10-fixed/Makefile.in	2023-08-15 13:48:19.695060329 +0930
 @@ -786,7 +786,7 @@
 MIME_TYPE_CHECK_SRCS = $(top_srcdir)/test/standalone/RH1195203.java
 
 # Patch list
 -ICEDTEA_PATCHES = $(am__append_8) $(am__append_9) $(am__append_10) \
-+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/jdk-fixed_xattr.patch patches/sharedRuntime_aarch64-fix.patch $(am__append_8) $(am__append_9) $(am__append_10) \
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/glibc-deprecated-sysctl.patch patches/jdk-fixed_xattr.patch patches/sharedRuntime_aarch64-fix.patch $(am__append_8) $(am__append_9) $(am__append_10) \
 	$(am__append_11) $(am__append_12) $(am__append_13) \
 	$(am__append_14) $(DISTRIBUTION_PATCHES)
 
 diff -uNr icedtea-2.6.10/patches/freetypecheck_fix.patch icedtea-2.6.10-fixed/patches/freetypecheck_fix.patch
--- icedtea-2.6.10/patches/freetypecheck_fix.patch	1970-01-01 00:00:00.000000000 +0000
-+++ icedtea-2.6.10-fixed/patches/freetypecheck_fix.patch	2020-06-17 02:05:56.376290451 +0000
+--- icedtea-2.6.10/patches/freetypecheck_fix.patch	1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.10-fixed/patches/freetypecheck_fix.patch	2023-08-15 13:39:41.589036684 +0930
 @@ -0,0 +1,34 @@
 +diff -uNr openjdk/jdk/make/common/shared/Sanity.gmk openjdk.fixed/jdk/make/common/shared/Sanity.gmk
 +--- openjdk/jdk/make/common/shared/Sanity.gmk	2016-12-30 15:00:21.000000000 +1030
@@ -81,9 +81,35 @@ diff -uNr icedtea-2.6.10/patches/freetypecheck_fix.patch icedtea-2.6.10-fixed/pa
 + 
 + ######################################################
 + # CUPS_HEADERS_PATH must be valid
+diff -uNr icedtea-2.6.10/patches/glibc-deprecated-sysctl.patch icedtea-2.6.10-fixed/patches/glibc-deprecated-sysctl.patch
+--- icedtea-2.6.10/patches/glibc-deprecated-sysctl.patch	1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.10-fixed/patches/glibc-deprecated-sysctl.patch	2023-08-15 13:46:07.440799031 +0930
+@@ -0,0 +1,22 @@
+diff -uNr openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk.fixed/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+--- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2017-05-03 12:20:28.000000000 +0930
++++ openjdk.fixed/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2023-08-15 13:41:22.655236367 +0930
+@@ -41,7 +41,6 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
+ #include <sys/utsname.h>
+ #include <netinet/ip.h>
+ 
+diff -uNr openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk.fixed/jdk/src/solaris/native/java/net/PlainSocketImpl.c
+--- openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c	2017-05-03 12:20:28.000000000 +0930
++++ openjdk.fixed/jdk/src/solaris/native/java/net/PlainSocketImpl.c	2023-08-15 13:41:13.280217844 +0930
+@@ -43,7 +43,6 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
+ #endif
+ 
+ #include "jvm.h"
 diff -uNr icedtea-2.6.10/patches/jdk-fixed_xattr.patch icedtea-2.6.10-fixed/patches/jdk-fixed_xattr.patch
--- icedtea-2.6.10/patches/jdk-fixed_xattr.patch	1970-01-01 00:00:00.000000000 +0000
-+++ icedtea-2.6.10-fixed/patches/jdk-fixed_xattr.patch	2020-06-17 02:05:56.376290451 +0000
+--- icedtea-2.6.10/patches/jdk-fixed_xattr.patch	1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.10-fixed/patches/jdk-fixed_xattr.patch	2023-08-15 13:39:41.589036684 +0930
 @@ -0,0 +1,12 @@
 +diff -uNr openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c openjdk.fixed/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c
 +--- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c	2017-05-03 12:20:28.000000000 +0930
@@ -98,8 +124,8 @@ diff -uNr icedtea-2.6.10/patches/jdk-fixed_xattr.patch icedtea-2.6.10-fixed/patc
 + #include <syscalls_fp.h>
 + #endif
 diff -uNr icedtea-2.6.10/patches/sharedRuntime_aarch64-fix.patch icedtea-2.6.10-fixed/patches/sharedRuntime_aarch64-fix.patch
--- icedtea-2.6.10/patches/sharedRuntime_aarch64-fix.patch	1970-01-01 00:00:00.000000000 +0000
-+++ icedtea-2.6.10-fixed/patches/sharedRuntime_aarch64-fix.patch	2020-06-17 02:14:04.031107828 +0000
+--- icedtea-2.6.10/patches/sharedRuntime_aarch64-fix.patch	1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.10-fixed/patches/sharedRuntime_aarch64-fix.patch	2023-08-15 13:39:41.589036684 +0930
 @@ -0,0 +1,14 @@
 +diff -uNr openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp openjdk.fixed/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
 +--- openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp	2017-05-03 02:50:28.000000000 +0000

--- a/icedtea-2.6.22.tar.xz
+++ b/icedtea-2.6.22.tar.xz
--- a/icedtea-2.6.22-fixed.patch
+++ b/icedtea-2.6.22-fixed.patch
-diff -uNr icedtea-2.6.22/configure icedtea-2.6.22-fixed/configure
--- icedtea-2.6.22/configure	2020-04-17 01:42:24.284978132 +0930
-+++ icedtea-2.6.22-fixed/configure	2021-07-31 11:36:28.218410718 +0930
-@@ -16101,7 +16101,7 @@
+diff -uNr icedtea-2.6.25/configure icedtea-2.6.25-fixed/configure
+--- icedtea-2.6.25/configure	2021-02-12 14:42:53.012788536 +1030
+++ icedtea-2.6.25-fixed/configure	2023-08-16 07:30:55.936652600 +0930
+@@ -16089,7 +16089,7 @@
 fi
 done
 
@@ -10,7 +10,7 @@ diff -uNr icedtea-2.6.22/configure icedtea-2.6.22-fixed/configure
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-@@ -16111,7 +16111,7 @@
+@@ -16099,7 +16099,7 @@
 _ACEOF
 
 else
@@ -19,34 +19,34 @@ diff -uNr icedtea-2.6.22/configure icedtea-2.6.22-fixed/configure
 fi
 
 done
-diff -uNr icedtea-2.6.22/Makefile.am icedtea-2.6.22-fixed/Makefile.am
--- icedtea-2.6.22/Makefile.am	2020-04-17 01:42:10.921181620 +0930
-+++ icedtea-2.6.22-fixed/Makefile.am	2021-07-31 11:37:40.953644159 +0930
+diff -uNr icedtea-2.6.25/Makefile.am icedtea-2.6.25-fixed/Makefile.am
+--- icedtea-2.6.25/Makefile.am	2021-02-12 14:41:14.067670731 +1030
+++ icedtea-2.6.25-fixed/Makefile.am	2023-08-16 07:33:48.741208740 +0930
 @@ -369,7 +369,7 @@
 
 # Patch list
 
 -ICEDTEA_PATCHES =
-+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/jdk-fixed_xattr.patch patches/sharedRuntime_aarch64-fix.patch
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/glibc-deprecated-sysctl.patch patches/jdk-fixed_xattr.patch
 
 # Conditional patches
 
-diff -uNr icedtea-2.6.22/Makefile.in icedtea-2.6.22-fixed/Makefile.in
--- icedtea-2.6.22/Makefile.in	2020-04-17 01:42:25.536959068 +0930
-+++ icedtea-2.6.22-fixed/Makefile.in	2021-07-31 11:39:02.585906155 +0930
-@@ -789,7 +789,8 @@
+diff -uNr icedtea-2.6.25/Makefile.in icedtea-2.6.25-fixed/Makefile.in
+--- icedtea-2.6.25/Makefile.in	2021-02-12 14:42:54.507805425 +1030
+++ icedtea-2.6.25-fixed/Makefile.in	2023-08-16 07:34:04.917260802 +0930
+@@ -788,7 +788,8 @@
 MIME_TYPE_CHECK_SRCS = $(top_srcdir)/test/standalone/RH1195203.java
 
 # Patch list
 -ICEDTEA_PATCHES = $(am__append_8) $(am__append_9) $(am__append_10) \
-+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/jdk-fixed_xattr.patch patches/sharedRuntime_aarch64-fix.patch \
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/glibc-deprecated-sysctl.patch patches/jdk-fixed_xattr.patch \
 +	$(am__append_8) $(am__append_9) $(am__append_10) \
 	$(am__append_11) $(am__append_12) $(am__append_13) \
 	$(DISTRIBUTION_PATCHES)
 
-diff -uNr icedtea-2.6.22/patches/freetypecheck_fix.patch icedtea-2.6.22-fixed/patches/freetypecheck_fix.patch
--- icedtea-2.6.22/patches/freetypecheck_fix.patch	1970-01-01 09:30:00.000000000 +0930
-+++ icedtea-2.6.22-fixed/patches/freetypecheck_fix.patch	2021-07-31 11:36:28.219410721 +0930
+diff -uNr icedtea-2.6.25/patches/freetypecheck_fix.patch icedtea-2.6.25-fixed/patches/freetypecheck_fix.patch
+--- icedtea-2.6.25/patches/freetypecheck_fix.patch	1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.25-fixed/patches/freetypecheck_fix.patch	2023-08-16 07:30:55.937652603 +0930
 @@ -0,0 +1,34 @@
 +diff -uNr openjdk/jdk/make/common/shared/Sanity.gmk openjdk.fixed/jdk/make/common/shared/Sanity.gmk
 +--- openjdk/jdk/make/common/shared/Sanity.gmk	2016-12-30 15:00:21.000000000 +1030
@@ -82,9 +82,35 @@ diff -uNr icedtea-2.6.22/patches/freetypecheck_fix.patch icedtea-2.6.22-fixed/pa
 + 
 + ######################################################
 + # CUPS_HEADERS_PATH must be valid
-diff -uNr icedtea-2.6.22/patches/jdk-fixed_xattr.patch icedtea-2.6.22-fixed/patches/jdk-fixed_xattr.patch
--- icedtea-2.6.22/patches/jdk-fixed_xattr.patch	1970-01-01 09:30:00.000000000 +0930
-+++ icedtea-2.6.22-fixed/patches/jdk-fixed_xattr.patch	2021-07-31 11:36:28.219410721 +0930
+diff -uNr icedtea-2.6.25/patches/glibc-deprecated-sysctl.patch icedtea-2.6.25-fixed/patches/glibc-deprecated-sysctl.patch
+--- icedtea-2.6.25/patches/glibc-deprecated-sysctl.patch	1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.25-fixed/patches/glibc-deprecated-sysctl.patch	2023-08-16 07:30:55.938652606 +0930
+@@ -0,0 +1,22 @@
+diff -uNr openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk.fixed/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+--- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2021-02-10 16:22:36.000000000 +1030
++++ openjdk.fixed/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2023-08-15 19:05:58.137534523 +0930
+@@ -41,7 +41,6 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
+ #include <sys/utsname.h>
+ #include <netinet/ip.h>
+ 
+diff -uNr openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk.fixed/jdk/src/solaris/native/java/net/PlainSocketImpl.c
+--- openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c	2021-02-10 16:22:36.000000000 +1030
++++ openjdk.fixed/jdk/src/solaris/native/java/net/PlainSocketImpl.c	2023-08-15 19:05:53.008523739 +0930
+@@ -43,7 +43,6 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
+ #endif
+ 
+ #include "jvm.h"
+diff -uNr icedtea-2.6.25/patches/jdk-fixed_xattr.patch icedtea-2.6.25-fixed/patches/jdk-fixed_xattr.patch
+--- icedtea-2.6.25/patches/jdk-fixed_xattr.patch	1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.25-fixed/patches/jdk-fixed_xattr.patch	2023-08-16 07:30:55.938652606 +0930
 @@ -0,0 +1,12 @@
 +diff -uNr openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c openjdk.fixed/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c
 +--- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c	2017-05-03 12:20:28.000000000 +0930
@@ -98,21 +124,3 @@ diff -uNr icedtea-2.6.22/patches/jdk-fixed_xattr.patch icedtea-2.6.22-fixed/patc
 + #else
 + #include <syscalls_fp.h>
 + #endif
-diff -uNr icedtea-2.6.22/patches/sharedRuntime_aarch64-fix.patch icedtea-2.6.22-fixed/patches/sharedRuntime_aarch64-fix.patch
--- icedtea-2.6.22/patches/sharedRuntime_aarch64-fix.patch	1970-01-01 09:30:00.000000000 +0930
-+++ icedtea-2.6.22-fixed/patches/sharedRuntime_aarch64-fix.patch	2021-07-31 11:36:28.219410721 +0930
-@@ -0,0 +1,14 @@
-+diff -uNr openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp openjdk.fixed/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
-+--- openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp	2019-10-14 18:21:39.000000000 +0000
-++++ openjdk.fixed/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp	2020-06-17 11:41:45.690625648 +0000
-+@@ -194,10 +194,6 @@
-+   return (r->reg2stack() + SharedRuntime::out_preserve_stack_slots()) * VMRegImpl::stack_slot_size;
-+ }
-+ 
-+-template <class T> static const T& min (const T& a, const T& b) {
-+-  return (a > b) ? b : a;
-+-}
-+-
-+ // ---------------------------------------------------------------------------
-+ // Read the array of BasicTypes from a signature, and compute where the
-+ // arguments should go.  Values in the VMRegPair regs array refer to 4-byte
--- a/icedtea-2.6.25.tar.xz
+++ b/icedtea-2.6.25.tar.xz
--- a/icedtea-3.17.0.tar.xz
+++ b/icedtea-3.17.0.tar.xz
--- a/icedtea-3.19.0.tar.xz
+++ b/icedtea-3.19.0.tar.xz
--- a/icedtea6-1.13.13-fixed.patch
+++ b/icedtea6-1.13.13-fixed.patch
 diff -uNr icedtea6-1.13.13/Makefile.am icedtea6-1.13.13-fixed/Makefile.am
 --- icedtea6-1.13.13/Makefile.am	2017-01-05 06:52:49.112782727 +1030
-+++ icedtea6-1.13.13-fixed/Makefile.am	2020-06-15 10:11:57.746344995 +0930
-@@ -345,6 +345,7 @@
+++ icedtea6-1.13.13-fixed/Makefile.am	2023-08-14 16:08:43.842667889 +0930
+@@ -345,6 +345,8 @@
 	patches/nomotif-6706121.patch \
 	patches/nomotif.patch \
 	patches/nomotif-mtoolkit.patch \
 +	patches/freetypecheck_fix.patch \
+	patches/glibc-deprecated-sysctl.patch \
 	patches/alt-jar.patch \
 	patches/jdk-use-ssize_t.patch \
 	patches/arch.patch \
-@@ -621,7 +622,8 @@
+@@ -621,7 +623,8 @@
 	patches/openjdk/6260348-pr3068.patch \
 	patches/openjdk/6961123-pr2975.patch \
 	patches/pr2800-missing_resources.patch \
@@ -21,16 +22,17 @@ diff -uNr icedtea6-1.13.13/Makefile.am icedtea6-1.13.13-fixed/Makefile.am
 ICEDTEA_PATCHES += \
 diff -uNr icedtea6-1.13.13/Makefile.in icedtea6-1.13.13-fixed/Makefile.in
 --- icedtea6-1.13.13/Makefile.in	2017-01-05 06:53:00.576597287 +1030
-+++ icedtea6-1.13.13-fixed/Makefile.in	2020-06-15 10:12:40.606483604 +0930
-@@ -793,6 +793,7 @@
+++ icedtea6-1.13.13-fixed/Makefile.in	2023-08-14 16:09:03.778735026 +0930
+@@ -793,6 +793,8 @@
 	patches/gcc-suffix.patch patches/libraries-splashscreen.patch \
 	patches/uname.patch patches/nomotif-6706121.patch \
 	patches/nomotif.patch patches/nomotif-mtoolkit.patch \
 +	patches/freetypecheck_fix.patch \
+	patches/glibc-deprecated-sysctl.patch \
 	patches/alt-jar.patch patches/jdk-use-ssize_t.patch \
 	patches/arch.patch patches/lc_ctype.patch patches/xjc.patch \
 	patches/linker-libs-order.patch patches/testenv.patch \
-@@ -1049,7 +1050,8 @@
+@@ -1049,7 +1051,8 @@
 	patches/openjdk/6260348-pr3068.patch \
 	patches/openjdk/6961123-pr2975.patch \
 	patches/pr2800-missing_resources.patch \
@@ -42,7 +44,7 @@ diff -uNr icedtea6-1.13.13/Makefile.in icedtea6-1.13.13-fixed/Makefile.in
 	$(am__append_28) $(am__append_29) $(am__append_30) \
 diff -uNr icedtea6-1.13.13/patches/freetypecheck_fix.patch icedtea6-1.13.13-fixed/patches/freetypecheck_fix.patch
 --- icedtea6-1.13.13/patches/freetypecheck_fix.patch	1970-01-01 09:30:00.000000000 +0930
-+++ icedtea6-1.13.13-fixed/patches/freetypecheck_fix.patch	2020-06-15 10:09:28.347861864 +0930
+++ icedtea6-1.13.13-fixed/patches/freetypecheck_fix.patch	2023-08-14 16:00:28.138998474 +0930
 @@ -0,0 +1,34 @@
 +diff -uNr openjdk/jdk/make/common/shared/Sanity.gmk openjdk.fixed/jdk/make/common/shared/Sanity.gmk
 +--- openjdk/jdk/make/common/shared/Sanity.gmk	2016-12-30 15:00:21.000000000 +1030
@@ -78,9 +80,35 @@ diff -uNr icedtea6-1.13.13/patches/freetypecheck_fix.patch icedtea6-1.13.13-fixe
 + 
 + ######################################################
 + # CUPS_HEADERS_PATH must be valid
+diff -uNr icedtea6-1.13.13/patches/glibc-deprecated-sysctl.patch icedtea6-1.13.13-fixed/patches/glibc-deprecated-sysctl.patch
+--- icedtea6-1.13.13/patches/glibc-deprecated-sysctl.patch	1970-01-01 09:30:00.000000000 +0930
+++ icedtea6-1.13.13-fixed/patches/glibc-deprecated-sysctl.patch	2023-08-14 16:04:59.209911381 +0930
+@@ -0,0 +1,22 @@
+diff -uNr openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk.fixed/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+--- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2016-12-30 15:00:19.000000000 +1030
++++ openjdk.fixed/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2023-08-14 16:04:01.632717474 +0930
+@@ -35,7 +35,6 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
+ #include <sys/utsname.h>
+ #include <netinet/ip.h>
+ 
+diff -uNr openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk.fixed/jdk/src/solaris/native/java/net/PlainSocketImpl.c
+--- openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c	2016-12-30 15:00:19.000000000 +1030
++++ openjdk.fixed/jdk/src/solaris/native/java/net/PlainSocketImpl.c	2023-08-14 16:03:54.631693898 +0930
+@@ -43,7 +43,6 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
+ #endif
+ 
+ #include "jvm.h"
 diff -uNr icedtea6-1.13.13/patches/linux_fork_fix.patch icedtea6-1.13.13-fixed/patches/linux_fork_fix.patch
 --- icedtea6-1.13.13/patches/linux_fork_fix.patch	1970-01-01 09:30:00.000000000 +0930
-+++ icedtea6-1.13.13-fixed/patches/linux_fork_fix.patch	2020-06-15 09:59:58.773019937 +0930
+++ icedtea6-1.13.13-fixed/patches/linux_fork_fix.patch	2023-08-14 16:00:28.138998474 +0930
 @@ -0,0 +1,50 @@
 +diff -uNr openjdk/hotspot/src/os/linux/vm/os_linux.cpp openjdk-linux_fork_fix/hotspot/src/os/linux/vm/os_linux.cpp
 +--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2016-12-30 15:01:06.000000000 +1030

--- a/icedtea7/2.6.22/corba.tar.bz2
+++ b/icedtea7/2.6.22/corba.tar.bz2
--- a/icedtea7/2.6.22/jaxp.tar.bz2
+++ b/icedtea7/2.6.22/jaxp.tar.bz2
--- a/icedtea7/2.6.22/jaxws.tar.bz2
+++ b/icedtea7/2.6.22/jaxws.tar.bz2
--- a/icedtea7/2.6.22/langtools.tar.bz2
+++ b/icedtea7/2.6.22/langtools.tar.bz2
--- a/icedtea7/2.6.22/openjdk.tar.bz2
+++ b/icedtea7/2.6.22/openjdk.tar.bz2
--- a/icedtea7/2.6.25/corba.tar.bz2
+++ b/icedtea7/2.6.25/corba.tar.bz2
--- a/icedtea7/2.6.22/hotspot.tar.bz2
+++ b/icedtea7/2.6.22/hotspot.tar.bz2
--- a/icedtea7/2.6.25/jaxp.tar.bz2
+++ b/icedtea7/2.6.25/jaxp.tar.bz2
--- a/icedtea7/2.6.25/jaxws.tar.bz2
+++ b/icedtea7/2.6.25/jaxws.tar.bz2
--- a/icedtea7/2.6.22/jdk.tar.bz2
+++ b/icedtea7/2.6.22/jdk.tar.bz2
--- a/icedtea7/2.6.25/langtools.tar.bz2
+++ b/icedtea7/2.6.25/langtools.tar.bz2
--- a/icedtea7/2.6.25/openjdk.tar.bz2
+++ b/icedtea7/2.6.25/openjdk.tar.bz2
--- a/icedtea8/3.17.0/corba.tar.xz
+++ b/icedtea8/3.17.0/corba.tar.xz
--- a/icedtea8/3.17.0/jaxp.tar.xz
+++ b/icedtea8/3.17.0/jaxp.tar.xz
--- a/icedtea8/3.17.0/jaxws.tar.xz
+++ b/icedtea8/3.17.0/jaxws.tar.xz
--- a/icedtea8/3.17.0/langtools.tar.xz
+++ b/icedtea8/3.17.0/langtools.tar.xz
--- a/icedtea8/3.17.0/openjdk.tar.xz
+++ b/icedtea8/3.17.0/openjdk.tar.xz
--- a/icedtea8/3.17.0/hotspot.tar.xz
+++ b/icedtea8/3.17.0/hotspot.tar.xz
--- a/icedtea8/3.19.0/corba.tar.xz
+++ b/icedtea8/3.19.0/corba.tar.xz
--- a/icedtea8/3.17.0/aarch32.tar.xz
+++ b/icedtea8/3.17.0/aarch32.tar.xz
--- a/icedtea8/3.19.0/jaxp.tar.xz
+++ b/icedtea8/3.19.0/jaxp.tar.xz
--- a/icedtea8/3.19.0/jaxws.tar.xz
+++ b/icedtea8/3.19.0/jaxws.tar.xz
--- a/icedtea8/3.17.0/jdk.tar.xz
+++ b/icedtea8/3.17.0/jdk.tar.xz
--- a/icedtea8/3.19.0/langtools.tar.xz
+++ b/icedtea8/3.19.0/langtools.tar.xz
--- a/icedtea8/3.17.0/nashorn.tar.xz
+++ b/icedtea8/3.17.0/nashorn.tar.xz
--- a/icedtea8/3.19.0/openjdk.tar.xz
+++ b/icedtea8/3.19.0/openjdk.tar.xz
--- a/icedtea8/3.17.0/shenandoah.tar.xz
+++ b/icedtea8/3.17.0/shenandoah.tar.xz