From: Jacek Konieczny <j.konieczny@eggsoft.pl>
Date: Fri, 23 May 2014 06:35:58 +0000 (+0200)
Subject: Version: 2.4.7, the finishing touch
X-Git-Tag: auto/th/icedtea7-2.4.7-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=a7da017d0c7975ed6fa48d118729acd516363dc8;p=packages%2Ficedtea7.git

Version: 2.4.7, the finishing touch

- drop unused patches
- Release: 1

Security fixes in this version:
  - S8023046: Enhance splashscreen support
  - S8025005: Enhance CORBA initializations
  - S8025010, CVE-2014-2412: Enhance AWT contexts
  - S8025030, CVE-2014-2414: Enhance stream handling
  - S8025152, CVE-2014-0458: Enhance activation set up
  - S8026067: Enhance signed jar verification
  - S8026163, CVE-2014-2427: Enhance media provisioning
  - S8026188, CVE-2014-2423: Enhance envelope factory
  - S8026200: Enhance RowSet Factory
  - S8026716, CVE-2014-2402: (aio) Enhance asynchronous channel handling
  - S8026736, CVE-2014-2398: Enhance Javadoc pages
  - S8026797, CVE-2014-0451: Enhance data transfers
  - S8026801, CVE-2014-0452: Enhance endpoint addressing
  - S8027766, CVE-2014-0453: Enhance RSA processing
  - S8027775: Enhance ICU code.
  - S8027841, CVE-2014-0429: Enhance pixel manipulations
  - S8028385: Enhance RowSet Factory
  - S8029282, CVE-2014-2403: Enhance CharInfo set up
  - S8029286: Enhance subject delegation
  - S8029699: Update Poller demo
  - S8029730: Improve audio device additions
  - S8029735: Enhance service mgmt natives
  - S8029740, CVE-2014-0446: Enhance handling of loggers
  - S8029745, CVE-2014-0454: Enhance algorithm checking
  - S8029750: Enhance LCMS color processing (LCMS 2 only)
  - S8029760, CVE-2013-6629: Enhance AWT image libraries (in-tree libjpeg)
  - S8029844, CVE-2014-0455: Enhance argument validation
  - S8029854, CVE-2014-2421: Enhance JPEG decodings
  - S8029858, CVE-2014-0456: Enhance array copies
  - S8030731, CVE-2014-0460: Improve name service robustness
  - S8031330: Refactor ObjectFactory
  - S8031335, CVE-2014-0459: Better color profiling
  - S8031352, CVE-2013-6954: Enhance PNG handling (in-tree libpng)
  - S8031394, CVE-2014-0457: (sl) Fix exception handling in ServiceLoader
  - S8031395: Enhance LDAP processing
  - S8032686, CVE-2014-2413: Issues with method invoke
  - S8033618, CVE-2014-1876: Correct logging output
  - S8034926, CVE-2014-2397: Attribute classes properly
  - S8036794, CVE-2014-0461: Manage JavaScript instances
---

diff --git a/icedtea7-i486.patch b/icedtea7-i486.patch
deleted file mode 100644
index 7e9f76c..0000000
--- a/icedtea7-i486.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- icedtea6-1.8/acinclude.m4.orig	2010-04-10 21:58:40.000000000 +0200
-+++ icedtea6-1.8/acinclude.m4	2010-04-15 19:34:17.000000000 +0200
-@@ -8,6 +8,14 @@
-       CROSS_TARGET_ARCH=x86_64
-       ARCHFLAG="-m64"
-       ;;
-+    i486)
-+      BUILD_ARCH_DIR=i586
-+      INSTALL_ARCH_DIR=i386
-+      JRE_ARCH_DIR=i386
-+      ARCH_PREFIX=${LINUX32}
-+      CROSS_TARGET_ARCH=i386
-+      ARCHFLAG="-m32 -march=i486"
-+      ;;
-     i?86)
-       BUILD_ARCH_DIR=i586
-       INSTALL_ARCH_DIR=i386
-@@ -746,7 +754,7 @@
-       use_zero=yes;
-     else
-       case "${host}" in
--        i?86-*-*) ;;
-+        i[[567]]86-*-*) ;;
-         sparc*-*-*) ;;
-         x86_64-*-*) ;;
-         *)
diff --git a/icedtea7-never_test_gamma.patch b/icedtea7-never_test_gamma.patch
deleted file mode 100644
index 616e4e3..0000000
--- a/icedtea7-never_test_gamma.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -dur icedtea-2.4.3.orig/Makefile.am icedtea-2.4.3/Makefile.am
---- icedtea-2.4.3.orig/Makefile.am	2013-10-21 10:17:55.000000000 +0200
-+++ icedtea-2.4.3/Makefile.am	2013-11-22 12:07:02.553682646 +0100
-@@ -258,7 +258,8 @@
- 
- # Patch list
- 
--ICEDTEA_PATCHES = 
-+ICEDTEA_PATCHES = \
-+	patches/test_gamma.patch
- 
- # Conditional patches
- 
-@@ -299,7 +300,6 @@
- 
- if WITH_PAX
- ICEDTEA_PATCHES += \
--	patches/test_gamma.patch \
- 	patches/pax-mark-rmic-java.patch
- endif
- 
-@@ -352,7 +353,6 @@
- endif
- 
- if !WITH_PAX
--ICEDTEA_BOOT_PATCHES += patches/boot/test_gamma.patch
- endif
- 
- if CP39408_JAVAH
diff --git a/icedtea7.spec b/icedtea7.spec
index 7e28477..1cfaa73 100644
--- a/icedtea7.spec
+++ b/icedtea7.spec
@@ -34,7 +34,7 @@ Summary:	OpenJDK and GNU Classpath code
 Summary(pl.UTF-8):	Kod OpenJDK i GNU Classpath
 Name:		icedtea7
 Version:	2.4.7
-Release:	0.1
+Release:	1
 License:	GPL v2
 Group:		Development/Languages/Java
 Source0:	http://icedtea.wildebeest.org/download/source/icedtea-%{version}.tar.gz
@@ -54,9 +54,8 @@ Source6:	http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools/a
 Source7:	http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot/archive/%{hotspot_changeset}.tar.gz
 # Source7-md5:	0381ef3920f1ff5c8ac6c8860974d8cc
 Source10:	make-cacerts.sh
-# patches for the IcedTea files
-Patch0:		%{name}-never_test_gamma.patch
-# patches applied to the extracted sources
+# 0-99 patches for the IcedTea files
+# 100-... patches applied to the extracted sources
 Patch100:	%{name}-libpath.patch
 URL:		http://icedtea.classpath.org/wiki/Main_Page
 BuildRequires:	alsa-lib-devel
@@ -400,7 +399,6 @@ Przykłady dla OpenJDK.
 
 %prep
 %setup -qn icedtea-%{version}
-#%%patch0 -p1
 
 # patches to applied to the extracted sources
 install -d pld-patches