wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

openjdk11: update to 11.0.25+5.

Browse source
This commit is contained in:
Đoàn Trần Công Danh 2024-08-31 16:13:59 +07:00 • committed by classabbyamp
parent 7476251363
commit 59d2ea2b70
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
srcpkgs/openjdk11/patches/system-public-suffix.patch Normal file
View file

@ -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) {

6
srcpkgs/openjdk11/template
View file

@ -1,6 +1,6 @@
# Template file for 'openjdk11' # Template file for 'openjdk11'
pkgname=openjdk11 pkgname=openjdk11
version=11.0.22+6 version=11.0.25+5
revision=1 revision=1
_java_ver="${version%%.*}" _java_ver="${version%%.*}"
_jdk_home="usr/lib/jvm/openjdk${_java_ver}" _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
@ -38,7 +38,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
license="GPL-2.0-only WITH Classpath-exception-2.0" license="GPL-2.0-only WITH Classpath-exception-2.0"
homepage="http://openjdk.java.net/" homepage="http://openjdk.java.net/"
distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz" distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
checksum=8bae7c5e608de84aa32010365514bb59cd0d8ba709f6730cc473e159c6bfb918 checksum=fb7e68bbaf9174605504e04331b3eadfeb37c23437598a04776fd3a9c085ace2
alternatives="jdk:/usr/lib/jvm/default-jdk:/${_jdk_home}" alternatives="jdk:/usr/lib/jvm/default-jdk:/${_jdk_home}"
provides="java-environment-${version}_1" provides="java-environment-${version}_1"
@ -128,7 +128,7 @@ openjdk11-jre_package() {
shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
short_desc+=" - runtime components" short_desc+=" - runtime components"
provides="java-runtime-${version}_1" provides="java-runtime-${version}_1"
depends="fontconfig openjdk-common" depends="fontconfig openjdk-common public-suffix"
alternatives="java:/usr/lib/jvm/default-jre:/${_jdk_home}" alternatives="java:/usr/lib/jvm/default-jre:/${_jdk_home}"
pkg_install() { pkg_install() {
for bin in java jjs keytool pack200 rmid rmiregistry unpack200; do for bin in java jjs keytool pack200 rmid rmiregistry unpack200; do