Hello community, here is the log from the commit of package java-1_7_0-openjdk for openSUSE:Factory checked in at 2016-01-28 22:49:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-bootstrap.changes 2015-10-28 17:15:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk-bootstrap.changes 2016-01-28 22:49:37.000000000 +0100 @@ -1,0 +2,67 @@ +Fri Jan 22 10:41:45 UTC 2016 - fstrba@suse.com + +- Update to 2.6.4 - OpenJDK 7u95 (bsc#962743) + * Security fixes + - S8059054, CVE-2016-0402: Better URL processing + - S8130710, CVE-2016-0448: Better attributes processing + - S8132210: Reinforce JMX collector internals + - S8132988: Better printing dialogues + - S8133962, CVE-2016-0466: More general limits + - S8137060: JMX memory management improvements + - S8139012: Better font substitutions + - S8139017, CVE-2016-0483: More stable image decoding + - S8140543, CVE-2016-0494: Arrange font actions + - S8143185: Cleanup for handling proxies + - S8143941, CVE-2015-8126, CVE-2015-8472: Update splashscreen + displays + - S8144773, CVE-2015-7575: Further reduce use of MD5 (SLOTH) + - S8142882, CVE-2015-4871: rebinding of the receiver of a + DirectMethodHandle may allow a protected method to be accessed + * Import of OpenJDK 7 u95 build 0 + - S7167988: PKIX CertPathBuilder in reverse mode doesn't work if + more than one trust anchor is specified + - S8068761: [TEST_BUG] java/nio/channels/ServerSocketChannel/AdaptServerSocket.java + failed with SocketTimeoutException + - S8074068: Cleanup in src/share/classes/sun/security/x509/ + - S8075773: jps running as root fails after the fix of JDK-8050807 + - S8081297: SSL Problem with Tomcat + - S8131181: Increment minor version of HSx for 7u95 and + initialize the build number + - S8132082: Let OracleUcrypto accept RSAPrivateKey + - S8134605: Partial rework of the fix for 8081297 + - S8134861: XSLT: Extension func call cause exception if + namespace URI contains partial package name + - S8135307: CompletionFailure thrown when calling FieldDoc.type, + if the field's type is missing + - S8138716: (tz) Support tzdata2015g + - S8140244: Port fix of JDK-8075773 to MacOSX + - S8141213: [Parfait]Potentially blocking function + GetArrayLength called in JNI critical region at line 239 of + jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c in + function GET_ARRAYS + - S8141287: Add MD5 to jdk.certpath.disabledAlgorithms - Take 2 + - S8142928: [TEST_BUG] sun/security/provider/certpath/ReverseBuilder/ReverseBuild.java + 8u71 failure + - S8143132: L10n resource file translation update + - S8144955: Wrong changes were pushed with 8143942 + - S8145551: Test failed with Crash for Improved font lookups + - S8147466: Add -fno-strict-overflow to + IndicRearrangementProcessor{,2}.cpp + * Backports + - S8140244: Port fix of JDK-8075773 to AIX + - S8133196, PR2712, RH1251935: HTTPS hostname invalid issue with + InetAddress + - S8140620, PR2710: Find and load default.sf2 as the default + soundbank on Linux +- Update the java-1_7_0-openjdk.keyring file to include both keys + of Andrew John Hughes of icedtea fame. +- Rename the keyring file and disable it in the spec file until + the key servers can handle those keys. + +------------------------------------------------------------------- +Mon Jan 18 08:52:48 UTC 2016 - fstrba@suse.com + +- Move libjavagtk to the full package as not to polute the headless + with X dependencies (bsc#939523). + +------------------------------------------------------------------- java-1_7_0-openjdk.changes: same change Old: ---- icedtea-2.6.2.tar.xz icedtea-2.6.2.tar.xz.sig java-1_7_0-openjdk.keyring New: ---- icedtea-2.6.4.tar.xz icedtea-2.6.4.tar.xz.sig java-1_7_0-openjdk.keyring.renamed ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.cCuldY/_old 2016-01-28 22:49:41.000000000 +0100 +++ /var/tmp/diff_new_pack.cCuldY/_new 2016-01-28 22:49:41.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package java-1_7_0-openjdk-bootstrap # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %{!?aarch64:%global aarch64 aarch64 arm64 armv8} %global jit_arches %ix86 x86_64 ppc64 ppc64le %arm %aarch64 %global test_arches %ix86 x86_64 ppc64 ppc64le -%global icedtea_version 2.6.2 +%global icedtea_version 2.6.4 %global icedtea_sound_version 1.0.1 %global mauvedate 2008-10-22 %global buildoutputdir openjdk.build/ @@ -31,7 +31,7 @@ # Standard JPackage naming and versioning defines. %global priority 1705 %global javaver 1.7.0 -%global buildver 91 +%global buildver 95 # Standard JPackage directories and symbolic links. %global sdklnk java-%{javaver}-openjdk %global archname %{sdklnk} @@ -170,9 +170,12 @@ Source11: http://icedtea.classpath.org/download/drops/icedtea7/%{icedtea_version}/hotspot.tar.bz2 # those properties are for opeSUSE only Source1001: fontconfig.SUSE.properties +# Unfortunately, upstream changed the signing key for icedtea packages and +# the key servers are unable to handle it correctly. Disabling it until times +# are better. Source2000: http://icedtea.classpath.org/download/source/icedtea-%{icedtea_version}.tar.xz.sig Source2001: http://icedtea.classpath.org/download/source/icedtea-sound-%{icedtea_sound_version}.tar.xz.sig -Source2002: java-1_7_0-openjdk.keyring +Source2002: java-1_7_0-openjdk.keyring.renamed Source2500: pre_checkin.sh # RPM/distribution specific patches # Remove the use of __DATE__ and __TIME__ in order to diminish unnecessary rebuilds @@ -1105,6 +1108,7 @@ %endif %attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libsplashscreen.so %attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt/libmawt.so +%attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libjavagtk.so %files headless %defattr(0644,root,root,0755) @@ -1141,14 +1145,16 @@ %attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/*.so #belongs to accessibility %exclude %{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so + #belongs to full package %exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libjsoundalsa.so - %if %{with_pulseaudio} %exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libicedtea-sound.so %exclude %{_jvmdir}/%{sdkdir}/jre/lib/pulseaudio.properties %endif %exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libsplashscreen.so +%exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt/libmawt.so +%exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libjavagtk.so %ifarch %ix86 %dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client @@ -1160,8 +1166,7 @@ %attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/headless/libmawt.so %attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/libjvm.* %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/libjsig.so -#belongs to full package -%exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt/libmawt.so + %config(noreplace) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/jvm.cfg %if ! %{with zero} ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.cCuldY/_old 2016-01-28 22:49:41.000000000 +0100 +++ /var/tmp/diff_new_pack.cCuldY/_new 2016-01-28 22:49:41.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package java-1_7_0-openjdk # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %{!?aarch64:%global aarch64 aarch64 arm64 armv8} %global jit_arches %ix86 x86_64 ppc64 ppc64le %arm %aarch64 %global test_arches %ix86 x86_64 ppc64 ppc64le -%global icedtea_version 2.6.2 +%global icedtea_version 2.6.4 %global icedtea_sound_version 1.0.1 %global mauvedate 2008-10-22 %global buildoutputdir openjdk.build/ @@ -31,7 +31,7 @@ # Standard JPackage naming and versioning defines. %global priority 1705 %global javaver 1.7.0 -%global buildver 91 +%global buildver 95 # Standard JPackage directories and symbolic links. %global sdklnk java-%{javaver}-openjdk %global archname %{sdklnk} @@ -170,9 +170,12 @@ Source11: http://icedtea.classpath.org/download/drops/icedtea7/%{icedtea_version}/hotspot.tar.bz2 # those properties are for opeSUSE only Source1001: fontconfig.SUSE.properties +# Unfortunately, upstream changed the signing key for icedtea packages and +# the key servers are unable to handle it correctly. Disabling it until times +# are better. Source2000: http://icedtea.classpath.org/download/source/icedtea-%{icedtea_version}.tar.xz.sig Source2001: http://icedtea.classpath.org/download/source/icedtea-sound-%{icedtea_sound_version}.tar.xz.sig -Source2002: java-1_7_0-openjdk.keyring +Source2002: java-1_7_0-openjdk.keyring.renamed Source2500: pre_checkin.sh # RPM/distribution specific patches # Remove the use of __DATE__ and __TIME__ in order to diminish unnecessary rebuilds @@ -1105,6 +1108,7 @@ %endif %attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libsplashscreen.so %attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt/libmawt.so +%attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libjavagtk.so %files headless %defattr(0644,root,root,0755) @@ -1141,14 +1145,16 @@ %attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/*.so #belongs to accessibility %exclude %{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so + #belongs to full package %exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libjsoundalsa.so - %if %{with_pulseaudio} %exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libicedtea-sound.so %exclude %{_jvmdir}/%{sdkdir}/jre/lib/pulseaudio.properties %endif %exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libsplashscreen.so +%exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt/libmawt.so +%exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libjavagtk.so %ifarch %ix86 %dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client @@ -1160,8 +1166,7 @@ %attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/headless/libmawt.so %attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/libjvm.* %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/libjsig.so -#belongs to full package -%exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt/libmawt.so + %config(noreplace) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/jvm.cfg %if ! %{with zero} ++++++ corba.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-a4d55c5cec23/.hgtags new/corba-2135da66cc53/.hgtags --- old/corba-a4d55c5cec23/.hgtags 2015-10-21 04:15:30.000000000 +0200 +++ new/corba-2135da66cc53/.hgtags 2016-01-18 16:52:10.000000000 +0100 @@ -646,3 +646,7 @@ 0445c54dcfb6cd523525a07eec0f2b26c43eb3c4 icedtea-2.6.2pre02 f9630ed441a06612f61a88bd3da39075015213a7 jdk7u91-b00 34be12b4b6ea5f30d364a916a92effeafdce678d jdk7u91-b01 +a4d55c5cec23631523672ca8b27767ec882eb835 icedtea-2.6.2 +e3a6331d136ecac575730b498501f5b0dc4302e2 jdk7u91-b02 +9a3ca529125ad02ef3b0afd3c2f8fa6f80e0e46f icedtea-2.6.3 +96b735f85c61ad721113713551271106a5070742 jdk7u95-b00 ++++++ hotspot.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/hotspot.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/hotspot.tar.bz2 differ: char 11, line 1 ++++++ icedtea-2.6.2.tar.xz -> icedtea-2.6.4.tar.xz ++++++ ++++ 5161 lines of diff (skipped) ++++++ java-1_7_0-openjdk.keyring.renamed ++++++ pub rsa4096/248BDC07 2011-09-28 [expires: 2017-10-08] uid [ unknown] Dr Andrew John Hughes <gnu_andrew@member.fsf.org> uid [ unknown] Andrew John Hughes <gnu.andrew@redhat.com> uid [ unknown] Dr Andrew John Hughes <ahughes@redhat.com> sub rsa4096/954E386D 2011-09-28 [expires: 2017-10-08] pub rsa4096/66484681 2012-01-18 [expires: 2017-01-16] uid [ unknown] Omair Majid <omajid@redhat.com> sub rsa4096/7CC8AAC6 2012-01-18 [expires: 2017-01-16] pub ed25519/35964222 2015-01-05 [expires: 2016-11-24] uid [ unknown] Andrew John Hughes <gnu.andrew@redhat.com> uid [ unknown] Andrew John Hughes (ECC Key) <gnu_andrew@member.fsf.org> -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2 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 Z5j2pc+dCQ== =/e2U -----END PGP PUBLIC KEY BLOCK----- ++++++ jaxp.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-f1202fb27695/.hgtags new/jaxp-bc6edb6c12a7/.hgtags --- old/jaxp-f1202fb27695/.hgtags 2015-10-21 04:15:31.000000000 +0200 +++ new/jaxp-bc6edb6c12a7/.hgtags 2016-01-18 16:52:13.000000000 +0100 @@ -647,3 +647,7 @@ 4e264c1f6b2f335e0068608e9ec4c312cddde7a4 icedtea-2.6.2pre02 e95e9042c8f31c5fe3149afdbe114592a3e32e91 jdk7u91-b00 9f5bcd95c8d54f8cf5ab922b0b9e94f7ea6cdeb8 jdk7u91-b01 +f1202fb276950491aa1ed30e214351d235c94920 icedtea-2.6.2 +6d9a192976332443bb3be46d49d5b255d9781fe9 jdk7u91-b02 +f7bf82fcbd098bc520ceb92f97890ee6f7da3506 icedtea-2.6.3 +7c422316234f10b327fdbc181aedd5e74f31fd38 jdk7u95-b00 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-f1202fb27695/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java new/jaxp-bc6edb6c12a7/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java --- old/jaxp-f1202fb27695/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java 2015-10-21 04:15:31.000000000 +0200 +++ new/jaxp-bc6edb6c12a7/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java 2016-01-18 16:52:13.000000000 +0100 @@ -1362,7 +1362,7 @@ { "optionE", " [-E (Entit\u00E4tsreferenzen nicht einblenden)]"}, { "optionV", " [-E (Entit\u00E4tsreferenzen nicht einblenden)]"}, { "optionQC", " [-QC (Stille Musterkonfliktwarnungen)]"}, - { "optionQ", " [-Q (Stiller Modus)]"}, + { "optionQ", " [-Q (Silent-Modus)]"}, { "optionLF", " [-LF (Nur Zeilenvorsch\u00FCbe bei Ausgabe verwenden {Standard ist CR/LF})]"}, { "optionCR", " [-CR (Nur Zeilenschaltungen bei Ausgabe verwenden {Standard ist CR/LF})]"}, { "optionESCAPE", " [-ESCAPE (Escapezeichen {Standard ist <>&\"'\r\n}]"}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-f1202fb27695/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java new/jaxp-bc6edb6c12a7/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java --- old/jaxp-f1202fb27695/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java 2015-10-21 04:15:31.000000000 +0200 +++ new/jaxp-bc6edb6c12a7/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java 2016-01-18 16:52:13.000000000 +0100 @@ -1213,7 +1213,7 @@ "Le nom de fonction ne peut pas \u00EAtre NULL."}, { ER_XPATH_RESOLVER_NEGATIVE_ARITY, - "Le nombre d'arguments ne peut pas \u00EAtre n\u00E9gatif."}, + "L'arit\u00E9 ne peut pas \u00EAtre n\u00E9gative."}, // Warnings... { WG_FOUND_CURLYBRACE, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-f1202fb27695/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java new/jaxp-bc6edb6c12a7/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java --- old/jaxp-f1202fb27695/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2015-10-21 04:15:31.000000000 +0200 +++ new/jaxp-bc6edb6c12a7/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2016-01-18 16:52:13.000000000 +0100 @@ -932,9 +932,9 @@ //Check if FSP and SM - only then proceed with loading if (namespace != null && isSecureProcessing && isExtensionFunctionEnabled - && (namespace.equals(JAVA_EXT_XALAN) - || namespace.equals(JAVA_EXT_XSLTC) - || namespace.equals(JAVA_EXT_XALAN_OLD) + && (namespace.startsWith(JAVA_EXT_XALAN) + || namespace.startsWith(JAVA_EXT_XSLTC) + || namespace.startsWith(JAVA_EXT_XALAN_OLD) || namespace.startsWith(XALAN_CLASSPACKAGE_NAMESPACE))) { _clazz = getXSLTC().loadExternalFunction(_className); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-f1202fb27695/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java new/jaxp-bc6edb6c12a7/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java --- old/jaxp-f1202fb27695/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java 2015-10-21 04:15:31.000000000 +0200 +++ new/jaxp-bc6edb6c12a7/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java 2016-01-18 16:52:13.000000000 +0100 @@ -332,7 +332,7 @@ new Object[]{entityName}); } } - fEntityManager.startEntity(false, entityName, true); + fEntityManager.startEntity(true, entityName, true); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-f1202fb27695/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java new/jaxp-bc6edb6c12a7/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java --- old/jaxp-f1202fb27695/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java 2015-10-21 04:15:31.000000000 +0200 +++ new/jaxp-bc6edb6c12a7/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java 2016-01-18 16:52:13.000000000 +0100 @@ -905,7 +905,7 @@ } int length = fCurrentEntity.position - offset; fCurrentEntity.columnNumber += length - newlines; - if (fCurrentEntity.reference) { + if (fCurrentEntity.isGE) { checkLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fCurrentEntity, offset, length); } content.setValues(fCurrentEntity.ch, offset, length); @@ -1052,6 +1052,9 @@ } int length = fCurrentEntity.position - offset; fCurrentEntity.columnNumber += length - newlines; + if (fCurrentEntity.isGE) { + checkLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fCurrentEntity, offset, length); + } content.setValues(fCurrentEntity.ch, offset, length); // return next character diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-f1202fb27695/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java new/jaxp-bc6edb6c12a7/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java --- old/jaxp-f1202fb27695/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java 2015-10-21 04:15:31.000000000 +0200 +++ new/jaxp-bc6edb6c12a7/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java 2016-01-18 16:52:13.000000000 +0100 @@ -1105,7 +1105,7 @@ /** * Starts a named entity. * - * @param reference flag to indicate whether the entity is an Entity Reference. + * @param isGE flag to indicate whether the entity is a General Entity * @param entityName The name of the entity to start. * @param literal True if this entity is started within a literal * value. @@ -1113,7 +1113,7 @@ * @throws IOException Thrown on i/o error. * @throws XNIException Thrown by entity handler to signal an error. */ - public void startEntity(boolean reference, String entityName, boolean literal) + public void startEntity(boolean isGE, String entityName, boolean literal) throws IOException, XNIException { // was entity declared? @@ -1237,7 +1237,7 @@ } // start the entity - startEntity(reference, entityName, xmlInputSource, literal, external); + startEntity(isGE, entityName, xmlInputSource, literal, external); } // startEntity(String,boolean) @@ -1286,7 +1286,7 @@ * This method can be used to insert an application defined XML * entity stream into the parsing stream. * - * @param reference flag to indicate whether the entity is an Entity Reference. + * @param isGE flag to indicate whether the entity is a General Entity * @param name The name of the entity. * @param xmlInputSource The input source of the entity. * @param literal True if this entity is started within a @@ -1296,12 +1296,12 @@ * @throws IOException Thrown on i/o error. * @throws XNIException Thrown by entity handler to signal an error. */ - public void startEntity(boolean reference, String name, + public void startEntity(boolean isGE, String name, XMLInputSource xmlInputSource, boolean literal, boolean isExternal) throws IOException, XNIException { - String encoding = setupCurrentEntity(reference, name, xmlInputSource, literal, isExternal); + String encoding = setupCurrentEntity(isGE, name, xmlInputSource, literal, isExternal); //when entity expansion limit is set by the Application, we need to //check for the entity expansion limit set by the parser, if number of entity diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-f1202fb27695/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java new/jaxp-bc6edb6c12a7/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java --- old/jaxp-f1202fb27695/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java 2015-10-21 04:15:31.000000000 +0200 +++ new/jaxp-bc6edb6c12a7/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java 2016-01-18 16:52:13.000000000 +0100 @@ -1038,7 +1038,7 @@ } int length = fCurrentEntity.position - offset; fCurrentEntity.columnNumber += length - newlines; - if (fCurrentEntity.reference) { + if (fCurrentEntity.isGE) { checkLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fCurrentEntity, offset, length); } @@ -1215,6 +1215,9 @@ } int length = fCurrentEntity.position - offset; fCurrentEntity.columnNumber += length - newlines; + if (fCurrentEntity.isGE) { + checkLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fCurrentEntity, offset, length); + } content.setValues(fCurrentEntity.ch, offset, length); // return next character diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-f1202fb27695/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java new/jaxp-bc6edb6c12a7/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java --- old/jaxp-f1202fb27695/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java 2015-10-21 04:15:31.000000000 +0200 +++ new/jaxp-bc6edb6c12a7/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java 2016-01-18 16:52:13.000000000 +0100 @@ -947,7 +947,7 @@ new Object[]{entityName}); } } - fEntityManager.startEntity(false, entityName, true); + fEntityManager.startEntity(true, entityName, true); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxp-f1202fb27695/src/com/sun/xml/internal/stream/Entity.java new/jaxp-bc6edb6c12a7/src/com/sun/xml/internal/stream/Entity.java --- old/jaxp-f1202fb27695/src/com/sun/xml/internal/stream/Entity.java 2015-10-21 04:15:31.000000000 +0200 +++ new/jaxp-bc6edb6c12a7/src/com/sun/xml/internal/stream/Entity.java 2016-01-18 16:52:13.000000000 +0100 @@ -344,8 +344,8 @@ // to know that prolog is read public boolean xmlDeclChunkRead = false; - // flag to indicate whether the Entity is an Entity Reference - public boolean reference = false; + // flag to indicate whether the Entity is a General Entity + public boolean isGE = false; /** returns the name of the current encoding * @return current encoding name @@ -391,11 +391,11 @@ // /** Constructs a scanned entity. */ - public ScannedEntity(boolean reference, String name, + public ScannedEntity(boolean isGE, String name, XMLResourceIdentifier entityLocation, InputStream stream, Reader reader, String encoding, boolean literal, boolean mayReadChunks, boolean isExternal) { - this.reference = reference; + this.isGE = isGE; this.name = name ; this.entityLocation = entityLocation; this.stream = stream; ++++++ jaxws.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-14c411b1183c/.hgtags new/jaxws-271b555de438/.hgtags --- old/jaxws-14c411b1183c/.hgtags 2015-10-21 04:15:31.000000000 +0200 +++ new/jaxws-271b555de438/.hgtags 2016-01-18 16:52:15.000000000 +0100 @@ -646,3 +646,7 @@ e8660c5ef3e5cce19f4459009e69270c52629312 icedtea-2.6.2pre02 8206da0912d36f48b023f983c0a3bd9235c33c12 jdk7u91-b00 3862008078f83ca7f7c669b1b9d1f0f2e256aad8 jdk7u91-b01 +14c411b1183cb5ef628c39cecae460a86357d24b icedtea-2.6.2 +2230b8f8e03a8eaefc83acb577f30c4de88c45a7 jdk7u91-b02 +39ef53b9c4030cde1ced8232f94b143968f4d22e icedtea-2.6.3 +3427b35ce5a1a0143b4aedf3f5e0a1953ad7fd7f jdk7u95-b00 ++++++ jdk.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/jdk.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/jdk.tar.bz2 differ: char 11, line 1 ++++++ langtools.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-73356b81c5c7/.hgtags new/langtools-fd0a34cb97b4/.hgtags --- old/langtools-73356b81c5c7/.hgtags 2015-10-21 04:15:32.000000000 +0200 +++ new/langtools-fd0a34cb97b4/.hgtags 2016-01-18 16:52:45.000000000 +0100 @@ -646,3 +646,7 @@ d627a940b6ca8fb4353f844e4f91163a3dcde0bc icedtea-2.6.2pre02 2741575d96f3985d41de8ebe1ba7fae8afbb0fde jdk7u91-b00 1a9e2dcc91dc3d0c103b09c478b3ac31ac45733f jdk7u91-b01 +73356b81c5c773a29729ae3b641516e0ac4a015d icedtea-2.6.2 +08e99c45e470ce8b87875c1cbe78ac2f341555a3 jdk7u91-b02 +91fdb0c83e50c398bee5f0550600d20650f2a6ef icedtea-2.6.3 +3c71abf7435352aee6e74ba2581274181ad3d17e jdk7u95-b00 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-73356b81c5c7/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java new/langtools-fd0a34cb97b4/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java --- old/langtools-73356b81c5c7/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java 2015-10-21 04:15:32.000000000 +0200 +++ new/langtools-fd0a34cb97b4/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java 2016-01-18 16:52:45.000000000 +0100 @@ -120,12 +120,14 @@ * Returns the flags of a ClassSymbol in terms of javac's flags */ static long getFlags(ClassSymbol clazz) { - while (true) { - try { - return clazz.flags(); - } catch (CompletionFailure ex) { - // quietly ignore completion failures - } + try { + return clazz.flags(); + } catch (CompletionFailure ex) { + /* Quietly ignore completion failures and try again - the type + * for which the CompletionFailure was thrown shouldn't be completed + * again by the completer that threw the CompletionFailure. + */ + return getFlags(clazz); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-73356b81c5c7/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java new/langtools-fd0a34cb97b4/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java --- old/langtools-73356b81c5c7/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java 2015-10-21 04:15:32.000000000 +0200 +++ new/langtools-fd0a34cb97b4/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java 2016-01-18 16:52:45.000000000 +0100 @@ -128,7 +128,7 @@ t.tag == TypeTags.CLASS; t = env.types.supertype(t)) { ClassSymbol c = (ClassSymbol)t.tsym; - for (Scope.Entry e = c.members().lookup(sym.name); e.scope != null; e = e.next()) { + for (Scope.Entry e = membersOf(c).lookup(sym.name); e.scope != null; e = e.next()) { if (sym.overrides(e.sym, origin, env.types, true)) { return TypeMaker.getType(env, t); } @@ -160,7 +160,7 @@ t.tag == TypeTags.CLASS; t = env.types.supertype(t)) { ClassSymbol c = (ClassSymbol)t.tsym; - for (Scope.Entry e = c.members().lookup(sym.name); e.scope != null; e = e.next()) { + for (Scope.Entry e = membersOf(c).lookup(sym.name); e.scope != null; e = e.next()) { if (sym.overrides(e.sym, origin, env.types, true)) { return env.getMethodDoc((MethodSymbol)e.sym); } @@ -169,6 +169,19 @@ return null; } + /**Retrieve members of c, ignoring any CompletionFailures that occur. */ + private Scope membersOf(ClassSymbol c) { + try { + return c.members(); + } catch (CompletionFailure cf) { + /* Quietly ignore completion failures and try again - the type + * for which the CompletionFailure was thrown shouldn't be completed + * again by the completer that threw the CompletionFailure. + */ + return membersOf(c); + } + } + /** * Tests whether this method overrides another. * The overridden method may be one declared in a superclass or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-73356b81c5c7/src/share/classes/com/sun/tools/javadoc/TypeMaker.java new/langtools-fd0a34cb97b4/src/share/classes/com/sun/tools/javadoc/TypeMaker.java --- old/langtools-73356b81c5c7/src/share/classes/com/sun/tools/javadoc/TypeMaker.java 2015-10-21 04:15:32.000000000 +0200 +++ new/langtools-fd0a34cb97b4/src/share/classes/com/sun/tools/javadoc/TypeMaker.java 2016-01-18 16:52:45.000000000 +0100 @@ -29,6 +29,7 @@ import com.sun.tools.javac.code.Symbol; import com.sun.tools.javac.code.Symbol.ClassSymbol; +import com.sun.tools.javac.code.Symbol.CompletionFailure; import com.sun.tools.javac.code.Type; import com.sun.tools.javac.code.Type.ClassType; import com.sun.tools.javac.code.Type.TypeVar; @@ -44,12 +45,25 @@ return getType(env, t, true); } + public static com.sun.javadoc.Type getType(DocEnv env, Type t, + boolean errToClassDoc) { + try { + return getTypeImpl(env, t, errToClassDoc); + } catch (CompletionFailure cf) { + /* Quietly ignore completion failures and try again - the type + * for which the CompletionFailure was thrown shouldn't be completed + * again by the completer that threw the CompletionFailure. + */ + return getType(env, t, errToClassDoc); + } + } + /** * @param errToClassDoc if true, ERROR type results in a ClassDoc; * false preserves legacy behavior */ @SuppressWarnings("fallthrough") - public static com.sun.javadoc.Type getType(DocEnv env, Type t, + private static com.sun.javadoc.Type getTypeImpl(DocEnv env, Type t, boolean errToClassDoc) { if (env.legacyDoclet) { t = env.types.erasure(t); ++++++ openjdk.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea7-forest-2-6-601ca7147b8c/.hgtags new/icedtea7-forest-2-6-4f1e498cad9c/.hgtags --- old/icedtea7-forest-2-6-601ca7147b8c/.hgtags 2015-10-21 04:15:30.000000000 +0200 +++ new/icedtea7-forest-2-6-4f1e498cad9c/.hgtags 2016-01-18 16:52:07.000000000 +0100 @@ -644,3 +644,7 @@ d27c76db0808b7a59313916e9880deded3368ed2 icedtea-2.6.2pre02 63d687368ce5bca36efbe48db2cf26df171b162d jdk7u91-b00 03b03194afbe87a049a1c6d83f49788602c363d8 jdk7u91-b01 +601ca7147b8c551d394ad97b6288b01c9e763ea4 icedtea-2.6.2 +2be0ab1a24b2b6910d8f31e3314ffa48f30f21df jdk7u91-b02 +f0e7f22f09ef0ddd583eb8ce9a14edcccfa4f7ea icedtea-2.6.3 +a28bc539342e4ca724a5abd2521c6a58f04c2113 jdk7u95-b00