[java-1.6.0-openjdk] sync with f15
jiri vanek
jvanek at fedoraproject.org
Wed Jun 8 10:12:35 UTC 2011
commit 3fd7b0a7e5fb1952580f621e2eeabe0cb59575a4
Author: Jiri Vanek <jvanek at dhcp-2-137.brq.redhat.com>
Date: Wed Jun 8 12:08:06 2011 +0200
sync with f15
java-1.6.0-openjdk.spec | 68 ++++++++++++++++++++++++++++++----------------
sources | 4 +-
2 files changed, 46 insertions(+), 26 deletions(-)
---
diff --git a/generate-fedora-zip.sh b/generate-fedora-zip.sh
old mode 100644
new mode 100755
diff --git a/java-1.6.0-openjdk.spec b/java-1.6.0-openjdk.spec
index 6224199..26abc39 100644
--- a/java-1.6.0-openjdk.spec
+++ b/java-1.6.0-openjdk.spec
@@ -6,7 +6,7 @@
# If runtests is 0 test suites will not be run.
%define runtests 0
-%define icedteaver 1.10
+%define icedteaver 1.10.2
%define icedteasnapshot %{nil}
%define openjdkver b22
%define openjdkdate 28_feb_2011
@@ -18,7 +18,7 @@
%define accessver %{accessmajorver}.%{accessminorver}
%define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/
-%define hotspoturl http://hg.openjdk.java.net/hsx/hsx19/master/archive/
+%define hotspoturl http://hg.openjdk.java.net/hsx/hsx20/master/archive/
%define jaxpurl https://jaxp.dev.java.net/files/documents/913/150648/
%define jafurl https://jax-ws.dev.java.net/files/documents/4202/150725/
%define jaxwsurl https://jax-ws.dev.java.net/files/documents/4202/150724/
@@ -72,9 +72,9 @@
%endif
%else
%ifarch %{jit_arches}
-%define icedteaopt --with-jdk-home=/usr/lib/jvm/java-openjdk --enable-systemtap
+%define icedteaopt --disable-bootstrap --with-jdk-home=/usr/lib/jvm/java-openjdk --enable-systemtap
%else
-%define icedteaopt --with-jdk-home=/usr/lib/jvm/java-openjdk
+%define icedteaopt --disable-bootstrap --with-jdk-home=/usr/lib/jvm/java-openjdk
%endif
%endif
@@ -139,7 +139,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: 55.%{icedteaver}%{?dist}
+Release: 58.%{icedteaver}%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -175,7 +175,6 @@ 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: makefile-xalan-deps.patch
-Patch6: java-1.6.0-openjdk-fix-RA.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -199,7 +198,6 @@ BuildRequires: ant
BuildRequires: ant-nodeps
BuildRequires: libXinerama-devel
BuildRequires: rhino
-BuildRequires: libstdc++-static
%if %{gcjbootstrap}
BuildRequires: java-1.5.0-gcj-devel
%else
@@ -369,10 +367,11 @@ export ARCH_DATA_MODEL=64
%ifarch alpha
export CFLAGS="$CFLAGS -mieee"
%endif
-./autogen.sh
patch -l -p0 < %{PATCH5}
+./autogen.sh
+
./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
--with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
--with-hotspot-build=hs20 --with-hotspot-src-zip=%{SOURCE7} \
@@ -384,9 +383,6 @@ make stamps/patch-ecj.stamp
%endif
make patch
-%ifarch i686 i386
-patch -l -p0 < %{PATCH6}
-%endif
patch -l -p0 < %{PATCH3}
patch -l -p0 < %{PATCH4}
make
@@ -887,12 +883,45 @@ exit 0
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}
-
%changelog
+* Tue Jun 06 2011 Jiri Vanek <jvanek at redhat.com> - 1:1.6.0.0-58.1.10.2
+- Resolves: rhbz#709375
+- Bumped to IcedTea6 1.10.2
+- RH706250, S6213702, CVE-2011-0872: (so) non-blocking sockets with TCP urgent
+ disabled get still selected for read ops (win)
+- RH706106, S6618658, CVE-2011-0865: Vulnerability in deserialization
+- RH706111, S7012520, CVE-2011-0815: Heap overflow vulnerability in
+ FileDialog.show() (win)
+- RH706139, S7013519, CVE-2011-0822, CVE-2011-0862: Integer overflows in 2D
+ code
+- RH706153, S7013969, CVE-2011-0867: NetworkInterface.toString can reveal
+ bindings
+- RH706234, S7013971, CVE-2011-0869: Vulnerability in SAAJ
+- RH706239, S7016340, CVE-2011-0870: Vulnerability in SAAJ
+- RH706241, S7016495, CVE-2011-0868: Crash in Java 2D transforming an image
+ with scale close to zero
+- RH706248, S7020198, CVE-2011-0871: ImageIcon creates Component with null acc
+- RH706245, S7020373, CVE-2011-0864: JSR rewriting can overflow memory address
+ size variables
+
+* Tue Apr 19 2011 Deepak Bhole <dbhole at redhat.com> 1:1.6.0.0-57.1.10.1
+- Updated to IcedTea6 1.10.1
+- Added --disable-bootstrap switch for non-bootstrap builds
+- Updated hotspot tarball to hs20-b11 (f0f676c5a2c6)
+- Removed java-1.6.0-openjdk-fix-RA.patch (in icedTea6 1.10.1)
+
+* Tue Apr 13 2011 Jiri Vanek <javenk at redhat.com> 1:1.6.0.0-57.1.10
+- removed BuildRequires: libstdc++-static as it is fixed upstream
+- added information for icedtea6.1.10 fixlist: http://blog.fuseyism.com/index.php/2011/04/04/icedtea6-1101-released/
+
+
+* Tue Apr 12 2011 Dan Horák <dan[at]danny.cz> 1:1.6.0.0-56.1.10
+- fix autogen vs. patch5 order
+
* Tue Mar 15 2011 Jiri Vanek <javenk at redhat.com> 1:1.6.0.0-55.1.10
-removed plugin
--bumped to icedtea 1.10
--./configure adaptted for icedtea 1.10
+-bumped to icedtea6 1.10
+-./configure adapted for icedtea6 1.10
-added newest hotspot 20
-bumped to openjdk b22
-added patch5 makefile-xalan-deps.patch to sutisfy xalan dependencies.
@@ -929,16 +958,7 @@ exit 0
* Fri Jan 28 2011 Jiri Vanek <jvanek at redhat.com> 1:1.6.0.0-51.1.9.5
- updated to icedtea 1.9.5
-- Resolves: rhbz#672262
-- Security updates
- - RH672262, CVE-2011-0025: IcedTea jarfile signature verification bypass
-- Backports
- - S6687968: PNGImageReader leaks native memory through an Inflater
- - S6541476, RH665355: PNG imageio plugin incorrectly handles iTXt chunk
- - S6782079: PNG: reading metadata may cause OOM on truncated images
-- Fixes
- - RH647157, RH582455: Update fontconfig files for rhel 6
- - PR619: Improper finalization by the plugin can crash the browser
+- http://blog.fuseyism.com/index.php/2011/02/01/security-icedtea6-178-185-195-released/
* Tue Jan 18 2011 Jiri Vanek <jvanek at redhat.com> - 1:1.6.0.0-50.1.9.4
- updated to iced tea 1.9.4
diff --git a/sources b/sources
index b78f4f6..ccb1a1c 100644
--- a/sources
+++ b/sources
@@ -5,5 +5,5 @@ c12f124672a97c7491530fed2c0facdc java-access-bridge-1.23.0.tar.bz2
ef7a8b3624ea904bf584bc46d79b5e75 jaxp144_01.zip
91adfd41e6f001add4f92ae31216b1e3 jdk6-jaxws-b20.zip
bc95c133620bd68c161cac9891592901 jdk6-jaf-b20.zip
-2791c8009eefee305538c81328a8dfd2 hotspot.tar.gz
-fd3f35e8a8a2ef9a64c035ed66cea06d icedtea6-1.10.tar.gz
+369ad745bf697d525d1a00fc09906829 hotspot.tar.gz
+83041b2d0de66cb5289813cc6f05af11 icedtea6-1.10.2.tar.gz
More information about the scm-commits
mailing list