summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaman <perfinion@gentoo.org>2017-07-09 17:49:32 +0800
committerJason Zaman <perfinion@gentoo.org>2017-07-09 18:03:09 +0800
commit07f19bdf64a33eb8bc7b2e1a8368bb53e0b0585c (patch)
treee9878cb96686a6ecd2eea8b345da507495c5e77f /sys-apps/policycoreutils
parentsys-apps/selinux-python: bump to 2.7_rc4 (diff)
downloadgentoo-07f19bdf64a33eb8bc7b2e1a8368bb53e0b0585c.tar.gz
gentoo-07f19bdf64a33eb8bc7b2e1a8368bb53e0b0585c.tar.bz2
gentoo-07f19bdf64a33eb8bc7b2e1a8368bb53e0b0585c.zip
sys-apps/policycoreutils: update suid patch
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Diffstat (limited to 'sys-apps/policycoreutils')
-rw-r--r--sys-apps/policycoreutils/files/policycoreutils-2.7-0001-newrole-not-suid.patch2
-rw-r--r--sys-apps/policycoreutils/files/policycoreutils-2.7_rc1-0001-newrole-not-suid.patch13
-rw-r--r--sys-apps/policycoreutils/policycoreutils-2.7_rc1.ebuild2
3 files changed, 15 insertions, 2 deletions
diff --git a/sys-apps/policycoreutils/files/policycoreutils-2.7-0001-newrole-not-suid.patch b/sys-apps/policycoreutils/files/policycoreutils-2.7-0001-newrole-not-suid.patch
index d4aa531063ff..6049bbe282af 100644
--- a/sys-apps/policycoreutils/files/policycoreutils-2.7-0001-newrole-not-suid.patch
+++ b/sys-apps/policycoreutils/files/policycoreutils-2.7-0001-newrole-not-suid.patch
@@ -8,6 +8,6 @@ index bdefbb8..9cff135 100644
ifeq ($(IS_SUID),y)
- MODE := 4555
+ MODE := 0555
- LDLIBS += -lcap-ng
+ override LDLIBS += -lcap-ng
else
MODE := 0555
diff --git a/sys-apps/policycoreutils/files/policycoreutils-2.7_rc1-0001-newrole-not-suid.patch b/sys-apps/policycoreutils/files/policycoreutils-2.7_rc1-0001-newrole-not-suid.patch
new file mode 100644
index 000000000000..d4aa531063ff
--- /dev/null
+++ b/sys-apps/policycoreutils/files/policycoreutils-2.7_rc1-0001-newrole-not-suid.patch
@@ -0,0 +1,13 @@
+diff --git a/policycoreutils/newrole/Makefile b/policycoreutils/newrole/Makefile
+index bdefbb8..9cff135 100644
+--- policycoreutils/newrole/Makefile
++++ policycoreutils/newrole/Makefile
+@@ -49,7 +49,7 @@ ifeq ($(NAMESPACE_PRIV),y)
+ IS_SUID=y
+ endif
+ ifeq ($(IS_SUID),y)
+- MODE := 4555
++ MODE := 0555
+ LDLIBS += -lcap-ng
+ else
+ MODE := 0555
diff --git a/sys-apps/policycoreutils/policycoreutils-2.7_rc1.ebuild b/sys-apps/policycoreutils/policycoreutils-2.7_rc1.ebuild
index 4e75a4f5dc67..fd1ae7ab7c69 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.7_rc1.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.7_rc1.ebuild
@@ -83,7 +83,7 @@ src_prepare() {
cd "${S}" || die "Failed to switch to ${S}"
if [[ ${PV} != 9999 ]] ; then
# If needed for live ebuilds please use /etc/portage/patches
- eapply "${FILESDIR}/policycoreutils-2.7-0001-newrole-not-suid.patch"
+ eapply "${FILESDIR}/policycoreutils-2.7_rc1-0001-newrole-not-suid.patch"
fi
# rlpkg is more useful than fixfiles