java-openjdk: Sync with arch

CachyOS · Jan 29, 2024 · 246cb4f · 246cb4f
1 parent 1bab7f6
commit 246cb4f
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 39 deletions.
diff --git a/openjdk/java-openjdk/.SRCINFO b/openjdk/java-openjdk/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = java-openjdk
-	pkgver = 21.u35
-	pkgrel = 10
+	pkgver = 21.0.2.u13
+	pkgrel = 1
 	url = https://openjdk.java.net/
 	arch = x86_64
 	license = custom
@@ -33,12 +33,12 @@ pkgbase = java-openjdk
 	makedepends = clang
 	makedepends = lld
 	options = !lto
-	source = https://github.com/openjdk/jdk21u/archive/jdk-21+35.tar.gz
+	source = https://github.com/openjdk/jdk21u/archive/jdk-21.0.2+13.tar.gz
 	source = freedesktop-java.desktop
 	source = freedesktop-jconsole.desktop
 	source = freedesktop-jshell.desktop
 	source = clang-lto.patch
-	sha256sums = b798ebc2e899a98edf2be99e786bb0fbad144e2270925dffe624fbe052f07ade
+	sha256sums = 4d8c8dd00164df0e344ed343d4ac20c1f30133f1029a83ff2c66c3557ed13a26
 	sha256sums = 72111743ab6ab36854b0c85a504172983715d0798fce10bc4e35689b7d15fd93
 	sha256sums = 8ecdf5c1605bafa58b3f7da615e6d8d3d943e3a2d3831930d6efa7815aacce07
 	sha256sums = 50fc0d677489b73d549df2f08d759d5f057f200adbbab83ea5e87456152ee03e
@@ -64,7 +64,7 @@ pkgname = jre-openjdk-headless
 	optdepends = java-rhino: for some JavaScript support
 	provides = java-runtime-headless=21
 	provides = java-runtime-headless-openjdk=21
-	provides = jre21-openjdk-headless=21.u35-10
+	provides = jre21-openjdk-headless=21.0.2.u13-1
 	conflicts = jdk-openjdk
 	conflicts = jre-openjdk
 	backup = etc/java-openjdk/logging.properties
@@ -107,10 +107,10 @@ pkgname = jre-openjdk
 	optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
 	provides = java-runtime=21
 	provides = java-runtime-openjdk=21
-	provides = jre21-openjdk=21.u35-10
+	provides = jre21-openjdk=21.0.2.u13-1
 	provides = java-runtime-headless=21
 	provides = java-runtime-headless-openjdk=21
-	provides = jre21-openjdk-headless=21.u35-10
+	provides = jre21-openjdk-headless=21.0.2.u13-1
 	conflicts = jdk-openjdk
 	conflicts = jre-openjdk-headless
 	backup = etc/java-openjdk/logging.properties
@@ -167,13 +167,13 @@ pkgname = jdk-openjdk
 	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-10
+	provides = jdk21-openjdk=21.0.2.u13-1
 	provides = java-runtime=21
 	provides = java-runtime-openjdk=21
-	provides = jre21-openjdk=21.u35-10
+	provides = jre21-openjdk=21.0.2.u13-1
 	provides = java-runtime-headless=21
 	provides = java-runtime-headless-openjdk=21
-	provides = jre21-openjdk-headless=21.u35-10
+	provides = jre21-openjdk-headless=21.0.2.u13-1
 	conflicts = jre-openjdk
 	conflicts = jre-openjdk-headless
 	backup = etc/java-openjdk/logging.properties
@@ -193,10 +193,10 @@ pkgname = jdk-openjdk
 
 pkgname = openjdk-src
 	pkgdesc = OpenJDK Java 21 sources
-	depends = jdk21-openjdk=21.u35-10
-	provides = openjdk21-src=21.u35-10
+	depends = jdk21-openjdk=21.0.2.u13-1
+	provides = openjdk21-src=21.0.2.u13-1
 
 pkgname = openjdk-doc
 	pkgdesc = OpenJDK Java 21 documentation
-	depends = jdk21-openjdk=21.u35-10
-	provides = openjdk21-doc=21.u35-10
+	depends = jdk21-openjdk=21.0.2.u13-1
+	provides = openjdk21-doc=21.0.2.u13-1
diff --git a/openjdk/java-openjdk/PKGBUILD b/openjdk/java-openjdk/PKGBUILD
@@ -9,13 +9,13 @@ pkgname=('jre-openjdk-headless' 'jre-openjdk' 'jdk-openjdk' 'openjdk-src' 'openj
 # on a majorver change, don't forget to update the misc files that come along this PKGBUILD
 _majorver=21
 _minorver=0
-_securityver=0
-_updatever=35
-# pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
-pkgver=${_majorver}.u${_updatever}
-pkgrel=10
-# _git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
-_git_tag=jdk-${_majorver}+${_updatever}
+_securityver=2
+_updatever=13
+pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
+# pkgver=${_majorver}.u${_updatever}
+pkgrel=1
+_git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
+# _git_tag=jdk-${_majorver}+${_updatever}
 arch=('x86_64')
 url='https://openjdk.java.net/'
 license=('custom')
@@ -33,7 +33,7 @@ source=(https://github.com/openjdk/jdk${_majorver}u/archive/${_git_tag}.tar.gz
         freedesktop-jconsole.desktop
         freedesktop-jshell.desktop
         clang-lto.patch)
-sha256sums=('b798ebc2e899a98edf2be99e786bb0fbad144e2270925dffe624fbe052f07ade'
+sha256sums=('4d8c8dd00164df0e344ed343d4ac20c1f30133f1029a83ff2c66c3557ed13a26'
             '72111743ab6ab36854b0c85a504172983715d0798fce10bc4e35689b7d15fd93'
             '8ecdf5c1605bafa58b3f7da615e6d8d3d943e3a2d3831930d6efa7815aacce07'
             '50fc0d677489b73d549df2f08d759d5f057f200adbbab83ea5e87456152ee03e'
@@ -210,7 +210,7 @@ package_jre-openjdk() {
     "${pkgdir}${_jvmdir}"
 
   for f in "${_nonheadless[@]}"; do
-    install -Dm 644 ${f} "${pkgdir}${_jvmdir}/${f}"
+    install -Dm 755 ${f} "${pkgdir}${_jvmdir}/${f}"
   done
 
   # Conf

diff --git a/openjdk/java17-openjdk/.SRCINFO b/openjdk/java17-openjdk/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = java17-openjdk
-	pkgver = 17.0.9.u8
+	pkgver = 17.0.10.u7
 	pkgrel = 4
 	url = https://openjdk.java.net/
 	arch = x86_64
@@ -33,11 +33,11 @@ pkgbase = java17-openjdk
 	makedepends = clang
 	makedepends = lld
 	options = !lto
-	source = https://github.com/openjdk/jdk17u/archive/jdk-17.0.9+8.tar.gz
+	source = https://github.com/openjdk/jdk17u/archive/jdk-17.0.10+7.tar.gz
 	source = freedesktop-java.desktop
 	source = freedesktop-jconsole.desktop
 	source = freedesktop-jshell.desktop
-	sha256sums = 01a115585a7ac183ddeed6aab3220399a9d3c37e669c13591404ead6deae4eda
+	sha256sums = a310a8666d2d7770a7b29fe4750c275b9b33a07bfcc925348040a8bca745c874
 	sha256sums = 85c4742764590783160af74587a47269e6797fbdf17ec485c7644bd239adf61d
 	sha256sums = abac1ab09a33a3654378bc69be5a7cf075263ab3ae9efec1eb25cf388e711bb7
 	sha256sums = e7cce0ecf868f656d8dc2eb25ab82ab665526a0a28aba20f02632dd29962dac3
@@ -62,7 +62,7 @@ pkgname = jre17-openjdk-headless
 	optdepends = java-rhino: for some JavaScript support
 	provides = java-runtime-headless=17
 	provides = java-runtime-headless-openjdk=17
-	provides = jre17-openjdk-headless=17.0.9.u8-4
+	provides = jre17-openjdk-headless=17.0.10.u7-4
 	backup = etc/java17-openjdk/logging.properties
 	backup = etc/java17-openjdk/management/jmxremote.access
 	backup = etc/java17-openjdk/management/jmxremote.password.template
@@ -81,7 +81,7 @@ pkgname = jre17-openjdk-headless
 pkgname = jre17-openjdk
 	pkgdesc = OpenJDK Java 17 full runtime environment
 	install = install_jre-openjdk.sh
-	depends = jre17-openjdk-headless=17.0.9.u8-4
+	depends = jre17-openjdk-headless=17.0.10.u7-4
 	depends = giflib
 	depends = libgif.so
 	depends = glibc
@@ -92,27 +92,27 @@ pkgname = jre17-openjdk
 	optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
 	provides = java-runtime=17
 	provides = java-runtime-openjdk=17
-	provides = jre17-openjdk=17.0.9.u8-4
+	provides = jre17-openjdk=17.0.10.u7-4
 
 pkgname = jdk17-openjdk
 	pkgdesc = OpenJDK Java 17 development kit
 	install = install_jdk-openjdk.sh
-	depends = jre17-openjdk=17.0.9.u8-4
+	depends = jre17-openjdk=17.0.10.u7-4
 	depends = java-environment-common=3
 	depends = hicolor-icon-theme
 	depends = libelf
 	depends = glibc
 	depends = gcc-libs
 	provides = java-environment=17
 	provides = java-environment-openjdk=17
-	provides = jdk17-openjdk=17.0.9.u8-4
+	provides = jdk17-openjdk=17.0.10.u7-4
 
 pkgname = openjdk17-src
 	pkgdesc = OpenJDK Java 17 sources
-	depends = jdk17-openjdk=17.0.9.u8-4
-	provides = openjdk17-src=17.0.9.u8-4
+	depends = jdk17-openjdk=17.0.10.u7-4
+	provides = openjdk17-src=17.0.10.u7-4
 
 pkgname = openjdk17-doc
 	pkgdesc = OpenJDK Java 17 documentation
-	depends = jdk17-openjdk=17.0.9.u8-4
-	provides = openjdk17-doc=17.0.9.u8-4
+	depends = jdk17-openjdk=17.0.10.u7-4
+	provides = openjdk17-doc=17.0.10.u7-4
diff --git a/openjdk/java17-openjdk/PKGBUILD b/openjdk/java17-openjdk/PKGBUILD
@@ -8,8 +8,8 @@ pkgbase=java17-openjdk
 pkgname=('jre17-openjdk-headless' 'jre17-openjdk' 'jdk17-openjdk' 'openjdk17-src' 'openjdk17-doc')
 _majorver=17
 _minorver=0
-_securityver=9
-_updatever=8
+_securityver=10
+_updatever=7
 pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
 #pkgver=${_majorver}.u${_updatever}
 pkgrel=4
@@ -31,7 +31,7 @@ source=(https://github.com/openjdk/jdk${_majorver}u/archive/${_git_tag}.tar.gz
         freedesktop-java.desktop
         freedesktop-jconsole.desktop
         freedesktop-jshell.desktop)
-sha256sums=('01a115585a7ac183ddeed6aab3220399a9d3c37e669c13591404ead6deae4eda'
+sha256sums=('a310a8666d2d7770a7b29fe4750c275b9b33a07bfcc925348040a8bca745c874'
             '85c4742764590783160af74587a47269e6797fbdf17ec485c7644bd239adf61d'
             'abac1ab09a33a3654378bc69be5a7cf075263ab3ae9efec1eb25cf388e711bb7'
             'e7cce0ecf868f656d8dc2eb25ab82ab665526a0a28aba20f02632dd29962dac3')
@@ -184,7 +184,7 @@ package_jre17-openjdk() {
   install -dm 755 "${pkgdir}${_jvmdir}"
 
   for f in "${_nonheadless[@]}"; do
-    install -Dm 644 ${f} "${pkgdir}${_jvmdir}/${f}"
+    install -Dm 755 ${f} "${pkgdir}${_jvmdir}/${f}"
   done
 
   # Licenses