diff options
| author | tnn <tnn@pkgsrc.org> | 2015-02-03 16:50:30 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2015-02-03 16:50:30 +0000 |
| commit | d7eae9a5010f92675532c78bf21778e8638e26f6 (patch) | |
| tree | 4df2a9799cfd987bf03d1dea0b3f7d7934560d98 /lang | |
| parent | 115abcb3011dafa34cd368e7ef0f58f89dc4dd74 (diff) | |
| download | pkgsrc-d7eae9a5010f92675532c78bf21778e8638e26f6.tar.gz | |
Replace the old cacert bundle from 2009 with security/mozilla-rootcerts.
Change the keystore password to the one used by official binary releases.
Bump PKGREVISION.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/openjdk7/Makefile | 22 | ||||
| -rw-r--r-- | lang/openjdk7/distinfo | 5 |
2 files changed, 13 insertions, 14 deletions
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index 43e678b6fb0..74a621a7dd1 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.83 2015/01/27 12:31:06 ryoon Exp $ +# $NetBSD: Makefile,v 1.84 2015/02/03 16:50:30 tnn Exp $ DISTNAME= openjdk-1.7.76-20150127 PKGNAME= openjdk7-1.7.76 +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} EXTRACT_SUFX= .tar.bz2 @@ -22,10 +23,6 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} #PATCHFILES+= jdk-7u21-20130526.diff #PATCH_SITES+= ${MASTER_SITE_LOCAL:=openjdk7/} -CACERTS= cacerts-20091013.tar.bz2 -DISTFILES+= ${CACERTS} -EXTRACT_ONLY+= ${CACERTS} - JAVA_NAME= openjdk7 JAVA_HOME= ${PREFIX}/java/${JAVA_NAME} JAVA_WRAPPERS= jar java javac javadoc javah javap keytool orbd \ @@ -38,6 +35,7 @@ MAKE_ENV+= PKGSRC_UNZIPSFX=${TOOLS_PATH.unzip}sfx DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf #DEPENDS+= ja-sazanami-ttf-[0-9]*:../../fonts/ja-sazanami-ttf #DEPENDS+= baekmuk-ttf-[0-9]*:../../fonts/baekmuk-ttf +BUILD_DEPENDS+= mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts NO_CONFIGURE= yes USE_LANGUAGES= c c++ @@ -230,14 +228,18 @@ ${WRKDIR}/stage3-done: ${WRKDIR}/stage2-done ${WRKDIR}/cacerts.out touch ${WRKDIR}/stage3-done ${WRKDIR}/cacerts.out: - for cert in ${WRKDIR}/cacerts/*.crt; do \ - ${ECHO} yes | LD_LIBRARY_PATH=${LD_LIBRARY_PATH} \ - LC_ALL=C ${BUILDDIR}/bin/keytool \ + mkdir ${WRKDIR}/cacerts && cd ${WRKDIR}/cacerts && \ + ${PREFIX}/sbin/mozilla-rootcerts extract + for cert in ${WRKDIR}/cacerts/*.pem; do \ + ${INFO_MSG} "Importing $$cert" && \ + ${SETENV} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} LC_ALL=C \ + ${BUILDDIR}/bin/keytool \ + -noprompt \ -importcert \ -keystore ${.TARGET} \ - -alias `${ECHO} $$cert | sed 's,.*/\\([^/]*\\)\\.crt,\\1,'` \ + -alias `${ECHO} $$cert | sed 's,.*/\\([^/]*\\)\\.pem,\\1,'` \ -file $$cert \ - -storepass pkgsrc; \ + -storepass changeit; \ done do-install: diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo index 863e4359ba7..543ef646eca 100644 --- a/lang/openjdk7/distinfo +++ b/lang/openjdk7/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.65 2015/01/30 09:43:52 abs Exp $ +$NetBSD: distinfo,v 1.66 2015/02/03 16:50:30 tnn Exp $ SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306 RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260 @@ -30,9 +30,6 @@ Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2) = 40161195 SHA1 (openjdk7/bootstrap-jdk7u71-bin-freebsd-10-x86_64-20150101.tar.bz2) = 7e85c42f75f014e88eb62580979f6a0fc9b6e957 RMD160 (openjdk7/bootstrap-jdk7u71-bin-freebsd-10-x86_64-20150101.tar.bz2) = d84d7b82205f23827ef9ce672602d0ba8a9a9c72 Size (openjdk7/bootstrap-jdk7u71-bin-freebsd-10-x86_64-20150101.tar.bz2) = 37448005 bytes -SHA1 (openjdk7/cacerts-20091013.tar.bz2) = 905e88e6e2ccdbfe1f36c1dace7cc687fba78890 -RMD160 (openjdk7/cacerts-20091013.tar.bz2) = 0f4e14197016201ff65272a944eafecc6f2d5770 -Size (openjdk7/cacerts-20091013.tar.bz2) = 55894 bytes SHA1 (openjdk7/icedtea-2.5.3.tar.xz) = c509018b108ec6d8e5c8380c9b42d5fba426c632 RMD160 (openjdk7/icedtea-2.5.3.tar.xz) = c386237bc07fa535b1cfd0cf95fc0bc50ab067c3 Size (openjdk7/icedtea-2.5.3.tar.xz) = 2021560 bytes |