Added basic hardened support (bug #392261 by Daniel Keyhani).

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

3 files changed, 24 insertions, 12 deletions

diff --git a/app-emulation/dosemu/ChangeLog b/app-emulation/dosemu/ChangeLog
index 1fb475298fd1..a8aff0286ed0 100644
--- a/app-emulation/dosemu/ChangeLog
+++ b/app-emulation/dosemu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/dosemu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/ChangeLog,v 1.56 2013/08/05 06:08:53 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/ChangeLog,v 1.57 2013/08/05 09:52:57 slyfox Exp $
+
+*dosemu-1.4.1_pre20130107-r2 (05 Aug 2013)
+
+  05 Aug 2013; Sergei Trofimovich <slyfox@gentoo.org>
+  +dosemu-1.4.1_pre20130107-r2.ebuild, -dosemu-1.4.1_pre20130107-r1.ebuild:
+  Added basic hardened support (bug #392261 by Daniel Keyhani).
 
 *dosemu-1.4.1_pre20130107-r1 (05 Aug 2013)
 
diff --git a/app-emulation/dosemu/Manifest b/app-emulation/dosemu/Manifest
index 6c05315e892f..4237e9266d61 100644
--- a/app-emulation/dosemu/Manifest
+++ b/app-emulation/dosemu/Manifest
@@ -11,14 +11,14 @@ DIST dosemu-freedos-1.0-bin.tgz 1205628 SHA256 080c306a1b611e1861fd64466062f268e
 DIST patch-1.4.0.1.gz 69968 SHA256 e581715732421a5f2c6744a6fbeae7055fbdc319eaf8677e1739990ed3f06b66 SHA512 b6b06b2b253c3fcca55b00a995a7a35eb8d4b1ba7e0a6d2517882ef89905206a446b1fadec8ef299fb2bc8b828c640e3172e5667c099027bd5e5dc15482c5d9b WHIRLPOOL 1567326c005c7ae967df6c75f064da822fb413609b907659262b3b7a871201cd7d6c71f6c1f8dc2a01290ea1ba797816041fcdc94bbecf5520857a6402232113
 EBUILD dosemu-1.4.0.1.ebuild 1623 SHA256 b44ec6af54d141980f5df0ede0a3e0fd6f0a71e1fb0329db8913dfff13d626a8 SHA512 18137c6ff60146c1bd6705febfed709379e6fbfe6dc58a15766e4d63bf9171d4ebd703151ba552f22b099bafd36f901a7ffd154eef1c12f1de1ad61e4e79be5b WHIRLPOOL c130dbbdc804143dd35cf4a9a5584c1bf52355aa9ab4913212f6a65b50529b4d7e1906d24ca43b1d21db172adffdd7fa9a8efdfee41fed6088b6753b65bd3351
 EBUILD dosemu-1.4.1_pre20091009.ebuild 1549 SHA256 a59ac809f3cf04d24704814e07ecc820fb81e14e0fda69d3881420e6cf6df97e SHA512 2d544901681f7423e239c3364d29135888ac0a6dc9c116bdafa564e46ded80f964ca7be84e2d4fa4ccd7f975274bb16a9a2de670305d04e77e736b4e2a73c414 WHIRLPOOL b9c23a187b024a839b9b48168630ef65c1b68596284b15d55d785c9735d2abbce29ab61c4caa7a8d545a07f6ca3bf76960ab2236d1c4a53260c709a33612c58e
-EBUILD dosemu-1.4.1_pre20130107-r1.ebuild 1871 SHA256 ca3125700fae8841d3080cb7546d56dec96e8e88af6831236e90650d8f3bb5ad SHA512 de7d7a70b05c304a6078dc3ff11b594395cf7bdf2a7f89dd50804a815fab45ba2123fa9b3804c17962605cbdd9b1ae4831c15a39ccee62d17e20f103a0b60baa WHIRLPOOL 0350e0e1e94f312cbb36769fb18063fa2c021157cba2401868a70a0b503a8bf5eb23d643adf481659de8e9e0330f82cd0c5f2f128685594dcd0f0525d6436456
+EBUILD dosemu-1.4.1_pre20130107-r2.ebuild 2031 SHA256 f90c84c6432f70dd23d0c05a8e9efaf8a8a5fd57fac3160b9607d63519e8aabe SHA512 3a9fcdd1ae9c90d262218c8104ca2d97d90059a0ed809b8226361829dea55ed73affc99185f844184f23d824e315b83dbeca8ea1ce2e572a6f99edc159734343 WHIRLPOOL 32b97e779d792742147f60d188c68c7d82806a9bf39e7d4a83b856b053f6c7f5dc79f167d2c3a392e4d1dd7178051b5ba78965e581ae408c8e95bb44313b73b3
 EBUILD dosemu-1.4.1_pre20130107.ebuild 1636 SHA256 73e86612ae6a334f094606cf878fdc4e13c122bda0ac133bdc94c687bf73d868 SHA512 4c7d5be4203da20f5664a7c09afc2009c6d23500a032504eee2918400e3335984d2d7e2eb84720595ef96605c8abf601fd46e0ea1862ebb53404d3cf6744fa6a WHIRLPOOL aff03e1a463d81ff405f43c0a2b3b029cc3bbe68bf13d960cb4f91b8b3a752a469d1c7dab946a8dbf748f79fb00a502f410a327f95c2f8b53fb48826bab5c7a1
-MISC ChangeLog 7884 SHA256 fe2f8d4fcc5461a75faca0ba1c22f4189e7f315fc2221f2d61db6822b47b91a4 SHA512 1b4f3ec01065f2efc4d1760d68abb6f8fa2c76030e7a923eeeb8a40ab1968ee514b25718d5d7ec0b64af87451e7116e2ae84d15891645689969b08f068f4995d WHIRLPOOL 485e06a75381d2c0048f063f0959f2500390eadd0a9d1e2a71e7397dd3af61be4a9efcce91fa54ed0c12749b9f7e68e498bc67f406ffed70cb20e7547049010d
+MISC ChangeLog 8123 SHA256 8adfe2ce8a3bc8690ae1448de49f2dacac44d1485e799c39322d1c9345bb6a4d SHA512 703b0bb3b95615a0d4877a0c7afad7c5bf057e8c9336b16374b6ad59b3ddb975b6f7bc1718952ec1a970388e6bbbe58ad442af2bb2088686724065a9a6e24301 WHIRLPOOL 06c5f40d42493f48ed262e6101d12c7ef075c232c723bd30df4e70ad78f04a5d12696811c2e2769b7b0b111c8b2c093fb296cbd5f9fa807e69c9e3dec33061ff
 MISC metadata.xml 401 SHA256 eb9ea49d2195e37b44eaf175a027aee38822146d6d70b1904d38313340a1ea25 SHA512 69b23927daeaa01cdb3a37cf389a355022d2bb799e8c67c583137b113a46ee617523427e9cf48ed53c1fd4ad51db00aac9be11da2353c99b6f56e7674df94936 WHIRLPOOL 29161f429054e7fe17a07b1f91149b62f1709bbc9a2dd21d21f5c36442e2db0cce12f4a882bb7d9567c42beb3a4003af9f1d8dea1a0efdc03483c79fd154a6d4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlH/QMgACgkQcaHudmEf86r26QCeLGPjQ4mo6NIeISL0alCz7Xti
-MVUAn2in5sWgvJVPSho8v8G1Yk1V814V
-=9TFN
+iEYEAREIAAYFAlH/df0ACgkQcaHudmEf86o5EACfWSOuJ/x45kz5U3RYVyex2XFp
+cUEAniBiCH4JVsGbtNsTzI90UsnUlJmv
+=jvzl
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r1.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r2.ebuild
index 01ae17417d78..4f2daa91996b 100644
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r1.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r1.ebuild,v 1.1 2013/08/05 06:08:53 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r2.ebuild,v 1.1 2013/08/05 09:52:57 slyfox Exp $
 
 EAPI=5
 
-inherit flag-o-matic
+inherit flag-o-matic pax-utils
 
 P_FD="dosemu-freedos-1.0-bin"
 COMMIT="15cfb41ff20a052769d753c3262c57ecb050ad71"
@@ -47,9 +47,6 @@ src_prepare() {
 	# Has problems with -O3 on some systems
 	replace-flags -O[3-9] -O2
 
-	# Fix compilation on hardened
-	append-flags -fno-pic
-
 	# This one is from media-sound/fluid-soundfont (bug #479534)
 	sed "s,/usr/share/soundfonts/default.sf2,${EPREFIX}/usr/share/sounds/sf2/FluidR3_GM.sf2,"\
 		-i src/plugin/fluidsynth/mid_o_flus.c || die
@@ -67,3 +64,12 @@ src_configure() {
 		--sysconfdir="${EPREFIX}"/etc/dosemu/ \
 		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
 }
+
+src_install() {
+	default
+
+	# r - randmmap. dosemu tries to get address mapping
+	#       exactly where asked
+	# m - PWX mapping as it's an emulator / code laoder
+	pax-mark -mr "${ED}/usr/bin/dosemu.bin"
+}