summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-auth/polkit/ChangeLog6
-rw-r--r--sys-auth/polkit/Manifest18
-rw-r--r--sys-auth/polkit/polkit-0.106-r5.ebuild6
3 files changed, 16 insertions, 14 deletions
diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index 78052537d4bf..f70c7f2baa54 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,10 +1,10 @@
# ChangeLog for sys-auth/polkit
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.92 2012/06/27 11:45:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.93 2012/06/27 11:56:12 ssuominen Exp $
27 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> polkit-0.106-r5.ebuild:
- pax-mark polkitd only when spidermonkey is built with JIT enabled (by using
- has_version check)
+ pax-mark polkitd only when spidermonkey is built with JIT enabled and only
+ 'm' instead of 'mr' when version is >= 1.8.7 (by using has_version check)
27 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> -polkit-0.106-r2.ebuild,
-polkit-0.106-r3.ebuild, -polkit-0.106-r4.ebuild:
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 8a59c816e21b..b8a57ff3d834 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -6,17 +6,17 @@ DIST polkit-0.105.tar.gz 1431080 RMD160 cd1100ee69a308d620e437d34e471580bb6dcf5a
DIST polkit-0.106.tar.gz 1381428 RMD160 6fa79aaa4e67e072d16860f1a242b053cc311bc3 SHA1 665624f5d69876ec5833f7952290188ca594aac0 SHA256 4005076a67aaa182872c1e316939fcb0ba74a89298e6330d72cfdac6624c984e
EBUILD polkit-0.104-r1.ebuild 3548 RMD160 e056d1186192d865a610ebe1250e8adf9250eed7 SHA1 1a7cec206005fdb8985fc308f16bbe6f76b45c34 SHA256 a038cdfd2381bd5ddbd6cf4feef8a3aaa126b4e80a6205979538c9ebcbf0b9a0
EBUILD polkit-0.105.ebuild 2194 RMD160 7f46dccee0326480a5c1c2fd276df48553abd630 SHA1 f41f0393be142066d39d52994f7f29f52c336f2c SHA256 15339d2d61f350eec88ad0fd90cec401df45106fc2ee52ee7b8b051103a5279e
-EBUILD polkit-0.106-r5.ebuild 2933 RMD160 21e13b24f864804ab1ab7a1413420348022355a9 SHA1 52932c9e873db150eceb7f46e3615c849b151746 SHA256 e9594050ac568054766faf4f456c73bc13f9a9ead2e94a36474153f370b67612
-MISC ChangeLog 12916 RMD160 05102a7f4ce7a5030588f78bd4e6a1470482c8f6 SHA1 2eff0fca83bad549576ca34c034dc7e2f03745d6 SHA256 6ea471f0b9a3e10cec1ae360b81e57a72e14781b996cfbb0540530fbd760aefa
+EBUILD polkit-0.106-r5.ebuild 3006 RMD160 5145f232a8c1c93e90ae89e5dcbcc7e4fa3c6892 SHA1 8eaf316ece45cd4f4041908b52bae525c187d897 SHA256 ac317d15ee30f4430cbd16fb30b6444d8044635d74e008263239ace4f69adedd
+MISC ChangeLog 12970 RMD160 14e39e225b9973a37c6bd58f3d9b4f64b6814628 SHA1 5995158febaff4b447bd798ce980596c3a5521fc SHA256 99cc239c819a8ef2cd7ebb37a84275bab14b50012cd19017f692e427b2386741
MISC metadata.xml 516 RMD160 0c65650680494cadd548ec430b11facf2cc28912 SHA1 092816617aa2ab7a9047298b6752b82bbab33520 SHA256 be8c8239fecd14fd1a9c1dee11ccb98b1188aceacf6ea58233a0f958ab648aba
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBAgAGBQJP6vE0AAoJEEdUh39IaPFNYJMH/iaoPQvdz/7fOvdZcTMZ1Yrv
-N+elNlvnkuPW5f52zp1288EZgzz6j8L0RZGEpAqz6vi9Aa978Ik8gI8yps6QMpOw
-xiGG9ky6MfPy0v70YukBaha8Go+CcgitDeJu4tfuD2T7REo2qmdTb+x0g+VRYHbr
-2B0CH48s24XDt34CyTF/nTQwpTh02jUV2vis1pixY7fsMl82jnaaGR+HVCPn6rvE
-nvMvQWJGpbKZwSGq2ywmVecuL1i/kWPL/+QURQqHgR/fu256nnuEK2o4sfqG6udf
-rVRwtGoKFCY2iJAAbJcNV8YhjwiLF+pg/Oeki8ujGEXJwPtZZlXW8DT9kyL0BlY=
-=T6oJ
+iQEcBAEBAgAGBQJP6vOkAAoJEEdUh39IaPFNhWwIAIXpBj+XS00YVTGSGsdeUbmf
+waM3ubaWPcO0DzGpj/C4RmxqFt84GdBxncfDoZAXRdJgfHI6D3YTruyDFcXhEG/4
+L8whLlAQ1wPJv8lLqj3yMneoWxNVRadJ/Wg22nP0yTBK5gCVwzS86wCKGjNDxdEx
+IQTJAGY3ZoUUDHEYMcVEd9wly3xIks7wIZyPsH2myoH/mRAK8W31aa+rmJ7E7UWR
+8WHQ/hdBryEZnmY2hiomCaoEsyu2jMAw8bv5jT474iAtLYlMwHOgox+upZkgjZVY
+JXBgsmzvmpHBbxdyS9ioy1TTTrR78kyfKmWf6eS1bRyappt3UNDGRRSVoS0sDfI=
+=r0Fn
-----END PGP SIGNATURE-----
diff --git a/sys-auth/polkit/polkit-0.106-r5.ebuild b/sys-auth/polkit/polkit-0.106-r5.ebuild
index be3a8b123402..6e90a9c00f65 100644
--- a/sys-auth/polkit/polkit-0.106-r5.ebuild
+++ b/sys-auth/polkit/polkit-0.106-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.106-r5.ebuild,v 1.2 2012/06/27 11:45:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.106-r5.ebuild,v 1.3 2012/06/27 11:56:12 ssuominen Exp $
EAPI=4
inherit eutils multilib pam pax-utils systemd user
@@ -95,8 +95,10 @@ src_install() {
rm -f "${ED}"/usr/lib*/pkgconfig/polkit-backend-1.pc #423431
# Required for polkitd on hardened/PaX due to spidermonkey's JIT
- if has_version '<dev-lang/spidermonkey-1.8.7' || has_version 'dev-lang/spidermonkey[jit]'; then
+ if has_version '<dev-lang/spidermonkey-1.8.7'; then
pax-mark mr "${ED}"/usr/$(get_libdir)/polkit-1/polkitd
+ elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
+ pax-mark m "${ED}"/usr/$(get_libdir)/polkit-1/polkitd
fi
}