Hello community, here is the log from the commit of package java-1_7_0-openjdk for openSUSE:Factory checked in at 2013-07-16 16:36:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_7_0-openjdk" Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk.changes 2013-07-02 12:24:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes 2013-07-16 16:36:46.000000000 +0200 @@ -1,0 +2,82 @@ +Tue Jul 9 12:51:56 UTC 2013 - mvyskocil@suse.com + +- update to icedtea-2.4.1 (bnc#828665) +* Security fixes + - S6741606, CVE-2013-2407: Integrate Apache Santuario + - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls + - S7170730, CVE-2013-2451: Improve Windows network stack support. + - S8000638, CVE-2013-2450: Improve deserialization + - S8000642, CVE-2013-2446: Better handling of objects for transportation + - S8001032: Restrict object access + - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers + - S8001034, CVE-2013-1500: Memory management improvements + - S8001038, CVE-2013-2444: Resourcefully handle resources + - S8001043: Clarify definition restrictions + - S8001308: Update display of applet windows + - S8001309: Better handling of annotation interfaces + - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost + - S8001330, CVE-2013-2443: Improve on checking order (non-Zero builds only) + - S8003703, CVE-2013-2412: Update RMI connection dialog box + - S8004288, CVE-2013-2449: (fs) Files.probeContentType problems + - S8004584: Augment applet contextualization + - S8005007: Better glyph processing + - S8006328, CVE-2013-2448: Improve robustness of sound classes + - S8006611: Improve scripting + - S8007467: Improve robustness of JMX internal APIs + - S8007471: Improve MBean notifications + - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes + - S8007925: Improve cmsStageAllocLabV2ToV4curves + - S8007926: Improve cmsPipelineDup + - S8007927: Improve cmsAllocProfileSequenceDescription + - S8007929: Improve CurvesAlloc + - S8008120, CVE-2013-2457: Improve JMX class checking + - S8008124, CVE-2013-2453: Better compliance testing + - S8008128: Better API coherence for JMX + - S8008132, CVE-2013-2456: Better serialization support + - S8008585: Better JMX data handling + - S8008593: Better URLClassLoader resource management + - S8008603: Improve provision of JMX providers + - S8008607: Better input checking in JMX + - S8008611: Better handling of annotations in JMX + - S8008615: Improve robustness of JMX internal APIs + - S8008623: Better handling of MBeanServers + - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606 + - S8008982: Adjust JMX for underlying interface changes + - S8009004: Better implementation of RMI connections + - S8009008: Better manage management-api + - S8009013: Better handling of T2K glyphs + - S8009034: Improve resulting notifications in JMX + - S8009038: Improve JMX notification support + - S8009057, CVE-2013-2448: Improve MIDI event handling + - S8009067: Improve storing keys in KeyStore + - S8009071, CVE-2013-2459: Improve shape handling + - S8009235: Improve handling of TSA data + - S8009424, CVE-2013-2458: Adapt Nashorn to JSR-292 implementation change + - S8009554, CVE-2013-2454: Improve SerialJavaObject.getFields + - S8009654: Improve stability of cmsnamed + - S8010209, CVE-2013-2460: Better provision of factories + - S8011243, CVE-2013-2470: Improve ImagingLib + - S8011248, CVE-2013-2471: Better Component Rasters + - S8011253, CVE-2013-2472: Better Short Component Rasters + - S8011257, CVE-2013-2473: Better Byte Component Rasters + - S8012375, CVE-2013-1571: Improve Javadoc framing + - S8012421: Better positioning of PairPositioning + - S8012438, CVE-2013-2463: Better image validation + - S8012597, CVE-2013-2465: Better image channel verification + - S8012601, CVE-2013-2469: Better validation of image layouts + - S8014281, CVE-2013-2461: Better checking of XML signature + - S8015997: Additional improvement in Javadoc framing +* OpenJDK + - list to long, please consult NEWS file + +------------------------------------------------------------------- +Mon Jul 8 12:39:05 UTC 2013 - schwab@suse.de + +- java-1.7.0-openjdk-zero-arch.patch: fix detection of zero arch + +------------------------------------------------------------------- +Mon Jul 8 10:53:25 UTC 2013 - mvyskocil@suse.com + +- ignore rhino dependencies during a build to prevent a build cycle + +------------------------------------------------------------------- Old: ---- 29ce11184945.tar.gz 5eaf3bca7f68.tar.gz 71d5ec2f3dfb.tar.gz 9c74cb4a3ae8.tar.gz 9d2007a13c02.tar.gz c67fd7874b1a.tar.gz ffb1b6bc4750.tar.gz icedtea-2.4.0.tar.gz icedtea-2.4.0.tar.gz.sig New: ---- 23ae4e0e0cce.tar.gz 5be6b670d08b.tar.gz 5f53e7717116.tar.gz 65d95818d79e.tar.gz 91c95fd8eea8.tar.gz ae86c6974e8e.tar.gz c0e48fdfb695.tar.gz icedtea-2.4.1.tar.gz icedtea-2.4.1.tar.gz.sig java-1.7.0-openjdk-zero-arch.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.3l5AuF/_old 2013-07-16 16:36:49.000000000 +0200 +++ /var/tmp/diff_new_pack.3l5AuF/_new 2013-07-16 16:36:49.000000000 +0200 @@ -34,7 +34,6 @@ %endif %bcond_with zero -#XXX: maybe 12.1 with pa 1.1 will work (?) %if 0%{?suse_version} >= 1140 %define with_pulseaudio 1 %else @@ -44,7 +43,7 @@ # If runtests is 0 test suites will not be run. %define runtests 0 -%define icedtea_version 2.4.0 +%define icedtea_version 2.4.1 %define hg_tag icedtea-{icedtea_version}-branchpoint %define openjdkdate 27_jun_2011 @@ -144,13 +143,13 @@ Source3: mauve-%{mauvedate}.tar.gz Source4: mauve_tests -Source5: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/archive/9c74cb4a... -Source6: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba/archive/71... -Source7: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp/archive/5ea... -Source8: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws/archive/9d... -Source9: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk/archive/29ce... -Source10: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools/archiv... -Source11: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot/archive/... +Source5: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/archive/ae86c697... +Source6: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba/archive/23... +Source7: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp/archive/5be... +Source8: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws/archive/c0... +Source9: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk/archive/65d9... +Source10: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools/archiv... +Source11: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot/archive/... # zero compatible hotspot #TODO: not needed Source12: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot/archive/... Source13: http://icedtea.classpath.org/download/drops/jamvm/jamvm-7c8dceb90880616b7dd6... @@ -199,6 +198,7 @@ # Patches for AArch64 Patch107: java-1.7.0-openjdk-fork.patch +Patch108: java-1.7.0-openjdk-zero-arch.patch #Already upstream: Patch108: java-1.7.0-openjdk-aarch64.patch # @@ -229,7 +229,8 @@ BuildRequires: desktop-file-utils BuildRequires: giflib-devel BuildRequires: libjpeg-devel -BuildRequires: liblcms2-devel +# since 2.4.1 release, newest lcms2 is needed +BuildRequires: liblcms2-devel >= 2.5 BuildRequires: libpng-devel %if %{with jamvm} BuildRequires: libtool @@ -238,6 +239,8 @@ BuildRequires: libxslt-tools %endif BuildRequires: rhino +# ignore depenencies of rhino to prevent a build cycle +#!BuildIgnore: bea-stax-api jline xmlbeans xmlbeans-mini BuildRequires: wget BuildRequires: xorg-x11 BuildRequires: xorg-x11-devel @@ -321,7 +324,8 @@ BuildRequires: gpg-offline %endif -Requires: lcms2 +# older lcms2 is known to have security issues, let's depends on fixed version +Requires: lcms2 >= 2.5 Requires: rhino # Require jpackage-utils for ant. Requires: jpackage-utils >= 1.7.3 @@ -515,6 +519,7 @@ %if 0%{?suse_version} <= 1110 --disable-system-gio \ %endif + --enable-system-lcms \ --with-openjdk-src-zip=%{SOURCE5} \ --with-corba-src-zip=%{SOURCE6} \ --with-jaxp-src-zip=%{SOURCE7} \ @@ -559,6 +564,7 @@ # AArch64 fixes - EM_AARCH64 does work since 12.3 qpatch -p1 %{PATCH107} %endif +qpatch -p0 %{PATCH108} #SUSE specific fixes qpatch -p1 %{PATCH1002} @@ -1026,7 +1032,6 @@ %{_jvmdir}/%{sdkdir}/jre/lib/images/ %dir %{_jvmdir}/%{jredir}/lib/management/ %dir %{_jvmdir}/%{jredir}/lib/security -%{_jvmdir}/%{jredir}/lib/servicetag/ %{_jvmdir}/%{sdkdir}/jre/lib/zi/ %{_jvmdir}/%{sdkdir}/jre/lib/*jar %{_jvmdir}/%{sdkdir}/jre/lib/classlist ++++++ 29ce11184945.tar.gz -> 23ae4e0e0cce.tar.gz ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/29ce11184945.tar.gz /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/23ae4e0e0cce.tar.gz differ: char 5, line 1 ++++++ 29ce11184945.tar.gz -> 5be6b670d08b.tar.gz ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/29ce11184945.tar.gz /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/5be6b670d08b.tar.gz differ: char 5, line 1 ++++++ 29ce11184945.tar.gz -> 5f53e7717116.tar.gz ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/29ce11184945.tar.gz /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/5f53e7717116.tar.gz differ: char 5, line 1 ++++++ 29ce11184945.tar.gz -> 65d95818d79e.tar.gz ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/29ce11184945.tar.gz /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/65d95818d79e.tar.gz differ: char 5, line 1 ++++++ 29ce11184945.tar.gz -> 91c95fd8eea8.tar.gz ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/29ce11184945.tar.gz /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/91c95fd8eea8.tar.gz differ: char 5, line 1 ++++++ 29ce11184945.tar.gz -> ae86c6974e8e.tar.gz ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/29ce11184945.tar.gz /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/ae86c6974e8e.tar.gz differ: char 5, line 1 ++++++ 29ce11184945.tar.gz -> c0e48fdfb695.tar.gz ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/29ce11184945.tar.gz /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/c0e48fdfb695.tar.gz differ: char 5, line 1 ++++++ icedtea-2.4.0.tar.gz -> icedtea-2.4.1.tar.gz ++++++ ++++ 1639 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-2.4.0/ChangeLog new/icedtea-2.4.1/ChangeLog --- old/icedtea-2.4.0/ChangeLog 2013-06-09 22:52:56.000000000 +0200 +++ new/icedtea-2.4.1/ChangeLog 2013-07-05 21:56:07.000000000 +0200 @@ -1,3 +1,67 @@ +2013-07-05 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * configure.ac: Set version to 2.4.1. + +2013-06-28 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * acinclude.m4: + (IT_WITH_HOTSPOT_BUILD): Define once. + (IT_CHECK_FOR_LCMS): Turn system LCMS off by default + and warn if enabled as it is unlikely to have + the new security fixes. + * configure.ac: Drop IT_ENABLE_ZERO_BUILD; called + by IT_WITH_HOTSPOT_BUILD. + +2013-06-25 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * NEWS: Add Red Hat bugzilla references. + +2013-07-05 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * NEWS: Add latest security fixes and other + changes brought in when syncing with 7u40 b31. + Set release date. + +2013-07-01 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * Makefile.am: + (OPENJDK_VERSION): Bump to b31. + (CORBA_CHANGESET): Update to IcedTea 2.4.1 tag. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * hotspot.map: Update default to IcedTea 2.4.1 tag. + * patches/boot/ecj-diamond.patch, + * patches/boot/ecj-multicatch.patch: + Add new cases. + * patches/boot/ecj-stringswitch.patch: + Update MethodHandleNatives patch, including + adding new case. + * patches/boot/tobin.patch: + Update following move from sun.awt.X11 + to sun.awt. + * patches/rhino.patch, + * patches/systemtap_gc.patch: + Regenerated. + +2013-06-11 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * configure.ac: Bump to 2.4.1pre. + * NEWS: Add 2.4.1 section. + +2013-06-10 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * NEWS: Update following release + annoucement. + 2013-04-21 Andrew John Hughes <gnu.andrew@member.fsf.org> * Makefile.am: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-2.4.0/Makefile.am new/icedtea-2.4.1/Makefile.am --- old/icedtea-2.4.0/Makefile.am 2013-06-09 22:52:56.000000000 +0200 +++ new/icedtea-2.4.1/Makefile.am 2013-07-05 21:56:07.000000000 +0200 @@ -1,22 +1,22 @@ # Dependencies -OPENJDK_VERSION = b20 +OPENJDK_VERSION = b31 JDK_UPDATE_VERSION = 40 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = 71d5ec2f3dfb -JAXP_CHANGESET = 5eaf3bca7f68 -JAXWS_CHANGESET = 9d2007a13c02 -JDK_CHANGESET = 29ce11184945 -LANGTOOLS_CHANGESET = ffb1b6bc4750 -OPENJDK_CHANGESET = 9c74cb4a3ae8 +CORBA_CHANGESET = 23ae4e0e0cce +JAXP_CHANGESET = 5be6b670d08b +JAXWS_CHANGESET = c0e48fdfb695 +JDK_CHANGESET = 65d95818d79e +LANGTOOLS_CHANGESET = 91c95fd8eea8 +OPENJDK_CHANGESET = ae86c6974e8e -CORBA_SHA256SUM = 0191c678935dac77c0ad085bedb59e6bcc93e0712c3a4ef2b7171562e129807c -JAXP_SHA256SUM = 25bb13db8a426c2d84e13eed0d598c88c447af41de3f678a70680897c38083fd -JAXWS_SHA256SUM = 4cff8300b4c23e9327607f7c09295a99ef7d1032d8397429c7879ba489d14456 -JDK_SHA256SUM = 13024c623bb37c4d44cb3b724876d7827924868fb8f94428faa87ddb11492352 -LANGTOOLS_SHA256SUM = 80cbe75f7c268e97619e8007f8d29ecbbb7584062c1286c8b470f875526028f3 -OPENJDK_SHA256SUM = 4adfde4b056ea8f35b639156c7cad8bac140ba7957ea8ce49b440089babc6579 +CORBA_SHA256SUM = 618bb237f262a4a703edb88bd873fd80fe33d7fb07b8a113bfc701227b748395 +JAXP_SHA256SUM = df2d15089890a7565b0dd89f867d7b2931839652d29029d63f8201358b0ecd34 +JAXWS_SHA256SUM = 972de06b968a6da85b1d9216c5617325135fc63c90ffb5e1d7721dce5843b037 +JDK_SHA256SUM = 97edcd78d316f33a43278c5549cb58a06f67305b63ad51b7c1a1fca7c45c6432 +LANGTOOLS_SHA256SUM = 6ff5cdcca8184526a5928bb8ff0bcc38b897d463559cc9f2b10e439931a8f561 +OPENJDK_SHA256SUM = f9f2925af3eac91ec4b0389b5316f840239558048569db2193b9e2ae34ffe32a CACAO_VERSION = e215e36be9fc CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-2.4.0/NEWS new/icedtea-2.4.1/NEWS --- old/icedtea-2.4.0/NEWS 2013-06-09 19:52:13.000000000 +0200 +++ new/icedtea-2.4.1/NEWS 2013-07-05 21:56:07.000000000 +0200 @@ -7,10 +7,331 @@ GX - http://bugs.gentoo.org/show_bug.cgi?id=X CAX - http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=X LPX - https://bugs.launchpad.net/bugs/X +JSRX - http://jcp.org/en/jsr/detail?id=X +JEPX - http://openjdk.java.net/jeps/X CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 2.4.0 (2012-06-09): +New in release 2.4.1 (2013-07-05): + +* Security fixes + - S6741606, CVE-2013-2407: Integrate Apache Santuario + - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls + - S7170730, CVE-2013-2451: Improve Windows network stack support. + - S8000638, CVE-2013-2450: Improve deserialization + - S8000642, CVE-2013-2446: Better handling of objects for transportation + - S8001032: Restrict object access + - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers + - S8001034, CVE-2013-1500: Memory management improvements + - S8001038, CVE-2013-2444: Resourcefully handle resources + - S8001043: Clarify definition restrictions + - S8001308: Update display of applet windows + - S8001309: Better handling of annotation interfaces + - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost + - S8001330, CVE-2013-2443: Improve on checking order (non-Zero builds only) + - S8003703, CVE-2013-2412: Update RMI connection dialog box + - S8004288, CVE-2013-2449: (fs) Files.probeContentType problems + - S8004584: Augment applet contextualization + - S8005007: Better glyph processing + - S8006328, CVE-2013-2448: Improve robustness of sound classes + - S8006611: Improve scripting + - S8007467: Improve robustness of JMX internal APIs + - S8007471: Improve MBean notifications + - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes + - S8007925: Improve cmsStageAllocLabV2ToV4curves + - S8007926: Improve cmsPipelineDup + - S8007927: Improve cmsAllocProfileSequenceDescription + - S8007929: Improve CurvesAlloc + - S8008120, CVE-2013-2457: Improve JMX class checking + - S8008124, CVE-2013-2453: Better compliance testing + - S8008128: Better API coherence for JMX + - S8008132, CVE-2013-2456: Better serialization support + - S8008585: Better JMX data handling + - S8008593: Better URLClassLoader resource management + - S8008603: Improve provision of JMX providers + - S8008607: Better input checking in JMX + - S8008611: Better handling of annotations in JMX + - S8008615: Improve robustness of JMX internal APIs + - S8008623: Better handling of MBeanServers + - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606 + - S8008982: Adjust JMX for underlying interface changes + - S8009004: Better implementation of RMI connections + - S8009008: Better manage management-api + - S8009013: Better handling of T2K glyphs + - S8009034: Improve resulting notifications in JMX + - S8009038: Improve JMX notification support + - S8009057, CVE-2013-2448: Improve MIDI event handling + - S8009067: Improve storing keys in KeyStore + - S8009071, CVE-2013-2459: Improve shape handling + - S8009235: Improve handling of TSA data + - S8009424, CVE-2013-2458: Adapt Nashorn to JSR-292 implementation change + - S8009554, CVE-2013-2454: Improve SerialJavaObject.getFields + - S8009654: Improve stability of cmsnamed + - S8010209, CVE-2013-2460: Better provision of factories + - S8011243, CVE-2013-2470: Improve ImagingLib + - S8011248, CVE-2013-2471: Better Component Rasters + - S8011253, CVE-2013-2472: Better Short Component Rasters + - S8011257, CVE-2013-2473: Better Byte Component Rasters + - S8012375, CVE-2013-1571: Improve Javadoc framing + - S8012421: Better positioning of PairPositioning + - S8012438, CVE-2013-2463: Better image validation + - S8012597, CVE-2013-2465: Better image channel verification + - S8012601, CVE-2013-2469: Better validation of image layouts + - S8014281, CVE-2013-2461: Better checking of XML signature + - S8015997: Additional improvement in Javadoc framing +* OpenJDK + - S2223192: [macosx] "opposite" seems always null in focus events + - S4504275: CORBA boolean type unions do not generate compilable code from idlj + - S6337518: Null Arrow Button Throws Exception in BasicComboBoxUI + - S6429204: (se) Concurrent Selector.register and SelectionKey.interestOps can ignore interestOps + - S6436314: Vector could be created with appropriate size in DefaultComboBoxModel + - S6443505: Ideal() function for CmpLTMask + - S6470730: Disconnect button leads to wrong popup message + - S6725714: par compact - add a table to speed up bitmap searches + - S6761744: Hotspot crashes if process size limit is exceeded + - S6843375: Debuggee VM crashes performing mark-sweep-compact + - S7038105: File.isHidden() should return true for pagefile.sys and hiberfil.sys + - S7053526: Upgrade JDK 8 to use Little CMS 2.4 + - S7056447: test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java fails in agentvm + - S7066063: CMS: "Conservation Principle" assert failed + - S7068740: If you wrap a JTable in a JLayer you can't use the page up and page down cmds + - S7105030: [TEST_BUG] [macosx] The tests never finishes + - S7109087: gc/7072527/TestFullGCCount.java fails when GC is set in command-line + - S7109977: [macosx] MixingInHwPanel.java test fails on Mac trying to click in the reserved corner + - S7115383: TEST_BUG: some jtreg tests fail because they explicitly specify -server option + - S7124520: [macosx] re:6373505 Toolkit.getScreenResolution() != GraphicsConfiguration.getNormalizingTransform() + - S7132378: Race in FutureTask if used with explicit set ( not Runnable ) + - S7142919: TEST_BUG: java/nio/channels/AsyncCloseAndInterrupt.java failing intermittently [sol11] + - S7151823: The test incorrectly recognizing OS + - S7152798: TEST_BUG: sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java does not compile + - S7152866: Tests not run because they are missing the @run tag + - S7157656: (zipfs) SeekableByteChannel to entry in zip file always reports its position as 0 + - S7158350: [macosx] Strange results of SwingUIText printing + - S7160084: javac fails to compile an apparently valid class/interface combination + - S7163898: add isLoggable() check to doLog() + - S7164256: EnumMap clone doesn't clear the entrySet keeping a reference to the original Map + - S7174966: With OCSP enabled on Java 7 get error 'Wrong key usage' with Comodo certificate + - S7176220: 'Full GC' events miss date stamp information occasionally + - S7176479: G1: JVM crashes on T5-8 system with 1.5 TB heap + - S7179050: [macosx] Make LWAWT be able to run on AppKit thread + - S7179353: try-with-resources fails to compile with generic exception parameters + - S7181710: [macosx] jawt_md.h shipped with jdk is outdated + - S7183520: [macosx]Unable to print out the defined page for 2D_PrintingTiger/JTablePrintPageRangesTest + - S7183800: TEST_BUG: Update tests to run on Ubuntu 12.04 (localhost is 127.0.1.1) + - S7184908: TEST_BUG: [macosx] closed/com/sun/java/swing/plaf/gtk/4928019/bug4928019.java fails + - S7184945: [macosx] NPE in AquaComboBoxUI since jdk7u6b17, jdk8b47 + - S7186737: Unable to allocate bit maps or card tables for parallel gc for the requested heap + - S7190897: (fs) Files.isWritable method returns false when the path is writable (win) + - S7194902: [macosx] closed/java/awt/Button/DoubleActionEventTest/DoubleActionEventTest failed since jdk8b49 + - S7196080: assert(max_heap >= InitialHeapSize) in arguments.cpp + - S7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact + - S7197666: java -d64 -version core dumps in a box with lots of memory + - S7198229: Painting during resizing of the frame should be more smooth + - S7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout + - S8000435: [macosx] Button painting error under Java 7 on Mac + - S8000450: Restrict access to com/sun/corba/se/impl package + - S8000529: Regression: SimpleDateFormat incorrectly parses dates formatted with Z and z pattern letters + - S8000629: [macosx] Blurry rendering with Java 7 on Retina display + - S8000973: SA on windows thread inspection is broken + - S8002070: Remove the stack search for a resource bundle for Logger to use + - S8002308: [macosx] 7198229 should be applied to the user action only + - S8002390: (zipfs) Problems moving files between zip file systems + - S8003169: [macosx] JVM crash after disconnecting from projector + - S8003173: [macosx] Fullscreen on Mac leaves an empty rectangle + - S8003268: SharedRuntime::generate_native_wrapper doesn't save all registers across runtime tracing calls for JNI critical native methods + - S8003992: File and other classes in java.io do not handle embedded nulls properly + - S8004821: Graphics2D.drawPolygon() fails with IllegalPathStateException + - S8004866: [macosx] HiDPI support in Aqua L&F + - S8005032: G1: Cleanup serial reference processing closures in concurrent marking + - S8005405: [macosx] Drag and Drop: wrong animation when dropped outside any drop target. + - S8005527: [TEST_BUG] console.sh failed Automatically with exit code 1. + - S8005555: TEST_BUG: java/io/Serializable/accessConstants/AccessConstants.java should be removed + - S8005956: C2: assert(!def_outside->member(r)) failed: Use of external LRG overlaps the same LRG defined in this block + - S8005997: [macosx] Printer Dialog opens an additional title bar + - S8006008: Memory leak in hotspot/src/share/vm/adlc/archDesc.cpp + - S8006014: Memory leak in hotspot/src/share/vm/adlc/dfa.cpp + - S8006016: Memory leak at hotspot/src/share/vm/adlc/output_c.cpp + - S8006242: G1: WorkerDataArray<T>::verify() too strict for double calculations + - S8006328: Improve robustness of sound classes + - S8006423: SA: NullPointerException in sun.jvm.hotspot.debugger.bsd.BsdThread.getContext(BsdThread.java:67) + - S8006611: Improve scripting + - S8006634: Unify LWCToolkit.invokeAndWait() and sun.awt.datatransfer.ToolkitThreadBlockedHandler + - S8006894: G1: Number of marking threads missing from PrintFlagsFinal output + - S8007028: java/util/NavigableMap/LockStep hit assert(flat != TypePtr::BOTTOM) failed: cannot alias-analyze an untyped ptr + - S8007036: G1: Too many old regions added to last mixed GC + - S8007150: Event based tracing is missing truncated field in stack trace content type + - S8007221: G1: concurrent phase durations do not state the time units ("secs") + - S8007333: [launcher] removes multiple back slashes + - S8007458: [findbugs] One more beans issue, with ReflectionUtils + - S8007699: Move some tests from test/sun/security/provider/certpath/X509CertPath to closed repo + - S8007703: Remove com.sun.servicetag API + - S8008289: DefaultButtonModel instance keeps stale listeners in html FormView + - S8008301: G1: guarantee(satb_mq_set.completed_buffers_num() == 0) failure + - S8008366: [macosx] ActionListener called twice for JMenuItem using ScreenMenuBar + - S8008391: Incorrect metadata for event based tracing + - S8008454: test/runtime/NMT/PrintNMTStatistics is broken + - S8008535: JDK7 Printing : CJK and Latin Text in a string overlap + - S8008660: Failure in 2D Queue Flusher thread on Mac + - S8008738: Issue in com.sun.org.apache.xml.internal.serializer.Encodings causes some JCK tests to fail intermittently + - S8008744: Rework part of fix for JDK-6741606 + - S8008804: file descriptor leak in src/windows/native/java/net/DualStackPlainSocketImpl.c + - S8008916: G1: Evacuation failed tracing event + - S8009012: [macosx] DisplayChangedListener is not implemented in LWWindowPeer/CGraphicsEnvironment + - S8009125: Add NMT tests for Virtual Memory operations + - S8009152: A number of jtreg tests need review/improvement + - S8009199: Printed text become garbage on Mac OSX + - S8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03 + - S8009259: TEST_BUG: sun/misc/Cleaner/exitOnThrow.sh failing intermittently + - S8009302: Mac OS X: JVM crash on infinite recursion on Appkit Thread + - S8009536: G1: Apache Lucene hang during reference processing + - S8009638: Wrong comment for PL in LocaleISOData, 1989 forward Poland is Republic of Poland + - S8009751: (se) Selector spin when select, close and interestOps(0) invoked at same time (lnx) + - S8009911: [macosx] SWT app freeze when going full screen using Java 7 on Mac + - S8009928: PSR:PERF Increase default string table size + - S8009940: G1: assert(_finger == _heap_end) failed, concurrentMark.cpp:809 + - S8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail + - S8009999: Test sun/tools/jcmd/jcmd-f.sh failing after JDK-8008820 + - S8010009: [macosx] Unable type into online word games on MacOSX + - S8010090: GC ID has the wrong type + - S8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive + - S8010151: nsk/regression/b6653214 fails "assert(snapshot != NULL) failed: Worker should not be started" + - S8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build + - S8010309: Improve PlatformLogger.isLoggable performance by direct mapping from an integer to Level + - S8010399: Test8009761.java "Failed: init recursive calls: 5498. After deopt 5494". + - S8010437: guarantee(this->is8bit(imm8)) failed: Short forward jump exceeds 8-bit offset + - S8010463: G1: Crashes with -UseTLAB and heap verification + - S8010514: G1: Concurrent mode failure tracing event + - S8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod + - S8010721: In JDK7 the menu bar disappears when a Dialog is shown + - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance + - S8010770: Zero: back port of 8000780 to HS24 broke JSR 292 + - S8010780: G1: Eden occupancy/capacity output wrong after a full GC + - S8010913: compiler/6863420 often exceeds timeout + - S8010927: Kitchensink crashed with SIGSEGV, Problematic frame: v ~StubRoutines::checkcast_arraycopy + - S8011102: Clear AVX registers after return from JNI call + - S8011128: (fs) Files.createDirectory fails if the resolved path is exactly 248 characters long + - S8011139: (reflect) Revise checking in getEnclosingClass + - S8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows + - S8011161: NMT: Memory leak when encountering out of memory error while initializing memory snapshot + - S8011186: [TEST_BUG] java/awt/Focus/OverrideRedirectWindowActivationTest/OverrideRedirectWindowActivationTest.java failed on windows 8 + - S8011200: (coll) Optimize empty HashMap and ArrayList + - S8011218: Kitchensink hanged, likely NMT is to blame + - S8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined + - S8011380: FX dependency on PlatformLogger broken by 8010309 + - S8011425: NPE in TestObjectCountAfterGCEvent.java on Linux32 + - S8011557: Improve reflection utility classes + - S8011653: Upgrade to JAXP 1.5 + - S8011686: [macosx] AWT accidentally disables the NSApplicationDelegate of SWT, causing loss of OS X integration functionality + - S8011695: [tck-red] Application can not be run, the Security Warning dialog is gray. + - S8011806: 7u25-b05 hotspot fastdebug build failure + - S8011882: Replace spin loops as back off when suspending + - S8011891: The vm/gc/heap/heap_summary_after_gc event for CMS contains old data + - S8011901: Unsafe.getAndAddLong(obj, off, delta) does not work properly with long deltas + - S8011947: new hotspot build - hs24-b41 + - S8011952: Missing ResourceMarks in TraceMethodHandles + - S8011968: Kitchensink crashed with SIGSEGV in MemBaseline::baseline + - S8011986: [corba] idlj generates read/write union helper methods that throw wrong exception in some cases + - S8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows + - S8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05 + - S8012004: JInternalFrame not being finalized after closing + - S8012019: (fc) Thread.interrupt triggers hang in FileChannelImpl.pread (win) + - S8012037: Test8009761.java "Failed: init recursive calls: 7224. After deopt 58824" + - S8012044: Give more information about self-suppression from Throwable.addSuppressed + - S8012082: SASL: auth-conf negotiated, but unencrypted data is accepted, reset to unencrypt + - S8012086: The object count event should only send events for instances occupying more than 0.5% of the heap + - S8012102: CollectedHeap::ensure_parsability is not always called during heap inspection + - S8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris + - S8012182: Add information about class loading and unloading to event based tracing framework + - S8012210: Make TracingTime available when INCLUDE_TRACE = 0 + - S8012212: Want to link against kstat on solaris x86 as well as sparc + - S8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21 + - S8012265: VM often crashes on solaris with a lot of memory + - S8012330: [macosx] Sometimes the applet showing the modal dialog itself loses the ability to gain focus + - S8012335: G1: Fix bug with compressed oops in template interpreter on x86 and sparc. + - S8012381: [macosx] Collation selection ignored when printing on MacOSX + - S8012453: (process) Runtime.exec(String) fails if command contains spaces [win] + - S8012455: Missing time and date stamps for PrintGCApplicationConcurrentTime and PrintGCApplicationStoppedTime + - S8012558: new hotspot build - hs24-b42 + - S8012586: [x11] Modal dialogs for fullscreen window may show behind its owner + - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer + - S8012683: Remove unused, obsolete ObjectFactory classes + - S8012714: Assign the unique traceid directly to the Klass upon creation + - S8012715: G1: GraphKit accesses PtrQueue::_index as int but is size_t + - S8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07 + - S8013057: assert(_needs_gc || SafepointSynchronize::is_at_safepoint()) failed: only read at safepoint + - S8013117: Thread-local trace_buffer has wrong type and name + - S8013120: NMT: Kitchensink crashes with assert(next_region == NULL || !next_region->is_committed_region()) failed: Sanity check + - S8013140: Heap corruption with NetworkInterface.getByInetAddress() and long i/f name + - S8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext() + - S8013214: BigApps fails due to 'fatal error: Illegal threadstate encountered: 6' + - S8013226: new hotspot build - hs24-b43 + - S8013228: Create new system properties to control allowable OCSP clock skew and CRL connection timeout + - S8013370: Null pointer exception when adding more than 9 accelators to a JMenuBar + - S8013380: Removal of stack walk to find resource bundle breaks Glassfish startup + - S8013398: Adjust number of stack guard pages on systems with large memory page size + - S8013416: Java Bean Persistence with XMLEncoder + - S8013557: XMLEncoder in 1.7 can't encode objects initialized in no argument constructor + - S8013651: NMT: reserve/release sequence id's in incorrect order due to race + - S8013799: new hotspot build - hs24-b44 + - S8013810: PrintServiceLookup.lookupPrintServices() does not return consistent result + - S8013827: File.createTempFile hangs with temp file starting with 'com1.4' + - S8013900: More warnings compiling jaxp. + - S8013917: Kitchensink crashed with SIGSEGV in BaselineReporter::diff_callsites + - S8013934: Garbage collection event for CMS has wrong cause for System.gc() + - S8014048: Online user guide of jconsole points incorrect link + - S8014129: makefile changes to allow integration of new features + - S8014189: JVM crash with SEGV in ConnectionGraph::record_for_escape_analysis() + - S8014196: ktab creates a file with zero kt_vno + - S8014205: Most of the Swing dialogs are blank on one win7 MUI + - S8014278: new hotspot build - hs24-b45 + - S8014326: [OSX] All libjvm symbols are exported + - S8014408: G1: crashes with assert assert(prev_committed_card_num == _committed_max_card_num) failed + - S8014411: Decrease lock order rank for event tracing locks + - S8014420: Default JDP address does not match the one assigned by IANA + - S8014423: [macosx] The scrollbar's block increment performs incorrectly + - S8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09 + - S8014478: EnableTracing: output from multiple threads may be mixed together + - S8014611: reserve_and_align() assumptions are invalid on windows + - S8014669: arch specific flags not passed to some link commands + - S8014676: Java debugger may fail to run + - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10 + - S8014721: TEST_BUG: java/awt/TrayIcon/DragEventSource/DragEventSource.java fails with java.lang.UnsupportedOperationException + - S8014724: Broken 7u-dev build + - S8014745: Provide a switch to allow stack walk search of resource bundle + - S8014759: new hotspot build - hs24-b46 + - S8014811: loopTransform.cpp assert(cmp_end->in(2) == limit) failed + - S8014821: Regression: Focus issues with Oracle WebCenter Capture applet + - S8014863: Line break calculations in Java 7 are incorrect + - S8014891: Redundant setting of external access properties in setFeatures + - S8014924: JToolTip#setTipText() sometimes (very often) not repaints component. + - S8014941: make jdk7u40 the default jprt release for hs24 + - S8014968: OCSP and CRL connection timeout is set to four hours by default + - S8014969: Use open man pages for non commercial builds + - S8015016: Improve JAXP 1.5 error message + - S8015275: Resolve ambiguity in OCSPChecker & CrlRevocationChecker + - S8015303: [macosx] Application launched via custom URL Scheme does not receive URL + - S8015304: new hotspot build - hs24-b47 + - S8015334: Memory leak when kerning is used on Windows. + - S8015375: Edits to text components hang for clipboard access + - S8015556: [macosx] surrogate pairs do not render properly. + - S8015604: JDP packets containing ideographic characters are broken + - S8015606: Text is not rendered correctly if destination buffer is custom + - S8015683: object_count_after_gc should have the same timestamp for all events + - S8015689: new hotspot build - hs24-b48 + - S8015972: Refactor the sending of the object count after GC event + - S8016046: (process) Strict validation of input should be security manager case only [win]. + - S8016063: getFinalAttributes should use FindClose + - S8016065: Write regression test for 7167142 + - S8016077: new hotspot build - hs24-b49 + - S8016153: Property http://javax.xml.XMLConstants/property/accessExternalDTD is not recognized. + - S8016170: GC id variable in gcTrace.cpp should use typedef GCId + - S8016187: assert(nbits == 32 || (-(1 << nbits-1) <= x && x < ( 1 << nbits-1))) failed: value out of range + - S8016556: G1: Use ArrayAllocator for BitMaps + - S8016566: new hotspot build - hs24-b50 + - S8016735: Remove superfluous EnableInvokeDynamic warning from UnlockDiagnosticVMOptions check + - S8016814: sun.reflect.Reflection.getCallerClass returns the frame off by 1 + +New in release 2.4.0 (2013-06-09): OpenJDK - PR1209, S7170638: Use DTRACE_PROBE[N] in JNI Set and SetStatic Field. @@ -218,7 +539,7 @@ - S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages - S7151348: Build breaks due to warning clean up in sun.rmi.*(7146763) - S7151427: Fix the potential memory leak in error handling code in X11SurfaceData.c - - S7151434: java -jar -XX crashes java launcher + - S7151434, RH969884: java -jar -XX crashes java launcher - S7151532: DCmd for hotspot native memory tracking - S7152007: Fix warnings in sun/rmi/rmic - S7152031: Hotspot needs updated xawt path [macosx] @@ -791,6 +1112,7 @@ - S8011867: Accept unknown PKCS #9 attributes - S8012572: Exclude sun/tools/jmap/Basic.sh for short term - S8014469: (tz) Support tzdata2013c + - S8015275: Resolve ambiguity in OCSPChecker & CrlRevocationChecker * Backports - PR1197, S8003120, RH868136: ResourceManager.getApplicationResources() does not close InputStreams - S8014618, RH962568: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement @@ -802,13 +1124,12 @@ - Include defs.make in buildtree.make so ZERO_BUILD is recognised and JVM_VARIANT_ZERO set. - Provide support for using PKCS11 provider with NSS - Remove file apparently removed as part of upstreaming of Zero. - - Revert 7060849 + - Revert S7060849 - Set UNLIMITED_CRYPTO=true to ensure we use the unlimited policy. - PR473: Set handleStartupErrors to ignoreMultipleInitialisation in nss.cfg - PR716: IcedTea7 should bootstrap with IcedTea6 - - Expand java.security.cert.* imports to avoid conflict when building with OpenJDK 6. - Fix indentation on Makefile block not executed when STRIP_POLICY=no_strip is set - - Fix invalid XSL stylesheets and DTD introduced as part of JEP 167. + - JEP167: Fix invalid XSL stylesheets and DTD. - Include defs.make in buildtree.make so ZERO_BUILD is recognised and JVM_VARIANT_ZERO set. - Make sure libffi cflags and libs are used. - PR1378: Add AArch64 support to Zero @@ -846,8 +1167,8 @@ - PR1278: Synchronise CACAO versions between IcedTea6/7/8 where possible - PR1276: Synchronise CACAO rules between IcedTea6/7/8 where possible * JamVM - - JSR 335: (lambda expressions) initial hack - - JEP 171: Implement fence methods in sun.misc.Unsafe + - JSR335: (lambda expressions) initial hack + - JEP171: Implement fence methods in sun.misc.Unsafe - Fix invokesuper check in invokespecial opcode - Fix non-direct interpreter invokespecial super-class check - When GC'ing a native method don't try to free code @@ -855,6 +1176,8 @@ - Set anonymous class protection domain - JVM_IsVMGeneratedMethodIx stub - Dummy implementation of sun.misc.Perf natives +* SystemTap + - Add garbage collection probes New in release 2.1.8 (2013-05-02): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-2.4.0/acinclude.m4 new/icedtea-2.4.1/acinclude.m4 --- old/icedtea-2.4.0/acinclude.m4 2013-06-09 19:52:13.000000000 +0200 +++ new/icedtea-2.4.1/acinclude.m4 2013-07-05 21:56:07.000000000 +0200 @@ -940,7 +940,7 @@ AC_SUBST([GCJ]) ]) -AC_DEFUN([IT_WITH_HOTSPOT_BUILD], +AC_DEFUN_ONCE([IT_WITH_HOTSPOT_BUILD], [ AC_REQUIRE([IT_ENABLE_ZERO_BUILD]) DEFAULT_BUILD="default" @@ -1937,15 +1937,16 @@ [ AC_MSG_CHECKING([whether to use the system LCMS install]) AC_ARG_ENABLE([system-lcms], - [AS_HELP_STRING(--enable-system-lcms,use the system LCMS [[default=yes]])], + [AS_HELP_STRING(--enable-system-lcms,use the system LCMS [[default=no]])], [ ENABLE_SYSTEM_LCMS="${enableval}" ], [ - ENABLE_SYSTEM_LCMS="yes" + ENABLE_SYSTEM_LCMS="no" ]) AC_MSG_RESULT(${ENABLE_SYSTEM_LCMS}) if test x"${ENABLE_SYSTEM_LCMS}" = "xyes"; then + AC_MSG_WARN([System LCMS may not have the latest security updates]) dnl Check for LCMS2 headers and libraries. PKG_CHECK_MODULES(LCMS2, lcms2,[LCMS2_FOUND=yes],[LCMS2_FOUND=no]) if test "x${LCMS2_FOUND}" = xno diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-2.4.0/configure.ac new/icedtea-2.4.1/configure.ac --- old/icedtea-2.4.0/configure.ac 2013-06-09 19:52:13.000000000 +0200 +++ new/icedtea-2.4.1/configure.ac 2013-07-05 21:56:07.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.4.0], [distro-pkg-dev@openjdk.java.net]) +AC_INIT([icedtea], [2.4.1], [distro-pkg-dev@openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) @@ -175,7 +175,6 @@ IT_ENABLE_WERROR IT_ENABLE_JAR_COMPRESSION IT_SET_SHARK_BUILD -IT_ENABLE_ZERO_BUILD IT_CHECK_ADDITIONAL_VMS IT_WITH_VERSION_SUFFIX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-2.4.0/hotspot.map new/icedtea-2.4.1/hotspot.map --- old/icedtea-2.4.0/hotspot.map 2013-06-09 20:14:27.000000000 +0200 +++ new/icedtea-2.4.1/hotspot.map 2013-07-05 21:56:08.000000000 +0200 @@ -1,2 +1,2 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot c67fd7874b1a 34e60aba6db2f7a5cac7861058db283bd1edcdd9194a5490114cf76edd71696d +default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot 5f53e7717116 f2cfd6da6ff85dff4e6f5d40e21bc48cf15325bcd69d6c36e8f27e1fca74bd42 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-2.4.0/patches/boot/ecj-diamond.patch new/icedtea-2.4.1/patches/boot/ecj-diamond.patch --- old/icedtea-2.4.0/patches/boot/ecj-diamond.patch 2013-06-09 19:52:13.000000000 +0200 +++ new/icedtea-2.4.1/patches/boot/ecj-diamond.patch 2013-07-05 21:56:08.000000000 +0200 @@ -6997,3 +6997,63 @@ List<Thread> threads = new ArrayList<Thread>(); for (int i = 0; i < threadCount; i++) { RandomCollector r = new RandomCollector(); +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java 2013-06-27 16:06:42.289384018 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2013-06-27 16:07:06.489768521 +0100 +@@ -1164,7 +1164,7 @@ + end = end.getSuperclass(); + } + +- HashSet<String> oscNames = new HashSet<>(3); ++ HashSet<String> oscNames = new HashSet<String>(3); + + for (ObjectStreamClass d = this; d != null; d = d.superDesc) { + if (oscNames.contains(d.name)) { +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2013-06-27 16:06:53.297558922 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2013-06-27 16:07:32.294178507 +0100 +@@ -106,7 +106,7 @@ + * Note that this only applies to createFont() from an InputStream object. + */ + private static class TempFileDeletionHook { +- private static HashMap<File, OutputStream> files = new HashMap<>(); ++ private static HashMap<File, OutputStream> files = new HashMap<File, OutputStream>(); + + private static Thread t = null; + static void init() { +diff --git a/src/share/classes/com/sun/media/sound/AbstractLine.java b/src/share/classes/com/sun/media/sound/AbstractLine.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java +@@ -54,7 +54,7 @@ + * Contains event dispatcher per thread group. + */ + private static final Map<ThreadGroup, EventDispatcher> dispatchers = +- new WeakHashMap<>(); ++ new WeakHashMap<ThreadGroup, EventDispatcher>(); + + /** + * Constructs a new AbstractLine. +diff --git a/src/share/classes/com/sun/media/sound/RealTimeSequencer.java b/src/share/classes/com/sun/media/sound/RealTimeSequencer.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java +@@ -59,7 +59,7 @@ + * dispatcher instance with a factory in EventDispatcher + */ + private static final Map<ThreadGroup, EventDispatcher> dispatchers = +- new WeakHashMap<>(); ++ new WeakHashMap<ThreadGroup, EventDispatcher>(); + + /** + * All RealTimeSequencers share this info object. +diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2013-06-27 20:05:19.200970932 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2013-06-27 20:05:33.857203747 +0100 +@@ -113,7 +113,7 @@ + SocketAddress[] saa) + { + SecurityManager sm = System.getSecurityManager(); +- Set<SocketAddress> set = new HashSet<>(saa.length); ++ Set<SocketAddress> set = new HashSet<SocketAddress>(saa.length); + for (SocketAddress sa : saa) { + set.add(getRevealedLocalAddress(sa, sm)); + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-2.4.0/patches/boot/ecj-multicatch.patch new/icedtea-2.4.1/patches/boot/ecj-multicatch.patch --- old/icedtea-2.4.0/patches/boot/ecj-multicatch.patch 2013-06-09 19:52:13.000000000 +0200 +++ new/icedtea-2.4.1/patches/boot/ecj-multicatch.patch 2013-07-05 21:56:08.000000000 +0200 @@ -401,3 +401,54 @@ throw new InternalError(e.toString()); } catch (InvocationTargetException e) { Throwable t = e.getCause(); +diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java 2013-06-27 15:56:57.456088537 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java 2013-06-27 16:02:12.857102777 +0100 +@@ -402,7 +402,13 @@ + try { + ServerNotifForwarder.checkMBeanPermission(this.mBeanServer, + candidate.getObjectName(),"addNotificationListener"); +- } catch (InstanceNotFoundException | SecurityException e) { ++ } catch (InstanceNotFoundException e) { ++ if (logger.debugOn()) { ++ logger.debug("fetchNotifications", "candidate: " + candidate + " skipped. exception " + e); ++ } ++ ++nextSeq; ++ continue; ++ } catch (SecurityException e) { + if (logger.debugOn()) { + logger.debug("fetchNotifications", "candidate: " + candidate + " skipped. exception " + e); + } +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java 2013-06-27 15:56:27.295609027 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2013-06-27 16:00:59.631938678 +0100 +@@ -1024,10 +1024,10 @@ + dir, + redirects, + redirectErrorStream); +- } catch (IOException | IllegalArgumentException e) { ++ } catch (IOException e) { + String exceptionInfo = ": " + e.getMessage(); + Throwable cause = e; +- if ((e instanceof IOException) && security != null) { ++ if (security != null) { + // Can not disclose the fail reason for read-protected files. + try { + security.checkRead(prog); +@@ -1039,6 +1039,16 @@ + // It's much easier for us to create a high-quality error + // message than the low-level C code which found the problem. + throw new IOException( ++ "Cannot run program "" + prog + """ ++ + (dir == null ? "" : " (in directory "" + dir + "")") ++ + exceptionInfo, ++ cause); ++ } catch (IllegalArgumentException e) { ++ String exceptionInfo = ": " + e.getMessage(); ++ Throwable cause = e; ++ // It's much easier for us to create a high-quality error ++ // message than the low-level C code which found the problem. ++ throw new IOException( + "Cannot run program "" + prog + """ + + (dir == null ? "" : " (in directory "" + dir + "")") + + exceptionInfo, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-2.4.0/patches/boot/ecj-stringswitch.patch new/icedtea-2.4.1/patches/boot/ecj-stringswitch.patch --- old/icedtea-2.4.0/patches/boot/ecj-stringswitch.patch 2013-06-09 19:52:13.000000000 +0200 +++ new/icedtea-2.4.1/patches/boot/ecj-stringswitch.patch 2013-07-05 21:56:08.000000000 +0200 @@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-04-04 13:22:25.036506097 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-07-02 03:38:10.090272900 +0100 @@ -350,19 +350,16 @@ if (attrCommands != null) { Object lkey = Attribute.keyForLookup(ctype, name); @@ -32,8 +32,8 @@ // Find canonical instance of the requested attribute. Attribute a = Attribute.lookup(Package.attrDefs, ctype, name); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-04-04 13:22:25.048506291 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-07-02 03:38:10.106273156 +0100 @@ -73,16 +73,14 @@ { // Non-standard, undocumented "--unpack" switch enables unpack mode. @@ -91,8 +91,8 @@ if (logFile != null && !logFile.equals("")) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-04-04 13:22:25.052506355 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-07-02 03:38:10.106273156 +0100 @@ -1116,30 +1116,25 @@ // what is one of { Debug, Compile, Constant, Exceptions, InnerClasses } if (verbose > 0) @@ -144,8 +144,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-04-04 13:22:25.056506419 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-07-02 03:38:10.106273156 +0100 @@ -64,17 +64,23 @@ protected NTLM(String version) throws NTLMException { @@ -182,9 +182,9 @@ fac = SecretKeyFactory.getInstance ("DES"); cipher = Cipher.getInstance ("DES/ECB/NoPadding"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-04-04 13:32:45.886517863 +0100 -@@ -327,12 +327,11 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-07-02 03:42:53.718781065 +0100 +@@ -328,12 +328,11 @@ Object[] appendixResult) { try { if (defc == MethodHandle.class && refKind == REF_invokeVirtual) { @@ -202,59 +202,24 @@ } } catch (Throwable ex) { if (ex instanceof LinkageError) -@@ -395,111 +394,106 @@ - static boolean isCallerSensitive(MemberName mem) { - if (!mem.isInvocable()) return false; // fields are not caller sensitive - Class<?> defc = mem.getDeclaringClass(); -- switch (mem.getName()) { +@@ -403,122 +402,118 @@ + // this method is also called by test/sun/reflect/CallerSensitiveFinder + // to validate the hand-maintained list + private static boolean isCallerSensitiveMethod(Class<?> defc, String method) { +- switch (method) { - case "doPrivileged": - case "doPrivilegedWithCombiner": -+ String memName = mem.getName(); -+ if ("doPrivileged".equals(memName) || -+ "doPrivilegedWithCombiner".equals(memName)) { ++ if ("doPrivileged".equals(method) || ++ "doPrivilegedWithCombiner".equals(method)) { return defc == java.security.AccessController.class; - case "checkMemberAccess": -+ } else if ("checkMemberAccess".equals(memName)) { - return canBeCalledVirtual(mem, java.lang.SecurityManager.class); +- return defc == java.lang.SecurityManager.class; - case "getUnsafe": - return defc == sun.misc.Unsafe.class; - case "lookup": -+ } else if ("getUnsafe".equals(memName)) { -+ return defc == sun.misc.Unsafe.class; -+ } else if ("lookup".equals(memName)) { - return defc == java.lang.invoke.MethodHandles.class; -- case "findStatic": -- case "findVirtual": -- case "findConstructor": -- case "findSpecial": -- case "findGetter": -- case "findSetter": -- case "findStaticGetter": -- case "findStaticSetter": -- case "bind": -- case "unreflect": -- case "unreflectSpecial": -- case "unreflectConstructor": -- case "unreflectGetter": -- case "unreflectSetter": -+ } else if ("findStatic".equals(memName) || -+ "findVirtual".equals(memName) || -+ "findConstructor".equals(memName) || -+ "findSpecial".equals(memName) || -+ "findGetter".equals(memName) || -+ "findSetter".equals(memName) || -+ "findStaticGetter".equals(memName) || -+ "findStaticSetter".equals(memName) || -+ "bind".equals(memName) || -+ "unreflect".equals(memName) || -+ "unreflectSpecial".equals(memName) || -+ "unreflectConstructor".equals(memName) || -+ "unreflectGetter".equals(memName) || -+ "unreflectSetter".equals(memName)) { - return defc == java.lang.invoke.MethodHandles.Lookup.class; +- return defc == java.lang.invoke.MethodHandles.class; - case "invoke": -+ } else if ("invoke".equals(memName)) { - return defc == java.lang.reflect.Method.class; +- return defc == java.lang.reflect.Method.class; - case "get": - case "getBoolean": - case "getByte": @@ -273,33 +238,17 @@ - case "setLong": - case "setFloat": - case "setDouble": -+ } else if ("get".equals(memName) || -+ "getBoolean".equals(memName) || -+ "getByte".equals(memName) || -+ "getChar".equals(memName) || -+ "getShort".equals(memName) || -+ "getInt".equals(memName) || -+ "getFloat".equals(memName) || -+ "getDouble".equals(memName) || -+ "set".equals(memName) || -+ "setBoolean".equals(memName) || -+ "setByte".equals(memName) || -+ "setChar".equals(memName) || -+ "setShort".equals(memName) || -+ "setInt".equals(memName) || -+ "setLong".equals(memName) || -+ "setFloat".equals(memName) || -+ "setDouble".equals(memName)) { - return defc == java.lang.reflect.Field.class; +- return defc == java.lang.reflect.Field.class; - case "newInstance": -+ } else if ("newInstance".equals(memName)) { - if (defc == java.lang.reflect.Constructor.class) return true; - if (defc == java.lang.Class.class) return true; +- if (defc == java.lang.reflect.Constructor.class) return true; +- if (defc == java.lang.Class.class) return true; - break; +- case "getFields": +- return defc == java.lang.Class.class || +- defc == javax.sql.rowset.serial.SerialJavaObject.class; - case "forName": - case "getClassLoader": - case "getClasses": -- case "getFields": - case "getMethods": - case "getConstructors": - case "getDeclaredClasses": @@ -312,88 +261,178 @@ - case "getDeclaredField": - case "getDeclaredMethod": - case "getDeclaredConstructor": -+ } else if ("forName".equals(memName) || -+ "getClassLoader".equals(memName) || -+ "getClasses".equals(memName) || -+ "getFields".equals(memName) || -+ "getMethods".equals(memName) || -+ "getConstructors".equals(memName) || -+ "getDeclaredClasses".equals(memName) || -+ "getDeclaredFields".equals(memName) || -+ "getDeclaredMethods".equals(memName) || -+ "getDeclaredConstructors".equals(memName) || -+ "getField".equals(memName) || -+ "getMethod".equals(memName) || -+ "getConstructor".equals(memName) || -+ "getDeclaredField".equals(memName) || -+ "getDeclaredMethod".equals(memName) || -+ "getDeclaredConstructor".equals(memName)) { - return defc == java.lang.Class.class; +- case "getEnclosingClass": +- case "getEnclosingMethod": +- case "getEnclosingConstructor": +- return defc == java.lang.Class.class; - case "getConnection": - case "getDriver": - case "getDrivers": - case "deregisterDriver": -+ } else if ("getConnection".equals(memName) || -+ "getDriver".equals(memName) || -+ "getDrivers".equals(memName) || -+ "deregisterDriver".equals(memName)) { - return defc == java.sql.DriverManager.class; +- return defc == java.sql.DriverManager.class; - case "newUpdater": -+ } else if ("newUpdater".equals(memName)) { - if (defc == java.util.concurrent.atomic.AtomicIntegerFieldUpdater.class) return true; - if (defc == java.util.concurrent.atomic.AtomicLongFieldUpdater.class) return true; - if (defc == java.util.concurrent.atomic.AtomicReferenceFieldUpdater.class) return true; +- if (defc == java.util.concurrent.atomic.AtomicIntegerFieldUpdater.class) return true; +- if (defc == java.util.concurrent.atomic.AtomicLongFieldUpdater.class) return true; +- if (defc == java.util.concurrent.atomic.AtomicReferenceFieldUpdater.class) return true; - break; - case "getContextClassLoader": -+ } else if ("getContextClassLoader".equals(memName)) { - return canBeCalledVirtual(mem, java.lang.Thread.class); +- return defc == java.lang.Thread.class; - case "getPackage": - case "getPackages": -+ } else if ("getPackage".equals(memName) || -+ "getPackages".equals(memName)) { - return defc == java.lang.Package.class; +- return defc == java.lang.Package.class; - case "getParent": - case "getSystemClassLoader": -+ } else if ("getParent".equals(memName) || -+ "getSystemClassLoader".equals(memName)) { - return defc == java.lang.ClassLoader.class; +- return defc == java.lang.ClassLoader.class; - case "load": - case "loadLibrary": -+ } else if ("load".equals(memName) || -+ "loadLibrary".equals(memName)) { - if (defc == java.lang.Runtime.class) return true; - if (defc == java.lang.System.class) return true; +- if (defc == java.lang.Runtime.class) return true; +- if (defc == java.lang.System.class) return true; - break; - case "getCallerClass": -+ } else if ("getCallerClass".equals(memName)) { - if (defc == sun.reflect.Reflection.class) return true; - if (defc == java.lang.System.class) return true; +- if (defc == sun.reflect.Reflection.class) return true; +- if (defc == java.lang.System.class) return true; - break; - case "getCallerClassLoader": -+ } else if ("getCallerClassLoader".equals(memName)) { - return defc == java.lang.ClassLoader.class; +- return defc == java.lang.ClassLoader.class; - case "registerAsParallelCapable": -+ } else if ("registerAsParallelCapable".equals(memName)) { - return canBeCalledVirtual(mem, java.lang.ClassLoader.class); +- return defc == java.lang.ClassLoader.class; - case "getProxyClass": - case "newProxyInstance": -+ } else if ("getProxyClass".equals(memName) || -+ "newProxyInstance".equals(memName)) { - return defc == java.lang.reflect.Proxy.class; +- return defc == java.lang.reflect.Proxy.class; - case "asInterfaceInstance": -+ } else if ("asInterfaceInstance".equals(memName)) { - return defc == java.lang.invoke.MethodHandleProxies.class; +- return defc == java.lang.invoke.MethodHandleProxies.class; - case "getBundle": - case "clearCache": -+ } else if ("getBundle".equals(memName) || -+ "clearCache".equals(memName)) { - return defc == java.util.ResourceBundle.class; +- return defc == java.util.ResourceBundle.class; +- case "getType": +- return defc == java.io.ObjectStreamField.class; +- case "forClass": +- return defc == java.io.ObjectStreamClass.class; +- case "getLogger": +- return defc == java.util.logging.Logger.class; +- case "getAnonymousLogger": +- return defc == java.util.logging.Logger.class; +- } +- return false; ++ } else if ("checkMemberAccess".equals(method)) { ++ return defc == java.lang.SecurityManager.class; ++ } else if ("getUnsafe".equals(method)) { ++ return defc == sun.misc.Unsafe.class; ++ } else if ("lookup".equals(method)) { ++ return defc == java.lang.invoke.MethodHandles.class; ++ } else if ("invoke".equals(method)) { ++ return defc == java.lang.reflect.Method.class; ++ } else if ("get".equals(method) || ++ "getBoolean".equals(method) || ++ "getByte".equals(method) || ++ "getChar".equals(method) || ++ "getShort".equals(method) || ++ "getInt".equals(method) || ++ "getLong".equals(method) || ++ "getFloat".equals(method) || ++ "getDouble".equals(method) || ++ "set".equals(method) || ++ "setBoolean".equals(method) || ++ "setByte".equals(method) || ++ "setChar".equals(method) || ++ "setShort".equals(method) || ++ "setInt".equals(method) || ++ "setLong".equals(method) || ++ "setFloat".equals(method) || ++ "setDouble".equals(method)) { ++ return defc == java.lang.reflect.Field.class; ++ } else if ("newInstance".equals(method)) { ++ if (defc == java.lang.reflect.Constructor.class) return true; ++ if (defc == java.lang.Class.class) return true; ++ } else if ("getFields".equals(method)) { ++ return defc == java.lang.Class.class || ++ defc == javax.sql.rowset.serial.SerialJavaObject.class; ++ } else if ("forName".equals(method) || ++ "getClassLoader".equals(method) || ++ "getClasses".equals(method) || ++ "getFields".equals(method) || ++ "getMethods".equals(method) || ++ "getConstructors".equals(method) || ++ "getDeclaredClasses".equals(method) || ++ "getDeclaredFields".equals(method) || ++ "getDeclaredMethods".equals(method) || ++ "getDeclaredConstructors".equals(method) || ++ "getField".equals(method) || ++ "getMethod".equals(method) || ++ "getConstructor".equals(method) || ++ "getDeclaredField".equals(method) || ++ "getDeclaredMethod".equals(method) || ++ "getDeclaredConstructor".equals(method) || ++ "getEnclosingClass".equals(method) || ++ "getEnclosingMethod".equals(method) || ++ "getEnclosingConstructor".equals(method)) { ++ return defc == java.lang.Class.class; ++ } else if ("getConnection".equals(method) || ++ "getDriver".equals(method) || ++ "getDrivers".equals(method) || ++ "deregisterDriver".equals(method)) { ++ return defc == java.sql.DriverManager.class; ++ } else if ("newUpdater".equals(method)) { ++ if (defc == java.util.concurrent.atomic.AtomicIntegerFieldUpdater.class) return true; ++ if (defc == java.util.concurrent.atomic.AtomicLongFieldUpdater.class) return true; ++ if (defc == java.util.concurrent.atomic.AtomicReferenceFieldUpdater.class) return true; ++ } else if ("getContextClassLoader".equals(method)) { ++ return defc == java.lang.Thread.class; ++ } else if ("getPackage".equals(method) || ++ "getPackages".equals(method)) { ++ return defc == java.lang.Package.class; ++ } else if ("getParent".equals(method) || ++ "getSystemClassLoader".equals(method)) { ++ return defc == java.lang.ClassLoader.class; ++ } else if ("load".equals(method) || ++ "loadLibrary".equals(method)) { ++ if (defc == java.lang.Runtime.class) return true; ++ if (defc == java.lang.System.class) return true; ++ } else if ("getCallerClass".equals(method)) { ++ if (defc == sun.reflect.Reflection.class) return true; ++ if (defc == java.lang.System.class) return true; ++ } else if ("getCallerClassLoader".equals(method)) { ++ return defc == java.lang.ClassLoader.class; ++ } else if ("registerAsParallelCapable".equals(method)) { ++ return defc == java.lang.ClassLoader.class; ++ } else if ("getProxyClass".equals(method) || ++ "newProxyInstance".equals(method)) { ++ return defc == java.lang.reflect.Proxy.class; ++ } else if ("asInterfaceInstance".equals(method)) { ++ return defc == java.lang.invoke.MethodHandleProxies.class; ++ } else if ("getBundle".equals(method) || ++ "clearCache".equals(method)) { ++ return defc == java.util.ResourceBundle.class; ++ } else if ("getType".equals(method)) { ++ return defc == java.io.ObjectStreamField.class; ++ } else if ("forClass".equals(method)) { ++ return defc == java.io.ObjectStreamClass.class; ++ } else if ("getLogger".equals(method)) { ++ return defc == java.util.logging.Logger.class; ++ } else if ("getAnonymousLogger".equals(method)) { ++ return defc == java.util.logging.Logger.class; ++ } ++ return false; + } + + + private static boolean canBeCalledVirtual(MemberName mem) { + assert(mem.isInvocable()); + Class<?> defc = mem.getDeclaringClass(); +- switch (mem.getName()) { +- case "checkMemberAccess": ++ String memName = mem.getName(); ++ if ("checkMemberAccess".equals(memName)) { + return canBeCalledVirtual(mem, java.lang.SecurityManager.class); +- case "getContextClassLoader": ++ } else if ("getContextClassLoader".equals(memName)) { + return canBeCalledVirtual(mem, java.lang.Thread.class); } return false; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java 2013-04-04 13:22:25.068506613 +0100 -@@ -268,14 +268,16 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java 2013-07-02 03:38:10.106273156 +0100 +@@ -269,14 +269,16 @@ private static boolean isObjectMethod(Method m) { @@ -414,7 +453,7 @@ return (m.getReturnType() == boolean.class && m.getParameterTypes().length == 1 && m.getParameterTypes()[0] == Object.class); -@@ -286,12 +288,14 @@ +@@ -287,12 +289,14 @@ private static Object callObjectMethod(Object self, Method m, Object[] args) { assert(isObjectMethod(m)) : m; @@ -434,8 +473,8 @@ } return null; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-04-04 13:22:25.068506613 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-07-02 03:38:10.106273156 +0100 @@ -119,24 +119,20 @@ String optStr = (opts.length > 1 && opts[1] != null) ? opts[1].trim() @@ -473,8 +512,8 @@ /* diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2013-04-03 14:18:05.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2013-04-04 13:22:25.080506807 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2013-07-02 03:38:10.106273156 +0100 @@ -378,19 +378,23 @@ GE; // ">=" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-2.4.0/patches/boot/tobin.patch new/icedtea-2.4.1/patches/boot/tobin.patch --- old/icedtea-2.4.0/patches/boot/tobin.patch 2013-06-09 19:52:13.000000000 +0200 +++ new/icedtea-2.4.1/patches/boot/tobin.patch 2013-07-05 21:56:08.000000000 +0200 @@ -1,38 +1,44 @@ -diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/sun/xawt/Makefile openjdk-boot/jdk/make/sun/xawt/Makefile ---- ../openjdk.orig/openjdk-boot/jdk/make/sun/xawt/Makefile 2009-10-30 16:49:39.000000000 +0000 -+++ openjdk-boot/jdk/make/sun/xawt/Makefile 2009-10-30 16:59:16.000000000 +0000 -@@ -294,11 +294,7 @@ +diff -Nru openjdk-boot.orig/jdk/make/sun/awt/Makefile openjdk-boot/jdk/make/sun/awt/Makefile +--- openjdk-boot.orig/jdk/make/sun/awt/Makefile 2013-06-25 16:52:46.810177400 +0100 ++++ openjdk-boot/jdk/make/sun/awt/Makefile 2013-06-25 16:54:43.856035962 +0100 +@@ -245,16 +245,12 @@ + $(ICONPATH)/security-icon-yellow48.png TEMPDIR_CLASSES = $(TEMPDIR)/classes +- ++ + generated.clean: + $(RM) -r $(GEN_DIR)/*.java + $(RM) -r $(TEMPDIR)/.gen_icons --$(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class: ToBin.java +-$(TEMPDIR_CLASSES)/sun/awt/ToBin.class: ToBin.java - @$(prep-target) - $(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $< - --$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class $(ICONS) +-$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/ToBin.class $(ICONS) +$(TEMPDIR)/.gen_icons: $(ICONS) $(prep-target) for i in $(ICONS); do \ filename=`basename $$i`; \ -@@ -308,20 +304,14 @@ - $(ECHO) "package sun.awt.X11;" >> $$classname ; \ - $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \ - $(ECHO) "public static int[] $$name = { " >> $$classname; \ +@@ -264,20 +260,14 @@ + $(ECHO) "package sun.awt;" >> $$classname ; \ + $(ECHO) "public class AWTIcon32_$$name {" >> $$classname; \ + $(ECHO) "public final static int[] $$name = { " >> $$classname; \ - $(CAT) $$i | \ - $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ - -Djava.awt.headless=true \ -- sun.awt.X11.ToBin >> $$classname; \ +- sun.awt.ToBin >> $$classname; \ + $(ECHO) "0,0" >> $$classname ; \ $(ECHO) "}; }" >> $$classname; \ - classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \ + classname=$(GEN_DIR)/AWTIcon64_$$name.java; \ $(RM) $$classname; \ - $(ECHO) "package sun.awt.X11;" >> $$classname ; \ - $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \ - $(ECHO) "public static long[] $$name = { " >> $$classname; \ + $(ECHO) "package sun.awt;" >> $$classname ; \ + $(ECHO) "public class AWTIcon64_$$name {" >> $$classname; \ + $(ECHO) "public final static long[] $$name = { " >> $$classname; \ - $(CAT) $$i | \ - $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ - -Djava.awt.headless=true \ -- sun.awt.X11.ToBin >> $$classname; \ +- sun.awt.ToBin >> $$classname; \ + $(ECHO) "0,0" >> $$classname ; \ $(ECHO) "}; }" >> $$classname; \ done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-2.4.0/patches/rhino.patch new/icedtea-2.4.1/patches/rhino.patch --- old/icedtea-2.4.0/patches/rhino.patch 2013-06-09 19:52:13.000000000 +0200 +++ new/icedtea-2.4.1/patches/rhino.patch 2013-07-05 21:56:08.000000000 +0200 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/jdk/make/com/sun/Makefile openjdk/jdk/make/com/sun/Makefile ---- openjdk.orig/jdk/make/com/sun/Makefile 2012-03-12 17:25:51.000000000 +0000 -+++ openjdk/jdk/make/com/sun/Makefile 2012-03-18 18:29:38.835009659 +0000 +--- openjdk.orig/jdk/make/com/sun/Makefile 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk/jdk/make/com/sun/Makefile 2013-07-02 03:23:41.216478448 +0100 @@ -31,13 +31,6 @@ PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk @@ -19,14 +19,14 @@ SUBDIRS_desktop = image SUBDIRS_enterprise = crypto/provider jndi \ org rowset net/httpserver --SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing servicetag nio demo -+SUBDIRS_misc = script tracing servicetag nio demo +-SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing nio demo ++SUBDIRS_misc = script tracing nio demo # Omit mirror since it's built with the apt tool. SUBDIRS_tools = tools diff -Nru openjdk.orig/jdk/make/com/sun/script/Makefile openjdk/jdk/make/com/sun/script/Makefile ---- openjdk.orig/jdk/make/com/sun/script/Makefile 2012-03-12 17:25:51.000000000 +0000 -+++ openjdk/jdk/make/com/sun/script/Makefile 2012-03-18 18:29:38.843009789 +0000 +--- openjdk.orig/jdk/make/com/sun/script/Makefile 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk/jdk/make/com/sun/script/Makefile 2013-07-02 03:20:37.373563985 +0100 @@ -31,6 +31,8 @@ AUTO_FILES_JAVA_DIRS = com/sun/script @@ -37,9 +37,9 @@ # Files that need to be copied # diff -Nru openjdk.orig/jdk/make/common/Release.gmk openjdk/jdk/make/common/Release.gmk ---- openjdk.orig/jdk/make/common/Release.gmk 2012-03-12 17:25:51.000000000 +0000 -+++ openjdk/jdk/make/common/Release.gmk 2012-03-18 18:30:00.367359553 +0000 -@@ -821,6 +821,7 @@ +--- openjdk.orig/jdk/make/common/Release.gmk 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk/jdk/make/common/Release.gmk 2013-07-02 03:20:37.381564110 +0100 +@@ -838,6 +838,7 @@ $(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar $(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar $(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar @@ -48,8 +48,8 @@ $(CP) $(JFR_JAR) $(JRE_IMAGE_DIR)/lib/jfr.jar endif diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java ---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2012-03-12 17:25:51.000000000 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2012-03-18 18:29:38.843009789 +0000 +--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2013-07-02 03:20:37.381564110 +0100 @@ -24,7 +24,7 @@ */ @@ -60,8 +60,8 @@ import java.util.*; diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java ---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java 2012-03-12 17:25:51.000000000 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java 2012-03-18 18:29:38.843009789 +0000 +--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java 2013-07-02 03:20:37.385564173 +0100 @@ -26,7 +26,7 @@ package com.sun.script.javascript; @@ -72,8 +72,8 @@ /** * This class implements Rhino-like JavaAdapter to help implement a Java diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java ---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2012-03-12 17:25:51.000000000 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2012-03-18 18:29:38.843009789 +0000 +--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2013-07-02 03:20:37.385564173 +0100 @@ -25,7 +25,7 @@ package com.sun.script.javascript; @@ -84,8 +84,8 @@ /** diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java ---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java 2012-03-12 17:25:51.000000000 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java 2012-03-18 18:29:38.843009789 +0000 +--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java 2013-07-02 03:20:37.385564173 +0100 @@ -26,7 +26,7 @@ package com.sun.script.javascript; @@ -96,8 +96,8 @@ /** * This class prevents script access to certain sensitive classes. diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java ---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java 2012-03-12 17:25:51.000000000 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java 2012-03-18 18:29:38.843009789 +0000 +--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java 2013-07-02 03:20:37.385564173 +0100 @@ -25,7 +25,7 @@ package com.sun.script.javascript; @@ -108,8 +108,8 @@ /** * Represents compiled JavaScript code. diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java ---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java 2012-03-12 17:25:51.000000000 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java 2012-03-18 18:29:38.843009789 +0000 +--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java 2013-07-02 03:20:37.385564173 +0100 @@ -26,7 +26,7 @@ package com.sun.script.javascript; import javax.script.*; @@ -120,8 +120,8 @@ /** diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java ---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2012-03-12 17:25:51.000000000 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2012-03-18 18:29:38.843009789 +0000 +--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2013-07-02 03:20:37.385564173 +0100 @@ -26,7 +26,7 @@ package com.sun.script.javascript; import com.sun.script.util.*; @@ -132,8 +132,8 @@ import java.io.*; import java.security.*; diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java ---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java 2012-03-12 17:25:51.000000000 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java 2012-03-18 18:29:38.843009789 +0000 +--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java 2013-07-02 03:20:37.385564173 +0100 @@ -25,7 +25,7 @@ package com.sun.script.javascript; @@ -144,8 +144,8 @@ import javax.script.*; import java.security.AccessControlContext; diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java ---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2012-03-12 17:25:51.000000000 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2012-03-18 18:29:38.843009789 +0000 +--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2013-07-01 15:22:10.000000000 +0100 ++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2013-07-02 03:20:37.385564173 +0100 @@ -27,7 +27,7 @@ import java.lang.reflect.*; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icedtea-2.4.0/patches/systemtap_gc.patch new/icedtea-2.4.1/patches/systemtap_gc.patch --- old/icedtea-2.4.0/patches/systemtap_gc.patch 2013-06-09 19:52:13.000000000 +0200 +++ new/icedtea-2.4.1/patches/systemtap_gc.patch 2013-07-05 21:56:08.000000000 +0200 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/hotspot/src/share/vm/compiler/oopMap.cpp openjdk/hotspot/src/share/vm/compiler/oopMap.cpp ---- openjdk.orig/hotspot/src/share/vm/compiler/oopMap.cpp 2013-04-23 23:15:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/compiler/oopMap.cpp 2013-04-24 09:29:58.431723500 +0100 +--- openjdk.orig/hotspot/src/share/vm/compiler/oopMap.cpp 2013-07-01 15:21:44.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/compiler/oopMap.cpp 2013-07-02 03:27:01.515655212 +0100 @@ -33,9 +33,13 @@ #include "memory/resourceArea.hpp" #include "runtime/frame.inline.hpp" @@ -26,8 +26,8 @@ // Delete entry delete entry; diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2013-04-23 23:15:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2013-04-24 09:29:58.439723629 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2013-07-01 15:21:44.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2013-07-02 03:27:01.527655402 +0100 @@ -59,6 +59,12 @@ #include "runtime/vmThread.hpp" #include "services/memoryService.hpp" @@ -41,7 +41,7 @@ // statics CMSCollector* ConcurrentMarkSweepGeneration::_collector = NULL; -@@ -1646,7 +1652,13 @@ +@@ -1647,7 +1653,13 @@ size_t size, bool tlab) { @@ -56,8 +56,8 @@ void CMSCollector::collect(bool full, diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2013-04-23 23:15:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2013-04-24 09:29:58.439723629 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2013-07-01 15:21:44.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2013-07-02 03:27:01.527655402 +0100 @@ -50,8 +50,13 @@ #include "runtime/thread.hpp" #include "runtime/vmThread.hpp" @@ -93,8 +93,8 @@ // CHF: cheating for now!!! // Universe::set_heap_capacity_at_last_gc(Universe::heap()->capacity()); diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2013-04-23 23:15:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2013-04-24 09:29:58.443723700 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2013-07-01 15:21:44.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2013-07-02 03:27:01.527655402 +0100 @@ -43,8 +43,14 @@ #include "runtime/java.hpp" #include "runtime/vmThread.hpp" @@ -110,7 +110,7 @@ PSYoungGen* ParallelScavengeHeap::_young_gen = NULL; PSOldGen* ParallelScavengeHeap::_old_gen = NULL; PSPermGen* ParallelScavengeHeap::_perm_gen = NULL; -@@ -811,7 +817,13 @@ +@@ -816,7 +822,13 @@ } VM_ParallelGCSystemGC op(gc_count, full_gc_count, cause); @@ -125,8 +125,8 @@ // This interface assumes that it's being called by the diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2013-04-23 23:15:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2013-04-24 09:29:58.447723769 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2013-07-01 15:21:44.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2013-07-02 03:28:20.476907895 +0100 @@ -58,11 +58,18 @@ #include "services/management.hpp" #include "services/memoryService.hpp" @@ -144,9 +144,9 @@ +#endif /* !USDT2 */ + // All sizes are in HeapWords. - const size_t ParallelCompactData::Log2RegionSize = 9; // 512 words + const size_t ParallelCompactData::Log2RegionSize = 16; // 64K words const size_t ParallelCompactData::RegionSize = (size_t)1 << Log2RegionSize; -@@ -440,6 +447,9 @@ +@@ -469,6 +476,9 @@ void ParallelCompactData::clear() { @@ -154,9 +154,9 @@ + HS_DTRACE_PROBE2(hotspot, gc__collection__ParallelCompact__clear, &_region_data, _region_data->data_location()); +#endif /* !USDT2 */ memset(_region_data, 0, _region_vspace->committed_size()); + memset(_block_data, 0, _block_vspace->committed_size()); } - -@@ -1980,6 +1990,9 @@ +@@ -2012,6 +2022,9 @@ "should be in vm thread"); ParallelScavengeHeap* heap = gc_heap(); @@ -166,7 +166,7 @@ GCCause::Cause gc_cause = heap->gc_cause(); assert(!heap->is_gc_active(), "not reentrant"); -@@ -3397,6 +3410,9 @@ +@@ -3511,6 +3524,9 @@ // past the end of the partial object entering the region (if any). HeapWord* const dest_addr = sd.partial_obj_end(dp_region); HeapWord* const new_top = _space_info[space_id].new_top(); @@ -177,8 +177,8 @@ const size_t words = pointer_delta(new_top, dest_addr); diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2013-04-23 23:15:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2013-04-24 09:29:58.447723769 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2013-07-01 15:21:44.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2013-07-02 03:27:01.527655402 +0100 @@ -55,8 +55,17 @@ #include "runtime/vmThread.hpp" #include "runtime/vm_operations.hpp" @@ -234,8 +234,8 @@ } diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2013-04-23 23:15:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2013-04-24 09:29:58.451723832 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2013-07-01 15:21:44.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2013-07-02 03:27:01.531655466 +0100 @@ -54,6 +54,12 @@ #include "utilities/copy.hpp" #include "utilities/globalDefinitions.hpp" @@ -271,8 +271,8 @@ TASKQUEUE_STATS_ONLY(thread_state_set.print_termination_stats()); TASKQUEUE_STATS_ONLY(thread_state_set.print_taskqueue_stats()); diff -Nru openjdk.orig/hotspot/src/share/vm/memory/defNewGeneration.cpp openjdk/hotspot/src/share/vm/memory/defNewGeneration.cpp ---- openjdk.orig/hotspot/src/share/vm/memory/defNewGeneration.cpp 2013-04-23 23:15:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/defNewGeneration.cpp 2013-04-24 09:30:36.336328227 +0100 +--- openjdk.orig/hotspot/src/share/vm/memory/defNewGeneration.cpp 2013-07-01 15:21:44.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/memory/defNewGeneration.cpp 2013-07-02 03:27:01.531655466 +0100 @@ -42,6 +42,7 @@ #include "oops/oop.inline.hpp" #include "runtime/java.hpp" @@ -315,8 +315,8 @@ gc_tracer.report_tenuring_threshold(tenuring_threshold()); diff -Nru openjdk.orig/hotspot/src/share/vm/memory/generation.cpp openjdk/hotspot/src/share/vm/memory/generation.cpp ---- openjdk.orig/hotspot/src/share/vm/memory/generation.cpp 2013-04-23 23:15:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/generation.cpp 2013-04-24 09:29:58.459723953 +0100 +--- openjdk.orig/hotspot/src/share/vm/memory/generation.cpp 2013-07-01 15:21:44.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/memory/generation.cpp 2013-07-02 03:27:01.531655466 +0100 @@ -41,8 +41,14 @@ #include "oops/oop.inline.hpp" #include "runtime/java.hpp" @@ -347,8 +347,8 @@ gc_timer->register_gc_end(os::elapsed_counter()); diff -Nru openjdk.orig/hotspot/src/share/vm/memory/tenuredGeneration.cpp openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp ---- openjdk.orig/hotspot/src/share/vm/memory/tenuredGeneration.cpp 2013-04-23 23:15:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp 2013-04-24 09:29:58.459723953 +0100 +--- openjdk.orig/hotspot/src/share/vm/memory/tenuredGeneration.cpp 2013-07-01 15:21:44.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp 2013-07-02 03:27:01.531655466 +0100 @@ -33,6 +33,12 @@ #include "memory/tenuredGeneration.hpp" #include "oops/oop.inline.hpp" ++++++ java-1.7.0-openjdk-java-access-bridge-security.patch ++++++ --- /var/tmp/diff_new_pack.3l5AuF/_old 2013-07-16 16:36:50.000000000 +0200 +++ /var/tmp/diff_new_pack.3l5AuF/_new 2013-07-16 16:36:50.000000000 +0200 @@ -2,24 +2,22 @@ =================================================================== --- openjdk/jdk/src/share/lib/security/java.security-linux.orig +++ openjdk/jdk/src/share/lib/security/java.security-linux -@@ -151,7 +151,10 @@ package.access=sun.,\ - com.sun.org.apache.xml.internal.serializer.utils.,\ - com.sun.org.apache.xml.internal.utils.,\ +@@ -154,7 +154,9 @@ package.access=sun.,\ + com.sun.org.apache.xml.internal.security.,\ com.sun.org.glassfish.,\ + org.jcp.xml.dsig.internal.,\ - oracle.jrockit.jfr. -+ com.sun.org.glassfish.gmbal.,\ + oracle.jrockit.jfr.,\ + org.GNOME.Accessibility.,\ + org.GNOME.Bonobo. # # List of comma-separated packages that start with or equal this string # will cause a security exception to be thrown when -@@ -186,7 +189,10 @@ package.definition=sun.,\ - com.sun.org.apache.xml.internal.serializer.utils.,\ - com.sun.org.apache.xml.internal.utils.,\ +@@ -192,7 +194,9 @@ package.definition=sun.,\ + com.sun.org.apache.xml.internal.security.,\ com.sun.org.glassfish.,\ + org.jcp.xml.dsig.internal.,\ - oracle.jrockit.jfr. -+ com.sun.org.glassfish.gmbl.,\ + oracle.jrockit.jfr.,\ + org.GNOME.Accessibility.,\ + org.GNOME.Bonobo. ++++++ java-1.7.0-openjdk-zero-arch.patch ++++++ --- openjdk/hotspot/make/linux/makefiles/defs.make +++ openjdk/hotspot/make/linux/makefiles/defs.make @@ -38,7 +38,7 @@ else endif # zero -ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) +ifeq ($(findstring zero, $(JVM_VARIANTS)), zero) ifeq ($(ARCH_DATA_MODEL), 64) MAKE_ARGS += LP64=1 endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org