Hello community,
here is the log from the commit of package java-1_6_0-openjdk for
openSUSE:12.1:Update:Test checked in at 2012-02-20 14:02:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update:Test/java-1_6_0-openjdk (Old)
and /work/SRC/openSUSE:12.1:Update:Test/.java-1_6_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_6_0-openjdk", Maintainer is
"bnc-team-j...@forge.provo.novell.com"
Changes:
--------
---
/work/SRC/openSUSE:12.1:Update:Test/java-1_6_0-openjdk/java-1_6_0-openjdk.changes
2012-02-20 14:02:47.000000000 +0100
+++
/work/SRC/openSUSE:12.1:Update:Test/.java-1_6_0-openjdk.new/java-1_6_0-openjdk.changes
2012-02-20 14:02:59.000000000 +0100
@@ -1,0 +2,76 @@
+Thu Feb 16 12:42:24 UTC 2012 - mvysko...@suse.cz
+
+- update to 1.11.1 (bnc#747208)
+* Security fixes
+ - S7082299, CVE-2011-3571: Fix in AtomicReferenceArray
+ - S7088367, CVE-2011-3563: Fix issues in java sound
+ - S7110683, CVE-2012-0502: Issues with some KeyboardFocusManager method
+ - S7110687, CVE-2012-0503: Issues with TimeZone class
+ - S7110700, CVE-2012-0505: Enhance exception throwing mechanism in
ObjectStreamClass
+ - S7110704, CVE-2012-0506: Issues with some method in corba
+ - S7112642, CVE-2012-0497: Incorrect checking for graphics rendering object
+ - S7118283, CVE-2012-0501: Better input parameter checking in zip file
processing
+ - S7126960, CVE-2011-5035: (httpserver) Add property to limit number of
request headers to the HTTP Server
+* Bug fixes
+ - PR865: Patching fails with patches/ecj/jaxws-getdtdtype.patch
+
+-------------------------------------------------------------------
+Fri Feb 3 14:06:13 UTC 2012 - r...@suse.de
+
+- apply ppc patch also on s390/s390x
+- add a 3 more void-return fixes to ppc patch
+
+-------------------------------------------------------------------
+Fri Feb 3 11:01:40 UTC 2012 - mvysko...@suse.cz
+
+- update to icedtea6-1.11, openjdk b24
+- ARM assembly language port reinstated and updated
+- Allow selection of test suites using the jtreg_checks argument e.g.
jtreg_checks="langtools"
+- Drop the outdated NIO2 backport. Users who want NIO2 should use IcedTea 2.x.
+- Shark has been disabled
+- Fixed build with GCC 4.7
+
+-------------------------------------------------------------------
+Tue Jan 17 12:34:06 UTC 2012 - mvysko...@suse.cz
+
+- update to 1.10.5 (bugfix release)
+* Backports
+ - S7034464: Support transparent large pages on Linux
+ - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used
+ - S7102369: remove java.rmi.server.codebase property parsing from registyimpl
+ - S7094468: rmiregistry clean up
+ - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using
TLS_DH_anon_WITH_AES_128_CBC_SHA
+ - S6851973, PR830: ignore incoming channel binding if acceptor does not set
one
+ - S7091528: javadoc attempts to parse .class files
+
+-------------------------------------------------------------------
+Sat Dec 10 09:39:51 CET 2011 - meiss...@suse.de
+
+- adjusted patch110 to fix ppc build.
+
+-------------------------------------------------------------------
+Fri Dec 9 08:20:01 UTC 2011 - mvysko...@suse.cz
+
+- there is no architecture called arm, so use macro instead
+
+-------------------------------------------------------------------
+Thu Dec 8 10:18:51 UTC 2011 - mvysko...@suse.cz
+
+- fix a stuff needed for gjc-based build
+ * change compiler flags in configure to gjc compatible
+ * added no-werror patch for openjdk-ecj
+ * avoid all aditional checking packages in this mode
+ * temporary remove memory size increase
+ * exclude patch110 in this case - TBD later
+- definitelly drop noarch feature as it never worked well
+- add arm to 32bit architectures
+- remove rhino as a runtime dependency, as it's repackaged and
+ installed in the jvm's tree
+- enable build --with-parallel-jobs
+
+-------------------------------------------------------------------
+Wed Nov 30 09:39:51 UTC 2011 - co...@suse.com
+
+- add automake as buildrequire to avoid implicit dependency
+
+-------------------------------------------------------------------
Old:
----
f0f676c5a2c6.tar.gz
icedtea6-1.10.4.tar.gz
icedtea6-replace-gcc-stack-marking.patch
jaxp144_01.zip
jdk6-jaxws-b20.zip
openjdk-6-src-b22-28_feb_2011-fedora.tar.bz2
New:
----
icedtea6-1.11.1.tar.gz
jaxp144_03.zip
jdk6-jaxws2_1_6-2011_06_13.zip
openjdk-6-src-b24-14_nov_2011-fedora.tar.gz
openjdk-ecj-6-src-b22-no-werror.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_6_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.PojjN3/_old 2012-02-20 14:03:02.000000000 +0100
+++ /var/tmp/diff_new_pack.PojjN3/_new 2012-02-20 14:03:02.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package java-1_6_0-openjdk
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
%define gcjbootstrap 0
%define jit_arches %{ix86} x86_64
@@ -28,20 +27,20 @@
%endif
%endif
-# XXX: systemtap does not work with gcj
%if %{gcjbootstrap}
+# XXX: systemtap does not work with gcj
%define with_systemtap 0
+# disable debug packages for gjc-based builds
+%define suse_insert_debug_package %nil
%endif
# If runtests is 0 test suites will not be run.
%define runtests 0
-%define icedteaver 1.10.4
+%define icedteaver 1.11.1
%define icedteasnapshot %{nil}
-%define openjdkver b22
-%define openjdkdate 28_feb_2011
-
-%define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
+%define openjdkver b24
+%define openjdkdate 14_nov_2011
%define accessmajorver 1.23
%define accessminorver 0
@@ -55,7 +54,7 @@
%define openjdkurlbase http://www.java.net/download/openjdk/jdk6/promoted/
%define openjdkurl %{openjdkurlbase}%{openjdkver}/
-%define fedorazip openjdk-6-src-%{openjdkver}-%{openjdkdate}-fedora.tar.bz2
+%define fedorazip openjdk-6-src-%{openjdkver}-%{openjdkdate}-fedora.tar.gz
%define mauvedate 2008-10-22
@@ -111,8 +110,6 @@
%define jrebindir %{_jvmdir}/%{jrelnk}/bin
%define jvmjardir %{_jvmjardir}/%{sdkdir}
%define jvmjarlink %{_jvmjardir}/%{sdklnk}
-# For openSUSE >= 11.2 demo, sample and src.zip is noarch ==> share
-%define sdkshare %{_datadir}/%{sdkname}
%ifarch %{jit_arches}
# Where to install systemtap tapset (links)
@@ -132,26 +129,29 @@
Name: java-1_6_0-openjdk
Version: 1.6.0.0_%{openjdkver}.%{icedteaver}
-Release: 1
+Release: 0
Summary: Java runtime environment based on OpenJDK 6 and IcedTea 6
+License: GPL-2.0 ; - with the OpenJDK Assembly Exception and the GNU
Classpath Exception
Group: Development/Languages/Java
-License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU
Classpath Exception
Url: http://openjdk.java.net/
Source0: %{url}icedtea6-%{icedteaver}%{icedteasnapshot}.tar.gz
# # download the openjdk from
http://download.java.net/openjdk/jdk6/promoted/latest/
# sh generate-fedora-zip.sh openjdk-6-src-%{openjdkver}-%{openjdkdate}.tar.gz
Source1: %{fedorazip}
-Source2:
%{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.bz2
-# wget
http://cvs.fedoraproject.org/viewvc/devel/java-1.6.0-openjdk/generate-fedora-zip.sh?view=co
-o generate-fedora-zip.sh
-Source3: %{genurl}generate-fedora-zip.sh
+#Source2:
%{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.bz2
+Source2: java-access-bridge-%{accessver}.tar.bz2
+#
http://pkgs.fedoraproject.org/gitweb/?p=java-1.6.0-openjdk.git;a=blob_plain;f=generate-fedora-zip.sh;h=67b1e89a86c53bfcb2b69e9169d0dc4c25325c11;hb=HEAD
+Source3: generate-fedora-zip.sh
# wget ftp://sources.redhat.com/pub/mauve/snapshot/mauve-nigthly.tar.bz
mauve-%(date '+%Y-%m-%d').tar.bz2
Source5: mauve-%{mauvedate}.tar.bz2
# from Fedora rpm
Source6: mauve_tests
-Source7: %{hotspoturl}f0f676c5a2c6.tar.gz
-Source8: %{jaxpurl}jaxp144_01.zip
-Source9: %{jafurl}jdk6-jaf-b20.zip
-Source10: %{jaxwsurl}jdk6-jaxws-b20.zip
+#Source8: %{jaxpurl}jaxp144_01.zip
+#Source9: %{jafurl}jdk6-jaf-b20.zip
+#Source10: %{jaxwsurl}jdk6-jaxws-b20.zip
+Source8: jaxp144_03.zip
+Source9: jdk6-jaf-b20.zip
+Source10: jdk6-jaxws2_1_6-2011_06_13.zip
Source1000: java-1_6_0-openjdk-rpmlintrc
# those properties are for opeSUSE only
Source1001: fontconfig.SuSE.properties
@@ -200,14 +200,27 @@
# PATCH-FIX-OPENSUSE: forward support for bouncycastle provider - requested by
rgarrigue,
# will be sent to fedora as well. Applied only on systems with enabled nss
(11.2+)
Patch135: icedtea6-1.10.2-bouncycastle-provider-support.patch
-# PATCH-FIX-UPSTREAM: http://icedtea.classpath.org/hg/icedtea6/rev/012505ce3d0d
-# fixes build on 11.1/i586 and sle11/i586, which fails because code behind
GNU_stack.note in linux_x64_32.so
-Patch136: icedtea6-replace-gcc-stack-marking.patch
+#PATCH-FIX-OPENSUSE: no -Werror on ecj based build as well
+Patch137: openjdk-ecj-6-src-b22-no-werror.patch
# PATCH-FIX-UPSTREAM bnc#524505
Patch1000: java-1_6_0-openjdk-suse-desktop-files.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+# we can simply skip the unwanted checks when bootstrapping package
+# as openjdk build using gjc is sooooo complicated and slooow without it
+%if %{gcjbootstrap}
+BuildRequires: -brp-check-suse
+BuildRequires: -post-build-checks
+BuildRequires: -rpmlint-Factory
+BuildRequires: -rpmlint-mini
+%endif
+
+BuildRequires: automake
BuildRequires: alsa-lib-devel
-BuildRequires: quilt vim
+%ifnarch %{arm}
+BuildRequires: quilt
+BuildRequires: vim
+%endif
BuildRequires: cups-devel
BuildRequires: desktop-file-utils
BuildRequires: giflib-devel
@@ -225,9 +238,11 @@
BuildRequires: ant-nodeps
BuildRequires: zip
%if %{gcjbootstrap}
-BuildRequires: ecj-bootstrap java-1_5_0-gcj-compat-devel
+BuildRequires: ecj-bootstrap
+BuildRequires: java-1_5_0-gcj-compat-devel
%else
-BuildRequires: java-1_6_0-openjdk java-1_6_0-openjdk-devel
+BuildRequires: java-1_6_0-openjdk
+BuildRequires: java-1_6_0-openjdk-devel
%endif
BuildRequires: mozilla-nss-devel
@@ -291,7 +306,6 @@
BuildRequires: openssl-certs
%endif
-Requires: rhino
# Require jpackage-utils for ant.
Requires: jpackage-utils >= 1.7.3
# Require zoneinfo data provided by tzdata-java subpackage.
@@ -341,7 +355,7 @@
Provides: jre1.6.x
# bnc#542545
# 32-bit versus 64-bit specific provides:
-%ifarch %ix86 ppc s390
+%ifarch %ix86 ppc s390 %{arm}
%define bits 32
%endif
%ifarch x86_64 ia64 s390x
@@ -370,7 +384,6 @@
%package devel
-License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU
Classpath Exception
Summary: Java SDK based on OpenJDK 6 and IcedTea 6
Group: Development/Languages/Java
Requires: %{name} = %{version}-%{release}
@@ -399,15 +412,11 @@
%package demo
-License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU
Classpath Exception
# As 1.6.0 is stable, obsolete java-1_7_0-icedtea in openSUSE 11.0 and earlier:
Summary: Sources for building demo applications with OpenJDK 6
Group: Development/Languages/Java
Provides: java-1.6.0-openjdk-demo = %{version}-%{release}
Requires: %{name}-devel = %{version}-%{release}
-%if 0%{?suse_version} >= 1120
-BuildArch: noarch
-%endif
%description demo
This package provides sources of demonstration applications for OpenJDK
@@ -417,14 +426,10 @@
%package src
-License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU
Classpath Exception
# As 1.6.0 is stable, obsolete java-1_7_0-icedtea in openSUSE 11.0 and earlier:
Summary: OpenJDK 6 Java class sources for developers
Group: Development/Languages/Java
Requires: %{name}-devel = %{version}-%{release}
-%if 0%{?suse_version} >= 1120
-BuildArch: noarch
-%endif
%description src
This package provides Java Runtime librarcy class sources of OpenJDK 6
@@ -434,7 +439,6 @@
%package javadoc
-License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU
Classpath Exception
# As 1.6.0 is stable, obsolete java-1_7_0-icedtea in openSUSE 11.0 and earlier:
Summary: Documentation of the Java API of OpenJDK 6
Group: Development/Languages/Java
@@ -442,9 +446,6 @@
Provides: java-1.6.0-openjdk-javadoc = %{version}-%{release}
Provides: java-javadoc = %{version}-%{release}
Provides: java-%{javaver}-javadoc = %{version}-%{release}
-%if 0%{?suse_version} >= 1120
-BuildArch: noarch
-%endif
%description javadoc
This package provides documentation of the API provided by OpenJDK 6
@@ -459,14 +460,24 @@
%setup -q -n icedtea6-%{icedteaver} -T -D -a 5
%setup -q -n icedtea6-%{icedteaver} -T -D -a 2
%patch0 -b .optflags
-%patch136 -p1 -b .gnu-stack
%patch1000 -p1
+rm -f *.desktop
cp %{SOURCE6} .
%build
export LANG=en_US.UTF-8
./autogen.sh
+
+%if %{gcjbootstrap}
+# XXX: use gcj-compatible switches for configure
+sed -i "s/$JAVAC -cp/$JAVAC -C --classpath/;s/-source 5//" configure
+%endif
+
+# macro _smp_mflags is too makefile centric, so it's better
+# get the number directly
+export NUMCPUS=`/usr/bin/getconf _NPROCESSORS_ONLN`
+
%{configure} \
%ifarch %{jit_arches}
%if 0%{?suse_version} >= 1120
@@ -481,26 +492,31 @@
--enable-pulse-java \
--enable-nss \
%endif
- --with-hotspot-build=hs20 \
- --with-hotspot-src-zip=%{SOURCE7} \
--with-jaf-drop-zip=%{SOURCE9} \
--with-jaxp-drop-zip=%{SOURCE8} \
--with-jaxws-drop-zip=%{SOURCE10} \
%if %{gcjbootstrap}
- --with-gcj-home=%{_jvmdir}/java-gcj \
+ --with-gcj=%{_bindir}/gcj \
+ --with-jdk-home=%{_jvmdir}/java-1.5.0-gcj \
%else
--with-jdk-home=%{_jvmdir}/%{sdkdir} \
--disable-bootstrap \
%endif
--with-xerces2-jar=%{_javadir}/xerces-j2-bootstrap.jar \
--with-openjdk-src-zip=%{SOURCE1} \
+%ifnarch %{arm}
+ --with-parallel-jobs=${NUMCPUS} \
+%endif
--with-pkgversion=suse-%{release}-%{_arch}
-sed -i 's/MEMORY_LIMIT = -J-Xmx512m/MEMORY_LIMIT = -J-Xmx768m/' Makefile
+#FIXME: maybe it's no longer needed, but let's not remove it
+#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 -i %{PATCH3}
patch -l -p0 -i %{PATCH4}
@@ -519,8 +535,11 @@
%ifarch %ix86
qpatch -p0 %{PATCH109}
%endif
-%ifarch ppc ppc64
-qpatch -p0 %{PATCH110}
+
+%if ! %{gcjbootstrap}
+%ifarch ppc ppc64 s390 s390x
+qpatch -p1 %{PATCH110}
+%endif
%endif
for PATCH in \
@@ -536,6 +555,7 @@
%{PATCH132} \
%{PATCH134} \
%{PATCH133} \
+ %{PATCH137} \
%endif
%if 0%{?suse_version} >= 1120
%{PATCH135} \
@@ -619,14 +639,6 @@
# Install main files.
install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
cp -a bin include lib src.zip $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
- # noarch sub packages in openSUSE >= 11.2
- %if 0%{?suse_version} >= 1120
- install -d -m 755 $RPM_BUILD_ROOT%{sdkshare}
- pushd $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
- mv src.zip $RPM_BUILD_ROOT%{sdkshare}
- ln -sf %{sdkshare}/src.zip
- popd
- %endif
install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
cp -a jre/bin jre/lib $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
# bnc#438674
@@ -697,24 +709,6 @@
[ -f bin/java-rmi.cgi ] && mv bin/java-rmi.cgi sample/rmi
cp -a sample $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
- # noarch sub packages in openSUSE >= 11.2
- %if 0%{?suse_version} >= 1120
- pushd $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
- # samples can go all
- mv sample $RPM_BUILD_ROOT%{sdkshare}
- ln -sf %{sdkshare}/sample
-
- # leave the demo/jvmti in the -devel package in %{_libdir} - contains .so
files
- install -d -m 0755 $RPM_BUILD_ROOT%{sdkshare}/demo
- DEMODIRS=$(ls -1d demo/* | grep -v jvmti)
- mv $DEMODIRS $RPM_BUILD_ROOT%{sdkshare}/demo
- pushd demo
- for dir in $DEMODIRS; do
- ln -sf %{sdkshare}/$dir
- done
- popd
- popd
- %endif
popd
# Install Javadoc documentation.
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
@@ -770,22 +764,11 @@
| sed 's|'$RPM_BUILD_ROOT'||' \
| sed 's|^|%doc |' \
>> %{name}-demo.files
- # noarch sub packages in openSUSE >= 11.2
- %if 0%{?suse_version} >= 1120
- sed -i -e 's#%{_jvmdir}/%{sdkdir}#%{sdkshare}#' %{name}-demo.files
- # also move the jvmti content to the -devel
- sed -i '/jvmti/d' %{name}-demo.files
- %endif
# fdupes links the files from JDK to JRE, so it breaks a JRE
# use it carefully :))
%fdupes -s $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir}/
-# noarch sub packages in openSUSE >= 11.2
-%if 0%{?suse_version} >= 1120
-%fdupes -s $RPM_BUILD_ROOT/%{sdkshare}
-%endif
-
%fdupes -s $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir}/demo
%fdupes -s $RPM_BUILD_ROOT%{_javadocdir}/%{sdkname}
@@ -1028,13 +1011,6 @@
%config(noreplace) %{_jvmdir}/%{jredir}/lib/management/jmxremote.access
%config(noreplace) %{_jvmdir}/%{jredir}/lib/management/management.properties
%config(noreplace) %{_jvmdir}/%{jredir}/lib/images/cursors/cursors.properties
-%if %{suse_version} >= 1120
-# links to the demo and sample dirs in noarch subpackages
-%{_jvmdir}/%{sdkdir}/demo
-%{_jvmdir}/%{sdkdir}/sample
-%{_jvmdir}/%{sdkdir}/src.zip
-%dir %{sdkshare}
-%endif
%{_mandir}/man1/java-%{sdkname}.1*
%{_mandir}/man1/keytool-%{sdkname}.1*
%{_mandir}/man1/orbd-%{sdkname}.1*
@@ -1071,11 +1047,6 @@
%{_jvmdir}/%{sdkdir}/lib/*
%{_jvmdir}/%{sdklnk}
%{jvmjarlink}
-# noarch sub packages in openSUSE >= 11.2
-%if 0%{?suse_version} >= 1120
-%dir %{_jvmdir}/%{sdkdir}/demo
-%{_jvmdir}/%{sdkdir}/demo/jvmti
-%endif
# bnc#525097
%{_datadir}/applications/jconsole.desktop
%{_mandir}/man1/appletviewer-%{sdkname}.1*
@@ -1114,12 +1085,7 @@
%files src
%defattr(-,root,root,-)
-# noarch sub packages in openSUSE >= 11.2
-%if 0%{?suse_version} >= 1120
-%{sdkshare}/src.zip
-%else
%{_jvmdir}/%{sdkdir}/src.zip
-%endif
#doc mauve_tests
#doc mauve-%{mauvedate}/mauve_output
++++++ generate-fedora-zip.sh ++++++
--- /var/tmp/diff_new_pack.PojjN3/_old 2012-02-20 14:03:02.000000000 +0100
+++ /var/tmp/diff_new_pack.PojjN3/_new 2012-02-20 14:03:02.000000000 +0100
@@ -79,11 +79,9 @@
openjdk/jdk/src/share/demo/java2d/J2DBench
-find openjdk -type f -perm 0444 | xargs chmod -f 0644
-
# Create new tarball with new name.
pushd openjdk > /dev/null
- tar cjf ../$(basename $1 .tar.gz)-fedora.tar.bz2 *
+ tar czf ../$(basename $1 .tar.gz)-fedora.tar.gz *
popd > /dev/null
# Remove old unzipped openjdk dir.
++++++ icedtea6-1.10.4.tar.gz -> icedtea6-1.11.1.tar.gz ++++++
/work/SRC/openSUSE:12.1:Update:Test/java-1_6_0-openjdk/icedtea6-1.10.4.tar.gz
/work/SRC/openSUSE:12.1:Update:Test/.java-1_6_0-openjdk.new/icedtea6-1.11.1.tar.gz
differ: char 5, line 1
++++++ java-1_6_0-openjdk-suse-desktop-files.patch ++++++
--- /var/tmp/diff_new_pack.PojjN3/_old 2012-02-20 14:03:02.000000000 +0100
+++ /var/tmp/diff_new_pack.PojjN3/_new 2012-02-20 14:03:02.000000000 +0100
@@ -1,13 +1,13 @@
-Index: icedtea6-1.4/jconsole.desktop
+Index: icedtea6-1.11.1/jconsole.desktop.in
===================================================================
---- icedtea6-1.4.orig/jconsole.desktop
-+++ icedtea6-1.4/jconsole.desktop
+--- icedtea6-1.11.1.orig/jconsole.desktop.in
++++ icedtea6-1.11.1/jconsole.desktop.in
@@ -1,10 +1,11 @@
[Desktop Entry]
Name=OpenJDK Monitoring & Management Console
+GenericName=OpenJDK Monitoring & Management Console
Comment=Monitor and manage OpenJDK applications
- Exec=/usr/bin/jconsole
+ Exec=@ABS_JAVA_HOME_DIR@/bin/jconsole
Icon=java
Terminal=false
Type=Application
@@ -15,16 +15,16 @@
-Categories=Development;Monitor;Java;
+Categories=Development;Profiling;
Version=1.0
-Index: icedtea6-1.4/policytool.desktop
+Index: icedtea6-1.11.1/policytool.desktop.in
===================================================================
---- icedtea6-1.4.orig/policytool.desktop
-+++ icedtea6-1.4/policytool.desktop
+--- icedtea6-1.11.1.orig/policytool.desktop.in
++++ icedtea6-1.11.1/policytool.desktop.in
@@ -1,10 +1,11 @@
[Desktop Entry]
Name=OpenJDK Policy Tool
+GenericName=OpenJDK Policy Tool
Comment=Manage OpenJDK policy files
- Exec=/usr/bin/policytool
+ Exec=@ABS_JAVA_HOME_DIR@/bin/policytool
Icon=java
Terminal=false
Type=Application
++++++ openjdk-6-src-b17-no-return-in-nonvoid-function-ppc.patch ++++++
--- /var/tmp/diff_new_pack.PojjN3/_old 2012-02-20 14:03:03.000000000 +0100
+++ /var/tmp/diff_new_pack.PojjN3/_new 2012-02-20 14:03:03.000000000 +0100
@@ -110,32 +110,6 @@
}
int AbstractInterpreter::size_activation(methodOop method,
-Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.hpp
-===================================================================
---- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.hpp
-+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.hpp
-@@ -41,6 +41,7 @@
- static int expr_tag_index_at(int i) {
- assert(TaggedStackInterpreter, "should not call this");
- Unimplemented();
-+ return 0; // make gcc happy
- }
-
- static int expr_offset_in_bytes(int i) {
-@@ -49,6 +50,7 @@
- static int expr_tag_offset_in_bytes(int i) {
- assert(TaggedStackInterpreter, "should not call this");
- Unimplemented();
-+ return 0; // make gcc happy
- }
-
- static int local_index_at(int i) {
-@@ -58,4 +60,5 @@
- static int local_tag_index_at(int i) {
- assert(TaggedStackInterpreter, "should not call this");
- Unimplemented();
-+ return 0; // make gcc happy
- }
Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp
===================================================================
--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp
@@ -399,14 +373,6 @@
}
#ifdef HOTSPOT_ASM
-@@ -234,6 +239,7 @@ JVM_handle_linux_signal(int sig,
-
- sprintf(buf, fmt, sig);
- fatal(buf);
-+ return 0; // make gcc happy
- }
-
- void os::Linux::init_thread_fpu_state(void) {
@@ -242,6 +248,7 @@ void os::Linux::init_thread_fpu_state(vo
int os::Linux::get_fpu_control_word() {
@@ -451,3 +417,32 @@
}
// These routines are only used on cpu architectures that
+--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp
2012/01/25 13:21:54 1.1
++++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp
2012/01/25 13:22:02
+@@ -28,6 +28,7 @@
+
+ int MethodHandles::adapter_conversion_ops_supported_mask() {
+ ShouldNotCallThis();
++ return 0;
+ }
+
+ void MethodHandles::generate_method_handle_stub(MacroAssembler* masm,
+--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/assembler_zero.cpp
2012/02/01 23:57:44 1.1
++++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/assembler_zero.cpp
2012/02/01 23:58:51
+@@ -57,6 +57,7 @@
+ RegisterOrConstant MacroAssembler::delayed_value_impl(
+ intptr_t* delayed_value_addr, Register tmpl, int offset) {
+ ShouldNotCallThis();
++ return RegisterOrConstant(tmpl);
+ }
+
+ void MacroAssembler::store_oop(jobject obj) {
+--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp
2012/02/01 23:59:21 1.1
++++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp
2012/02/01 23:59:38
+@@ -34,5 +34,6 @@
+ Register tmp,
+ int offset) {
+ ShouldNotCallThis();
++ return RegisterOrConstant(tmp);
+ }
+ };
++++++ openjdk-ecj-6-src-b22-no-werror.patch ++++++
Index: icedtea6-1.10.4/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make
===================================================================
--- icedtea6-1.10.4.orig/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make
+++ icedtea6-1.10.4/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make
@@ -60,8 +60,8 @@ CPPFLAGS += -DASSERT
# CFLAGS_WARN holds compiler options to suppress/enable warnings.
# Compiler warnings are treated as errors
-CFLAGS_WARN = -Werror
-CFLAGS += $(CFLAGS_WARN)
+#CFLAGS_WARN = -Werror
+#CFLAGS += $(CFLAGS_WARN)
OBJECTNAMES = \
adlparse.o \
Index: icedtea6-1.10.4/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make
===================================================================
--- icedtea6-1.10.4.orig/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make
+++ icedtea6-1.10.4/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make
@@ -135,7 +135,7 @@ else
ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
endif
-CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
+CFLAGS_WARN/DEFAULT = $(ACCEPTABLE_WARNINGS)
# Special cases
CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
Index: icedtea6-1.10.4/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make
===================================================================
--- icedtea6-1.10.4.orig/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make
+++ icedtea6-1.10.4/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make
@@ -116,7 +116,7 @@ endif
WARNINGS_ARE_ERRORS = -Werror
# Enable these warnings. See 'info gcc' about details on these options
ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
-CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS)
+CFLAGS_WARN/DEFAULT = $(ADDITIONAL_WARNINGS)
# Special cases
CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
Index: icedtea6-1.10.4/openjdk-ecj/corba/make/common/Defs-linux.gmk
===================================================================
--- icedtea6-1.10.4.orig/openjdk-ecj/corba/make/common/Defs-linux.gmk
+++ icedtea6-1.10.4/openjdk-ecj/corba/make/common/Defs-linux.gmk
@@ -143,9 +143,9 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G
#
# Treat compiler warnings as errors, if warnings not allowed
#
-ifeq ($(COMPILER_WARNINGS_FATAL),true)
- GCC_WARNINGS += -Werror
-endif
+#ifeq ($(COMPILER_WARNINGS_FATAL),true)
+# GCC_WARNINGS += -Werror
+#endif
#
# Misc compiler options
Index: icedtea6-1.10.4/openjdk-ecj/jdk/make/common/Defs-linux.gmk
===================================================================
--- icedtea6-1.10.4.orig/openjdk-ecj/jdk/make/common/Defs-linux.gmk
+++ icedtea6-1.10.4/openjdk-ecj/jdk/make/common/Defs-linux.gmk
@@ -153,9 +153,9 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G
#
# Treat compiler warnings as errors, if warnings not allowed
#
-ifeq ($(COMPILER_WARNINGS_FATAL),true)
- GCC_WARNINGS += -Werror
-endif
+#ifeq ($(COMPILER_WARNINGS_FATAL),true)
+# GCC_WARNINGS += -Werror
+#endif
#
# Misc compiler options
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
