commit a3906880d8912c736858f84939ddbd1b533ae25a Author: John Vogel <jvogel4@stny.rr.com> Date: Sat Jun 1 08:28:00 2019 -0400 openjdk8: update to 8u212-b04, icedtea 3.12.0 diff --git a/openjdk8/.footprint b/openjdk8/.footprint index d8e00395..252acb59 100644 --- a/openjdk8/.footprint +++ b/openjdk8/.footprint @@ -9,7 +9,9 @@ drwxr-xr-x root/root usr/lib/java/openjdk8/ -r--r--r-- root/root usr/lib/java/openjdk8/LICENSE drwxr-xr-x root/root usr/lib/java/openjdk8/bin/ -rwxr-xr-x root/root usr/lib/java/openjdk8/bin/appletviewer +-rwxr-xr-x root/root usr/lib/java/openjdk8/bin/clhsdb -rwxr-xr-x root/root usr/lib/java/openjdk8/bin/extcheck +-rwxr-xr-x root/root usr/lib/java/openjdk8/bin/hsdb -rwxr-xr-x root/root usr/lib/java/openjdk8/bin/idlj -rwxr-xr-x root/root usr/lib/java/openjdk8/bin/jar -rwxr-xr-x root/root usr/lib/java/openjdk8/bin/jarsigner @@ -63,6 +65,8 @@ drwxr-xr-x root/root usr/lib/java/openjdk8/jre/ -r--r--r-- root/root usr/lib/java/openjdk8/jre/ASSEMBLY_EXCEPTION -r--r--r-- root/root usr/lib/java/openjdk8/jre/LICENSE drwxr-xr-x root/root usr/lib/java/openjdk8/jre/bin/ +lrwxrwxrwx root/root usr/lib/java/openjdk8/jre/bin/clhsdb -> ../../bin/clhsdb +lrwxrwxrwx root/root usr/lib/java/openjdk8/jre/bin/hsdb -> ../../bin/hsdb lrwxrwxrwx root/root usr/lib/java/openjdk8/jre/bin/java -> ../../bin/java lrwxrwxrwx root/root usr/lib/java/openjdk8/jre/bin/jjs -> ../../bin/jjs lrwxrwxrwx root/root usr/lib/java/openjdk8/jre/bin/keytool -> ../../bin/keytool diff --git a/openjdk8/.signature b/openjdk8/.signature index 26462d30..cf670aa4 100644 --- a/openjdk8/.signature +++ b/openjdk8/.signature @@ -1,17 +1,16 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF34s+JlxrckoEzN4yp9KPaZT2w20eAV4h30Bqha3UmMEMfzC8n52nwCh7x31mm5TLoHxmHlIbt9Kx+6jv+7f4zQU= -SHA256 (Pkgfile) = ceb7c8814d91bee445f6dbb194b37fb4d1432c4635b6d67de897ae0e747503a8 -SHA256 (.footprint) = fd6b80c3b2a7306f2b3e85653ad0d7fdcb5062901a15c00fe393ffd6a7c36e23 -SHA256 (icedtea-3.10.0.tar.xz) = ac4c5ec996555db6b4943e3849afc72ba2504b14c7d443cded68dd7d7e0055f9 -SHA256 (corba-8u191-b12.tar.xz) = 69200a5f46b917f5ffcdb64729e6871cdbe152d767a569e18be3725b45536a32 -SHA256 (hotspot-8u191-b12.tar.xz) = ce71e125b3ac598f8a46bcbdd2c9e5727beeee15c1e081b06d49aa5346afb897 -SHA256 (jaxp-8u191-b12.tar.xz) = 79277071c09112f9383de9b0fd813a5e135e4525562890c17ed44ca0d90dbcfb -SHA256 (jaxws-8u191-b12.tar.xz) = 92f3cb8a4f615e962fcb6dd40e81dc3134741dbb0dba1556527604d15d765786 -SHA256 (jdk-8u191-b12.tar.xz) = c29b268f08c5615904098126458c5ccc32d9d31457482b97d2ed70b94b79cab5 -SHA256 (langtools-8u191-b12.tar.xz) = f2786cd6963696cb989fcd27054505ec74c0f2e31a485f5550ddbe3ad065a917 -SHA256 (nashorn-8u191-b12.tar.xz) = 9ed937e497e30344a2ee4a938cdec81b5b79642f3c7106f3abf911318fdda99d -SHA256 (openjdk-8u191-b12.tar.xz) = fc760130ce1c6dc2379f5b219615344ee25d6380ea24813da53fe034eeb4d156 -SHA256 (certdata-dc2f7806fbc1.txt) = 35b415062acb8c2c27607083b5b3bec8f4ff57463c9b9f06db3e8df3ea895592 +RWSagIOpLGJF32AoW89VK8nwis803WfWG3d+1RLHyx48/yW0HnZSd4SwIxAIoDLzMQ47XHER7CLaSBWd4+VN8VkZR/Gk75lqcgo= +SHA256 (Pkgfile) = 6b97c63387f27c07e97538c92542692ac8b8f86b8634e395ae058719974d3a4e +SHA256 (.footprint) = 6c181722f2005db2354b1f677f5afe38ee77b078bf803fec87fd4d9d9f86f63d +SHA256 (icedtea-3.12.0.tar.xz) = 121dd400d6cc40803b634b42968de2842e9ac0adc7808a91c45bfd30d8223338 +SHA256 (corba-8u212-b04.tar.xz) = 5ce6b01dd0b1608d6cf293eec3a51c2b0ad6567cc8b0ff8e7834016603bab9e8 +SHA256 (hotspot-8u212-b04.tar.xz) = 073ebc2f2e0301e0f2c17bb0e9d7340a0ed1f003c9706109f25ecefeeedc67f6 +SHA256 (jaxp-8u212-b04.tar.xz) = 24ee541b347bbaf948db050fe9bbd2a47ecb07974c98bbe3e3aca79c4ccb3433 +SHA256 (jaxws-8u212-b04.tar.xz) = e3e96176392415126733e38042ca06660933d3549a3c9829643b8c688233bceb +SHA256 (jdk-8u212-b04.tar.xz) = df05b344ec32de2736c4ea12e274a6967d9844f228e5994cdf5d953ab3c4cd35 +SHA256 (langtools-8u212-b04.tar.xz) = 52cc44f48b782aac4a1afb3326ead961665f9cd3bb855086d709ae8b8db5340a +SHA256 (nashorn-8u212-b04.tar.xz) = 434fa40c57ab1c6416b65aecc187cbf9b16cf1d90e5e68f1333563a60e0fdbb1 +SHA256 (openjdk-8u212-b04.tar.xz) = b19b2f33dc9d8e1619cc59b4e3ffe7129698016f468f8759e81d04583c692e0c +SHA256 (certdata-f84b1b428d42.txt) = 61eaa79ac46d923f2f74dfe401189424e96fa8736102b47ba2cdb4ea19af2cc8 SHA256 (mozilla-rootcerts-2018Q3.sh) = 45bf640ca551ecbb5e7a9c3121f67c3d9fd256b0f58916b7d5a5a40d5bee98ba -SHA256 (openjdk8-boot-20190106-bin.tar.xz) = 7b54af2d26be9d59b82ce0fa59681d6bc1aabdbacd467ce28b370557922effaf -SHA256 (hotspot_add_linux5.patch) = 0d1e3229e80d517ac03c0c10d14cf091cac968f1760e51edb60ea84de9be785e +SHA256 (openjdk8-boot-20190531-bin.tar.xz) = a1d2a2fd89f83d45d3dcd92f2e4472bc8bd58a9faf08026d0c6a57bf7dd141a9 diff --git a/openjdk8/Pkgfile b/openjdk8/Pkgfile index 2ef9d3f1..6563319c 100644 --- a/openjdk8/Pkgfile +++ b/openjdk8/Pkgfile @@ -4,36 +4,24 @@ # Depends on: alsa-lib cups fontconfig freetype giflib gtk krb5 lcms2 libjpeg-turbo libpng libxslt nss unzip xorg-libxt xorg-libxtst xorg-libxinerama zip name=openjdk8 -version=8u191-b12 -icedtea_version=3.10.0 -boot_version=20190106 +version=8u212-b04 +icedtea_version=3.12.0 +boot_version=20190531 pkgsrc_quarter=2018Q3 -certdata_rev=dc2f7806fbc1 -release=3 +certdata_rev=f84b1b428d42 +release=1 source=(http://icedtea.wildebeest.org/download/source/icedtea-$icedtea_version.tar.x... -# https://stygian.me/crux/distfiles/$name/corba-$version.tar.xz -# https://stygian.me/crux/distfiles/$name/hotspot-$version.tar.xz -# https://stygian.me/crux/distfiles/$name/jaxp-$version.tar.xz -# https://stygian.me/crux/distfiles/$name/jaxws-$version.tar.xz -# https://stygian.me/crux/distfiles/$name/jdk-$version.tar.xz -# https://stygian.me/crux/distfiles/$name/langtools-$version.tar.xz -# https://stygian.me/crux/distfiles/$name/nashorn-$version.tar.xz -# https://stygian.me/crux/distfiles/$name/openjdk-$version.tar.xz -# https://stygian.me/crux/distfiles/certdata-$certdata_rev.txt -# https://stygian.me/crux/distfiles/mozilla-rootcerts-$pkgsrc_quarter.sh -# https://stygian.me/crux/distfiles/$name-boot-$boot_version-bin.tar.xz - http://crux.ster.zone/downloads/$name/corba-$version.tar.xz - http://crux.ster.zone/downloads/$name/hotspot-$version.tar.xz - http://crux.ster.zone/downloads/$name/jaxp-$version.tar.xz - http://crux.ster.zone/downloads/$name/jaxws-$version.tar.xz - http://crux.ster.zone/downloads/$name/jdk-$version.tar.xz - http://crux.ster.zone/downloads/$name/langtools-$version.tar.xz - http://crux.ster.zone/downloads/$name/nashorn-$version.tar.xz - http://crux.ster.zone/downloads/$name/openjdk-$version.tar.xz - http://crux.ster.zone/downloads/$name/certdata-$certdata_rev.txt - http://crux.ster.zone/downloads/$name/mozilla-rootcerts-$pkgsrc_quarter.sh - http://crux.ster.zone/downloads/$name/$name-boot-$boot_version-bin.tar.xz - hotspot_add_linux5.patch) + https://stygian.me/crux/distfiles/$name/corba-$version.tar.xz + https://stygian.me/crux/distfiles/$name/hotspot-$version.tar.xz + https://stygian.me/crux/distfiles/$name/jaxp-$version.tar.xz + https://stygian.me/crux/distfiles/$name/jaxws-$version.tar.xz + https://stygian.me/crux/distfiles/$name/jdk-$version.tar.xz + https://stygian.me/crux/distfiles/$name/langtools-$version.tar.xz + https://stygian.me/crux/distfiles/$name/nashorn-$version.tar.xz + https://stygian.me/crux/distfiles/$name/openjdk-$version.tar.xz + https://stygian.me/crux/distfiles/certdata-$certdata_rev.txt + https://stygian.me/crux/distfiles/mozilla-rootcerts-$pkgsrc_quarter.sh + https://stygian.me/crux/distfiles/$name-boot-$boot_version-bin.tar.xz) # See README for links to originally named files and rationale of renaming/versioning/mirroring. unpack_source() { @@ -49,10 +37,6 @@ unpack_source() { } build() { - # fix hotspot not recognizing linux version 5 kernels; thanks to ryuo and tb - mv $SRC/hotspot_add_linux5.patch $SRC/icedtea-$icedtea_version/patches - export DISTRIBUTION_PATCHES=patches/hotspot_add_linux5.patch - # Make sure we do not have ccache masquerade directory in PATH. # Use --enable-ccache instead of providing a wrapped compiler. # NOTE: the check for usr/bin/ccache may be too specific, since it rules out diff --git a/openjdk8/hotspot_add_linux5.patch b/openjdk8/hotspot_add_linux5.patch deleted file mode 100644 index ee9170e6..00000000 --- a/openjdk8/hotspot_add_linux5.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur openjdk.orig/hotspot/make/linux/Makefile openjdk/hotspot/make/linux/Makefile ---- openjdk.orig/hotspot/make/linux/Makefile 2018-11-13 11:21:32.000000000 -0500 -+++ openjdk/hotspot/make/linux/Makefile 2019-03-10 08:06:18.895829794 -0400 -@@ -233,7 +233,7 @@ - # Solaris 2.5.1, 2.6). - # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. - --SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4% -+SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4% 5% - OS_VERSION := $(shell uname -r) - EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) -