uppkg -> 21.u35-2

.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = java-openjdk-xdg
-	pkgver = 20.0.2.u9
-	pkgrel = 1
+	pkgver = 21.u35
+	pkgrel = 2
 	url = https://openjdk.java.net/
 	arch = x86_64
 	license = custom
@@ -40,21 +40,21 @@ pkgbase = java-openjdk-xdg
 	conflicts = openjdk-src
 	conflicts = openjdk-doc
 	options = !lto
-	source = https://github.com/openjdk/jdk20u/archive/jdk-20.0.2+9.tar.gz
+	source = https://github.com/openjdk/jdk21u/archive/jdk-21+35.tar.gz
 	source = freedesktop-java.desktop
 	source = freedesktop-jconsole.desktop
 	source = freedesktop-jshell.desktop
 	source = xdg-basedir-compliant-fontconfig.patch
 	source = xdg-basedir-compliant-userPrefs.patch
-	sha256sums = 4d6f176075d5f2ce62fd16ebd5cc4c27a3e551ce4d3d3bc0e9946454e52fc88d
-	sha256sums = 761d4f1274c7dfb4ff61f6d6cb01504f2f886240229e371647ce227fcf81278e
-	sha256sums = 2b17178ac414e1d0768c8f482779efa88bfeab17b8b0517df4e66b3c2874131c
-	sha256sums = 82329d23887df14bce3f8d8f356fe8f4b643831d40ade5fed31a070516f86fd7
+	sha256sums = b798ebc2e899a98edf2be99e786bb0fbad144e2270925dffe624fbe052f07ade
+	sha256sums = 72111743ab6ab36854b0c85a504172983715d0798fce10bc4e35689b7d15fd93
+	sha256sums = 8ecdf5c1605bafa58b3f7da615e6d8d3d943e3a2d3831930d6efa7815aacce07
+	sha256sums = 50fc0d677489b73d549df2f08d759d5f057f200adbbab83ea5e87456152ee03e
 	sha256sums = 25860396475759236e0edf66711b842143b0ddee47eed61e080da158bbc58ce9
 	sha256sums = 48f9e40c4ae8eb79d17fb676893a89b95ac43616827725a9d10de2b1f357642c
 
 pkgname = jre-openjdk-headless-xdg
-	pkgdesc = OpenJDK Java 20 headless runtime environment - with improved Support for the XDG Base Directory Specification
+	pkgdesc = OpenJDK Java 21 headless runtime environment - with improved Support for the XDG Base Directory Specification
 	install = install_jre-openjdk-headless.sh
 	depends = java-runtime-common>=3
 	depends = ca-certificates-utils
@@ -71,9 +71,9 @@ pkgname = jre-openjdk-headless-xdg
 	depends = glibc
 	depends = gcc-libs
 	optdepends = java-rhino: for some JavaScript support
-	provides = java-runtime-headless=20
-	provides = java-runtime-headless-openjdk=20
-	provides = jre20-openjdk-headless=20.0.2.u9-1
+	provides = java-runtime-headless=21
+	provides = java-runtime-headless-openjdk=21
+	provides = jre21-openjdk-headless=21.u35-2
 	backup = etc/java-openjdk-xdg/logging.properties
 	backup = etc/java-openjdk-xdg/management/jmxremote.access
 	backup = etc/java-openjdk-xdg/management/jmxremote.password.template
@@ -90,9 +90,9 @@ pkgname = jre-openjdk-headless-xdg
 	backup = etc/java-openjdk-xdg/sound.properties
 
 pkgname = jre-openjdk-xdg
-	pkgdesc = OpenJDK Java 20 full runtime environment - with improved Support for the XDG Base Directory Specification
+	pkgdesc = OpenJDK Java 21 full runtime environment - with improved Support for the XDG Base Directory Specification
 	install = install_jre-openjdk.sh
-	depends = jre20-openjdk-headless=20.0.2.u9-1
+	depends = jre21-openjdk-headless=21.u35-2
 	depends = giflib
 	depends = libgif.so
 	depends = glibc
@@ -101,29 +101,74 @@ pkgname = jre-openjdk-xdg
 	optdepends = alsa-lib: for basic sound support
 	optdepends = gtk2: for the Gtk+ 2 look and feel - desktop usage
 	optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
-	provides = java-runtime=20
-	provides = java-runtime-openjdk=20
-	provides = jre20-openjdk=20.0.2.u9-1
+	provides = java-runtime=21
+	provides = java-runtime-openjdk=21
+	provides = jre21-openjdk=21.u35-2
 
 pkgname = jdk-openjdk-xdg
-	pkgdesc = OpenJDK Java 20 development kit - with improved Support for the XDG Base Directory Specification
+	pkgdesc = OpenJDK Java 21 development kit - with improved Support for the XDG Base Directory Specification
 	install = install_jdk-openjdk.sh
-	depends = jre20-openjdk=20.0.2.u9-1
+	depends = jre21-openjdk=21.u35-2
 	depends = java-environment-common=3
 	depends = hicolor-icon-theme
 	depends = libelf
 	depends = glibc
 	depends = gcc-libs
-	provides = java-environment=20
-	provides = java-environment-openjdk=20
-	provides = jdk20-openjdk=20.0.2.u9-1
+	depends = libgif.so
+	depends = libpng
+	depends = ca-certificates-utils
+	depends = nss
+	depends = libjpeg-turbo
+	depends = libjpeg.so
+	depends = lcms2
+	depends = liblcms2.so
+	depends = libnet
+	depends = freetype2
+	depends = libfreetype.so
+	depends = harfbuzz
+	depends = libharfbuzz.so
+	optdepends = java-rhino: for some JavaScript support
+	optdepends = alsa-lib: for basic sound support
+	optdepends = gtk2: for the Gtk+ 2 look and feel - desktop usage
+	optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
+	provides = java-environment=21
+	provides = java-environment-openjdk=21
+	provides = jdk21-openjdk=21.u35-2
+	provides = java-runtime=21
+	provides = java-runtime-openjdk=21
+	provides = jre21-openjdk=21.u35-2
+	provides = java-runtime-headless=21
+	provides = java-runtime-headless-openjdk=21
+	provides = jre21-openjdk-headless=21.u35-2
+	conflicts = jre-openjdk
+	conflicts = jre-openjdk-headless
+	conflicts = java-runtime=21
+	conflicts = java-runtime-openjdk=21
+	conflicts = jre21-openjdk=21.u35-2
+	conflicts = java-runtime-headless=21
+	conflicts = java-runtime-headless-openjdk=21
+	conflicts = jre21-openjdk-headless=21.u35-2
+	backup = etc/java-openjdk-xdg/logging.properties
+	backup = etc/java-openjdk-xdg/management/jmxremote.access
+	backup = etc/java-openjdk-xdg/management/jmxremote.password.template
+	backup = etc/java-openjdk-xdg/management/management.properties
+	backup = etc/java-openjdk-xdg/net.properties
+	backup = etc/java-openjdk-xdg/security/java.policy
+	backup = etc/java-openjdk-xdg/security/java.security
+	backup = etc/java-openjdk-xdg/security/policy/README.txt
+	backup = etc/java-openjdk-xdg/security/policy/limited/default_US_export.policy
+	backup = etc/java-openjdk-xdg/security/policy/limited/default_local.policy
+	backup = etc/java-openjdk-xdg/security/policy/limited/exempt_local.policy
+	backup = etc/java-openjdk-xdg/security/policy/unlimited/default_US_export.policy
+	backup = etc/java-openjdk-xdg/security/policy/unlimited/default_local.policy
+	backup = etc/java-openjdk-xdg/sound.properties
 
 pkgname = openjdk-src-xdg
-	pkgdesc = OpenJDK Java 20 sources - with improved Support for the XDG Base Directory Specification
-	depends = jdk20-openjdk=20.0.2.u9-1
-	provides = openjdk20-src=20.0.2.u9-1
+	pkgdesc = OpenJDK Java 21 sources - with improved Support for the XDG Base Directory Specification
+	depends = jdk21-openjdk=21.u35-2
+	provides = openjdk21-src=21.u35-2
 
 pkgname = openjdk-doc-xdg
-	pkgdesc = OpenJDK Java 20 documentation - with improved Support for the XDG Base Directory Specification
-	depends = jdk20-openjdk=20.0.2.u9-1
-	provides = openjdk20-doc=20.0.2.u9-1
+	pkgdesc = OpenJDK Java 21 documentation - with improved Support for the XDG Base Directory Specification
+	depends = jdk21-openjdk=21.u35-2
+	provides = openjdk21-doc=21.u35-2

PKGBUILD

@@ -12,7 +12,7 @@ _securityver=0
 _updatever=35
 # pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
 pkgver=${_majorver}.u${_updatever}
-pkgrel=1
+pkgrel=2
 # _git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
 _git_tag=jdk-${_majorver}+${_updatever}
 arch=('x86_64')
@@ -52,12 +52,6 @@ _nonheadless=(lib/libawt_xawt.so
               lib/libjsound.so
               lib/libsplashscreen.so)
 
-_nonjre=(lib/ct.sym
-          lib/libattach.so
-          lib/libsaproc.so
-          lib/lible.so
-          lib/src.zip)
-
 prepare() {
   cd ${_jdkdir}
   patch -p1 -i ../xdg-basedir-compliant-fontconfig.patch
@@ -162,25 +156,15 @@ package_jre-openjdk-headless-xdg() {
 
   cd ${_imgdir}/jre
 
-  install -dm 755 "${pkgdir}${_jvmdir}"/bin
-
-  for i in $(ls bin/); do
-    cp ../jdk/bin/$i "${pkgdir}${_jvmdir}/bin/"
-  done
-
-  cp -a ../jdk/lib "${pkgdir}${_jvmdir}"
+  install -dm 755 "${pkgdir}${_jvmdir}"
 
-  for f in "${_nonjre[@]}"; do
-    rm "${pkgdir}${_jvmdir}/${f}"
-  done
+  cp -a bin lib \
+    "${pkgdir}${_jvmdir}"
 
   for f in "${_nonheadless[@]}"; do
     rm "${pkgdir}${_jvmdir}/${f}"
   done
 
-  cp ../jdk/release "${pkgdir}${_jvmdir}"
-  cp ../jdk/lib/modules "${pkgdir}${_jvmdir}/lib"
-
   # Conf
   install -dm 755 "${pkgdir}/etc"
   cp -r conf "${pkgdir}/etc/${pkgbase}"
@@ -219,20 +203,70 @@ package_jre-openjdk-xdg() {
 
   install -dm 755 "${pkgdir}${_jvmdir}"
 
+   cp -a bin lib \
+    "${pkgdir}${_jvmdir}"
+
+
   for f in "${_nonheadless[@]}"; do
     install -Dm 644 ${f} "${pkgdir}${_jvmdir}/${f}"
   done
 
-  # Licenses
+  # Conf
+  install -dm 755 "${pkgdir}/etc"
+  cp -r conf "${pkgdir}/etc/${pkgbase}"
+  ln -s /etc/${pkgbase} "${pkgdir}/${_jvmdir}/conf"
+
+  # Legal
   install -dm 755 "${pkgdir}/usr/share/licenses"
+  cp -r legal "${pkgdir}/usr/share/licenses/${pkgbase}"
   ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+  ln -s /usr/share/licenses/${pkgbase} "${pkgdir}/${_jvmdir}/legal"
+
+  # Man pages
+  for f in bin/*; do
+    f=$(basename "${f}")
+    _man=../jdk/man/man1/"${f}.1"
+    test -f "${_man}" && install -Dm 644 "${_man}" "${pkgdir}/usr/share/man/man1/${f}-openjdk${_majorver}.1"
+  done
+  ln -s /usr/share/man "${pkgdir}/${_jvmdir}/man"
+
+  # 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"
 }
 
 package_jdk-openjdk-xdg() {
   pkgdesc="OpenJDK Java ${_majorver} development kit - with improved Support for the XDG Base Directory Specification"
   depends=("jre${_majorver}-openjdk=${pkgver}-${pkgrel}" 'java-environment-common=3'
-           'hicolor-icon-theme' 'libelf' 'glibc' 'gcc-libs')
-  provides=("java-environment=${_majorver}" "java-environment-openjdk=${_majorver}" "jdk${_majorver}-openjdk=${pkgver}-${pkgrel}")
+           'hicolor-icon-theme' 'libelf' 'glibc' 'gcc-libs' 'libgif.so' 'libpng'
+           'ca-certificates-utils' 'nss' 'libjpeg-turbo' 'libjpeg.so'
+           'lcms2' 'liblcms2.so' 'libnet' 'freetype2' 'libfreetype.so' 'harfbuzz'
+           'libharfbuzz.so')
+  optdepends=('java-rhino: for some JavaScript support'
+              'alsa-lib: for basic sound support'
+              'gtk2: for the Gtk+ 2 look and feel - desktop usage'
+              'gtk3: for the Gtk+ 3 look and feel - desktop usage')
+  provides=("java-environment=${_majorver}" "java-environment-openjdk=${_majorver}" "jdk${_majorver}-openjdk=${pkgver}-${pkgrel}"
+            "java-runtime=${_majorver}" "java-runtime-openjdk=${_majorver}" "jre${_majorver}-openjdk=${pkgver}-${pkgrel}"
+            "java-runtime-headless=${_majorver}" "java-runtime-headless-openjdk=${_majorver}" "jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}")
+  conflicts=("jre-openjdk" "jre-openjdk-headless"
+             "java-runtime=${_majorver}" "java-runtime-openjdk=${_majorver}" "jre${_majorver}-openjdk=${pkgver}-${pkgrel}"
+             "java-runtime-headless=${_majorver}" "java-runtime-headless-openjdk=${_majorver}" "jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}")
+  backup=(etc/${pkgbase}/logging.properties
+          etc/${pkgbase}/management/jmxremote.access
+          etc/${pkgbase}/management/jmxremote.password.template
+          etc/${pkgbase}/management/management.properties
+          etc/${pkgbase}/net.properties
+          etc/${pkgbase}/security/java.policy
+          etc/${pkgbase}/security/java.security
+          etc/${pkgbase}/security/policy/README.txt
+          etc/${pkgbase}/security/policy/limited/default_US_export.policy
+          etc/${pkgbase}/security/policy/limited/default_local.policy
+          etc/${pkgbase}/security/policy/limited/exempt_local.policy
+          etc/${pkgbase}/security/policy/unlimited/default_US_export.policy
+          etc/${pkgbase}/security/policy/unlimited/default_local.policy
+          etc/${pkgbase}/sound.properties)
+
   install=install_jdk-openjdk.sh
 
   cd ${_imgdir}/jdk
@@ -244,33 +278,30 @@ package_jdk-openjdk-xdg() {
 
   rm "${pkgdir}${_jvmdir}/lib/src.zip"
 
-  # Remove files held by JRE
-  pushd ../jre
-  for d in bin lib; do
-    find ${d} ! -type d -exec rm "${pkgdir}${_jvmdir}/{}" \;
-  done
-  popd
-  find "${pkgdir}${_jvmdir}/lib" -type d -empty -delete
-
-  # Conf files all belong to JRE
+  # Conf
+  install -dm 755 "${pkgdir}/etc"
+  cp -r conf "${pkgdir}/etc/${pkgbase}"
+  ln -s /etc/${pkgbase} "${pkgdir}/${_jvmdir}/conf"
 
   # Legal
   install -dm 755 "${pkgdir}/usr/share/licenses"
   cp -r legal "${pkgdir}/usr/share/licenses/${pkgbase}"
-  pushd ../jre/legal
-  find . ! -type d -exec rm "${pkgdir}/usr/share/licenses/${pkgbase}/{}" \;
-  popd
-  find "${pkgdir}/usr/share/licenses" -type d -empty -delete
   ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+  ln -s /usr/share/licenses/${pkgbase} "${pkgdir}/${_jvmdir}/legal"
 
   # Man pages
   for f in bin/*; do
     f=$(basename "${f}")
-    _man=man/man1/"${f}.1"
-    test -f "../jre/bin/${f}" && continue
+     _man=../jdk/man/man1/"${f}.1"
     test -f "${_man}" && install -Dm 644 "${_man}" "${pkgdir}/usr/share/man/man1/${f}-openjdk${_majorver}.1"
   done
 
+  ln -s /usr/share/man "${pkgdir}/${_jvmdir}/man"
+
+  # 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"
+
   # Icons
   for s in 16 24 32 48; do
     install -Dm 644 \