Hello community,
here is the log from the commit of package java-1_6_0-openjdk for openSUSE:Factory
checked in at Fri Jul 30 14:37:18 CEST 2010.
--------
--- java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2010-05-27 10:03:20.000000000 +0200
+++ java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2010-07-29 10:15:35.000000000 +0200
@@ -1,0 +2,81 @@
+Wed Jul 28 12:08:30 UTC 2010 - mvyskocil@suse.cz
+
+- update to icedtea6-1.8.1 (bnc#623905)
+- update to openjdk-6-b18
+- Latest security updates and hardening patches:
+ * (CVE-2010-0837): JAR "unpack200" must verify input parameters (6902299)
+ * (CVE-2010-0845): No ClassCastException for HashAttributeSet constructors if run with -Xcomp (6894807)
+ * (CVE-2010-0838): CMM readMabCurveData Buffer Overflow Vulnerability (6899653)
+ * (CVE-2010-0082): Loader-constraint table allows arrays instead of only the base-classes (6626217)
+ * (CVE-2010-0095): Subclasses of InetAddress may incorrectly interpret network addresses (6893954)
+ * (CVE-2010-0085): File TOCTOU deserialization vulnerability (6736390)
+ * (CVE-2010-0091): Unsigned applet can retrieve the dragged information before drop action occurs (6887703)
+ * (CVE-2010-0088): Inflater/Deflater clone issues (6745393)
+ * (CVE-2010-0084): Policy/PolicyFile leak dynamic ProtectionDomains. (6633872)
+ * (CVE-2010-0092): AtomicReferenceArray causes SIGSEGV -> SEGV_MAPERR error (6888149)
+ * (CVE-2010-0094): Deserialization of RMIConnectionImpl objects should enforce stricter checks (6893947)
+ * (CVE-2010-0093): System.arraycopy unable to reference elements beyond Integer.MAX_VALUE bytes (6892265)
+ * (CVE-2010-0840): Applet Trusted Methods Chaining Privilege Escalation Vulnerability (6904691)
+ * (CVE-2010-0848): AWT Library Invalid Index Vulnerability (6914823)
+ * (CVE-2010-0847): ImagingLib arbitrary code execution vulnerability (6914866)
+ * (CVE-2009-3555): TLS: MITM attacks via session renegotiation
+- IcedTeaNPPlugin.
+ * RH524387: javax.net.ssl.SSLKeyException: RSA premaster secret error
+ * Set context classloader for all threads in an applet's threadgroup
+ * PR436: Close all applet threads on exit
+ * PR480: NPPlugin with NoScript extension.
+ * PR488: Question mark changing into underscore in URL.
+ * RH592553: Fix bug causing 100% CPU usage.
+ * Don't generate a random pointer from a pthread_t in the debug output.
+ * Add ForbiddenTargetException for legacy support.
+ * Use variadic macro for plugin debug message printing.
+ * Don't link the plugin with libxul libraries.
+ * Fix race conditions in plugin initialization code that were causing hangs.
+ * RH506730: BankID (Norwegian common online banking authentication system) applet fails to load.
+ * Fix policy evaluation to match the proprietary JDK.
+ * PR491: pass java_{code,codebase,archive} parameters to Java.
+ * Adds javawebstart.version property and give user permission to read that property.
+ * Old plugin removed; NPPlugin is now the default and is controlled by
+ --enable/disable-plugin. As with the old plugin, it produces a
+ IcedTeaPlugin.so library rather than IcedTeaNPPlugin.so.
+ * Dependence on the binary plugs mechanism removed. The plugin and NetX
+ code is now imported into the JDK build in the same manner as langtools,
+ CORBA, JAXP and JAXWS.
+ * Fix for plugin buffer overflow: https://bugzilla.mozilla.org/show_bug.cgi?id=555342
+- NetX:
+ * Fix security flaw in NetX that allows arbitrary unsigned apps to set
+ any java property.
+ * Fix a flaw that allows unsigned code to access any file on the
+ machine (accessible to the user) and write to it.
+ * Make path sanitization consistent; use a blacklisting approach.
+ * Make the SingleInstanceServer thread a daemon thread.
+ * Handle JNLP files which use native libraries but do not indicate it
+ * Allow JNLP classloaders to share native libraries
+ * Added encoding support
+- bug fixes
+ * Nimbus Look 'n' Feel backported from OpenJDK7.
+ * JAXP and JAXWS now external dependencies rather than being in-tree.
+ * 6639665: ThreadGroup finalizer allows creation of false root ThreadGroups
+ * 6898622: ObjectIdentifer.equals is not capable of detecting incorrectly encoded CommonName OIDs
+ * 6910590: Application can modify command array in ProcessBuilder
+ * 6909597: JPEGImageReader stepX Integer Overflow Vulnerability
+ * 6932480: Crash in CompilerThread/Parser. Unloaded array klass?
+ * 6678385: Fixes jvm crashes when window is resized.
+ * Produces the "expected" behavior for full screen applications, when
+ running the Metacity window manager.
+ * Fix issue with ant -diagnostics on ant 1.8.0 due to changed exit code
+ * Zero/Shark
+ * Shark is now able to build itself.
+ * For ARM, add Thumb2 JIT.
+ * Fixed Shark sharkCompiler mattr memory corruption bug when using llvm 2.7.
+ * others
+ http://blogs.sun.com/darcy/resource/OpenJDK_6/openjdk6-b18-changes-summary.h...
+ * Eliminate spurious exception throwing when using PulseAudio
+ * PR shark/483: Fix miscompilation of sun.misc.Unsafe::getByte.
+ * PR PR icedtea/324, icedtea/481: Fix Shark VM crash.
+ * Fix Zero build on Hitachi SH.
+ * PR476: Enable building SystemTap support on GCC 4.5.
+- disabled systemtap support on openSUSE 11.2, as it requires more recent version
+- require xulrunner191 on 11.1 too
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
icedtea6-1.7.3.tar.bz2
netbeans-profiler-visualvm_release65_mod.tar.bz2
openjdk-6-src-b17-14_oct_2009-fedora.tar.bz2
visualvm-111-src.tar.bz2
New:
----
icedtea6-1.8.1.tar.bz2
java-1.6.0-openjdk-visualvm-update.patch
jdk6-jaf-2009_10_27.zip
jdk6-jaxp-2009_10_13.zip
jdk6-jaxws-2009_10_27.zip
netbeans-profiler-visualvm_release68_1.tar.gz
openjdk-6-src-b18-16_feb_2010-fedora.tar.bz2
visualvm_122-src.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_6_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.qdoXOf/_old 2010-07-30 14:02:04.000000000 +0200
+++ /var/tmp/diff_new_pack.qdoXOf/_new 2010-07-30 14:02:04.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package java-1_6_0-openjdk (Version 1.6.0.0_b17)
+# spec file for package java-1_6_0-openjdk (Version 1.6.0.0_b18)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -16,26 +16,51 @@
#
+# Turn on/off some features depending on openSUSE version
+%define with_systemtap 0
+
+%ifarch %{jit_arches}
+%if 0%{?suse_version} >= 1130
+%define with_systemtap 1
+%endif
+%endif
+
%define gcjbootstrap 0
+
+# If runtests is 0 test suites will not be run.
%define runtests 0
-%define icedteaver 1.7.3
+
+%define icedteaver 1.8.1
%define icedteasnapshot %{nil}
-%define openjdkver b17
-%define openjdkdate 14_oct_2009
+%define openjdkver b18
+%define openjdkdate 16_feb_2010
+
+%define jaxpdate 2009_10_13
+%define jafdate 2009_10_27
+%define jaxwsdate 2009_10_27
+
%define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
+
%define accessmajorver 1.23
%define accessminorver 0
%define accessver %{accessmajorver}.%{accessminorver}
%define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/
-%define visualvmurl https://visualvm.dev.java.net/files/documents/7163/127170/
-%define netbeansurl http://icedtea.classpath.org/visualvm/
-%define hotspoturl http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/
-%define hotspotsnapshot %{nil}
+
+%define jaxpurl https://jaxp.dev.java.net/files/documents/913/147491/
+%define jafurl http://kenai.com/projects/jdk6-drops/downloads/download/
+%define jaxwsurl http://kenai.com/projects/jdk6-drops/downloads/download/
+
+%define visualvmurl https://visualvm.dev.java.net/files/documents/7163/146746/
+%define netbeansurl https://visualvm.dev.java.net/files/documents/7163/150173/
+
%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 mauvedate 2008-10-22
+
%define multilib_arches ppc64 sparc64 x86_64
+
%define jit_arches %{ix86} x86_64
%ifarch %{ix86}
%define archbuild i586
@@ -54,6 +79,7 @@
%ifnarch %{jit_arches}
%define runtests 0
%endif
+
%define buildoutputdir openjdk/build/linux-%{archbuild}
# Convert an absolute path to a relative path. Each symbolic link is
# specified relative to the directory in which it is installed so that
@@ -70,7 +96,7 @@
%endif
# Standard JPackage naming and versioning defines.
%define origin openjdk
-%define priority 17104
+%define priority 17105
%define javaver 1.6.0
%define buildver 0
# Hard-code libdir on 64-bit architectures to make the 64-bit JDK
@@ -93,28 +119,36 @@
# macros from Sun package to make them similar
%define pluginsdir %{_libdir}/browser-plugins
%define pluginpath %{_jvmdir}/%{jrelnk}/lib/%{archinstall}
-%if 0%{?suse_version} >= 1120
-%define pluginname IcedTeaNPPlugin.so
-%else
+# From icedtea 1.8 the new plugin is on;ly one available and is named
+# IcedTeaPlugin.so (again)
%define pluginname IcedTeaPlugin.so
-%endif
# For openSUSE >= 11.2 demo, sample and src.zip is noarch ==> share
%define sdkshare %{_datadir}/%{sdkname}
-Name: java-1_6_0-openjdk
-%define obsoletes java-1_7_0-icedtea
-# As 1.6.0 is stable, obsolete java-1_7_0-icedtea in openSUSE 11.0 and earlier:
-%if 0%{?suse_version} <= 1100
-Obsoletes: %obsoletes
+%ifarch %{jit_arches}
+# Where to install systemtap tapset (links)
+# We would like these to be in a package specific subdir,
+# but currently systemtap doesn't support that, so we have to
+# use the root tapset dir for now. To distinquish between 64
+# and 32 bit architectures we place the tapsets under the arch
+# specific dir (note that systemtap will only pickup the tapset
+# for the primary arch for now). Systemtap uses the machine name
+# aka build_cpu as architecture specific directory name.
+#%define tapsetdir /usr/share/systemtap/tapset/%{sdkdir}
+%define tapsetdir %{_datadir}/systemtap/tapset/%{_build_cpu}
%endif
+
+Name: java-1_6_0-openjdk
Version: 1.6.0.0_%{openjdkver}
-Release: 5
+Release: 1
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
Url: http://openjdk.java.net/
# hg clone http://icedtea.classpath.org/hg/icedtea6-%{icedteaver} icedtea6-%{icedteaver}
# tar --exclude-vcs -cjf icedtea6-%{icedteaver}%{icedteasnapshot}.tar.bz2 icedtea6-%{icedteaver}
+# XXX: The 1.8.1 release provided by Matthias Klose (doko at cannonical)! Thanks
+# http://people.canonical.com/~doko/tmp/hidden/hdsf76dsaf/icedtea6-1.8.1.tar.g...
Source0: %{url}icedtea6-%{icedteaver}%{icedteasnapshot}.tar.bz2
# # download the openjdk from http://download.java.net/openjdk/jdk6/promoted/latest/
# sh generate-fedora-zip.sh openjdk-6-src-%{openjdkver}-%{openjdkdate}.tar.gz
@@ -126,8 +160,11 @@
Source5: mauve-%{mauvedate}.tar.bz2
# from Fedora rpm
Source6: mauve_tests
-Source7: %{visualvmurl}/netbeans-profiler-visualvm_release65_mod.tar.bz2
-Source8: %{visualvmurl}/visualvm-111-src.tar.bz2
+Source7: %{netbeansurl}/netbeans-profiler-visualvm_release68_1.tar.gz
+Source8: %{visualvmurl}/visualvm_122-src.tar.gz
+Source9: %{jafurl}jdk6-jaf-%{jafdate}.zip
+Source10: %{jaxpurl}jdk6-jaxp-%{jaxpdate}.zip
+Source11: %{jaxwsurl}jdk6-jaxws-%{jaxwsdate}.zip
Source1000: java-1_6_0-openjdk-rpmlintrc
# those properties are for opeSUSE only
Source1001: fontconfig.SuSE.properties
@@ -139,6 +176,7 @@
Patch2: java-1.6.0-openjdk-java-access-bridge-idlj.patch
Patch3: java-1.6.0-openjdk-java-access-bridge-security.patch
Patch4: java-1.6.0-openjdk-accessible-toolkit.patch
+Patch5: java-1.6.0-openjdk-visualvm-update.patch
# SUSE patches
Patch104: openjdk-6-src-b09-gcc4-warningfixes.patch
Patch107: openjdk-6-src-b14-no-return-in-nonvoid-function.patch
@@ -183,7 +221,6 @@
BuildRequires: cups-devel
BuildRequires: desktop-file-utils
BuildRequires: giflib-devel
-BuildRequires: openmotif-devel
BuildRequires: xorg-x11
BuildRequires: xorg-x11-proto-devel
BuildRequires: libjpeg-devel
@@ -195,6 +232,7 @@
BuildRequires: xerces-j2-bootstrap
#!BuildIgnore: xerces-j2 xml-commons-resolver xml-commons-apis xml-commons
BuildRequires: ant
+BuildRequires: ant-nodeps
BuildRequires: zip
%if %{gcjbootstrap}
BuildRequires: ecj-bootstrap java-1_5_0-gcj-compat-devel
@@ -219,24 +257,20 @@
BuildRequires: glib2-devel
BuildRequires: gtk2-devel
BuildRequires: mozilla-nspr-devel
-%if 0%{?suse_version} == 1130
+%if 0%{?suse_version} >= 1130
BuildRequires: mozilla-xulrunner192-devel
%endif
-%if 0%{?suse_version} == 1120
+%if 0%{?suse_version} <= 1120
+# in case of 11.1 needs to build against openSUSE:11:Update repo
BuildRequires: mozilla-xulrunner191-devel
%endif
-%if 0%{?suse_version} <= 1110
-BuildRequires: mozilla-xulrunner190-devel
-%endif
# pulse audio requirements
BuildRequires: libpulse-devel >= 0.9.11
BuildRequires: pulseaudio >= 0.9.11
-%ifarch %{jit_arches}
#system tap
-%if 0%{?suse_version} >= 1120
+%if %{with_systemtap}
BuildRequires: systemtap-sdt-devel >= 1.0
%endif
-%endif
# Zero-assembler build requirement.
%ifnarch %{jit_arches}
BuildRequires: libffi-devel
@@ -249,14 +283,13 @@
BuildRequires: perl
BuildRequires: update-desktop-files
%endif
+
# the certificates will converted in a prep to standard keystore file - cacerts
# The openssl requirment seems to be necessary for build only.
# 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
@@ -276,11 +309,9 @@
%else
Requires(pre): update-alternatives
%endif
-%ifarch %{jit_arches}
-%if 0%{?suse_version} >= 1120
+%if %{with_systemtap}
Recommends: systemtap >= 1.0
%endif
-%endif
# Standard JPackage base provides.
Provides: java-1.6.0-openjdk = %{version}-%{release}
Provides: jre-%{javaver}-%{origin} = %{version}-%{release}
@@ -339,10 +370,6 @@
%package devel
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:
-%if 0%{?suse_version} <= 1100
-Obsoletes: %obsoletes-devel
-%endif
Summary: Java SDK based on OpenJDK 6 and IcedTea 6
Group: Development/Languages/Java
Requires: %{name} = %{version}-%{release}
@@ -373,9 +400,6 @@
%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:
-%if 0%{?suse_version} <= 1100
-Obsoletes: %obsoletes-demo
-%endif
Summary: Sources for building demo applications with OpenJDK 6
Group: Development/Languages/Java
Provides: java-1.6.0-openjdk-demo = %{version}-%{release}
@@ -394,9 +418,6 @@
%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:
-%if 0%{?suse_version} <= 1100
-Obsoletes: %obsoletes-src
-%endif
Summary: OpenJDK 6 Java class sources for developers
Group: Development/Languages/Java
Requires: %{name}-devel = %{version}-%{release}
@@ -414,9 +435,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:
-%if 0%{?suse_version} <= 1100
-Obsoletes: %obsoletes-javadoc
-%endif
Summary: Documentation of the Java API of OpenJDK 6
Group: Development/Languages/Java
Requires(pre): %{_sbindir}/update-alternatives
@@ -437,9 +455,6 @@
%package plugin
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:
-%if 0%{suse_version} <= 1100
-Obsoletes: %obsoletes-plugin
-%endif
Summary: Java web browser plugin based on OpenJDK 6 and IcedTea 6
Group: Development/Languages/Java
Requires: %{name} = %{version}-%{release}
@@ -467,8 +482,11 @@
%setup -q -n icedtea6-%{icedteaver} -T -D -a 5
%setup -q -n icedtea6-%{icedteaver} -T -D -a 2
%patch0 -b .optflags
+%patch5 -b .visualvm
%patch124 -p1 -b .no-return-in-non-void
%patch1000 -p1
+
+cp %{SOURCE6} .
cp %{SOURCE7} .
cp %{SOURCE8} .
@@ -480,16 +498,21 @@
%{configure} \
%ifarch %{jit_arches}
%if 0%{?suse_version} >= 1120
- --enable-systemtap \
--enable-nio2 \
%endif
+%if %{with_systemtap}
+ --enable-systemtap \
+%endif
--with-abs-install-dir=%{_jvmdir}/%{sdkdir} \
%endif
%if 0%{?suse_version} >= 1120
--enable-pulse-java \
--enable-nss \
- --enable-npplugin \
+ --enable-plugin \
%endif
+ --with-jaf-drop-zip=%{SOURCE9} \
+ --with-jaxp-drop-zip=%{SOURCE10} \
+ --with-jaxws-drop-zip=%{SOURCE11} \
--with-openjdk=%{_jvmdir}/%{sdkdir} \
--with-openjdk-src-zip=%{SOURCE1} \
--with-pkgversion=suse-%{release}-%{_arch}
@@ -512,7 +535,8 @@
%ifarch ppc ppc64
patch -l -p0 -i %{PATCH110}
%endif
-patch -l -p0 -i %{PATCH112}
+# Seems upstreamed
+#patch -l -p0 -i %{PATCH112}
patch -l -p1 -i %{PATCH114}
patch -l -p1 -i %{PATCH117}
patch -l -p1 -i %{PATCH118}
@@ -526,6 +550,7 @@
make
export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
+
# ========== a default keystore ==========
# a cacerts generation
if [ -f %{buildoutputdir}/j2sdk-image/jre/lib/security/cacerts ]; then
@@ -542,6 +567,7 @@
yes | $JAVA_HOME/jre/bin/keytool -import -alias ${ALIAS} -keystore %{buildoutputdir}/j2sdk-image/jre/lib/security/cacerts -storepass 'changeit' -file ${ALIAS}.pem
rm ${ALIAS}.pem
done
+
# ========== java access bridge ==========
pushd java-access-bridge-%{accessver}
patch -l -p1 < %{PATCH1}
@@ -554,6 +580,7 @@
cp -a bridge/accessibility.properties $JAVA_HOME/jre/lib
cp -a gnome-java-bridge.jar $JAVA_HOME/jre/lib/ext
popd
+
%if %{runtests}
# Run jtreg test suite.
{
@@ -567,6 +594,7 @@
rm -f Xvfb.pid
echo ====================JTREG TESTING END====================
} || :
+
# Run Mauve test suite.
{
pushd mauve-%{mauvedate}
@@ -609,6 +637,16 @@
# bnc#438674
# Install a fontconfig file which don't reffer to agfa-fonts on openSUSE
cp %{S:1001} $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/
+
+%if %{with_systemtap}
+ # Install systemtap support files.
+ cp -a tapset $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
+ install -d -m 755 $RPM_BUILD_ROOT%{tapsetdir}
+ pushd $RPM_BUILD_ROOT%{tapsetdir}
+ RELATIVE=$(%{abs2rel} %{_jvmdir}/%{sdkdir}/tapset %{tapsetdir})
+ ln -sf $RELATIVE/*.stp .
+ popd
+%endif
# Install extension symlinks.
install -d -m 755 $RPM_BUILD_ROOT%{jvmjardir}
pushd $RPM_BUILD_ROOT%{jvmjardir}
@@ -632,19 +670,24 @@
ln -sf $jar $(echo $jar | sed "s|-%{version}.jar|.jar|g")
done
popd
+
# Install JCE policy symlinks.
install -d -m 755 $RPM_BUILD_ROOT%{_jvmprivdir}/%{archname}/jce/vanilla
+
# Install versionless symlinks.
pushd $RPM_BUILD_ROOT%{_jvmdir}
ln -sf %{jredir} %{jrelnk}
ln -sf %{sdkdir} %{sdklnk}
popd
+
pushd $RPM_BUILD_ROOT%{_jvmjardir}
ln -sf %{sdkdir} %{jrelnk}
ln -sf %{sdkdir} %{sdklnk}
popd
+
# Remove javaws man page.
rm -f man/man1/javaws.1
+
# Install man pages.
install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1
for manpage in man/man1/*
@@ -658,7 +701,7 @@
# Install demos and samples.
cp -a demo $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
# enable short-circuit
- [ ! -d sample/rmi ] && mkdir sample/rmi
+ mkdir -p sample/rmi
[ -f bin/java-rmi.cgi ] && mv bin/java-rmi.cgi sample/rmi
cp -a sample $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
@@ -680,14 +723,6 @@
popd
popd
%endif
-
- %ifarch %{jit_arches}
- %if 0%{?suse_version} >= 1120
- # systemtap support
- install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}/systemtap/tapset/
- install -m 0644 tapset/hotspot.stp $RPM_BUILD_ROOT/%{_datadir}/systemtap/tapset/
- %endif
- %endif
popd
# Install Javadoc documentation.
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
@@ -698,6 +733,7 @@
openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java.png
done
+
# Install desktop files.
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps}
cp javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -761,12 +797,15 @@
# 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}
+
# bnc496378 - check the size of installed cacerts
# 32 bytes means a default empty one
if [[ $(stat -c "%s" $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir}/lib/security/cacerts) == "32" ]]; then
@@ -956,6 +995,9 @@
fi
%post plugin
+# The new icedtea plugin has been renamed back to IcedTeaPlugin.so
+alternatives --remove %{javaplugin} \
+ %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaNPPlugin.so 2>/dev/null || :
update-alternatives \
--install %{pluginsdir}/javaplugin.so javaplugin \
%{pluginpath}/%{pluginname} %{priority}
@@ -963,7 +1005,7 @@
%postun plugin
if [ $1 -eq 0 ]
then
- update-alternatives --remove javaplugin \
+update-alternatives --remove javaplugin \
%{pluginpath}/%{pluginname}
fi
@@ -987,8 +1029,8 @@
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/cacerts
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
+%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/nss.cfg
%if %{suse_version} >= 1120
-%{_jvmdir}/%{jredir}/lib/security/nss.cfg
# links to the demo and sample dirs in noarch subpackages
%{_jvmdir}/%{sdkdir}/demo
%{_jvmdir}/%{sdkdir}/sample
@@ -1023,10 +1065,12 @@
%dir %{_jvmdir}/%{sdkdir}/bin
%dir %{_jvmdir}/%{sdkdir}/include
%dir %{_jvmdir}/%{sdkdir}/lib
-%ifarch %{jit_arches}
-%if 0%{?suse_version} >= 1120
-%{_datadir}/systemtap
-%endif
+%if %{with_systemtap}
+%dir %{_datadir}/systemtap/tapset
+%dir %{tapsetdir}
+%dir %{_jvmdir}/%{sdkdir}/tapset
+%{tapsetdir}/*
+%{_jvmdir}/%{sdkdir}/tapset/*
%endif
%{_jvmdir}/%{sdkdir}/bin/*
%{_jvmdir}/%{sdkdir}/include/*
++++++ icedtea6-1.7-no-return-in-non-void.patch ++++++
--- /var/tmp/diff_new_pack.qdoXOf/_old 2010-07-30 14:02:04.000000000 +0200
+++ /var/tmp/diff_new_pack.qdoXOf/_new 2010-07-30 14:02:04.000000000 +0200
@@ -1,11 +1,11 @@
-Index: icedtea6-1.7/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
+Index: icedtea6-1.8.1/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
===================================================================
---- icedtea6-1.7.orig/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc 2010-01-15 21:05:54.000000000 +0100
-+++ icedtea6-1.7/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc 2010-03-04 09:38:42.077510759 +0100
-@@ -729,6 +729,7 @@
+--- icedtea6-1.8.1.orig/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
++++ icedtea6-1.8.1/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
+@@ -788,6 +788,7 @@ queue_processor(void* data)
}
- PLUGIN_DEBUG_0ARG("Queue processing stopped.\n");
+ PLUGIN_DEBUG("Queue processing stopped.\n");
+ return NULL;
}
++++++ icedtea6-1.7.3.tar.bz2 -> icedtea6-1.8.1.tar.bz2 ++++++
++++ 111073 lines of diff (skipped)
++++++ java-1.6.0-openjdk-java-access-bridge-security.patch ++++++
--- /var/tmp/diff_new_pack.qdoXOf/_old 2010-07-30 14:02:06.000000000 +0200
+++ /var/tmp/diff_new_pack.qdoXOf/_new 2010-07-30 14:02:06.000000000 +0200
@@ -1,5 +1,5 @@
---- openjdk/jdk/src/share/lib/security/java.security.prev 2009-09-09 10:50:09.813179147 +0100
-+++ openjdk/jdk/src/share/lib/security/java.security 2009-09-09 10:50:55.458176705 +0100
+--- jsorig 2008-12-05 11:43:39.000000000 -0500
++++ openjdk/jdk/src/share/lib/security/java.security 2008-12-05 11:43:45.000000000 -0500
@@ -127,7 +127,7 @@
# passed to checkPackageAccess unless the
# corresponding RuntimePermission ("accessClassInPackage."+package) has
++++++ java-1.6.0-openjdk-visualvm-update.patch ++++++
-- a/Makefile.am Thu Apr 22 11:16:37 2010 +0200
+++ Makefile.am Fri Apr 23 11:08:23 2010 +0200
@@ -10,13 +10,13 @@ CACAO_BASE_URL = http://www.complang.tuw
CACAO_BASE_URL = http://www.complang.tuwien.ac.at
CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/download/cacao-$(CACAO_VERSION)/
-NETBEANS_PROFILER_MD5SUM = a6756a62291ebea5c0e2431389b31380
-NETBEANS_PROFILER_URL = http://icedtea.classpath.org/visualvm/
-NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release65_mod.tar.gz
+NETBEANS_PROFILER_MD5SUM = 517b66f76914970569a8add1ee96bcaf
+NETBEANS_PROFILER_URL = https://visualvm.dev.java.net/files/documents/7163/150173/
+NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release68_1.tar.gz
-VISUALVM_MD5SUM = a289739f4a5bcdb9a2c642cfcc1e83fe
-VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/127170/
-VISUALVM_SRC_ZIP = visualvm-111-src.tar.gz
+VISUALVM_MD5SUM = f1e2525ddcd5fdf97bcf891d715c08ff
+VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/146746/
+VISUALVM_SRC_ZIP = visualvm_122-src.tar.gz
JAXWS_DROP_URL = http://kenai.com/projects/jdk6-drops/downloads/download
JAXWS_DROP_ZIP = jdk6-jaxws-2009_10_27.zip
@@ -154,10 +154,8 @@ endif
if WITH_VISUALVM
NB_PLATFORM= $(shell ls /usr/share/netbeans | grep platform | tail -n1)
-NB_APISUPPORT=$(shell ls /usr/share/netbeans | grep apisupport | tail -n1)
else
NB_PLATFORM=
-NB_APISUPPORT=
endif
if ENABLE_PULSE_JAVA
@@ -1732,16 +1730,15 @@ if WITH_VISUALVM
rm nbbuild/external/binaries-list ; \
mkdir -p ./nbbuild/netbeans_visualvm/ ; \
ln -s $(SYSTEM_NETBEANS_DIR)/$(NB_PLATFORM)/ ./nbbuild/netbeans_visualvm/$(NB_PLATFORM) ; \
- ln -s $(SYSTEM_NETBEANS_DIR)/$(NB_APISUPPORT)/ ./nbbuild/netbeans_visualvm/$(NB_APISUPPORT) ; \
ln -s $(SYSTEM_NETBEANS_DIR)/harness/ ./nbbuild/netbeans_visualvm/harness ; \
if ! (uname -a | grep x86_64) ; then \
mkdir -p lib.profiler/release/lib/deployed/jdk15/linux ; \
mkdir -p lib.profiler/release/lib/deployed/jdk16/linux ; \
- buildscript=./buildnative-linux-15.sh ; \
+ buildscript=./buildnative-linux.sh ; \
else \
mkdir -p lib.profiler/release/lib/deployed/jdk15/linux-amd64 ; \
mkdir -p lib.profiler/release/lib/deployed/jdk16/linux-amd64 ; \
- buildscript=./buildnative-linux64-15.sh ; \
+ buildscript=./buildnative-linux64.sh ; \
fi ; \
cd lib.profiler/native/build ; \
JAVA_HOME_15=$(ICEDTEA_HOME) JAVA_HOME_16=$(ICEDTEA_HOME) \
@@ -1749,9 +1746,9 @@ if WITH_VISUALVM
cd ../../.. ; \
JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true \
-f nbbuild/build.xml bootstrap ; \
- for dir in lib.profiler lib.profiler.ui lib.profiler.common profiler ; do \
- JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true -Dbuildnumber=081204 \
- -Dnetbeans.dest.dir=../nbbuild/netbeans_visualvm \
+ for dir in lib.profiler lib.profiler.charts lib.profiler.ui lib.profiler.common profiler profiler.oql ; do \
+ JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true -Dbuildnumber=091221-4fc006d17cb1 \
+ -Dnetbeans.dest.dir=$(abs_top_builddir)/netbeans/nbbuild/netbeans_visualvm \
-f $$dir/build.xml ; \
done
endif
++++++ java-1_6_0-openjdk-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.qdoXOf/_old 2010-07-30 14:02:06.000000000 +0200
+++ /var/tmp/diff_new_pack.qdoXOf/_new 2010-07-30 14:02:06.000000000 +0200
@@ -4,6 +4,7 @@
# those patches are applied in %build phase after unpacking of openjdk
# this is a false positive
addFilter("patch-not-applied Patch1")
+addFilter("patch-not-applied Patch2")
addFilter("patch-not-applied Patch3")
addFilter("patch-not-applied Patch4")
addFilter("patch-not-applied Patch104")
@@ -12,3 +13,6 @@
addFilter("patch-not-applied Patch107")
addFilter("patch-not-applied Patch108")
addFilter("patch-not-applied Patch109")
+
+# no need to fix this warning in demo package
+addFilter("shared-lib-calls-exit .*demo")
++++++ openjdk-6-src-b17-no-multiline-comments.patch ++++++
--- /var/tmp/diff_new_pack.qdoXOf/_old 2010-07-30 14:02:06.000000000 +0200
+++ /var/tmp/diff_new_pack.qdoXOf/_new 2010-07-30 14:02:06.000000000 +0200
@@ -1,76 +1,3 @@
-Index: icedtea6-1.7/IcedTeaPlugin.cc
-===================================================================
---- icedtea6-1.7.orig/IcedTeaPlugin.cc
-+++ icedtea6-1.7/IcedTeaPlugin.cc
-@@ -594,12 +594,14 @@ char const* TYPES[10] = { "Object",
- PROCESS_PENDING_EVENTS_REF (reference); \
- } \
- *result = ParseValue (type, resultC->returnValue);
-+/*
- // \
- // char* valueString = ValueString (type, *result); \
- // printf ("RECEIVE_VALUE: %s result: %x = %s\n", \
- // __func__, result, valueString); \
- // free (valueString); \
- // valueString = NULL;
-+*/
-
- #define MESSAGE_RECEIVE_SIZE(reference, result) \
- PRBool processed = PR_FALSE; \
-@@ -620,9 +622,11 @@ char const* TYPES[10] = { "Object",
- *result = resultC->returnValue.ToInteger (&conversionResult); \
- PLUGIN_CHECK ("parse integer", conversionResult); \
- }
-+/*
- // \
- // printf ("RECEIVE_SIZE: %s result: %x = %d\n", \
- // __func__, result, *result);
-+*/
-
- // strdup'd string must be freed by calling function.
- #define MESSAGE_RECEIVE_STRING(reference, char_type, result) \
-@@ -644,9 +648,11 @@ char const* TYPES[10] = { "Object",
- *result = reinterpret_cast