No exec stack and let portage strip binaries

Package-Manager: portage-2.1.2_rc1-r1

4 files changed, 52 insertions, 15 deletions

diff --git a/games-strategy/liquidwar/ChangeLog b/games-strategy/liquidwar/ChangeLog
index bc26fa67694c..2b687792110c 100644
--- a/games-strategy/liquidwar/ChangeLog
+++ b/games-strategy/liquidwar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/liquidwar
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar/ChangeLog,v 1.16 2006/08/30 19:33:04 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar/ChangeLog,v 1.17 2006/10/30 10:47:38 nyhm Exp $
+
+  30 Oct 2006; Tristan Heaven <nyhm@gentoo.org>
+  +files/liquidwar-5.6.3-exec-stack.patch, liquidwar-5.6.3.ebuild:
+  No exec stack and let portage strip binaries
 
   30 Aug 2006; Michael Hanselmann <hansmi@gentoo.org>
   liquidwar-5.6.3.ebuild:
diff --git a/games-strategy/liquidwar/Manifest b/games-strategy/liquidwar/Manifest
index bc20cf759565..a193fd15cd80 100644
--- a/games-strategy/liquidwar/Manifest
+++ b/games-strategy/liquidwar/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX liquidwar-5.6.3-exec-stack.patch 430 RMD160 979cd0d211211a1864ca237d4af394d04c2e5635 SHA1 e911562d977b4f8f38ef2ed3e9095969918f4d17 SHA256 d661dab2c07f2df8089c618d4ccf6e40032fe3af19704ff9b4273aec21043263
+MD5 82fad0c0744730fbff03e63f19adb90f files/liquidwar-5.6.3-exec-stack.patch 430
+RMD160 979cd0d211211a1864ca237d4af394d04c2e5635 files/liquidwar-5.6.3-exec-stack.patch 430
+SHA256 d661dab2c07f2df8089c618d4ccf6e40032fe3af19704ff9b4273aec21043263 files/liquidwar-5.6.3-exec-stack.patch 430
 DIST liquidwar-5.6.2.tar.gz 2973938 RMD160 37042373804a9b93db3b0fbf64d103f801573c85 SHA1 582ca26c507ea1fd79b247865142112d5ecfb0b1 SHA256 3378224741920b4b2945622072bdba7ec596784dfb4e4fa667cfe6866009e8d1
 DIST liquidwar-5.6.3.tar.gz 3292030 RMD160 678304f624dcff4480b0398c79650ac3625dc86d SHA1 a0126f0370a92e2db0f18d4bf8cf31a7f15081e2 SHA256 33aedf15ac96dc526dc7daed1a6a311e9ca82bd66268e95a1e57ec29501d0c8b
 EBUILD liquidwar-5.6.2.ebuild 1568 RMD160 d77339aea81d5bcc2658d853feb5310ffd02ed9a SHA1 8c52cc7759735bfdeab39f47a061cd171fffa34c SHA256 90f3c78451ae4ac61293dc4d5c80647c04c91592fc962e433cb5b82a333f7a50
 MD5 be828dad0dc957c423c04a5931bf052b liquidwar-5.6.2.ebuild 1568
 RMD160 d77339aea81d5bcc2658d853feb5310ffd02ed9a liquidwar-5.6.2.ebuild 1568
 SHA256 90f3c78451ae4ac61293dc4d5c80647c04c91592fc962e433cb5b82a333f7a50 liquidwar-5.6.2.ebuild 1568
-EBUILD liquidwar-5.6.3.ebuild 1459 RMD160 fc94a0b66023e77415d0648e9e0730301ca4e92c SHA1 0bf0a641ad076f300fe99e31144671f49a676aea SHA256 43ed79b8cb47fe0f4809377d7b2cd4443a9fdbaca1965998f12b47fe13dc8eec
-MD5 3d31102862f3327ac7a8fc3cbfb01575 liquidwar-5.6.3.ebuild 1459
-RMD160 fc94a0b66023e77415d0648e9e0730301ca4e92c liquidwar-5.6.3.ebuild 1459
-SHA256 43ed79b8cb47fe0f4809377d7b2cd4443a9fdbaca1965998f12b47fe13dc8eec liquidwar-5.6.3.ebuild 1459
-MISC ChangeLog 2911 RMD160 84910239a438607fc73f437a3bb4a01ab3a00f36 SHA1 c3ae1a42d1044560c7773d5a3b60929addb2ea00 SHA256 097134b26056df506e2b00f412fa194708757791d901602145919f5a74da3fea
-MD5 d2372a69b79d4ffce9266e6529172753 ChangeLog 2911
-RMD160 84910239a438607fc73f437a3bb4a01ab3a00f36 ChangeLog 2911
-SHA256 097134b26056df506e2b00f412fa194708757791d901602145919f5a74da3fea ChangeLog 2911
+EBUILD liquidwar-5.6.3.ebuild 1535 RMD160 d0c41934accaa797ace47d11380b2782f866dc0e SHA1 dd1b9938077f624ad06c8ff8c4bc5241feb616a9 SHA256 87ec7d382e2426e5448c2d4d05600367f3af7177198b84ee89c22ece5356e2dc
+MD5 fa2402c92826128b4f1820545c7d3635 liquidwar-5.6.3.ebuild 1535
+RMD160 d0c41934accaa797ace47d11380b2782f866dc0e liquidwar-5.6.3.ebuild 1535
+SHA256 87ec7d382e2426e5448c2d4d05600367f3af7177198b84ee89c22ece5356e2dc liquidwar-5.6.3.ebuild 1535
+MISC ChangeLog 3072 RMD160 231c56e61e76e5d654d935ae7a17affb5be217a4 SHA1 a835f9ae61efe247cbd3dd4f761e2cdf54f92a56 SHA256 71c5167169bb1cbe76b0f412fac810a6a0482cbcf175718353f5211eaa1b7950
+MD5 402e3560fde3ebd11f41498e11efaf6e ChangeLog 3072
+RMD160 231c56e61e76e5d654d935ae7a17affb5be217a4 ChangeLog 3072
+SHA256 71c5167169bb1cbe76b0f412fac810a6a0482cbcf175718353f5211eaa1b7950 ChangeLog 3072
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -28,7 +32,7 @@ SHA256 c42c637fa68afb40c41cc13b75b6c8d7a65a03f5f0fc8ce13a7900aba221b48e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFRVFkamhnQswr0vIRAqcYAJ9zw0J40ckeHp2eqoGgKv6EnNTjgACbBeCw
-zEDKcRYr8Ku26gDTNrFQhvk=
-=jL5y
+iD8DBQFFRdhQdz7hIScOURERAiV8AJ4xRV9k4URetoFXdvVS5Y1lxb+wJwCgzbc0
+XOfoipJbNXj4I6jnAe+vp0A=
+=hyPn
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.3-exec-stack.patch b/games-strategy/liquidwar/files/liquidwar-5.6.3-exec-stack.patch
new file mode 100644
index 000000000000..83e733b28a05
--- /dev/null
+++ b/games-strategy/liquidwar/files/liquidwar-5.6.3-exec-stack.patch
@@ -0,0 +1,27 @@
+--- src/glouglou.s
++++ src/glouglou.s
+@@ -240,3 +240,6 @@
+ 
+    ret
+ 
++#ifdef __ELF__
++.section .note.GNU-stack,"",%progbits
++#endif
+--- src/monster.s
++++ src/monster.s
+@@ -972,3 +972,6 @@
+    ret                              # retour au c
+ 
+ 
++#ifdef __ELF__
++.section .note.GNU-stack,"",%progbits
++#endif
+--- src/spread.s
++++ src/spread.s
+@@ -957,3 +957,6 @@
+ 
+ 
+ 
++#ifdef __ELF__
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/games-strategy/liquidwar/liquidwar-5.6.3.ebuild b/games-strategy/liquidwar/liquidwar-5.6.3.ebuild
index f818ccb0ccc2..a79dfa28579a 100644
--- a/games-strategy/liquidwar/liquidwar-5.6.3.ebuild
+++ b/games-strategy/liquidwar/liquidwar-5.6.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar/liquidwar-5.6.3.ebuild,v 1.7 2006/10/30 01:11:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar/liquidwar-5.6.3.ebuild,v 1.8 2006/10/30 10:47:38 nyhm Exp $
 
-inherit games
+inherit eutils games
 
 DESCRIPTION="unique multiplayer wargame"
 HOMEPAGE="http://www.ufoot.org/liquidwar/"
@@ -19,6 +19,7 @@ DEPEND=">=media-libs/allegro-4.2"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-exec-stack.patch
 	sed -i \
 		-e 's:/games::' \
 		-e '/^MANDIR/ s:=.*:= $(mandir)/man6:' \
@@ -26,6 +27,7 @@ src_unpack() {
 		-e '/^DESKTOPDIR/ s:=.*:= /usr/share/applnk/Games/:' \
 		-e '/^INFODIR/ s/=.*/= $(infodir)/' \
 		-e '/^GAMEDIR/ s/exec_prefix/bindir/' \
+		-e '/install/s:-s ::' \
 		-e 's:$(DOCDIR)/txt:$(DOCDIR):g' \
 		-e 's:$(GMAKE):$(MAKE):' \
 		-e '/^DOCDIR/ s:=.*:= /usr/share/doc/$(PF):' Makefile.in \
@@ -46,7 +48,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install_nolink || die "make install failed"
+	emake DESTDIR="${D}" install_nolink || die "emake install failed"
 	rm -f "${D}"/usr/share/doc/${PF}/COPYING
 	use nls || rm -f "${D}"/usr/share/doc/${PF}/README.*
 	prepalldocs