diff --git a/srcpkgs/openjdk11/patches/system-public-suffix.patch b/srcpkgs/openjdk11/patches/system-public-suffix.patch new file mode 100644 index 00000000000..c278e7709f6 --- /dev/null +++ b/srcpkgs/openjdk11/patches/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) { diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template index 64f43424204..494da5d6fca 100644 --- a/srcpkgs/openjdk11/template +++ b/srcpkgs/openjdk11/template @@ -1,6 +1,6 @@ # Template file for 'openjdk11' pkgname=openjdk11 -version=11.0.22+6 +version=11.0.25+5 revision=1 _java_ver="${version%%.*}" _jdk_home="usr/lib/jvm/openjdk${_java_ver}" @@ -38,7 +38,7 @@ maintainer="Kyle Nusbaum " license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="http://openjdk.java.net/" 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}" 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" short_desc+=" - runtime components" provides="java-runtime-${version}_1" - depends="fontconfig openjdk-common" + depends="fontconfig openjdk-common public-suffix" alternatives="java:/usr/lib/jvm/default-jre:/${_jdk_home}" pkg_install() { for bin in java jjs keytool pack200 rmid rmiregistry unpack200; do