openjdk8: update to 8u252-b09, icedtea 3.16.0

3 files changed, 51 insertions, 69 deletions

diff --git a/openjdk8/.signature b/openjdk8/.signature
index 00674c591..6308332e1 100644
--- a/openjdk8/.signature
+++ b/openjdk8/.signature
@@ -1,16 +1,14 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3yA4vVA05erXDjoRYDiNl9z0GW0XB3/kdOPRELyuhJ2kLJjfhsJJ4y1b7LePBiihrX04ljPBTce5oNvjDA61ZAA=
-SHA256 (Pkgfile) = 969772b73ceefeb0f77d2f302c460fdc3a0f139788ed3c32c4b6d896b4ce6ae0
+RWSagIOpLGJF39U9o9FB3VhGkqe+ZubhFqZ/onFIILHNpgMJVM/h+lXC0dmaZt6ddwFyYmHMFhHYpGbeh1LEHEveCHOy6/4TJQo=
+SHA256 (Pkgfile) = b5e12360c5690d6f16425a5e1018c95d5f634f45e61796d9e87d8e57be44f607
 SHA256 (.footprint) = cbff9c3cbe559abe9d2a5d1ef95a6f21a9fc6f2b8bbbb994b1d9a3838679e328
-SHA256 (icedtea-3.15.0.tar.xz) = f37d5c92268e0ecd7242b756574c19af7ec0032441a858de842f744a5261eeee
-SHA256 (corba-8u242-b08.tar.xz) = 008d694f1bc18a147b6762309e5017d826929dfedbb8150eb5bb5550be1f7d25
-SHA256 (hotspot-8u242-b08.tar.xz) = ff331bd89896681153bc8ed69f397995627fd56ed39081a4ff4388a918b101a5
-SHA256 (jaxp-8u242-b08.tar.xz) = e2ef2ae1f1a034fa18f1f48c1af497ff72f19d1eac4dc27f2b01f9aa5e502e9b
-SHA256 (jaxws-8u242-b08.tar.xz) = 7e7b6fced17fbbe969276aa519cc16324651d8544eab696e41d1f74407d07c02
-SHA256 (jdk-8u242-b08.tar.xz) = 818e2fbf57c5bdfdcac312484262e4886f7a6738e7dd71da90d2a6ba71531865
-SHA256 (langtools-8u242-b08.tar.xz) = af7e2417b2b3dd3c2f40c280d9aee87afbbc7fd7df828fb42089b614e23fd236
-SHA256 (nashorn-8u242-b08.tar.xz) = 0dd669ab749cd3273ac7c9ddc829087a7c2f8ecfb4cb19bf1d20ce0061b9c670
-SHA256 (openjdk-8u242-b08.tar.xz) = 979f10d9eacaefcf78fe19cb63046205c26a65d7b925939d195ffc2726ed3020
-SHA256 (certdata-dc8776ff4759.txt) = f3bdcd74612952da8476a9d4147f50b29ad0710b7dd95b4c8690500209986d70
-SHA256 (mozilla-rootcerts-2018Q3.sh) = 45bf640ca551ecbb5e7a9c3121f67c3d9fd256b0f58916b7d5a5a40d5bee98ba
-SHA256 (openjdk8-boot-20200217-bin.tar.xz) = 508578e1a7506706caf33a22e310f611bb25a2b0f27215869cf310959d6a7225
+SHA256 (icedtea-3.16.0.tar.xz) = b84bb7678baf09008670ce230a787b7bce7186cb5500d5a0664b8a369ad52500
+SHA256 (corba-8u252-b09.tar.xz) = 45fbaefea10211f1efc17df5d1f2197583a119d2e8d1773ecd0f4fbc786813d3
+SHA256 (hotspot-8u252-b09.tar.xz) = a6b3e5379b95d6263d8d397cf181d6c07946400f1d5a424a8bc06c1cce9ef1e3
+SHA256 (jaxp-8u252-b09.tar.xz) = 030ee059bcb815934b4ea4fb1e6b8d4ee4d15fdad6f4ea8ce20f99ded80631b6
+SHA256 (jaxws-8u252-b09.tar.xz) = b529f8d44af3ed7588e51f8326da2ba47fb3ea79c23933b5a7e8ec1e5e4e0f1b
+SHA256 (jdk-8u252-b09.tar.xz) = da14787acc99062ffb8b087eb27619eded0c84649b4a4e0f8d50d5c067533e8b
+SHA256 (langtools-8u252-b09.tar.xz) = dd6978cce62c30bdeb2afeec865449d99e2a65a8555fdbecf9f7173c10022fcd
+SHA256 (nashorn-8u252-b09.tar.xz) = 30086e392a365242c7c61eee18534bfc1583ced855fbb301f187fcd16403845c
+SHA256 (openjdk-8u252-b09.tar.xz) = f08a768697cefd1bc2b358b075803d366d7023c7e84a78fc47fef66134bbc7e9
+SHA256 (openjdk8-boot-20200504-bin.tar.xz) = d5633e613b33728fb7bb4305144d3654f238c9759edda112422533b7e2495195
diff --git a/openjdk8/Pkgfile b/openjdk8/Pkgfile
index 0b517d609..b0d6349c9 100644
--- a/openjdk8/Pkgfile
+++ b/openjdk8/Pkgfile
@@ -1,14 +1,12 @@
 # Description: OpenJDK 8 built using IcedTea build harness
 # URL:         http://icedtea.classpath.org http://openjdk.java.net
 # Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
-# Depends on:  alsa-lib cups fontconfig freetype giflib gtk krb5 lcms2 libjpeg-turbo libpng libxslt nss unzip xorg-libxt xorg-libxtst xorg-libxinerama zip
+# Depends on:  alsa-lib cups fontconfig freetype giflib gtk krb5 lcms2 libjpeg-turbo libpng libxslt nss p11-kit unzip xorg-libxt xorg-libxtst xorg-libxinerama zip
 
 name=openjdk8
-version=8u242-b08
-icedtea_version=3.15.0
-boot_version=20200217
-pkgsrc_quarter=2018Q3
-certdata_rev=dc8776ff4759
+version=8u252-b09
+icedtea_version=3.16.0
+boot_version=20200504
 release=1
 source=(http://icedtea.wildebeest.org/download/source/icedtea-$icedtea_version.tar.xz
 	https://stygian.me/crux/distfiles/$name/corba-$version.tar.xz
@@ -19,8 +17,6 @@ source=(http://icedtea.wildebeest.org/download/source/icedtea-$icedtea_version.t
 	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.
 
@@ -55,9 +51,17 @@ build() {
 	export JAVA_HOME=$SRC/$name-boot
 	export PATH=$JAVA_HOME/bin:$OLD_PATH
 
+	if [ -f /etc/pki/tls/java/cacerts ]; then
+		JAVA_CACERTS=/etc/pki/tls/java/cacerts
+	else
+		/usr/sbin/make-ca -g -D $SRC/certs || exit 1
+		JAVA_CACERTS=$SRC/certs/etc/pki/tls/java/cacerts
+	fi
+
 	mkdir $SRC/build
 	cd $SRC/build
 
+	# Will fail if make-ca has not been run after p11-kit install
 	LC_ALL=C \
 	CONFIG_SHELL=/bin/bash \
 	../icedtea-$icedtea_version/configure ${EXTRA_OPTIONS} \
@@ -93,7 +97,9 @@ build() {
 		--with-nashorn-src-zip=$SRC/nashorn-$version.tar.xz \
 		--with-openjdk-src-zip=$SRC/openjdk-$version.tar.xz \
 		--with-pkgversion=CRUX \
-		--with-jdk-home=$JAVA_HOME
+		--with-jdk-home=$JAVA_HOME \
+		--with-cacerts-file=$JAVA_CACERTS \
+		--with-tzdata-dir=/usr/share/zoneinfo
 
 	LC_ALL=C \
 	make
@@ -132,38 +138,5 @@ build() {
 		fi
 	done
 
-	sed -e "/# cd \/etc\/openssl\/certs/s//# cd \/usr\/share\/$name\/certs/" \
-		-e '/@AWK@/s,,/usr/bin/awk,' \
-		-e "/@DATADIR@/s,,/usr/share/$name," \
-		-e '/@ECHO@/s,,/bin/echo,' \
-		-e '/@EXPR@/s,,/usr/bin/expr,' \
-		-e '/@LN@/s,,/bin/ln,' \
-		-e '/@LS@/s,,/bin/ls,' \
-		-e '/@MKDIR@/s,,/bin/mkdir,' \
-		-e '/@OPENSSL@/s,,/usr/bin/openssl,' \
-		-e '/@PREFIX@/s,,/usr,' \
-		-e "/@SSLDIR@/s,,/usr/share/$name," \
-		-e '/@RM@/s,,/bin/rm,' \
-		-e 's,self extract,self -f $certfile extract,' \
-		-e 's,self rehash,self -f $certfile rehash,' \
-		$SRC/mozilla-rootcerts-$pkgsrc_quarter.sh > $SRC/mozilla-rootcerts
-
-	export JAVA_HOME=$PKG/usr/lib/java/$name
-	export PATH=$JAVA_HOME/bin:$OLD_PATH
-
-	# Generate java's cacerts.
-	# Big thanks to pkgsrc's mozilla-rootcerts and openjdk pkg's for this part.
-	rm -f $PKG/usr/lib/java/$name/jre/lib/security/cacerts
-	mkdir $SRC/cacerts
-	cd $SRC/cacerts
-	sh $SRC/mozilla-rootcerts -f $SRC/certdata-$certdata_rev.txt extract
-	for cert in *.pem; do
-		keytool \
-			-noprompt \
-			-importcert \
-			-keystore $PKG/usr/lib/java/$name/jre/lib/security/cacerts \
-			-alias $(echo $cert | sed 's,.*/\([^/]*\)\.pem,\1,') \
-			-file $cert \
-			-storepass changeit
-	done
+	chmod u+w $PKG/usr/lib/java/$name/jre/lib/security/cacerts
 }
diff --git a/openjdk8/README b/openjdk8/README
index bb586601e..ceddbfe29 100644
--- a/openjdk8/README
+++ b/openjdk8/README
@@ -1,30 +1,41 @@
 NOTES:
 =====
 
+* I have switched from generating the java cacerts to depending on p11-kit and
+  make-ca. If you run into build failure at configure due to missing the java
+  cacerts file, the likely issue is that `make-ca` needs to be run before
+  building openjdk8. It will be done automatically when installing p11-kit, if:
+    1) you have 'runscripts yes' in your prt-get.conf, or
+    2) supply prt-get with '--install-scripts' commandline argument.
+
 * These are the links to the unversioned files:
 
 http://icedtea.wildebeest.org/download/drops/icedtea8/$icedtea_version/{corba,hotspot,jaxp,jaxws,langtools,nashorn,openjdk}.tar.xz
-http://hg.mozilla.org/releases/mozilla-release/raw-file/$certdata_rev/security/nss/lib/ckfw/builtins/certdata.txt
-http://ftp.netbsd.org/pub/pkgsrc/pkgsrc-$pkgsrc_quarter/pkgsrc/security/mozilla-rootcerts/files/mozilla-rootcerts.sh
 
- The mirrorred and versioned files are merely renamed to prevent signature mismatches and files
- not being downloaded due to older, unversioned files stopping the correct file from being retrieved.
+  The mirrorred and versioned files are merely renamed to prevent signature mismatches and files
+  not being downloaded due to older, unversioned files stopping the correct file from being retrieved.
+
+* The manual pages are outside of the normal MANPATH. At this point in time,
+  I see no easy way to move them without conflicting with the opt/jdk port.
 
-* The following packages do not exist but might be nice to have:
+* These packages exist in my j_v repo (might be nice to have as dependencies):
 
-pcsc-lite, lksctp-tools
+  pcsc-lite, lksctp-tools
 
- (Actually, I have private ports for these, but need to determine if there is
- any actual benefit from adding and depending on them).
+  (I need to determine if there is any actual benefit from depending on them).
 
 
 TODO:
 ====
 
-* Add script(s) for setting the java environment. Or, perhaps in a post-install?
-
 * Concider generic java packages that allow to have different java env installed
-  and be able to switch between them via script: 'java-choose icedtea7' or
-  'java-choose gcj-jdk' or 'java-choose jdk8', etc, etc...
+  and be able to switch between them via script:
+
+  'java-choose openjdk8'
+
+  or
+
+  'java-choose jdk'
 
 * Do testing beyond just running java programs like eclipse and minecraft.
+  To this end, I now have a jtreg port.