sys-apps/policycoreutils: update suid patch

Package-Manager: Portage-2.3.6, Repoman-2.3.1

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 d4aa531063ffce6d43ea637ffb4e359c0947bad4..6049bbe282af29e72561b69130068a40bbc68af1 100644 (file)
--- 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 (file)
index 0000000..d4aa531
--- /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 4e75a4f5dc67d43356d7e53b92012815ce7c7b5b..fd1ae7ab7c69128d7e199a528cc08825e3ac822a 100644 (file)
--- 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