Fixes for hardened, see bug #79815

Package-Manager: portage-2.0.51-r15

3 files changed, 41 insertions, 38 deletions

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index 9203d667f7ce..1318b17e9832 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.109 2005/01/31 21:06:16 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.110 2005/02/03 17:09:27 suka Exp $
+
+  03 Feb 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.7.ebuild:
+  GCC 3.4 patches also work fine with GCC 3.3.x so they are applied by default
+  now. This also fixes some further problems on hardened gccs, closes bug
+  #79815
 
   31 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
   openoffice-ximian-1.3.7.ebuild, openoffice-ximian-1.3.8.ebuild:
diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index d8371374b49e..a827c20e50af 100644
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,49 +1,49 @@
-MD5 8b49bc66fd2b04c6f87c92b2716e42f4 ChangeLog 27198
 MD5 7bb244361a08b72dca07314792a1c00c openoffice-ximian-1.3.6.ebuild 16894
-MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
-MD5 bf9f440cb814be41e14bee60fa4de013 openoffice-ximian-1.3.7.ebuild 17864
 MD5 c8aff6d8bdc2e2653c24c6c30da1aaff openoffice-ximian-1.3.8.ebuild 17379
 MD5 7d0e5a8b623a136c7948a25e1d287247 openoffice-ximian-1.3.5-r1.ebuild 16146
+MD5 4097df26e064748c02beb905be124834 openoffice-ximian-1.3.7.ebuild 17835
+MD5 ec869c3bf2e13621296d5bf3bf7b612a ChangeLog 27448
+MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
+MD5 b7a3ab0336f7e514b6641e5871c1bbbb files/digest-openoffice-ximian-1.3.5-r1 437
 MD5 2595967ac130a541e50bffc75e105041 files/digest-openoffice-ximian-1.3.6 502
 MD5 0b59100689dae352eeac675e31a4cdec files/digest-openoffice-ximian-1.3.7 502
 MD5 5d4e4391572b1cd6de8338b1914f6e78 files/digest-openoffice-ximian-1.3.8 500
-MD5 b7a3ab0336f7e514b6641e5871c1bbbb files/digest-openoffice-ximian-1.3.5-r1 437
-MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.2/newstlportfix.patch 10362
-MD5 5c07103a16bd20651d16bb467e1bdb44 files/1.1.2/gentoo-1.3.5-r1.patch 597
 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.2/ximian-openoffice.applications 980
+MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.2/gentoo-splash.diff 890
 MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.2/ximian-openoffice.keys 6298
+MD5 5c07103a16bd20651d16bb467e1bdb44 files/1.1.2/gentoo-1.3.5-r1.patch 597
 MD5 e3c1dc0a3108091c8acfab788a5c9282 files/1.1.2/xooffice-wrapper-1.3 9336
-MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.2/gentoo-splash.diff 890
-MD5 e93f28c8afacb22bf9ac351ebd8195d2 files/1.1.3/gcc34-gnome.patch 598
-MD5 6984d0675ce2c9de20b0939a2f0b5dcb files/1.1.3/gcc34-nojava-fix.patch 455
-MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.3/nptl.patch 785
+MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.2/newstlportfix.patch 10362
+MD5 f9578015a434c209259917e9df3c0b27 files/1.1.3/gcc34_2.patch.bz2 33535
 MD5 04621a43bfeb4fac8077a770a8eba7e3 files/1.1.3/gcc34.patch.bz2 33661
+MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.3/pyunolink-fix.patch 475
 MD5 a5ef896f6a59b91fa3367c92de077769 files/1.1.3/gentoo-1.3.6.patch 597
-MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.3/gentoo-splash.diff 890
-MD5 a9233bc0091b925de38145108267b949 files/1.1.3/newstlportfix.patch 3638
 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.3/ximian-openoffice.applications 980
+MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.3/gcc-instlib.patch 393
+MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.3/gentoo-splash.diff 890
+MD5 24035033f41d743378e16582c2e51469 files/1.1.3/javafix.patch 1382
 MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.3/ximian-openoffice.keys 6298
+MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.3/hardened-link.patch 576
+MD5 61dc69767eddbb5ab3ac02822fff6c13 files/1.1.3/gentoo-1.3.7.patch 1449
 MD5 476f1f342d8321113a27e098630a6003 files/1.1.3/xooffice-wrapper-1.3 6091
-MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.3/STLport-vector.patch 1472
+MD5 6984d0675ce2c9de20b0939a2f0b5dcb files/1.1.3/gcc34-nojava-fix.patch 455
+MD5 e93f28c8afacb22bf9ac351ebd8195d2 files/1.1.3/gcc34-gnome.patch 598
+MD5 3d3555a66a2d8a66613d4e4471701eb8 files/1.1.3/pthreadlink-fix.patch 1163
+MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.3/nptl.patch 785
 MD5 f43ca2544f6cd797bed8e5aad1e50a29 files/1.1.3/gcc34-sal-link-to-libsupc++.diff 405
-MD5 f9578015a434c209259917e9df3c0b27 files/1.1.3/gcc34_2.patch.bz2 33535
-MD5 61dc69767eddbb5ab3ac02822fff6c13 files/1.1.3/gentoo-1.3.7.patch 1449
+MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.3/STLport-vector.patch 1472
 MD5 dd3785621235368cc28f1f85101fcac7 files/1.1.3/nojvmfwk-fix.patch 6986
-MD5 24035033f41d743378e16582c2e51469 files/1.1.3/javafix.patch 1382
-MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.3/hardened-link.patch 576
-MD5 3d3555a66a2d8a66613d4e4471701eb8 files/1.1.3/pthreadlink-fix.patch 1163
-MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.3/gcc-instlib.patch 393
-MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.3/pyunolink-fix.patch 475
-MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
-MD5 a560f9fd159502d802881206b45684f1 files/1.1.4/config-db-checkfix.patch 507
+MD5 a9233bc0091b925de38145108267b949 files/1.1.3/newstlportfix.patch 3638
+MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.4/pyunolink-fix.patch 475
 MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393
-MD5 6938dc2e28e840cebf4fdbde9d6e2d4b files/1.1.4/gentoo-1.3.8.patch 859
 MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.4/gentoo-splash.diff 890
-MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.4/hardened-link.patch 576
 MD5 24035033f41d743378e16582c2e51469 files/1.1.4/javafix.patch 1382
-MD5 a9233bc0091b925de38145108267b949 files/1.1.4/newstlportfix.patch 3638
-MD5 3f008e2c5595512c7f6306b1a722612e files/1.1.4/nptl.patch 243
+MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.4/hardened-link.patch 576
+MD5 964398ef88829e5a2935d0c0f8389c9d files/1.1.4/xooffice-wrapper-1.3 6091
+MD5 6938dc2e28e840cebf4fdbde9d6e2d4b files/1.1.4/gentoo-1.3.8.patch 859
+MD5 a560f9fd159502d802881206b45684f1 files/1.1.4/config-db-checkfix.patch 507
 MD5 3d3555a66a2d8a66613d4e4471701eb8 files/1.1.4/pthreadlink-fix.patch 1163
-MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.4/pyunolink-fix.patch 475
+MD5 3f008e2c5595512c7f6306b1a722612e files/1.1.4/nptl.patch 243
+MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 69a22ccaf3c62d6b96bfd30c70a2c679 files/1.1.4/regcompfix.patch 712
-MD5 964398ef88829e5a2935d0c0f8389c9d files/1.1.4/xooffice-wrapper-1.3 6091
+MD5 a9233bc0091b925de38145108267b949 files/1.1.4/newstlportfix.patch 3638
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild
index f979bed6c369..7e674cd8a1d9 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild,v 1.16 2005/02/01 18:19:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild,v 1.17 2005/02/03 17:09:27 suka Exp $
 
 # Notes:
 #
@@ -298,14 +298,11 @@ src_unpack() {
 	einfo "Applying Ximian OO.org Patches"
 	${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=${DISTRO} || die "Ximian patches failed"
 
-	# GCC 3.4.x fixes
-	if [ "$(gcc-version)" = "3.4" ]
-	then
-		epatch ${FILESDIR}/${OO_VER}/gcc34_2.patch.bz2
-		epatch ${FILESDIR}/${OO_VER}/gcc34-sal-link-to-libsupc++.diff
-		use !java && epatch ${FILESDIR}/${OO_VER}/gcc34-nojava-fix.patch
-		use gnome && epatch ${FILESDIR}/${OO_VER}/gcc34-gnome.patch
-	fi
+	#GCC 3.4 fixes, also needed for hardened
+	epatch ${FILESDIR}/${OO_VER}/gcc34_2.patch.bz2
+	epatch ${FILESDIR}/${OO_VER}/gcc34-sal-link-to-libsupc++.diff
+	use !java && epatch ${FILESDIR}/${OO_VER}/gcc34-nojava-fix.patch
+	use gnome && epatch ${FILESDIR}/${OO_VER}/gcc34-gnome.patch
 
 	#Fix for hardened
 	if use hardened; then