head 1.4; access; symbols pkgsrc-2020Q1:1.3.0.2 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.24 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.20 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.18 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.16 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.14 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.12 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.10 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.8 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.6 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.4 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.2.0.18 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.16 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.14 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.12 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.10 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.8 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.6 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.4 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.2 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.1.0.8 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.6 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.4 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.2; locks; strict; comment @# @; 1.4 date 2020.05.17.00.47.06; author tnn; state dead; branches; next 1.3; commitid by06jUrXKAUzQw8C; 1.3 date 2017.08.14.00.02.16; author ryoon; state Exp; branches; next 1.2; commitid FNK38syeYrmeY63A; 1.2 date 2015.06.09.15.03.43; author tnn; state Exp; branches; next 1.1; commitid jdhWNPI67qGNzLoy; 1.1 date 2014.07.21.00.15.41; author ryoon; state Exp; branches 1.1.2.1; next ; commitid fXXqAX2HfQNS2bJx; 1.1.2.1 date 2014.07.21.00.15.41; author spz; state dead; branches; next 1.1.2.2; commitid f7GPXXrOJYN2X0Kx; 1.1.2.2 date 2014.07.27.12.36.21; author spz; state Exp; branches; next ; commitid f7GPXXrOJYN2X0Kx; desc @@ 1.4 log @retire lang/openjdk7 @ text @$NetBSD: patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd,v 1.3 2017/08/14 00:02:16 ryoon Exp $ * Under NetBSD 5, use fork instead of posix_spawn. NetBSD 5 has no posix_spawn. +++ jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd --- jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd.orig 2017-08-13 05:55:20.000000000 +0000 +++ jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd @@@@ -103,14 +103,28 @@@@ final class UNIXProcess extends Process helperpath = toCString(javahome + "/lib/jspawnhelper"); } - String s = System.getProperty( - "jdk.lang.Process.launchMechanism", "posix_spawn"); - - try { - return LaunchMechanism.valueOf(s.toUpperCase(Locale.ENGLISH)); - } catch (IllegalArgumentException e) { - throw new Error(s + " is not a supported " + - "process launch mechanism on this platform."); +/* NetBSD 5 does not have posix_spawn. Use fork instead. */ + String osversion = System.getProperty("os.version"); + if (osname.startsWith("NetBSD") && osversion.startsWith("5")) { + String s = System.getProperty( + "jdk.lang.Process.launchMechanism", "fork"); + + try { + return LaunchMechanism.valueOf(s.toUpperCase(Locale.ENGLISH)); + } catch (IllegalArgumentException e) { + throw new Error(s + " is not a supported " + + "process launch mechanism on this platform."); + } + } else { + String s = System.getProperty( + "jdk.lang.Process.launchMechanism", "posix_spawn"); + + try { + return LaunchMechanism.valueOf(s.toUpperCase(Locale.ENGLISH)); + } catch (IllegalArgumentException e) { + throw new Error(s + " is not a supported " + + "process launch mechanism on this platform."); + } } } }); @ 1.3 log @Update to 1.7.141 * Support build and run under NetBSD PaX MPROTECT environment Changelog: Many bugfixes and security bugfixes @ text @d1 1 a1 1 $NetBSD: patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd,v 1.2 2015/06/09 15:03:43 tnn Exp $ @ 1.2 log @Update to OpenJDK7, Update 80. This is a maintenance release that fixes ~100 bugs in the following subsystems: client-libs: 2d, java.awt, javax.swing core-libs: Support, java.lang, java.lang.class_loading, java.lang:reflect java.net, java.nio, java.nio.charsets, java.util.jar, java.util:i18n core-svc: javax.management deploy: deployment_toolkit, plugin, webstart globalization: locale-data, translation hotspot: compiler, gc, jvmti, runtime, svc security-libs: java.security, javax.crypto, javax.crypto:pkcs11, javax.net.ssl, org.ietf.jgss:krb5 tools: javac xml: jaxp @ text @d1 1 a1 1 $NetBSD$ d6 2 @ 1.1 log @Bump PKGREVISION. Fix PR pkg/48982. * Use fork instead of posix_spawn under NetBSD 5. @ text @a4 1 --- jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd.orig 2014-06-14 20:38:31.000000000 +0000 d6 1 a6 1 @@@@ -102,14 +102,28 @@@@ final class UNIXProcess extends Process d14 1 a14 1 - return LaunchMechanism.valueOf(s.toUpperCase()); d25 1 a25 1 + return LaunchMechanism.valueOf(s.toUpperCase()); d35 1 a35 1 + return LaunchMechanism.valueOf(s.toUpperCase()); @ 1.1.2.1 log @file patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd was added on branch pkgsrc-2014Q2 on 2014-07-27 12:36:21 +0000 @ text @d1 43 @ 1.1.2.2 log @Pullup ticket #4465 - requested by dholland lang/openjdk7: fix for netbsd-5 Revisions pulled up: - lang/openjdk7/Makefile 1.71-1.72 - lang/openjdk7/bootstrap.mk 1.11 - lang/openjdk7/distinfo 1.50-1.51 - lang/openjdk7/patches/patch-aa 1.12 - lang/openjdk7/patches/patch-ak 1.7 - lang/openjdk7/patches/patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java 1.1 - lang/openjdk7/patches/patch-jdk_make_java_net_FILES__c.gmk 1.1 - lang/openjdk7/patches/patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd 1.1 - lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c 1.1 - lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_java__props__md.c 1.1 - lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.h 1.1 - lang/openjdk7/patches/patch-jdk_test_jprt.config 1.1 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: ryoon Date: Mon Jul 21 00:15:41 UTC 2014 Modified Files: pkgsrc/lang/openjdk7: Makefile distinfo Added Files: pkgsrc/lang/openjdk7/patches: patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c Log Message: Bump PKGREVISION. Fix PR pkg/48982. * Use fork instead of posix_spawn under NetBSD 5. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 pkgsrc/lang/openjdk7/Makefile cvs rdiff -u -r1.49 -r1.50 pkgsrc/lang/openjdk7/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/lang/openjdk7/patches/patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd \ pkgsrc/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c ------------------------------------------------------------------- Module Name: pkgsrc Committed By: ryoon Date: Fri Jul 25 20:35:14 UTC 2014 Modified Files: pkgsrc/lang/openjdk7: Makefile bootstrap.mk distinfo pkgsrc/lang/openjdk7/patches: patch-aa patch-ak Added Files: pkgsrc/lang/openjdk7/patches: patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java patch-jdk_make_java_net_FILES__c.gmk patch-jdk_src_solaris_native_java_lang_java__props__md.c patch-jdk_src_solaris_native_java_net_net__util__md.h patch-jdk_test_jprt.config Log Message: Bump PKGREVISION * Use working bootstrap kits for DragonFly from DPorts. * Borrow patches from DragonFly Dports. Fix build under DragonFly 3.6.2 and 3.8.1. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 pkgsrc/lang/openjdk7/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/openjdk7/bootstrap.mk cvs rdiff -u -r1.50 -r1.51 pkgsrc/lang/openjdk7/distinfo cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/openjdk7/patches/patch-aa cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/openjdk7/patches/patch-ak cvs rdiff -u -r0 -r1.1 \ pkgsrc/lang/openjdk7/patches/patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java \ pkgsrc/lang/openjdk7/patches/patch-jdk_make_java_net_FILES__c.gmk \ pkgsrc/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_java__props__md.c \ pkgsrc/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.h \ pkgsrc/lang/openjdk7/patches/patch-jdk_test_jprt.config @ text @a0 43 $NetBSD$ * Under NetBSD 5, use fork instead of posix_spawn. NetBSD 5 has no posix_spawn. --- jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd.orig 2014-06-14 20:38:31.000000000 +0000 +++ jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd @@@@ -102,14 +102,28 @@@@ final class UNIXProcess extends Process helperpath = toCString(javahome + "/lib/jspawnhelper"); } - String s = System.getProperty( - "jdk.lang.Process.launchMechanism", "posix_spawn"); - - try { - return LaunchMechanism.valueOf(s.toUpperCase()); - } catch (IllegalArgumentException e) { - throw new Error(s + " is not a supported " + - "process launch mechanism on this platform."); +/* NetBSD 5 does not have posix_spawn. Use fork instead. */ + String osversion = System.getProperty("os.version"); + if (osname.startsWith("NetBSD") && osversion.startsWith("5")) { + String s = System.getProperty( + "jdk.lang.Process.launchMechanism", "fork"); + + try { + return LaunchMechanism.valueOf(s.toUpperCase()); + } catch (IllegalArgumentException e) { + throw new Error(s + " is not a supported " + + "process launch mechanism on this platform."); + } + } else { + String s = System.getProperty( + "jdk.lang.Process.launchMechanism", "posix_spawn"); + + try { + return LaunchMechanism.valueOf(s.toUpperCase()); + } catch (IllegalArgumentException e) { + throw new Error(s + " is not a supported " + + "process launch mechanism on this platform."); + } } } }); @