mirror of
https://github.com/beard7n/bsdports.git
synced 2026-04-17 05:51:19 +02:00
create bsd12 branch
This commit is contained in:
227
java/openjdk7/Makefile
Normal file
227
java/openjdk7/Makefile
Normal file
@@ -0,0 +1,227 @@
|
||||
#
|
||||
# $Id$
|
||||
#
|
||||
PORTNAME= openjdk
|
||||
PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER}
|
||||
CATEGORIES= java devel
|
||||
MASTER_SITES+= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/
|
||||
MASTER_SITES+= http://download.java.net/jaxp/1.4.5/:jaxp
|
||||
MASTER_SITES+= http://icedtea.classpath.org/download/drops/:jaxp
|
||||
MASTER_SITES+= http://download.java.net/glassfish/components/jax-ws/openjdk/jdk7/:jaxws
|
||||
MASTER_SITES+= http://icedtea.classpath.org/download/drops/:jaxws
|
||||
MASTER_SITES+= https://java.net/downloads/jax-ws/JDK7/:jaf
|
||||
MASTER_SITES+= http://icedtea.classpath.org/download/drops/:jaf
|
||||
MASTER_SITES+= APACHE/ant/binaries/:ant
|
||||
PATCH_SITES= LOCAL/glewis/openjdk7
|
||||
DISTFILES+= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX}
|
||||
DISTFILES+= ${ANT_DISTFILE}${EXTRACT_SUFX}:ant
|
||||
PKGNAMESUFFIX= ${JDK_MAJOR_VERSION}
|
||||
|
||||
EXTRACT_ONLY= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} ${ANT_DISTFILE}${EXTRACT_SUFX}
|
||||
|
||||
BUILD_DEPENDS+= unzip:arch/unzip
|
||||
BUILD_DEPENDS+= zip:arch/zip
|
||||
BUILD_DEPENDS+= ${LOCALBASE}/include/cups/cups.h:print/cups-base
|
||||
BUILD_DEPENDS+= bash:lang/bash
|
||||
|
||||
LIB_DEPENDS+= libasound.so:media/libalsa
|
||||
LIB_DEPENDS+= libfontconfig.so:x11/libfontconfig
|
||||
LIB_DEPENDS+= libfreetype.so:graph/libfreetype2
|
||||
LIB_DEPENDS+= libgif.so:graph/libgif
|
||||
|
||||
LIB_DEPENDS+= libX11.so:x11/libX11
|
||||
LIB_DEPENDS+= libXext.so:x11/libXext
|
||||
LIB_DEPENDS+= libXt.so:x11/libXt
|
||||
LIB_DEPENDS+= libXi.so:x11/libXi
|
||||
LIB_DEPENDS+= libXtst.so:x11/libXtst
|
||||
LIB_DEPENDS+= libXrender.so:x11/libXrender
|
||||
|
||||
|
||||
RUN_DEPENDS+= javavm:java/javavmwrapper
|
||||
RUN_DEPENDS+= xf-dejavu>0:xfont/xf-dejavu
|
||||
|
||||
_PATCHFILES= patch-7u45-b30.xz \
|
||||
patch-7u51-b30.xz \
|
||||
patch-7u55-b31.xz \
|
||||
patch-7u60-b30.xz \
|
||||
patch-7u65-b31.xz \
|
||||
patch-7u71-b14.xz \
|
||||
patch-7u76-b31.xz \
|
||||
patch-7u80-b32.xz \
|
||||
patch-7u85-b02.xz \
|
||||
patch-7u91-b02.xz \
|
||||
patch-7u95-b00.xz \
|
||||
patch-7u101-b00.xz \
|
||||
patch-7u111-b01.xz
|
||||
|
||||
PATCHFILES= patch-7u45-b30.xz \
|
||||
patch-7u51-b30.xz \
|
||||
patch-7u55-b31.xz \
|
||||
patch-7u60-b30.xz \
|
||||
patch-7u65-b31.xz \
|
||||
patch-7u71-b14.xz \
|
||||
patch-7u76-b31.xz \
|
||||
patch-7u80-b32.xz \
|
||||
patch-7u85-b02.xz \
|
||||
patch-7u91-b02.xz \
|
||||
patch-7u95-b00.xz \
|
||||
patch-7u101-b00.xz \
|
||||
patch-7u111-b01.xz \
|
||||
patch-7u121-b00.xz \
|
||||
patch-7u131-b00.xz \
|
||||
patch-7u141-b02.xz \
|
||||
patch-7u151-b01.xz \
|
||||
patch-7u161-b01.xz
|
||||
|
||||
|
||||
MAINTAINER?= glewis@FreeBSD.org
|
||||
COMMENT?= Java Development Kit 7
|
||||
|
||||
WRKSRC= ${WRKDIR}/${PORTNAME}
|
||||
|
||||
USES= compiler dos2unix gmake zip
|
||||
|
||||
JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION}
|
||||
|
||||
#PORT_MINOR_VERSION= 111
|
||||
#PORT_BUILD_NUMBER= 01
|
||||
#JDK_MAJOR_VERSION= 7
|
||||
#JDK_MINOR_VERSION= 40
|
||||
#JDK_BUILD_NUMBER= 43
|
||||
#JDK_BUILD_DATE= 26_aug_2013
|
||||
#JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}-fcs-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE}
|
||||
|
||||
PORT_MINOR_VERSION= 161
|
||||
PORT_BUILD_NUMBER= 01
|
||||
JDK_MAJOR_VERSION= 7
|
||||
JDK_MINOR_VERSION= 40
|
||||
JDK_BUILD_NUMBER= 43
|
||||
JDK_BUILD_DATE= 26_aug_2013
|
||||
JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}-fcs-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE}
|
||||
|
||||
|
||||
|
||||
# Use our own version of ant to avoid circular dependencies
|
||||
ANT_VERSION= 1.9.7
|
||||
ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin
|
||||
|
||||
DOS2UNIX_FILES= jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties
|
||||
|
||||
OPENJDK_OSARCH= bsd-${ARCH:S/i386/i586/}
|
||||
ONLY_FOR_ARCHS= i386 amd64
|
||||
|
||||
NOPRECIOUSMAKEVARS= yes
|
||||
|
||||
#BOOTSTRAPJDKDIR= ${LOCALBASE}/bootstrap-openjdk6
|
||||
|
||||
_MAKE_JOBS= #
|
||||
MAKE_ENV+= LANG="C"
|
||||
MAKE_ENV+= LC_ALL="C"
|
||||
MAKE_ENV+= JAVA_HOME=""
|
||||
MAKE_ENV+= CLASSPATH=""
|
||||
MAKE_ENV+= LD_LIBRARY_PATH=""
|
||||
MAKE_ENV+= MAKEFLAGS=""
|
||||
|
||||
MAKE_ENV+= ALT_BOOTDIR="${BOOTSTRAPJDKDIR}"
|
||||
MAKE_ENV+= ALT_FREETYPE_HEADERS_PATH="${LOCALBASE}/include"
|
||||
MAKE_ENV+= ALT_FREETYPE_LIB_PATH="${LOCALBASE}/lib"
|
||||
MAKE_ENV+= ALT_CUPS_HEADERS_PATH="${LOCALBASE}/include"
|
||||
MAKE_ENV+= ALT_X11_PATH="${LOCALBASE}"
|
||||
MAKE_ENV+= ALT_PKG_PATH="${LOCALBASE}"
|
||||
MAKE_ENV+= ALT_PACKAGE_PATH="${LOCALBASE}"
|
||||
MAKE_ENV+= ANT_HOME="${WRKDIR}/apache-ant-${ANT_VERSION}"
|
||||
MAKE_ENV+= JAVACMD=${BOOTSTRAPJDKDIR}/bin/java
|
||||
MAKE_ENV+= X11DIR="${LOCALBASE}"
|
||||
MAKE_ENV+= LOCALDIR="${LOCALBASE}"
|
||||
MAKE_ENV+= COMPILER_WARNINGS_FATAL="false"
|
||||
MAKE_ENV+= NO_DOCS="true"
|
||||
MAKE_ENV+= SKIP_COMPARE_IMAGES="true"
|
||||
MAKE_ENV+= SKIP_FASTDEBUG_BUILD="true"
|
||||
MAKE_ENV+= SKIP_DEBUG_BUILD="true"
|
||||
MAKE_ENV+= ZIP_DEBUGINFO_FILES=0
|
||||
MAKE_ENV+= ENABLE_FULL_DEBUG_SYMBOLS=0
|
||||
MAKE_ENV+= PTHREAD_LIBS="-lpthread"
|
||||
MAKE_ENV+= MILESTONE="fcs"
|
||||
MAKE_ENV+= JDK_MICRO_VERSION="0_${PORT_MINOR_VERSION}"
|
||||
MAKE_ENV+= BUILD_NUMBER="b${PORT_BUILD_NUMBER}"
|
||||
|
||||
MAKE_ENV+= HOTSPOT_BUILD_JOBS=${MAKE_JOBS_NUMBER}
|
||||
|
||||
#MAKE_ENV+= ALT_PARALLEL_COMPILE_JOBS=1
|
||||
|
||||
MAKE_ARGS= CC=${CC:Q} CXX=${CXX:Q} HOST_CC=${CC:Q}
|
||||
MAKE_ENV+= UNLIMITED_CRYPTO=1
|
||||
|
||||
|
||||
BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk7 \
|
||||
${LOCALBASE}/bootstrap-openjdk6
|
||||
|
||||
# do we have valid native jdk installed?
|
||||
.for BJDK in ${BOOTSTRAP_JDKS}
|
||||
. if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac)
|
||||
BOOTSTRAPJDKDIR= ${BJDK}
|
||||
. endif
|
||||
.endfor
|
||||
|
||||
# if no valid jdk found, set dependency
|
||||
.if !defined(BOOTSTRAPJDKDIR)
|
||||
BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk6
|
||||
BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk6
|
||||
.endif
|
||||
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html
|
||||
#MAKE_ENV+= USE_PRECOMPILED_HEADER=0
|
||||
MAKE_ENV+= EXTRA_CFLAGS=-DLIBICONV_PLUG
|
||||
|
||||
.if ${ARCH} == i386
|
||||
# Fix the build for i386 when WITH_LLD_IS_LD is set
|
||||
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=225741
|
||||
MAKE_ENV+= LFLAGS="-Wl,-z,notext"
|
||||
.endif
|
||||
|
||||
# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html
|
||||
.if ${COMPILER_TYPE} == gcc
|
||||
MAKE_ENV+= USE_PRECOMPILED_HEADER=0
|
||||
.endif
|
||||
|
||||
|
||||
post-patch:
|
||||
${REINPLACE_CMD} "s|%%LOCALBASE%%|${LOCALBASE}|" \
|
||||
${WRKSRC}/hotspot/src/os/bsd/vm/os_bsd.cpp \
|
||||
${WRKSRC}/jdk/src/share/classes/sun/print/PSPrinterJob.java
|
||||
|
||||
JDK_IMAGEDIR= ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image
|
||||
INSTALLDIR= ${PREFIX}/${PKGBASE}
|
||||
|
||||
PLIST= ${PKGDIR}/plist.${ARCH}
|
||||
|
||||
SUB_LIST+= PREFIX=${PREFIX}
|
||||
SUB_LIST+= PORTNAME=${PORTNAME}${PKGNAMESUFFIX}
|
||||
SUB_FILES+= man.conf
|
||||
|
||||
|
||||
do-install:
|
||||
${MKDIR} ${STAGEDIR}${INSTALLDIR}
|
||||
cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR}
|
||||
|
||||
${INSTALL_DATA} \
|
||||
${WRKSRC}/build/${OPENJDK_OSARCH}/btjars/compilefontconfig.jar \
|
||||
${WRKSRC}/build/${OPENJDK_OSARCH}/btjars/javazic.jar \
|
||||
${STAGEDIR}${INSTALLDIR}/jre/lib/
|
||||
${INSTALL_DATA} ${FILESDIR}/cacerts \
|
||||
${STAGEDIR}${INSTALLDIR}/jre/lib/security/cacerts
|
||||
|
||||
cd ${STAGEDIR}${PREFIX}/openjdk7/man/man1 && ${GZIP_CMD} *.1
|
||||
${CHMOD} a+x ${STAGEDIR}${PREFIX}/openjdk7/bin/*
|
||||
${CHMOD} a+x ${STAGEDIR}${PREFIX}/openjdk7/jre/bin/*
|
||||
${CHMOD} a+x ${STAGEDIR}${PREFIX}/openjdk7/jre/lib/*/jexec
|
||||
${CHMOD} a+x ${STAGEDIR}${PREFIX}/openjdk7/jre/lib/*/jspawnhelper
|
||||
${MKDIR} ${STAGEDIR}${PREFIX}/etc/man.d
|
||||
${INSTALL_DATA} ${WRKDIR}/man.conf ${STAGEDIR}${PREFIX}/etc/man.d/${PORTNAME}${PKGNAMESUFFIX}.conf
|
||||
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
#EOF
|
||||
67
java/openjdk7/distinfo
Normal file
67
java/openjdk7/distinfo
Normal file
@@ -0,0 +1,67 @@
|
||||
TIMESTAMP = 1572150346
|
||||
SHA256 (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 00f8ea561876cbcad174ba3ca7a9ae10b50df46a782ac64c2ac57ac357b50596
|
||||
SIZE (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 104575196
|
||||
SHA256 (apache-ant-1.9.7-bin.zip) = b28c5ea0b5ea90bb4ad6bab229b6a56ac4461760a251a12567803a69259cd9de
|
||||
SIZE (apache-ant-1.9.7-bin.zip) = 8317465
|
||||
SHA256 (patch-7u45-b30.xz) = f0ab28db8819a72b82236d98c6780a0fa063cf4d2f45f26105545559e630a1b3
|
||||
SIZE (patch-7u45-b30.xz) = 156968
|
||||
SHA256 (patch-7u51-b30.xz) = af1143952a0f67535c2bdf586b7089af1d525f544974e989fe7b273a925b8359
|
||||
SIZE (patch-7u51-b30.xz) = 170476
|
||||
SHA256 (patch-7u55-b31.xz) = 30d4ae0e98e639dca060f7dc8289fe8af345e93258c8642cad1378725330afa9
|
||||
SIZE (patch-7u55-b31.xz) = 109908
|
||||
SHA256 (patch-7u60-b30.xz) = 1132c6c32f515b735b7b3f78670ec81c3161b7afe8a10f21f68f851c2e776a4c
|
||||
SIZE (patch-7u60-b30.xz) = 324180
|
||||
SHA256 (patch-7u65-b31.xz) = acde33caa1691a6a1bcb4cab71ea01ce73df616d02d023bda053e3f728850d72
|
||||
SIZE (patch-7u65-b31.xz) = 87776
|
||||
SHA256 (patch-7u71-b14.xz) = 2fa4622c55d55e27679ef99ce5d528210d66982abdfae53bf7fa9850e160db27
|
||||
SIZE (patch-7u71-b14.xz) = 66484
|
||||
SHA256 (patch-7u76-b31.xz) = a9ddaf7ee121b29bff9cd0300e7939640f6933223d81a484fa2db575cbb7f3de
|
||||
SIZE (patch-7u76-b31.xz) = 315184
|
||||
SHA256 (patch-7u80-b32.xz) = 095e2f074125a3804710b7276fd96b743befb0472c3a3b5fd3a695511a10ff23
|
||||
SIZE (patch-7u80-b32.xz) = 674268
|
||||
SHA256 (patch-7u85-b02.xz) = 87699747b28ae80cb168f1e2af3dcff65cc0ef9a74decebcf4ee1868b117f971
|
||||
SIZE (patch-7u85-b02.xz) = 78796
|
||||
SHA256 (patch-7u91-b02.xz) = b18c3843d656340fcca0e9b0eb0410a598dbce9c53c84fc6fde53d189bf44829
|
||||
SIZE (patch-7u91-b02.xz) = 152344
|
||||
SHA256 (patch-7u95-b00.xz) = bb522469cedcd31ff15fde745ab5717bd012c52ce2e25d1180b3338b90f755a3
|
||||
SIZE (patch-7u95-b00.xz) = 91612
|
||||
SHA256 (patch-7u101-b00.xz) = 8406d9f453b91c4e31e5a6a0a1769c3da87e3e3bf7a4c567024f7f929f555702
|
||||
SIZE (patch-7u101-b00.xz) = 121752
|
||||
SHA256 (patch-7u111-b01.xz) = d46ffd30a6fa6d8ce40231e6dadcabf491a347e2afea87302f38bab5e2bee523
|
||||
SIZE (patch-7u111-b01.xz) = 273552
|
||||
SHA256 (patch-7u45-b30.xz) = f0ab28db8819a72b82236d98c6780a0fa063cf4d2f45f26105545559e630a1b3
|
||||
SIZE (patch-7u45-b30.xz) = 156968
|
||||
SHA256 (patch-7u51-b30.xz) = af1143952a0f67535c2bdf586b7089af1d525f544974e989fe7b273a925b8359
|
||||
SIZE (patch-7u51-b30.xz) = 170476
|
||||
SHA256 (patch-7u55-b31.xz) = 30d4ae0e98e639dca060f7dc8289fe8af345e93258c8642cad1378725330afa9
|
||||
SIZE (patch-7u55-b31.xz) = 109908
|
||||
SHA256 (patch-7u60-b30.xz) = 1132c6c32f515b735b7b3f78670ec81c3161b7afe8a10f21f68f851c2e776a4c
|
||||
SIZE (patch-7u60-b30.xz) = 324180
|
||||
SHA256 (patch-7u65-b31.xz) = acde33caa1691a6a1bcb4cab71ea01ce73df616d02d023bda053e3f728850d72
|
||||
SIZE (patch-7u65-b31.xz) = 87776
|
||||
SHA256 (patch-7u71-b14.xz) = 2fa4622c55d55e27679ef99ce5d528210d66982abdfae53bf7fa9850e160db27
|
||||
SIZE (patch-7u71-b14.xz) = 66484
|
||||
SHA256 (patch-7u76-b31.xz) = a9ddaf7ee121b29bff9cd0300e7939640f6933223d81a484fa2db575cbb7f3de
|
||||
SIZE (patch-7u76-b31.xz) = 315184
|
||||
SHA256 (patch-7u80-b32.xz) = 095e2f074125a3804710b7276fd96b743befb0472c3a3b5fd3a695511a10ff23
|
||||
SIZE (patch-7u80-b32.xz) = 674268
|
||||
SHA256 (patch-7u85-b02.xz) = 87699747b28ae80cb168f1e2af3dcff65cc0ef9a74decebcf4ee1868b117f971
|
||||
SIZE (patch-7u85-b02.xz) = 78796
|
||||
SHA256 (patch-7u91-b02.xz) = b18c3843d656340fcca0e9b0eb0410a598dbce9c53c84fc6fde53d189bf44829
|
||||
SIZE (patch-7u91-b02.xz) = 152344
|
||||
SHA256 (patch-7u95-b00.xz) = bb522469cedcd31ff15fde745ab5717bd012c52ce2e25d1180b3338b90f755a3
|
||||
SIZE (patch-7u95-b00.xz) = 91612
|
||||
SHA256 (patch-7u101-b00.xz) = 8406d9f453b91c4e31e5a6a0a1769c3da87e3e3bf7a4c567024f7f929f555702
|
||||
SIZE (patch-7u101-b00.xz) = 121752
|
||||
SHA256 (patch-7u111-b01.xz) = d46ffd30a6fa6d8ce40231e6dadcabf491a347e2afea87302f38bab5e2bee523
|
||||
SIZE (patch-7u111-b01.xz) = 273552
|
||||
SHA256 (patch-7u121-b00.xz) = e8cba92ab639210471db536fb316593eef300d67bbf36146922eef0a41b6e86b
|
||||
SIZE (patch-7u121-b00.xz) = 670484
|
||||
SHA256 (patch-7u131-b00.xz) = 5c7b4f9be1d7bc3336ba19c288c882ff5cbd1b1b0ee403f84229cd8807452024
|
||||
SIZE (patch-7u131-b00.xz) = 769172
|
||||
SHA256 (patch-7u141-b02.xz) = 721db525f519417c30d37bcfa80ff715a1e2858e0882e75759b4eaedd6a20510
|
||||
SIZE (patch-7u141-b02.xz) = 165488
|
||||
SHA256 (patch-7u151-b01.xz) = 90f1f83528825290f2183f4122e8cef8e1bac4814a826f449271cc7635ca197c
|
||||
SIZE (patch-7u151-b01.xz) = 217872
|
||||
SHA256 (patch-7u161-b01.xz) = 9c466a4a39a77fab96798ce120dd1dc7446d6930bd25ae5390ce3e9e9a4b8dc2
|
||||
SIZE (patch-7u161-b01.xz) = 364440
|
||||
BIN
java/openjdk7/files/cacerts
Normal file
BIN
java/openjdk7/files/cacerts
Normal file
Binary file not shown.
6
java/openjdk7/files/man.conf.in
Normal file
6
java/openjdk7/files/man.conf.in
Normal file
@@ -0,0 +1,6 @@
|
||||
#
|
||||
# $Id$
|
||||
#
|
||||
MANPATH %%PREFIX%%/%%PORTNAME%%/man
|
||||
#EOF
|
||||
|
||||
48359
java/openjdk7/files/patch-bsd
Normal file
48359
java/openjdk7/files/patch-bsd
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,14 @@
|
||||
--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.prev 2016-05-20 14:03:24.511067000 +0000
|
||||
+++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2016-05-20 14:12:29.670620000 +0000
|
||||
@@ -609,7 +609,11 @@
|
||||
stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
|
||||
}
|
||||
} else if (thread->thread_state() == _thread_in_vm &&
|
||||
+#ifdef __FreeBSD__
|
||||
+ (sig == SIGBUS || sig == SIGSEGV) &&
|
||||
+#else
|
||||
sig == SIGBUS && /* info->si_code == BUS_OBJERR && */
|
||||
+#endif
|
||||
thread->doing_unsafe_access()) {
|
||||
stub = StubRoutines::handler_for_unsafe_access();
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
--- hotspot/make/bsd/makefiles/gcc.make.orig
|
||||
+++ hotspot/make/bsd/makefiles/gcc.make
|
||||
@@ -112,6 +112,7 @@ ifeq ($(JVM_VARIANT_ZEROSHARK), true)
|
||||
CFLAGS += $(LIBFFI_CFLAGS)
|
||||
CFLAGS += $(LLVM_CFLAGS)
|
||||
endif
|
||||
+CFLAGS += -std=gnu++98
|
||||
CFLAGS += $(VM_PICFLAG)
|
||||
CFLAGS += -fno-rtti
|
||||
CFLAGS += -fno-exceptions
|
||||
@@ -0,0 +1,20 @@
|
||||
--- hotspot/src/share/vm/runtime/virtualspace.cpp.orig
|
||||
+++ hotspot/src/share/vm/runtime/virtualspace.cpp
|
||||
@@ -524,7 +524,7 @@ ReservedHeapSpace::ReservedHeapSpace(siz
|
||||
(UseCompressedOops && (Universe::narrow_oop_base() != NULL) &&
|
||||
Universe::narrow_oop_use_implicit_null_checks()) ?
|
||||
lcm(os::vm_page_size(), alignment) : 0) {
|
||||
- if (base() > 0) {
|
||||
+ if (base() != NULL) {
|
||||
MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
|
||||
}
|
||||
|
||||
@@ -543,7 +543,7 @@ ReservedHeapSpace::ReservedHeapSpace(con
|
||||
(UseCompressedOops && (Universe::narrow_oop_base() != NULL) &&
|
||||
Universe::narrow_oop_use_implicit_null_checks()) ?
|
||||
lcm(os::vm_page_size(), prefix_align) : 0) {
|
||||
- if (base() > 0) {
|
||||
+ if (base() != NULL) {
|
||||
MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
|
||||
}
|
||||
|
||||
106
java/openjdk7/files/patch-icedtea-web
Normal file
106
java/openjdk7/files/patch-icedtea-web
Normal file
@@ -0,0 +1,106 @@
|
||||
--- jdk/src/share/classes/sun/applet/AppletPanel.java Mon Nov 22 21:55:09 2010 +0000
|
||||
+++ jdk/src/share/classes/sun/applet/AppletPanel.java Wed Dec 08 23:26:01 2010 +0000
|
||||
@@ -67,7 +67,7 @@ abstract class AppletPanel extends Panel
|
||||
/**
|
||||
* The applet (if loaded).
|
||||
*/
|
||||
- Applet applet;
|
||||
+ protected Applet applet;
|
||||
|
||||
/**
|
||||
* Applet will allow initialization. Should be
|
||||
@@ -161,7 +161,8 @@ abstract class AppletPanel extends Panel
|
||||
* Creates a thread to run the applet. This method is called
|
||||
* each time an applet is loaded and reloaded.
|
||||
*/
|
||||
- synchronized void createAppletThread() {
|
||||
+ //Overridden by NetxPanel.
|
||||
+ protected synchronized void createAppletThread() {
|
||||
// Create a thread group for the applet, and start a new
|
||||
// thread to load the applet.
|
||||
String nm = "applet-" + getCode();
|
||||
@@ -305,7 +306,7 @@ abstract class AppletPanel extends Panel
|
||||
/**
|
||||
* Get an event from the queue.
|
||||
*/
|
||||
- synchronized AppletEvent getNextEvent() throws InterruptedException {
|
||||
+ protected synchronized AppletEvent getNextEvent() throws InterruptedException {
|
||||
while (queue == null || queue.isEmpty()) {
|
||||
wait();
|
||||
}
|
||||
@@ -694,7 +695,8 @@ abstract class AppletPanel extends Panel
|
||||
* applet event processing so that it can be gracefully interrupted from
|
||||
* things like HotJava.
|
||||
*/
|
||||
- private void runLoader() {
|
||||
+ //Overridden by NetxPanel.
|
||||
+ protected void runLoader() {
|
||||
if (status != APPLET_DISPOSE) {
|
||||
showAppletStatus("notdisposed");
|
||||
return;
|
||||
--- jdk/src/share/classes/sun/applet/AppletViewerPanel.java Mon Nov 22 21:55:09 2010 +0000
|
||||
+++ jdk/src/share/classes/sun/applet/AppletViewerPanel.java Wed Dec 08 23:26:01 2010 +0000
|
||||
@@ -42,25 +42,25 @@ import sun.tools.jar.*;
|
||||
*
|
||||
* @author Arthur van Hoff
|
||||
*/
|
||||
-class AppletViewerPanel extends AppletPanel {
|
||||
+public class AppletViewerPanel extends AppletPanel {
|
||||
|
||||
/* Are we debugging? */
|
||||
- static boolean debug = false;
|
||||
+ protected static boolean debug = false;
|
||||
|
||||
/**
|
||||
* The document url.
|
||||
*/
|
||||
- URL documentURL;
|
||||
+ protected URL documentURL;
|
||||
|
||||
/**
|
||||
* The base url.
|
||||
*/
|
||||
- URL baseURL;
|
||||
+ protected URL baseURL;
|
||||
|
||||
/**
|
||||
* The attributes of the applet.
|
||||
*/
|
||||
- Hashtable atts;
|
||||
+ protected Hashtable<String,String> atts;
|
||||
|
||||
/*
|
||||
* JDK 1.1 serialVersionUID
|
||||
@@ -70,7 +70,7 @@ class AppletViewerPanel extends AppletPa
|
||||
/**
|
||||
* Construct an applet viewer and start the applet.
|
||||
*/
|
||||
- AppletViewerPanel(URL documentURL, Hashtable atts) {
|
||||
+ protected AppletViewerPanel(URL documentURL, Hashtable<String,String> atts) {
|
||||
this.documentURL = documentURL;
|
||||
this.atts = atts;
|
||||
|
||||
@@ -106,7 +106,7 @@ class AppletViewerPanel extends AppletPa
|
||||
* Get an applet parameter.
|
||||
*/
|
||||
public String getParameter(String name) {
|
||||
- return (String)atts.get(name.toLowerCase());
|
||||
+ return atts.get(name.toLowerCase());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -202,12 +202,12 @@ class AppletViewerPanel extends AppletPa
|
||||
return (AppletContext)getParent();
|
||||
}
|
||||
|
||||
- static void debug(String s) {
|
||||
+ protected static void debug(String s) {
|
||||
if(debug)
|
||||
System.err.println("AppletViewerPanel:::" + s);
|
||||
}
|
||||
|
||||
- static void debug(String s, Throwable t) {
|
||||
+ protected static void debug(String s, Throwable t) {
|
||||
if(debug) {
|
||||
t.printStackTrace();
|
||||
debug(s);
|
||||
11
java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk
Normal file
11
java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk
Normal file
@@ -0,0 +1,11 @@
|
||||
--- jdk/make/common/Defs-bsd.gmk.orig
|
||||
+++ jdk/make/common/Defs-bsd.gmk
|
||||
@@ -274,7 +274,7 @@ CFLAGS_OPT = $(CC_OPT)
|
||||
CFLAGS_DBG = $(DEBUG_FLAG)
|
||||
CFLAGS_COMMON += $(CFLAGS_REQUIRED)
|
||||
|
||||
-CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS)
|
||||
+CXXFLAGS_COMMON = -std=gnu++98 $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS)
|
||||
CXXFLAGS_OPT = $(CC_OPT)
|
||||
CXXFLAGS_DBG = $(DEBUG_FLAG)
|
||||
CXXFLAGS_COMMON += $(CFLAGS_REQUIRED)
|
||||
@@ -0,0 +1,78 @@
|
||||
--- ./jdk/make/tools/freetypecheck/freetypecheck.c.orig 2013-09-06 14:27:43.000000000 -0400
|
||||
+++ ./jdk/make/tools/freetypecheck/freetypecheck.c 2019-05-29 18:16:30.696642000 -0400
|
||||
@@ -74,26 +74,65 @@
|
||||
#define QUOTEMACRO(x) QUOTEME(x)
|
||||
#define QUOTEME(x) #x
|
||||
|
||||
+int compare_versions(FT_Int req_major, FT_Int req_minor, FT_Int req_patch,
|
||||
+ FT_Int major, FT_Int minor, FT_Int patch) {
|
||||
+ if (major > req_major) {
|
||||
+ printf("Major version %d greater than required major version %d\n",
|
||||
+ major, req_major);
|
||||
+ return 0;
|
||||
+ }
|
||||
+ if (major < req_major) {
|
||||
+ printf("Major version %d less than required major version %d\n",
|
||||
+ major, req_major);
|
||||
+ return -1;
|
||||
+ }
|
||||
+ printf("Major version %d equal to required major version %d\n",
|
||||
+ major, req_major);
|
||||
+ if (minor > req_minor) {
|
||||
+ printf("Minor version %d greater than required minor version %d\n",
|
||||
+ minor, req_minor);
|
||||
+ return 0;
|
||||
+ }
|
||||
+ if (minor < req_minor) {
|
||||
+ printf("Minor version %d less than required minor version %d\n",
|
||||
+ minor, req_minor);
|
||||
+ return -2;
|
||||
+ }
|
||||
+ printf("Minor version %d equal to required minor version %d\n",
|
||||
+ minor, req_minor);
|
||||
+ if (patch >= req_patch) {
|
||||
+ printf("Patch version %d greater than or equal to required patch version %d\n",
|
||||
+ patch, req_patch);
|
||||
+ return 0;
|
||||
+ }
|
||||
+ printf("Patch version %d less than required patch version %d\n",
|
||||
+ patch, req_patch);
|
||||
+ return -3;
|
||||
+}
|
||||
+
|
||||
int main(int argc, char** argv) {
|
||||
- char v[50];
|
||||
- FT_Int major, minor, patch;
|
||||
+ FT_Int major, minor, patch, req_major, req_minor, req_patch;
|
||||
FT_Library library;
|
||||
- sprintf(v, "%d.%d.%d", FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH);
|
||||
|
||||
- printf("Required version of freetype: %s\n",
|
||||
- QUOTEMACRO(REQUIRED_FREETYPE_VERSION));
|
||||
+ sscanf(QUOTEMACRO(REQUIRED_FREETYPE_VERSION),
|
||||
+ "%d.%d.%d", &req_major, &req_minor, &req_patch);
|
||||
+ printf("Required version of freetype: %d.%d.%d\n",
|
||||
+ req_major, req_minor, req_patch);
|
||||
|
||||
- printf("Detected freetype headers: %s\n", v);
|
||||
- if (strcmp(v, QUOTEMACRO(REQUIRED_FREETYPE_VERSION)) < 0) {
|
||||
+ printf("Detected freetype headers: %d.%d.%d\n",
|
||||
+ FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH);
|
||||
+ if (compare_versions(req_major, req_minor, req_patch,
|
||||
+ FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH) < 0) {
|
||||
printf("Failed: headers are too old.\n");
|
||||
}
|
||||
|
||||
FT_Init_FreeType(&library);
|
||||
FT_Library_Version(library, &major, &minor, &patch);
|
||||
- sprintf(v, "%d.%d.%d", major, minor, patch);
|
||||
|
||||
- printf("Detected freetype library: %s\n", v);
|
||||
- if (strcmp(v, QUOTEMACRO(REQUIRED_FREETYPE_VERSION)) < 0) {
|
||||
+ printf("Detected freetype library: %d.%d.%d\n",
|
||||
+ major, minor, patch);
|
||||
+ if (compare_versions(req_major, req_minor, req_patch,
|
||||
+ major, minor, patch) < 0) {
|
||||
printf("Failed: too old library.\n");
|
||||
}
|
||||
|
||||
38
java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp
Normal file
38
java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp
Normal file
@@ -0,0 +1,38 @@
|
||||
--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2014-10-06 17:10:00.000000000 -0400
|
||||
+++ hotspot/src/os/bsd/vm/os_bsd.cpp 2014-10-08 10:23:14.000000000 -0400
|
||||
@@ -458,7 +458,7 @@
|
||||
* 7: The default directories, normally /lib and /usr/lib.
|
||||
*/
|
||||
#ifndef DEFAULT_LIBPATH
|
||||
-#define DEFAULT_LIBPATH "/lib:/usr/lib"
|
||||
+#define DEFAULT_LIBPATH "/lib:/usr/lib:%%LOCALBASE%%/lib"
|
||||
#endif
|
||||
|
||||
#define EXTENSIONS_DIR "/lib/ext"
|
||||
@@ -2947,7 +2947,7 @@
|
||||
if (::write(fd, "", 1) == 1) {
|
||||
mmap(base, size,
|
||||
PROT_READ|PROT_WRITE|PROT_EXEC,
|
||||
- MAP_PRIVATE|MAP_FIXED|MAP_NORESERVE, fd, 0);
|
||||
+ MAP_PRIVATE|MAP_FIXED, fd, 0);
|
||||
}
|
||||
}
|
||||
::close(fd);
|
||||
@@ -3196,7 +3196,7 @@
|
||||
return ::mprotect(addr, size, PROT_NONE) == 0;
|
||||
#else
|
||||
uintptr_t res = (uintptr_t) ::mmap(addr, size, PROT_NONE,
|
||||
- MAP_PRIVATE|MAP_FIXED|MAP_NORESERVE|MAP_ANONYMOUS, -1, 0);
|
||||
+ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0);
|
||||
return res != (uintptr_t) MAP_FAILED;
|
||||
#endif
|
||||
}
|
||||
@@ -3223,7 +3223,7 @@
|
||||
char * addr;
|
||||
int flags;
|
||||
|
||||
- flags = MAP_PRIVATE | MAP_NORESERVE | MAP_ANONYMOUS;
|
||||
+ flags = MAP_PRIVATE | MAP_ANONYMOUS;
|
||||
if (fixed) {
|
||||
assert((uintptr_t)requested_addr % os::Bsd::page_size() == 0, "unaligned address");
|
||||
flags |= MAP_FIXED;
|
||||
63
java/openjdk7/files/patch-src-os-bsd-vm-vmError_bsd.cpp
Normal file
63
java/openjdk7/files/patch-src-os-bsd-vm-vmError_bsd.cpp
Normal file
@@ -0,0 +1,63 @@
|
||||
--- hotspot/src/os/bsd/vm/vmError_bsd.cpp.orig
|
||||
+++ hotspot/src/os/bsd/vm/vmError_bsd.cpp
|
||||
@@ -33,30 +33,50 @@
|
||||
#include <sys/syscall.h>
|
||||
#include <unistd.h>
|
||||
#include <signal.h>
|
||||
+#ifdef __FreeBSD__
|
||||
+#include <limits.h>
|
||||
+#include <sys/sysctl.h>
|
||||
+#endif
|
||||
+
|
||||
+#define GDB_CMD "gdb"
|
||||
+
|
||||
+static void set_debugger(char *buf, int buflen) {
|
||||
+ int pid = os::current_process_id();
|
||||
+#ifdef __FreeBSD__
|
||||
+ char cmd[PATH_MAX+1];
|
||||
+ int name[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, pid };
|
||||
+ size_t len = sizeof(cmd);
|
||||
+ if (sysctl(name, 4, cmd, &len, NULL, 0) == 0 && len > 0) {
|
||||
+ cmd[len] = '\0';
|
||||
+ jio_snprintf(buf, buflen, "%s %s %d", GDB_CMD, cmd, pid);
|
||||
+ } else
|
||||
+#endif
|
||||
+ jio_snprintf(buf, buflen, "%s /proc/%d/file %d", GDB_CMD, pid, pid);
|
||||
+}
|
||||
|
||||
void VMError::show_message_box(char *buf, int buflen) {
|
||||
bool yes;
|
||||
do {
|
||||
- error_string(buf, buflen);
|
||||
- int len = (int)strlen(buf);
|
||||
+ intx tid = os::current_thread_id();
|
||||
+ set_debugger(buf, buflen);
|
||||
+ int len = (int)strlen(buf) + 1;
|
||||
+ char *msg = &buf[len];
|
||||
+ error_string(msg, buflen - len);
|
||||
+ len += (int)strlen(msg);
|
||||
char *p = &buf[len];
|
||||
|
||||
jio_snprintf(p, buflen - len,
|
||||
"\n\n"
|
||||
"Do you want to debug the problem?\n\n"
|
||||
- "To debug, run 'gdb /proc/%d/exe %d'; then switch to thread " INTX_FORMAT " (" INTPTR_FORMAT ")\n"
|
||||
- "Enter 'yes' to launch gdb automatically (PATH must include gdb)\n"
|
||||
+ "To debug, run '%s'; then switch to thread " INTX_FORMAT " (" INTPTR_FORMAT ")\n"
|
||||
+ "Enter 'yes' to launch " GDB_CMD " automatically (PATH must include " GDB_CMD ")\n"
|
||||
"Otherwise, press RETURN to abort...",
|
||||
- os::current_process_id(), os::current_process_id(),
|
||||
- os::current_thread_id(), os::current_thread_id());
|
||||
+ buf, tid, tid);
|
||||
|
||||
- yes = os::message_box("Unexpected Error", buf);
|
||||
+ yes = os::message_box("Unexpected Error", msg);
|
||||
|
||||
if (yes) {
|
||||
// yes, user asked VM to launch debugger
|
||||
- jio_snprintf(buf, buflen, "gdb /proc/%d/exe %d",
|
||||
- os::current_process_id(), os::current_process_id());
|
||||
-
|
||||
os::fork_and_exec(buf);
|
||||
yes = false;
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
--- jdk/src/share/classes/sun/print/PSPrinterJob.java
|
||||
+++ jdk/src/share/classes/sun/print/PSPrinterJob.java
|
||||
@@ -1568,9 +1568,31 @@
|
||||
}
|
||||
|
||||
String osname = System.getProperty("os.name");
|
||||
- if (osname.equals("Linux") || osname.equals("FreeBSD") || osname.equals("NetBSD") || osname.equals("OpenBSD") || osname.equals("OS X")) {
|
||||
+ if (osname.equals("Linux") || osname.endsWith("BSD") || osname.contains("OS X")) {
|
||||
+ String lprPath = "/usr/bin/lpr";
|
||||
+ if (osname.endsWith("BSD")) {
|
||||
+ final PrintService pservice = getPrintService();
|
||||
+ Boolean isIPPPrinter =
|
||||
+ (Boolean)java.security.AccessController.doPrivileged(
|
||||
+ new java.security.PrivilegedAction() {
|
||||
+ public Object run() {
|
||||
+ try {
|
||||
+ Class psClass =
|
||||
+ Class.forName("sun.print.IPPPrintService");
|
||||
+ if (psClass.isInstance(pservice)) {
|
||||
+ return Boolean.TRUE;
|
||||
+ }
|
||||
+ } catch (Throwable t) {
|
||||
+ }
|
||||
+ return Boolean.FALSE;
|
||||
+ }
|
||||
+ });
|
||||
+ if (isIPPPrinter) {
|
||||
+ lprPath = "%%LOCALBASE%%/bin/lpr";
|
||||
+ }
|
||||
+ }
|
||||
execCmd = new String[ncomps];
|
||||
- execCmd[n++] = "/usr/bin/lpr";
|
||||
+ execCmd[n++] = lprPath;
|
||||
if ((pFlags & PRINTER) != 0) {
|
||||
execCmd[n++] = "-P" + printer;
|
||||
}
|
||||
58
java/openjdk7/files/patch-src-solaris-bin-java_md_solinux.c
Normal file
58
java/openjdk7/files/patch-src-solaris-bin-java_md_solinux.c
Normal file
@@ -0,0 +1,58 @@
|
||||
--- jdk/src/solaris/bin/java_md_solinux.c.orig
|
||||
+++ jdk/src/solaris/bin/java_md_solinux.c
|
||||
@@ -35,6 +35,9 @@
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
+#ifdef __FreeBSD__
|
||||
+#include <sys/sysctl.h>
|
||||
+#endif
|
||||
#include "manifest_info.h"
|
||||
#include "version_comp.h"
|
||||
|
||||
@@ -899,9 +902,9 @@
|
||||
* onwards the filename returned in DL_info structure from dladdr is
|
||||
* an absolute pathname so technically realpath isn't required.
|
||||
* On Linux we read the executable name from /proc/self/exe.
|
||||
- * On *BSD we read the executable name from /proc/curproc/file.
|
||||
+ * On FreeBSD, we get the executable name via sysctl(3).
|
||||
* As a fallback, and for platforms other than Solaris, Linux, and
|
||||
- * *BSD, we use FindExecName to compute the executable name.
|
||||
+ * FreeBSD, we use FindExecName to compute the executable name.
|
||||
*/
|
||||
const char*
|
||||
SetExecname(char **argv)
|
||||
@@ -928,13 +931,9 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
-#elif defined(__linux__) || defined(_ALLBSD_SOURCE)
|
||||
+#elif defined(__linux__)
|
||||
{
|
||||
-#if defined(_ALLBSD_SOURCE)
|
||||
- const char* self = "/proc/curproc/file";
|
||||
-#else
|
||||
const char* self = "/proc/self/exe";
|
||||
-#endif
|
||||
char buf[PATH_MAX+1];
|
||||
int len = readlink(self, buf, PATH_MAX);
|
||||
if (len >= 0) {
|
||||
@@ -942,7 +941,17 @@
|
||||
exec_path = JLI_StringDup(buf);
|
||||
}
|
||||
}
|
||||
-#else /* !__solaris__ && !__linux__ && !_ALLBSD_SOURCE */
|
||||
+#elif defined(__FreeBSD__)
|
||||
+ {
|
||||
+ char buf[PATH_MAX+1];
|
||||
+ int name[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
|
||||
+ size_t len = sizeof(buf);
|
||||
+ if (sysctl(name, 4, buf, &len, NULL, 0) == 0 && len > 0) {
|
||||
+ buf[len] = '\0';
|
||||
+ exec_path = JLI_StringDup(buf);
|
||||
+ }
|
||||
+ }
|
||||
+#else /* !__sun && !__linux && !__FreeBSD__ */
|
||||
{
|
||||
/* Not implemented */
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
--- jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig 2015-02-01 19:16:25.000000000 -0800
|
||||
+++ jdk/src/solaris/classes/sun/awt/X11/XWM.java 2015-02-01 19:16:51.000000000 -0800
|
||||
@@ -578,7 +578,7 @@
|
||||
}
|
||||
|
||||
static boolean isMutter() {
|
||||
- return isNetWMName("Mutter");
|
||||
+ return isNetWMName("Mutter") || isNetWMName("GNOME Shell");
|
||||
}
|
||||
|
||||
static boolean isNonReparentingWM() {
|
||||
@@ -0,0 +1,21 @@
|
||||
--- jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java.orig
|
||||
+++ jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java
|
||||
@@ -27,6 +27,7 @@
|
||||
|
||||
import java.nio.file.*;
|
||||
import java.nio.file.attribute.*;
|
||||
+import java.nio.file.spi.FileSystemProvider;
|
||||
import java.io.IOException;
|
||||
|
||||
/**
|
||||
@@ -38,6 +39,10 @@
|
||||
super();
|
||||
}
|
||||
|
||||
+ public BsdFileSystemProvider(FileSystemProvider f) {
|
||||
+ super();
|
||||
+ }
|
||||
+
|
||||
@Override
|
||||
BsdFileSystem newFileSystem(String dir) {
|
||||
return new BsdFileSystem(this, dir);
|
||||
@@ -0,0 +1,37 @@
|
||||
--- jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Sun Mar 10 14:04:37 2013 -0400
|
||||
+++ jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Tue Mar 26 18:25:51 2013 -0700
|
||||
@@ -28,6 +28,8 @@
|
||||
import java.nio.file.spi.FileSystemProvider;
|
||||
import java.security.AccessController;
|
||||
import java.security.PrivilegedAction;
|
||||
+import java.util.Set;
|
||||
+import java.util.HashSet;
|
||||
import sun.security.action.GetPropertyAction;
|
||||
|
||||
/**
|
||||
@@ -37,6 +39,14 @@
|
||||
public class DefaultFileSystemProvider {
|
||||
private DefaultFileSystemProvider() { }
|
||||
|
||||
+ private static final Set<String> validFileSystemProviders
|
||||
+ = new HashSet<String>();
|
||||
+ static {
|
||||
+ validFileSystemProviders.add("sun.nio.fs.SolarisFileSystemProvider");
|
||||
+ validFileSystemProviders.add("sun.nio.fs.LinuxFileSystemProvider");
|
||||
+ validFileSystemProviders.add("sun.nio.fs.BsdFileSystemProvider");
|
||||
+ }
|
||||
+
|
||||
@SuppressWarnings("unchecked")
|
||||
private static FileSystemProvider createProvider(final String cn) {
|
||||
return AccessController
|
||||
@@ -64,6 +74,10 @@
|
||||
public static FileSystemProvider create() {
|
||||
String osname = AccessController
|
||||
.doPrivileged(new GetPropertyAction("os.name"));
|
||||
+ String fileSystemProvider = System
|
||||
+ .getProperty("java.nio.file.spi.DefaultFileSystemProvider");
|
||||
+ if (validFileSystemProviders.contains(fileSystemProvider))
|
||||
+ return createProvider(fileSystemProvider);
|
||||
if (osname.equals("SunOS"))
|
||||
return createProvider("sun.nio.fs.SolarisFileSystemProvider");
|
||||
if (osname.equals("Linux"))
|
||||
@@ -0,0 +1,17 @@
|
||||
--- jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
|
||||
+++ jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
|
||||
@@ -140,12 +140,12 @@
|
||||
static int cmdIndex = UNINITIALIZED;
|
||||
|
||||
String[] lpcFirstCom = {
|
||||
- "/usr/sbin/lpc status | grep : | sed -ne '1,1 s/://p'",
|
||||
+ "/usr/sbin/lpc status all | grep ':$' | sed -ne '1,1 s/://p'",
|
||||
"/usr/sbin/lpc status | grep -E '^[ 0-9a-zA-Z_-]*@' | awk -F'@' '{print $1}'"
|
||||
};
|
||||
|
||||
String[] lpcAllCom = {
|
||||
- "/usr/sbin/lpc status all | grep : | sed -e 's/://'",
|
||||
+ "/usr/sbin/lpc status all | grep ':$' | sed -e 's/://'",
|
||||
"/usr/sbin/lpc status all | grep -E '^[ 0-9a-zA-Z_-]*@' | awk -F'@' '{print $1}' | sort"
|
||||
};
|
||||
|
||||
15
java/openjdk7/pkg-deinstall
Normal file
15
java/openjdk7/pkg-deinstall
Normal file
@@ -0,0 +1,15 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -x
|
||||
|
||||
PREFIX=${PKG_PREFIX}
|
||||
LOCALBASE=${PKG_PREFIX}
|
||||
|
||||
case $2 in
|
||||
DEINSTALL)
|
||||
;;
|
||||
POST-DEINSTALL)
|
||||
${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk7/bin/java
|
||||
;;
|
||||
esac
|
||||
#EOF
|
||||
3
java/openjdk7/pkg-descr
Normal file
3
java/openjdk7/pkg-descr
Normal file
@@ -0,0 +1,3 @@
|
||||
An open-source implementation of the Java Platform, Standard Edition,
|
||||
|
||||
WWW: http://openjdk.java.net/
|
||||
15
java/openjdk7/pkg-install
Normal file
15
java/openjdk7/pkg-install
Normal file
@@ -0,0 +1,15 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -x
|
||||
|
||||
PREFIX=${PKG_PREFIX}
|
||||
LOCALBASE=${PKG_PREFIX}
|
||||
|
||||
case $2 in
|
||||
PRE-INSTALL)
|
||||
;;
|
||||
POST-INSTALL)
|
||||
${LOCALBASE}/bin/registervm ${PREFIX}/openjdk7/bin/java
|
||||
;;
|
||||
esac
|
||||
#EOF
|
||||
18
java/openjdk7/pkg-message
Normal file
18
java/openjdk7/pkg-message
Normal file
@@ -0,0 +1,18 @@
|
||||
[
|
||||
{ type: install
|
||||
message: <<EOM
|
||||
This OpenJDK implementation requires fdescfs(5) mounted on /dev/fd and
|
||||
procfs(5) mounted on /proc for some functionality.
|
||||
|
||||
If you have not done it yet, please do the following:
|
||||
|
||||
mount -t fdescfs fdesc /dev/fd
|
||||
mount -t procfs proc /proc
|
||||
|
||||
To make it permanent, you need the following lines in /etc/fstab:
|
||||
|
||||
fdesc /dev/fd fdescfs rw 0 0
|
||||
proc /proc procfs rw 0 0
|
||||
EOM
|
||||
}
|
||||
]
|
||||
1229
java/openjdk7/plist.amd64
Normal file
1229
java/openjdk7/plist.amd64
Normal file
File diff suppressed because it is too large
Load Diff
1229
java/openjdk7/plist.i386
Normal file
1229
java/openjdk7/plist.i386
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user