Add a fix for the execstack problems in libgcc3_uno.so

(Portage version: 2.1.2_pre3-r9)

4 files changed, 32 insertions, 5 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 9a29376f2525..bc38f9018648 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.266 2006/10/23 09:01:17 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.267 2006/10/27 12:06:33 suka Exp $
+
+  27 Oct 2006; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.0.4/libgcc3_uno_noexecstack.diff, files/2.0.4/gentoo-2.0.4.diff,
+  openoffice-2.0.4.ebuild:
+  Add a fix for the execstack problems in libgcc3_uno.so and remove the
+  corresponding workaround
 
   23 Oct 2006; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.4.ebuild:
diff --git a/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff b/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff
index a64755cbb2d1..3e0756b46d0e 100644
--- a/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff
+++ b/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff
@@ -20,3 +20,14 @@
  # And here we go.
  exec "$SystemInstallDir/program/$Binary", @ooo_argv
  
+--- patches/src680/apply 
++++ patches/src680/apply 
+@@ -1069,6 +1069,8 @@
+ 64bit-jdk-server-paths.diff, i#65974, hmth
+ # use IBM j9vm over IBM classic JVM
+ ibm-j9vm.diff, hmth
++# Fix for some execstacks in libgcc3_uno.so, i#70845, aprosky
++libgcc3_uno_noexecstack.diff
+ 
+ [ DebianBaseOnly ]
+ SectionOwner => rengelha
diff --git a/app-office/openoffice/files/2.0.4/libgcc3_uno_noexecstack.diff b/app-office/openoffice/files/2.0.4/libgcc3_uno_noexecstack.diff
new file mode 100644
index 000000000000..687ceb6f54f1
--- /dev/null
+++ b/app-office/openoffice/files/2.0.4/libgcc3_uno_noexecstack.diff
@@ -0,0 +1,12 @@
+Index: source/cpp_uno/gcc3_linux_intel/call.s
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_intel/call.s,v
+retrieving revision 1.3
+diff -u -r1.3 call.s
+--- bridges/source/cpp_uno/gcc3_linux_intel/call.s	17 Jun 2005 09:51:37 -0000	1.3
++++ bridges/source/cpp_uno/gcc3_linux_intel/call.s	25 Oct 2006 13:02:44 -0000
+@@ -265,3 +265,4 @@
+     .uleb128 5
+     .align 4
+ .LEFDEc:
++    .section        .note.GNU-stack,"",@progbits
diff --git a/app-office/openoffice/openoffice-2.0.4.ebuild b/app-office/openoffice/openoffice-2.0.4.ebuild
index 865628325827..9bbb74d76131 100644
--- a/app-office/openoffice/openoffice-2.0.4.ebuild
+++ b/app-office/openoffice/openoffice-2.0.4.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.4.ebuild,v 1.8 2006/10/23 09:01:17 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4.ebuild,v 1.9 2006/10/27 12:06:33 suka Exp $
 
 inherit check-reqs debug eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions multilib toolchain-funcs
 
@@ -115,9 +115,6 @@ if use amd64; then
 fi
 
 
-# FIXME executable stacks should be addressed upstream!
-QA_EXECSTACK_x86="usr/lib/openoffice/program/libgcc3_uno.so"
-
 pkg_setup() {
 
 	ewarn
@@ -178,6 +175,7 @@ src_unpack() {
 
 	#Some fixes for our patchset
 	cd ${S}
+	cp -a ${FILESDIR}/${PV}/libgcc3_uno_noexecstack.diff ${S}/patches/src680 || die
 	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
 
 	#Use flag checks