Hello community, here is the log from the commit of package java-1_7_0-openjdk for openSUSE:Factory checked in at 2013-01-20 07:51:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-12-19 10:59:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes 2013-01-20 07:51:51.000000000 +0100 @@ -1,0 +2,20 @@ +Wed Jan 16 15:50:49 UTC 2013 - [email protected] + +- update to icedtea-2.3.4 (bnc#798324, bnc#798521) +* Security fixes + - S8004933, CVE-2012-3174: Improve MethodHandle interaction with libraries + - S8006017, CVE-2013-0422: Improve lookup resolutions + - S8006125: Update MethodHandles library interactions +* Bug fixes + - S7197906: BlockOffsetArray::power_to_cards_back() needs to handle > 32 bit shifts + - G422525: Fix building with PaX enabled kernels. +- use gpg-offline to check the validity of icedtea tarball + +------------------------------------------------------------------- +Tue Dec 18 12:40:48 UTC 2012 - [email protected] + +- use jamvm on %arm +- use icedtea package name instead of protected openjdk for jamvm builds +- fix armv5 build + +------------------------------------------------------------------- Old: ---- 03f54ef33914.tar.gz 301e79a966b4.tar.gz 5ec94d162f05.tar.gz 9a95d714d136.tar.gz d2d0a106917c.tar.gz ec73c6927fb7.tar.gz f45296ac69be.tar.gz icedtea-2.3.3.tar.gz New: ---- 7182233cc27e.tar.gz 8bd8e70d4a03.tar.gz 946195011b30.tar.gz 96d4f04f2b7c.tar.gz aa3654afea12.tar.gz beecf0b9e760.tar.gz dc9234e25ab0.tar.gz icedtea-2.3.4.tar.gz icedtea-2.3.4.tar.gz.sig java-1_7_0-openjdk.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.FpTcBZ/_old 2013-01-20 07:51:55.000000000 +0100 +++ /var/tmp/diff_new_pack.FpTcBZ/_new 2013-01-20 07:51:55.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package java-1_7_0-openjdk +# spec file for package java-1_7_0 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,11 @@ %endif %endif +%ifarch %arm +%bcond_without jamvm +%else %bcond_with jamvm +%endif # turn zero on non jit arches by default, unless jamvm has been specified %ifnarch %{jit_arches} @@ -53,7 +57,7 @@ # If runtests is 0 test suites will not be run. %define runtests 0 -%define icedtea_version 2.3.3 +%define icedtea_version 2.3.4 %define hg_tag icedtea-{icedtea_version}-branchpoint %define openjdkdate 27_jun_2011 @@ -92,7 +96,11 @@ %define abs2rel %{__perl} -e %{script} # Standard JPackage naming and versioning defines. +%if ! %{with jamvm} %define origin openjdk +%else +%define origin icedtea +%endif %define priority 17147 %define javaver 1.7.0 %define buildver 6 @@ -130,7 +138,7 @@ # real file made by update-ca-certificates %define javacacerts %{_var}/lib/ca-certificates/java-cacerts -Name: java-1_7_0-openjdk +Name: java-1_7_0-%{origin} Version: %{javaver}.%{buildver} Release: 0 Summary: Java runtime environment based on OpenJDK 7 and IcedTea 7 @@ -149,13 +157,13 @@ Source3: mauve-%{mauvedate}.tar.gz Source4: mauve_tests -Source5: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/archive/301e79a966b4.tar.gz -Source6: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba/archive/9a95d714d136.tar.gz -Source7: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp/archive/f45296ac69be.tar.gz -Source8: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws/archive/03f54ef33914.tar.gz -Source9: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk/archive/5ec94d162f05.tar.gz -Source10: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools/archive/ec73c6927fb7.tar.gz -Source11: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot/archive/d2d0a106917c.tar.gz +Source5: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/archive/8bd8e70d4a03.tar.gz +Source6: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba/archive/dc9234e25ab0.tar.gz +Source7: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp/archive/aa3654afea12.tar.gz +Source8: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws/archive/7182233cc27e.tar.gz +Source9: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk/archive/96d4f04f2b7c.tar.gz +Source10: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools/archive/946195011b30.tar.gz +Source11: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot/archive/beecf0b9e760.tar.gz # zero compatible hotspot Source12: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot/archive/a456d0771ba0.tar.gz Source13: http://icedtea.classpath.org/download/drops/jamvm/jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz @@ -164,10 +172,8 @@ # those properties are for opeSUSE only Source1001: fontconfig.SuSE.properties -# not released this time, checked sha256sum according -# http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-October/020571.html -# e5ac5564e00c4a8d7b3376ed6de91b18a2587c8abdad802ccc92c780765b1073 icedtea-2.3.3.tar.gz -#Source2000: icedtea-%{icedtea_version}.tar.gz.sig +Source2000: icedtea-%{icedtea_version}.tar.gz.sig +Source2001: java-1_7_0-openjdk.keyring # RPM/distribution specific patches @@ -262,6 +268,8 @@ #!BuildIgnore: xerces-j2 xml-commons-resolver xml-commons-apis xml-commons BuildRequires: ant BuildRequires: ant-nodeps +#BuildRequires: java-1_7_0-%{origin} +#BuildRequires: java-1_7_0-%{origin}-devel BuildRequires: java-1_7_0-openjdk BuildRequires: java-1_7_0-openjdk-devel BuildRequires: mozilla-nss-devel @@ -330,6 +338,10 @@ BuildRequires: openssl-certs %endif +%if 0%{?suse_version} >= 1230 +BuildRequires: gpg-offline +%endif + Requires: lcms2 Requires: rhino # Require jpackage-utils for ant. @@ -467,10 +479,15 @@ are provided by OpenJDK 7. %prep +%if 0%{?suse_version} >= 1230 +%gpg_verify -p java-1_7_0-openjdk %{SOURCE2000} +%endif + %if %{with jamvm} && %{with zero} -echo "ERROR: use either --with jamvm either--with zero, both are not supported!" >&2 +echo "ERROR: use either --with jamvm either --with zero, both are not supported!" >&2 exit 1 %endif + %setup -q -n icedtea-%{icedtea_version} %setup -q -n icedtea-%{icedtea_version} -T -D -a 3 %setup -q -n icedtea-%{icedtea_version} -T -D -a 1 @@ -988,7 +1005,7 @@ %doc %{buildoutputdir}/j2sdk-image/jre/THIRD_PARTY_README %doc -%dir %{_jvmdir}/java-1.7.0-openjdk +%dir %{_jvmdir}/java-%{javaver}-%{origin} %dir %{_jvmdir}/%{sdkdir} %{_jvmdir}/%{jrelnk} %{_jvmjardir}/%{jrelnk} @@ -1010,6 +1027,12 @@ %attr(775,root,root) %{_jvmdir}/%{sdkdir}/jre/bin/* # jre/lib %attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/*.so +%ifarch %arm +%dir %{_jvmdir}/%{sdkdir}/jre/lib/arm/client +%attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/arm/client/libjsig.so +%attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/arm/client/libjvm.so +%{_jvmdir}/%{sdkdir}/jre/lib/arm/client/Xusage.txt +%endif %ifarch %{ix86} %dir %{_jvmdir}/%{sdkdir}/jre/lib/i386/client %attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/i386/client/libjsig.so ++++++ 03f54ef33914.tar.gz -> 7182233cc27e.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-03f54ef33914/.hgtags new/jaxws-7182233cc27e/.hgtags --- old/jaxws-03f54ef33914/.hgtags 2012-10-16 22:36:37.000000000 +0200 +++ new/jaxws-7182233cc27e/.hgtags 2013-01-14 23:24:58.000000000 +0100 @@ -210,3 +210,4 @@ 410de4b438cf005c78611209ffa0799d89be1e19 icedtea-2.3.1 9a744f20cfc52e19f66956e5d406c23910ed4cb4 icedtea-2.3.2 c89c6ac953e7f30780e74b4bc153fee4dd330179 icedtea-2.3.3 +03f54ef339144764e218c6548c237e06d54d5ac7 icedtea-2.3.4 ++++++ 03f54ef33914.tar.gz -> 8bd8e70d4a03.tar.gz ++++++ ++++ 494053 lines of diff (skipped) ++++++ 301e79a966b4.tar.gz -> 946195011b30.tar.gz ++++++ ++++ 426809 lines of diff (skipped) ++++++ 03f54ef33914.tar.gz -> 96d4f04f2b7c.tar.gz ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/03f54ef33914.tar.gz /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/96d4f04f2b7c.tar.gz differ: char 5, line 1 ++++++ 03f54ef33914.tar.gz -> aa3654afea12.tar.gz ++++++ ++++ 1081150 lines of diff (skipped) ++++++ 03f54ef33914.tar.gz -> beecf0b9e760.tar.gz ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/03f54ef33914.tar.gz /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/beecf0b9e760.tar.gz differ: char 5, line 1 ++++++ 03f54ef33914.tar.gz -> dc9234e25ab0.tar.gz ++++++ ++++ 729214 lines of diff (skipped) ++++++ icedtea-2.3.3.tar.gz -> icedtea-2.3.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-2.3.3/ChangeLog new/icedtea-2.3.4/ChangeLog --- old/icedtea-2.3.3/ChangeLog 2012-10-17 10:20:09.000000000 +0200 +++ new/icedtea-2.3.4/ChangeLog 2013-01-15 10:43:41.000000000 +0100 @@ -1,3 +1,55 @@ +2013-01-15 Andrew John Hughes <[email protected]> + + * NEWS: Mention PaX bug fix from Gentoo, + G422525. + +2013-01-15 Andrew John Hughes <[email protected]> + + * Makefile.am: + (ICEDTEA_PATCHES): Add patch when building + with PaX. + * patches/pax-mark-rmic-java.patch: + PaX mark output directory before running just-built + rmic. + +2013-01-15 Andrew John Hughes <[email protected]> + + * patches/boot/ecj-stringswitch.patch: + Updated to work post-security-patches. + +2013-01-15 Andrew John Hughes <[email protected]> + + * configure.ac: Bump to 2.3.4 proper. + +2013-01-15 Andrew John Hughes <[email protected]> + + * Makefile.am: + (CORBA_CHANGESET): Update to IcedTea7 2.3 forest head; + the tag icedtea-2.3.4. + (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. + * NEWS: List security fixes and set release date. + * hotspot.map: Update default to IcedTea7 2.3.4. + +2012-10-24 Andrew John Hughes <[email protected]> + + * NEWS: Corrected bad CVE number + given by Oracle. + +2012-10-24 Andrew John Hughes <[email protected]> + + * configure.ac: Bump to 2.3.4pre. + * NEWS: Add new release. + 2011-10-17 Andrew John Hughes <[email protected]> * NEWS: Drop S7176337 which is only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-2.3.3/Makefile.am new/icedtea-2.3.4/Makefile.am --- old/icedtea-2.3.3/Makefile.am 2012-10-17 10:20:09.000000000 +0200 +++ new/icedtea-2.3.4/Makefile.am 2013-01-15 10:43:41.000000000 +0100 @@ -4,19 +4,19 @@ JDK_UPDATE_VERSION = 09 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = 9a95d714d136 -JAXP_CHANGESET = f45296ac69be -JAXWS_CHANGESET = 03f54ef33914 -JDK_CHANGESET = 5ec94d162f05 -LANGTOOLS_CHANGESET = ec73c6927fb7 -OPENJDK_CHANGESET = 301e79a966b4 - -CORBA_SHA256SUM = 4ad0ab1e0ab6f1e0402fd5a5f0b388bb33cc2c553df867e4c5e6ca78a4ede9bb -JAXP_SHA256SUM = b088dd5d383f27b2ccd433eebcbf3f73c016b3359abdae2a5575455d56668141 -JAXWS_SHA256SUM = 86dfb4fda79de7459b17b6efac6b8d5d6fd7bb1175b7e4ff22ba2ce4a903c05a -JDK_SHA256SUM = 11a77a35661b2239e73c3fb1318fb6371d0cd7130594d1405df1cb1b17040ea6 -LANGTOOLS_SHA256SUM = c7c67f6805d05c0fa5ddd2a7e406a6adcd0823dd008005563f2b2a88d1f3e6b6 -OPENJDK_SHA256SUM = dce85d9bcc6e213240b6ad49755bf57fc60a515461664890efcce2ed615ca70b +CORBA_CHANGESET = dc9234e25ab0 +JAXP_CHANGESET = aa3654afea12 +JAXWS_CHANGESET = 7182233cc27e +JDK_CHANGESET = 96d4f04f2b7c +LANGTOOLS_CHANGESET = 946195011b30 +OPENJDK_CHANGESET = 8bd8e70d4a03 + +CORBA_SHA256SUM = 911a049e735c1ab0dfa65426ada7a11494d51fec88126d34588b23f06ef7acf8 +JAXP_SHA256SUM = cc9a95c09be36753f9dd5aacd961400deddbdb757f8ea547cd7073f7ab7b87b7 +JAXWS_SHA256SUM = 7e694d90969413972a51ad1202f3c042b1eca92591e43f1f94f4421a6be5c590 +JDK_SHA256SUM = afba9798a4f2407bdf2cd58d0a99d94bb76ae15aec6ad9cfa0375fb255b0032b +LANGTOOLS_SHA256SUM = a9f56fbd58047adc9296800cd9c534375ef052074cd40ebc0da1f7db6ce09144 +OPENJDK_SHA256SUM = 3ea7c4acd4c2f7b91588231427a8685010f8ce7eb0b9610457d6a35bf2afd6bd CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 @@ -296,7 +296,9 @@ endif if WITH_PAX -ICEDTEA_PATCHES += patches/test_gamma.patch +ICEDTEA_PATCHES += \ + patches/test_gamma.patch \ + patches/pax-mark-rmic-java.patch endif ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-2.3.3/Makefile.in new/icedtea-2.3.4/Makefile.in --- old/icedtea-2.3.3/Makefile.in 2012-10-17 10:20:15.000000000 +0200 +++ new/icedtea-2.3.4/Makefile.in 2013-01-15 10:44:02.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -103,7 +103,10 @@ @ENABLE_SYSTEMTAP_TRUE@am__append_12 = patches/systemtap.patch @ENABLE_NSS_TRUE@am__append_13 = patches/nss-config.patch @ENABLE_NSS_FALSE@am__append_14 = patches/nss-not-enabled-config.patch -@WITH_PAX_TRUE@am__append_15 = patches/test_gamma.patch +@WITH_PAX_TRUE@am__append_15 = \ +@WITH_PAX_TRUE@ patches/test_gamma.patch \ +@WITH_PAX_TRUE@ patches/pax-mark-rmic-java.patch + @WITH_PAX_FALSE@am__append_16 = patches/boot/test_gamma.patch @CP39408_JAVAH_TRUE@am__append_17 = patches/boot/pr39408.patch @CP40188_JAVAH_TRUE@am__append_18 = patches/boot/pr40188.patch \ @@ -480,18 +483,18 @@ OPENJDK_VERSION = b30 JDK_UPDATE_VERSION = 09 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = 9a95d714d136 -JAXP_CHANGESET = f45296ac69be -JAXWS_CHANGESET = 03f54ef33914 -JDK_CHANGESET = 5ec94d162f05 -LANGTOOLS_CHANGESET = ec73c6927fb7 -OPENJDK_CHANGESET = 301e79a966b4 -CORBA_SHA256SUM = 4ad0ab1e0ab6f1e0402fd5a5f0b388bb33cc2c553df867e4c5e6ca78a4ede9bb -JAXP_SHA256SUM = b088dd5d383f27b2ccd433eebcbf3f73c016b3359abdae2a5575455d56668141 -JAXWS_SHA256SUM = 86dfb4fda79de7459b17b6efac6b8d5d6fd7bb1175b7e4ff22ba2ce4a903c05a -JDK_SHA256SUM = 11a77a35661b2239e73c3fb1318fb6371d0cd7130594d1405df1cb1b17040ea6 -LANGTOOLS_SHA256SUM = c7c67f6805d05c0fa5ddd2a7e406a6adcd0823dd008005563f2b2a88d1f3e6b6 -OPENJDK_SHA256SUM = dce85d9bcc6e213240b6ad49755bf57fc60a515461664890efcce2ed615ca70b +CORBA_CHANGESET = dc9234e25ab0 +JAXP_CHANGESET = aa3654afea12 +JAXWS_CHANGESET = 7182233cc27e +JDK_CHANGESET = 96d4f04f2b7c +LANGTOOLS_CHANGESET = 946195011b30 +OPENJDK_CHANGESET = 8bd8e70d4a03 +CORBA_SHA256SUM = 911a049e735c1ab0dfa65426ada7a11494d51fec88126d34588b23f06ef7acf8 +JAXP_SHA256SUM = cc9a95c09be36753f9dd5aacd961400deddbdb757f8ea547cd7073f7ab7b87b7 +JAXWS_SHA256SUM = 7e694d90969413972a51ad1202f3c042b1eca92591e43f1f94f4421a6be5c590 +JDK_SHA256SUM = afba9798a4f2407bdf2cd58d0a99d94bb76ae15aec6ad9cfa0375fb255b0032b +LANGTOOLS_SHA256SUM = a9f56fbd58047adc9296800cd9c534375ef052074cd40ebc0da1f7db6ce09144 +OPENJDK_SHA256SUM = 3ea7c4acd4c2f7b91588231427a8685010f8ce7eb0b9610457d6a35bf2afd6bd 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.3/NEWS new/icedtea-2.3.4/NEWS --- old/icedtea-2.3.3/NEWS 2012-10-17 10:20:09.000000000 +0200 +++ new/icedtea-2.3.4/NEWS 2013-01-15 10:43:41.000000000 +0100 @@ -10,6 +10,16 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 2.3.4 (2013-01-15): + +* Security fixes + - S8004933, CVE-2012-3174: Improve MethodHandle interaction with libraries + - S8006017, CVE-2013-0422: Improve lookup resolutions + - S8006125: Update MethodHandles library interactions +* Bug fixes + - S7197906: BlockOffsetArray::power_to_cards_back() needs to handle > 32 bit shifts + - G422525: Fix building with PaX enabled kernels. + New in release 2.3.3 (2012-10-17): * Security fixes @@ -32,7 +42,7 @@ - S7195194, CVE-2012-5084: Better data validation for Swing - S7195549, CVE-2012-5087: Better bean object persistence - S7195917, CVE-2012-5086: XMLDecoder parsing at close-time should be improved - - S7195919, CVE-2012-5979: (sl) ServiceLoader can throw CCE without needing to create instance + - S7195919, CVE-2012-5079: (sl) ServiceLoader can throw CCE without needing to create instance - S7196190, CVE-2012-5088: Improve method of handling MethodHandles - S7198296, CVE-2012-5089: Refactor classloader usage - S7158800: Improve storage of symbol tables diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-2.3.3/aclocal.m4 new/icedtea-2.3.4/aclocal.m4 --- old/icedtea-2.3.3/aclocal.m4 2012-10-17 10:20:13.000000000 +0200 +++ new/icedtea-2.3.4/aclocal.m4 2013-01-15 10:44:00.000000000 +0100 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.12.4 -*- Autoconf -*- +# generated automatically by aclocal 1.12.6 -*- Autoconf -*- # Copyright (C) 1996-2012 Free Software Foundation, Inc. @@ -234,7 +234,7 @@ [am__api_version='1.12' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.12.4], [], +m4_if([$1], [1.12.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -250,7 +250,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.12.4])dnl +[AM_AUTOMAKE_VERSION([1.12.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-2.3.3/config.guess new/icedtea-2.3.4/config.guess --- old/icedtea-2.3.3/config.guess 2012-10-17 10:20:15.000000000 +0200 +++ new/icedtea-2.3.4/config.guess 2013-01-15 10:44:02.000000000 +0100 @@ -2,13 +2,13 @@ # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# 2011, 2012, 2013 Free Software Foundation, Inc. -timestamp='2012-08-14' +timestamp='2012-12-30' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +22,17 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to <[email protected]> and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to [email protected]. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -55,8 +53,8 @@ Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, +2012, 2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -329,7 +327,7 @@ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-2.3.3/config.sub new/icedtea-2.3.4/config.sub --- old/icedtea-2.3.3/config.sub 2012-10-17 10:20:15.000000000 +0200 +++ new/icedtea-2.3.4/config.sub 2013-01-15 10:44:02.000000000 +0100 @@ -2,23 +2,19 @@ # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# 2011, 2012, 2013 Free Software Foundation, Inc. -timestamp='2012-08-18' +timestamp='2013-01-11' -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, see <http://www.gnu.org/licenses/>. @@ -26,11 +22,12 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to <[email protected]>. Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to [email protected]. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -74,8 +71,8 @@ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, +2012, 2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -156,7 +153,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -259,8 +256,10 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx | dvp \ @@ -273,7 +272,7 @@ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -291,6 +290,7 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ @@ -389,7 +389,8 @@ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -407,6 +408,7 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ @@ -788,7 +790,7 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; mingw64) @@ -1041,7 +1043,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1368,7 +1374,7 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1514,9 +1520,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-2.3.3/configure new/icedtea-2.3.4/configure --- old/icedtea-2.3.3/configure 2012-10-17 10:20:14.000000000 +0200 +++ new/icedtea-2.3.4/configure 2013-01-15 10:44:01.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.3. +# Generated by GNU Autoconf 2.69 for icedtea 2.3.4. # # Report bugs to <[email protected]>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='icedtea' PACKAGE_TARNAME='icedtea' -PACKAGE_VERSION='2.3.3' -PACKAGE_STRING='icedtea 2.3.3' +PACKAGE_VERSION='2.3.4' +PACKAGE_STRING='icedtea 2.3.4' 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.3 to adapt to many kinds of systems. +\`configure' configures icedtea 2.3.4 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.3:";; + short | recursive ) echo "Configuration of icedtea 2.3.4:";; 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.3 +icedtea configure 2.3.4 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.3, which was +It was created by icedtea $as_me 2.3.4, 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.3' + VERSION='2.3.4' 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.3, which was +This file was extended by icedtea $as_me 2.3.4, 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.3 +icedtea config.status 2.3.4 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.3/configure.ac new/icedtea-2.3.4/configure.ac --- old/icedtea-2.3.3/configure.ac 2012-10-17 10:20:09.000000000 +0200 +++ new/icedtea-2.3.4/configure.ac 2013-01-15 02:47:57.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.3.3], [[email protected]]) +AC_INIT([icedtea], [2.3.4], [[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.3/hotspot.map new/icedtea-2.3.4/hotspot.map --- old/icedtea-2.3.3/hotspot.map 2012-10-17 10:20:09.000000000 +0200 +++ new/icedtea-2.3.4/hotspot.map 2013-01-15 02:47:58.000000000 +0100 @@ -1,3 +1,3 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot d2d0a106917c 872e9e0c36b9fd93e81ac131e60deadb0afa22aa77447150bb45ede77ee6db8b +default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot beecf0b9e760 de7a5397a83bb7c7be2458809b576133e8a3b75dc62d62d2f2983b97c220dc4f zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot a456d0771ba0 09a64fca0beff0759ef1b461d63ed6a00e43032972781bb3a55e49d8b93f67d0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-2.3.3/patches/boot/ecj-stringswitch.patch new/icedtea-2.3.4/patches/boot/ecj-stringswitch.patch --- old/icedtea-2.3.3/patches/boot/ecj-stringswitch.patch 2012-10-17 10:20:09.000000000 +0200 +++ new/icedtea-2.3.4/patches/boot/ecj-stringswitch.patch 2013-01-15 10:43:41.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 2011-07-27 14:31:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-07-27 14:54:48.369035615 +0100 +--- 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 @@ -350,18 +350,15 @@ if (attrCommands != null) { Attribute.Layout lkey = Attribute.keyForLookup(ctype, name); @@ -30,9 +30,9 @@ } // 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 2011-06-11 00:38:08.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2011-07-27 14:52:45.595028657 +0100 -@@ -71,16 +71,14 @@ +--- 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 +@@ -73,16 +73,14 @@ { // Non-standard, undocumented "--unpack" switch enables unpack mode. String arg0 = av.isEmpty() ? "" : av.get(0); @@ -56,7 +56,7 @@ } // Collect engine properties here: -@@ -180,21 +178,16 @@ +@@ -182,21 +180,16 @@ // Deal with remaining non-engine properties: for (String opt : avProps.keySet()) { String val = avProps.get(opt); @@ -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 2011-07-27 14:31:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2011-07-27 14:52:45.599028722 +0100 +--- 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 @@ -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 2011-04-30 03:28:32.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2011-07-27 14:52:45.603028787 +0100 +--- 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 @@ -64,17 +64,23 @@ protected NTLM(String version) throws NTLMException { @@ -179,132 +179,10 @@ try { fac = SecretKeyFactory.getInstance ("DES"); cipher = Cipher.getInstance ("DES/ECB/NoPadding"); -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 2011-07-12 12:43:47.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java 2011-07-27 14:52:45.607028852 +0100 -@@ -211,14 +211,16 @@ - - private static - boolean isObjectMethod(Method m) { -- switch (m.getName()) { -- case "toString": -+ String name = m.getName(); -+ if ("toString".equals(name)) { - return (m.getReturnType() == String.class - && m.getParameterTypes().length == 0); -- case "hashCode": -+ } -+ if ("hashCode".equals(name)) { - return (m.getReturnType() == int.class - && m.getParameterTypes().length == 0); -- case "equals": -+ } -+ if ("equals".equals(name)) { - return (m.getReturnType() == boolean.class - && m.getParameterTypes().length == 1 - && m.getParameterTypes()[0] == Object.class); -@@ -229,12 +231,14 @@ - private static - Object callObjectMethod(Object self, Method m, Object[] args) { - assert(isObjectMethod(m)) : m; -- switch (m.getName()) { -- case "toString": -+ String name = m.getName(); -+ if ("toString".equals(name)) { - return self.getClass().getName() + "@" + Integer.toHexString(self.hashCode()); -- case "hashCode": -+ } -+ if ("hashCode".equals(name)) { - return System.identityHashCode(self); -- case "equals": -+ } -+ if ("equals".equals(name)) { - return (self == args[0]); - } - 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 2011-06-11 00:38:09.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2011-07-27 14:52:45.603028787 +0100 -@@ -117,24 +117,20 @@ - String optStr = (opts.length > 1 && opts[1] != null) - ? opts[1].trim() - : "all"; -- switch (optStr) { -- case "vm": -+ if ("vm".equals(optStr)) -+ printVmSettings(ostream, initialHeapSize, maxHeapSize, -+ stackSize, isServer); -+ else if ("properties".equals(optStr)) -+ printProperties(ostream); -+ else if ("locale".equals(optStr)) -+ printLocale(ostream); -+ else -+ { - printVmSettings(ostream, initialHeapSize, maxHeapSize, -- stackSize, isServer); -- break; -- case "properties": -+ stackSize, isServer); - printProperties(ostream); -- break; -- case "locale": - printLocale(ostream); -- break; -- default: -- printVmSettings(ostream, initialHeapSize, maxHeapSize, -- stackSize, isServer); -- printProperties(ostream); -- printLocale(ostream); -- break; -- } -+ } - } - - /* -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 2011-04-30 03:28:32.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2011-07-27 14:52:45.607028852 +0100 -@@ -383,19 +383,23 @@ - GE; // ">=" - - static Operator of(String s) { -- switch (s) { -- case "==": -- return EQ; -- case "!=": -- return NE; -- case "<": -- return LT; -- case "<=": -- return LE; -- case ">": -- return GT; -- case ">=": -- return GE; -+ if ("==".equals(s)) { -+ return EQ; -+ } -+ if ("!=".equals(s)) { -+ return NE; -+ } -+ if ("<".equals(s)) { -+ return LT; -+ } -+ if ("<=".equals(s)) { -+ return LE; -+ } -+ if (">".equals(s)) { -+ return GT; -+ } -+ if (">=".equals(s)) { -+ return GE; - } - - throw new IllegalArgumentException( 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 2012-10-17 03:48:53.678554395 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2012-10-17 04:20:20.203700764 +0100 -@@ -411,89 +411,84 @@ +--- 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 @@ static boolean isCallerSensitive(MemberName mem) { assert(mem.isInvocable()); Class<?> defc = mem.getDeclaringClass(); @@ -319,6 +197,35 @@ - case "lookup": + } 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; - case "invoke": + } else if ("invoke".equals(memName)) { return defc == java.lang.reflect.Method.class; @@ -451,3 +358,125 @@ return defc == java.util.ResourceBundle.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-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 @@ + + private static + boolean isObjectMethod(Method m) { +- switch (m.getName()) { +- case "toString": ++ String name = m.getName(); ++ if ("toString".equals(name)) { + return (m.getReturnType() == String.class + && m.getParameterTypes().length == 0); +- case "hashCode": ++ } ++ if ("hashCode".equals(name)) { + return (m.getReturnType() == int.class + && m.getParameterTypes().length == 0); +- case "equals": ++ } ++ if ("equals".equals(name)) { + return (m.getReturnType() == boolean.class + && m.getParameterTypes().length == 1 + && m.getParameterTypes()[0] == Object.class); +@@ -237,12 +239,14 @@ + private static + Object callObjectMethod(Object self, Method m, Object[] args) { + assert(isObjectMethod(m)) : m; +- switch (m.getName()) { +- case "toString": ++ String name = m.getName(); ++ if ("toString".equals(name)) { + return self.getClass().getName() + "@" + Integer.toHexString(self.hashCode()); +- case "hashCode": ++ } ++ if ("hashCode".equals(name)) { + return System.identityHashCode(self); +- case "equals": ++ } ++ if ("equals".equals(name)) { + return (self == args[0]); + } + 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 @@ + String optStr = (opts.length > 1 && opts[1] != null) + ? opts[1].trim() + : "all"; +- switch (optStr) { +- case "vm": ++ if ("vm".equals(optStr)) ++ printVmSettings(ostream, initialHeapSize, maxHeapSize, ++ stackSize, isServer); ++ else if ("properties".equals(optStr)) ++ printProperties(ostream); ++ else if ("locale".equals(optStr)) ++ printLocale(ostream); ++ else ++ { + printVmSettings(ostream, initialHeapSize, maxHeapSize, +- stackSize, isServer); +- break; +- case "properties": ++ stackSize, isServer); + printProperties(ostream); +- break; +- case "locale": + printLocale(ostream); +- break; +- default: +- printVmSettings(ostream, initialHeapSize, maxHeapSize, +- stackSize, isServer); +- printProperties(ostream); +- printLocale(ostream); +- break; +- } ++ } + } + + /* +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 +@@ -378,19 +378,23 @@ + GE; // ">=" + + static Operator of(String s) { +- switch (s) { +- case "==": +- return EQ; +- case "!=": +- return NE; +- case "<": +- return LT; +- case "<=": +- return LE; +- case ">": +- return GT; +- case ">=": +- return GE; ++ if ("==".equals(s)) { ++ return EQ; ++ } ++ if ("!=".equals(s)) { ++ return NE; ++ } ++ if ("<".equals(s)) { ++ return LT; ++ } ++ if ("<=".equals(s)) { ++ return LE; ++ } ++ if (">".equals(s)) { ++ return GT; ++ } ++ if (">=".equals(s)) { ++ return GE; + } + + throw new IllegalArgumentException( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea-2.3.3/patches/pax-mark-rmic-java.patch new/icedtea-2.3.4/patches/pax-mark-rmic-java.patch --- old/icedtea-2.3.3/patches/pax-mark-rmic-java.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/icedtea-2.3.4/patches/pax-mark-rmic-java.patch 2013-01-15 10:43:41.000000000 +0100 @@ -0,0 +1,10 @@ +--- openjdk/jdk/make/com/sun/jmx/Makefile ++++ openjdk/jdk/make/com/sun/jmx/Makefile +@@ -119,6 +119,7 @@ + + $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class + $(prep-target) ++ "$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)" + $(RMIC) -classpath "$(CLASSDESTDIR)" \ + -d $(CLASSDESTDIR) \ + -v1.2 \ ++++++ java-1_7_0-openjdk.keyring ++++++ pub 4096R/248BDC07 2011-09-28 [expires: 2013-10-12] uid Andrew John Hughes <[email protected]> uid Dr Andrew John Hughes <[email protected]> uid Dr Andrew John Hughes <[email protected]> sub 4096R/954E386D 2011-09-28 [expires: 2013-10-12] -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2.0.18 (GNU/Linux) mQINBE6DsxYBEAC1BEaIiSABPHGOv7nVgYhR4i4RtISnDhYcLX2Vyd0IuUDBeUJu D5PBdl/d0Ski/HwXQCaAUa8DLy+eC5llgGGNXGVKU8KMk/sbign0dZonF6uDe36t MfI+w71XCZYD9wXB3Hfjl4XMIEczi71SmuAD/snY1kRm5cFfUzGx3nqqxIR7TIpY smTJwC7jlnaDPgcleQPwyu6IWKlwVnfHgjUqsPz9fxTCAcQiUw/u9teE8B7VD89T VeRv3oqg95QuQV9PkloUbUwOe2XG/4Jvix3+jmqzWzv/luXEOT84BsuiAjpz4mT5 tz3zwaW2umSwSeU0foC+ONhZzVdcajIYkCZZEe3+mNfOFFtoyeUeZkSlcsexUEXC aeEFCoHBqyfquLDMqarKTr/j0vzHPEuQ6N/INf+yhA2IbPVwLEEZ4nMtcwKe9S7y Ucu5nFIPtsK7nO0oKTRNIq48+JgzLyKnYEu9Ld+3xfDynp6pT4zMqbIAFMrxHm89 JeOPZIgPJuKrjHzyfzxANPsdtqcGHAdDXCwk03cagpfkAYUQWCPcMv2uQRiqJIsJ cNomuUV7l8ZuTnw+i+/0ZSNKqE5k5OZvZ+Xf7yMCpc5RB5UdTkt4NR7qmz5d/cMq CoKz9QsU7RuiDDV4jK2HuDIFbXMNto4MRedvJcnpfaZPoWZFWGsvHOBjGQARAQAB tCpBbmRyZXcgSm9obiBIdWdoZXMgPGdudS5hbmRyZXdAcmVkaGF0LmNvbT6JAj0E EwEKACcFAlB4ZpUCGwMFCQPV5skFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQ O5aleCSL3AcAUA//fDurJW5CIBvAtVZXKQLQ6+05FCfEPbIdnpI9kRpah+JdBJuO UC7B2ekbw29/SiVfga34+Dlr+fXAK4MfdhjmINl4xKdGG1HqVWm7D3L8Eu1n5jUg SFvLB1nzfrPaUS11nYhPvpF2/CHfwHc8Fu/5EVWmYjhsx0L1BL2oN72vOEQNxoIa Qb//Kn11qFQEt8HYyqZORpQHJP37ZVfUx7CXznX+ce0YGnzfn2j8i9ImVqmMG/te AWiPDCBz6ZjOzkPTJ354fAPdNj/pDmHL08zSlwaAllEOWlWC6GfiWw/4ajLhHuBR vzaAJmLHW3mQvPPP2raY5mKDawflWNzckwMLEM4DJ6Tdwmjavk8GaPzAnSmpboGj sU9fjL1mSDVkQRkDnmG2Pm4iEBqYALah7q5vaTnLGKSrCQXjDWmzPaNYanZYG4kS 1xesQ8FPLjQbCncZSDd8+D5rwXcT5eHkpyiHObgCCtANdLscJg3s9anz1QgjyWY1 W+EJBeFiHsQ3zlFqMhsWamLHh6k/w02wRREvqv09qX1MaMq+1j3taa20t06XrVoi t65U9X2Xs0uwPP3q292Teau/0P8nu8g/bfyZiKyz227IJ4TECItHdOel5LJm4gK6 5ZAcE2aPcLnpdeOobvkMMyxoFVxifpaVve71EUjIYHVv//q8kx54y9vl6Ii0KkRy IEFuZHJldyBKb2huIEh1Z2hlcyA8YWh1Z2hlc0ByZWRoYXQuY29tPokCPQQTAQoA JwIbAwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAUCUHhmXwUJA9XmyQAKCRA7lqV4 JIvcB8vQD/4pquKiXXdEHmHeazGv7tJGm1haWaXwgj7itEyNYXQhCLptWkMjV0aV iYOmqoW/JJT6+NJDEtTe/x5ehNu5PcxXTFXLcB1eMzH56AUzVM1Lvsm0vLJP8hCy t78yGanEbvUBLUBVG9254xIt6jKgNlx0SyogsDXw+tS/0ROBPRfzc7ZDl40nxeAT HNSZqPrc3yiAzQfJQLy0PB8LKv0Id4XWLh8QXGpa3exBvxq5DBE46gqNwSXHNYzc PLYpscB3cn2XcrZVfd6E9CuIQQZdX0QLAPjZE8MOYrHCknqdXUm5X0P69DKWSqHM fn4uPXEDerNb7/JCfOHpPTaXP7RVO6vNfOZ7ORHibd6eQsjUsJ1s2NZn+Zex9U4E 0Zm0dvFP7RdXJGU0Hq//EulWUD81nANvzEJE1rN+8IGaFz1FPp0yCEG6/kydlp4E yEgHn8E3W9B+N4Y432pKyD5C4lrcxYlUPzZ8lNFnOYTHE0iIgpZFyvpv5ptCAkDP yQlDZHXzbVhk8PBg7PnulUQR8WaqJoQItMqRXgpvjqJbA6mdAV5XuNAuSMFJ2/XB qqcU69b4/6byWwAqd+/LLR8gNVkOk7572ubnK34gDLCTO4yq8fpQTdLmoElbRUle RqFf3DN0uW9kamejINl+deTb7Y91QfyB1X8N3mh4okxWDMBMVe/Df7QxRHIgQW5k cmV3IEpvaG4gSHVnaGVzIDxnbnVfYW5kcmV3QG1lbWJlci5mc2Yub3JnPokCPQQT AQoAJwIbAwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAUCUHhmaQUJA9XmyQAKCRA7 lqV4JIvcBzV6D/wLaRYjbitzsrq7AaeCPEJy6Llp6n/9pKNrRm5AB1HJ7uAQkakk 93O3D+eVRiSC1IgLIOVhRg1xj2V051oAI7Gf1cjZbg+GbfWTGOUXAsrtOYe/PQlr G6HB/frPLipN+D+kFMdhqrGGHi5Pa9VNepUxaKDwJ7UcYsSSvATcQbr110aYtIZx SLLOMnVxpMTddOz5PPXYyP7ioWScJVRmniXEj1CwGxt37eiLvH0R3mGsCtTKr1rA Nt4lriu4sElFwuKJPmMpFIsZqv/ePmHQrlEPQAlDhzAqmWzGyPG6ZhLr4hLU4KUU Vi9jtTbsmVlVAwb4YM8CNp98rR0YTZ7mOM3zHvadyV2kiMtED9qfihMTHYEpdnVd EpaekmnG4SyOQ7bDyvO2NEfhWyRajnQyBRedmRaySwvjoLFxbGSBs9GX+LRycDsg +YaeeD8D/m3kk6EuUUNJcKeSr6XFsQryN3fBmhunBeRSZYAUNQlB5NVG0jeh8Mij CmUBZp5uTsJ3Kmaf5ZFFhc4U82ua3tIUzZED3QrnumynqdCunmCnIHvlFZzEx9U6 PntLA/JPmN+fE49DGv1jrcOVTa6yL9otuukG8t8edZ1UbeVJdIPDjnJfHB60p4yf OelJHC8V3EcfybtRn5gTnzDoJti8GWw3L2j7hyFsg6rXFQkTcd63oT0wArkCDQRO g7SJARAAnEmBK66XwkDrxuOsLhH003qWOEyqtnRYTTYq2NsBGICOD1lF4RmoBnx3 F07r3EP5AQ7KEQEF0iZ1UMFvSWQ6VkUfL6ZqQEEQX9zgXAsy7SH2vZs0ngC2yr05 hYjH9S8/53gY5TkOILaqBlxIrOju9RAApqiWeeLKQ9qU+7bhWSqcHAWcmEDw0BL6 V1GR8FR+vjfBtzcLWzCuMLI0AdDKtYT2bnIHHYo9MbkTLL1jWqd83KyHoNKjFcRZ 2IeqTQB6YYD5oCfDnsWPSO9DgiJ58dssqhZ2oxbvJSfYXW06to2xZm7n/7xZr3mC YayG2m5QByjP7E2c7Bd+PN+iZGlIWUSkrLbNzHXzjAyN883avBPtUmYUOiH1EHDp yoQDsumLXHKrFUtHmTC8vkkEDTvF1UPNAqEd4yKLM/mmXw7T+gkjp1Aw6xA/77gu et10OIKGEQxmgjbWFrITEdurtYfhV8XQdMMOIYXZl//R88sK6A3Bc+IIWLSzsCqa SBEfkH0fRiuhYANlB6+6wY1enbdz14wwJWbxAZZ22dk6SOpG1v+qQC7XKKan7bzU Ekn/OWDRr2fjRnaujwqr9aQ/HWcK9ohdGS+fkqa3GGKEwBe/7j1Cpvr4q7iGwVPU 4qkdJmcCyC1VfP5N1FomxvxbYlmxWxIJ2FBh6ICoyq09l/znC9MAEQEAAYkCJQQY AQoADwIbDAUCUHhmfwUJA9XldgAKCRA7lqV4JIvcBzeMEACsDFKAubbpkUrkwJCc t9VEIljm95LMwippsxg96BGXwQSbD8FA5hmWRwSaxnBBmsFqSo+vd1tHVs5lpFkp p1KXCViTlryj1WbYMnhP0ezwg4lkC2J/U+knSQcGclcSFoyZOs+o6cxJGkSXRjf7 3WlfFGUin1y+MeexVmyZ9sciu1AAsqz4pwPNf1G/A3iu+KAt52xfwNuUdtXK/cFJ 5WHmrx3JK8A9Yt4mkQAgDKvERluw/Y+OyIg/6rd+K2JWCc+DvNWvYn8jm9dYpK21 aVt+Mz/K2fkOwrZjDz4g4K/vbjNEsOPCUMuUTWiocUrn61/5AoRrEcX6AJSyFdVh jd7B9ygY+EhrRygdo7IjKZj4Tq478vXXb1JzOk7rdklJcK18LVb9C+IXlcRCoUQ/ vknn6RmvwvJ9irJnStppYRks/IVEOKUdHfsv7QVTRnLVqydKsF+KJ4DeRBX0atgs A6FIOD4zjTuGgcbhDlW3FHdVfZqJbcL4ejWAW+ZKmdzgQUYVSoF+TjiS+J4q3IVz K4M3RVNnSDM01eSB+WLGVrH+h6zSIb5Q0OCPFUSahQHGlgUxp1UvRfXuhN9AfgyW 2qPQCYenuyTYXl2xVgQMa8G6Sr3E6cJ4zaCtUHT2JLLusGKjeEMc10kgs4eiEk2x JLGXasD0ex7Eg+JtenBjCyxa9A== =GBrO -----END PGP PUBLIC KEY BLOCK----- -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
