paxmared on the pax_kernel use flag so it works on the hardened profile

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

4 files changed, 35 insertions, 22 deletions

diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index 884dbde48f0a..ad1c43c58beb 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/skype
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.117 2011/06/15 22:07:37 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.118 2012/02/28 21:24:54 prometheanfire Exp $
+
+  28 Feb 2012; mthode <mthode@gentoo.org> skype-2.2.0.35-r1.ebuild:
+  paxmarked m skype to work on hardened
 
 *skype-2.2.0.35-r1 (15 Jun 2011)
 
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index f66c39fab889..3f5a4e4054ab 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 DIST skype-2.1.0.81.tar.bz2 19659673 RMD160 0b145ee9e89ab2592fc7d3590412da0a36eb903f SHA1 8d4fbb26eb1a791f2e6f2da7bba8a698377b8592 SHA256 5f1218b658fb7d22f03ffdeb660c74896ffe20ac68f392b0d21a300012a928f4
 DIST skype-2.2.0.25.tar.bz2 23057633 RMD160 eb794cef43f0c30ea5cd5dd7a015f77bb1cc1a80 SHA1 1b7e969ca3fdb4b4dc2ed0d674149cf016fd55c3 SHA256 09065baed79dbd22325e9f0d79bf26b169010b9c84beeed599aa9350e8f1f9a5
@@ -9,23 +9,23 @@ DIST skype_static-2.2.0.25.tar.bz2 30882910 RMD160 833b77599112447c28ecfdfa0d60f
 DIST skype_static-2.2.0.35.tar.bz2 30885960 RMD160 25acdad5d4ad974d169a8b4de89bc901171187f1 SHA1 bdf5d18dd09151bb4382f7002724cf38d1bb30aa SHA256 4f5bf7f2029fcd90d6d5f8477ac3e9a87fac9fd4cb08c0634747c435e985167d
 EBUILD skype-2.1.0.81.ebuild 2767 RMD160 fc7faabedad29c713c4f92bc0a067227c6eca6d2 SHA1 b789b801a7bb8e7e2b0d8ccb522dc01c3d92d956 SHA256 15e45595dc3f1b690e834275dd51112158c66485cae6507a874aa22d5816d919
 EBUILD skype-2.2.0.25.ebuild 2770 RMD160 89d0195733d4a6294084809bab9fba384c5d8397 SHA1 26047792437c7304862b7a3a9f4e3cb91eae1831 SHA256 ff50a4e57267470ba1662303eb8529bac5f17b126e929e3086a76a3d5ef94fe5
-EBUILD skype-2.2.0.35-r1.ebuild 2772 RMD160 09a81facee8697bc4d1a5a1db6b6cce0b962df6d SHA1 404388660a5a2fc7e476c12867ba6298d46e7f62 SHA256 dab392771552bb2a307bdbb2e43d1c495300a0db77996ff8a8c7b04385725540
-MISC ChangeLog 21166 RMD160 54a4c7c9201e0f2c98e38298a2441b3960ce5f21 SHA1 01415b92f347482c578ca7b9db25b82f59fd0fb7 SHA256 2745b1eb8ab27a4a8f7371ffa56c026a7be7c86074a0b0eab3866633833f49cf
-MISC metadata.xml 574 RMD160 8b4dbbc23a0cdff6e73ace07c8aaff5ac6bb1e49 SHA1 474a65946ca1d57f50b123d4f6f6518ab6106553 SHA256 ba7224ee8e985051a464944ba62227ff7e9364df9be83270ac0075b2e95b2ef0
+EBUILD skype-2.2.0.35-r1.ebuild 3176 RMD160 2e15f4eedd23c221e4928280ee2cfb2956b15ac3 SHA1 d1de9ca3dce079797d80f7ec45c50bc1b84dc36e SHA256 8fd8dc3972cc48dc617e2d6834e5bcc332740bc9aa936cdef849b44e9d7ee273
+MISC ChangeLog 21281 RMD160 7cdeba98e6148f07e522124d3c14ec458e370706 SHA1 70378818f277502be54b010db7c1d13278806f6d SHA256 0c50b0b37f56bb651498503ec93d8579071c61828f06524c351e599f4a09b6f0
+MISC metadata.xml 642 RMD160 05610ec2a61b34d7899522e0ee386c1b0a058a00 SHA1 6cc7fcf1828878901c9a2f6bacc4a0a31ff5fbb1 SHA256 7e34a5faa64f3044b7557d03e9fd1b67d6e72cc24e9cf7263c6bf467240c0c1c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN+SzhAAoJEPqDWhW0r/LCw9UQAJm1S5/N92SrkYVSn7tFY0uk
-3E0IwVA4U4flrH0FQNWD9LlSB8eZUPcmjq/yPsTi2d+/X+eqaLPEf+UeLku3bJfo
-GE7p6yovB/oNh5op1GK8ZmgT6KIaiywJsIaNbx2W2xPvrScLOK/r2Id8AA6VU3eq
-043kHZapvoGq/SUOBwbTxCGXeug34SaUt68C+4Pa4PmQ8QKaNYgLxjGjX3trC2fM
-VnYiqvQQTIW47XrsP/woJLgD2/N4FeEaLUjY+w/5yRq6Z86yOIejAtcp+tMcry4B
-lGS9YcomDStPKfF7liw1BJvbMDoQNJzxloEtnT39iSxyG2rO24HfLuEQ6PopE5Hm
-ZUkXWk9wew0exW6dFfOoAkYDaPyqNQrLYPOVLIMrwQv0tR3DjOyN5nwvigI65Ik2
-G1Y2x8imDR69CsxeGw/IhJiz83cl8feKQa9n7y/9FZMFU1X6lHPS1FXYYIXFc4d9
-jStsXXmTad2rlPzWhcYx/408oNAFESLJgKqSQYDlMJfiULU78tZt6D4z7/nMs8gw
-Ygjz8MXQBTlvrToY4k/Hg9WiQQmf9LBVkmlW0YFlY0w95q/UUf3CkbRYJDfIvZDq
-3vVN2jDFvra1UMM3NQJwRaKE8ZJItyXL46Pen3uLkVMIVdc7tcJRbf/CdT2g86tV
-VxZTxkOOfG39H2aoHLG0
-=UEMy
+iQIcBAEBAgAGBQJPTUY1AAoJECRx6z5ArFrDCOAP/jvlhEOCu3CT9Hu/7z84j3Ll
+vWmMuWefkw1QkTSDkk9QiOBdaffiEib5qqGg/Sh862kNPgqt93Zp9+8lqmHm32yr
+4iWQ/oE016X9rsjsm/Aa8IbGMDCp0nMpAqyjgJ6icvdI1043he62V1dJnRK6ITIY
+YunpuXdGmQhFYEQYBQUqV8Ipu2EkMHP2zFKIAGSiz96PcNvONLvOBrnue5gp0LjE
+Hv3FiiGtr+DcR/4FlR2IaeKjMuOBtvSa7Ls6bULDIWvO1DrQ92kpJYNK1ZDCLdnP
+4Yuyg3PYGVeTSNMETXWiHUGwwpx4smJB2iIa+h8s48tIKTtfURGUMVM09jjVo4Ti
+1DHQEhL59B9WMl790oDkK+I/RXyl/bducIjKPkMYOCzoNmdemBo/k+EEcjQjkskw
+xwrkh12glDOrmytCuhxNjRLVQiQpd6CErwUv3xxq900/wLGUSc1SUSBObE4/AopU
+fCT2A1KEJfBoVEQq3bTl1d8Gv2IwiWxtT23HuNhCUdNHWURMp+1+nQUZaKAcGZVn
+R7AevZ1VMTQQJFAGGVMy2QGKGhGHRBPC5L+xajykO4jNURSFHePyLCxqcdbOn2FK
+2C67+uhqyfqKMTbsXg4zw4bmzApzlpKIq3YrfvdEcpvtNsg8094bHVZC4fnuk+7w
+yarlGNirm58rzD0mn6Eu
+=21pb
 -----END PGP SIGNATURE-----
diff --git a/net-im/skype/metadata.xml b/net-im/skype/metadata.xml
index 1bfaca5fbf06..57d9415cbc55 100644
--- a/net-im/skype/metadata.xml
+++ b/net-im/skype/metadata.xml
@@ -12,5 +12,6 @@ time, but to talk and chat with your friends.
 </longdescription>
 <use>
 	<flag name='qt-static'>Installs binaries statically linked to Qt</flag>
+	<flag name='pax_kernel'>Triggers a paxmarking of the binary</flag>
 </use>
 </pkgmetadata>
diff --git a/net-im/skype/skype-2.2.0.35-r1.ebuild b/net-im/skype/skype-2.2.0.35-r1.ebuild
index 1beb77ee104c..e3a8aa2088c2 100644
--- a/net-im/skype/skype-2.2.0.35-r1.ebuild
+++ b/net-im/skype/skype-2.2.0.35-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild,v 1.1 2011/06/15 22:07:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild,v 1.2 2012/02/28 21:24:54 prometheanfire Exp $
 
 EAPI=4
 inherit gnome2-utils eutils qt4-r2 pax-utils
@@ -16,7 +16,7 @@ SRC_URI="!qt-static? ( http://download.skype.com/linux/${DFILENAME} )
 LICENSE="skype-eula"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="qt-static"
+IUSE="qt-static pax_kernel"
 
 RESTRICT="mirror strip" # Bug 299368
 EMUL_VER=20091231
@@ -103,6 +103,15 @@ src_install() {
 	make_desktop_entry skype "Skype VoIP" skype "Network;InstantMessaging;Telephony"
 
 	dosym /opt/skype /usr/share/skype #Fix for disabled sound notification
+
+	if use pax_kernel; then
+		pax-mark m /opt/skype/skype || die
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "skype under a PaX enabled kernel.  To do so, we must modify"
+		eqawarn "the skype binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that skype is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
 }
 
 pkg_preinst() {