commit dcd1b706d2bbe2a962c319eff04ddf9bf52173ed Author: John Vogel <jvogel4@stny.rr.com> Date: Fri Dec 28 11:44:37 2018 -0500 openjdk8: add versioning for all downloaded files. Also, add note in README about unversioned source urls. diff --git a/openjdk8/.signature b/openjdk8/.signature index 51ad875a..7755bca5 100644 --- a/openjdk8/.signature +++ b/openjdk8/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF343qw2iN+5nsiMPAp3TRZxWc7aDNgSZFnY+/kQlwYEWVFJFAnyrOnpebpIHi0Q42vw/wXD2/GTgDvlxD4+LN3AM= -SHA256 (Pkgfile) = 97b8bf63bfc796f581ea0fd3a6219fa833373fa8476e88fbb9fd7d17b008bd40 +RWSagIOpLGJF36n0clmvQ+5AjDl0fDMEJ/RHd1DM5tedobB+uAzx22H/fVECRKbsNr5owCd8aCWK7VtKVE4BsKZGq9uB0kdFFwk= +SHA256 (Pkgfile) = 146e36443e17ee05961396c65012c39de1be3476dacdaa9faf9b8a77d89a82e8 SHA256 (.footprint) = fd6b80c3b2a7306f2b3e85653ad0d7fdcb5062901a15c00fe393ffd6a7c36e23 SHA256 (icedtea-3.9.0.tar.xz) = 45577f65e61509fcfa1dfce06ff9c33ef5cfea0e308dc1f63e120975ce7bdc3c SHA256 (corba-8u181-b13.tar.xz) = 47cfbcd6612af9161e35b8ed5ffe5519624062ccaa3b5cc2f1a13b1d9228d380 @@ -11,6 +11,6 @@ SHA256 (jdk-8u181-b13.tar.xz) = 496b164f739f37ef241faea8329be9654b92c42633a9849f SHA256 (langtools-8u181-b13.tar.xz) = 0910b84754e5c36ab93acd2f617a8cb6095a4db76130de001193dca93a96af03 SHA256 (nashorn-8u181-b13.tar.xz) = 170f328f57bc1efe50c31bfcee459e15cfb251f77a67c1f6a69d8634e51f8138 SHA256 (openjdk-8u181-b13.tar.xz) = 0889cdfb8620950bc9922ef58df8313dc85b5be27dd515bfbfcfbc1bce1a1f46 +SHA256 (certdata-dc2f7806fbc1.txt) = 35b415062acb8c2c27607083b5b3bec8f4ff57463c9b9f06db3e8df3ea895592 +SHA256 (mozilla-rootcerts-2018Q3.sh) = 45bf640ca551ecbb5e7a9c3121f67c3d9fd256b0f58916b7d5a5a40d5bee98ba SHA256 (openjdk8-boot-20181102-bin.tar.xz) = 8028fbd65c8aedef6e71ea8e375f28c132296417fe065d98539a4eabf410e1e3 -SHA256 (mozilla-rootcerts.sh) = 45bf640ca551ecbb5e7a9c3121f67c3d9fd256b0f58916b7d5a5a40d5bee98ba -SHA256 (certdata.txt) = a3ac15b98179dd2f3c5de076d10b1d53048754372f7207c2f327510cdd78fbd8 diff --git a/openjdk8/Pkgfile b/openjdk8/Pkgfile index 5cc0e090..3bb6ca39 100644 --- a/openjdk8/Pkgfile +++ b/openjdk8/Pkgfile @@ -9,7 +9,7 @@ icedtea_version=3.9.0 boot_version=20181102 pkgsrc_quarter=2018Q3 certdata_rev=dc2f7806fbc1 -release=1 +release=2 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 @@ -19,9 +19,10 @@ 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/$name-boot-$boot_version-bin.tar.xz - http://ftp.netbsd.org/pub/pkgsrc/pkgsrc-$pkgsrc_quarter/pkgsrc/security/mozi... - http://hg.mozilla.org/releases/mozilla-release/raw-file/$certdata_rev/securi...) + 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() { for file in ${source[@]}; do @@ -133,7 +134,7 @@ build() { -e '/@RM@/s,,/bin/rm,' \ -e 's,self extract,self -f $certfile extract,' \ -e 's,self rehash,self -f $certfile rehash,' \ - $SRC/mozilla-rootcerts.sh > $SRC/mozilla-rootcerts + $SRC/mozilla-rootcerts-$pkgsrc_quarter.sh > $SRC/mozilla-rootcerts export JAVA_HOME=$PKG/usr/lib/java/$name export PATH=$JAVA_HOME/bin:$OLD_PATH @@ -143,7 +144,7 @@ build() { rm -f $PKG/usr/lib/java/$name/jre/lib/security/cacerts mkdir $SRC/cacerts cd $SRC/cacerts - sh $SRC/mozilla-rootcerts -f $SRC/certdata.txt extract + sh $SRC/mozilla-rootcerts -f $SRC/certdata-$certdata_rev.txt extract for cert in *.pem; do keytool \ -noprompt \ diff --git a/openjdk8/README b/openjdk8/README index 1dfcb0fe..bb586601 100644 --- a/openjdk8/README +++ b/openjdk8/README @@ -1,15 +1,27 @@ NOTES: ===== -The following packages do not exist but might be nice to have: +* 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/securi... +http://ftp.netbsd.org/pub/pkgsrc/pkgsrc-$pkgsrc_quarter/pkgsrc/security/mozi... + + 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 following packages do not exist but might be nice to have: + 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). + + (Actually, I have private ports for these, but need to determine if there is + any actual benefit from adding and depending on them). + TODO: ==== -* Add script(s) for setting the java environment. +* 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