diff options
| author |   Jason Zaman <perfinion@gentoo.org> | 2017-04-27 02:10:37 +0800 |
|---|---|---|
| committer | Jason Zaman <perfinion@gentoo.org> | 2017-04-27 02:14:20 +0800 |
| commit | 0fc3c67bb5c4530d6bc487aebd5a2eb2bc314d95 (patch) | |
| tree | ac7b29a2cec22b998224b151269fb506ebebca48 /sys-apps/policycoreutils | |
| parent | sys-apps/restorecond: New Package split from policycoreutils (diff) | |
| download | gentoo-0fc3c67bb5c4530d6bc487aebd5a2eb2bc314d95.tar.gz gentoo-0fc3c67bb5c4530d6bc487aebd5a2eb2bc314d95.tar.bz2 gentoo-0fc3c67bb5c4530d6bc487aebd5a2eb2bc314d95.zip | |
sys-apps/policycoreutils: patches merge upstream
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'sys-apps/policycoreutils')
| -rw-r--r-- | sys-apps/policycoreutils/files/policycoreutils-2.7-0001-newrole-not-suid.patch | 13 | ||||
| -rw-r--r-- | sys-apps/policycoreutils/policycoreutils-9999.ebuild | 19 |
2 files changed, 20 insertions, 12 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 new file mode 100644 index 000000000000..9dcddde4fda8 --- /dev/null +++ b/sys-apps/policycoreutils/files/policycoreutils-2.7-0001-newrole-not-suid.patch @@ -0,0 +1,13 @@ +diff --git a/policycoreutils/newrole/Makefile b/policycoreutils/newrole/Makefile +index bdefbb8..9cff135 100644 +--- a/policycoreutils/newrole/Makefile ++++ b/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-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild index 4986665b85c6..b3b5d467800a 100644 --- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild @@ -83,12 +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}/0010-remove-sesandbox-support.patch" - eapply "${FILESDIR}/0020-disable-autodetection-of-pam-and-audit.patch" - eapply "${FILESDIR}/0030-make-inotify-check-use-flag-triggered.patch" - eapply "${FILESDIR}/0070-remove-symlink-attempt-fails-with-gentoo-sandbox-approach.patch" - eapply "${FILESDIR}/0110-build-mcstrans-bug-472912.patch" - eapply "${FILESDIR}/0120-build-failure-for-mcscolor-for-CONTEXT__CONTAINS.patch" + eapply "${FILESDIR}/policycoreutils-2.7-0001-newrole-not-suid.patch" fi # rlpkg is more useful than fixfiles @@ -114,9 +109,9 @@ src_compile() { building() { emake -C "${BUILD_DIR}" \ AUDIT_LOG_PRIVS="y" \ - AUDITH="$(usex audit)" \ - PAMH="$(usex pam)" \ - INOTIFYH="$(usex dbus)" \ + AUDITH="$(usex audit y n)" \ + PAMH="$(usex pam y n)" \ + INOTIFYH="$(usex dbus y n)" \ SESANDBOX="n" \ CC="$(tc-getCC)" \ PYLIBVER="${EPYTHON}" \ @@ -133,9 +128,9 @@ src_install() { installation-policycoreutils() { einfo "Installing policycoreutils" emake -C "${BUILD_DIR}" DESTDIR="${D}" \ - AUDITH="$(usex audit)" \ - PAMH="$(usex pam)" \ - INOTIFYH="$(usex dbus)" \ + AUDITH="$(usex audit y n)" \ + PAMH="$(usex pam y n)" \ + INOTIFYH="$(usex dbus y n)" \ SESANDBOX="n" \ AUDIT_LOG_PRIV="y" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ |