From 0d5cdf73eb17eac28ad5e6bd56c71cafb3121ee3 Mon Sep 17 00:00:00 2001 From: kurt Date: Wed, 24 Oct 2012 18:54:03 +0000 Subject: [PATCH] - Restore man pages in PLIST-main. Reported by Tomas Bodzar - Patch to serialize gconf client access which corrects gconf/dbus related crashes. From Christian Schulte - Patch to stop the JDK from querying the locale using the LC_MESSAGES category. From Christian Schulte --- devel/jdk/1.7/Makefile | 6 +- ...sses_sun_net_spi_DefaultProxySelector_java | 16 ++++ ...c_solaris_native_java_lang_java_props_md_c | 36 +++++++++ devel/jdk/1.7/pkg/PLIST-main | 78 +++++++++---------- 4 files changed, 94 insertions(+), 42 deletions(-) create mode 100644 devel/jdk/1.7/patches/patch-jdk_src_share_classes_sun_net_spi_DefaultProxySelector_java create mode 100644 devel/jdk/1.7/patches/patch-jdk_src_solaris_native_java_lang_java_props_md_c diff --git a/devel/jdk/1.7/Makefile b/devel/jdk/1.7/Makefile index c1062681601..ee2b351f062 100644 --- a/devel/jdk/1.7/Makefile +++ b/devel/jdk/1.7/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.51 2012/09/26 18:23:04 naddy Exp $ +# $OpenBSD: Makefile,v 1.52 2012/10/24 18:54:03 kurt Exp $ SHARED_ONLY= Yes ONLY_FOR_ARCHS= i386 amd64 @@ -9,9 +9,9 @@ V= 1.7.0.03 B= b13 PKGNAME= jdk-${V} PKGNAME-main= jdk-${V} -REVISION-main= 0 +REVISION-main= 1 PKGNAME-jre= jre-${V} -REVISION-jre= 0 +REVISION-jre= 1 EPOCH= 0 # see openjdk/jaxp/jaxp.properties & openjdk/jaxws/jaxws.properties diff --git a/devel/jdk/1.7/patches/patch-jdk_src_share_classes_sun_net_spi_DefaultProxySelector_java b/devel/jdk/1.7/patches/patch-jdk_src_share_classes_sun_net_spi_DefaultProxySelector_java new file mode 100644 index 00000000000..4770fc60c6c --- /dev/null +++ b/devel/jdk/1.7/patches/patch-jdk_src_share_classes_sun_net_spi_DefaultProxySelector_java @@ -0,0 +1,16 @@ +$OpenBSD: patch-jdk_src_share_classes_sun_net_spi_DefaultProxySelector_java,v 1.1 2012/10/24 18:54:03 kurt Exp $ + +Crash due to missing synchronization on gconf_client. +Upstream CR 7188755. + +--- jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java.orig Fri Aug 3 06:05:21 2012 ++++ jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java Fri Aug 3 06:05:37 2012 +@@ -339,6 +339,6 @@ public class DefaultProxySelector extends ProxySelecto + } + } + +- private native static boolean init(); +- private native Proxy getSystemProxy(String protocol, String host); ++ private synchronized native static boolean init(); ++ private synchronized native Proxy getSystemProxy(String protocol, String host); + } diff --git a/devel/jdk/1.7/patches/patch-jdk_src_solaris_native_java_lang_java_props_md_c b/devel/jdk/1.7/patches/patch-jdk_src_solaris_native_java_lang_java_props_md_c new file mode 100644 index 00000000000..4a7fb9a81d8 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-jdk_src_solaris_native_java_lang_java_props_md_c @@ -0,0 +1,36 @@ +$OpenBSD: patch-jdk_src_solaris_native_java_lang_java_props_md_c,v 1.4 2012/10/24 18:54:03 kurt Exp $ + +OpenBSD supports only the "C" and "POSIX" locales for all but the +LC_CTYPE locale. + +--- jdk/src/solaris/native/java/lang/java_props_md.c.orig Sat Aug 4 21:43:10 2012 ++++ jdk/src/solaris/native/java/lang/java_props_md.c Sat Aug 4 22:49:04 2012 +@@ -142,7 +142,7 @@ static int ParseLocale(int cat, char ** std_language, + /* Query the locale set for the category */ + lc = setlocale(cat, NULL); + +-#ifndef __linux__ ++#if !defined(__linux__) && !defined(_ALLBSD_SOURCE) + if (lc == NULL) { + return 0; + } +@@ -430,12 +430,19 @@ GetJavaProperties(JNIEnv *env) + &(sprops.format_country), + &(sprops.format_variant), + &(sprops.encoding))) { ++#ifdef __OpenBSD__ ++ sprops.language = sprops.format_language; ++ sprops.script = sprops.format_script; ++ sprops.country = sprops.format_country; ++ sprops.variant = sprops.format_variant; ++#else + ParseLocale(LC_MESSAGES, + &(sprops.language), + &(sprops.script), + &(sprops.country), + &(sprops.variant), + NULL); ++#endif + } else { + sprops.language = "en"; + sprops.encoding = "ISO8859-1"; diff --git a/devel/jdk/1.7/pkg/PLIST-main b/devel/jdk/1.7/pkg/PLIST-main index dbcc9326af3..5691736d2f8 100644 --- a/devel/jdk/1.7/pkg/PLIST-main +++ b/devel/jdk/1.7/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.11 2012/03/19 19:50:57 kurt Exp $ +@comment $OpenBSD: PLIST-main,v 1.12 2012/10/24 18:54:03 kurt Exp $ @option no-default-conflict @conflict jdk->=1.7,<1.8|jdk->=1.7v0,<1.8v0 ${JDKHOME}/ @@ -1025,44 +1025,44 @@ ${JDKHOME}/lib/orb.idl ${JDKHOME}/lib/sa-jdi.jar ${JDKHOME}/lib/tools.jar @mandir ${JDKHOME}/man/ -@comment ${JDKHOME}/man/man1/ -@comment @man ${JDKHOME}/man/man1/appletviewer.1 -@comment @man ${JDKHOME}/man/man1/extcheck.1 -@comment @man ${JDKHOME}/man/man1/idlj.1 -@comment @man ${JDKHOME}/man/man1/jar.1 -@comment @man ${JDKHOME}/man/man1/jarsigner.1 -@comment @man ${JDKHOME}/man/man1/java.1 -@comment @man ${JDKHOME}/man/man1/javac.1 -@comment @man ${JDKHOME}/man/man1/javadoc.1 -@comment @man ${JDKHOME}/man/man1/javah.1 -@comment @man ${JDKHOME}/man/man1/javap.1 -@comment @man ${JDKHOME}/man/man1/jconsole.1 -@comment @man ${JDKHOME}/man/man1/jdb.1 -@comment @man ${JDKHOME}/man/man1/jhat.1 -@comment @man ${JDKHOME}/man/man1/jinfo.1 -@comment @man ${JDKHOME}/man/man1/jmap.1 -@comment @man ${JDKHOME}/man/man1/jps.1 -@comment @man ${JDKHOME}/man/man1/jrunscript.1 -@comment @man ${JDKHOME}/man/man1/jsadebugd.1 -@comment @man ${JDKHOME}/man/man1/jstack.1 -@comment @man ${JDKHOME}/man/man1/jstat.1 -@comment @man ${JDKHOME}/man/man1/jstatd.1 -@comment @man ${JDKHOME}/man/man1/keytool.1 -@comment @man ${JDKHOME}/man/man1/native2ascii.1 -@comment @man ${JDKHOME}/man/man1/orbd.1 -@comment @man ${JDKHOME}/man/man1/pack200.1 -@comment @man ${JDKHOME}/man/man1/policytool.1 -@comment @man ${JDKHOME}/man/man1/rmic.1 -@comment @man ${JDKHOME}/man/man1/rmid.1 -@comment @man ${JDKHOME}/man/man1/rmiregistry.1 -@comment @man ${JDKHOME}/man/man1/schemagen.1 -@comment @man ${JDKHOME}/man/man1/serialver.1 -@comment @man ${JDKHOME}/man/man1/servertool.1 -@comment @man ${JDKHOME}/man/man1/tnameserv.1 -@comment @man ${JDKHOME}/man/man1/unpack200.1 -@comment @man ${JDKHOME}/man/man1/wsgen.1 -@comment @man ${JDKHOME}/man/man1/wsimport.1 -@comment @man ${JDKHOME}/man/man1/xjc.1 +${JDKHOME}/man/man1/ +@man ${JDKHOME}/man/man1/appletviewer.1 +@man ${JDKHOME}/man/man1/extcheck.1 +@man ${JDKHOME}/man/man1/idlj.1 +@man ${JDKHOME}/man/man1/jar.1 +@man ${JDKHOME}/man/man1/jarsigner.1 +@man ${JDKHOME}/man/man1/java.1 +@man ${JDKHOME}/man/man1/javac.1 +@man ${JDKHOME}/man/man1/javadoc.1 +@man ${JDKHOME}/man/man1/javah.1 +@man ${JDKHOME}/man/man1/javap.1 +@man ${JDKHOME}/man/man1/jconsole.1 +@man ${JDKHOME}/man/man1/jdb.1 +@man ${JDKHOME}/man/man1/jhat.1 +@man ${JDKHOME}/man/man1/jinfo.1 +@man ${JDKHOME}/man/man1/jmap.1 +@man ${JDKHOME}/man/man1/jps.1 +@man ${JDKHOME}/man/man1/jrunscript.1 +@man ${JDKHOME}/man/man1/jsadebugd.1 +@man ${JDKHOME}/man/man1/jstack.1 +@man ${JDKHOME}/man/man1/jstat.1 +@man ${JDKHOME}/man/man1/jstatd.1 +@man ${JDKHOME}/man/man1/keytool.1 +@man ${JDKHOME}/man/man1/native2ascii.1 +@man ${JDKHOME}/man/man1/orbd.1 +@man ${JDKHOME}/man/man1/pack200.1 +@man ${JDKHOME}/man/man1/policytool.1 +@man ${JDKHOME}/man/man1/rmic.1 +@man ${JDKHOME}/man/man1/rmid.1 +@man ${JDKHOME}/man/man1/rmiregistry.1 +@man ${JDKHOME}/man/man1/schemagen.1 +@man ${JDKHOME}/man/man1/serialver.1 +@man ${JDKHOME}/man/man1/servertool.1 +@man ${JDKHOME}/man/man1/tnameserv.1 +@man ${JDKHOME}/man/man1/unpack200.1 +@man ${JDKHOME}/man/man1/wsgen.1 +@man ${JDKHOME}/man/man1/wsimport.1 +@man ${JDKHOME}/man/man1/xjc.1 ${JDKHOME}/release ${JDKHOME}/sample/ ${JDKHOME}/sample/README