enabled pax marking for bug #427032

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 138 insertions, 13 deletions

diff --git a/games-emulation/zsnes/ChangeLog b/games-emulation/zsnes/ChangeLog
index a5914d44d421..c04f7e287b82 100644
--- a/games-emulation/zsnes/ChangeLog
+++ b/games-emulation/zsnes/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/zsnes
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.49 2012/06/04 20:04:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.50 2012/07/17 21:43:36 prometheanfire Exp $
+
+*zsnes-1.51-r3 (17 Jul 2012)
+
+  17 Jul 2012; Matthew Thode <prometheanfire@gentoo.org> +zsnes-1.51-r3.ebuild:
+  new ebuild to add hardened support, bug 427032.
 
   04 Jun 2012; Michael Sterrett <mr_bones_@gentoo.org> zsnes-1.51-r2.ebuild,
   files/zsnes-1.51-CC-quotes.patch,
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index 2ce2cf5b3942..ba732be2c5e3 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -1,13 +1,34 @@
-AUX zsnes-1.51-CC-quotes.patch 740 RMD160 edddef24850584314403a34f51d7505c2c2fdac6 SHA1 dc173400d013188a87472acd7bc5774274a819dc SHA256 73f4cfa22b93c9633bb5e748054bbabb75a03634988cddea0f1c4c8f6bca71bc
-AUX zsnes-1.51-archopt-july-23-update.patch 12668 RMD160 7bc765680223fc4583f2a73d019766bd3212537d SHA1 cfd1b6f6981263ba4b4c2271e95424f65c6fe8af SHA256 6d134d3cc8682ed71fc287023cb5e234aa9bbbd162d4a9de69ff6e3ff549f645
-AUX zsnes-1.51-buffer.patch 3157 RMD160 abb9834f649be6b730e0bf393b2451e13af40e0f SHA1 9be5abad6aa7dd799fc4318cebf0c9f4bca2cae9 SHA256 177fb1df4ecddf1e120cc7cb788d76ac8a18078edc2c9818691a6f7919f3ac2c
-AUX zsnes-1.51-depbuild.patch 559 RMD160 5a8bfeba6a8a21bd8922b4274311ff14e6b39ff5 SHA1 72b7f4b2421cabe239354ba421faa73d9c817a26 SHA256 2e6e0bb1fbccee7635f30174f1607db7a11036c8af26e8c25b4aa78204da6f22
-AUX zsnes-1.51-gcc43.patch 913 RMD160 95ab52f570dd1e5c7d0852dac17d56ada4939079 SHA1 9bbececf44cc48a4d6b48ebff66ba657ef409168 SHA256 9eb0aff2be2b303295b0d0a76240facd13dca170b97fe3ee827a6c26d89d53de
-AUX zsnes-1.51-gcc47.patch 316 RMD160 af379d99ea5078f0dc526d262959d80ff5c82909 SHA1 0c0bba18501490d643ca09d7242008720b80afd9 SHA256 ccd1343e51a294c425e14dfc2a9a4f519111630a0e8dfb6a33438fd336693e38
-AUX zsnes-1.51-libao-thread.patch 663 RMD160 10b0ce28577e39187f98d8f392462585148d34eb SHA1 67a34c9a5f8c6abb2881007d47ba10647ca4503a SHA256 71be0bbb8b683edc7c7780b68a43e54be7a8c341bf9b2a01e5cceb53834b1a73
-AUX zsnes-1.51-libpng.patch 854 RMD160 c6a5208196c6b90f94d78a6c3055d53ac74df8a6 SHA1 ced94445cbe71d146e0a1cafce6f96d552d182bd SHA256 8fa8614c9dd4360c05fb4c581a8c8aba89195dc4da0c087daa18845b7ab499be
-AUX zsnes-1.51-libpng15.patch 510 RMD160 72682ef320f6b23e3626e7acfa2479b2ccb00b7f SHA1 e6c8d2985d602c659a472e23278f9e0f2c2e6aea SHA256 c9636e76441ae1624c8ddc92e47facc20b43871fb0f55fd50d526b10944c6560
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX zsnes-1.51-CC-quotes.patch 740 SHA256 73f4cfa22b93c9633bb5e748054bbabb75a03634988cddea0f1c4c8f6bca71bc SHA512 2347910158934a7c8b90a6739f923d7a1f94e963515dca42d45eb97e6165c5f80c30d28fd151537a7a80bba16d2462568ff1c1dac93a855990f0418aaf059776 WHIRLPOOL 6c8d0bfc63a7e0de53efb3881e37d15a27d614ce5bc69c55ccc5245db1d7be707c31807c3e0e0054cc5ab7136cd525c45b91e03837acda248097defd63d7b6db
+AUX zsnes-1.51-archopt-july-23-update.patch 12668 SHA256 6d134d3cc8682ed71fc287023cb5e234aa9bbbd162d4a9de69ff6e3ff549f645 SHA512 a02ba164e2f06915b7de92032b7757f90b545e2afd4275805ea3466ddb6f1f9f0973fbc838c690441a10bbc70fb9be12fc95e5fde19c0505f4264cae2721c944 WHIRLPOOL 9f17c365befa0dc31177f6afe3610a6cc5ae71c89a37998067e29b439c9e45ff8424720155a2f1a6314e2fd94b4e6dd19b8fad365bb89ccc53b61a0c852617dc
+AUX zsnes-1.51-buffer.patch 3157 SHA256 177fb1df4ecddf1e120cc7cb788d76ac8a18078edc2c9818691a6f7919f3ac2c SHA512 b9a18c288f59413a7bd7f25622774440124de8ab356bfa48ea29b0db39ec6380d7df715eaca031bcff0fcb4f94dfc6f3b1f0770bf29cc9324e096ee5a6876f47 WHIRLPOOL 303683c6410a3de8c6557e4a2292a61e76f9934ac0f8432e903525fc017964720c9eeddc81b79b9492c46e04c9215b1a47cbbe62565836c084caae0ad584ecdd
+AUX zsnes-1.51-depbuild.patch 559 SHA256 2e6e0bb1fbccee7635f30174f1607db7a11036c8af26e8c25b4aa78204da6f22 SHA512 46955153ec6d2ecd5a295117c3ecc911a566de69f29f4d29decc98867d03e4a53a980a3c75d8ff19bbd1655eb291069fbbd598e002a73ebdbdc94c135f852c6e WHIRLPOOL 0896f33b9d482286336a4679035289bb5a4f3b9d8c055f4f6e88a40447c02fed33ce3db79a99968e8fc3bae5e005d68ff9fa6bdb854e8b66209e2f260f098d70
+AUX zsnes-1.51-gcc43.patch 913 SHA256 9eb0aff2be2b303295b0d0a76240facd13dca170b97fe3ee827a6c26d89d53de SHA512 8684b9b8c01d2d9f27bf27a86e4705b3408a2891347045266040397b649eb162962e8384746930c9837ac9b21bfd626d6e241d8a6c73b46a0e348274dd8688d3 WHIRLPOOL 2024f3c0d611c7cb489e06b8a1458bf4d78f216f34d176f692c79a5420c933440f911e7439c980ecb801e413c6a335b766b0c5ea0023e8d4af331b82dbaa6e96
+AUX zsnes-1.51-gcc47.patch 316 SHA256 ccd1343e51a294c425e14dfc2a9a4f519111630a0e8dfb6a33438fd336693e38 SHA512 3e9adecac963fd2769edcb979dde262ed54247f8d7f63b34d2f5f472e5d6eeb7bc3879de24210d312c5d1d4694abc32aeb9e853d3ab2ec7b7bad6794716e4da4 WHIRLPOOL a75bae4cab301cfbf9455bcf9ffad5bd83670ceaeb9d826867eeb81fd6aea531619332e110e61ddf57c7eaa83ef17913550ea46c639f16917112e39f106035c5
+AUX zsnes-1.51-libao-thread.patch 663 SHA256 71be0bbb8b683edc7c7780b68a43e54be7a8c341bf9b2a01e5cceb53834b1a73 SHA512 3b7dab3e8f7e55b5295ad728279aa116b0e1f63a9bfad398b55a2d7f5ba55c806311952311f3f3ac91803d903e91b724f6ceea53a15b5fe485a7b3c2e5dafbab WHIRLPOOL c0cf4462f0ca48859af7832dbcc3e41f947eb73b56cb28703d553826ac19462ed0b6d6190d8fa7bb08ec1a9dea61231047da95424ddaec1f409b906de5c2089c
+AUX zsnes-1.51-libpng.patch 854 SHA256 8fa8614c9dd4360c05fb4c581a8c8aba89195dc4da0c087daa18845b7ab499be SHA512 210dcba006bdf6c18bb55e106e8bb2fcb9691deb89874fd4f9e034f2aaf9e8e96543b2177d31b94c121a811b80de6352b7b420fa8d0760055dc1d4df43bbaa68 WHIRLPOOL c1e1a97a9ec17a1934c493194028c640a7318eb60f9da564c9da34c6925a3deb65fb403adcd8ae6834a6b9afc76d85852c3c0168f3bea14f519d8c52232a8187
+AUX zsnes-1.51-libpng15.patch 510 SHA256 c9636e76441ae1624c8ddc92e47facc20b43871fb0f55fd50d526b10944c6560 SHA512 4191987cad2f8dd7d7fd1d4f8f0c60de07059f18a60cb9bb94f1e5c35c06122032de9887762ebcf2d255f24c3e90aa5b4f6a7540a8e4dbdc4ce5f7d3b3e3b532 WHIRLPOOL 4c8e6565a8b1d2d040f545f57dda751bcf387828c3153cf71459bdd72252ac62d66317dd3fef51cba10cfce372391aba7d4bfb5e2fdce7782484fce2a4b7c6c2
 DIST zsnes151src.tar.bz2 1071712 RMD160 337407bf7e5516bcd7bf310c7b17d6d12a948750 SHA1 03df35490870c9950d7010747d0546c8525c0362 SHA256 eb013f824f5a9814a714cf0daaea3ea68a1c74fd741e5b0979fcb7964236a866
-EBUILD zsnes-1.51-r2.ebuild 2605 RMD160 6fc70c779c3d221398f6b5af08f2c9c94385c490 SHA1 f1334651373d8550d079ed992205b9cb99af3c81 SHA256 e2950082b1665c7c559a4b4aaf8dd71252ba36e7568546e04991f8e872d36b17
-MISC ChangeLog 10030 RMD160 26af2556628eeac0622446ed2380fe584abaad4a SHA1 21b005d2749377e78446c902cce88a52fadfabf5 SHA256 ff9b6ad5195d942beba8272e65762a8c8c32e3b958ec60dc082918729d94017c
-MISC metadata.xml 160 RMD160 f839c00d9f25c1f873f95ab899fb64060c1d0bf5 SHA1 08c3d180cf8dbef87e40c42a18b457516a5d7ffe SHA256 5ac0a3647e8149d52ce55d391cf1680ac52d6f0330be21c3bca4790b971b5e5d
+EBUILD zsnes-1.51-r2.ebuild 2605 SHA256 e2950082b1665c7c559a4b4aaf8dd71252ba36e7568546e04991f8e872d36b17 SHA512 f9fb7e705e92aabd95c730d74353a883d0d09093b6bc4df5d4af92b357c79f348decadffd2223527aec645aa090f6e8df0dd045d085b9878d03771c4bace21fb WHIRLPOOL 8e7dfbbb8e28f950174a621f2497cfef0a5c7c9fd3976b6bc2762cf17f20e60a8cec4f638c3d41016ba8c937f55953b11c5ec7c2bdaa45bab2f5191960099986
+EBUILD zsnes-1.51-r3.ebuild 2705 SHA256 e85965dc9cab7d2104d0bfecf90a532fe988c5a7ec433267a1e1bdafe27bb671 SHA512 3aadef44bbffd13681f398d8c2be1b99c1ab0e476ca39b034628cbd88a6bf7b2513c59e5c5831200cfc32d058cdb3cab2dff525058a0b245941b9d2b62762960 WHIRLPOOL 5c444d5e55433f19bd5a90fa0b7a6309157c9787c2e9c4d023e6d99787102eb283a38a36f2342a97a151b09181f8f8033df8ba3ad792404794e2b4288abe0bfd
+MISC ChangeLog 10196 SHA256 f4f111272ff5eb3e88d2a6b20fc6bd9fbe99c68706442a20d119a8478e37ff34 SHA512 ad7dc979b916462b3666162ba7a05b89ff4f8ec772b3c69813c63113b04ab7a5b5e22eccc2597cc69b94f44afc616b095faef8d74151f471d7c4cc304da246a8 WHIRLPOOL 2ab1ca30a4011a5a0f2d6aa15f483c3bc770425b80fbc0387d430401f6595ce7a9f3ff957838cd11d34ccfd9c357067705f9f145cf18e43b25cb52feae0d76fd
+MISC metadata.xml 248 SHA256 9f13da34ea696a801cdc7c8893d7182ae7615444da963a1c4c49d8f5b2c6542f SHA512 c8669dd1200018f0e1fe15d0fa1294fcaac1d0061d134213267e8e46c4ff1f54c2efe8f0915315e5b5e90613c72e9032157669624521ec4389b7b5846c44e0ab WHIRLPOOL d9f77db5df16dbc95c70bcc180176f1c9bf196e41f77aeec864ab5028f348fb01f6c6413554b41bb9ca106e18f7252398a4a41ab99aa1d49aa0e150db75eb6c4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBAgAGBQJQBdyVAAoJECRx6z5ArFrDKfoP/iooLbBUASE9tDrkzy/Q56tn
+Q1AabHHAW1M1S+soh9gsvSdVDZkA2uOvDatKU4Zc3HQTR8PYv2a6a24tzluGRmVu
+LH5dTmJuoHd6VT3uZMg1cZ4iESgyRdbRxj7aj8I6AaK6FIIodNswlIgGl0R+e3PH
+PJVulyoPy5c3C3wzi+IPC1DXiDidZ3FrW1MK22B9QFU543ERQyhP3yWAO0vmIz0e
+XhtjiXZn1e3TQCUIikqJWMXyA0AvRloeNsunQsXdRWji8/71OUvL7iBf4JPys7eY
+55RqJ1im4fJBoEg1URN4VcHT/XCIYRslKz9WaZ4Ck/u3NRYrg+7LcuNTbQrqc9bR
+qLhLfGbn15Ib17o2etoLc2KKSYzE8wKysan3E/eH/YjHQ3Egir/YXoCqzeO8gf9E
+Y6Cjsl2/de9EldMrQut7omZrzfpK9B8725zuG2TuyllVnVCD/Xu1u88/JmuM9hT6
+38bEwyIA5CkBhSB4/1yxNhd/juKNl/FQqQUVP0OwkljHUnImONyrNNu7dKoZZtXJ
+uvdGyPQQnrPchq+ZoxzKinI054BPS8yuJM9CL5ldCfZCJj0KTY7FTRABWvzNB5yq
+CuXj3B+xKlYH/Yi1UQFzYUT13+o/lYJmms7rwfcHpz8ok2+om6POzq8Aj84rmqOj
+CN3trNvx8YuXVA+5Z6lf
+=yPMQ
+-----END PGP SIGNATURE-----
diff --git a/games-emulation/zsnes/metadata.xml b/games-emulation/zsnes/metadata.xml
index f72870c0c28d..330d9049409e 100644
--- a/games-emulation/zsnes/metadata.xml
+++ b/games-emulation/zsnes/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>games</herd>
+  <use>
+    <flag name='pax_kernel'>Triggers a paxmarking of the binary</flag>
+  </use>
 </pkgmetadata>
diff --git a/games-emulation/zsnes/zsnes-1.51-r3.ebuild b/games-emulation/zsnes/zsnes-1.51-r3.ebuild
new file mode 100644
index 000000000000..aa8836fcc5f2
--- /dev/null
+++ b/games-emulation/zsnes/zsnes-1.51-r3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r3.ebuild,v 1.1 2012/07/17 21:43:36 prometheanfire Exp $
+
+EAPI=2
+inherit eutils autotools flag-o-matic toolchain-funcs multilib games pax-utils
+
+DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly"
+HOMEPAGE="http://www.zsnes.com/ http://ipherswipsite.com/zsnes/"
+SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+IUSE="ao custom-cflags opengl pax_kernel png"
+
+RDEPEND="media-libs/libsdl[audio,video]
+	>=sys-libs/zlib-1.2.3-r1
+	amd64? ( >=app-emulation/emul-linux-x86-sdl-10.1 )
+	ao? ( media-libs/libao )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng )"
+DEPEND="${RDEPEND}
+	dev-lang/nasm
+	amd64? ( >=sys-apps/portage-2.1 )"
+
+S=${WORKDIR}/${PN}_${PV//./_}/src
+
+src_prepare() {
+	# Fixing compilation without libpng installed
+	# Fix bug #186111
+	# Fix bug #214697
+	# Fix bug #170108
+	# Fix bug #260247
+	# Fix compability with libpng15 wrt #378735
+	# Fix buffer overwrite #257963
+	# Fix gcc47 compile #419635
+	epatch \
+		"${FILESDIR}"/${P}-libpng.patch \
+		"${FILESDIR}"/${P}-archopt-july-23-update.patch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-libao-thread.patch \
+		"${FILESDIR}"/${P}-depbuild.patch \
+		"${FILESDIR}"/${P}-CC-quotes.patch \
+		"${FILESDIR}"/${P}-libpng15.patch \
+		"${FILESDIR}"/${P}-buffer.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
+
+	sed -i -e '67i#define OF(x) x' zip/zunzip.h || die
+
+	# Remove hardcoded CFLAGS and LDFLAGS
+	sed -i \
+		-e '/^CFLAGS=.*local/s:-pipe.*:-Wall -I.":' \
+		-e '/^LDFLAGS=.*local/d' \
+		-e '/\w*CFLAGS=.*fomit/s:-O3.*$STRIP::' \
+		configure.in \
+		|| die "sed failed"
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	use amd64 && multilib_toolchain_setup x86
+	use custom-cflags || strip-flags
+
+	append-flags -U_FORTIFY_SOURCE	#257963
+
+	egamesconf \
+		$(use_enable ao libao) \
+		$(use_enable png libpng) \
+		$(use_enable opengl) \
+		--disable-debug \
+		--disable-cpucheck \
+		--enable-release \
+		force_arch=no
+}
+
+src_compile() {
+	emake makefile.dep || die "emake makefile.dep failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	dogamesbin zsnes || die "dogamesbin failed"
+	if use pax_kernel; then
+		pax-mark m "${GAMES_BINDIR}/zsnes" || die
+	fi
+	newman linux/zsnes.1 zsnes.6
+	dodoc \
+		../docs/{readme.1st,authors.txt,srcinfo.txt,stdards.txt,support.txt,thanks.txt,todo.txt,README.LINUX} \
+		../docs/readme.txt/*
+	dohtml -r ../docs/readme.htm/*
+	make_desktop_entry zsnes ZSNES
+	newicon icons/48x48x32.png ${PN}.png
+	prepgamesdirs
+}