[java-1.7.0-openjdk] - update of IcedTea7-forest 2.3.10 tarball
jiri vanek
jvanek at fedoraproject.org
Wed Jun 19 06:54:26 UTC 2013
commit 7db5c31528cc6472afed37ff886a7b0b10fdcbec
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date: Wed Jun 19 08:53:24 2013 +0200
- update of IcedTea7-forest 2.3.10 tarball
* Thu Jun 13 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.25-2.3.10.2.fc19
- added patch1000 MBeanFix.patch to fix regressions caused by security patches
* Thu Jun 13 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.25-2.3.10.1.fc19
- arm tarball updated to 2.1.9
- build bumped to 25
* Wed Jun 12 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.19-2.3.10.0.fc19
- All full-paths now have arch
- temporarly swithced to intree lcms as it have security fixes (patch 500)
- added GENSRCDIR="$PWD/generated.build" to be able to
- removed (build)requires lcms2(-devel)
- Updated to latest IcedTea7-forest 2.3.10
.gitignore | 2 +
...1.7.0-openjdk-java-access-bridge-security.patch | 20 +++---
java-1.7.0-openjdk.spec | 64 ++++++++++++--------
remove-intree-libraries.sh | 34 ----------
sources | 4 +-
5 files changed, 53 insertions(+), 71 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7743f46..56a3fe4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,5 @@
/java-access-bridge-1.26.2.tar.bz2
/openjdk-icedtea-2.3.9.tar.gz
/openjdk-icedtea-2.1.8.tar.gz
+/openjdk-icedtea-2.3.10.tar.gz
+/openjdk-icedtea-2.1.9.tar.gz
diff --git a/java-1.7.0-openjdk-java-access-bridge-security.patch b/java-1.7.0-openjdk-java-access-bridge-security.patch
index 9153fb4..22deefc 100644
--- a/java-1.7.0-openjdk-java-access-bridge-security.patch
+++ b/java-1.7.0-openjdk-java-access-bridge-security.patch
@@ -1,23 +1,23 @@
diff -up openjdk/jdk/src/share/lib/security/java.security.sav openjdk/jdk/src/share/lib/security/java.security
--- openjdk/jdk/src/share/lib/security/java.security.sav 2013-02-01 17:34:10.750939826 -0500
+++ openjdk/jdk/src/share/lib/security/java.security 2013-02-01 17:36:09.283198885 -0500
-@@ -146,7 +146,9 @@
- com.sun.org.apache.xml.internal.res.,\
- com.sun.org.apache.xml.internal.serializer.utils.,\
+@@ -148,7 +148,9 @@
com.sun.org.apache.xml.internal.utils.,\
-- com.sun.org.glassfish.
-+ com.sun.org.glassfish.,\
+ com.sun.org.apache.xml.internal.security.,\
+ com.sun.org.glassfish.,\
+- org.jcp.xml.dsig.internal.
++ org.jcp.xml.dsig.internal.,\
+ org.GNOME.Accessibility.,\
+ org.GNOME.Bonobo.
#
# List of comma-separated packages that start with or equal this string
-@@ -181,7 +183,9 @@
- com.sun.org.apache.xml.internal.res.,\
- com.sun.org.apache.xml.internal.serializer.utils.,\
+@@ -185,7 +187,9 @@
com.sun.org.apache.xml.internal.utils.,\
-- com.sun.org.glassfish.
-+ com.sun.org.glassfish.,\
+ com.sun.org.apache.xml.internal.security.,\
+ com.sun.org.glassfish.,\
+- org.jcp.xml.dsig.internal.
++ org.jcp.xml.dsig.internal.,\
+ org.GNOME.Accessibility.,\
+ org.GNOME.Bonobo.
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index b5f3de0..3cbabb5 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -1,7 +1,7 @@
# If debug is 1, OpenJDK is built with all debug info present.
%global debug 0
-%global icedtea_version 2.3.9
+%global icedtea_version 2.3.10
%global hg_tag icedtea-{icedtea_version}
%global multilib_arches ppc64 sparc64 x86_64
@@ -97,30 +97,22 @@
# Standard JPackage naming and versioning defines.
%global origin openjdk
-%global buildver 19
+%global buildver 25
# Keep priority on 6digits in case buildver>9
%global priority 1700%{buildver}
%global javaver 1.7.0
# Standard JPackage directories and symbolic links.
# Make 64-bit JDKs just another alternative on 64-bit architectures.
-%ifarch %{multilib_arches}
%global sdklnk java-%{javaver}-%{origin}.%{_arch}
%global jrelnk jre-%{javaver}-%{origin}.%{_arch}
%global sdkdir %{name}-%{version}.%{_arch}
-%else
-%global sdklnk java-%{javaver}-%{origin}
-%global jrelnk jre-%{javaver}-%{origin}
-%global sdkdir %{name}-%{version}
-%endif
+
%global jredir %{sdkdir}/jre
%global sdkbindir %{_jvmdir}/%{sdklnk}/bin
%global jrebindir %{_jvmdir}/%{jrelnk}/bin
-%ifarch %{multilib_arches}
+
%global jvmjardir %{_jvmjardir}/%{name}-%{version}.%{_arch}
-%else
-%global jvmjardir %{_jvmjardir}/%{name}-%{version}
-%endif
# The suffix for file names when we have to make them unique (from
# other Java packages).
@@ -144,7 +136,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: %{icedtea_version}.12%{?dist}
+Release: %{icedtea_version}.3%{?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
@@ -206,8 +198,8 @@ Source10: remove-intree-libraries.sh
# base (icedtea-2.2.1 tag)
# http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1
-# hg tag: icedtea-2.1.8
-Source100: openjdk-icedtea-2.1.8.tar.gz
+# hg tag: icedtea-2.1.9
+Source100: openjdk-icedtea-2.1.9.tar.gz
# RPM/distribution specific patches
@@ -237,6 +229,9 @@ Patch100: rhino.patch
Patch101: %{name}-bitmap.patch
Patch102: %{name}-size_t.patch
+# Disable system LCMS as 2.3.10 security release have fixes for it
+Patch500: %{name}-disable-system-lcms.patch
+
# Patches for Arm
Patch103: %{name}-arm-fixes.patch
@@ -282,7 +277,6 @@ BuildRequires: alsa-lib-devel
BuildRequires: cups-devel
BuildRequires: desktop-file-utils
BuildRequires: giflib-devel
-BuildRequires: lcms2-devel
BuildRequires: libX11-devel
BuildRequires: libXi-devel
BuildRequires: libXp-devel
@@ -331,7 +325,6 @@ BuildRequires: systemtap-sdt-devel
%endif
Requires: rhino
-Requires: lcms2
Requires: libjpeg = 6b
Requires: fontconfig
Requires: xorg-x11-fonts-Type1
@@ -544,6 +537,9 @@ patch -l -p0 < %{PATCH102}
patch -l -p0 < %{PATCH103}
%endif
+# Disable system LCMS2
+patch -l -p0 < %{PATCH500}
+
patch -l -p0 < %{PATCH106}
patch -l -p0 < %{PATCH200}
@@ -613,7 +609,7 @@ make \
ANT="/usr/bin/ant" \
DISTRO_NAME="Fedora" \
DISTRO_PACKAGE_VERSION="fedora-%{release}-%{_arch}" \
-%ifnarch %{arm_arches}
+%ifarch %{arm_arches}
JDK_UPDATE_VERSION="03" \
%else
JDK_UPDATE_VERSION=`printf "%02d" %{buildver}` \
@@ -622,6 +618,7 @@ make \
HOTSPOT_BUILD_JOBS="$NUM_PROC" \
STATIC_CXX="false" \
RHINO_JAR="$PWD/../rhino/rhino.jar" \
+ GENSRCDIR="$PWD/generated.build" \
FT2_CFLAGS="-I/usr/include/freetype2 " \
FT2_LIBS="-lfreetype " \
DEBUG_CLASSFILES="true" \
@@ -1176,14 +1173,31 @@ exit 0
%{_jvmdir}/%{jredir}/lib/accessibility.properties
%changelog
+* Wed Jun 19 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.25-2.3.10.3.fc20
+- update of IcedTea7-forest 2.3.10 tarball
+
+* Thu Jun 13 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.25-2.3.10.2.fc20
+- added patch1000 MBeanFix.patch to fix regressions caused by security patches
+
+* Thu Jun 13 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.25-2.3.10.1.fc20
+- arm tarball updated to 2.1.9
+- build bumped to 25
+
+* Wed Jun 12 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.19-2.3.10.0.fc20
+- All full-paths now have arch
+- temporarly swithced to intree lcms as it have security fixes (patch 500)
+ - added GENSRCDIR="$PWD/generated.build" to be able to
+ - removed (build)requires lcms2(-devel)
+- Updated to latest IcedTea7-forest 2.3.10
+
+
* Wed Jun 05 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.19-2.3.9.12.fc20
-- Aadded client/server directories so they can be owned
-- more usage of uniquesuffix
-- all full-paths now have arch
+- Added client/server directories so they can be owned
+- More usage of uniquesuffix
- Renamed patch 107 to 200
- Added fix for RH857717, owned /etc/.java/ and /etc/.java/.systemPrefs
-* Thu May 22 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.19-2.3.9.11.fc20
+* Wed May 22 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.19-2.3.9.11.fc20
- added variable arm_arches as restriction to some cases of not jit_arches
- size_t patch adapted to 2.3 which is now default on all except arm arches
@@ -1234,7 +1248,7 @@ exit 0
- fixed priority (one zero deleted)
- unapplied patch2
-* Wed Apr 04 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.9-2.3.8.6.fc20
+* Thu Apr 04 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.9-2.3.8.6.fc20
- added patch107 abrt_friendly_hs_log_jdk7.patch
- removed patch2 java-1.7.0-openjdk-java-access-bridge-idlj.patch
@@ -1283,7 +1297,7 @@ exit 0
- Updated to icedtea7 2.3.8 (forest)
- Removed upstreamed patches.
-* Fri Feb 16 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.9-2.3.7.fc19
+* Sat Feb 16 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.9-2.3.7.fc19
- Updated to 2.3.7 icedtea7 tarball
- Updated the 2.1.6 icedtea7 tarballfor arm
- Removed testing
@@ -1346,7 +1360,7 @@ exit 0
865359, 865363, 865365, 865370, 865428, 865471, 865434, 865511, 865514,
865519, 865531, 865541, 865568
-* Thu Sep 7 2012 jiri Vanek <jvanek at redhat.com> - 1.7.0.6-2.3.1.fc19.3
+* Fri Sep 7 2012 jiri Vanek <jvanek at redhat.com> - 1.7.0.6-2.3.1.fc19.3
- Not-jit-archs source tarball updated to openjdk-icedtea-2.1.2.tar.gz
* Thu Aug 30 2012 jiri Vanek <jvanek at redhat.com> - 1.7.0.6-2.3.1.fc19.2
diff --git a/remove-intree-libraries.sh b/remove-intree-libraries.sh
index da15d9e..237049a 100644
--- a/remove-intree-libraries.sh
+++ b/remove-intree-libraries.sh
@@ -4,7 +4,6 @@ ZIP_SRC=openjdk/jdk/src/share/native/java/util/zip/zlib-*
JPEG_SRC=openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpeg-6b
GIF_SRC=openjdk/jdk/src/share/native/sun/awt/giflib
PNG_SRC=openjdk/jdk/src/share/native/sun/awt/libpng
-LCMS_SRC=openjdk/jdk/src/share/native/sun/java2d/cmm/lcms
echo "Removing built-in libs (they will be linked)"
@@ -81,36 +80,3 @@ if [ ! -d ${PNG_SRC} ]; then
fi
rm -rvf ${PNG_SRC}
-echo "Removing lcms"
-if [ ! -d ${LCMS_SRC} ]; then
- echo "${LCMS_SRC} does not exist. Refusing to proceed."
- exit 1
-fi
-rm -vf ${LCMS_SRC}/cmscam02.c
-rm -vf ${LCMS_SRC}/cmscgats.c
-rm -vf ${LCMS_SRC}/cmscnvrt.c
-rm -vf ${LCMS_SRC}/cmserr.c
-rm -vf ${LCMS_SRC}/cmsgamma.c
-rm -vf ${LCMS_SRC}/cmsgmt.c
-rm -vf ${LCMS_SRC}/cmsintrp.c
-rm -vf ${LCMS_SRC}/cmsio0.c
-rm -vf ${LCMS_SRC}/cmsio1.c
-rm -vf ${LCMS_SRC}/cmslut.c
-rm -vf ${LCMS_SRC}/cmsmd5.c
-rm -vf ${LCMS_SRC}/cmsmtrx.c
-rm -vf ${LCMS_SRC}/cmsnamed.c
-rm -vf ${LCMS_SRC}/cmsopt.c
-rm -vf ${LCMS_SRC}/cmspack.c
-rm -vf ${LCMS_SRC}/cmspcs.c
-rm -vf ${LCMS_SRC}/cmsplugin.c
-rm -vf ${LCMS_SRC}/cmsps2.c
-rm -vf ${LCMS_SRC}/cmssamp.c
-rm -vf ${LCMS_SRC}/cmssm.c
-rm -vf ${LCMS_SRC}/cmstypes.c
-rm -vf ${LCMS_SRC}/cmsvirt.c
-rm -vf ${LCMS_SRC}/cmswtpnt.c
-rm -vf ${LCMS_SRC}/cmsxform.c
-rm -vf ${LCMS_SRC}/lcms2.h
-rm -vf ${LCMS_SRC}/lcms2_internal.h
-rm -vf ${LCMS_SRC}/lcms2_plugin.h
-
diff --git a/sources b/sources
index 1faa231..d1e5377 100644
--- a/sources
+++ b/sources
@@ -2,5 +2,5 @@ ea344cc5b53b73f375558ba41760ff64 class-rewriter.tar.gz
200676ae97998b6f5bc18ff77e35d222 desktop-files.tar.gz
1cb61996cf5dbe80827abbe7d009bf28 pulseaudio.tar.gz
8eb5ad93dbf2f4fe86e52631969cfb09 systemtap-tapset.tar.gz
-a6099b53d46caac65faa14342d1c0772 openjdk-icedtea-2.1.8.tar.gz
-c18d097a0c8b7c8884a0ac521f8a646e openjdk-icedtea-2.3.9.tar.gz
+5c85d851b9dd190b23071a7021f8853a openjdk-icedtea-2.1.9.tar.gz
+58c2a3bb9fc7da7a837e975b4b2e68b3 openjdk-icedtea-2.3.10.tar.gz
More information about the scm-commits
mailing list