/hg/icedtea6: 10 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Sep 25 09:22:29 PDT 2012
changeset dc9ce5c9dbc1 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=dc9ce5c9dbc1
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 16 13:01:42 2012 +0100
Move hg tree to b26, ready for next release.
2012-05-16 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
(OPENJDK_VERSION): Move to b26, ready
for next release.
changeset 244fd5d980de in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=244fd5d980de
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jun 06 18:00:06 2012 +0100
Remove 6610244; patch upstreamed.
2012-06-06 Andrew John Hughes <ahughes at redhat.com>
* patches/openjdk/6610244-modal-fatal-error-windows.patch:
Removed.
* Makefile.am,
Remove upstreamed patch.
changeset ac9d382dab4e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ac9d382dab4e
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jun 11 17:49:58 2012 +0100
Drop upstreamed patches. Regenerate 6633275 patch due to copyright change by Oracle.
2012-06-11 Andrew John Hughes <ahughes at redhat.com>
* patches/openjdk/7103224-glibc_name_collision.patch,
* patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch,
* patches/support_linux_3.patch:
Drop upstreamed patches.
* Makefile.am:
(ICEDTEA_PATCHES): Removed above patches.
* patches/openjdk/6633275-shaped_translucent_windows.patch:
Regenerated due to copyright header change by Oracle.
changeset 7a3b429bf4d5 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7a3b429bf4d5
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jun 13 17:33:16 2012 +0100
Merge
changeset f9a4a97fd49a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f9a4a97fd49a
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jun 13 21:11:11 2012 +0100
Sync with upstream security patches and upstreaming of mimpure-text patch.
2012-06-13 Andrew John Hughes <ahughes at redhat.com>
* patches/openjdk/remove-mimpure-option-to-gcc.patch:
Dropped; upstreamed.
* patches/security/20120612/7079902.patch,
* patches/security/20120612/7110720.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/7152811.patch,
* patches/security/20120612/7157609.patch,
* patches/security/20120612/7160677.patch,
* patches/security/20120612/7160757.patch:
Dropped; provided by Oracle upstream.
* Makefile.am:
(JAXP_DROP_ZIP): Update to security fixed version.
(JAXP_DROP_SHA256SUM): Likewise.
(SECURITY_PATCHES): Drop; upstream.
(ICEDTEA_PATCHES): Drop mimpure-text patch; upstream.
* patches/ecj/override.patch: Regenerate
against Oracle version of security patches.
changeset 004393c6afb9 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=004393c6afb9
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Sep 10 17:48:15 2012 +0100
Merge
changeset 7f9b1d08b2c5 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7f9b1d08b2c5
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Sep 10 17:48:48 2012 +0100
Merge
changeset 8ad13dc5ad87 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8ad13dc5ad87
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Sep 19 17:06:14 2012 +0100
Work with latest upstream, post security fixes.
2012-09-19 Andrew John Hughes <ahughes at redhat.com>
* patches/openjdk/7185678-xmenuitem_peer_npe.patch,
* patches/security/20120830/7162476-xmldecoder_via_classfinder.patch,
* patches/security/20120830/7163201-simplify_toolkit_internal_references.patch:
Removed; upstream.
* Makefile.am:
(SECURITY_PATCHES): Drop patches available upstream.
(ICEDTEA_PATCHES): Likewise.
* patches/merge_fix.patch,
* patches/nomotif-6706121.patch,
* patches/openjdk/6633275-shaped_translucent_windows.patch,
* patches/openjdk/6797195-hw_lw_mixing.patch:
Regenerated against upstream.
changeset 99dd5321a045 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=99dd5321a045
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Sep 24 20:32:40 2012 +0100
Merge in icedtea6-hg for b26
changeset 8bfbcf3a5d93 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8bfbcf3a5d93
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Sep 25 17:22:04 2012 +0100
Update to b26 tarball. Include new changes in b25 & b26 in NEWS.
2012-09-25 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(OPENJDK_DATE): Updated to that of b26 tarball.
(OPENJDK_SHA256SUM): Likewise.
* NEWS:
Add updates in b25 & b26 not already present
in previous releases.
diffstat:
ChangeLog | 385 +
Makefile.am | 276 +-
NEWS | 109 +-
README | 2 +-
acinclude.m4 | 64 +
configure.ac | 8 +-
overlays/openjdk/hotspot/test/serviceability/SDTProbesGNULinuxTest.sh | 68 +
patches/ecj/7010849-make_sa-jdi_build_with_1.5.patch | 394 +
patches/ecj/corba-dependencies.patch | 17 +
patches/ecj/hotspot-jdk-dependency.patch | 25 +
patches/ecj/hotspot.patch | 14 -
patches/ecj/icedtea.patch | 7 +-
patches/ecj/jaxws-jdk-dependency.patch | 47 +
patches/ecj/jaxws-langtools-dependency.patch | 48 +
patches/ecj/override.patch | 95 +-
patches/gcc-suffix.patch | 116 +-
patches/libraries.patch | 2589 +++++----
patches/merge_fix.patch | 280 +
patches/nomotif-6706121.patch | 657 +--
patches/nss-config.patch | 4 +-
patches/nss-not-enabled-config.patch | 4 +-
patches/openjdk/6610244-modal-fatal-error-windows.patch | 125 -
patches/openjdk/6633275-shaped_translucent_windows.patch | 421 +-
patches/openjdk/6693253-security_warning.patch | 331 +-
patches/openjdk/6797195-hw_lw_mixing.patch | 133 +-
patches/openjdk/7034464-hugepage.patch | 458 -
patches/openjdk/7034464-transparent_huge_pages.patch | 458 +
patches/openjdk/7037939-disable_adaptive_resizing_with_large_pages.patch | 71 +
patches/openjdk/7037939-hugepage.patch | 71 -
patches/openjdk/7103224-glibc_name_collision.patch | 236 -
patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch | 12 -
patches/openjdk/p11cipher-6414899-p11digest_should_support_cloning.patch | 1511 +++++
patches/openjdk/remove-mimpure-option-to-gcc.patch | 162 -
patches/sdt-arguments.patch | 24 +
patches/sdt-dtrace-hpp.patch | 103 +
patches/sdt-jni.patch | 37 +
patches/sdt-make.patch | 51 +
patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch | 519 ++
patches/support_linux_3.patch | 19 -
patches/systemtap.patch | 162 -
patches/version-hotspot.patch | 24 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java | 6 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java | 2 +
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java | 8 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java | 3 +
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c | 21 +-
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java | 13 +
tapset/jstack.stp.in | 34 +-
test/tapset/jstaptest.pl | 62 +-
49 files changed, 6536 insertions(+), 3750 deletions(-)
diffs (truncated from 13683 to 500 lines):
diff -r aaefc2cbbc10 -r 8bfbcf3a5d93 ChangeLog
--- a/ChangeLog Wed May 16 12:59:46 2012 +0100
+++ b/ChangeLog Tue Sep 25 17:22:04 2012 +0100
@@ -1,3 +1,388 @@
+2012-09-25 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (OPENJDK_DATE): Updated to that of b26 tarball.
+ (OPENJDK_SHA256SUM): Likewise.
+ * NEWS:
+ Add updates in b25 & b26 not already present
+ in previous releases.
+
+2012-09-20 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_BOOTSTRAP_CLASSES):
+ Remove com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel.
+
+2012-09-19 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/7185678-xmenuitem_peer_npe.patch,
+ * patches/security/20120830/7162476-xmldecoder_via_classfinder.patch,
+ * patches/security/20120830/7163201-simplify_toolkit_internal_references.patch:
+ Removed; upstream.
+ * Makefile.am:
+ (SECURITY_PATCHES): Drop patches available upstream.
+ (ICEDTEA_PATCHES): Likewise.
+ * patches/merge_fix.patch,
+ * patches/nomotif-6706121.patch,
+ * patches/openjdk/6633275-shaped_translucent_windows.patch,
+ * patches/openjdk/6797195-hw_lw_mixing.patch:
+ Regenerated against upstream.
+
+2012-09-19 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR1119: Only add classes to rt-source-files.txt if the class (or one or more of its methods/fields)
+ are actually missing from the boot JDK
+ * Makefile.am:
+ (ICEDTEA_BOOTSTRAP_CLASSES): Only include
+ javax.swing.plaf.basic.BasicDirectoryModel if
+ PR42003 is present in the boot JDK.
+ * NEWS: List PR1119. Correct previous use of
+ PR1119 which should be PR1121.
+ * acinclude.m4:
+ (IT_FIND_JAVAC): Add missing requirement of
+ IT_CHECK_FOR_JDK.
+ (IT_FIND_JAVA): Likewise.
+ (IT_FIND_JAVAH): Likewise.
+ (IT_FIND_JAR): Likewise.
+ (IT_FIND_RMIC): Likewise.
+ (IT_FIND_NATIVE2ASCII): Likewise.
+ (IT_CHECK_FOR_METHOD): New macro to check
+ for a method both at build-time and run-time.
+ * configure.ac: Call IT_CHECK_FOR_METHOD
+ for javax.swing.plaf.basic.BasicDirectoryModel.addPropertyChangeListener.
+
+2012-09-03 Mark Wielaard <mark at klomp.org>
+
+ * Makefile.am (ICEDTEA_PATCHES): Add missing backslash after
+ patches/openjdk/7034464-transparent_huge_pages.patch.
+
+2012-09-03 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Add 1.10.9 & 1.11.4.
+
+2012-08-31 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (JAXP_DROP_ZIP): Update to security fixed version.
+ (JAXP_DROP_SHA256SUM): Likewise.
+ (SECURITY_PATCHES): Drop; upstream.
+ (ICEDTEA_PATCHES): Drop mimpure-text patch; upstream.
+ * patches/ecj/override.patch: Regenerate
+ against Oracle version of security patches.
+
+2012-08-31 Andrew John Hughes <ahughes at redhat.com>
+
+ (ICEDTEA_PATCHES): Rename patches.
+ * patches/openjdk/7034464-hugepage.patch:
+ Renamed to...
+ * patches/openjdk/7034464-transparent_huge_pages.patch:
+ this.
+ * patches/openjdk/7037939-hugepage.patch:
+ Renamed to...
+ * patches/openjdk/7037939-disable_adaptive_resizing_with_large_pages.patch
+ this.
+
+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>
+
+ JamVM: Sync with IcedTea7
+ * Makefile.am
+ (JAMVM_VERSION): Updated JamVM to 2012-08-15 revision.
+ (JAMVM_SHA256SUM): Updated.
+ (stamps/jamvm.stamp): Use --with-java-runtime-library=openjdk6
+
+2012-08-17 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * patches/ecj/hotspot.patch:
+ Make this patch file compatible with patch tool 2.5.4
+
+2012-08-16 Mark Wielaard <mark at klomp.org>
+
+ * Makefile.am (add-zero.stamp): Setup drops directory by symlinking.
+ (add-zero-debug.stamp): Likewise.
+
+2012-08-16 Mark Wielaard <mark at klomp.org>
+
+ * Makefile.am (stamps/add-nss.stamp): Only try patching the
+ security files if they actually exist.
+
+2012-08-16 Andrew John Hughes <ahughes at redhat.com>
+
+ PR1121: Old installs still suffer from GCC PR41686
+ * Makefile.am:
+ (ICEDTEA_BOOTSTRAP_CLASSES):
+ Add javax.security.auth.kerberos.KerberosTicket
+ * NEWS: Updated.
+
+2012-08-15 Andrew John Hughes <ahughes at redhat.com>
+
+ PR1117: IcedTea6 prebuilds far too many classes on bootstrap
+ * patches/ecj/hotspot.patch:
+ Removed; replaced by hotspot-jdk-dependency
+ We don't need to add rt.jar on the classpath
+ as well as the bootclasspath.
+ * Makefile.am:
+ (ICEDTEA_BOOTSTRAP_DIRS): Removed.
+ (ICEDTEA_BOOTSTRAP_CLASSES): Extend with new
+ cases found through building without
+ ICEDTEA_BOOTSTRAP_DIRS.
+ (ICEDTEA_ECJ_PATCHES): Add new patches, remove
+ hotspot.patch.
+ (rt-source-files.txt): Remove use of
+ ICEDTEA_BOOTSTRAP_CLASSES.
+ * NEWS: Updated.
+ * patches/ecj/7010849-make_sa-jdi_build_with_1.5.patch:
+ Backport from OpenJDK7. Allows the serviceability
+ agent to be compiled with 1.5. Added to bootstrap
+ only to reduce potential issues with the API change.
+ * patches/ecj/corba-dependencies.patch:
+ Point the CORBA build at the JDK sources as it
+ requires sun.tools.java.
+ * patches/ecj/hotspot-jdk-dependency.patch:
+ Point the HotSpot build at the JDK sources as it
+ requires com.sun.jdi for the serviceability agent.
+ Building com.sun.jdi requires 1.5+ source code and
+ thus 7010849 is necessary.
+ * patches/ecj/icedtea.patch:
+ Extend CORBA Defs-java changes so that it uses the
+ just-built langtools instead of the boot jdk's
+ tools.jar.
+ * patches/ecj/jaxws-jdk-dependency.patch:
+ Point the JAXWS build at the JDK sources as it
+ depends on com.sun.net.httpserver.
+ * patches/ecj/jaxws-langtools-dependency.patch:
+ Point the JAXWS build at the full langtools
+ distribution, rather than just javac/javah/javadoc
+ as it requires com.sun.mirror.
+
+2012-08-15 Mark Wielaard <mjw at redhat.com>
+
+ * Makefile.am (ICEDTEA_PATCHES): Remove systemtap.patch, add
+ individual sdt-*.patches.
+ * patches/systemtap.patch: Removed.
+ * patches/sdt-arguments.patch: Added.
+ * patches/sdt-dtrace-hpp.patch: Added.
+ * patches/sdt-jni.patch: Added.
+ * patches/sdt-make.patch: Added.
+ * overlays/openjdk/hotspot/test/serviceability/SDTProbesGNULinuxTest.sh:
+ New testcase.
+
+2012-08-14 Andrew John Hughes <ahughes at redhat.com>
+
+ PR1113: Include tapset tests in distribution.
+ * Makefile.am:
+ (TAPSET_TEST_SRCS): Like tapset test sources.
+ (EXTRA_DIST): Add TAPSET_TEST_SRCS.
+ * NEWS: Updated.
+
+2012-08-14 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (clean-add-nss): Only move java.security.old
+ if it exists.
+ (clean-add-nss-debug): Likewise.
+ (clean-add-nss-ecj): Likewise.
+
+2012-08-13 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ JamVM
+ - ARMv6 armhf: Changes for Raspbian (Raspberry Pi)
+ - PPC: Don't use lwsync if it isn't supported
+ - X86: Generate machine-dependent stubs for i386
+ - When suspending, ignore detached threads that have died, this prevents
+ a user caused deadlock when an external thread has been attached to the
+ VM via JNI and it has exited without detaching
+ - Add missing REF_TO_OBJs for references passed from JNI,
+ this enable JamVM to run Qt-Jambi
+ * NEWS: Updated.
+ * Makefile.am
+ (JAMVM_VERSION): Updated JamVM to 2012-07-25 revision.
+ (JAMVM_SHA256SUM): Updated.
+
+2012-08-10 Stefan Ring <stefan at complang.tuwien.ac.at>
+
+ * README: Fix CACAO URL.
+
+2012-08-06 Mark Wielaard <mjw at redhat.com>
+
+ * test/tapset/jstaptest.pl (probestrings): Expect non-zero value
+ for hotspot.jni.NewObjectA.return.
+
+2012-08-03 Mark Wielaard <mjw at redhat.com>
+
+ * Makefile.am (check-tapset-probes): New target.
+ (check-tapset-jstack): Likewise.
+ (check-tapset): Depend on check-tapset-probes check-tapset-jstack.
+ * test/tapset/jstaptest.pl (process_args): Add -p [$run_test_probes]
+ and -j [$run_test_jstack].
+ (test_jstack): Takes argument to pass to java process.
+ Pass -XX:+UseCompressedOops and/or -Xmx5G.
+
+2012-08-03 Yasumasa Suenaga <suenaga.yasumasa at lab.ntt.co.jp>
+
+ * tapset/jstack.stp.in (NarrowOopStruct): New global.
+ (hotspot.vm_init_end): Initialize NarrowOopStruct.
+ (hotspot.vm_shutdown): Delete NarrowOopStruct for pid.
+ (jstack_call): Use NarrowOopStruct to calculate methodOopKlass.
+
+2012-08-09 Stefan Ring <stefan at complang.tuwien.ac.at>
+
+ * Makefile.am: copy entire CACAO directory, including .hg
+
+2012-08-09 Andrew John Hughes <ahughes at redhat.com>
+
+ Apply NSS changes to java.security after
+ build.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Don't add NSS config patches.
+ (NSS_PATCHES): Add here instead.
+ (add-nss): Apply NSS_PATCHES.
+ (clean-add-nss): Revert java.security.
+ (add-nss-debug): Apply NSS_PATCHES to debug build.
+ (clean-add-nss-debug): Revert java.security for debug build.
+ (add-nss-ecj): Apply NSS_PATCHES to bootstrap build.
+ (clean-add-nss-ecj): Revert java.security for bootstrap build.
+
+2012-08-08 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add new patch.
+ * patches/openjdk/p11cipher-6414899-p11digest_should_support_cloning.patch:
+ Backport of OpenJDK patch to make
+ com.oracle.security.ucrypto.TestDigest test
+ work on NSS.
+
+2012-06-28 Omair Majid <omajid at redhat.com>
+
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
+ (getMicrosecondLength, getMicrosecondPosition)
+ (setMicrosecondPosition): Use correct factor to convert seconds to
+ microseconds.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
+ (getMicrosecondPosition): Likewise.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java:
+ Define SECONDS_TO_MICROSECONDS.
+
+2012-06-28 Omair Majid <omajid at redhat.com>
+
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
+ (write): Synchronize access to writeInterrupted flag.
+
+2012-06-28 Omair Majid <omajid at redhat.com>
+
+ PR1050: Stream objects not garbage collected
+ * NEWS: Update with fix.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java:
+ Add new member variable contextPointer.
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c
+ (Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1new):
+ Save j_context as contextPointer.
+ (Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1unref):
+ Delete the global ref and dellocate the java context.
+ (cork_callback): Don't check userdata. It is NULL.
+ (Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1cork):
+ Dont allocate and pass a java_context to pa_stream_cork. It is not needed.
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java
+ (testOpenCloseLotsOfTimes): New method.
+
+2012-06-26 Omair Majid <omajid at redhat.com>
+
+ * test/tapset/jstaptest.pl (get_arch_dir): Fix dir for x86.
+
+2012-06-13 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/remove-mimpure-option-to-gcc.patch:
+ Dropped; upstreamed.
+ * patches/security/20120612/7079902.patch,
+ * patches/security/20120612/7110720.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/7152811.patch,
+ * patches/security/20120612/7157609.patch,
+ * patches/security/20120612/7160677.patch,
+ * patches/security/20120612/7160757.patch:
+ Dropped; provided by Oracle upstream.
+ * Makefile.am:
+ (JAXP_DROP_ZIP): Update to security fixed version.
+ (JAXP_DROP_SHA256SUM): Likewise.
+ (SECURITY_PATCHES): Drop; upstream.
+ (ICEDTEA_PATCHES): Drop mimpure-text patch; upstream.
+ * patches/ecj/override.patch: Regenerate
+ against Oracle version of security patches.
+
+2012-06-07 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am,
+ * patches/ecj/override.patch:
+ Add additional cases from 7143872.
+ * patches/security/20120612/7079902.patch,
+ * patches/security/20120612/7110720.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/7152811.patch,
+ * patches/security/20120612/7157609.patch,
+ * patches/security/20120612/7160677.patch,
+ * patches/security/20120612/7160757.patch:
+ Security patches for 2012/06/12.
+
+2012-06-12 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Add 1.10.8 & 1.11.3 releases.
+
+2012-06-11 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/7103224-glibc_name_collision.patch,
+ * patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch,
+ * patches/support_linux_3.patch:
+ Drop upstreamed patches.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Removed above patches.
+ * patches/openjdk/6633275-shaped_translucent_windows.patch:
+ Regenerated due to copyright header change by Oracle.
+
+2012-06-06 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6610244-modal-fatal-error-windows.patch:
+ Removed.
+ * Makefile.am,
+ Remove upstreamed patch.
+
+2012-05-16 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (OPENJDK_VERSION): Move to b26, ready
+ for next release.
+
2012-05-16 Andrew John Hughes <ahughes at redhat.com>
Move to released b25.
diff -r aaefc2cbbc10 -r 8bfbcf3a5d93 Makefile.am
--- a/Makefile.am Wed May 16 12:59:46 2012 +0100
+++ b/Makefile.am Tue Sep 25 17:22:04 2012 +0100
@@ -1,8 +1,8 @@
# Dependencies
-OPENJDK_DATE = 01_may_2012
-OPENJDK_SHA256SUM = 42db988b436593017e29d6543ac09168a901027817e41dc1be5c795b85d53b05
-OPENJDK_VERSION = b25
+OPENJDK_DATE = 21_sep_2012
+OPENJDK_SHA256SUM = 9635d8563b9ba811f1d6e333861f235a2d8835c623451abc44791891d40d8b09
+OPENJDK_VERSION = b26
OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
CACAO_VERSION = cff92704c4e0
@@ -11,8 +11,8 @@
CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
-JAMVM_VERSION = 4617da717ecb05654ea5bb9572338061106a414d
-JAMVM_SHA256SUM = 47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d
+JAMVM_VERSION = e70f2450890b82c37422616cc85e1a23385f03cd
+JAMVM_SHA256SUM = 3ca7e297ef4daa56c3dd733e21bce795d57ab071243369aa9400c0384ada8a4c
JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm
JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz
JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
@@ -24,8 +24,8 @@
JAF_DROP_ZIP = jdk6-jaf-b20.zip
JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
JAXP_DROP_URL = http://icedtea.classpath.org/download/drops
-JAXP_DROP_ZIP = jaxp144_03.zip
-JAXP_DROP_SHA256SUM = c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012
+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
@@ -62,31 +62,23 @@
SOURCEPATH_DIRS = $(abs_top_srcdir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
# Sources used from OpenJDK.
-ICEDTEA_BOOTSTRAP_DIRS = \
- $(SHARE)/com/sun/jdi \
- $(SHARE)/com/sun/net/httpserver \
- $(SHARE)/com/sun/tools/jdi \
- $(SHARE)/java/io \
- $(SHARE)/java/security/cert \
- $(SHARE)/java/util \
- $(SHARE)/java/rmi \
- $(SHARE)/sun/awt/ \
- $(SHARE)/sun/nio/cs \
- $(SHARE)/sun/rmi/rmic \
- $(SHARE)/sun/tools/java \
- $(SHARE)/javax/net/ssl \
- $(SHARE)/javax/script \
- $(SHARE)/javax/security/auth/kerberos \
- $(SHARE)/javax/security/sasl \
- $(LANGTOOLS)/com/sun/mirror \
- $(LANGTOOLS)/com/sun/tools/apt
# PR42003 - javax.swing.plaf.basic.BasicDirectoryModel
# PR43389 - javax.management.StandardMBean
+# PR54274 - sun.security.other requires missing X509CRLSelector methods
+# PR54275 - sun.security.sasl requires missing Sasl.CREDENTIALS field
ICEDTEA_BOOTSTRAP_CLASSES = \
- $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java \
$(SHARE)/javax/management/StandardMBean.java \
- $(SHARE)/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java
+ $(SHARE)/java/security/cert/X509CRLSelector.java \
+ $(SHARE)/java/security/cert/X509CertSelector.java \
+ $(SHARE)/javax/security/sasl/Sasl.java \
+ $(SHARE)/javax/security/auth/kerberos/KerberosTicket.java
+
+#PR42003 - Missing javax.swing.plaf.basic.BasicDirectoryModel methods cause OpenJDK build failure
+if LACKS_JAVAX_SWING_PLAF_BASIC_BASICDIRECTORYMODEL_ADDPROPERTYCHANGELISTENER
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java
+endif
# Flags
MEMORY_LIMIT = -J-Xmx1024m
@@ -188,18 +180,30 @@
# Relative path to JTreg tool
JTREG_DIR = src/jtreg
JTREG_SRCS = $(top_srcdir)/$(JTREG_DIR)
+TAPSET_TEST_SRCS = \
+ $(top_srcdir)/test/tapset/ClassUnloadedProbeTester.java \
+ $(top_srcdir)/test/tapset/JNIStapTest.c \
+ $(top_srcdir)/test/tapset/JNITestClass.c \
+ $(top_srcdir)/test/tapset/JNITestClass.h \
+ $(top_srcdir)/test/tapset/JNITestClass.java \
+ $(top_srcdir)/test/tapset/jstaptest.pl \
+ $(top_srcdir)/test/tapset/RunWrapper.java \
+ $(top_srcdir)/test/tapset/StapJNIClassLoader.java \
+ $(top_srcdir)/test/tapset/StapURLClassLoader.java \
+ $(top_srcdir)/test/tapset/SystemtapTester.java \
+ $(top_srcdir)/test/tapset/TestingRunner.java
# Patch list
ICEDTEA_FSG_PATCHES =
-SECURITY_PATCHES =
+SECURITY_PATCHES = \
+ patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch
SPECIAL_SECURITY_PATCH = patches/security/20120214/7112642.patch
More information about the distro-pkg-dev
mailing list