Add some fixes for hardened, see bug #88588

Package-Manager: portage-2.1_pre4

5 files changed, 67 insertions, 8 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index b089dbe944be..d3bf90314647 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.180 2006/01/28 19:28:22 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.181 2006/01/28 23:42:58 suka Exp $
+
+  28 Jan 2006; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.0.1/gentoo-pax.diff, +files/2.0.1/gentoo-2.0.1.diff,
+  openoffice-2.0.1.ebuild:
+  Add some fixes for hardened, this also should remove the last TEXTRELS, see
+  bug #88588
 
   28 Jan 2006; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.1.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 35e6b76d4883..14ee6ec44aef 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,15 +1,21 @@
-MD5 d03114b721e7bd418351ba4f9cc58ddf ChangeLog 39146
-RMD160 8caad52e4cda244d4d3d73c95977a58e31329c0d ChangeLog 39146
-SHA256 f5324ccb230b5021168f8da1c05fe6fdb34e2bb5efd71670ca8e470cdf81d3c3 ChangeLog 39146
+MD5 9623ef4e11c2005d2da5c916e3f408c7 ChangeLog 39382
+RMD160 c55fc27875c29a3f886872a3f6fc4700f2e710ec ChangeLog 39382
+SHA256 590934cd170f43991b6339bbd8d9c49a361d4cbe5a891cab8acf36bf051ce23b ChangeLog 39382
 MD5 500f7e71be57d40b0a8042cab1484df9 files/2.0.1/alwayscrystal.diff 3222
 RMD160 6f563dccad523db881def1fdb711df3949c2a687 files/2.0.1/alwayscrystal.diff 3222
 SHA256 22af14b2c3bd7d796eeda2f4a423f4290e71d2f2790a82038b837c6219133ef1 files/2.0.1/alwayscrystal.diff 3222
+MD5 0a954994a7692742c58fd40c888e38ab files/2.0.1/gentoo-2.0.1.diff 240
+RMD160 cbd2d4fe5b15c9322404655b70743f1f97d067e6 files/2.0.1/gentoo-2.0.1.diff 240
+SHA256 b6f1ff91ffdbbe1719d339c11110ba0070a83c9f92474238d5267f31fc933f3c files/2.0.1/gentoo-2.0.1.diff 240
+MD5 cdbf32f4f5a6784b0199ec7c5eb9d669 files/2.0.1/gentoo-pax.diff 1196
+RMD160 1123487e0af0ac327b17d984c630c499f4c010a7 files/2.0.1/gentoo-pax.diff 1196
+SHA256 1377a5e2ac4a23b0746ef10cdea654f3cbc67d32fb71afac288f6bc2855993d5 files/2.0.1/gentoo-pax.diff 1196
 MD5 395809eda113094fb17da00460aee420 files/digest-openoffice-2.0.1 552
 RMD160 ec99e7db715d6bf67db572f79bdaa027d89ef7ca files/digest-openoffice-2.0.1 552
 SHA256 224563b62f7bb7be50187171015a871c475d388efd2efbbef3c73a8b5d97821e files/digest-openoffice-2.0.1 552
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata.xml 461
-MD5 e0b84ad20cd5795a797b5724116867ab openoffice-2.0.1.ebuild 7343
-RMD160 c349f07d83646395f109a312ace6972e0f38c538 openoffice-2.0.1.ebuild 7343
-SHA256 4a0f0c224ae1a0005ab5b4b9e568da3209a4f8f06d5a56e3d25e87466aab2934 openoffice-2.0.1.ebuild 7343
+MD5 99d48d83c4b8bc43a46a990d2bd5f3ef openoffice-2.0.1.ebuild 7878
+RMD160 55706f195a6c620f8ad58ef910c719c6688b0298 openoffice-2.0.1.ebuild 7878
+SHA256 175a62a5a3e29bdfbc6879b6fc99f75f95f4c6e1ef370b16c44629d115a36c89 openoffice-2.0.1.ebuild 7878
diff --git a/app-office/openoffice/files/2.0.1/gentoo-2.0.1.diff b/app-office/openoffice/files/2.0.1/gentoo-2.0.1.diff
new file mode 100644
index 000000000000..38db0e432933
--- /dev/null
+++ b/app-office/openoffice/files/2.0.1/gentoo-2.0.1.diff
@@ -0,0 +1,11 @@
+--- patches/src680/apply
++++ patches/src680/apply
+@@ -976,6 +976,8 @@
+ stlport-ppc-buildfix.diff
+ # Re-add DicOOo
+ gentoo-dicooo.diff
++# Allow build to proceed with PaX enabled
++gentoo-pax.diff
+ 
+ #
+ # NOTE: 64 bit OOo is work in progress!
diff --git a/app-office/openoffice/files/2.0.1/gentoo-pax.diff b/app-office/openoffice/files/2.0.1/gentoo-pax.diff
new file mode 100644
index 000000000000..e0b4700e6555
--- /dev/null
+++ b/app-office/openoffice/files/2.0.1/gentoo-pax.diff
@@ -0,0 +1,26 @@
+--- solenv/inc/unxlngi4.mk.orig	2005-10-29 17:09:48.000000000 +0200
++++ solenv/inc/unxlngi4.mk	2005-10-29 17:18:46.000000000 +0200
+@@ -138,8 +138,8 @@
+ LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+ 
+ # linker flags for linking applications
+-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
+ 
+ # linker flags for linking shared libraries
+ LINKFLAGSSHLGUI= -shared
+--- solenv/inc/unxlngi6.mk.orig	2005-10-29 17:16:27.000000000 +0200
++++ solenv/inc/unxlngi6.mk	2005-10-29 17:19:08.000000000 +0200
+@@ -147,8 +147,8 @@
+ LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+ 
+ # linker flags for linking applications
+-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
+ 
+ # linker flags for linking shared libraries
+ LINKFLAGSSHLGUI= -shared
diff --git a/app-office/openoffice/openoffice-2.0.1.ebuild b/app-office/openoffice/openoffice-2.0.1.ebuild
index 59a5518c42bf..42ff5c150dc3 100644
--- a/app-office/openoffice/openoffice-2.0.1.ebuild
+++ b/app-office/openoffice/openoffice-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1.ebuild,v 1.20 2006/01/28 19:28:22 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1.ebuild,v 1.21 2006/01/28 23:42:58 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
@@ -140,6 +140,8 @@ src_unpack() {
 	#Some fixes for our patchset
 	cd ${S}
 	epatch ${FILESDIR}/${PV}/alwayscrystal.diff
+	cp ${FILESDIR}/${PV}/gentoo-pax.diff ${S}/patches/src680/ || die
+	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
 
 	#Use flag checks
 	use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE} || echo "--without-java" >> ${CONFFILE}
@@ -157,6 +159,14 @@ src_unpack() {
 	echo "`use_enable gnome gnome-vfs`" >> ${CONFFILE}
 	echo "`use_enable gnome lockdown`" >> ${CONFFILE}
 
+	# Gentoo installs both static and dynamic libraries for Xinerama;
+	# Openoffice configure defaults to static if both are present,
+	# unless --with-dynamic-xinerama is specified.  Without this,
+	# libvclplug_gen680li.so links to the static library causing
+	# unnecessary TEXTRELs. This option only takes effect when
+	# both libraries are present so it's safe to enable always.
+	echo "--with-dynamic-xinerama" >> ${CONFFILE}
+
 }
 
 src_compile() {