Hello community, here is the log from the commit of package java-1_6_0-openjdk for openSUSE:Factory checked in at Fri Aug 14 15:06:20 CEST 2009. -------- --- java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2009-07-31 14:45:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2009-08-11 15:47:19.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Aug 11 13:46:29 UTC 2009 - mvyskocil@suse.cz + +- Updates: + * icedtea6-1.5.1 contains a lot of security fixes from Sun JDK6u15 + This includes fixes for: + * bnc#524505: Vulnerability in OpenJDK/NetX + * bnc#514421: XML Signature weakness (HMAC truncation) +- Fixed bnc#521512: lcms pointer dereference +- Dropped some s390 patches, because they was obsoleted and not used +- Fixed bnc#525097 - openjdk installs dead .desktop files + * now removed *.desktop from %%files of openjdk + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- icedtea6-1.5.tar.bz2 openjdk-6-src-b09-s390+s390x.patch openjdk-6-src-b09-s390-size_t-fixes.patch New: ---- icedtea6-1.5.1.tar.bz2 openjdk-6-src-b16-lcms.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_6_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.Wzhw3W/_old 2009-08-14 15:05:52.000000000 +0200 +++ /var/tmp/diff_new_pack.Wzhw3W/_new 2009-08-14 15:05:52.000000000 +0200 @@ -18,7 +18,7 @@ %define gcjbootstrap 0 %define runtests 0 -%define icedteaver 1.5 +%define icedteaver 1.5.1 %define icedteasnapshot %{nil} %define openjdkver b16 %define openjdkdate 24_apr_2009 @@ -102,7 +102,7 @@ Obsoletes: %obsoletes %endif Version: 1.6.0.0_%{openjdkver} -Release: 1 +Release: 2 Summary: Java runtime environment based on OpenJDK 6 and IcedTea 6 Group: Development/Languages/Java License: GPL v2 only ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception @@ -159,18 +159,18 @@ Patch9: java-1.6.0-openjdk-execvpe.patch # SUSE patches Patch104: openjdk-6-src-b09-gcc4-warningfixes.patch -Patch105: openjdk-6-src-b09-s390+s390x.patch -Patch106: openjdk-6-src-b09-s390-size_t-fixes.patch Patch107: openjdk-6-src-b14-no-return-in-nonvoid-function.patch Patch108: openjdk-6-src-b14-undefined-operation.patch Patch109: openjdk-6-src-b14-no-return-in-nonvoid-function-ix86.patch # PATCH-FIX-OPENSUSE bnc#471829 comment#28 # will be sent to upstream after sign of SCA (http://openjdk.java.net/contribute/) Patch110: openjdk-6-src-b16-no-return-in-nonvoid-function-ppc.patch -# Deprecated by icedtea 1.5 -#Patch111: openjdk-6-src-b14-confluence-crash.patch Patch112: openjdk-6-src-b16-no-return-in-nonvoid-function.patch Patch113: icedtead6-1.5-nppplugin-xulrunner191.patch +# PATCH-FIX-OPENSUSE bnc#490610 +# Icedtea lcms patches are not correct, this fixes it +Patch114: openjdk-6-src-b16-lcms.patch +# PATCH-FIX-UPSTREAM bnc#524505 Patch1000: java-1_6_0-openjdk-suse-desktop-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: alsa-lib-devel @@ -263,7 +263,7 @@ %endif Recommends: systemtap # Standard JPackage base provides. -Provides: %(echo %name|sed s/_/./g) +Provides: java-1.6.0-openjdk = %{version}-%{release} Provides: jre-%{javaver}-%{origin} = %{version}-%{release} Provides: jre-%{origin} = %{version}-%{release} Provides: jre-%{javaver} = %{version}-%{release} @@ -314,7 +314,7 @@ Group: Development/Languages/Java Requires: %{name} = %{version}-%{release} PreReq: %{_sbindir}/update-alternatives -Provides: %(echo %name|sed s/_/./g)-devel +Provides: java-1.6.0-openjdk-devel = %{version}-%{release} Provides: java-sdk-%{javaver}-%{origin} = %{version} Provides: java-sdk-%{javaver} = %{version} Provides: java-sdk-%{origin} = %{version} @@ -345,7 +345,7 @@ %endif Summary: Sources for building demo applications with OpenJDK 6 Group: Development/Languages/Java -Provides: %(echo %name|sed s/_/./g)-demo +Provides: java-1.6.0-openjdk-demo = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} %description demo @@ -381,7 +381,7 @@ Summary: Documentation of the Java API of OpenJDK 6 Group: Development/Languages/Java PreReq: %{_sbindir}/update-alternatives -Provides: %(echo %name|sed s/_/./g)-javadoc +Provides: java-1.6.0-openjdk-javadoc = %{version}-%{release} Provides: java-javadoc = %{version}-%{release} Provides: java-%{javaver}-javadoc = %{version}-%{release} @@ -402,7 +402,7 @@ Group: Development/Languages/Java Requires: %{name} = %{version}-%{release} PreReq: %{_sbindir}/update-alternatives -Provides: %(echo %name|sed s/_/./g)-plugin +Provides: java-1.6.0-openjdk-plugin = %{version}-%{release} Provides: java-plugin = %{javaver} Provides: java-%{javaver}-plugin = %{version} @@ -454,35 +454,26 @@ --enable-nio2 \ --with-hotspot-src-zip=hotspot.tar.gz sed -i 's/MEMORY_LIMIT = -J-Xmx512m/MEMORY_LIMIT = -J-Xmx768m/' Makefile -patch_openjdk() { - patch -l $* --input=%{PATCH104} -%ifarch s390 s390x # contains a special makefile test which is only for s390(x) for now: - patch -l $* --input=%{PATCH105} -%endif - # IcedTea's openjdk patching is quite a mess, this patch should be added as - # an IcedTea openjdk patch which is applied during the IcedTea patch orgy: -%ifarch s390 # Only needed on s390 for now, could break on other archictures in theory, for review: - patch -l $* --input=%PATCH106 -%endif - patch -l $* --input=%PATCH107 -%ifarch %ix86 - patch -l $* --input=%PATCH108 - patch -l $* --input=%PATCH109 -%endif -%ifarch ppc ppc64 - patch -l $* --input=%PATCH110 -%endif - patch -l $* --input=%PATCH112 -} %if %{gcjbootstrap} make stamps/patch-ecj.stamp %endif make patch -patch_openjdk -p0 +# Those patches are from Fedora package patch -l -p0 < %{PATCH4} patch -l -p0 < %{PATCH5} patch -l -p0 < %{PATCH8} patch -l -p0 < %{PATCH9} +patch -l -p0 < %{PATCH104} +patch -l -p0 < %{PATCH107} +%ifarch %ix86 +patch -l -p0 < %{PATCH108} +patch -l -p0 < %{PATCH109} +%endif +%ifarch ppc ppc64 +patch -l -p0 < %{PATCH110} +%endif +patch -l -p0 < %{PATCH112} +patch -l -p1 < %{PATCH114} # ========== a default keystore ========== # a cacerts generation if [ -f openjdk/jdk/src/share/lib/security/cacerts ]; then @@ -903,7 +894,6 @@ %{_datadir}/icons/hicolor/32x32 %{_datadir}/icons/hicolor/48x48 %{_datadir}/pixmaps/javaws.png -%{_datadir}/applications/*.desktop %ifarch %{jit_arches} # systemtap support %{_datadir}/systemtap ++++++ icedtea6-1.5.tar.bz2 -> icedtea6-1.5.1.tar.bz2 ++++++ ++++ 171418 lines of diff (skipped) ++++++ java-1.6.0-openjdk-java-access-bridge-security.patch ++++++ --- /var/tmp/diff_new_pack.Wzhw3W/_old 2009-08-14 15:06:00.000000000 +0200 +++ /var/tmp/diff_new_pack.Wzhw3W/_new 2009-08-14 15:06:00.000000000 +0200 @@ -4,8 +4,8 @@ # passed to checkPackageAccess unless the # corresponding RuntimePermission ("accessClassInPackage."+package) has # been granted. --package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind. -+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,org.GNOME.Accessibility,org.GNOME.Bonobo +-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio. ++package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,org.GNOME.Accessibility,org.GNOME.Bonobo # # List of comma-separated packages that start with or equal this string ++++++ openjdk-6-src-b16-lcms.patch ++++++ Index: icedtea6-1.5/openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c =================================================================== --- icedtea6-1.5.orig/openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c +++ icedtea6-1.5/openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c @@ -687,11 +687,10 @@ LPMATSHAPER cmsBuildGrayOutputMatrixShap LPGAMMATABLE Shapes1[3]; GrayTRC = cmsReadICCGamma(hProfile, icSigGrayTRCTag); - FromLstarToXYZ(GrayTRC, Shapes1); if (GrayTRC == NULL) return NULL; - + FromLstarToXYZ(GrayTRC, Shapes1); // Reversing must be done after curve translation Shapes[0] = cmsReverseGamma(Shapes1[0]->nEntries, Shapes1[0]); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org