git » java-openjdk.git » commit cefe97e

diff --git a/.SRCINFO b/.SRCINFO
index d0ac79a..d234421 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = java-openjdk
 	pkgver = 25.0.1.u8
-	pkgrel = 1
+	pkgrel = 3
 	url = https://openjdk.java.net/
 	arch = x86_64
 	arch = aarch64
@@ -76,13 +76,13 @@ pkgname = jdk-openjdk
 	optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
 	provides = java-environment=25
 	provides = java-environment-openjdk=25
-	provides = jdk25-openjdk=25.0.1.u8-1
+	provides = jdk25-openjdk=25.0.1.u8-3
 	provides = java-runtime=25
 	provides = java-runtime-openjdk=25
-	provides = jre25-openjdk=25.0.1.u8-1
+	provides = jre25-openjdk=25.0.1.u8-3
 	provides = java-runtime-headless=25
 	provides = java-runtime-headless-openjdk=25
-	provides = jre25-openjdk-headless=25.0.1.u8-1
+	provides = jre25-openjdk-headless=25.0.1.u8-3
 	conflicts = jre-openjdk
 	conflicts = jre-openjdk-headless
 	backup = etc/java-openjdk/logging.properties
@@ -123,10 +123,10 @@ pkgname = jre-openjdk
 	optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
 	provides = java-runtime=25
 	provides = java-runtime-openjdk=25
-	provides = jre25-openjdk=25.0.1.u8-1
+	provides = jre25-openjdk=25.0.1.u8-3
 	provides = java-runtime-headless=25
 	provides = java-runtime-headless-openjdk=25
-	provides = jre25-openjdk-headless=25.0.1.u8-1
+	provides = jre25-openjdk-headless=25.0.1.u8-3
 	conflicts = jdk-openjdk
 	conflicts = jre-openjdk-headless
 	backup = etc/java-openjdk/logging.properties
@@ -163,7 +163,7 @@ pkgname = jre-openjdk-headless
 	optdepends = java-rhino: for some JavaScript support
 	provides = java-runtime-headless=25
 	provides = java-runtime-headless-openjdk=25
-	provides = jre25-openjdk-headless=25.0.1.u8-1
+	provides = jre25-openjdk-headless=25.0.1.u8-3
 	conflicts = jdk-openjdk
 	conflicts = jre-openjdk
 	backup = etc/java-openjdk/logging.properties
@@ -183,5 +183,5 @@ pkgname = jre-openjdk-headless
 
 pkgname = openjdk-src
 	pkgdesc = OpenJDK Java 25 sources
-	depends = jdk25-openjdk=25.0.1.u8-1
-	provides = openjdk25-src=25.0.1.u8-1
+	depends = jdk25-openjdk=25.0.1.u8-3
+	provides = openjdk25-src=25.0.1.u8-3
diff --git a/PKGBUILD b/PKGBUILD
index 1a27b49..da392e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -35,7 +35,7 @@ _securityver=1
 _updatever=8
 pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
 # pkgver=${_majorver}.u${_updatever}
-pkgrel=1
+pkgrel=3
 _git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
 # _git_tag=jdk-${_majorver}+${_updatever}
 arch=('x86_64' 'aarch64' 'armv7h')
@@ -259,9 +259,9 @@ package_jre-openjdk-headless() {
   done
   ln -s /usr/share/man "${pkgdir}/${_jvmdir}/man"
 
-  # Link JKS keystore from ca-certificates-utils
+  # Link JKS keystore from make-ca
   rm -f "${pkgdir}${_jvmdir}/lib/security/cacerts"
-  ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/lib/security/cacerts"
+  ln -sf /etc/pki/tls/java/cacerts "${pkgdir}${_jvmdir}/lib/security/cacerts"
 }
 
 package_jre-openjdk() {
@@ -338,7 +338,7 @@ package_jre-openjdk() {
 
   # Link JKS keystore from ca-certificates-utils
   rm -f "${pkgdir}${_jvmdir}/lib/security/cacerts"
-  ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/lib/security/cacerts"
+  ln -sf /etc/pki/tls/java/cacerts "${pkgdir}${_jvmdir}/lib/security/cacerts"
 
   # Desktop files
   for f in java; do
@@ -437,7 +437,7 @@ package_jdk-openjdk() {
 
   # Link JKS keystore from ca-certificates-utils
   rm -f "${pkgdir}${_jvmdir}/lib/security/cacerts"
-  ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/lib/security/cacerts"
+  ln -sf /etc/pki/tls/java/cacerts "${pkgdir}${_jvmdir}/lib/security/cacerts"
 
   # Icons
   for s in 16 24 32 48; do
diff --git a/pre-build-special.sh b/pre-build-special.sh
index 78991b2..ea410cd 100755
--- a/pre-build-special.sh
+++ b/pre-build-special.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-su -c "pacman -Udd --noconfirm /sources/archives/base/java-openjdk/bootstrap/$CARCH/*.pkg.tar.xz"
+su -c "pacman -S --noconfirm java-environment" || su -c "pacman -Udd --noconfirm /sources/archives/base/java-openjdk/bootstrap/$CARCH/*.pkg.tar.xz"