diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-06-27 11:56:12 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-06-27 11:56:12 +0000 |
| commit | fea40a811ce96dd6da5d31dfc8939a34985df750 (patch) | |
| tree | bd41e45ba5751e76a84e50276db1c320c86dc2e4 /sys-auth | |
| parent | Stable for amd64, wrt bug #392329 (diff) | |
| download | gentoo-2-fea40a811ce96dd6da5d31dfc8939a34985df750.tar.gz gentoo-2-fea40a811ce96dd6da5d31dfc8939a34985df750.tar.bz2 gentoo-2-fea40a811ce96dd6da5d31dfc8939a34985df750.zip | |
tweak last pax-mark change
(Portage version: 2.2.0_alpha113/cvs/Linux x86_64)
Diffstat (limited to 'sys-auth')
| -rw-r--r-- | sys-auth/polkit/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-auth/polkit/polkit-0.106-r5.ebuild | 6 |
2 files changed, 7 insertions, 5 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/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 } |