From 691cab34d782921f812d2d3f3eed4951a271cf23 Mon Sep 17 00:00:00 2001
From: Mathias-Boulay <mathiasboulay@free.fr>
Date: Sat, 27 Jul 2024 19:53:24 +0200
Subject: [PATCH] Workaround: skip check for ipv6 support (by @nexplorer-3e)

The commit is made instead of PR merge because the PR has a weird file in it
---
 .../android/26_skip_proc_net6_check.diff      | 21 +++++++++++++++++++
 .../android/26_skip_proc_net6_check.diff      | 21 +++++++++++++++++++
 patches/jre_21/android/jdk21u_android.diff    | 20 ++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 patches/jre_17/android/26_skip_proc_net6_check.diff
 create mode 100644 patches/jre_21/android/26_skip_proc_net6_check.diff

diff --git a/patches/jre_17/android/26_skip_proc_net6_check.diff b/patches/jre_17/android/26_skip_proc_net6_check.diff
new file mode 100644
index 0000000..9915109
--- /dev/null
+++ b/patches/jre_17/android/26_skip_proc_net6_check.diff
@@ -0,0 +1,21 @@
+// skip some checks as AOSP does
+diff --git a/src/java.base/unix/native/libnet/net_util_md.c b/src/java.base/unix/native/libnet/net_util_md.c
+index 4ec11a136..01b85db4d 100644
+--- a/src/java.base/unix/native/libnet/net_util_md.c
++++ b/src/java.base/unix/native/libnet/net_util_md.c
+@@ -129,6 +129,7 @@ jint  IPv6_supported()
+     SOCKETADDRESS sa;
+     socklen_t sa_len = sizeof(SOCKETADDRESS);
+ 
++#ifndef __ANDROID__  // ANDROID: skip check, see libcore commit ae218d9b
+     fd = socket(AF_INET6, SOCK_STREAM, 0) ;
+     if (fd < 0) {
+         /*
+@@ -172,6 +173,7 @@ jint  IPv6_supported()
+         }
+     }
+ #endif
++#endif  // !defined __ANDROID__
+ 
+     /*
+      *  OK we may have the stack available in the kernel,
diff --git a/patches/jre_21/android/26_skip_proc_net6_check.diff b/patches/jre_21/android/26_skip_proc_net6_check.diff
new file mode 100644
index 0000000..9915109
--- /dev/null
+++ b/patches/jre_21/android/26_skip_proc_net6_check.diff
@@ -0,0 +1,21 @@
+// skip some checks as AOSP does
+diff --git a/src/java.base/unix/native/libnet/net_util_md.c b/src/java.base/unix/native/libnet/net_util_md.c
+index 4ec11a136..01b85db4d 100644
+--- a/src/java.base/unix/native/libnet/net_util_md.c
++++ b/src/java.base/unix/native/libnet/net_util_md.c
+@@ -129,6 +129,7 @@ jint  IPv6_supported()
+     SOCKETADDRESS sa;
+     socklen_t sa_len = sizeof(SOCKETADDRESS);
+ 
++#ifndef __ANDROID__  // ANDROID: skip check, see libcore commit ae218d9b
+     fd = socket(AF_INET6, SOCK_STREAM, 0) ;
+     if (fd < 0) {
+         /*
+@@ -172,6 +173,7 @@ jint  IPv6_supported()
+         }
+     }
+ #endif
++#endif  // !defined __ANDROID__
+ 
+     /*
+      *  OK we may have the stack available in the kernel,
diff --git a/patches/jre_21/android/jdk21u_android.diff b/patches/jre_21/android/jdk21u_android.diff
index 5eeac6b..6dfd3be 100644
--- a/patches/jre_21/android/jdk21u_android.diff
+++ b/patches/jre_21/android/jdk21u_android.diff
@@ -2258,6 +2258,26 @@ index 21ef40688..b8c2520d2 100644
  #endif
  
      if (exec_path == NULL) {
+diff --git a/src/java.base/unix/native/libnet/net_util_md.c b/src/java.base/unix/native/libnet/net_util_md.c
+index 4ec11a136..01b85db4d 100644
+--- a/src/java.base/unix/native/libnet/net_util_md.c
++++ b/src/java.base/unix/native/libnet/net_util_md.c
+@@ -129,6 +129,7 @@ jint  IPv6_supported()
+     SOCKETADDRESS sa;
+     socklen_t sa_len = sizeof(SOCKETADDRESS);
+
++#ifndef __ANDROID__  // ANDROID: skip check, see libcore commit ae218d9b
+     fd = socket(AF_INET6, SOCK_STREAM, 0) ;
+     if (fd < 0) {
+         /*
+@@ -172,6 +173,7 @@ jint  IPv6_supported()
+         }
+     }
+ #endif
++#endif  // !defined __ANDROID__
+
+     /*
+      *  OK we may have the stack available in the kernel,
 diff --git a/src/java.base/unix/native/libnet/net_util_md.h b/src/java.base/unix/native/libnet/net_util_md.h
 index 902cf9673..3b8acd66b 100644
 --- a/src/java.base/unix/native/libnet/net_util_md.h