Mercurial > hg > release > icedtea6-1.10
view patches/arch.patch @ 2578:96394d394527
Add security patches for 2012/06/12.
2012-06-07 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add security patches. Make more
patches HotSpot-build specific.
* patches/ecj/override.patch:
Add additional cases from 7143872.
* patches/arm.patch: Moved to HotSpot-specific versions.
* patches/arch.patch,
* patches/freetypeversion.patch,
* patches/gcc-suffix.patch:
Fix to work with no fuzz.
* patches/hotspot/hs20/arm.patch,
* patches/hotspot/hs20/gcc-stack-markings.patch,
* patches/hotspot/hs20/numa_on_early_glibc.patch,
* patches/hotspot/hs20/sparc-trapsfix.patch,
* patches/hotspot/hs20/version-hotspot.patch:
Split to work with hs20 with no fuzz.
* patches/hotspot/original/arm.patch,
* patches/hotspot/original/gcc-stack-markings.patch,
* patches/hotspot/original/numa_on_early_glibc.patch,
* patches/hotspot/original/sparc-trapsfix.patch,
* patches/hotspot/original/version-hotspot.patch:
Likewise for hs19 (original).
* patches/jaxp-serial-version-uid.patch,
* patches/libraries.patch,
* patches/nio2.patch,
* patches/no-static-linking.patch,
* patches/openjdk/6693253-security_warning.patch,
* patches/openjdk/6766342-AA-simple-shape-performance.patch,
* patches/openjdk/6797139-jbutton_truncation.patch,
* patches/openjdk/6851973-kerberos.patch,
* patches/openjdk/7102369-7094468-rmiregistry.patch:
Fixed to work with no fuzz.
* patches/openjdk/hs20/7034464-hugepage.patch,
* patches/openjdk/hs20/7103224-glibc_name_collision.patch,
Fixed to work with hs20 and no fuzz.
* patches/openjdk/mutter.patch:
Fixed to work with no fuzz.
* patches/openjdk/original/7034464-hugepage.patch,
* patches/openjdk/original/7103224-glibc_name_collision.patch,
Fixed to work with hs19 (original) and no fuzz.
* patches/openjdk/remove-mimpure-option-to-gcc.patch:
Fixed to work with no fuzz.
* patches/security/20120612/7079902.patch,
* patches/security/20120612/7143606.patch,
* patches/security/20120612/7143614.patch,
* patches/security/20120612/7143617.patch,
* patches/security/20120612/7143851.patch,
* patches/security/20120612/7143872.patch,
* patches/security/20120612/7145239.patch,
* patches/security/20120612/7157609.patch,
* patches/security/20120612/7160677.patch,
* patches/security/20120612/7160757.patch,
* patches/security/20120612/hs20/7110720.patch,
* patches/security/20120612/hs20/7152811.patch,
* patches/security/20120612/original/7110720.patch,
* patches/security/20120612/original/7152811.patch,
Security patches for 2012/06/12.
* NEWS: Updated.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Fri, 08 Jun 2012 14:23:28 +0100 |
| parents | 41fca4a6cb61 |
| children |
line wrap: on
line source
diff -Nru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk --- openjdk.orig/corba/make/common/Defs-linux.gmk 2011-02-28 16:02:14.000000000 +0000 +++ openjdk/corba/make/common/Defs-linux.gmk 2012-06-08 11:40:58.778526814 +0100 @@ -92,9 +92,19 @@ # We need this frame pointer to make it easy to walk the stacks. # This should be the default on X86, but ia64 and amd64 may not have this # as the default. +CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN +CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN +CFLAGS_REQUIRED_hppa += CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN +CFLAGS_REQUIRED_m68k += +CFLAGS_REQUIRED_mips += +CFLAGS_REQUIRED_mipsel += -D_LITTLE_ENDIAN +CFLAGS_REQUIRED_ppc += -m32 +CFLAGS_REQUIRED_ppc64 += -m64 +CFLAGS_REQUIRED_s390 += +CFLAGS_REQUIRED_s390x += -m64 CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9 LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9 CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9 diff -Nru openjdk.orig/corba/make/common/shared/Platform.gmk openjdk/corba/make/common/shared/Platform.gmk --- openjdk.orig/corba/make/common/shared/Platform.gmk 2012-06-08 11:39:58.213547080 +0100 +++ openjdk/corba/make/common/shared/Platform.gmk 2012-06-08 11:40:58.778526814 +0100 @@ -220,9 +220,40 @@ else # i586 is 32-bit, amd64 is 64-bit ifndef ARCH_DATA_MODEL + ifeq ($(ARCH), alpha) + ARCH_DATA_MODEL=64 + endif + ifeq ($(ARCH), amd64) + ARCH_DATA_MODEL=64 + endif + ifeq ($(ARCH), arm) + ARCH_DATA_MODEL=32 + endif ifeq ($(ARCH), i586) ARCH_DATA_MODEL=32 - else + endif + ifeq ($(ARCH), ia64) + ARCH_DATA_MODEL=64 + endif + ifeq ($(ARCH), m68k) + ARCH_DATA_MODEL=32 + endif + ifeq ($(ARCH), mips) + ARCH_DATA_MODEL=32 + endif + ifeq ($(ARCH), mipsel) + ARCH_DATA_MODEL=32 + endif + ifeq ($(ARCH), ppc) + ARCH_DATA_MODEL=32 + endif + ifeq ($(ARCH), ppc64) + ARCH_DATA_MODEL=64 + endif + ifeq ($(ARCH), s390) + ARCH_DATA_MODEL=32 + endif + ifeq ($(ARCH), s390x) ARCH_DATA_MODEL=64 endif endif diff -Nru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk --- openjdk.orig/jdk/make/common/Defs-linux.gmk 2011-02-28 16:06:10.000000000 +0000 +++ openjdk/jdk/make/common/Defs-linux.gmk 2012-06-08 11:40:58.770526683 +0100 @@ -102,9 +102,19 @@ # We need this frame pointer to make it easy to walk the stacks. # This should be the default on X86, but ia64 and amd64 may not have this # as the default. +CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN +CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN +CFLAGS_REQUIRED_hppa += CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN +CFLAGS_REQUIRED_m68k += +CFLAGS_REQUIRED_mips += +CFLAGS_REQUIRED_mipsel += -D_LITTLE_ENDIAN +CFLAGS_REQUIRED_ppc += -m32 +CFLAGS_REQUIRED_ppc64 += -m64 +CFLAGS_REQUIRED_s390 += +CFLAGS_REQUIRED_s390x += -m64 CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9 LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9 CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9 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-06-08 11:39:58.053544493 +0100 +++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2012-06-08 11:40:58.778526814 +0100 @@ -70,28 +70,56 @@ else CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX) endif - ifneq ("$(findstring sparc,$(ARCH))", "") - # sparc or sparcv9 - REQUIRED_CC_VER = 4.0 - REQUIRED_GCC_VER = 4.0.* - else - ifeq ($(ARCH_DATA_MODEL), 32) - # i586 + ifeq ($(ARCH), alpha) + # alpha REQUIRED_CC_VER = 3.2 - REQUIRED_GCC_VER = 3.2.1* - REQUIRED_GCC_VER_INT = 3.2.1-7a - else + REQUIRED_GCC_VER = 3.2.* + endif ifeq ($(ARCH), amd64) # amd64 REQUIRED_CC_VER = 3.2 REQUIRED_GCC_VER = 3.2.* endif + ifeq ($(ARCH), arm) + # arm + REQUIRED_CC_VER = 3.2 + REQUIRED_GCC_VER = 3.2.* + endif + ifeq ($(ARCH), i586) + # i586 + REQUIRED_CC_VER = 3.2 + REQUIRED_GCC_VER = 3.2.1* + REQUIRED_GCC_VER_INT = 3.2.1-7a + endif ifeq ($(ARCH), ia64) # ia64 REQUIRED_CC_VER = 3.2 REQUIRED_GCC_VER = 2.9[56789].* endif + ifneq ("$(findstring m68k,$(ARCH))", "") + # m68k + REQUIRED_CC_VER = 3.2 + REQUIRED_GCC_VER = 3.2.* endif + ifneq ("$(findstring mips,$(ARCH))", "") + # mips + REQUIRED_CC_VER = 3.2 + REQUIRED_GCC_VER = 3.2.* + endif + ifneq ("$(findstring ppc,$(ARCH))", "") + # ppc or ppc64 + REQUIRED_CC_VER = 3.2 + REQUIRED_GCC_VER = 3.2.* + endif + ifneq ("$(findstring s390,$(ARCH))", "") + # s390 or s390x + REQUIRED_CC_VER = 3.2 + REQUIRED_GCC_VER = 3.2.* + endif + ifneq ("$(findstring sparc,$(ARCH))", "") + # sparc or sparcv9 + REQUIRED_CC_VER = 4.0 + REQUIRED_GCC_VER = 4.0.* endif # Option used to create a shared library SHARED_LIBRARY_FLAG = -shared -mimpure-text diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk --- openjdk.orig/jdk/make/common/shared/Platform.gmk 2012-06-08 11:39:58.221547210 +0100 +++ openjdk/jdk/make/common/shared/Platform.gmk 2012-06-08 11:40:58.778526814 +0100 @@ -230,9 +230,40 @@ else # i586 is 32-bit, amd64 is 64-bit ifndef ARCH_DATA_MODEL + ifeq ($(ARCH), alpha) + ARCH_DATA_MODEL=64 + endif + ifeq ($(ARCH), amd64) + ARCH_DATA_MODEL=64 + endif + ifeq ($(ARCH), arm) + ARCH_DATA_MODEL=32 + endif ifeq ($(ARCH), i586) ARCH_DATA_MODEL=32 - else + endif + ifeq ($(ARCH), ia64) + ARCH_DATA_MODEL=64 + endif + ifeq ($(ARCH), m68k) + ARCH_DATA_MODEL=32 + endif + ifeq ($(ARCH), mips) + ARCH_DATA_MODEL=32 + endif + ifeq ($(ARCH), mipsel) + ARCH_DATA_MODEL=32 + endif + ifeq ($(ARCH), ppc) + ARCH_DATA_MODEL=32 + endif + ifeq ($(ARCH), ppc64) + ARCH_DATA_MODEL=64 + endif + ifeq ($(ARCH), s390) + ARCH_DATA_MODEL=32 + endif + ifeq ($(ARCH), s390x) ARCH_DATA_MODEL=64 endif endif diff -Nru openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk --- openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk 2011-02-28 16:06:11.000000000 +0000 +++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2012-06-08 11:40:58.770526683 +0100 @@ -58,10 +58,54 @@ ifeq ($(ZERO_BUILD), true) CPPFLAGS += -DX_ARCH=X_ZERO else + ifeq ($(ARCH), alpha) + CPPFLAGS += -DX_ARCH=X_ALPHA + endif # ARCH alpha + + ifeq ($(ARCH), amd64) + CPPFLAGS += -DX_ARCH=X_AMD64 + endif # ARCH amd64 + + ifeq ($(ARCH), arm) + CPPFLAGS += -DX_ARCH=X_ARM + endif # ARCH arm + ifeq ($(ARCH), i586) CPPFLAGS += -DX_ARCH=X_I586 endif # ARCH i586 + ifeq ($(ARCH), ia64) + CPPFLAGS += -DX_ARCH=X_IA64 + endif # ARCH ia64 + + ifeq ($(ARCH), m68k) + CPPFLAGS += -DX_ARCH=X_M68K + endif # ARCH m68k + + ifeq ($(ARCH), mips) + CPPFLAGS += -DX_ARCH=X_MIPS + endif # ARCH mips + + ifeq ($(ARCH), mipsel) + CPPFLAGS += -DX_ARCH=X_MIPSEL + endif # ARCH mipsel + + ifeq ($(ARCH), ppc) + CPPFLAGS += -DX_ARCH=X_PPC + endif # ARCH ppc + + ifeq ($(ARCH), ppc64) + CPPFLAGS += -DX_ARCH=X_PPC64 + endif # ARCH ppc64 + + ifeq ($(ARCH), s390) + CPPFLAGS += -DX_ARCH=X_S390 + endif # ARCH s390 + + ifeq ($(ARCH), s390x) + CPPFLAGS += -DX_ARCH=X_S390X + endif # ARCH s390x + ifeq ($(ARCH), sparc) CPPFLAGS += -DX_ARCH=X_SPARC endif # ARCH sparc @@ -69,10 +113,6 @@ ifeq ($(ARCH), sparcv9) CPPFLAGS += -DX_ARCH=X_SPARCV9 endif # ARCH sparcv9 - - ifeq ($(ARCH), amd64) - CPPFLAGS += -DX_ARCH=X_AMD64 - endif # ARCH amd64 endif diff -Nru openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h --- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-02-28 16:06:44.000000000 +0000 +++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2012-06-08 11:40:58.778526814 +0100 @@ -33,12 +33,21 @@ #define X_LINUX 3 // types for X_ARCH -#define X_I586 1 -#define X_SPARC 2 -#define X_SPARCV9 3 -#define X_IA64 4 -#define X_AMD64 5 -#define X_ZERO 6 +#define X_ALPHA 1 +#define X_AMD64 2 +#define X_ARM 3 +#define X_I586 4 +#define X_IA64 5 +#define X_M68K 6 +#define X_MIPS 7 +#define X_MIPSEL 8 +#define X_PPC 9 +#define X_PPC64 10 +#define X_S390 11 +#define X_S390X 12 +#define X_SPARC 13 +#define X_SPARCV9 14 +#define X_ZERO 15 // ********************************** // Make sure you set X_PLATFORM and X_ARCH defines correctly.