head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.26 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.6.0.24 pkgsrc-2025Q4-base:1.6 pkgsrc-2025Q3:1.6.0.22 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.6.0.20 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.18 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.16 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.14 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.12 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.10 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.8 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.6 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.4 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.2 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.5.0.40 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.5.0.38 pkgsrc-2022Q3-base:1.5 pkgsrc-2022Q2:1.5.0.36 pkgsrc-2022Q2-base:1.5 pkgsrc-2022Q1:1.5.0.34 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.5.0.32 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.30 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.28 pkgsrc-2021Q2-base:1.5 pkgsrc-2021Q1:1.5.0.26 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.5.0.24 pkgsrc-2020Q4-base:1.5 pkgsrc-2020Q3:1.5.0.22 pkgsrc-2020Q3-base:1.5 pkgsrc-2020Q2:1.5.0.20 pkgsrc-2020Q2-base:1.5 pkgsrc-2020Q1:1.5.0.16 pkgsrc-2020Q1-base:1.5 pkgsrc-2019Q4:1.5.0.18 pkgsrc-2019Q4-base:1.5 pkgsrc-2019Q3:1.5.0.14 pkgsrc-2019Q3-base:1.5 pkgsrc-2019Q2:1.5.0.12 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.10 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.8 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.6 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.4 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.2 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.4.0.2 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.3.0.6 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.2 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.2.0.6 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.4 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.2 pkgsrc-2016Q3-base:1.2; locks; strict; comment @# @; 1.6 date 2023.02.27.11.09.40; author jperkin; state Exp; branches; next 1.5; commitid 5Z2yDg7WlRWvD9fE; 1.5 date 2018.02.23.14.43.49; author fhajny; state Exp; branches; next 1.4; commitid C8j50yePT1OBDZrA; 1.4 date 2017.11.28.05.07.25; author ryoon; state Exp; branches; next 1.3; commitid ITeNhmdh4rBFfLgA; 1.3 date 2017.05.10.14.01.58; author ryoon; state Exp; branches 1.3.6.1; next 1.2; commitid pd2sXrafredCHQQz; 1.2 date 2016.07.19.12.32.15; author jperkin; state Exp; branches 1.2.6.1; next 1.1; commitid h97ZGKMSdlKIGVez; 1.1 date 2016.07.05.14.32.21; author jperkin; state Exp; branches; next ; commitid VoBCSNqQgcxHN8dz; 1.3.6.1 date 2017.12.20.16.54.59; author spz; state Exp; branches; next ; commitid ZkoCpEGd0fXAsEjA; 1.2.6.1 date 2017.05.18.19.02.33; author bsiegert; state Exp; branches; next ; commitid XPQ1slZZBuWO6URz; desc @@ 1.6 log @openjdk8: Fix patch. Some pkglint cleanup while here. @ text @$NetBSD: patch-jdk_make_lib_CoreLibraries.gmk,v 1.5 2018/02/23 14:43:49 fhajny Exp $ Ensure we can find zlib. Proper libiconv link (and SunOS needs it too). --- jdk/make/lib/CoreLibraries.gmk.orig 2023-01-22 21:06:41.000000000 +0000 +++ jdk/make/lib/CoreLibraries.gmk @@@@ -263,7 +263,7 @@@@ $(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 else ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib @@@@ -544,6 +544,8 @@@@ endif ########################################################################################## +LIBICONV := @@COMPILER_RPATH_FLAG@@@@BUILDLINK_PREFIX.iconv@@/lib -L@@BUILDLINK_PREFIX.iconv@@/lib -liconv + ifeq ($(OPENJDK_TARGET_OS), bsd) BSD_ICONV_CFLAGS:= -I$(PACKAGE_PATH)/include ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd) @@@@ -564,7 +566,8 @@@@ $(eval $(call SetupNativeCompilation,BUI MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnpt/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_bsd := -L$(PACKAGE_PATH)/lib -liconv, \ + LDFLAGS_bsd := $(LIBICONV), \ + LDFLAGS_solaris := $(LIBICONV), \ LDFLAGS_macosx := -liconv, \ LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \ LDFLAGS_SUFFIX_solaris := -lc, \ @ 1.5 log @lang/openjdk8: The libinstrument, libnpt and libsplashscreen libs require to be linked against libiconv on SunOS too. Fixes problems with e.g. the JPDA debugger. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-jdk_make_lib_CoreLibraries.gmk,v 1.4 2017/11/28 05:07:25 ryoon Exp $ d6 1 a6 1 --- jdk/make/lib/CoreLibraries.gmk.orig 2017-11-28 00:13:34.000000000 +0000 d8 1 a8 1 @@@@ -253,12 +253,14 @@@@ $(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM) d17 3 a19 1 endif d23 4 a26 4 BUILD_LIBZIP_REORDER := ifeq ($(OPENJDK_TARGET_OS), solaris) ifneq ($(OPENJDK_TARGET_CPU), x86_64) @@@@ -550,7 +552,8 @@@@ $(eval $(call SetupNativeCompilation,BUI @ 1.4 log @Update to 1.8.152 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 @ text @d1 1 a1 1 $NetBSD: patch-jdk_make_lib_CoreLibraries.gmk,v 1.3 2017/05/10 14:01:58 ryoon Exp $ d4 1 d24 1 a24 1 @@@@ -550,7 +552,7 @@@@ $(eval $(call SetupNativeCompilation,BUI d30 1 @ 1.3 log @Fix build with converters/libiconv and update distinfo for previous @ text @d1 1 a1 1 $NetBSD: patch-jdk_make_lib_CoreLibraries.gmk,v 1.2 2016/07/19 12:32:15 jperkin Exp $ d5 1 a5 1 --- jdk/make/lib/CoreLibraries.gmk.orig 2017-04-27 09:44:53.000000000 +0000 d7 1 a7 1 @@@@ -231,12 +231,14 @@@@ $(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM) d13 1 a13 1 LIBZIP_EXCLUDES += zlib-1.2.8 d15 1 a15 1 ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8 d23 1 a23 1 @@@@ -528,7 +530,7 @@@@ $(eval $(call SetupNativeCompilation,BUI @ 1.3.6.1 log @Pullup ticket #5654 - requested by bsiegert lang/openjdk8: security update Revisions pulled up: - lang/openjdk8/Makefile 1.55 - lang/openjdk8/PLIST 1.8 - lang/openjdk8/distinfo 1.51 - lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh 1.13 - lang/openjdk8/patches/patch-jdk_make_CompileLaunchers.gmk 1.5 - lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk 1.4 - lang/openjdk8/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c 1.4 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: ryoon Date: Tue Nov 28 05:07:25 UTC 2017 Modified Files: pkgsrc/lang/openjdk8: Makefile PLIST distinfo pkgsrc/lang/openjdk8/patches: patch-common_autoconf_generated-configure.sh patch-jdk_make_CompileLaunchers.gmk patch-jdk_make_lib_CoreLibraries.gmk patch-jdk_src_solaris_native_java_net_NetworkInterface.c Log Message: Update to 1.8.152 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 To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 pkgsrc/lang/openjdk8/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/openjdk8/PLIST cvs rdiff -u -r1.50 -r1.51 pkgsrc/lang/openjdk8/distinfo cvs rdiff -u -r1.12 -r1.13 \ pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh cvs rdiff -u -r1.4 -r1.5 \ pkgsrc/lang/openjdk8/patches/patch-jdk_make_CompileLaunchers.gmk cvs rdiff -u -r1.3 -r1.4 \ pkgsrc/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk \ pkgsrc/lang/openjdk8/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- jdk/make/lib/CoreLibraries.gmk.orig 2017-11-28 00:13:34.000000000 +0000 d7 1 a7 1 @@@@ -253,12 +253,14 @@@@ $(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM) d13 1 a13 1 LIBZIP_EXCLUDES += zlib d15 1 a15 1 ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib d23 1 a23 1 @@@@ -550,7 +552,7 @@@@ $(eval $(call SetupNativeCompilation,BUI @ 1.2 log @Fix zlib detection. Use correct strip flag on SunOS. @ text @d1 1 a1 1 $NetBSD: patch-jdk_make_lib_CoreLibraries.gmk,v 1.1 2016/07/05 14:32:21 jperkin Exp $ d5 1 a5 1 --- jdk/make/lib/CoreLibraries.gmk.orig 2016-05-06 12:11:21.000000000 +0000 d7 1 a7 1 @@@@ -231,7 +231,7 @@@@ $(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM) d16 16 @ 1.2.6.1 log @Pullup tickets #5412 and #5413 - requested by sevan lang/opendjk8: build fix for FreeBSD Revisions pulled up: - lang/openjdk8/Makefile 1.49 - lang/openjdk8/distinfo 1.47 - lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh 1.12 - lang/openjdk8/patches/patch-jdk_make_lib_Awt2dLibraries.gmk 1.3 - lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk 1.3 - lang/openjdk8/patches/patch-jdk_make_lib_ServiceabilityLibraries.gmk 1.1 - mk/java-vm.mk 1.109 --- Module Name: pkgsrc Committed By: ryoon Date: Wed May 10 13:59:57 UTC 2017 Modified Files: pkgsrc/lang/openjdk8/patches: patch-common_autoconf_generated-configure.sh Log Message: Ignore alsa on FreeBSD too --- Module Name: pkgsrc Committed By: ryoon Date: Wed May 10 14:01:58 UTC 2017 Modified Files: pkgsrc/lang/openjdk8: Makefile distinfo pkgsrc/lang/openjdk8/patches: patch-jdk_make_lib_Awt2dLibraries.gmk patch-jdk_make_lib_CoreLibraries.gmk Added Files: pkgsrc/lang/openjdk8/patches: patch-jdk_make_lib_ServiceabilityLibraries.gmk Log Message: Fix build with converters/libiconv and update distinfo for previous --- Module Name: pkgsrc Committed By: ryoon Date: Wed May 10 14:04:31 UTC 2017 Modified Files: pkgsrc/mk: java-vm.mk Log Message: lang/openjdk8 works under FreeBSD/amd64 10.3 @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- jdk/make/lib/CoreLibraries.gmk.orig 2017-04-27 09:44:53.000000000 +0000 d7 1 a7 1 @@@@ -231,12 +231,14 @@@@ $(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM) a15 16 endif +LIBICONV := @@COMPILER_RPATH_FLAG@@@@BUILDLINK_PREFIX.iconv@@/lib -L@@BUILDLINK_PREFIX.iconv@@/lib -liconv + BUILD_LIBZIP_REORDER := ifeq ($(OPENJDK_TARGET_OS), solaris) ifneq ($(OPENJDK_TARGET_CPU), x86_64) @@@@ -528,7 +530,7 @@@@ $(eval $(call SetupNativeCompilation,BUI MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnpt/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_bsd := -L$(PACKAGE_PATH)/lib -liconv, \ + LDFLAGS_bsd := $(LIBICONV), \ LDFLAGS_macosx := -liconv, \ LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \ LDFLAGS_SUFFIX_solaris := -lc, \ @ 1.1 log @Allow passing LIBZ in the environment. Skip checking libinstrument.so which is resolved at runtime. Fixes build on SunOS at least. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 Allow passing LIBZ in the environment. d12 1 a12 1 + #LIBZ := -lz @