tags 491362 patch thanks The patch I intend to upload rather fast.
Bastian -- Ahead warp factor one, Mr. Sulu.
diff -u openjdk-6-6b10dfsg/Makefile.am openjdk-6-6b10dfsg/Makefile.am
--- openjdk-6-6b10dfsg/Makefile.am
+++ openjdk-6-6b10dfsg/Makefile.am
@@ -353,6 +353,7 @@
ZERO_PATCHES_COND = $(ZERO_PATCHES)
else
ZERO_PATCHES_COND = $(NON_ZERO_PATCHES)
+ SECURITY_PATCHES_COND = patches/icedtea-security-updates-nonzero.patch
endif
# If Shark is required, apply shark patch
@@ -420,6 +421,7 @@
patches/icedtea-toolkit.patch \
patches/icedtea-jdk-docs-target.patch \
patches/icedtea-security-updates.patch \
+ $(SECURITY_PATCHES_COND) \
$(SHARK_PATCH) \
$(GCC_PATCH)
diff -u openjdk-6-6b10dfsg/Makefile.in openjdk-6-6b10dfsg/Makefile.in
--- openjdk-6-6b10dfsg/Makefile.in
+++ openjdk-6-6b10dfsg/Makefile.in
@@ -435,6 +435,7 @@
@[EMAIL PROTECTED] = $(NON_ZERO_PATCHES)
@[EMAIL PROTECTED] = $(ZERO_PATCHES)
[EMAIL PROTECTED]@SECURITY_PATCHES_COND =
patches/icedtea-security-updates-nonzero.patch
@[EMAIL PROTECTED] =
# If Shark is required, apply shark patch
@@ -485,9 +486,9 @@
patches/icedtea-shark-build.patch \
patches/icedtea-toolkit.patch \
patches/icedtea-jdk-docs-target.patch \
- patches/icedtea-security-updates.patch $(SHARK_PATCH) \
- $(GCC_PATCH) $(am__append_7) $(am__append_8) \
- $(DISTRIBUTION_PATCHES)
+ patches/icedtea-security-updates.patch \
+ $(SECURITY_PATCHES_COND) $(SHARK_PATCH) $(GCC_PATCH) \
+ $(am__append_7) $(am__append_8) $(DISTRIBUTION_PATCHES)
# Patch OpenJDK for plug replacements and ecj.
ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
diff -u openjdk-6-6b10dfsg/patches/icedtea-security-updates.patch
openjdk-6-6b10dfsg/patches/icedtea-security-updates.patch
--- openjdk-6-6b10dfsg/patches/icedtea-security-updates.patch
+++ openjdk-6-6b10dfsg/patches/icedtea-security-updates.patch
@@ -881,17 +881,6 @@
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<doc>this is a secret</doc>
---- old/src/share/vm/opto/parse3.cpp Wed Apr 9 12:49:10 2008
-+++ openjdk/hotspot/src/share/vm/opto/parse3.cpp Wed Apr 9 12:49:08 2008
-@@ -398,7 +398,7 @@
- // fill the lowest dimensions with unknown sizes
- for (int index = 0; index < mdimensions - ndimensions; index++) {
- const TypeAry* arr0 = TypeAry::make(prev_type, TypeInt::POS);
-- prev_type = TypeAryPtr::make(TypePtr::BotPTR, arr0, prev_array, true, 0);
-+ prev_type = TypeAryPtr::make(TypePtr::BotPTR, arr0, prev_array, false, 0);
- prev_array = NULL; // array klasses can be lazy, except the first
- }
-
--- /dev/null Mon Jun 2 09:19:39 2008
+++ openjdk/jdk/test/sun/management/jmxremote/bootstrap/LocalOnlyTest.java
Mon Jun 2 09:19:39 2008
@@ -0,0 +1,97 @@
diff -u openjdk-6-6b10dfsg/debian/changelog openjdk-6-6b10dfsg/debian/changelog
--- openjdk-6-6b10dfsg/debian/changelog
+++ openjdk-6-6b10dfsg/debian/changelog
@@ -1,3 +1,11 @@
+openjdk-6 (6b10dfsg-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Split patches/icedtea-security-updates.patch in zero and non-zero parts.
+ (closes: #491362)
+
+ -- Bastian Blank <[EMAIL PROTECTED]> Sun, 20 Jul 2008 14:38:13 +0200
+
openjdk-6 (6b10dfsg-2) unstable; urgency=low
* Update IcedTea build infrastructure (20080714).
only in patch2:
unchanged:
--- openjdk-6-6b10dfsg.orig/patches/icedtea-security-updates-nonzero.patch
+++ openjdk-6-6b10dfsg/patches/icedtea-security-updates-nonzero.patch
@@ -0,0 +1,11 @@
+--- old/src/share/vm/opto/parse3.cpp Wed Apr 9 12:49:10 2008
++++ openjdk/hotspot/src/share/vm/opto/parse3.cpp Wed Apr 9 12:49:08 2008
+@@ -398,7 +398,7 @@
+ // fill the lowest dimensions with unknown sizes
+ for (int index = 0; index < mdimensions - ndimensions; index++) {
+ const TypeAry* arr0 = TypeAry::make(prev_type, TypeInt::POS);
+- prev_type = TypeAryPtr::make(TypePtr::BotPTR, arr0, prev_array, true, 0);
++ prev_type = TypeAryPtr::make(TypePtr::BotPTR, arr0, prev_array, false, 0);
+ prev_array = NULL; // array klasses can be lazy, except the first
+ }
+
signature.asc
Description: Digital signature
