Security update to u21. Remove patches included in upstream repository.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/jdk/1.7/Makefile,v
retrieving revision 1.63
diff -u -p -r1.63 Makefile
--- Makefile 10 Apr 2013 02:49:05 -0000 1.63
+++ Makefile 6 May 2013 21:47:47 -0000
@@ -5,17 +5,17 @@ ONLY_FOR_ARCHS= i386 amd64
COMMENT-main= Java2(TM) SE Dev Kit v${V}
COMMENT-jre= Java2(TM) SE Runtime Environment v${V}
-V= 1.7.0.17
-B= b02
+V= 1.7.0.21
+B= b11
PKGNAME= jdk-${V}
PKGNAME-main= jdk-${V}
PKGNAME-jre= jre-${V}
-REVISION-main= 1
-REVISION-jre= 1
+REVISION-main= 0
+REVISION-jre= 0
EPOCH= 0
JDK_SRC= openjdk-7u6-fcs-src-b24-28_aug_2012.zip
-PATCH_SET= openjdk-7u17-patch-set-20130310.zip
+PATCH_SET= openjdk-7u21-patch-set-20130506.zip
DISTFILES= ${JDK_SRC} ${PATCH_SET}:1
EXTRACT_ONLY= ${JDK_SRC} ${PATCH_SET}
@@ -87,7 +87,7 @@ MAKE_ENV= ALT_BOOTDIR=${ALT_BOOTDIR} \
USERNAME=${USER} \
MILESTONE=fcs \
BUILD_NUMBER=${B} \
- JDK_UPDATE_VERSION=17 \
+ JDK_UPDATE_VERSION=21 \
HOTSPOT_BUILD_JOBS=${HOTSPOT_BUILD_JOBS}
#ALL_TARGET= debug_build
@@ -128,7 +128,7 @@ post-extract:
@cp -f ${FILESDIR}/PLATFORM_API_BSDOS_PCM.c \
${WRKDIST}/jdk/src/solaris/native/com/sun/media/sound
@cd ${WRKDIST} && \
- ${PATCH} -p0 -z .orig.u17 --quiet < ${WRKDIR}/${PATCH_SET:R}
+ ${PATCH} -p0 -z .orig.u21 --quiet < ${WRKDIR}/${PATCH_SET:R}
@perl -pi -e 's|build-policy install-limited|build-policy
install-unlimited|' \
${WRKDIST}/jdk/make/javax/crypto/Makefile
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/jdk/1.7/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo 12 Mar 2013 04:39:42 -0000 1.16
+++ distinfo 6 May 2013 21:47:47 -0000
@@ -1,4 +1,4 @@
-SHA256 (jdk/openjdk-7u17-patch-set-20130310.zip) =
q1KGrZhGNuCum5hpw/nMj1altanADhT5QSckYI5852U=
+SHA256 (jdk/openjdk-7u21-patch-set-20130506.zip) =
HqckEUjkKJhou48lEboky5WDJLJkd2ZkScT2qkPrIUM=
SHA256 (jdk/openjdk-7u6-fcs-src-b24-28_aug_2012.zip) =
qbsNejvr3IJW/G97Ye2Ep5wU/P/NV3YXgBhDoB7CMfQ=
-SIZE (jdk/openjdk-7u17-patch-set-20130310.zip) = 808897
+SIZE (jdk/openjdk-7u21-patch-set-20130506.zip) = 1088680
SIZE (jdk/openjdk-7u6-fcs-src-b24-28_aug_2012.zip) = 103777502
Index: patches/patch-jdk_make_com_sun_tools_attach_mapfile-bsd
===================================================================
RCS file: patches/patch-jdk_make_com_sun_tools_attach_mapfile-bsd
diff -N patches/patch-jdk_make_com_sun_tools_attach_mapfile-bsd
--- patches/patch-jdk_make_com_sun_tools_attach_mapfile-bsd 29 Mar 2013
15:08:44 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-jdk_make_com_sun_tools_attach_mapfile-bsd,v 1.3 2013/03/29
15:08:44 kurt Exp $
---- jdk/make/com/sun/tools/attach/mapfile-bsd.orig Fri Mar 29 09:15:51 2013
-+++ jdk/make/com/sun/tools/attach/mapfile-bsd Fri Mar 29 09:18:08 2013
-@@ -30,6 +30,7 @@ SUNWprivate_1.1 {
- Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
- Java_sun_tools_attach_BsdVirtualMachine_close;
- Java_sun_tools_attach_BsdVirtualMachine_connect;
-+ Java_sun_tools_attach_BsdVirtualMachine_getTempDir;
- Java_sun_tools_attach_BsdVirtualMachine_open;
- Java_sun_tools_attach_BsdVirtualMachine_sendQuitTo;
- Java_sun_tools_attach_BsdVirtualMachine_socket;
Index: patches/patch-jdk_make_common_Defs-bsd_gmk
===================================================================
RCS file: patches/patch-jdk_make_common_Defs-bsd_gmk
diff -N patches/patch-jdk_make_common_Defs-bsd_gmk
--- patches/patch-jdk_make_common_Defs-bsd_gmk 10 Apr 2013 02:49:05 -0000
1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-jdk_make_common_Defs-bsd_gmk,v 1.9 2013/04/10 02:49:05 kurt
Exp $
---- jdk/make/common/Defs-bsd.gmk.orig Tue Apr 9 20:29:15 2013
-+++ jdk/make/common/Defs-bsd.gmk Tue Apr 9 20:29:40 2013
-@@ -399,7 +399,7 @@ endif
- # the library itself should not.
- #
- VM_NAME = server
--JVMLIB = -Xlinker -rpath -Xlinker $(LIBDIR)/$(LIBARCH)/$(VM_NAME)
-L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
-+JVMLIB = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
- JAVALIB = -ljava $(JVMLIB)
-
- #
Index: patches/patch-jdk_make_sun_awt_mawt_gmk
===================================================================
RCS file: patches/patch-jdk_make_sun_awt_mawt_gmk
diff -N patches/patch-jdk_make_sun_awt_mawt_gmk
--- patches/patch-jdk_make_sun_awt_mawt_gmk 10 Apr 2013 02:49:05 -0000
1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-$OpenBSD: patch-jdk_make_sun_awt_mawt_gmk,v 1.7 2013/04/10 02:49:05 kurt Exp $
---- jdk/make/sun/awt/mawt.gmk.orig Tue Apr 9 15:56:34 2013
-+++ jdk/make/sun/awt/mawt.gmk Tue Apr 9 16:06:19 2013
-@@ -193,16 +193,15 @@ endif
- #
- # Other extra flags needed for compiling.
- #
-+ifneq ($(PLATFORM), bsd))
- CPPFLAGS += -I$(CUPS_HEADERS_PATH)
-
- ifndef HEADLESS
- CPPFLAGS += -I$(OPENWIN_HOME)/include
- LDFLAGS += -L$(OPENWIN_LIB)
--ifeq ($(OS_NAME), netbsd)
--LDFLAGS += -Wl,-R$(OPENWIN_LIB)
--endif
-
- endif # !HEADLESS
-+endif # !PLATFORM
-
- CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
-@@ -226,13 +225,16 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
- -I$(PLATFORM_SRC)/native/$(PKGDIR) \
- $(EVENT_MODEL)
-
--ifeq ($(PLATFORM), macosx)
-+ifneq (,$(findstring $(PLATFORM), bsd macosx))
- CPPFLAGS += -I$(CUPS_HEADERS_PATH)
-
- ifndef HEADLESS
- CPPFLAGS += -I$(MOTIF_DIR)/include \
- -I$(OPENWIN_HOME)/include
- LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
-+ifeq ($(OS_NAME), netbsd)
-+LDFLAGS += -Wl,-R$(OPENWIN_LIB)
-+endif
-
- endif # !HEADLESS
- endif # PLATFORM
Index: patches/patch-jdk_src_share_classes_sun_awt_FontConfiguration_java
===================================================================
RCS file: patches/patch-jdk_src_share_classes_sun_awt_FontConfiguration_java
diff -N patches/patch-jdk_src_share_classes_sun_awt_FontConfiguration_java
--- patches/patch-jdk_src_share_classes_sun_awt_FontConfiguration_java 10 Apr
2013 02:49:05 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-jdk_src_share_classes_sun_awt_FontConfiguration_java,v 1.6
2013/04/10 02:49:05 kurt Exp $
---- jdk/src/share/classes/sun/awt/FontConfiguration.java.orig Tue Apr 9
16:57:50 2013
-+++ jdk/src/share/classes/sun/awt/FontConfiguration.java Tue Apr 9
16:58:31 2013
-@@ -1146,7 +1146,7 @@ public abstract class FontConfiguration {
- */
- HashMap<String, Boolean> existsMap;
- public boolean needToSearchForFile(String fileName) {
-- if (!FontUtilities.isLinux || FontUtilities.isBSD) {
-+ if (!FontUtilities.isLinux && !FontUtilities.isBSD) {
- return false;
- } else if (existsMap == null) {
- existsMap = new HashMap<String, Boolean>();
