[java-1.7.0-openjdk/f18] security update to icedtea 2.4.3 (u45, b15) - removed upstreamed patch101 zero-s8024914.patch - remo
jiri vanek
jvanek at fedoraproject.org
Wed Oct 16 17:41:29 UTC 2013
commit e212b4e3addf4f34be0b441a24ffe1a9d73c90df
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date: Wed Oct 16 19:41:15 2013 +0200
security update to icedtea 2.4.3 (u45, b15)
- removed upstreamed patch101 zero-s8024914.patch
- removed upstreamed patch102: zero-size_t.patch
- removed upstreamed patch1100: zero-entry_frame_call_wrapper.patch
- removed upstreamed patch1110: zero-zero_build.patch
- removed upstreamed patch1120: zero-gcdrainstacktargetsize.patch
- removed unnecessary revert patch404: RH661505-toBeReverted.patch
- fixed tapset for 32b archs
- source11 redecalred as 1
.gitignore | 2 +
RH661505-toBeReverted.patch | 38 -------
java-1.7.0-openjdk.spec | 52 ++++------
sources | 4 +-
zero-entry_frame_call_wrapper.patch | 34 ------
zero-gcdrainstacktargetsize.patch | 20 ----
zero-s8024914.patch | 58 -----------
zero-size_t.patch | 191 -----------------------------------
zero-zero_build.patch | 38 -------
9 files changed, 27 insertions(+), 410 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 169620a..0563839 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,5 @@
/openjdk-icedtea-2.3.12.tar.xz
/openjdk-icedtea-2.4.1.tar.xz
/openjdk-icedtea-2.4.2.tar.xz
+/systemtap-tapset-2013-10-02.tar.gz
+/openjdk-icedtea-2.4.3.tar.xz
\ No newline at end of file
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index d63e994..318b36f 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.4.2
+%global icedtea_version 2.4.3
%global hg_tag icedtea-{icedtea_version}
%global accessmajorver 1.23
@@ -108,9 +108,9 @@
# Standard JPackage naming and versioning defines.
%global origin openjdk
-%global updatever 40
+%global updatever 45
#Fedora have an bogus 60 instead of updatever. Fix when updatever>=60 in version:
-%global buildver 60
+%global buildver 15
# Keep priority on 6digits in case updatever>9
%global priority 1700%{updatever}
%global javaver 1.7.0
@@ -150,7 +150,11 @@
# for the primary arch for now). Systemtap uses the machine name
# aka build_cpu as architecture specific directory name.
%global tapsetroot /usr/share/systemtap
-%global tapsetdir %{tapsetroot}/tapset/%{_build_cpu}
+ %ifarch %{ix86}
+ %global tapsetdir %{tapsetroot}/tapset/i386
+ %else
+ %global tapsetdir %{tapsetroot}/tapset/%{_build_cpu}
+ %endif
%endif
# Prevent brp-java-repack-jars from being run.
@@ -158,7 +162,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.60
-Release: %{icedtea_version}.5%{?dist}
+Release: %{icedtea_version}.0%{?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
@@ -207,7 +211,7 @@ Source5: class-rewriter.tar.gz
# Systemtap tapsets. Zipped up to keep it small.
# last update from http://icedtea.classpath.org/hg/icedtea7/file/8599fdfc398d/tapset
-Source6: systemtap-tapset.tar.gz
+Source6: systemtap-tapset-2013-10-02.tar.gz
# .desktop files.
Source7: policytool.desktop
@@ -228,7 +232,7 @@ Source10: remove-intree-libraries.sh
Source1111: fsg.sh
# Ensure we aren't using the limited crypto policy
-Source11: TestCryptoLevel.java
+Source12: TestCryptoLevel.java
# RPM/distribution specific patches
@@ -254,21 +258,12 @@ Patch6: %{name}-debuginfo.patch
# Add rhino support
Patch100: rhino.patch
-# Type fixing for s390
-Patch101: zero-s8024914.patch
-Patch102: zero-size_t.patch
-
# Patch for PPC/PPC64
Patch104: %{name}-ppc-zero-jdk.patch
Patch105: %{name}-ppc-zero-hotspot.patch
Patch106: %{name}-freetype-check-fix.patch
-# Zero fixes
-Patch1100: zero-entry_frame_call_wrapper.patch
-Patch1110: zero-zero_build.patch
-Patch1120: zero-gcdrainstacktargetsize.patch
-
# allow to create hs_pid.log in tmp (in 700 permissions) if working directory is unwritable
Patch200: abrt_friendly_hs_log_jdk7.patch
@@ -283,7 +278,6 @@ Patch300: pulse-soundproperties.patch
#Workaround RH902004
Patch402: gstackbounds.patch
Patch403: PStack-808293.patch
-Patch404: RH661505-toBeReverted.patch
# End of tmp patches
BuildRequires: autoconf
@@ -513,15 +507,6 @@ tar xzf %{SOURCE9}
%patch6
%endif
-# Type fixes for s390
-%patch101
-%ifnarch %{arm}
-%patch102
-%patch1100
-%patch1110
-%patch1120
-%endif
-
%patch106
%patch200
@@ -536,8 +521,6 @@ tar xzf %{SOURCE9}
%patch403
%endif
-%patch404 -R
-
%build
# How many cpu's do we have?
%ifarch aarch64
@@ -684,7 +667,7 @@ rm -f %{buildoutputdir}/lib/fontconfig*.properties.src
rm -f %{buildoutputdir}/lib/fontconfig*.bfc
# Check unlimited policy has been used
-$JAVA_HOME/bin/javac -d . %{SOURCE11}
+$JAVA_HOME/bin/javac -d . %{SOURCE12}
$JAVA_HOME/bin/java TestCryptoLevel
@@ -1173,6 +1156,17 @@ exit 0
%doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
%changelog
+* Thu Oct 10 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.40-2.4.3.0.f18
+- security update to icedtea 2.4.3 (u45, b15)
+- removed upstreamed patch101 zero-s8024914.patch
+- removed upstreamed patch102: zero-size_t.patch
+- removed upstreamed patch1100: zero-entry_frame_call_wrapper.patch
+- removed upstreamed patch1110: zero-zero_build.patch
+- removed upstreamed patch1120: zero-gcdrainstacktargetsize.patch
+- removed unnecessary revert patch404: RH661505-toBeReverted.patch
+- fixed tapset for 32b archs
+- source11 redecalred as 12
+
* Wed Oct 02 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.40-2.4.2.5.f18
- updated tapset to current head
- few cosmetic changes for more easy merging
diff --git a/sources b/sources
index a779e0a..7231f19 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
ea344cc5b53b73f375558ba41760ff64 class-rewriter.tar.gz
c12f124672a97c7491530fed2c0facdc java-access-bridge-1.23.0.tar.bz2
1cb61996cf5dbe80827abbe7d009bf28 pulseaudio.tar.gz
-785b5ff80beef8cc095e25345c6c8242 systemtap-tapset.tar.gz
-4bf2b37d85cf71fc3611aa772ffe1553 openjdk-icedtea-2.4.2.tar.xz
+785b5ff80beef8cc095e25345c6c8242 systemtap-tapset-2013-10-02.tar.gz
+fd22afba9cc55754abcd584aa0b9aaaa openjdk-icedtea-2.4.3.tar.xz
More information about the scm-commits
mailing list