From 53475a55c5a50c5ed710f481a7beaa233cd0efd8 Mon Sep 17 00:00:00 2001
From: Tim Biermann <tbier@posteo.de>
Date: Sun, 3 Nov 2024 21:40:11 +0100
Subject: [PATCH] openjdk17-jdk: 17.0.8+6 -> 17.0.14+1

---
 openjdk17-jdk/.signature                 |  9 ++++----
 openjdk17-jdk/Pkgfile                    | 29 ++++++++++++++----------
 openjdk17-jdk/system-public-suffix.patch | 16 +++++++++++++
 3 files changed, 38 insertions(+), 16 deletions(-)
 create mode 100644 openjdk17-jdk/system-public-suffix.patch

diff --git a/openjdk17-jdk/.signature b/openjdk17-jdk/.signature
index 66a1f0528..9c8e3a1a8 100644
--- a/openjdk17-jdk/.signature
+++ b/openjdk17-jdk/.signature
@@ -1,7 +1,8 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF37dZqZ6AmTq6G/Ejw1TOsfqR87Z21f3sn8nGhAEcst9qVhFqMcSTXuHvMPSXqSPngX8e8ZE4ep+o8rs1WLQBzwc=
-SHA256 (Pkgfile) = 22042d4878148767b3f5f9092b5523e8c17ace0a3bde448645b7fa12e7c6777b
+RWSagIOpLGJF36UYWF+EkwPmCtPrboTEhnsznBYQ7Nx03PI44cT7edSHO85Rsa+v84kQs1lnPEEn8IZ1vFvN0C58zPvlJwTD6gs=
+SHA256 (Pkgfile) = 13406c5f25e879198df4a9bd78475f2cc498347d5c5c6aa29675385be4c7ca53
 SHA256 (.footprint) = aecdd813ca338c3f6e650f1a1b4b54a785e437d251b91b82beb49361d7208373
-SHA256 (openjdk17-jdk-17.0.8+6.tar.gz) = ce6e1b61c70cc9d7f3c4c27bda1fa9c21d5a54f5cdb98512c30425703dee9ce4
-SHA256 (openjdk17-boot-20230715.tar.xz) = 0675c30b8f1248edfe33b1239932faafd94e174187bc4d0c97e973bf0484201a
+SHA256 (jdk-17.0.14+1.tar.gz) = 16adebb35c00d54f1660f326f6006dbc2fb098071fd22a3604c89830733f2c52
+SHA256 (openjdk16-boot-16.0.2+7-20241103.tar.xz) = 19525e7458f5858d76bc1d416c72fe3ce2de867089eac304221d9379734ff8d2
 SHA256 (java_cacerts-20210916) = 983d71ae2fa404f102fbb7a02e48a56a96459f0d7473026daceef1219045f9de
+SHA256 (system-public-suffix.patch) = 8e09bd5d4df78080f1ea7f23e98e4aa6d639eab04d4357c70681b888055e43dd
diff --git a/openjdk17-jdk/Pkgfile b/openjdk17-jdk/Pkgfile
index 40bcdc3de..648e2e2df 100644
--- a/openjdk17-jdk/Pkgfile
+++ b/openjdk17-jdk/Pkgfile
@@ -4,30 +4,35 @@
 # Depends on: alsa-lib cups giflib harfbuzz lcms2 libxslt nss unzip xorg-libxrandr xorg-libxt xorg-libxtst zip
 
 name=openjdk17-jdk
-version=17.0.8+6
-_boot_ver=20230715
+version=17.0.14+1
+_boot_ver=16.0.2+7
+_boot_date=20241103
 _cert_ver=20210916
 release=1
-source=(https://github.com/openjdk/jdk17u/archive/jdk-$version/$name-$version.tar.gz
-  https://git.crux.nu/tb/java-distfiles/raw/branch/master/distfiles/openjdk17-boot-${_boot_ver}.tar.xz
-  https://git.crux.nu/tb/java-distfiles/raw/branch/master/distfiles/java_cacerts-${_cert_ver})
+source=(https://github.com/openjdk/jdk17u/archive/jdk-$version/jdk-$version.tar.gz
+  https://git.crux.nu/tb/java-distfiles/src/branch/master/distfiles/openjdk${_boot_ver::2}-boot-${_boot_ver}-${_boot_date}.tar.xz
+  https://git.crux.nu/tb/java-distfiles/raw/branch/master/distfiles/java_cacerts-${_cert_ver}
+  system-public-suffix.patch
+)
 
 build() {
-  if [ -e '/usr/bin/ccache' ]; then
-    PATH=$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')
+  if command -v ccache >/dev/null 2>&1; then
+    export PATH=$(echo $PATH | tr ':' '\n' | grep -E '/(s?bin)$' | tr '\n' ':')
     PKGMK_JDK17+=' --enable-ccache'
   fi
 
+  patch -p1 -d $SRC/jdk${version::2}u-jdk-${version/+/-} -i $SRC/system-public-suffix.patch
+
   OLD_PATH=$PATH
-  export JAVA_HOME=$SRC/openjdk17-boot
+  export JAVA_HOME=$SRC/openjdk${_boot_ver::2}-boot
   export PATH=$JAVA_HOME/bin:$OLD_PATH
 
+  export EXTRA_CPP_FLAGS="$CXXFLAGS -fcommon"
+  export EXTRA_CFLAGS="$CFLAGS -fcommon"
   unset CFLAGS
   unset CXXFLAGS
   unset LDFLAGS
   unset MAKEFLAGS
-  export _CFLAGS+=' -fcommon'
-  export _CXXFLAGS+=' -fcommon'
 
   [ -z $JOBS ] && JOBS=$(nproc)
 
@@ -59,8 +64,8 @@ build() {
     --with-lcms=system \
     --with-freetype=system \
     --with-harfbuzz=system \
-    --with-extra-cflags="$_CFLAGS" \
-    --with-extra-cxxflags="$_CXXFLAGS"
+    --with-extra-cflags="$EXTRA_CFLAGS" \
+    --with-extra-cxxflags="$EXTRA_CPP_FLAGS"
 
   # NOTE: for debugging build issues: set LOG to debug, JOBS to 1.
   LC_ALL=C \
diff --git a/openjdk17-jdk/system-public-suffix.patch b/openjdk17-jdk/system-public-suffix.patch
new file mode 100644
index 000000000..c278e7709
--- /dev/null
+++ b/openjdk17-jdk/system-public-suffix.patch
@@ -0,0 +1,16 @@
+--- a/src/java.base/share/classes/sun/security/util/DomainName.java
++++ b/src/java.base/share/classes/sun/security/util/DomainName.java
+@@ -206,8 +206,11 @@ class DomainName {
+                 new PrivilegedAction<>() {
+                     @Override
+                     public InputStream run() {
+-                        File f = new File(System.getProperty("java.home"),
+-                            "lib/security/public_suffix_list.dat");
++                        File f = new File("/usr/share/publicsuffix/public_suffix_list.dat");
++                        if (!f.exists()) {
++                            f = new File(System.getProperty("java.home"),
++                                "lib/security/public_suffix_list.dat");
++                        }
+                         try {
+                             return new FileInputStream(f);
+                         } catch (FileNotFoundException e) {