Update to Java 7u65, including some security fixes.
Committing on behalf of kurt@
This commit is contained in:
parent
be45cf16ed
commit
feb954cc99
@ -1,22 +1,20 @@
|
||||
# $OpenBSD: Makefile,v 1.70 2014/05/07 15:42:15 kurt Exp $
|
||||
# $OpenBSD: Makefile,v 1.71 2014/08/22 09:16:05 sthen Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
ONLY_FOR_ARCHS= i386 amd64
|
||||
|
||||
COMMENT-main= Java2(TM) SE Dev Kit v${V}
|
||||
COMMENT-jre= Java2(TM) SE Runtime Environment v${V}
|
||||
U= 55
|
||||
U= 65
|
||||
V= 1.7.0.${U}
|
||||
B= b13
|
||||
B= b17
|
||||
PKGNAME= jdk-${V}
|
||||
PKGNAME-main= jdk-${V}
|
||||
PKGNAME-jre= jre-${V}
|
||||
REVISION-main= 1
|
||||
REVISION-jre= 1
|
||||
EPOCH= 0
|
||||
|
||||
JDK_SRC= openjdk-7u40-fcs-src-b43-26_aug_2013.zip
|
||||
PATCH_SET= openjdk-7u${U}-patch-set-20140428.zip
|
||||
PATCH_SET= openjdk-7u${U}-patch-set-20140723.zip
|
||||
|
||||
DISTFILES= ${JDK_SRC} ${PATCH_SET}:1
|
||||
EXTRACT_ONLY= ${JDK_SRC} ${PATCH_SET}
|
||||
|
@ -1,10 +1,10 @@
|
||||
SHA256 (jdk/apache-ant-1.9.3-bin.tar.gz) = GiSFWZZqw1Rzn2rjsp0eQKIMeFcI90XYPY8/DpO04jE=
|
||||
SHA256 (jdk/openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = APjqVhh2y8rRdLo8p6muELUN9Gp4KsZMKsV6w1e1BZY=
|
||||
SHA256 (jdk/openjdk-7u55-patch-set-20140428.zip) = Z8jP0jO85C/EQZvA8Bf0YZy+FNNgzulMgbciw43nHSk=
|
||||
SHA256 (jdk/openjdk-7u65-patch-set-20140723.zip) = SIr/YwHY2LBsvGUbjfXpuazsHW6/5/LA8duUyr/066c=
|
||||
SHA256 (jdk/openjdk7-bootjdk-amd64-20140430.tar.gz) = ULX8onzrKqL+tBdfcJm6IdIXlzBwzxWvKb65/swUDI0=
|
||||
SHA256 (jdk/openjdk7-bootjdk-i386-20140430.tar.gz) = r4SkczULVxBdaUjJmsJHm77qK6pmjWl6rC7dCA10FnY=
|
||||
SIZE (jdk/apache-ant-1.9.3-bin.tar.gz) = 5529017
|
||||
SIZE (jdk/openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 104575196
|
||||
SIZE (jdk/openjdk-7u55-patch-set-20140428.zip) = 999744
|
||||
SIZE (jdk/openjdk-7u65-patch-set-20140723.zip) = 1289036
|
||||
SIZE (jdk/openjdk7-bootjdk-amd64-20140430.tar.gz) = 67983497
|
||||
SIZE (jdk/openjdk7-bootjdk-i386-20140430.tar.gz) = 69631488
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-jre,v 1.13 2014/05/07 15:42:15 kurt Exp $
|
||||
@comment $OpenBSD: PLIST-jre,v 1.14 2014/08/22 09:16:05 sthen Exp $
|
||||
@pkgpath devel/jdk/1.6,-jre
|
||||
@option no-default-conflict
|
||||
@conflict jre->=1.7,<1.8|jre->=1.7v0,<1.8v0
|
||||
@ -324,6 +324,7 @@ ${JREHOME}/lib/zi/Antarctica/Mawson
|
||||
${JREHOME}/lib/zi/Antarctica/Palmer
|
||||
${JREHOME}/lib/zi/Antarctica/Rothera
|
||||
${JREHOME}/lib/zi/Antarctica/Syowa
|
||||
${JREHOME}/lib/zi/Antarctica/Troll
|
||||
${JREHOME}/lib/zi/Antarctica/Vostok
|
||||
${JREHOME}/lib/zi/Asia/
|
||||
${JREHOME}/lib/zi/Asia/Aden
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.15 2014/05/07 15:42:15 kurt Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.16 2014/08/22 09:16:05 sthen Exp $
|
||||
@pkgpath devel/jdk/1.6,-jdk
|
||||
@option no-default-conflict
|
||||
@conflict jdk->=1.7,<1.8|jdk->=1.7v0,<1.8v0
|
||||
@ -751,6 +751,7 @@ ${JDKHOME}/jre/lib/zi/Antarctica/Mawson
|
||||
${JDKHOME}/jre/lib/zi/Antarctica/Palmer
|
||||
${JDKHOME}/jre/lib/zi/Antarctica/Rothera
|
||||
${JDKHOME}/jre/lib/zi/Antarctica/Syowa
|
||||
${JDKHOME}/jre/lib/zi/Antarctica/Troll
|
||||
${JDKHOME}/jre/lib/zi/Antarctica/Vostok
|
||||
${JDKHOME}/jre/lib/zi/Asia/
|
||||
${JDKHOME}/jre/lib/zi/Asia/Aden
|
||||
|
Loading…
Reference in New Issue
Block a user