/hg/icedtea6: Add security fixes from 2012/08/30.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Aug 31 07:06:30 PDT 2012
changeset 1479af449489 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1479af449489
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Aug 31 15:06:23 2012 +0100
Add security fixes from 2012/08/30.
2012-08-31 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
(SECURITY_PATCHES): Add 7162476, 7163201 & 7182135.
(ICEDTEA_PATCHES): Add 7185678.
* patches/merge_fix.patch: Patch to fix merge issues
between new security fixes and previous backports.
* patches/gcc-suffix.patch,
* patches/libraries.patch,
* patches/version-hotspot.patch:
Regenerate to remove fuzz.
* patches/nomotif-6706121.patch,
* patches/openjdk/6633275-shaped_translucent_windows.patch,
* patches/openjdk/6693253-security_warning.patch,
* patches/openjdk/6797195-hw_lw_mixing.patch:
Regenerated post-security patches.
* patches/openjdk/7185678-xmenuitem_peer_npe.patch,
* patches/security/20120830/7162476-xmldecoder_via_classfinder.patch,
* patches/security/20120830/7163201-simplify_toolkit_internal_references.patch:
New patches from 6u35/7u7 security release.
* patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch:
Regression fix for 7162476.
diffstat:
ChangeLog | 23 +
Makefile.am | 9 +-
patches/gcc-suffix.patch | 116 +-
patches/libraries.patch | 2589 +++---
patches/nomotif-6706121.patch | 659 +-
patches/openjdk/6633275-shaped_translucent_windows.patch | 600 +-
patches/openjdk/6693253-security_warning.patch | 331 +-
patches/openjdk/6797195-hw_lw_mixing.patch | 131 +-
patches/openjdk/7185678-xmenuitem_peer_npe.patch | 21 +
patches/security/20120830/7162476-xmldecoder_via_classfinder.patch | 2522 ++++++
patches/security/20120830/7163201-simplify_toolkit_internal_references.patch | 3713 ++++++++++
patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch | 519 +
patches/version-hotspot.patch | 24 +-
13 files changed, 8915 insertions(+), 2342 deletions(-)
diffs (truncated from 14057 to 500 lines):
diff -r fb1137cef484 -r 1479af449489 ChangeLog
--- a/ChangeLog Mon Aug 20 18:10:54 2012 +0200
+++ b/ChangeLog Fri Aug 31 15:06:23 2012 +0100
@@ -1,3 +1,26 @@
+2012-08-31 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (SECURITY_PATCHES): Add 7162476, 7163201 & 7182135.
+ (ICEDTEA_PATCHES): Add 7185678.
+ * patches/merge_fix.patch: Patch to fix merge issues
+ between new security fixes and previous backports.
+ * patches/gcc-suffix.patch,
+ * patches/libraries.patch,
+ * patches/version-hotspot.patch:
+ Regenerate to remove fuzz.
+ * patches/nomotif-6706121.patch,
+ * patches/openjdk/6633275-shaped_translucent_windows.patch,
+ * patches/openjdk/6693253-security_warning.patch,
+ * patches/openjdk/6797195-hw_lw_mixing.patch:
+ Regenerated post-security patches.
+ * patches/openjdk/7185678-xmenuitem_peer_npe.patch,
+ * patches/security/20120830/7162476-xmldecoder_via_classfinder.patch,
+ * patches/security/20120830/7163201-simplify_toolkit_internal_references.patch:
+ New patches from 6u35/7u7 security release.
+ * patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch:
+ Regression fix for 7162476.
+
2012-08-20 Xerxes RÃ¥nby <xerxes at zafena.se>
Robert Lougher <rob at jamvm.org.uk>
diff -r fb1137cef484 -r 1479af449489 Makefile.am
--- a/Makefile.am Mon Aug 20 18:10:54 2012 +0200
+++ b/Makefile.am Fri Aug 31 15:06:23 2012 +0100
@@ -205,7 +205,10 @@
patches/security/20120612/7152811.patch \
patches/security/20120612/7157609.patch \
patches/security/20120612/7160677.patch \
- patches/security/20120612/7160757.patch
+ patches/security/20120612/7160757.patch \
+ patches/security/20120830/7162476-xmldecoder_via_classfinder.patch \
+ patches/security/20120830/7163201-simplify_toolkit_internal_references.patch \
+ patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch
SPECIAL_SECURITY_PATCH = patches/security/20120214/7112642.patch
@@ -430,7 +433,9 @@
patches/openjdk/p11cipher-6687725-throw_illegalblocksizeexception.patch \
patches/openjdk/p11cipher-6924489-ckr_operation_not_initialized.patch \
patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch \
- patches/openjdk/p11cipher-6414899-p11digest_should_support_cloning.patch
+ patches/openjdk/p11cipher-6414899-p11digest_should_support_cloning.patch \
+ patches/openjdk/7185678-xmenuitem_peer_npe.patch \
+ patches/merge_fix.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r fb1137cef484 -r 1479af449489 patches/gcc-suffix.patch
--- a/patches/gcc-suffix.patch Mon Aug 20 18:10:54 2012 +0200
+++ b/patches/gcc-suffix.patch Fri Aug 31 15:06:23 2012 +0100
@@ -1,5 +1,62 @@
---- openjdk/jdk/make/common/shared/Compiler-gcc.gmk~ 2007-08-02 09:17:53.000000000 +0200
-+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2007-08-08 16:30:52.857814544 +0200
+diff -Nru openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk openjdk/corba/make/common/shared/Compiler-gcc.gmk
+--- openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk 2012-05-01 22:14:04.000000000 +0100
++++ openjdk/corba/make/common/shared/Compiler-gcc.gmk 2012-08-31 14:23:49.777791536 +0100
+@@ -58,17 +58,17 @@
+ ifeq ($(PLATFORM), linux)
+
+ # Settings specific to Linux
+- CC = $(COMPILER_PATH)gcc
+- CPP = $(COMPILER_PATH)gcc -E
++ CC = $(COMPILER_PATH)gcc$(GCC_SUFFIX)
++ CPP = $(COMPILER_PATH)gcc$(GCC_SUFFIX) -E
+ # statically link libstdc++ before C++ ABI is stablized on Linux
+ STATIC_CXX = true
+ ifeq ($(STATIC_CXX),true)
+ # g++ always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++"
+ # We need to use gcc to statically link the C++ runtime. gcc and g++ use
+ # the same subprocess to compile C++ files, so it is OK to build using gcc.
+- CXX = $(COMPILER_PATH)gcc
++ CXX = $(COMPILER_PATH)gcc$(GCC_SUFFIX)
+ else
+- CXX = $(COMPILER_PATH)g++
++ CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX)
+ endif
+ ifeq ($(ZERO_BUILD), true)
+ # zero
+diff -Nru openjdk.orig/hotspot/agent/src/os/linux/Makefile openjdk/hotspot/agent/src/os/linux/Makefile
+--- openjdk.orig/hotspot/agent/src/os/linux/Makefile 2012-05-01 22:15:02.000000000 +0100
++++ openjdk/hotspot/agent/src/os/linux/Makefile 2012-08-31 14:23:17.249256215 +0100
+@@ -23,7 +23,7 @@
+ #
+
+ ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi )
+-GCC = gcc
++GCC = gcc$(GCC_SUFFIX)
+
+ JAVAH = ${JAVA_HOME}/bin/javah
+
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2012-08-31 14:22:45.464733130 +0100
++++ openjdk/hotspot/make/linux/makefiles/gcc.make 2012-08-31 14:23:17.249256215 +0100
+@@ -28,11 +28,11 @@
+ # When cross-compiling the ALT_COMPILER_PATH points
+ # to the cross-compilation toolset
+ ifdef CROSS_COMPILE_ARCH
+-CPP = $(ALT_COMPILER_PATH)/g++
+-CC = $(ALT_COMPILER_PATH)/gcc
++CPP = $(ALT_COMPILER_PATH)/g++$(GCC_SUFFIX)
++CC = $(ALT_COMPILER_PATH)/gcc$(GCC_SUFFIX)
+ else
+-CPP = g++
+-CC = gcc
++CPP = g++$(GCC_SUFFIX)
++CC = gcc$(GCC_SUFFIX)
+ endif
+
+ AS = $(CC) -c
+diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk
+--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2012-05-01 22:17:59.000000000 +0100
++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2012-08-31 14:23:17.241256083 +0100
@@ -58,17 +58,17 @@
ifeq ($(PLATFORM), linux)
@@ -22,58 +79,3 @@
endif
ifneq ("$(findstring sparc,$(ARCH))", "")
# sparc or sparcv9
---- openjdk/corba/make/common/shared/Compiler-gcc.gmk~ 2008-01-14 14:05:43.738465508 +0100
-+++ openjdk/corba/make/common/shared/Compiler-gcc.gmk 2008-01-14 14:19:33.640984398 +0100
-@@ -58,17 +58,17 @@
- ifeq ($(PLATFORM), linux)
-
- # Settings specific to Linux
-- CC = $(COMPILER_PATH)gcc
-- CPP = $(COMPILER_PATH)gcc -E
-+ CC = $(COMPILER_PATH)gcc$(GCC_SUFFIX)
-+ CPP = $(COMPILER_PATH)gcc$(GCC_SUFFIX) -E
- # statically link libstdc++ before C++ ABI is stablized on Linux
- STATIC_CXX = true
- ifeq ($(STATIC_CXX),true)
- # g++ always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++"
- # We need to use gcc to statically link the C++ runtime. gcc and g++ use
- # the same subprocess to compile C++ files, so it is OK to build using gcc.
-- CXX = $(COMPILER_PATH)gcc
-+ CXX = $(COMPILER_PATH)gcc$(GCC_SUFFIX)
- else
-- CXX = $(COMPILER_PATH)g++
-+ CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX)
- endif
- ifneq ("$(findstring sparc,$(ARCH))", "")
- # sparc or sparcv9
-diff -Nru openjdk.orig/hotspot/agent/src/os/linux/Makefile openjdk/hotspot/agent/src/os/linux/Makefile
---- openjdk.orig/hotspot/agent/src/os/linux/Makefile 2011-01-25 22:57:24.000000000 +0000
-+++ openjdk/hotspot/agent/src/os/linux/Makefile 2011-01-28 00:43:20.632487152 +0000
-@@ -23,7 +23,7 @@
- #
-
- ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi )
--GCC = gcc
-+GCC = gcc$(GCC_SUFFIX)
-
- JAVAH = ${JAVA_HOME}/bin/javah
-
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2011-01-28 00:35:53.000000000 +0000
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2011-01-28 00:43:56.676866099 +0000
-@@ -28,11 +28,11 @@
- # When cross-compiling the ALT_COMPILER_PATH points
- # to the cross-compilation toolset
- ifdef CROSS_COMPILE_ARCH
--CPP = $(ALT_COMPILER_PATH)/g++
--CC = $(ALT_COMPILER_PATH)/gcc
-+CPP = $(ALT_COMPILER_PATH)/g++$(GCC_SUFFIX)
-+CC = $(ALT_COMPILER_PATH)/gcc$(GCC_SUFFIX)
- else
--CPP = g++
--CC = gcc
-+CPP = g++$(GCC_SUFFIX)
-+CC = gcc$(GCC_SUFFIX)
- endif
-
- AS = $(CC) -c
diff -r fb1137cef484 -r 1479af449489 patches/libraries.patch
--- a/patches/libraries.patch Mon Aug 20 18:10:54 2012 +0200
+++ b/patches/libraries.patch Fri Aug 31 15:06:23 2012 +0100
@@ -1,71 +1,61 @@
---- openjdk.old/jdk/make/sun/jpeg/Makefile 2007-10-12 03:54:08.000000000 -0400
-+++ openjdk/jdk/make/sun/jpeg/Makefile 2007-10-24 15:15:25.000000000 -0400
-@@ -68,6 +68,8 @@
- include $(BUILDDIR)/common/Mapfile-vers.gmk
- include $(BUILDDIR)/common/Library.gmk
-
-+LDLIBS += -ldl
-+
- #
- # Add to ambient vpath to get files in a subdirectory
- #
---- openjdk.old/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2007-10-12 04:03:51.000000000 -0400
-+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2007-10-22 12:50:36.000000000 -0400
-@@ -25,7 +25,7 @@
-
- #include "splashscreen_impl.h"
-
--#include "../libpng/png.h"
-+#include <png.h>
-
- #include <setjmp.h>
-
---- openjdk.old/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2007-10-12 04:03:51.000000000 -0400
-+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2007-10-22 12:50:36.000000000 -0400
-@@ -26,7 +26,7 @@
- #include "splashscreen_impl.h"
- #include "splashscreen_gfx.h"
-
--#include "../giflib/gif_lib.h"
-+#include <gif_lib.h>
-
- #define GIF_TRANSPARENT 0x01
- #define GIF_USER_INPUT 0x02
---- openjdk.old/jdk/src/share/native/java/util/zip/Adler32.c 2007-10-12 04:03:46.000000000 -0400
-+++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c 2007-10-22 13:21:09.000000000 -0400
-@@ -29,7 +29,7 @@
-
- #include "jni.h"
- #include "jni_util.h"
--#include "zlib.h"
-+#include <zlib.h>
-
- #include "java_util_zip_Adler32.h"
-
---- openjdk.old/jdk/src/share/native/java/util/zip/Deflater.c 2007-10-12 04:03:46.000000000 -0400
-+++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c 2007-10-22 13:22:34.000000000 -0400
-@@ -32,7 +32,7 @@
- #include "jlong.h"
- #include "jni.h"
- #include "jni_util.h"
--#include "zlib.h"
-+#include <zlib.h>
-
- #include "java_util_zip_Deflater.h"
-
---- openjdk.old/jdk/src/share/native/java/util/zip/CRC32.c 2007-10-12 04:03:46.000000000 -0400
-+++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c 2007-10-22 13:23:08.000000000 -0400
-@@ -29,7 +29,7 @@
-
- #include "jni.h"
- #include "jni_util.h"
--#include "zlib.h"
-+#include <zlib.h>
-
- #include "java_util_zip_CRC32.h"
-
---- openjdk.old/jdk/make/common/Program.gmk 2007-10-12 03:54:05.000000000 -0400
-+++ openjdk/jdk/make/common/Program.gmk 2007-10-22 13:26:06.000000000 -0400
+diff -Nru openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
+--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2012-05-01 22:17:59.000000000 +0100
++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2012-08-31 14:28:14.213967014 +0100
+@@ -64,23 +64,21 @@
+ 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)
++ $(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)
++
++ OTHER_LDLIBS += -lz
+ else
+ OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
+- OTHER_LDLIBS += $(JVMLIB)
++ OTHER_LDLIBS += -lz $(JVMLIB)
+ endif
+
+ CXXFLAGS_DBG += -DFULL
+@@ -102,12 +100,12 @@
+ COMPILER_WARNINGS_FATAL=false
+ else
+ LDOUTPUT = -o #Have a space
+- LDDFLAGS += -lc
++ LDDFLAGS += -lz -lc
+ OTHER_LDLIBS += $(LIBCXX)
+ # setup the list of libraries to link in...
+ ifeq ($(PLATFORM), linux)
+ ifeq ("$(CC_VER_MAJOR)", "3")
+- OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
++ OTHER_LDLIBS += -lz -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
+ endif
+ endif #LINUX
+ endif #PLATFORM
+diff -Nru openjdk.orig/jdk/make/common/Program.gmk openjdk/jdk/make/common/Program.gmk
+--- openjdk.orig/jdk/make/common/Program.gmk 2012-05-01 22:17:59.000000000 +0100
++++ openjdk/jdk/make/common/Program.gmk 2012-08-31 14:28:36.022311198 +0100
@@ -85,7 +85,7 @@
endif
endif
@@ -75,45 +65,69 @@
LDFLAGS += -Wl,--allow-shlib-undefined
LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
-@@ -251,7 +251,6 @@
+@@ -229,7 +229,6 @@
endif
OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin
-OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
- # this may not be necessary...
+ OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
+ VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
+diff -Nru openjdk.orig/jdk/make/java/jli/Makefile openjdk/jdk/make/java/jli/Makefile
+--- openjdk.orig/jdk/make/java/jli/Makefile 2012-05-01 22:18:00.000000000 +0100
++++ openjdk/jdk/make/java/jli/Makefile 2012-08-31 14:28:14.213967014 +0100
+@@ -44,8 +44,6 @@
+
+ include $(BUILDDIR)/common/Defs.gmk
+
+-ZLIB_VERSION = 1.1.3
+-ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+ LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin
+ LAUNCHER_PLATFORM_SRC = $(PLATFORM_SRC)/bin
+
+@@ -56,22 +54,14 @@
+ parse_manifest.c \
+ version_comp.c \
+ wildcard.c \
+- jli_util.c \
+- inflate.c \
+- infblock.c \
+- inftrees.c \
+- infcodes.c \
+- inffast.c \
+- infutil.c \
+- zadler32.c \
+- zutil.c
++ jli_util.c
+
+ OTHER_CPPFLAGS += -DEXPAND_CLASSPATH_WILDCARDS
+
+ ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems
+ LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/jli
+ # Guarantee very limited dependencies
+- LDLIBS = -lc
++ LDLIBS = -lz -lc
+ endif
+
ifeq ($(PLATFORM), windows)
---- openjdk.old/jdk/make/java/zip/Makefile 2007-10-12 03:54:05.000000000 -0400
-+++ openjdk/jdk/make/java/zip/Makefile 2007-10-22 13:27:01.000000000 -0400
-@@ -30,8 +30,6 @@
- PRODUCT = sun
- include $(BUILDDIR)/common/Defs.gmk
-
--ZLIB_VERSION = 1.1.3
--
+@@ -98,7 +88,6 @@
+
+ OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)
+ OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC)
+-OTHER_INCLUDES += -I$(ZIP_SRC)
+
#
- # Files to compile.
+ # Library to compile.
+@@ -139,5 +128,5 @@
#
-@@ -72,16 +70,10 @@
- CPPFLAGS += -UDEBUG
- endif
-
--CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
- CPPFLAGS += -I$(SHARE_SRC)/native/java/io
- CPPFLAGS += -I$(PLATFORM_SRC)/native/java/io
-
+ # Add to ambient vpath so we pick up the library files
#
--# Add to ambient vpath so we pick up the library files
--#
--vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/zlib-$(ZLIB_VERSION)
--
--#
- # Link to JVM library for JVM_Zip* functions
- #
--OTHER_LDLIBS = $(JVMLIB)
-+OTHER_LDLIBS = $(JVMLIB) -lz
---- openjdk.old/jdk/make/java/zip/FILES_c.gmk 2007-10-12 03:54:05.000000000 -0400
-+++ openjdk/jdk/make/java/zip/FILES_c.gmk 2007-10-22 13:52:53.000000000 -0400
+-vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC)
++vpath %.c $(LAUNCHER_SHARE_SRC)
+
+diff -Nru openjdk.orig/jdk/make/java/zip/FILES_c.gmk openjdk/jdk/make/java/zip/FILES_c.gmk
+--- openjdk.orig/jdk/make/java/zip/FILES_c.gmk 2012-05-01 22:18:00.000000000 +0100
++++ openjdk/jdk/make/java/zip/FILES_c.gmk 2012-08-31 14:28:14.189966636 +0100
@@ -30,15 +30,4 @@
Inflater.c \
ZipFile.c \
@@ -130,31 +144,107 @@
- infutil.c \
- inffast.c \
zip_util.c
---- openjdk.old/jdk/src/share/native/java/util/zip/Inflater.c 2007-10-12 04:03:46.000000000 -0400
-+++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c 2007-10-22 15:21:32.000000000 -0400
-@@ -35,7 +35,7 @@
- #include "jni.h"
- #include "jvm.h"
- #include "jni_util.h"
--#include "zlib.h"
-+#include <zlib.h>
- #include "java_util_zip_Inflater.h"
-
- #define ThrowDataFormatException(env, msg) \
---- openjdk.old/jdk/src/share/native/java/util/zip/zip_util.c 2007-10-12 04:03:46.000000000 -0400
-+++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c 2007-10-23 14:33:18.000000000 -0400
-@@ -44,7 +44,8 @@
- #include "io_util.h"
- #include "io_util_md.h"
- #include "zip_util.h"
--#include "zlib.h"
-+
-+#include <zlib.h>
-
- /* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */
- #ifdef USE_MMAP
---- openjdk.old/jdk/make/sun/splashscreen/FILES_c.gmk 2007-10-12 03:54:08.000000000 -0400
-+++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2007-10-23 16:15:48.000000000 -0400
+diff -Nru openjdk.orig/jdk/make/java/zip/Makefile openjdk/jdk/make/java/zip/Makefile
+--- openjdk.orig/jdk/make/java/zip/Makefile 2012-05-01 22:18:00.000000000 +0100
++++ openjdk/jdk/make/java/zip/Makefile 2012-08-31 14:28:14.189966636 +0100
+@@ -30,8 +30,6 @@
+ PRODUCT = sun
+ include $(BUILDDIR)/common/Defs.gmk
+
+-ZLIB_VERSION = 1.1.3
+-
+ #
+ # Files to compile.
+ #
+@@ -72,16 +70,10 @@
+ CPPFLAGS += -UDEBUG
+ endif
+
+-CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+ CPPFLAGS += -I$(SHARE_SRC)/native/java/io
+ CPPFLAGS += -I$(PLATFORM_SRC)/native/java/io
+
+ #
+-# Add to ambient vpath so we pick up the library files
+-#
+-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/zlib-$(ZLIB_VERSION)
+-
+-#
+ # Link to JVM library for JVM_Zip* functions
+ #
+-OTHER_LDLIBS = $(JVMLIB)
++OTHER_LDLIBS = $(JVMLIB) -lz
+diff -Nru openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk openjdk/jdk/make/sun/jpeg/FILES_c.gmk
+--- openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk 2012-05-01 22:18:01.000000000 +0100
++++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2012-08-31 14:28:14.189966636 +0100
+@@ -25,51 +25,7 @@
+
+ FILES_c = \
+ imageioJPEG.c \
+- jpegdecoder.c \
+- jcomapi.c \
+- jdapimin.c \
+- jdapistd.c \
+- jdcoefct.c \
+- jdcolor.c \
+- jddctmgr.c \
+- jdhuff.c \
+- jdinput.c \
+- jdmainct.c \
+- jdmarker.c \
+- jdmaster.c \
+- jdmerge.c \
+- jdphuff.c \
+- jdpostct.c \
+- jdsample.c \
+- jerror.c \
+- jidctflt.c \
More information about the distro-pkg-dev
mailing list