. Link with the system libz instead of building the our own internal

  copy.  This should have the following effects:

  . Fix problems experienced by programmes that dynamically create their
    own copy of the JVM and are linked against the system's zlib (e.g.,
    eclipse).
  . Reduce the potential for zlib based security problems affecting the
    JDK.

Submitted by:	mi@

16 files changed, 282 insertions, 176 deletions

diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index b44b94c0ac22..915f64f0d275 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -308,3 +308,5 @@ post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.post.mk>
+
+EXTRACT_AFTER_ARGS+=	-x '*/zlib-*/*'
diff --git a/java/jdk15/files/patch-j2se::common::Program.gmk b/java/jdk15/files/patch-j2se::common::Program.gmk
new file mode 100644
index 000000000000..06918312c6f5
--- /dev/null
+++ b/java/jdk15/files/patch-j2se::common::Program.gmk
@@ -0,0 +1,16 @@
+--- ../../j2se/make/common/Program.gmk	Tue Oct 19 14:44:50 2004
++++ ../../j2se/make/common/Program.gmk	Sat Oct 15 12:37:38 2005
+@@ -17,5 +17,4 @@
+ LAUNCHER_SHARE_SRC = $(SHARE_SRC)
+ endif
+-ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+ 
+ .PHONY: all optimized debug classes clean clobber
+@@ -47,5 +46,6 @@
+ 	$(OBJDIR)/zutil.$(OBJECT_SUFFIX)
+ 
+-FILES_o = $(LAUNCHER_o) $(ZLIB_o)
++FILES_o = $(LAUNCHER_o)
++LDFLAGS += -lz
+ 
+ ifeq ($(PLATFORM), windows)
diff --git a/java/jdk15/files/patch-j2se::instrument::Makefile b/java/jdk15/files/patch-j2se::instrument::Makefile
index 8934bfc11fe3..2ce0f43ea3e3 100644
--- a/java/jdk15/files/patch-j2se::instrument::Makefile
+++ b/java/jdk15/files/patch-j2se::instrument::Makefile
@@ -2,8 +2,35 @@ $FreeBSD$
 
 --- ../../j2se/make/java/instrument/Makefile.orig	Thu Jan 13 02:04:44 2005
 +++ ../../j2se/make/java/instrument/Makefile	Thu Jan 13 02:05:03 2005
-@@ -72,8 +72,8 @@
+@@ -39,5 +39,4 @@
+ # into the instrument library.
+ #
+-ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+ IO_PLATFORM_SRC = $(PLATFORM_SRC)/native/java/io
+ LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin
+@@ -45,12 +44,4 @@
+ 
+ FILES_c += \
+-	inflate.c \
+-	infblock.c \
+-	infcodes.c \
+-	inffast.c \
+-	inftrees.c \
+-	zadler32.c \
+-	infutil.c \
+-	zutil.c \
+ 	canonicalize_md.c \
+ 	parse_manifest.c 
+@@ -61,5 +60,4 @@
+ OTHER_INCLUDES = -I$(SHARE_SRC)/instrument
+ OTHER_INCLUDES += -I$(PLATFORM_SRC)/instrument
+-OTHER_INCLUDES += -I$(ZIP_SRC)
+ OTHER_INCLUDES += -I$(IO_PLATFORM_SRC)
+ OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC) -I$(LAUNCHER_PLATFORM_SRC)
+@@ -71,9 +61,10 @@
+   COMPILER_WARNING_LEVEL=0
  else
++OTHER_LDLIBS += -lz
  ifeq ($(PLATFORM), bsd)
    ifneq ($(TRUE_PLATFORM), NetBSD)
 -    OTHER_INCLUDES += -I/usr/local/include
@@ -13,3 +40,9 @@ $FreeBSD$
    endif
  else
    OTHER_LDLIBS = -lnsl -ldl
+@@ -123,5 +121,4 @@
+ #
+ vpath %.c $(SHARE_SRC)/instrument $(PLATFORM_SRC)/instrument
+-vpath %.c $(ZIP_SRC)
+ vpath %.c $(IO_PLATFORM_SRC)
+ vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC)
diff --git a/java/jdk15/files/patch-j2se::pack::Makefile b/java/jdk15/files/patch-j2se::pack::Makefile
new file mode 100644
index 000000000000..86c92e52917c
--- /dev/null
+++ b/java/jdk15/files/patch-j2se::pack::Makefile
@@ -0,0 +1,29 @@
+--- ../../j2se/make/com/sun/java/pack/Makefile	Tue Oct 19 14:44:46 2004
++++ ../../j2se/make/com/sun/java/pack/Makefile	Sun Oct 16 09:07:12 2005
+@@ -36,24 +36,6 @@
+ 
+ 
+-
+-
+ ifeq ($(STANDALONE),true)
+-  ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
+-
+-  ZIPOBJS =  $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
+-
+-  ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+-  OTHER_CXXFLAGS += $(ZINCLUDE)
+-  LDDFLAGS += $(ZIPOBJS)
++  LDDFLAGS += -lz
+ else
+   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
+
diff --git a/java/jdk15/files/patch-j2se::pack::defines.h b/java/jdk15/files/patch-j2se::pack::defines.h
new file mode 100644
index 000000000000..5c97841af76b
--- /dev/null
+++ b/java/jdk15/files/patch-j2se::pack::defines.h
@@ -0,0 +1,24 @@
+--- ../../j2se/src/share/native/com/sun/java/util/jar/pack/defines.h	Tue Oct 19 14:59:48 2004
++++ ../../j2se/src/share/native/com/sun/java/util/jar/pack/defines.h	Sun Oct 16 09:06:04 2005
+@@ -15,4 +15,8 @@
+ #endif
+ 
++#ifndef NO_ZLIB
++#	include <zconf.h>
++#endif
++
+ #ifndef FULL
+ #define FULL 1 /* Adds <500 bytes to the zipped final product. */
+@@ -70,4 +74,5 @@
+ 
+ typedef unsigned int uint;
++#ifdef NO_ZLIB
+ #ifdef _LP64
+ typedef unsigned int uLong; // Historical zlib, should be 32-bit.
+@@ -75,4 +80,6 @@
+ typedef unsigned long uLong;
+ #endif
++#endif
++
+ #ifdef _MSC_VER 
+ typedef LONGLONG 	jlong;
diff --git a/java/jdk15/files/patch-j2se::zip::FILES_c.gmk b/java/jdk15/files/patch-j2se::zip::FILES_c.gmk
new file mode 100644
index 000000000000..d1f2a848a259
--- /dev/null
+++ b/java/jdk15/files/patch-j2se::zip::FILES_c.gmk
@@ -0,0 +1,17 @@
+--- ../../j2se/make/java/zip/FILES_c.gmk	Tue Oct 19 14:44:55 2004
++++ ../../j2se/make/java/zip/FILES_c.gmk	Sat Oct 15 14:51:44 2005
+@@ -9,14 +9,3 @@
+ 	$(CTARGDIR)ZipFile.c \
+ 	$(CTARGDIR)ZipEntry.c \
+-	$(CTARGDIR)zadler32.c \
+-	$(CTARGDIR)zcrc32.c \
+-	$(CTARGDIR)deflate.c \
+-	$(CTARGDIR)trees.c \
+-	$(CTARGDIR)zutil.c \
+-	$(CTARGDIR)inflate.c \
+-	$(CTARGDIR)infblock.c \
+-	$(CTARGDIR)inftrees.c \
+-	$(CTARGDIR)infcodes.c \
+-	$(CTARGDIR)infutil.c \
+-	$(CTARGDIR)inffast.c \
+ 	$(CTARGDIR)zip_util.c
diff --git a/java/jdk15/files/patch-j2se::zip::Makefile b/java/jdk15/files/patch-j2se::zip::Makefile
new file mode 100644
index 000000000000..d6638e36a07d
--- /dev/null
+++ b/java/jdk15/files/patch-j2se::zip::Makefile
@@ -0,0 +1,19 @@
+--- ../../j2se/make/java/zip/Makefile	Tue Oct 19 14:44:55 2004
++++ ../../j2se/make/java/zip/Makefile	Sat Oct 15 14:02:40 2005
+@@ -59,11 +59,4 @@
+ endif
+ 
+-CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+-
+-#
+-# Add to ambient vpath so we pick up the library files
+-#
+-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/zlib-$(ZLIB_VERSION)
+-
+ #
+ # Has been converted to the JNI: generate JNI-style header files
+@@ -74,3 +67,3 @@
+ # Link to JVM library for JVM_Zip* functions
+ #
+-OTHER_LDLIBS = $(JVMLIB)
++OTHER_LDLIBS = -lz
diff --git a/java/jdk15/files/patch-j2se::zlib-1.1.3::zconf.h b/java/jdk15/files/patch-j2se::zlib-1.1.3::zconf.h
deleted file mode 100644
index c749997e2b0a..000000000000
--- a/java/jdk15/files/patch-j2se::zlib-1.1.3::zconf.h
+++ /dev/null
@@ -1,87 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/share/native/java/util/zip/zlib-1.1.3/zconf.h	8 Nov 2004 22:27:36 -0000	1.1.1.1
-+++ ../../j2se/src/share/native/java/util/zip/zlib-1.1.3/zconf.h	20 Oct 2005 18:19:49 -0000
-@@ -11,44 +11,49 @@
- /* for _LP64 */
- #include <sys/types.h>
- 
-+/**
-+ * Privatise the symbols to the JDK.
-+ */
-+#define Z_PREFIX
-+
- /*
-  * If you *really* need a unique prefix for all types and library functions,
-  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
-  */
- #ifdef Z_PREFIX
--#  define deflateInit_	z_deflateInit_
--#  define deflate	z_deflate
--#  define deflateEnd	z_deflateEnd
--#  define inflateInit_ 	z_inflateInit_
--#  define inflate	z_inflate
--#  define inflateEnd	z_inflateEnd
--#  define deflateInit2_	z_deflateInit2_
--#  define deflateSetDictionary z_deflateSetDictionary
--#  define deflateCopy	z_deflateCopy
--#  define deflateReset	z_deflateReset
--#  define deflateParams	z_deflateParams
--#  define inflateInit2_	z_inflateInit2_
--#  define inflateSetDictionary z_inflateSetDictionary
--#  define inflateSync	z_inflateSync
--#  define inflateSyncPoint z_inflateSyncPoint
--#  define inflateReset	z_inflateReset
--#  define compress	z_compress
--#  define compress2	z_compress2
--#  define uncompress	z_uncompress
--#  define adler32	z_adler32
--#  define crc32		z_crc32
--#  define get_crc_table z_get_crc_table
--
--#  define Byte		z_Byte
--#  define uInt		z_uInt
--#  define uLong		z_uLong
--#  define Bytef	        z_Bytef
--#  define charf		z_charf
--#  define intf		z_intf
--#  define uIntf		z_uIntf
--#  define uLongf	z_uLongf
--#  define voidpf	z_voidpf
--#  define voidp		z_voidp
-+#  define deflateInit_	_java_libz_deflateInit_
-+#  define deflate	_java_libz_deflate
-+#  define deflateEnd	_java_libz_deflateEnd
-+#  define inflateInit_ 	_java_libz_inflateInit_
-+#  define inflate	_java_libz_inflate
-+#  define inflateEnd	_java_libz_inflateEnd
-+#  define deflateInit2_	_java_libz_deflateInit2_
-+#  define deflateSetDictionary _java_libz_deflateSetDictionary
-+#  define deflateCopy	_java_libz_deflateCopy
-+#  define deflateReset	_java_libz_deflateReset
-+#  define deflateParams	_java_libz_deflateParams
-+#  define inflateInit2_	_java_libz_inflateInit2_
-+#  define inflateSetDictionary _java_libz_inflateSetDictionary
-+#  define inflateSync	_java_libz_inflateSync
-+#  define inflateSyncPoint _java_libz_inflateSyncPoint
-+#  define inflateReset	_java_libz_inflateReset
-+#  define compress	_java_libz_compress
-+#  define compress2	_java_libz_compress2
-+#  define uncompress	_java_libz_uncompress
-+#  define adler32	_java_libz_adler32
-+#  define crc32		_java_libz_crc32
-+#  define get_crc_table _java_libz_get_crc_table
-+
-+#  define Byte		_java_libz_Byte
-+#  define uInt		_java_libz_uInt
-+#  define uLong		_java_libz_uLong
-+#  define Bytef	        _java_libz_Bytef
-+#  define charf		_java_libz_charf
-+#  define intf		_java_libz_intf
-+#  define uIntf		_java_libz_uIntf
-+#  define uLongf	_java_libz_uLongf
-+#  define voidpf	_java_libz_voidpf
-+#  define voidp		_java_libz_voidp
- #endif
- 
- #if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index b44b94c0ac22..915f64f0d275 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -308,3 +308,5 @@ post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.post.mk>
+
+EXTRACT_AFTER_ARGS+=	-x '*/zlib-*/*'
diff --git a/java/jdk16/files/patch-j2se::common::Program.gmk b/java/jdk16/files/patch-j2se::common::Program.gmk
new file mode 100644
index 000000000000..06918312c6f5
--- /dev/null
+++ b/java/jdk16/files/patch-j2se::common::Program.gmk
@@ -0,0 +1,16 @@
+--- ../../j2se/make/common/Program.gmk	Tue Oct 19 14:44:50 2004
++++ ../../j2se/make/common/Program.gmk	Sat Oct 15 12:37:38 2005
+@@ -17,5 +17,4 @@
+ LAUNCHER_SHARE_SRC = $(SHARE_SRC)
+ endif
+-ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+ 
+ .PHONY: all optimized debug classes clean clobber
+@@ -47,5 +46,6 @@
+ 	$(OBJDIR)/zutil.$(OBJECT_SUFFIX)
+ 
+-FILES_o = $(LAUNCHER_o) $(ZLIB_o)
++FILES_o = $(LAUNCHER_o)
++LDFLAGS += -lz
+ 
+ ifeq ($(PLATFORM), windows)
diff --git a/java/jdk16/files/patch-j2se::instrument::Makefile b/java/jdk16/files/patch-j2se::instrument::Makefile
index 8934bfc11fe3..2ce0f43ea3e3 100644
--- a/java/jdk16/files/patch-j2se::instrument::Makefile
+++ b/java/jdk16/files/patch-j2se::instrument::Makefile
@@ -2,8 +2,35 @@ $FreeBSD$
 
 --- ../../j2se/make/java/instrument/Makefile.orig	Thu Jan 13 02:04:44 2005
 +++ ../../j2se/make/java/instrument/Makefile	Thu Jan 13 02:05:03 2005
-@@ -72,8 +72,8 @@
+@@ -39,5 +39,4 @@
+ # into the instrument library.
+ #
+-ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+ IO_PLATFORM_SRC = $(PLATFORM_SRC)/native/java/io
+ LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin
+@@ -45,12 +44,4 @@
+ 
+ FILES_c += \
+-	inflate.c \
+-	infblock.c \
+-	infcodes.c \
+-	inffast.c \
+-	inftrees.c \
+-	zadler32.c \
+-	infutil.c \
+-	zutil.c \
+ 	canonicalize_md.c \
+ 	parse_manifest.c 
+@@ -61,5 +60,4 @@
+ OTHER_INCLUDES = -I$(SHARE_SRC)/instrument
+ OTHER_INCLUDES += -I$(PLATFORM_SRC)/instrument
+-OTHER_INCLUDES += -I$(ZIP_SRC)
+ OTHER_INCLUDES += -I$(IO_PLATFORM_SRC)
+ OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC) -I$(LAUNCHER_PLATFORM_SRC)
+@@ -71,9 +61,10 @@
+   COMPILER_WARNING_LEVEL=0
  else
++OTHER_LDLIBS += -lz
  ifeq ($(PLATFORM), bsd)
    ifneq ($(TRUE_PLATFORM), NetBSD)
 -    OTHER_INCLUDES += -I/usr/local/include
@@ -13,3 +40,9 @@ $FreeBSD$
    endif
  else
    OTHER_LDLIBS = -lnsl -ldl
+@@ -123,5 +121,4 @@
+ #
+ vpath %.c $(SHARE_SRC)/instrument $(PLATFORM_SRC)/instrument
+-vpath %.c $(ZIP_SRC)
+ vpath %.c $(IO_PLATFORM_SRC)
+ vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC)
diff --git a/java/jdk16/files/patch-j2se::pack::Makefile b/java/jdk16/files/patch-j2se::pack::Makefile
new file mode 100644
index 000000000000..86c92e52917c
--- /dev/null
+++ b/java/jdk16/files/patch-j2se::pack::Makefile
@@ -0,0 +1,29 @@
+--- ../../j2se/make/com/sun/java/pack/Makefile	Tue Oct 19 14:44:46 2004
++++ ../../j2se/make/com/sun/java/pack/Makefile	Sun Oct 16 09:07:12 2005
+@@ -36,24 +36,6 @@
+ 
+ 
+-
+-
+ ifeq ($(STANDALONE),true)
+-  ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
+-
+-  ZIPOBJS =  $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
+-
+-  ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+-  OTHER_CXXFLAGS += $(ZINCLUDE)
+-  LDDFLAGS += $(ZIPOBJS)
++  LDDFLAGS += -lz
+ else
+   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
+
diff --git a/java/jdk16/files/patch-j2se::pack::defines.h b/java/jdk16/files/patch-j2se::pack::defines.h
new file mode 100644
index 000000000000..5c97841af76b
--- /dev/null
+++ b/java/jdk16/files/patch-j2se::pack::defines.h
@@ -0,0 +1,24 @@
+--- ../../j2se/src/share/native/com/sun/java/util/jar/pack/defines.h	Tue Oct 19 14:59:48 2004
++++ ../../j2se/src/share/native/com/sun/java/util/jar/pack/defines.h	Sun Oct 16 09:06:04 2005
+@@ -15,4 +15,8 @@
+ #endif
+ 
++#ifndef NO_ZLIB
++#	include <zconf.h>
++#endif
++
+ #ifndef FULL
+ #define FULL 1 /* Adds <500 bytes to the zipped final product. */
+@@ -70,4 +74,5 @@
+ 
+ typedef unsigned int uint;
++#ifdef NO_ZLIB
+ #ifdef _LP64
+ typedef unsigned int uLong; // Historical zlib, should be 32-bit.
+@@ -75,4 +80,6 @@
+ typedef unsigned long uLong;
+ #endif
++#endif
++
+ #ifdef _MSC_VER 
+ typedef LONGLONG 	jlong;
diff --git a/java/jdk16/files/patch-j2se::zip::FILES_c.gmk b/java/jdk16/files/patch-j2se::zip::FILES_c.gmk
new file mode 100644
index 000000000000..d1f2a848a259
--- /dev/null
+++ b/java/jdk16/files/patch-j2se::zip::FILES_c.gmk
@@ -0,0 +1,17 @@
+--- ../../j2se/make/java/zip/FILES_c.gmk	Tue Oct 19 14:44:55 2004
++++ ../../j2se/make/java/zip/FILES_c.gmk	Sat Oct 15 14:51:44 2005
+@@ -9,14 +9,3 @@
+ 	$(CTARGDIR)ZipFile.c \
+ 	$(CTARGDIR)ZipEntry.c \
+-	$(CTARGDIR)zadler32.c \
+-	$(CTARGDIR)zcrc32.c \
+-	$(CTARGDIR)deflate.c \
+-	$(CTARGDIR)trees.c \
+-	$(CTARGDIR)zutil.c \
+-	$(CTARGDIR)inflate.c \
+-	$(CTARGDIR)infblock.c \
+-	$(CTARGDIR)inftrees.c \
+-	$(CTARGDIR)infcodes.c \
+-	$(CTARGDIR)infutil.c \
+-	$(CTARGDIR)inffast.c \
+ 	$(CTARGDIR)zip_util.c
diff --git a/java/jdk16/files/patch-j2se::zip::Makefile b/java/jdk16/files/patch-j2se::zip::Makefile
new file mode 100644
index 000000000000..d6638e36a07d
--- /dev/null
+++ b/java/jdk16/files/patch-j2se::zip::Makefile
@@ -0,0 +1,19 @@
+--- ../../j2se/make/java/zip/Makefile	Tue Oct 19 14:44:55 2004
++++ ../../j2se/make/java/zip/Makefile	Sat Oct 15 14:02:40 2005
+@@ -59,11 +59,4 @@
+ endif
+ 
+-CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+-
+-#
+-# Add to ambient vpath so we pick up the library files
+-#
+-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/zlib-$(ZLIB_VERSION)
+-
+ #
+ # Has been converted to the JNI: generate JNI-style header files
+@@ -74,3 +67,3 @@
+ # Link to JVM library for JVM_Zip* functions
+ #
+-OTHER_LDLIBS = $(JVMLIB)
++OTHER_LDLIBS = -lz
diff --git a/java/jdk16/files/patch-j2se::zlib-1.1.3::zconf.h b/java/jdk16/files/patch-j2se::zlib-1.1.3::zconf.h
deleted file mode 100644
index c749997e2b0a..000000000000
--- a/java/jdk16/files/patch-j2se::zlib-1.1.3::zconf.h
+++ /dev/null
@@ -1,87 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/share/native/java/util/zip/zlib-1.1.3/zconf.h	8 Nov 2004 22:27:36 -0000	1.1.1.1
-+++ ../../j2se/src/share/native/java/util/zip/zlib-1.1.3/zconf.h	20 Oct 2005 18:19:49 -0000
-@@ -11,44 +11,49 @@
- /* for _LP64 */
- #include <sys/types.h>
- 
-+/**
-+ * Privatise the symbols to the JDK.
-+ */
-+#define Z_PREFIX
-+
- /*
-  * If you *really* need a unique prefix for all types and library functions,
-  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
-  */
- #ifdef Z_PREFIX
--#  define deflateInit_	z_deflateInit_
--#  define deflate	z_deflate
--#  define deflateEnd	z_deflateEnd
--#  define inflateInit_ 	z_inflateInit_
--#  define inflate	z_inflate
--#  define inflateEnd	z_inflateEnd
--#  define deflateInit2_	z_deflateInit2_
--#  define deflateSetDictionary z_deflateSetDictionary
--#  define deflateCopy	z_deflateCopy
--#  define deflateReset	z_deflateReset
--#  define deflateParams	z_deflateParams
--#  define inflateInit2_	z_inflateInit2_
--#  define inflateSetDictionary z_inflateSetDictionary
--#  define inflateSync	z_inflateSync
--#  define inflateSyncPoint z_inflateSyncPoint
--#  define inflateReset	z_inflateReset
--#  define compress	z_compress
--#  define compress2	z_compress2
--#  define uncompress	z_uncompress
--#  define adler32	z_adler32
--#  define crc32		z_crc32
--#  define get_crc_table z_get_crc_table
--
--#  define Byte		z_Byte
--#  define uInt		z_uInt
--#  define uLong		z_uLong
--#  define Bytef	        z_Bytef
--#  define charf		z_charf
--#  define intf		z_intf
--#  define uIntf		z_uIntf
--#  define uLongf	z_uLongf
--#  define voidpf	z_voidpf
--#  define voidp		z_voidp
-+#  define deflateInit_	_java_libz_deflateInit_
-+#  define deflate	_java_libz_deflate
-+#  define deflateEnd	_java_libz_deflateEnd
-+#  define inflateInit_ 	_java_libz_inflateInit_
-+#  define inflate	_java_libz_inflate
-+#  define inflateEnd	_java_libz_inflateEnd
-+#  define deflateInit2_	_java_libz_deflateInit2_
-+#  define deflateSetDictionary _java_libz_deflateSetDictionary
-+#  define deflateCopy	_java_libz_deflateCopy
-+#  define deflateReset	_java_libz_deflateReset
-+#  define deflateParams	_java_libz_deflateParams
-+#  define inflateInit2_	_java_libz_inflateInit2_
-+#  define inflateSetDictionary _java_libz_inflateSetDictionary
-+#  define inflateSync	_java_libz_inflateSync
-+#  define inflateSyncPoint _java_libz_inflateSyncPoint
-+#  define inflateReset	_java_libz_inflateReset
-+#  define compress	_java_libz_compress
-+#  define compress2	_java_libz_compress2
-+#  define uncompress	_java_libz_uncompress
-+#  define adler32	_java_libz_adler32
-+#  define crc32		_java_libz_crc32
-+#  define get_crc_table _java_libz_get_crc_table
-+
-+#  define Byte		_java_libz_Byte
-+#  define uInt		_java_libz_uInt
-+#  define uLong		_java_libz_uLong
-+#  define Bytef	        _java_libz_Bytef
-+#  define charf		_java_libz_charf
-+#  define intf		_java_libz_intf
-+#  define uIntf		_java_libz_uIntf
-+#  define uLongf	_java_libz_uLongf
-+#  define voidpf	_java_libz_voidpf
-+#  define voidp		_java_libz_voidp
- #endif
- 
- #if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)