openjdk17: update to 17.0.13+5.

This commit is contained in:
Đoàn Trần Công Danh 2024-08-31 13:32:40 +07:00 committed by classabbyamp
parent e24c237ace
commit 7476251363
2 changed files with 27 additions and 10 deletions

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
@@ -209,8 +209,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) {

View File

@ -1,6 +1,6 @@
# Template file for 'openjdk17'
pkgname=openjdk17
version=17.0.13+2
version=17.0.13+5
revision=1
_gtest_ver=1.13.0
_java_ver="${version%%.*}"
@ -8,8 +8,6 @@ _jdk_update="${version#*+}"
_base_version="${version%+*}"
_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
archs="x86_64* i686* aarch64* armv7* ppc64*"
create_wrksrc=yes
build_wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
build_style=gnu-configure
configure_args="--disable-warnings-as-errors
--enable-unlimited-crypto
@ -19,7 +17,7 @@ configure_args="--disable-warnings-as-errors
--with-libpng=system
--with-lcms=system
--with-jtreg=no
--with-gtest=../googletest-${_gtest_ver}
--with-gtest=./gtest
--with-debug-level=release
--with-native-debug-symbols=internal
--with-jobs=${XBPS_ORIG_MAKEJOBS}
@ -45,11 +43,12 @@ 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
https://github.com/google/googletest/archive/refs/tags/v${_gtest_ver}.tar.gz"
checksum="a95b5dd8b5e50f4989160d3a938d54db86ca58464027d4db39b8664ad4600b66
checksum="3b87d8c771e8fcebe38435e1019a050a87a20648eda683decaa9fd71bea46861
ad7fdba11ea011c1d925b3289cf4af2c66a352e18d4c7264392fead75e919363"
alternatives="jdk:/usr/lib/jvm/default-jdk:/${_jdk_home}"
provides="java-environment-${version}_1"
patch_args="-Np1 --directory=$build_wrksrc"
skip_extraction="v${_gtest_ver}.tar.gz"
# Build and check are still parallel, but don't use -jN.
disable_parallel_build=yes
@ -85,9 +84,11 @@ else
fi
post_extract() {
chmod +x $build_wrksrc/configure
mkdir -p gtest
vsrcextract -C gtest v${_gtest_ver}.tar.gz
chmod +x configure
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
rm -r $build_wrksrc/src/jdk.hotspot.agent
rm -r src/jdk.hotspot.agent
fi
}
@ -143,7 +144,7 @@ openjdk17-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="openjdk-common"
depends="openjdk-common public-suffix"
alternatives="java:/usr/lib/jvm/default-jre:/${_jdk_home}"
pkg_install() {
for bin in java jfr keytool rmiregistry; do
@ -172,7 +173,7 @@ openjdk17-doc_package() {
if [ "$build_option_docs" ]; then
local _docdir=usr/share/doc/openjdk$_java_ver
vmkdir $_docdir
cp -a $wrksrc/$build_wrksrc/build/linux-*/images/docs/* ${PKGDESTDIR}/$_docdir
cp -a $wrksrc/build/linux-*/images/docs/* ${PKGDESTDIR}/$_docdir
fi
}
}