Hello community, here is the log from the commit of package java-1_6_0-openjdk for openSUSE:Factory checked in at Fri May 14 00:23:32 CEST 2010. -------- --- java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2010-04-12 12:22:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2010-05-13 10:59:20.000000000 +0200 @@ -1,0 +2,16 @@ +Thu May 13 08:56:07 UTC 2010 - mvyskocil@suse.cz + +- fix bnc#603316: openjdk run out of file descriptors + * add openjdk-6-src-b17-stack-protector-fclose.patch + add the missing fclose to the stack-protector patch + +------------------------------------------------------------------- +Wed Apr 28 07:39:19 UTC 2010 - mvyskocil@suse.cz + +- fixes ppc build + * enable nio2 only for ix86 and x86_64 + * refresh openjdk-6-src-b17-no-return-in-nonvoid-function-ppc.patch +- ignore old libopenssl on 11.3+ +- use patch -i, instead of shell redirection + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- openjdk-6-src-b16-no-return-in-nonvoid-function-ppc.patch New: ---- openjdk-6-src-b17-no-return-in-nonvoid-function-ppc.patch openjdk-6-src-b17-stack-protector-fclose.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_6_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.7F6FG7/_old 2010-05-14 00:23:00.000000000 +0200 +++ /var/tmp/diff_new_pack.7F6FG7/_new 2010-05-14 00:23:00.000000000 +0200 @@ -108,7 +108,7 @@ Obsoletes: %obsoletes %endif Version: 1.6.0.0_%{openjdkver} -Release: 3 +Release: 4 Summary: Java runtime environment based on OpenJDK 6 and IcedTea 6 Group: Development/Languages/Java License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception @@ -144,9 +144,11 @@ 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 +################## +# sent those patches to ptisnovsk@redhat.com, +# he will (hopefully) be able to push them to upstream +# PATCH-FIX-OPENSUSE bnc#594415#c8 +Patch110: openjdk-6-src-b17-no-return-in-nonvoid-function-ppc.patch Patch112: openjdk-6-src-b16-no-return-in-nonvoid-function.patch # PATCH-FIX-OPENSUSE bnc#490610 # Icedtea lcms patches are not correct, this fixes it @@ -171,6 +173,9 @@ # PATCH-FIX-UPSTREAM: bnc#589021 # http://cr.openjdk.java.net/~aph/6929067-jdk7-webrev-4/ Patch125: openjdk-6-src-b17-stack-protector.patch +# PATCH-FIX-OPENSUSE: bnc#603316 +# The stack protector patch did not close the /proc/self/maps correctly +Patch126: openjdk-6-src-b17-stack-protector-fclose.patch # PATCH-FIX-UPSTREAM bnc#524505 Patch1000: java-1_6_0-openjdk-suse-desktop-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -249,6 +254,9 @@ # FIXME: remove!! Requires: openssl BuildRequires: openssl-certs +%if 0%{?suse_version} >= 1120 +#!BuildIgnore: libopenssl0_9_8 +%endif Requires: rhino # Require jpackage-utils for ant. Requires: jpackage-utils >= 1.7.3 @@ -472,46 +480,49 @@ %ifarch %{jit_arches} %if 0%{?suse_version} >= 1120 --enable-systemtap \ + --enable-nio2 \ %endif --with-abs-install-dir=%{_jvmdir}/%{sdkdir} \ %endif - --with-openjdk=%{_jvmdir}/%{sdkdir} \ - --with-openjdk-src-zip=%{SOURCE1} \ - --with-pkgversion=suse-%{release}-%{_arch} \ - --enable-pulse-java \ %if 0%{?suse_version} >= 1120 + --enable-pulse-java \ --enable-nss \ --enable-npplugin \ %endif - --enable-nio2 + --with-openjdk=%{_jvmdir}/%{sdkdir} \ + --with-openjdk-src-zip=%{SOURCE1} \ + --with-pkgversion=suse-%{release}-%{_arch} + sed -i 's/MEMORY_LIMIT = -J-Xmx512m/MEMORY_LIMIT = -J-Xmx768m/' Makefile %if %{gcjbootstrap} make stamps/patch-ecj.stamp %endif make patch # Those patches are from Fedora package -patch -l -p0 < %{PATCH3} -patch -l -p0 < %{PATCH4} +patch -l -p0 -i %{PATCH3} +patch -l -p0 -i %{PATCH4} -patch -l -p0 < %{PATCH104} -patch -l -p0 < %{PATCH107} +patch -l -p0 -i %{PATCH104} +patch -l -p0 -i %{PATCH107} %ifarch %ix86 -patch -l -p0 < %{PATCH108} -patch -l -p0 < %{PATCH109} +patch -l -p0 -i %{PATCH108} +patch -l -p0 -i %{PATCH109} %endif %ifarch ppc ppc64 -patch -l -p0 < %{PATCH110} +patch -l -p0 -i %{PATCH110} %endif -patch -l -p0 < %{PATCH112} -patch -l -p1 < %{PATCH114} -patch -l -p1 < %{PATCH117} -patch -l -p1 < %{PATCH118} -patch -l -p1 < %{PATCH119} -patch -l -p1 < %{PATCH120} -patch -l -p1 < %{PATCH121} -patch -l -p1 < %{PATCH122} -patch -l -p1 < %{PATCH123} -patch -l -p1 < %{PATCH125} +patch -l -p0 -i %{PATCH112} +patch -l -p1 -i %{PATCH114} +patch -l -p1 -i %{PATCH117} +patch -l -p1 -i %{PATCH118} +patch -l -p1 -i %{PATCH119} +patch -l -p1 -i %{PATCH120} +patch -l -p1 -i %{PATCH121} +patch -l -p1 -i %{PATCH122} +patch -l -p1 -i %{PATCH123} +patch -l -p1 -i %{PATCH125} +patch -l -p1 -i %{PATCH126} + make export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image # ========== a default keystore ========== ++++++ openjdk-6-src-b16-no-return-in-nonvoid-function-ppc.patch -> openjdk-6-src-b17-no-return-in-nonvoid-function-ppc.patch ++++++ ++++ 766 lines (skipped) ++++ between java-1_6_0-openjdk/openjdk-6-src-b16-no-return-in-nonvoid-function-ppc.patch ++++ and /mounts/work_src_done/STABLE/java-1_6_0-openjdk/openjdk-6-src-b17-no-return-in-nonvoid-function-ppc.patch ++++++ openjdk-6-src-b17-stack-protector-fclose.patch ++++++ Index: icedtea6-1.7.3/openjdk/hotspot/src/os/linux/vm/os_linux.cpp =================================================================== --- icedtea6-1.7.3.orig/openjdk/hotspot/src/os/linux/vm/os_linux.cpp +++ icedtea6-1.7.3/openjdk/hotspot/src/os/linux/vm/os_linux.cpp @@ -2555,6 +2555,7 @@ get_stack_bounds(uintptr_t *bottom, uint char *str = NULL; ssize_t len = getline(&str, &dummy, f); if (len == -1) { + fclose(f); return false; } @@ -2571,6 +2572,7 @@ get_stack_bounds(uintptr_t *bottom, uint uintptr_t sp = (uintptr_t)__builtin_frame_address(0); if (sp >= *bottom && sp <= *top) { free(str); + fclose(f); return true; } } @@ -2579,6 +2581,7 @@ get_stack_bounds(uintptr_t *bottom, uint free(str); } + fclose(f); return false; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org