From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1049B139695 for ; Wed, 26 Apr 2017 18:15:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 50E12E0C5F; Wed, 26 Apr 2017 18:15:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1A4D8E0C5F for ; Wed, 26 Apr 2017 18:15:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 04F30341686 for ; Wed, 26 Apr 2017 18:15:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2518F7446 for ; Wed, 26 Apr 2017 18:14:58 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1493230460.0fc3c67bb5c4530d6bc487aebd5a2eb2bc314d95.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/policycoreutils/files/, sys-apps/policycoreutils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/policycoreutils/files/policycoreutils-2.7-0001-newrole-not-suid.patch sys-apps/policycoreutils/policycoreutils-9999.ebuild X-VCS-Directories: sys-apps/policycoreutils/files/ sys-apps/policycoreutils/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 0fc3c67bb5c4530d6bc487aebd5a2eb2bc314d95 X-VCS-Branch: master Date: Wed, 26 Apr 2017 18:14:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2afc76c7-cc43-4311-a5a1-ee6e956b2646 X-Archives-Hash: f2d8110e2840cc9d5617e663e0f2acbd commit: 0fc3c67bb5c4530d6bc487aebd5a2eb2bc314d95 Author: Jason Zaman gentoo org> AuthorDate: Wed Apr 26 18:10:37 2017 +0000 Commit: Jason Zaman gentoo org> CommitDate: Wed Apr 26 18:14:20 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fc3c67b sys-apps/policycoreutils: patches merge upstream Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../policycoreutils-2.7-0001-newrole-not-suid.patch | 13 +++++++++++++ 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 00000000000..9dcddde4fda --- /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 4986665b85c..b3b5d467800 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)" \