/hg/icedtea6: 9 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Apr 25 21:54:16 PDT 2013
changeset c9be0d1330dc in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c9be0d1330dc
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Apr 26 03:06:47 2013 +0100
Add 2013/04/16 security patches.
2013-04-17 Andrew John Hughes <gnu.andrew at member.fsf.org>
* patches/openjdk/6669869-Beans_isDesignTime_should_be_per-AppContext.patch:
Reapplied as a security patch pre-requisite.
* patches/security/20130201/8001235.patch:
Dropped as included in JAXP tarball used.
* INSTALL: Remove --with-{jaxp,jaf,jaxws}-drop-zip documentation.
* Makefile.am:
(JAXWS_DROP_URL): Removed.
(JAXWS_DROP_ZIP): Likewise.
(JAXWS_DROP_SHA256SUM): Likewise.
(JAF_DROP_URL): Likewise.
(JAF_DROP_ZIP): Likewise.
(JAF_DROP_SHA256SUM): Likewise.
(JAF_DROP_URL): Likewise.
(JAXP_DROP_URL): Likewise.
(JAXP_DROP_ZIP): Likewise.
(JAXP_DROP_SHA256SUM): Likewise.
(DROP_PATCHES): Add patches providing code
previously provided by drop zips.
(SECURITY_PATCHES): Updated.
(ICEDTEA_PATCHES): Add DROP_PATCHES. Remove
6669869 duplicate.
(ICEDTEA_ENV): Remove ALT_DROPS_DIR.
(download-jaxp-drop): Removed.
(clean-download-jaxp-drop): Likewise.
(download-jaf-drop): Likewise.
(clean-download-jaf-drop): Likewise.
(download-jaxws-drop): Likewise.
(clean-download-jaxws-drop): Likewise.
(download-drops): Likewise.
(clean-drops): Likewise.
(download): Don't depend on download-drops.
(clean-download): Likewise for clean-drops.
* NEWS: Add security issues, backports and
mention drop move.
* acinclude.m4:
(IT_WITH_JAXP_DROP_ZIP): Removed.
(IT_WITH_JAF_DROP_ZIP): Likewise.
(IT_WITH_JAXWS_DROP_ZIP): Likewise.
* configure.ac: Don't call removed macros above.
* patches/ecj/override.patch: Add new cases introduced
by security patches (sigh).
* patches/libraries.patch,
* patches/nomotif-6706121.patch:
Regenerated against security patches.
* patches/openjdk/5102804-memory_leak.patch,
* patches/openjdk/6501644-icu_sync.patch:
Backports for security patches.
* patches/openjdk/6633275-shaped_translucent_windows.patch:
Remove copyright notice changes broken by 8006790 security patch.
* patches/openjdk/6669869-queries_per_appcontext.patch,
* patches/openjdk/6886358-layout_update.patch,
* patches/openjdk/6963811-deadlock_fix.patch,
* patches/openjdk/7017324-kerning_crash.patch,
* patches/openjdk/7064279-fixup.patch,
* patches/openjdk/7064279-resource_release.patch,
* patches/openjdk/8004302-soap_test_failure.patch:
More backports for security patches.
* patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch,
* patches/openjdk/jaxp144_05.patch:
Add drop zips in patch form.
* patches/security/20130416/6657673-fixup.patch,
* patches/security/20130416/6657673.patch,
* patches/security/20130416/7200507.patch,
* patches/security/20130416/8000724.patch,
* patches/security/20130416/8001031.patch,
* patches/security/20130416/8001040.patch,
* patches/security/20130416/8001322.patch,
* patches/security/20130416/8001329.patch,
* patches/security/20130416/8003335.patch,
* patches/security/20130416/8003445.patch,
* patches/security/20130416/8003543.patch,
* patches/security/20130416/8004261.patch,
* patches/security/20130416/8004336.patch,
* patches/security/20130416/8004986.patch,
* patches/security/20130416/8005432.patch,
* patches/security/20130416/8005943.patch,
* patches/security/20130416/8006309.patch,
* patches/security/20130416/8006435.patch,
* patches/security/20130416/8006790.patch,
* patches/security/20130416/8006795.patch,
* patches/security/20130416/8007406.patch,
* patches/security/20130416/8007617.patch,
* patches/security/20130416/8009699.patch:
Add security patches.
* patches/xjc.patch:
Regenerate JAXWS patch against sources, not
drop system.
2013-04-12 Omair Majid <omajid at redhat.com>
* patches/security/20130416/8007667.patch,
* patches/security/20130416/8007918.patch,
* patches/security/20130416/8009305.patch,
* patches/security/20130416/8009814.patch,
* patches/security/20130416/8009857.patch:
Add security patches.
changeset 0115b40df976 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0115b40df976
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Apr 26 03:10:41 2013 +0100
PR1402: Support glibc < 2.17 with AArch64 patch
2013-04-17 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/aarch64.patch:
Fix to apply against older HotSpot.
2013-04-17 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/aarch64.patch:
Define EM_AARCH64 for legacy systems
with glibc earlier than 2.17.
changeset 13cfe757d5ee in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=13cfe757d5ee
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Apr 26 03:15:18 2013 +0100
RH952389: Restrict temp file permissions.
2013-04-17 Andrew John Hughes <gnu.andrew at redhat.com>
* ChangeLog:
Move Elliott's entry to correct position.
* Makefile.am:
(ICEDTEA_PATCHES): Fix path to previous patch.
* patches/openjdk/jaxws-tempfiles-ioutils-6.patch:
Moved from here to...
* patches/jaxws-tempfiles-ioutils-6.patch:
...here as not an upstream OpenJDK patch.
2013-04-17 Elliott Baron <ebaron at redhat.com>
* patches/openjdk/jaxws-tempfiles-ioutils-6.patch:
Restrict temp file permissions.
* Makefile.am:
(ICEDTEA_PATCHES): Added new patch.
changeset 2701f46e49a0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2701f46e49a0
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Apr 26 03:17:57 2013 +0100
Give xalan/xerces access to their own internal packages.
2013-04-18 Elliott Baron <ebaron at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch.
* patches/object-factory-cl-internal.patch:
Patch to give xalan/xerces access to their own internal
packages.
changeset 0bf8e7d60829 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0bf8e7d60829
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Apr 19 11:38:18 2013 +0100
Fix patch to apply on RHEL 5.
2013-04-19 Jiri Vanek <jvanek at redhat.com>
* patches/security/20130416/8007667.patch:
Fix patch format to apply on RHEL 5.
changeset c483fccf4758 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c483fccf4758
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Apr 26 03:20:56 2013 +0100
Fix Backport from S6657673.
2013-04-19 Elliott Baron <ebaron at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch.
* patches/security/20130416/6657673.patch:
Removed {parser,transform}.FactoryFinder hunks.
* patches/security/20130416/6657673-jaxp-backport-factoryfinder.patch:
Backported {parser,transform}.FactoryFinder fixes
from jdk7u-dev changesets: 4a61ac055189 & 38d4d23d167c.
changeset 4c03cba06c11 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4c03cba06c11
author: Elliott Baron <ebaron at redhat.com>
date: Mon Apr 22 17:13:26 2013 -0400
Split 6657673-jaxp-backport-factoryfinder patch into two.
2013-04-22 Elliott Baron <ebaron at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Removed one patch, split it into two.
* patches/security/20130416/6657673-jaxp-backport-factoryfinder.patch:
Removed. Split into patches below.
* patches/openjdk/7133220-factory-finder-parser-transform-useBSClassLoader.patch:
First part of removed patch.
* patches/openjdk/6657673-factory-finder-parser-transform-internal-packages.patch:
Second part of removed patch.
changeset 797c2d24d89f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=797c2d24d89f
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Apr 26 03:31:01 2013 +0100
Cleanup from previous commit.
2013-04-24 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Rename patches.
* NEWS: List backports in previous change
correctly.
* patches/openjdk/7133220-factory-finder-parser-transform-useBSClassLoader.patch:
Moved to...
* patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch:
...this.
* patches/openjdk/6657673-factory-finder-parser-transform-internal-packages.patch:
Moved to..
* patches/security/20130416/6657673-factory_finder.patch:
...this.
changeset 3e701dcab7d4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3e701dcab7d4
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Apr 26 03:32:15 2013 +0100
S8009530: ICU Kern table support broken
2013-04-24 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch.
* patches/openjdk/8009530-icu_kern_table_support_broken.patch:
Backported from 7u.
diffstat:
ChangeLog | 182 +
INSTALL | 3 -
Makefile.am | 179 +-
acinclude.m4 | 63 -
configure.ac | 3 -
patches/aarch64.patch | 21 +-
patches/ecj/override.patch | 59 +
patches/jaxws-tempfiles-ioutils-6.patch | 176 +
patches/libraries.patch | 252 +-
patches/nomotif-6706121.patch | 218 +-
patches/object-factory-cl-internal.patch | 384 +
patches/openjdk/5102804-memory_leak.patch | 429 +
patches/openjdk/6501644-icu_sync.patch | 8066 +
patches/openjdk/6633275-shaped_translucent_windows.patch | 49 -
patches/openjdk/6669869-Beans_isDesignTime_should_be_per-AppContext.patch | 346 -
patches/openjdk/6669869-queries_per_appcontext.patch | 355 +
patches/openjdk/6886358-layout_update.patch | 13847 +
patches/openjdk/6963811-deadlock_fix.patch | 42 +
patches/openjdk/7017324-kerning_crash.patch | 101 +
patches/openjdk/7064279-fixup.patch | 71 +
patches/openjdk/7064279-resource_release.patch | 436 +
patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch | 298 +
patches/openjdk/8004302-soap_test_failure.patch | 75 +
patches/openjdk/8009530-icu_kern_table_support_broken.patch | 332 +
patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch | 449213 +++++++
patches/openjdk/jaxp144_05.patch | 595585 ++++++++++
patches/security/20130201/8001235.patch | 37 -
patches/security/20130416/6657673-factory_finder.patch | 54 +
patches/security/20130416/6657673-fixup.patch | 229 +
patches/security/20130416/6657673.patch | 9494 +
patches/security/20130416/7200507.patch | 230 +
patches/security/20130416/8000724.patch | 1368 +
patches/security/20130416/8001031.patch | 5457 +
patches/security/20130416/8001040.patch | 113 +
patches/security/20130416/8001322.patch | 61 +
patches/security/20130416/8001329.patch | 32 +
patches/security/20130416/8003335.patch | 63 +
patches/security/20130416/8003445.patch | 77 +
patches/security/20130416/8003543.patch | 236 +
patches/security/20130416/8004261.patch | 142 +
patches/security/20130416/8004336.patch | 29 +
patches/security/20130416/8004986.patch | 374 +
patches/security/20130416/8005432.patch | 518 +
patches/security/20130416/8005943.patch | 202 +
patches/security/20130416/8006309.patch | 22 +
patches/security/20130416/8006435.patch | 76 +
patches/security/20130416/8006790.patch | 166 +
patches/security/20130416/8006795.patch | 35 +
patches/security/20130416/8007406.patch | 31 +
patches/security/20130416/8007617.patch | 376 +
patches/security/20130416/8007667.patch | 579 +
patches/security/20130416/8007918.patch | 357 +
patches/security/20130416/8009305.patch | 68 +
patches/security/20130416/8009699.patch | 25 +
patches/security/20130416/8009814.patch | 27 +
patches/security/20130416/8009857.patch | 66 +
patches/xjc.patch | 56 +-
57 files changed, 1090488 insertions(+), 897 deletions(-)
diffs (truncated from 1093138 to 500 lines):
diff -r d5ea2fe9da2d -r 3e701dcab7d4 ChangeLog
--- a/ChangeLog Thu Apr 25 18:18:04 2013 +0100
+++ b/ChangeLog Fri Apr 26 03:32:15 2013 +0100
@@ -1,3 +1,185 @@
+2013-04-24 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch.
+ * patches/openjdk/8009530-icu_kern_table_support_broken.patch:
+ Backported from 7u.
+
+2013-04-24 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Rename patches.
+ correctly.
+ * patches/openjdk/7133220-factory-finder-parser-transform-useBSClassLoader.patch:
+ Moved to...
+ * patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch:
+ ...this.
+ * patches/openjdk/6657673-factory-finder-parser-transform-internal-packages.patch:
+ Moved to..
+ * patches/security/20130416/6657673-factory_finder.patch:
+ ...this.
+
+2013-04-22 Elliott Baron <ebaron at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Removed one patch, split it into two.
+ * patches/security/20130416/6657673-jaxp-backport-factoryfinder.patch:
+ Removed. Split into patches below.
+ * patches/openjdk/7133220-factory-finder-parser-transform-useBSClassLoader.patch:
+ First part of removed patch.
+ * patches/openjdk/6657673-factory-finder-parser-transform-internal-packages.patch:
+ Second part of removed patch.
+
+2013-04-19 Elliott Baron <ebaron at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch.
+ * patches/security/20130416/6657673.patch:
+ Removed {parser,transform}.FactoryFinder hunks.
+ * patches/security/20130416/6657673-jaxp-backport-factoryfinder.patch:
+ Backported {parser,transform}.FactoryFinder fixes
+ from jdk7u-dev changesets: 4a61ac055189 & 38d4d23d167c.
+
+2013-04-19 Jiri Vanek <jvanek at redhat.com>
+
+ * patches/security/20130416/8007667.patch:
+ Fix patch format to apply on RHEL 5.
+
+2013-04-18 Elliott Baron <ebaron at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch.
+ * patches/object-factory-cl-internal.patch:
+ Patch to give xalan/xerces access to their own internal
+ packages.
+
+2013-04-17 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * ChangeLog:
+ Move Elliott's entry to correct position.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Fix path to previous patch.
+ * patches/openjdk/jaxws-tempfiles-ioutils-6.patch:
+ Moved from here to...
+ * patches/jaxws-tempfiles-ioutils-6.patch:
+ ...here as not an upstream OpenJDK patch.
+
+2013-04-17 Elliott Baron <ebaron at redhat.com>
+
+ * patches/openjdk/jaxws-tempfiles-ioutils-6.patch:
+ Restrict temp file permissions.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Added new patch.
+
+2013-04-17 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/aarch64.patch:
+ Fix to apply against older HotSpot.
+
+2013-04-17 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR1402: Support glibc < 2.17 with AArch64 patch
+ * patches/aarch64.patch:
+ Define EM_AARCH64 for legacy systems
+ with glibc earlier than 2.17.
+
+2013-04-17 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * patches/openjdk/6669869-Beans_isDesignTime_should_be_per-AppContext.patch:
+ Reapplied as a security patch pre-requisite.
+ * patches/security/20130201/8001235.patch:
+ Dropped as included in JAXP tarball used.
+ * INSTALL: Remove --with-{jaxp,jaf,jaxws}-drop-zip documentation.
+ * Makefile.am:
+ (JAXWS_DROP_URL): Removed.
+ (JAXWS_DROP_ZIP): Likewise.
+ (JAXWS_DROP_SHA256SUM): Likewise.
+ (JAF_DROP_URL): Likewise.
+ (JAF_DROP_ZIP): Likewise.
+ (JAF_DROP_SHA256SUM): Likewise.
+ (JAF_DROP_URL): Likewise.
+ (JAXP_DROP_URL): Likewise.
+ (JAXP_DROP_ZIP): Likewise.
+ (JAXP_DROP_SHA256SUM): Likewise.
+ (DROP_PATCHES): Add patches providing code
+ previously provided by drop zips.
+ (SECURITY_PATCHES): Updated.
+ (ICEDTEA_PATCHES): Add DROP_PATCHES. Remove
+ 6669869 duplicate.
+ (ICEDTEA_ENV): Remove ALT_DROPS_DIR.
+ (download-jaxp-drop): Removed.
+ (clean-download-jaxp-drop): Likewise.
+ (download-jaf-drop): Likewise.
+ (clean-download-jaf-drop): Likewise.
+ (download-jaxws-drop): Likewise.
+ (clean-download-jaxws-drop): Likewise.
+ (download-drops): Likewise.
+ (clean-drops): Likewise.
+ (download): Don't depend on download-drops.
+ (clean-download): Likewise for clean-drops.
+ * acinclude.m4:
+ (IT_WITH_JAXP_DROP_ZIP): Removed.
+ (IT_WITH_JAF_DROP_ZIP): Likewise.
+ (IT_WITH_JAXWS_DROP_ZIP): Likewise.
+ * configure.ac: Don't call removed macros above.
+ * patches/ecj/override.patch: Add new cases introduced
+ by security patches (sigh).
+ * patches/libraries.patch,
+ * patches/nomotif-6706121.patch:
+ Regenerated against security patches.
+ * patches/openjdk/5102804-memory_leak.patch,
+ * patches/openjdk/6501644-icu_sync.patch:
+ Backports for security patches.
+ * patches/openjdk/6633275-shaped_translucent_windows.patch:
+ Remove copyright notice changes broken by 8006790 security patch.
+ * patches/openjdk/6669869-queries_per_appcontext.patch,
+ * patches/openjdk/6886358-layout_update.patch,
+ * patches/openjdk/6963811-deadlock_fix.patch,
+ * patches/openjdk/7017324-kerning_crash.patch,
+ * patches/openjdk/7064279-fixup.patch,
+ * patches/openjdk/7064279-resource_release.patch,
+ * patches/openjdk/8004302-soap_test_failure.patch:
+ More backports for security patches.
+ * patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch,
+ * patches/openjdk/jaxp144_05.patch:
+ Add drop zips in patch form.
+ * patches/security/20130416/6657673-fixup.patch,
+ * patches/security/20130416/6657673.patch,
+ * patches/security/20130416/7200507.patch,
+ * patches/security/20130416/8000724.patch,
+ * patches/security/20130416/8001031.patch,
+ * patches/security/20130416/8001040.patch,
+ * patches/security/20130416/8001322.patch,
+ * patches/security/20130416/8001329.patch,
+ * patches/security/20130416/8003335.patch,
+ * patches/security/20130416/8003445.patch,
+ * patches/security/20130416/8003543.patch,
+ * patches/security/20130416/8004261.patch,
+ * patches/security/20130416/8004336.patch,
+ * patches/security/20130416/8004986.patch,
+ * patches/security/20130416/8005432.patch,
+ * patches/security/20130416/8005943.patch,
+ * patches/security/20130416/8006309.patch,
+ * patches/security/20130416/8006435.patch,
+ * patches/security/20130416/8006790.patch,
+ * patches/security/20130416/8006795.patch,
+ * patches/security/20130416/8007406.patch,
+ * patches/security/20130416/8007617.patch,
+ * patches/security/20130416/8009699.patch:
+ Add security patches.
+ * patches/xjc.patch:
+ Regenerate JAXWS patch against sources, not
+ drop system.
+
+2013-04-12 Omair Majid <omajid at redhat.com>
+
+ * patches/security/20130416/8007667.patch,
+ * patches/security/20130416/8007918.patch,
+ * patches/security/20130416/8009305.patch,
+ * patches/security/20130416/8009814.patch,
+ * patches/security/20130416/8009857.patch:
+ Add security patches.
+
2013-04-25 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
diff -r d5ea2fe9da2d -r 3e701dcab7d4 INSTALL
--- a/INSTALL Thu Apr 25 18:18:04 2013 +0100
+++ b/INSTALL Fri Apr 26 03:32:15 2013 +0100
@@ -145,9 +145,6 @@
* --with-openjdk-src-zip: Specify the location of the OpenJDK tarball to avoid downloading.
* --with-hotspot-src-zip: Specify the location of the HotSpot tarball to avoid downloading.
* --with-alt-jar: Use the specified jar binary in the second stage rather than the one just built.
-* --with-jaxp-drop-zip: Specify the location of the JAXP source drop zip file to avoid downloading.
-* --with-jaf-drop-zip: Specify the location of the JAF source drop zip file to avoid downloading.
-* --with-jaxws-drop-zip: Specify the location of the JAXWS source drop zip file to avoid downloading.
* --with-cacao-home: Specify the location of an installed CACAO to use rather than downloading
and building one.
* --with-cacao-src-zip: Specify the location of a CACAO tarball to avoid downloading.
diff -r d5ea2fe9da2d -r 3e701dcab7d4 Makefile.am
--- a/Makefile.am Thu Apr 25 18:18:04 2013 +0100
+++ b/Makefile.am Fri Apr 26 03:32:15 2013 +0100
@@ -17,15 +17,6 @@
JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz
JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
-JAXWS_DROP_URL = http://icedtea.classpath.org/download/drops
-JAXWS_DROP_ZIP = jdk6-jaxws2_1_6-2011_06_13.zip
-JAXWS_DROP_SHA256SUM = 229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3
-JAF_DROP_URL = http://icedtea.classpath.org/download/drops
-JAF_DROP_ZIP = jdk6-jaf-b20.zip
-JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
-JAXP_DROP_URL = http://icedtea.classpath.org/download/drops
-JAXP_DROP_ZIP = jaxp144_04.zip
-JAXP_DROP_SHA256SUM = 490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c
OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6
HOTSPOT_SRC_ZIP = hotspot.tar.gz
@@ -266,6 +257,10 @@
ICEDTEA_FSG_PATCHES =
+DROP_PATCHES = \
+ patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch \
+ patches/openjdk/jaxp144_05.patch
+
SECURITY_PATCHES = \
patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \
patches/security/20130201/7201068.patch \
@@ -295,7 +290,6 @@
patches/security/20130201/8001242.patch \
patches/security/20130201/8001972.patch \
patches/security/20130201/8002325.patch \
- patches/security/20130201/8001235.patch \
patches/security/20130219/8006446.patch \
patches/security/20130219/8006777.patch \
patches/security/20130219/8007688.patch \
@@ -303,16 +297,56 @@
patches/security/20130304/8007675.patch \
patches/openjdk/8009641-8007675_build_fix.patch \
patches/openjdk/7036559-concurrenthashmap_improvements.patch \
- patches/security/20130416/8009063.patch
+ patches/security/20130416/8009063.patch \
+ patches/openjdk/8004302-soap_test_failure.patch \
+ patches/security/20130416/6657673.patch \
+ patches/security/20130416/6657673-fixup.patch \
+ patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch \
+ patches/security/20130416/6657673-factory_finder.patch \
+ patches/openjdk/6669869-queries_per_appcontext.patch \
+ patches/openjdk/5102804-memory_leak.patch \
+ patches/openjdk/6963811-deadlock_fix.patch \
+ patches/openjdk/7064279-resource_release.patch \
+ patches/openjdk/7064279-fixup.patch \
+ patches/security/20130416/7200507.patch \
+ patches/security/20130416/8000724.patch \
+ patches/security/20130416/8004986.patch \
+ patches/openjdk/6501644-icu_sync.patch \
+ patches/openjdk/6886358-layout_update.patch \
+ patches/security/20130416/8001031.patch \
+ patches/openjdk/7017324-kerning_crash.patch \
+ patches/security/20130416/8001040.patch \
+ patches/security/20130416/8001322.patch \
+ patches/security/20130416/8001329.patch \
+ patches/security/20130416/8003335.patch \
+ patches/security/20130416/8003445.patch \
+ patches/security/20130416/8003543.patch \
+ patches/security/20130416/8004261.patch \
+ patches/security/20130416/8005432.patch \
+ patches/security/20130416/8005943.patch \
+ patches/security/20130416/8006435.patch \
+ patches/security/20130416/8006790.patch \
+ patches/security/20130416/8006795.patch \
+ patches/security/20130416/8007406.patch \
+ patches/security/20130416/8007617.patch \
+ patches/security/20130416/8007667.patch \
+ patches/security/20130416/8007918.patch \
+ patches/security/20130416/8009305.patch \
+ patches/security/20130416/8009814.patch \
+ patches/security/20130416/8009857.patch
if !WITH_ALT_HSBUILD
SECURITY_PATCHES += \
- patches/security/20130201/8001307.patch
+ patches/security/20130201/8001307.patch \
+ patches/security/20130416/8004336.patch \
+ patches/security/20130416/8006309.patch \
+ patches/security/20130416/8009699.patch
endif
SPECIAL_SECURITY_PATCH = patches/security/20120214/7112642.patch
ICEDTEA_PATCHES = \
+ $(DROP_PATCHES) \
$(SECURITY_PATCHES) \
patches/openjdk/4993545-nativeinlightfixer.patch \
patches/openjdk/6637796-set_bounds.patch \
@@ -459,7 +493,6 @@
patches/openjdk/6390045-error_cannot_access_java_lang_void.patch \
patches/openjdk/6752638-preferLocaleFonts_throws_NPE.patch \
patches/openjdk/5047314-Collator_compare_runs_indefinitely.patch \
- patches/openjdk/6669869-Beans_isDesignTime_should_be_per-AppContext.patch \
patches/openjdk/6934356-Vector_writeObject_serialization_DL.patch \
patches/openjdk/7036582-Improve_test_coverage_of_BigDecimal.patch \
patches/openjdk/6806261-BigDecimal_longValueExact_throws_NPE.patch \
@@ -508,7 +541,10 @@
patches/openjdk/7046929-fix_t6397104_test_failure.patch \
patches/openjdk/7024568-long_method_resolution_oom_error.patch \
patches/openjdk/7003595-incompatibleclasschangeerror.patch \
- patches/openjdk/6500343-bad_code_from_conditionals.patch
+ patches/openjdk/6500343-bad_code_from_conditionals.patch \
+ patches/jaxws-tempfiles-ioutils-6.patch \
+ patches/object-factory-cl-internal.patch \
+ patches/openjdk/8009530-icu_kern_table_support_broken.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
@@ -718,7 +754,6 @@
DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
DEBUG_CLASSFILES="true" \
DEBUG_BINARIES="true" \
- ALT_DROPS_DIR="$(abs_top_builddir)/drops" \
VERBOSE="$(VERBOSE)" \
ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" \
STATIC_CXX="false"
@@ -913,98 +948,6 @@
clean-hgforest:
rm -f stamps/hgforest.stamp
-stamps/download-jaxp-drop.stamp:
- mkdir -p drops
-if USE_ALT_JAXP_DROP_ZIP
- ln -sf $(ALT_JAXP_DROP_ZIP) drops/$(JAXP_DROP_ZIP)
-endif
- if ! echo "$(JAXP_DROP_SHA256SUM) drops/$(JAXP_DROP_ZIP)" \
- | $(SHA256SUM) --check ; \
- then \
- if test "x$(enable_downloading)" = "xyes"; then \
- if [ -f drops/$(JAXP_DROP_ZIP) ] ; \
- then \
- mv drops/$(JAXP_DROP_ZIP) drops/$(JAXP_DROP_ZIP).old ; \
- fi ; \
- $(WGET) $(JAXP_DROP_URL)/$(JAXP_DROP_ZIP) -O drops/$(JAXP_DROP_ZIP); \
- if ! echo "$(JAXP_DROP_SHA256SUM) drops/$(JAXP_DROP_ZIP)" \
- | $(SHA256SUM) --check ; \
- then echo "ERROR: Bad download of jaxp drop zip"; false; \
- fi; \
- else \
- echo "ERROR: No up-to-date JAXP drop zip available"; exit -1; \
- fi ; \
- fi ;
- mkdir -p stamps
- touch $@
-
-clean-download-jaxp-drop:
- rm -f drops/$(JAXP_DROP_ZIP)
- rm -f stamps/download-jaxp-drop.stamp
-
-stamps/download-jaf-drop.stamp:
- mkdir -p drops
-if USE_ALT_JAF_DROP_ZIP
- ln -sf $(ALT_JAF_DROP_ZIP) drops/$(JAF_DROP_ZIP)
-endif
- if ! echo "$(JAF_DROP_SHA256SUM) drops/$(JAF_DROP_ZIP)" \
- | $(SHA256SUM) --check ; \
- then \
- if test "x$(enable_downloading)" = "xyes"; then \
- if [ -f drops/$(JAF_DROP_ZIP) ] ; \
- then \
- mv drops/$(JAF_DROP_ZIP) drops/$(JAF_DROP_ZIP).old ; \
- fi ; \
- $(WGET) $(JAF_DROP_URL)/$(JAF_DROP_ZIP) -O drops/$(JAF_DROP_ZIP); \
- if ! echo "$(JAF_DROP_SHA256SUM) drops/$(JAF_DROP_ZIP)" \
- | $(SHA256SUM) --check ; \
- then echo "ERROR: Bad download of jaf drop zip"; false; \
- fi; \
- else \
- echo "ERROR: No up-to-date JAF drop zip available"; exit -1; \
- fi; \
- fi ;
- mkdir -p stamps
- touch $@
-
-clean-download-jaf-drop:
- rm -f drops/$(JAF_DROP_ZIP)
- rm -f stamps/download-jaf-drop.stamp
-
-stamps/download-jaxws-drop.stamp:
- mkdir -p drops
-if USE_ALT_JAXWS_DROP_ZIP
- ln -sf $(ALT_JAXWS_DROP_ZIP) drops/$(JAXWS_DROP_ZIP)
-endif
- if ! echo "$(JAXWS_DROP_SHA256SUM) drops/$(JAXWS_DROP_ZIP)" \
- | $(SHA256SUM) --check ; \
- then \
- if test "x$(enable_downloading)" = "xyes"; then \
- if [ -f drops/$(JAXWS_DROP_ZIP) ] ; \
- then \
- mv drops/$(JAXWS_DROP_ZIP) drops/$(JAXWS_DROP_ZIP).old ; \
- fi ; \
- $(WGET) $(JAXWS_DROP_URL)/$(JAXWS_DROP_ZIP) -O drops/$(JAXWS_DROP_ZIP); \
- if ! echo "$(JAXWS_DROP_SHA256SUM) drops/$(JAXWS_DROP_ZIP)" \
- | $(SHA256SUM) --check ; \
- then echo "ERROR: Bad download of jaxws drop zip"; false; \
- fi; \
- else \
- echo "ERROR: No up-to-date JAXWS drop zip available"; exit -1; \
- fi; \
- fi ;
- mkdir -p stamps
- touch $@
-
-clean-download-jaxws-drop:
- rm -f drops/$(JAXWS_DROP_ZIP)
- rm -f stamps/download-jaxws-drop.stamp
-
-stamps/download-drops.stamp: stamps/download-jaxp-drop.stamp \
- stamps/download-jaxws-drop.stamp stamps/download-jaf-drop.stamp
- mkdir -p stamps
- touch $@
-
stamps/download-cacao.stamp:
if BUILD_CACAO
if !USE_SYSTEM_CACAO
@@ -1067,14 +1010,6 @@
rm -f $(JAMVM_SRC_ZIP)
rm -f stamps/download-jamvm.stamp
-clean-drops: clean-download-jaxp-drop clean-download-jaf-drop \
- clean-download-jaxws-drop
- if [ -e drops ] ; then \
- rm -f drops/*.old ; \
- rmdir drops ; \
- fi
- rm -f stamps/download-drops.stamp
-
stamps/download-openjdk.stamp: stamps/hgforest.stamp
if USE_HG
if WITH_HGREV
@@ -1148,11 +1083,11 @@
rm -f $(HOTSPOT_SRC_ZIP)
rm -f stamps/download-hotspot.stamp
-stamps/download.stamp: stamps/download-drops.stamp stamps/download-cacao.stamp \
- stamps/download-jamvm.stamp stamps/download-openjdk.stamp stamps/download-hotspot.stamp
+stamps/download.stamp: stamps/download-cacao.stamp stamps/download-jamvm.stamp \
+ stamps/download-openjdk.stamp stamps/download-hotspot.stamp
touch stamps/download.stamp
-clean-download: clean-drops clean-download-cacao clean-download-jamvm \
+clean-download: clean-download-cacao clean-download-jamvm \
clean-download-openjdk clean-download-hotspot
rm -f stamps/download.stamp
@@ -2774,18 +2709,10 @@
download-cacao: stamps/download-cacao.stamp
-download-drops: stamps/download-drops.stamp
-
download-hotspot: stamps/download-hotspot.stamp
download-jamvm: stamps/download-jamvm.stamp
-download-jaf-drop: stamps/download-jaf-drop.stamp
-
-download-jaxp-drop: stamps/download-jaxp-drop.stamp
-
-download-jaxws-drop: stamps/download-jaxws-drop.stamp
-
download-openjdk: stamps/download-openjdk.stamp
extract: stamps/extract.stamp
diff -r d5ea2fe9da2d -r 3e701dcab7d4 acinclude.m4
--- a/acinclude.m4 Thu Apr 25 18:18:04 2013 +0100
+++ b/acinclude.m4 Fri Apr 26 03:32:15 2013 +0100
@@ -1014,69 +1014,6 @@
AC_SUBST(ALT_HOTSPOT_SRC_ZIP)
])
-AC_DEFUN([IT_WITH_JAXP_DROP_ZIP],
-[
- AC_MSG_CHECKING([for a JAXP drop zip])
- AC_ARG_WITH([jaxp-drop-zip],
- [AS_HELP_STRING(--with-jaxp-drop-zip,specify the location of the JAXP drop zip)],
- [
- ALT_JAXP_DROP_ZIP=${withval}
- if test "x${ALT_JAXP_DROP_ZIP}" = "xno"; then
- ALT_JAXP_DROP_ZIP="not specified"
- elif ! test -f ${ALT_JAXP_DROP_ZIP} ; then
- AC_MSG_ERROR([Invalid JAXP drop zip specified: ${ALT_JAXP_DROP_ZIP}])
- fi
- ],
- [
- ALT_JAXP_DROP_ZIP="not specified"
- ])
- AM_CONDITIONAL(USE_ALT_JAXP_DROP_ZIP, test "x${ALT_JAXP_DROP_ZIP}" != "xnot specified")
- AC_MSG_RESULT(${ALT_JAXP_DROP_ZIP})
More information about the distro-pkg-dev
mailing list