Hello community, here is the log from the commit of package java-1_7_0-openjdk for openSUSE:Factory checked in at 2013-02-23 16:34:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk.changes 2013-02-19 13:35:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes 2013-02-23 16:34:52.000000000 +0100 @@ -1,0 +2,15 @@ +Thu Feb 21 09:24:47 UTC 2013 - [email protected] + +- update to icedtea-2.3.7 (bnc#803379) + - S8004937, CVE-2013-1484: Improve proxy construction + - S8006439, CVE-2013-1485: Improve MethodHandles coverage + - S8006446, CVE-2013-1486: Restrict MBeanServer access + - S8006777, CVE-2013-0169: Improve TLS handling of invalid messages + - S8007688: Blacklist known bad certificate +* Backports + - S8007393: Possible race condition after JDK-6664509 + - S8007611: logging behavior in applet changed +* Bug fixes + - PR1303: Support building with giflib 5 + +------------------------------------------------------------------- Old: ---- 6bb01322bb5a.tar.gz 97a8b625f6e9.tar.gz b900024eb4ba.tar.gz bc0de5a0ece2.tar.gz d7feafb8427b.tar.gz dd8d1a8f222f.tar.gz e0739a8783d1.tar.gz icedtea-2.3.6.tar.gz icedtea-2.3.6.tar.gz.sig New: ---- 104e2c65892d.tar.gz 1d46a56eb51c.tar.gz 506161df1c48.tar.gz 6a3417030605.tar.gz 82e58144c3fb.tar.gz b5006c3285c6.tar.gz b9590aa972b9.tar.gz icedtea-2.3.7.tar.gz icedtea-2.3.7.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.bQ19PE/_old 2013-02-23 16:35:01.000000000 +0100 +++ /var/tmp/diff_new_pack.bQ19PE/_new 2013-02-23 16:35:01.000000000 +0100 @@ -57,7 +57,7 @@ # If runtests is 0 test suites will not be run. %define runtests 0 -%define icedtea_version 2.3.6 +%define icedtea_version 2.3.7 %define hg_tag icedtea-{icedtea_version}-branchpoint %define openjdkdate 27_jun_2011 @@ -157,13 +157,13 @@ Source3: mauve-%{mauvedate}.tar.gz Source4: mauve_tests -Source5: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/archive/dd8d1a8f222f.tar.gz -Source6: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba/archive/97a8b625f6e9.tar.gz -Source7: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp/archive/d7feafb8427b.tar.gz -Source8: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws/archive/b900024eb4ba.tar.gz -Source9: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk/archive/6bb01322bb5a.tar.gz -Source10: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools/archive/e0739a8783d1.tar.gz -Source11: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot/archive/bc0de5a0ece2.tar.gz +Source5: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/archive/506161df1c48.tar.gz +Source6: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba/archive/82e58144c3fb.tar.gz +Source7: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp/archive/1d46a56eb51c.tar.gz +Source8: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws/archive/b9590aa972b9.tar.gz +Source9: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk/archive/6a3417030605.tar.gz +Source10: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools/archive/b5006c3285c6.tar.gz +Source11: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot/archive/104e2c65892d.tar.gz # zero compatible hotspot Source12: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot/archive/32569b4d36f4.tar.gz Source13: http://icedtea.classpath.org/download/drops/jamvm/jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz @@ -993,7 +993,6 @@ %doc %{buildoutputdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE %doc %{buildoutputdir}/j2sdk-image/jre/THIRD_PARTY_README -%doc %dir %{_jvmdir}/java-%{javaver}-%{origin} %dir %{_jvmdir}/%{sdkdir} ++++++ 6bb01322bb5a.tar.gz -> 104e2c65892d.tar.gz ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/6bb01322bb5a.tar.gz /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/104e2c65892d.tar.gz differ: char 5, line 1 ++++++ 6bb01322bb5a.tar.gz -> 1d46a56eb51c.tar.gz ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/6bb01322bb5a.tar.gz /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/1d46a56eb51c.tar.gz differ: char 5, line 1 ++++++ 6bb01322bb5a.tar.gz -> 506161df1c48.tar.gz ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/6bb01322bb5a.tar.gz /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/506161df1c48.tar.gz differ: char 5, line 1 ++++++ 6bb01322bb5a.tar.gz -> 6a3417030605.tar.gz ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/6bb01322bb5a.tar.gz /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/6a3417030605.tar.gz differ: char 5, line 1 ++++++ 6bb01322bb5a.tar.gz -> 82e58144c3fb.tar.gz ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/6bb01322bb5a.tar.gz /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/82e58144c3fb.tar.gz differ: char 5, line 1 ++++++ bc0de5a0ece2.tar.gz -> b5006c3285c6.tar.gz ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/bc0de5a0ece2.tar.gz /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/b5006c3285c6.tar.gz differ: char 5, line 1 ++++++ 6bb01322bb5a.tar.gz -> b9590aa972b9.tar.gz ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/6bb01322bb5a.tar.gz /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/b9590aa972b9.tar.gz differ: char 5, line 1 ++++++ icedtea-2.3.6.tar.gz -> icedtea-2.3.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-2.3.6/ChangeLog new/icedtea-2.3.7/ChangeLog --- old/icedtea-2.3.6/ChangeLog 2013-02-12 17:56:09.000000000 +0100 +++ new/icedtea-2.3.7/ChangeLog 2013-02-20 07:17:45.000000000 +0100 @@ -1,5 +1,41 @@ 2013-02-12 Andrew John Hughes <[email protected]> + * configure.ac: Bump to 2.3.7 proper. + * NEWS: Set release date for 2.3.7. + +2013-02-20 Andrew John Hughes <[email protected]> + + * NEWS: List security fixes. + +2013-02-20 Andrew John Hughes <[email protected]> + + * Makefile.am, + (JDK_UPDATE_VERSION): Bump to 15. + (CORBA_CHANGESET): Update to IcedTea7 2.3 forest head, + bringing in latest security updates. + (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: Sync default with 2.3 HEAD as other + changes above. + * patches/boot/ecj-stringswitch.patch: + Update MethodHandleNatives case. + +2013-02-13 Andrew John Hughes <[email protected]> + + * configure.ac: Bump to 2.3.7pre. + * NEWS: Add section for 2.3.7. + +2013-02-12 Andrew John Hughes <[email protected]> + * NEWS: Replace 2.3.5 with 2.3.6 as 2.3.5 was forest only. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-2.3.6/Makefile.am new/icedtea-2.3.7/Makefile.am --- old/icedtea-2.3.6/Makefile.am 2013-02-12 14:23:44.000000000 +0100 +++ new/icedtea-2.3.7/Makefile.am 2013-02-20 07:17:45.000000000 +0100 @@ -1,22 +1,22 @@ # Dependencies OPENJDK_VERSION = b20 -JDK_UPDATE_VERSION = 13 +JDK_UPDATE_VERSION = 15 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = 97a8b625f6e9 -JAXP_CHANGESET = d7feafb8427b -JAXWS_CHANGESET = b900024eb4ba -JDK_CHANGESET = 6bb01322bb5a -LANGTOOLS_CHANGESET = e0739a8783d1 -OPENJDK_CHANGESET = dd8d1a8f222f +CORBA_CHANGESET = 82e58144c3fb +JAXP_CHANGESET = 1d46a56eb51c +JAXWS_CHANGESET = b9590aa972b9 +JDK_CHANGESET = 6a3417030605 +LANGTOOLS_CHANGESET = b5006c3285c6 +OPENJDK_CHANGESET = 506161df1c48 -CORBA_SHA256SUM = 511f9517374babed86f9d3d60d06f0fb7614cff14431a4eb678967b6f1358b1d -JAXP_SHA256SUM = 81f30228dfab5669b114841a0b797c6529a5e37ca52eb97c7f9bbfd29aae9941 -JAXWS_SHA256SUM = 276fcc2f7609dd5a9346f9faa317331e722c9c015fa19c61a1228d86cf231bc2 -JDK_SHA256SUM = a2d4557222eb72b9f1ecf6cfd19c73eb0a02e2f9755eacacabb4c43c682095e2 -LANGTOOLS_SHA256SUM = 85170ef7a68ef8e2895edffd9a4209f78b43887e8c782bebfe14997d06619bdb -OPENJDK_SHA256SUM = a360299dd869d612b77a016967678716cb03dfddd0f484944a1619fda5fb6092 +CORBA_SHA256SUM = c438607d04e04439ca7df3d911f3cf46ac64066a5b21da98bea8070f98abdafe +JAXP_SHA256SUM = fca2c95b3e60533a937e4f8d497a2934382d9f1f95cde874d926f3b4841407ce +JAXWS_SHA256SUM = c6ca4f98b35acdb24a81721de0bee2686bb83917bd84b108775e586c5ae81136 +JDK_SHA256SUM = 2a8afd9ecb53e255e436885e6fe3e9882e8657c70482a90ef39aa33e024e79b0 +LANGTOOLS_SHA256SUM = 44d8bc14b213b7c218465a8859bd551feb6805857077ca6aa68aaa4c1b10b676 +OPENJDK_SHA256SUM = 704bdd40bc328183384272ee282310d8fc3216f3051e504141e7660fe50185a0 CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-2.3.6/Makefile.in new/icedtea-2.3.7/Makefile.in --- old/icedtea-2.3.6/Makefile.in 2013-02-12 14:23:58.000000000 +0100 +++ new/icedtea-2.3.7/Makefile.in 2013-02-20 07:17:55.000000000 +0100 @@ -481,20 +481,20 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ OPENJDK_VERSION = b20 -JDK_UPDATE_VERSION = 13 +JDK_UPDATE_VERSION = 15 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = 97a8b625f6e9 -JAXP_CHANGESET = d7feafb8427b -JAXWS_CHANGESET = b900024eb4ba -JDK_CHANGESET = 6bb01322bb5a -LANGTOOLS_CHANGESET = e0739a8783d1 -OPENJDK_CHANGESET = dd8d1a8f222f -CORBA_SHA256SUM = 511f9517374babed86f9d3d60d06f0fb7614cff14431a4eb678967b6f1358b1d -JAXP_SHA256SUM = 81f30228dfab5669b114841a0b797c6529a5e37ca52eb97c7f9bbfd29aae9941 -JAXWS_SHA256SUM = 276fcc2f7609dd5a9346f9faa317331e722c9c015fa19c61a1228d86cf231bc2 -JDK_SHA256SUM = a2d4557222eb72b9f1ecf6cfd19c73eb0a02e2f9755eacacabb4c43c682095e2 -LANGTOOLS_SHA256SUM = 85170ef7a68ef8e2895edffd9a4209f78b43887e8c782bebfe14997d06619bdb -OPENJDK_SHA256SUM = a360299dd869d612b77a016967678716cb03dfddd0f484944a1619fda5fb6092 +CORBA_CHANGESET = 82e58144c3fb +JAXP_CHANGESET = 1d46a56eb51c +JAXWS_CHANGESET = b9590aa972b9 +JDK_CHANGESET = 6a3417030605 +LANGTOOLS_CHANGESET = b5006c3285c6 +OPENJDK_CHANGESET = 506161df1c48 +CORBA_SHA256SUM = c438607d04e04439ca7df3d911f3cf46ac64066a5b21da98bea8070f98abdafe +JAXP_SHA256SUM = fca2c95b3e60533a937e4f8d497a2934382d9f1f95cde874d926f3b4841407ce +JAXWS_SHA256SUM = c6ca4f98b35acdb24a81721de0bee2686bb83917bd84b108775e586c5ae81136 +JDK_SHA256SUM = 2a8afd9ecb53e255e436885e6fe3e9882e8657c70482a90ef39aa33e024e79b0 +LANGTOOLS_SHA256SUM = 44d8bc14b213b7c218465a8859bd551feb6805857077ca6aa68aaa4c1b10b676 +OPENJDK_SHA256SUM = 704bdd40bc328183384272ee282310d8fc3216f3051e504141e7660fe50185a0 CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 CACAO_BASE_URL = http://icedtea.classpath.org/download/drops/cacao diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-2.3.6/NEWS new/icedtea-2.3.7/NEWS --- old/icedtea-2.3.6/NEWS 2013-02-12 17:56:09.000000000 +0100 +++ new/icedtea-2.3.7/NEWS 2013-02-20 07:17:45.000000000 +0100 @@ -10,6 +10,20 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 2.3.7 (2013-02-20): + +* Security fixes + - S8004937, CVE-2013-1484: Improve proxy construction + - S8006439, CVE-2013-1485: Improve MethodHandles coverage + - S8006446, CVE-2013-1486: Restrict MBeanServer access + - S8006777, CVE-2013-0169: Improve TLS handling of invalid messages + - S8007688: Blacklist known bad certificate +* Backports + - S8007393: Possible race condition after JDK-6664509 + - S8007611: logging behavior in applet changed +* Bug fixes + - PR1303: Support building with giflib 5 + New in release 2.3.6 (2013-02-12): * Security fixes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-2.3.6/configure new/icedtea-2.3.7/configure --- old/icedtea-2.3.6/configure 2013-02-12 14:23:57.000000000 +0100 +++ new/icedtea-2.3.7/configure 2013-02-20 07:17:54.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for icedtea 2.3.6. +# Generated by GNU Autoconf 2.69 for icedtea 2.3.7. # # Report bugs to <[email protected]>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='icedtea' PACKAGE_TARNAME='icedtea' -PACKAGE_VERSION='2.3.6' -PACKAGE_STRING='icedtea 2.3.6' +PACKAGE_VERSION='2.3.7' +PACKAGE_STRING='icedtea 2.3.7' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1683,7 +1683,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures icedtea 2.3.6 to adapt to many kinds of systems. +\`configure' configures icedtea 2.3.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1753,7 +1753,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of icedtea 2.3.6:";; + short | recursive ) echo "Configuration of icedtea 2.3.7:";; esac cat <<\_ACEOF @@ -1995,7 +1995,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -icedtea configure 2.3.6 +icedtea configure 2.3.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2631,7 +2631,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by icedtea $as_me 2.3.6, which was +It was created by icedtea $as_me 2.3.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3455,7 +3455,7 @@ # Define the identity of the package. PACKAGE='icedtea' - VERSION='2.3.6' + VERSION='2.3.7' cat >>confdefs.h <<_ACEOF @@ -15361,7 +15361,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by icedtea $as_me 2.3.6, which was +This file was extended by icedtea $as_me 2.3.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15418,7 +15418,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -icedtea config.status 2.3.6 +icedtea config.status 2.3.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-2.3.6/configure.ac new/icedtea-2.3.7/configure.ac --- old/icedtea-2.3.6/configure.ac 2013-02-12 14:23:44.000000000 +0100 +++ new/icedtea-2.3.7/configure.ac 2013-02-20 07:17:45.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.3.6], [[email protected]]) +AC_INIT([icedtea], [2.3.7], [[email protected]]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-2.3.6/hotspot.map new/icedtea-2.3.7/hotspot.map --- old/icedtea-2.3.6/hotspot.map 2013-02-12 14:23:44.000000000 +0100 +++ new/icedtea-2.3.7/hotspot.map 2013-02-20 07:17:45.000000000 +0100 @@ -1,3 +1,3 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot bc0de5a0ece2 4b571c99b9dfdca6e8456a7d0d47eedb1a8e3c4863322cc853f959b1cb4bc068 +default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 104e2c65892d 203acf2f9737032fe4bb1096e2f81417fa8a92a7016d8220b54a70efd579711a zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot 32569b4d36f4 455be170dcea6edbc9c74f9d67308bb6a1f39dadda0267e7d73ea6af3043f60c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-2.3.6/patches/boot/ecj-stringswitch.patch new/icedtea-2.3.7/patches/boot/ecj-stringswitch.patch --- old/icedtea-2.3.6/patches/boot/ecj-stringswitch.patch 2013-02-12 14:23:44.000000000 +0100 +++ new/icedtea-2.3.7/patches/boot/ecj-stringswitch.patch 2013-02-20 07:17:45.000000000 +0100 @@ -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-01-14 22:25:02.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-01-15 02:08:56.592702486 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-02-17 18:47:55.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-02-20 01:19:23.757194433 +0000 @@ -350,18 +350,15 @@ if (attrCommands != null) { Attribute.Layout lkey = Attribute.keyForLookup(ctype, name); @@ -30,8 +30,8 @@ } // Find canonical instance of the requested attribute. 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-01-14 22:25:02.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-01-15 02:08:56.608702746 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-02-17 18:47:55.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-02-20 01:19:23.757194433 +0000 @@ -73,16 +73,14 @@ { // Non-standard, undocumented "--unpack" switch enables unpack mode. @@ -89,8 +89,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-01-14 22:25:02.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-01-15 02:08:56.608702746 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-02-17 18:47:55.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-02-20 01:19:23.757194433 +0000 @@ -1107,30 +1107,25 @@ // what is one of { Debug, Compile, Constant, Exceptions, InnerClasses } if (verbose > 0) @@ -142,8 +142,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-01-14 22:25:02.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-01-15 02:08:56.612702810 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-02-17 18:47:55.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-02-20 01:19:23.757194433 +0000 @@ -64,17 +64,23 @@ protected NTLM(String version) throws NTLMException { @@ -180,17 +180,22 @@ 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-01-14 22:25:02.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-01-15 02:19:34.315049222 +0000 -@@ -411,104 +411,99 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-02-17 18:47:55.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-02-20 01:35:29.564524781 +0000 +@@ -411,111 +411,106 @@ static boolean isCallerSensitive(MemberName mem) { - assert(mem.isInvocable()); + if (!mem.isInvocable()) return false; // fields are not caller sensitive Class<?> defc = mem.getDeclaringClass(); - switch (mem.getName()) { - case "doPrivileged": +- case "doPrivilegedWithCombiner": + String memName = mem.getName(); -+ if ("doPrivileged".equals(memName)) { ++ if ("doPrivileged".equals(memName) || ++ "doPrivilegedWithCombiner".equals(memName)) { return defc == java.security.AccessController.class; +- case "checkMemberAccess": ++ } else if ("checkMemberAccess".equals(memName)) { + return canBeCalledVirtual(mem, java.lang.SecurityManager.class); - case "getUnsafe": + } else if ("getUnsafe".equals(memName)) { return defc == sun.misc.Unsafe.class; @@ -320,7 +325,7 @@ - break; - case "getContextClassLoader": + } else if ("getContextClassLoader".equals(memName)) { - return defc == java.lang.Thread.class; + return canBeCalledVirtual(mem, java.lang.Thread.class); - case "getPackage": - case "getPackages": + } else if ("getPackage".equals(memName) || @@ -346,11 +351,17 @@ - case "getCallerClassLoader": + } else if ("getCallerClassLoader".equals(memName)) { return defc == java.lang.ClassLoader.class; +- case "registerAsParallelCapable": ++ } else if ("registerAsParallelCapable".equals(memName)) { + return canBeCalledVirtual(mem, java.lang.ClassLoader.class); - case "getProxyClass": - case "newProxyInstance": + } else if ("getProxyClass".equals(memName) || + "newProxyInstance".equals(memName)) { return defc == java.lang.reflect.Proxy.class; +- case "asInterfaceInstance": ++ } else if ("asInterfaceInstance".equals(memName)) { + return defc == java.lang.invoke.MethodHandleProxies.class; - case "getBundle": - case "clearCache": + } else if ("getBundle".equals(memName) || @@ -359,9 +370,9 @@ } 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-01-14 22:25:02.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java 2013-01-15 02:08:56.620702941 +0000 -@@ -219,14 +219,16 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java 2013-02-17 18:47:55.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java 2013-02-20 01:19:23.757194433 +0000 +@@ -268,14 +268,16 @@ private static boolean isObjectMethod(Method m) { @@ -382,7 +393,7 @@ return (m.getReturnType() == boolean.class && m.getParameterTypes().length == 1 && m.getParameterTypes()[0] == Object.class); -@@ -237,12 +239,14 @@ +@@ -286,12 +288,14 @@ private static Object callObjectMethod(Object self, Method m, Object[] args) { assert(isObjectMethod(m)) : m; @@ -402,9 +413,9 @@ } 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-01-14 22:25:02.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-01-15 02:08:56.624703006 +0000 -@@ -117,24 +117,20 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-02-17 18:47:55.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-02-20 01:19:23.757194433 +0000 +@@ -119,24 +119,20 @@ String optStr = (opts.length > 1 && opts[1] != null) ? opts[1].trim() : "all"; @@ -441,8 +452,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-01-14 22:25:02.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2013-01-15 02:08:56.628703070 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2013-02-17 18:47:55.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2013-02-20 01:19:23.757194433 +0000 @@ -378,19 +378,23 @@ GE; // ">=" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
