Add a fix for the execstack problems in libgcc3_uno.so

Package-Manager: portage-2.1.2_pre3-r9

5 files changed, 48 insertions, 17 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/Manifest b/app-office/openoffice/Manifest
index 8db2d2d84c68..37744b6990be 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -2,10 +2,14 @@ AUX 2.0.3/gentoo-2.0.3.diff 523 RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9
 MD5 919be84ef3c8315b84c37cdd1f5b947d files/2.0.3/gentoo-2.0.3.diff 523
 RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9 files/2.0.3/gentoo-2.0.3.diff 523
 SHA256 adf13d129e3a3a6fb513ada2046af98d10d4d46953603da13be8e4ae75d56527 files/2.0.3/gentoo-2.0.3.diff 523
-AUX 2.0.4/gentoo-2.0.4.diff 523 RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9 SHA1 84f3aa66994463524e53fceac8d6e3fc143f00d1 SHA256 adf13d129e3a3a6fb513ada2046af98d10d4d46953603da13be8e4ae75d56527
-MD5 919be84ef3c8315b84c37cdd1f5b947d files/2.0.4/gentoo-2.0.4.diff 523
-RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9 files/2.0.4/gentoo-2.0.4.diff 523
-SHA256 adf13d129e3a3a6fb513ada2046af98d10d4d46953603da13be8e4ae75d56527 files/2.0.4/gentoo-2.0.4.diff 523
+AUX 2.0.4/gentoo-2.0.4.diff 840 RMD160 64cf7be5d67a0f94a41b0d8d39ca36808fec001a SHA1 0d2e17deee68d6c8075458c7e96273452c0ea790 SHA256 78ecbdb063861e37cfb537635858f4f026ad544eebc27f0533d7a246614f853c
+MD5 63fc7c7667cfa5981445720f5cfa1a9c files/2.0.4/gentoo-2.0.4.diff 840
+RMD160 64cf7be5d67a0f94a41b0d8d39ca36808fec001a files/2.0.4/gentoo-2.0.4.diff 840
+SHA256 78ecbdb063861e37cfb537635858f4f026ad544eebc27f0533d7a246614f853c files/2.0.4/gentoo-2.0.4.diff 840
+AUX 2.0.4/libgcc3_uno_noexecstack.diff 497 RMD160 4990752ff5758d432fe6671cd1437ca319367fc3 SHA1 c94755a688095aa1edd0a2d3900e61116b5c875f SHA256 8cf1f1347aff8dcf6a4905f72a5922f91df0270a8463db3ceb47d9aa77f61ca3
+MD5 d10bda03b16c996cf53f90d2d5e12c3e files/2.0.4/libgcc3_uno_noexecstack.diff 497
+RMD160 4990752ff5758d432fe6671cd1437ca319367fc3 files/2.0.4/libgcc3_uno_noexecstack.diff 497
+SHA256 8cf1f1347aff8dcf6a4905f72a5922f91df0270a8463db3ceb47d9aa77f61ca3 files/2.0.4/libgcc3_uno_noexecstack.diff 497
 DIST OOO_2_0_3-binfilter.tar.bz2 17307831 RMD160 a8bb291789bee4692804f8fc3b32ce204689d7a3 SHA1 fa89f8f7c1414b365b78467dc4007d802e9ffd68 SHA256 eeb478603262ea62bc749f6698512bf0463d66cc2a5669db6ecedeb937577864
 DIST OOO_2_0_3-core.tar.bz2 109469286 RMD160 d40a11614ef9d25b6af96485877a347ffb6cefd0 SHA1 2ec6cee1fad05c128eb8c0b4e4ab7d9ca1b2c71f SHA256 0d6889e0426590e58c546ca03d227f266ced7de41bc55bcec7ff6f3cfd238c2d
 DIST OOO_2_0_3-lang.tar.bz2 64201627 RMD160 f893f84ad3c3526c15eb935163d7d98c201d225d SHA1 7525407d609a40ff1edb2c3b74642fd5e83d7921 SHA256 d9120ed91073ec624e60e604872611ecbde204300762874cf5a673addfda4dd8
@@ -28,14 +32,14 @@ EBUILD openoffice-2.0.3.ebuild 9145 RMD160 60a33696dbe9eecd555720610c34ccfdf834e
 MD5 59f7b5eb1b353c0bbd22dc07607acfcf openoffice-2.0.3.ebuild 9145
 RMD160 60a33696dbe9eecd555720610c34ccfdf834efcb openoffice-2.0.3.ebuild 9145
 SHA256 ca6828638a3c30e4cde1ebd454e566f6718fbea528befc1c1fd9caf928054f30 openoffice-2.0.3.ebuild 9145
-EBUILD openoffice-2.0.4.ebuild 9785 RMD160 a19eb950dc965b172d3cebed162e35d32f00547a SHA1 1e6c7e052aabe0589ea4f3083bfee4bd5305f945 SHA256 61ae56de10b8ca4eb20bd25287afa52bb083f5b9a64f3b2e1daa60e7e5c7bcb7
-MD5 f3fbe2d79e7b6d641b376f5c84a31a27 openoffice-2.0.4.ebuild 9785
-RMD160 a19eb950dc965b172d3cebed162e35d32f00547a openoffice-2.0.4.ebuild 9785
-SHA256 61ae56de10b8ca4eb20bd25287afa52bb083f5b9a64f3b2e1daa60e7e5c7bcb7 openoffice-2.0.4.ebuild 9785
-MISC ChangeLog 56025 RMD160 7c2d69d294b3c9166052ac32d4d38aec75fbcb4d SHA1 ad9586426388226c1d60b31a32e6cf2fba0021f5 SHA256 ee9336ebd3c39ed77287f502379083107bcab0a558a40ef2eedf377d326bff79
-MD5 2d987f1de38713e3b8b43c8f14c4bee3 ChangeLog 56025
-RMD160 7c2d69d294b3c9166052ac32d4d38aec75fbcb4d ChangeLog 56025
-SHA256 ee9336ebd3c39ed77287f502379083107bcab0a558a40ef2eedf377d326bff79 ChangeLog 56025
+EBUILD openoffice-2.0.4.ebuild 9748 RMD160 430f6399c5795df99c5b7c18ba9784d4a5287559 SHA1 eca0977737bc25c4d1c4d3eb98b256adfe5205f7 SHA256 ce87bf49163459e5c31bd2760c9da1918845ad0257cb77682c395f7f61184417
+MD5 9e6f02e787464293cd2bb4dc343ac5e5 openoffice-2.0.4.ebuild 9748
+RMD160 430f6399c5795df99c5b7c18ba9784d4a5287559 openoffice-2.0.4.ebuild 9748
+SHA256 ce87bf49163459e5c31bd2760c9da1918845ad0257cb77682c395f7f61184417 openoffice-2.0.4.ebuild 9748
+MISC ChangeLog 56281 RMD160 ee85703574f55984790481a0e675e5da5ba52758 SHA1 1680ef47a8164d7f78b48728043655c42d301c3b SHA256 c2756581bd7158d93064fe43c689646712ce947a434e4f4308298eef8d1aad1d
+MD5 2d941bb527ece1af1a8fcf08f1d260c7 ChangeLog 56281
+RMD160 ee85703574f55984790481a0e675e5da5ba52758 ChangeLog 56281
+SHA256 c2756581bd7158d93064fe43c689646712ce947a434e4f4308298eef8d1aad1d ChangeLog 56281
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
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