kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 1.8.152

Browse source 
Changelog:
Security bug fixes:
CVE-2017-10285
CVE-2017-10388
CVE-2017-10309
CVE-2017-10274
CVE-2017-10356
CVE-2017-10293
CVE-2017-10342
CVE-2017-10350
CVE-2017-10349
CVE-2017-10348
CVE-2017-10357
CVE-2016-9841
CVE-2016-10165
CVE-2017-10355
CVE-2017-10281
CVE-2017-10347
CVE-2017-10386
CVE-2017-10380
CVE-2017-10295
CVE-2017-10341
CVE-2017-10345
This commit is contained in:
ryoon 2017-11-28 05:07:25 +00:00
parent a0669fe840
commit 24e631e5b3
7 changed files with 67 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lang/openjdk8/Makefile
View file

@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.54 2017/11/23 17:20:01 wiz Exp $
# $NetBSD: Makefile,v 1.55 2017/11/28 05:07:25 ryoon Exp $
DISTNAME= openjdk-1.8.144-20170830
PKGNAME= openjdk8-1.8.144
PKGREVISION= 2
DISTNAME= openjdk-1.8.152-20171128
PKGNAME= openjdk8-1.8.152
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/}
EXTRACT_SUFX= .tar.xz

8
lang/openjdk8/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.7 2017/03/31 07:55:14 abs Exp $
@comment $NetBSD: PLIST,v 1.8 2017/11/28 05:07:25 ryoon Exp $
bin/openjdk8-jar
bin/openjdk8-java
bin/openjdk8-javac
@ -433,12 +433,14 @@ java/openjdk8/jre/lib/psfont.properties.ja
java/openjdk8/jre/lib/psfontj2d.properties
java/openjdk8/jre/lib/resources.jar
java/openjdk8/jre/lib/rt.jar
java/openjdk8/jre/lib/security/US_export_policy.jar
java/openjdk8/jre/lib/security/blacklisted.certs
java/openjdk8/jre/lib/security/cacerts
java/openjdk8/jre/lib/security/java.policy
java/openjdk8/jre/lib/security/java.security
java/openjdk8/jre/lib/security/local_policy.jar
java/openjdk8/jre/lib/security/policy/limited/US_export_policy.jar
java/openjdk8/jre/lib/security/policy/limited/local_policy.jar
java/openjdk8/jre/lib/security/policy/unlimited/US_export_policy.jar
java/openjdk8/jre/lib/security/policy/unlimited/local_policy.jar
java/openjdk8/jre/lib/sound.properties
java/openjdk8/jre/lib/tzdb.dat
java/openjdk8/lib/${ARCH}/jexec

18
lang/openjdk8/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.50 2017/09/02 04:13:41 ryoon Exp $
$NetBSD: distinfo,v 1.51 2017/11/28 05:07:25 ryoon Exp $
SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
@ -44,10 +44,10 @@ SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29b
RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140
SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 1403e582dacd0474e57d9aa8f1333060c50d099ef5d2c5a992ff7f63dcde2e538ff1e7fb78e45d12fd5aea6daf0704672e7f326399d415ee0d6bb53b6f925e9f
Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes
SHA1 (openjdk7/openjdk-1.8.144-20170830.tar.xz) = a897c539fec09e9f97769f4fd64e4f387569c8b4
RMD160 (openjdk7/openjdk-1.8.144-20170830.tar.xz) = 4506dc7484898d397adf34922d534082d9f598ad
SHA512 (openjdk7/openjdk-1.8.144-20170830.tar.xz) = 207f9ba412276a87b6305c83290266a65f7a9ae93299bcf8e6169863c1fceeae4345687efb99b3c02822c84f2d1ad0bec66c66c6a74c002958a4bc2db34ed0a7
Size (openjdk7/openjdk-1.8.144-20170830.tar.xz) = 55434592 bytes
SHA1 (openjdk7/openjdk-1.8.152-20171128.tar.xz) = e4937fd9af8c1a111358a3a8d64fc6765509cd23
RMD160 (openjdk7/openjdk-1.8.152-20171128.tar.xz) = db7f212a789ab2265d802e51c6c5274a97151c65
SHA512 (openjdk7/openjdk-1.8.152-20171128.tar.xz) = 4e3e3c1c4049071df292b317ab4d7ec2fe0c98b3d1f628a61997f8a564936dba1380691a8ef04fb84b2759fd9db34fe0646f4fb7959084acd6ffba022d69597a
Size (openjdk7/openjdk-1.8.152-20171128.tar.xz) = 55518112 bytes
SHA1 (patch-aa) = 512a42ff1a0d6c4a0672ec32e9396cc0c5c8c9fb
SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c
SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178
@ -59,7 +59,7 @@ SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63
SHA1 (patch-bi) = 190056b3d4c42986ae0a600668b02711598361b8
SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
SHA1 (patch-common_autoconf_boot-jdk.m4) = 530da90ea4062f9d8c208557ff634579b0b19f55
SHA1 (patch-common_autoconf_generated-configure.sh) = 116f1b37fc737ca30998a28b40ef00f7be95a744
SHA1 (patch-common_autoconf_generated-configure.sh) = becb70acee2cfaa5f8bab588ece118303fe1f123
SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b
SHA1 (patch-hotspot_agent_src_os_bsd_Makefile) = a686ca478011561df93cce6311b5a344d79c3a24
SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928
@ -106,12 +106,12 @@ SHA1 (patch-hotspot_src_share_vm_runtime_arguments.cpp) = 80265396c62de95b0937d7
SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = a8e8fef04d7acb4772f57961e7df3681bd53d0b9
SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 83b90d951ce3aa9e913a36d792ac7376fb3d8bc7
SHA1 (patch-jdk_make_CompileDemos.gmk) = 4d5e2e9b0e35e373e6246408c775c25094b6f1c7
SHA1 (patch-jdk_make_CompileLaunchers.gmk) = fc386f8992db579483ad779f1aecfca762a29f92
SHA1 (patch-jdk_make_CompileLaunchers.gmk) = 1a8807595c5774fc6ecfc7caa3b53b806cc9537b
SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5
SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828
SHA1 (patch-jdk_make_Images.gmk) = e6643dcb25ad5457efe610f6ab7fd0ccc9b5ed41
SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = 519960ee33b748b5d91b101c2d644117a6b18e12
SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 0afdb43822b01b244d56446ae11d15629eeec285
SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 60392b9e8f4c823cffb120b9d7418bf8cb31e776
SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d
SHA1 (patch-jdk_make_lib_ServiceabilityLibraries.gmk) = 76eb64f3602f67ccb346df7a0acedf097869ba76
SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = b63cf0ebe204acf7264704916df875a31de84393
@ -127,7 +127,7 @@ SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvide
SHA1 (patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c) = 7fab23dce20b4ff18123ea65841589ae673f5675
SHA1 (patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c) = 2596d03c4a2e0d978aabfd4b170b0dd1d6260c6d
SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 672c9a044936cb11cc91e9a3e550dc69ef665209
SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 4e4cd6b8aef0011edf176505624ef4f518eb6c7e
SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 6d58169565503ef8e50224fce8380e42cb87baba
SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = c51d6b0687011a54c27e6253cad33d8f8cc27124
SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = cf0f8218e0088b677cd66fd5bc0d575ab08b710f
SHA1 (patch-jdk_test_Makefile) = 36430647c444dea491ae0c916c6ad7b1a3607ec6

50
lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
View file

@ -1,10 +1,10 @@
$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.12 2017/05/10 13:59:57 ryoon Exp $
$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.13 2017/11/28 05:07:25 ryoon Exp $
BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386)
--- common/autoconf/generated-configure.sh.orig 2016-10-26 22:56:42.000000000 +0000
--- common/autoconf/generated-configure.sh.orig 2017-11-28 00:13:34.000000000 +0000
+++ common/autoconf/generated-configure.sh
@@ -8454,9 +8454,9 @@ done
@@ -8486,9 +8486,9 @@ done
# We need to find a recent version of GNU make. Especially on Solaris, this can be tricky.
if test "x$MAKE" != x; then
# User has supplied a make, test it.
@ -17,7 +17,7 @@ BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386)
MAKE_CANDIDATE=""$MAKE""
DESCRIPTION="user supplied MAKE=$MAKE"
@@ -11755,7 +11755,7 @@ $as_echo "$as_me: Potential Boot JDK fou
@@ -11787,7 +11787,7 @@ $as_echo "$as_me: Potential Boot JDK fou
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -26,7 +26,7 @@ BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386)
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -12539,7 +12539,7 @@ fi
@@ -12571,7 +12571,7 @@ fi
# Resolve file symlinks
while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@ -35,7 +35,7 @@ BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386)
# This is not a symbolic link! We are done!
break
fi
@@ -16225,16 +16225,15 @@ $as_echo_n "checking flags for boot jdk
@@ -16257,16 +16257,15 @@ $as_echo_n "checking flags for boot jdk
# Maximum amount of heap memory.
# Maximum stack size.
if test "x$BOOT_JDK_BITS" = x32; then
@ -53,7 +53,7 @@ BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386)
$ECHO "Check if jvm arg is ok: -Xmx$JVM_MAX_HEAP" >&5
$ECHO "Command: $JAVA -Xmx$JVM_MAX_HEAP -version" >&5
@@ -19454,7 +19453,7 @@ $as_echo "(none, will use system headers
@@ -19486,7 +19485,7 @@ $as_echo "(none, will use system headers
elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
COMPILER_CHECK_LIST="cl"
elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
@ -62,7 +62,7 @@ BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386)
elif test "x$OPENJDK_TARGET_OS" = "xaix"; then
# Do not probe for cc on AIX.
COMPILER_CHECK_LIST="xlc_r"
@@ -19910,7 +19909,7 @@ $as_echo_n "checking resolved symbolic l
@@ -19942,7 +19941,7 @@ $as_echo_n "checking resolved symbolic l
# Resolve file symlinks
while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@ -71,7 +71,7 @@ BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386)
# This is not a symbolic link! We are done!
break
fi
@@ -20348,7 +20347,7 @@ $as_echo_n "checking for resolved symbol
@@ -20380,7 +20379,7 @@ $as_echo_n "checking for resolved symbol
# Resolve file symlinks
while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@ -80,7 +80,7 @@ BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386)
# This is not a symbolic link! We are done!
break
fi
@@ -20376,7 +20375,7 @@ $as_echo "no, keeping CC" >&6; }
@@ -20408,7 +20407,7 @@ $as_echo "no, keeping CC" >&6; }
COMPILER=$CC
COMPILER_NAME=$COMPILER_NAME
@ -89,7 +89,7 @@ BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386)
# Make sure we use the Sun Studio compiler and not gcc on Solaris, which won't work
COMPILER_VERSION_TEST=`$COMPILER -V 2>&1 | $HEAD -n 1`
$ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
@@ -21511,7 +21510,7 @@ $as_echo_n "checking resolved symbolic l
@@ -21544,7 +21543,7 @@ $as_echo_n "checking resolved symbolic l
# Resolve file symlinks
while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@ -98,7 +98,7 @@ BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386)
# This is not a symbolic link! We are done!
break
fi
@@ -21949,7 +21948,7 @@ $as_echo_n "checking for resolved symbol
@@ -21982,7 +21981,7 @@ $as_echo_n "checking for resolved symbol
# Resolve file symlinks
while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@ -107,7 +107,7 @@ BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386)
# This is not a symbolic link! We are done!
break
fi
@@ -21977,7 +21976,7 @@ $as_echo "no, keeping CXX" >&6; }
@@ -22010,7 +22009,7 @@ $as_echo "no, keeping CXX" >&6; }
COMPILER=$CXX
COMPILER_NAME=$COMPILER_NAME
@ -116,7 +116,7 @@ BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386)
# Make sure we use the Sun Studio compiler and not gcc on Solaris, which won't work
COMPILER_VERSION_TEST=`$COMPILER -V 2>&1 | $HEAD -n 1`
$ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
@@ -29390,6 +29389,15 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
@@ -29451,6 +29450,15 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
if test "x$OPENJDK_TARGET_OS" = xbsd || test "x$OPENJDK_TARGET_OS" = xmacosx; then
SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
fi
@ -132,7 +132,7 @@ BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386)
else
if test "x$OPENJDK_TARGET_OS" = xsolaris; then
# If it is not gcc, then assume it is the Oracle Solaris Studio Compiler
@@ -29531,6 +29539,13 @@ rm -f core conftest.err conftest.$ac_obj
@@ -29592,6 +29600,13 @@ rm -f core conftest.err conftest.$ac_obj
C_O_FLAG_NORM="-Os"
C_O_FLAG_NONE=""
;;
@ -146,16 +146,16 @@ BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386)
*)
C_O_FLAG_HI="-O3"
C_O_FLAG_NORM="-O2"
@@ -29732,7 +29747,7 @@ fi
@@ -29796,7 +29811,7 @@ fi
#
case $COMPILER_NAME in
gcc )
- CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare \
+ CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare -Wno-unused-parameter \
- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare \
+ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare -Wno-unused-parameter \
-pipe \
-D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
case $OPENJDK_TARGET_CPU_ARCH in
@@ -30343,7 +30358,8 @@ $as_echo "alsa pulse x11" >&6; }
CXXSTD_CXXFLAG="-std=gnu++98"
@@ -30753,7 +30768,8 @@ $as_echo "alsa pulse x11" >&6; }
if test "x$OPENJDK_TARGET_OS" = xbsd; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on BSD?" >&5
$as_echo_n "checking what is not needed on BSD?... " >&6; }
@ -165,7 +165,7 @@ BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386)
ALSA_NOT_NEEDED=yes
PULSE_NOT_NEEDED=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
@@ -31555,7 +31571,11 @@ $as_echo "$as_me: WARNING: freetype not
@@ -31965,7 +31981,11 @@ $as_echo "$as_me: WARNING: freetype not
# Allow --with-freetype-lib and --with-freetype-include to override
if test "x$with_freetype_include" != x; then
@ -178,7 +178,7 @@ BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386)
fi
if test "x$with_freetype_lib" != x; then
POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
@@ -34373,7 +34393,7 @@ $as_echo "$as_me: The path of FREETYPE_I
@@ -34783,7 +34803,7 @@ $as_echo "$as_me: The path of FREETYPE_I
FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
fi
@ -187,7 +187,7 @@ BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386)
FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
else
FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
@@ -34506,7 +34526,7 @@ $as_echo "$as_me: The path of FREETYPE_L
@@ -34916,7 +34936,7 @@ $as_echo "$as_me: The path of FREETYPE_L
if test "x$OPENJDK_TARGET_OS" = xwindows; then
FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib"
else
@ -196,7 +196,7 @@ BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386)
fi
fi
@@ -35732,9 +35752,6 @@ fi
@@ -36142,9 +36162,6 @@ fi
@ -206,7 +206,7 @@ BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386)
llvm_components="jit mcjit engine nativecodegen native"
unset LLVM_CFLAGS
@@ -35777,7 +35794,7 @@ fi
@@ -36187,7 +36204,7 @@ fi
fi
# libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)

6
lang/openjdk8/patches/patch-jdk_make_CompileLaunchers.gmk
View file

@ -1,6 +1,6 @@
$NetBSD: patch-jdk_make_CompileLaunchers.gmk,v 1.4 2016/07/19 12:32:15 jperkin Exp $
$NetBSD: patch-jdk_make_CompileLaunchers.gmk,v 1.5 2017/11/28 05:07:25 ryoon Exp $
--- jdk/make/CompileLaunchers.gmk.orig 2016-05-06 12:11:21.000000000 +0000
--- jdk/make/CompileLaunchers.gmk.orig 2017-11-28 00:13:34.000000000 +0000
+++ jdk/make/CompileLaunchers.gmk
@@ -121,7 +121,7 @@ define SetupLauncher
endif
@ -18,7 +18,7 @@ $NetBSD: patch-jdk_make_CompileLaunchers.gmk,v 1.4 2016/07/19 12:32:15 jperkin E
- UNPACKEXE_ZIPOBJS := -lz
+ UNPACKEXE_ZIPOBJS := @COMPILER_RPATH_FLAG@@BUILDLINK_PREFIX.zlib@/lib -L@BUILDLINK_PREFIX.zlib@/lib -lz
else
UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8
UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib
UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \
@@ -548,9 +548,7 @@ BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/
# jdk/make/java/Makefile

12
lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk
View file

@ -1,18 +1,18 @@
$NetBSD: patch-jdk_make_lib_CoreLibraries.gmk,v 1.3 2017/05/10 14:01:58 ryoon Exp $
$NetBSD: patch-jdk_make_lib_CoreLibraries.gmk,v 1.4 2017/11/28 05:07:25 ryoon Exp $
Ensure we can find zlib.
--- jdk/make/lib/CoreLibraries.gmk.orig 2017-04-27 09:44:53.000000000 +0000
--- jdk/make/lib/CoreLibraries.gmk.orig 2017-11-28 00:13:34.000000000 +0000
+++ jdk/make/lib/CoreLibraries.gmk
@@ -231,12 +231,14 @@ $(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM)
@@ -253,12 +253,14 @@ $(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM)
BUILD_LIBZIP_EXCLUDES :=
ifeq ($(USE_EXTERNAL_LIBZ), true)
- LIBZ := -lz
+ LIBZ := @COMPILER_RPATH_FLAG@@BUILDLINK_PREFIX.zlib@/lib -L@BUILDLINK_PREFIX.zlib@/lib -lz
LIBZIP_EXCLUDES += zlib-1.2.8
LIBZIP_EXCLUDES += zlib
else
ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8
ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib
endif
+LIBICONV := @COMPILER_RPATH_FLAG@@BUILDLINK_PREFIX.iconv@/lib -L@BUILDLINK_PREFIX.iconv@/lib -liconv
@ -20,7 +20,7 @@ Ensure we can find zlib.
BUILD_LIBZIP_REORDER :=
ifeq ($(OPENJDK_TARGET_OS), solaris)
ifneq ($(OPENJDK_TARGET_CPU), x86_64)
@@ -528,7 +530,7 @@ $(eval $(call SetupNativeCompilation,BUI
@@ -550,7 +552,7 @@ $(eval $(call SetupNativeCompilation,BUI
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnpt/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \

28
lang/openjdk8/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c
View file

@ -1,10 +1,10 @@
$NetBSD: patch-jdk_src_solaris_native_java_net_NetworkInterface.c,v 1.3 2016/10/27 13:06:42 ryoon Exp $
$NetBSD: patch-jdk_src_solaris_native_java_net_NetworkInterface.c,v 1.4 2017/11/28 05:07:25 ryoon Exp $
Zones support.
--- jdk/src/solaris/native/java/net/NetworkInterface.c.orig 2016-10-26 22:56:37.000000000 +0000
--- jdk/src/solaris/native/java/net/NetworkInterface.c.orig 2017-11-28 00:13:32.000000000 +0000
+++ jdk/src/solaris/native/java/net/NetworkInterface.c
@@ -42,6 +42,7 @@
@@ -39,6 +39,7 @@
#include <fcntl.h>
#include <stropts.h>
#include <sys/sockio.h>
@ -12,7 +12,7 @@ Zones support.
#endif
#if defined(__linux__)
@@ -62,14 +63,12 @@
@@ -58,14 +59,12 @@
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/sockio.h>
@ -29,17 +29,17 @@ Zones support.
#endif
#include <net/if_dl.h>
#include <netinet/in_var.h>
@@ -1710,7 +1709,8 @@ static short getSubnet(JNIEnv *env, int
}
@@ -82,7 +81,8 @@
#ifndef SIOCGLIFHWADDR
#define SIOCGLIFHWADDR _IOWR('i', 192, struct lifreq)
#endif
- #define DEV_PREFIX "/dev/"
+ #define NET_DEV_PREFIX "/dev/"
+ #define ZONE_NET_DEV_PREFIX "/dev/net/"
#endif
-#define DEV_PREFIX "/dev/"
+#define NET_DEV_PREFIX "/dev/"
+#define ZONE_NET_DEV_PREFIX "/dev/net/"
/*
* Solaris specific DLPI code to get hardware address from a device.
@@ -1728,9 +1728,18 @@ static int getMacFromDevice
#ifdef LIFNAMSIZ
@@ -1843,9 +1843,18 @@ static int getMacFromDevice
char buf[128];
int flags = 0;