java/92459: jdk-1.4.2p8_2 crashes in libzip.so when starting eclipse

[HASHI Hiroaki]

Hello.

I made a patch for jdk14.

That using system's zlib instead of jdk's zlib-1.1.3 .
-------------- next part --------------
diff -ruN jdk14.orig/Makefile jdk14/Makefile
--- jdk14.orig/Makefile	Sat Jan 21 15:06:09 2006
+++ jdk14/Makefile	Mon Jan 30 11:03:51 2006
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk14.html
@@ -241,6 +241,8 @@
 		${REINPLACE_CMD} -e "s:-lkse:${PTHREAD_LIBS}:g" \
 			${WRKSRC}/$${file}; \
 	done
+	@cd ${WRKDIR}/j2se/src/share/native/java/util/zip && \
+		${RM} -rf zlib-1.1.3
 
 pre-build-linuxcheck:
 .if defined(WITH_LINUX_BOOTSTRAP)
diff -ruN jdk14.orig/files/patch-java::zip::FILES_c.gmk jdk14/files/patch-java::zip::FILES_c.gmk
--- jdk14.orig/files/patch-java::zip::FILES_c.gmk	Thu Jan  1 09:00:00 1970
+++ jdk14/files/patch-java::zip::FILES_c.gmk	Mon Jan 30 10:26:37 2006
@@ -0,0 +1,18 @@
+--- ../../../../jdk14.orig/work/j2se/make/java/zip/FILES_c.gmk	Thu Sep 11 10:43:01 2003
++++ ../../j2se/make/java/zip/FILES_c.gmk	Mon Jan 30 02:22:58 2006
+@@ -8,15 +8,4 @@
+ 	$(CTARGDIR)Inflater.c \
+ 	$(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 -ruN jdk14.orig/files/patch-java::zip::Makefile jdk14/files/patch-java::zip::Makefile
--- jdk14.orig/files/patch-java::zip::Makefile	Thu Jan  1 09:00:00 1970
+++ jdk14/files/patch-java::zip::Makefile	Mon Jan 30 10:27:34 2006
@@ -0,0 +1,30 @@
+--- ../../../../jdk14.orig/work/j2se/make/java/zip/Makefile	Thu Sep 11 10:43:01 2003
++++ ../../j2se/make/java/zip/Makefile	Mon Jan 30 02:04:45 2006
+@@ -12,8 +12,6 @@
+ PRODUCT = sun
+ include $(BUILDDIR)/common/Defs.gmk
+ 
+-ZLIB_VERSION = 1.1.3
+-
+ #
+ # Files to compile.
+ #
+@@ -58,12 +56,9 @@
+ CPPFLAGS += -UDEBUG 
+ 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
+@@ -73,4 +68,4 @@
+ #
+ # Link to JVM library for JVM_Zip* functions
+ #
+-OTHER_LDLIBS = $(JVMLIB)
++OTHER_LDLIBS = $(JVMLIB) -lz