summaryrefslogtreecommitdiff
path: root/lang/openjdk7/patches
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2015-01-27 12:31:06 +0000
committerryoon <ryoon@pkgsrc.org>2015-01-27 12:31:06 +0000
commit26301388e48594ba93286dcece7247a73e9d6515 (patch)
treebd7ce88671587a145723c32b6577cf5845c1e8a1 /lang/openjdk7/patches
parent7d8cd19d81e3a8c4f9c843944231fadca382906a (diff)
downloadpkgsrc-26301388e48594ba93286dcece7247a73e9d6515.tar.gz
Update to 1.7.76
* Disable SCTP support under NetBSD. Changelog: From: http://www.oracle.com/technetwork/java/javase/7u76-relnotes-2389087.html IANA Data 2014j JDK 7u76 contains IANA time zone data version 2014j. For more information, refer to Timezone Data Versions in the JRE Software. New Features and Changes SSLv3 is disabled by default Starting with JDK 7u75 release, the SSLv3 protocol (Secure Socket Layer) has been deactivated and is not available by default. See the java.security.Security property jdk.tls.disabledAlgorithms in <JRE_HOME>/lib/security/java.security file. If SSLv3 is absolutely required, the protocol can be reactivated by removing "SSLv3" from the jdk.tls.disabledAlgorithms property in the java.security file or by dynamically setting this Security property to "true" before JSSE is initialized. It should be noted that SSLv3 is obsolete and should no longer be used. Changes to Java Control Panel Starting with 7u75 release, SSLv3 protocol is removed from Java Control Panel Advanced options. If the user needs to use SSLv3 for applications, re-enable it manually as follows: Enable SSLv3 protocol on JRE level: as described in the previous section. Enable SSLv3 protocol on deploy level: edit the deployment.properties file and add the following: deployment.security.SSLv3=true
Diffstat (limited to 'lang/openjdk7/patches')
-rw-r--r--lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make8
-rw-r--r--lang/openjdk7/patches/patch-jdk_make_com_sun_nio_Makefile19
2 files changed, 23 insertions, 4 deletions
diff --git a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make
index f59d2b3fda8..5ad1f5ca818 100644
--- a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make
+++ b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make
@@ -1,6 +1,6 @@
-$NetBSD: patch-hotspot_make_bsd_makefiles_rules.make,v 1.1 2014/09/13 14:35:25 joerg Exp $
+$NetBSD: patch-hotspot_make_bsd_makefiles_rules.make,v 1.2 2015/01/27 12:31:06 ryoon Exp $
---- hotspot/make/bsd/makefiles/rules.make.orig 2014-09-12 17:24:02.000000000 +0000
+--- hotspot/make/bsd/makefiles/rules.make.orig 2015-01-26 15:21:52.000000000 +0000
+++ hotspot/make/bsd/makefiles/rules.make
@@ -68,12 +68,12 @@ REMOVE_TARGET = rm -f $@
@@ -10,12 +10,12 @@ $NetBSD: patch-hotspot_make_bsd_makefiles_rules.make,v 1.1 2014/09/13 14:35:25 j
-RUN.JAVAP = $(ALT_BOOTDIR)/bin/javap
-RUN.JAVAH = $(ALT_BOOTDIR)/bin/javah
-RUN.JAR = $(ALT_BOOTDIR)/bin/jar
+-COMPILE.JAVAC = $(ALT_BOOTDIR)/bin/javac
+-COMPILE.RMIC = $(ALT_BOOTDIR)/bin/rmic
+RUN.JAVA = $(ALT_BOOTDIR)/bin/java -XX:+UseSerialGC -mx1024m
+RUN.JAVAP = $(ALT_BOOTDIR)/bin/javap -J-XX:+UseSerialGC -J-mx1024m
+RUN.JAVAH = $(ALT_BOOTDIR)/bin/javah -J-XX:+UseSerialGC -J-mx1024m
+RUN.JAR = $(ALT_BOOTDIR)/bin/jar -J-XX:+UseSerialGC -J-mx1024m
--COMPILE.JAVAC = $(ALT_BOOTDIR)/bin/javac
--COMPILE.RMIC = $(ALT_BOOTDIR)/bin/rmic
+COMPILE.JAVAC = $(ALT_BOOTDIR)/bin/javac -J-XX:+UseSerialGC -J-mx1024m
+COMPILE.RMIC = $(ALT_BOOTDIR)/bin/rmic -J-XX:+UseSerialGC -J-mx1024m
BOOT_JAVA_HOME = $(ALT_BOOTDIR)
diff --git a/lang/openjdk7/patches/patch-jdk_make_com_sun_nio_Makefile b/lang/openjdk7/patches/patch-jdk_make_com_sun_nio_Makefile
new file mode 100644
index 00000000000..9798afbf30a
--- /dev/null
+++ b/lang/openjdk7/patches/patch-jdk_make_com_sun_nio_Makefile
@@ -0,0 +1,19 @@
+$NetBSD: patch-jdk_make_com_sun_nio_Makefile,v 1.1 2015/01/27 12:31:06 ryoon Exp $
+
+* NetBSD has no SCTP support.
+
+--- jdk/make/com/sun/nio/Makefile.orig 2015-01-26 15:20:56.000000000 +0000
++++ jdk/make/com/sun/nio/Makefile
+@@ -29,8 +29,12 @@
+
+ BUILDDIR = ../../..
+ include $(BUILDDIR)/common/Defs.gmk
++
++# disable for NetBSD
++ifneq ($(OS_VENDOR), NetBSD)
+ include $(BUILDDIR)/common/Subdirs.gmk
+ SUBDIRS = sctp
++endif
+
+ all build clean clobber::
+ $(SUBDIRS-loop)