[gentoo-commits] repo/gentoo:master commit in: sys-apps/policycoreutils/files/, sys-apps/policycoreutils/

2018-03-01 Thread Jason Zaman 
commit: bdc01316917d5975eff7b9a767b9c2fe7f2e3196
Author: Jason Zaman  gentoo  org>
AuthorDate: Thu Mar  1 15:43:53 2018 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Fri Mar  2 06:06:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdc01316

sys-apps/policycoreutils: drop 2.6

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-apps/policycoreutils/Manifest  |   2 -
 .../files/0010-remove-sesandbox-support.patch  |   9 -
 ...20-disable-autodetection-of-pam-and-audit.patch | 108 
 ...030-make-inotify-check-use-flag-triggered.patch |  14 --
 ...ttempt-fails-with-gentoo-sandbox-approach.patch |  11 --
 .../files/0110-build-mcstrans-bug-472912.patch |  64 ---
 ...ailure-for-mcscolor-for-CONTEXT__CONTAINS.patch |  11 --
 .../policycoreutils/policycoreutils-2.6-r1.ebuild  | 187 -
 8 files changed, 406 deletions(-)

diff --git a/sys-apps/policycoreutils/Manifest 
b/sys-apps/policycoreutils/Manifest
index ed6789183b4..38aec9564a6 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,4 +1,2 @@
-DIST policycoreutils-2.6.tar.gz 4660087 BLAKE2B 
26ea03db8552b5ad3967acb6912dde0f332315f93682e65e3f6461f19efdc4ec1444c219a946e3172283078012961c0a39bb77203e20544e6c4de48c7a6fa0f9
 SHA512 
ba289060bc348f9315bce84a5e5daf145600274289fdd2206edc10bb0ee03f9b02a9e40e9c118809961ddfe7844dee7d8952d8c9a239af7282f4fc1614c21e9d
 DIST policycoreutils-2.7.tar.gz 2796707 BLAKE2B 
4b1c03f2d12252b453950c3d6bcde75780926a1b91263d3881f741399c5630c707f0429b9b144c657b017b7b0c1500b63b6463610dea3caaef8c2f7c3f69fd8f
 SHA512 
ce97d659f72058fd23d8dab8db98fc7c0003806a636c521fa15da465d7358d40ccc8e3eaa9675f00a9b0b8aaa1465d3fb650bc0ebbbf00164e121230673256fb
-DIST policycoreutils-extra-1.35.tar.bz2 12124 BLAKE2B 
78e9651a1d8aa1747ef6a4dfd657e27a1b22e13d6ae36cabbfe8bd80986770a6f3638232db6b56f730cf379e85239e4a945cea4946553d07f18e1e9d1467996f
 SHA512 
8cc3c74afee7ec38d7d085744fdd60849d3ae97a75599d2181b12b5b472a6a4445868e8a6aff707e439c10d9c378fb55e329b4db21c0a771f41180bf3b9eabc1
 DIST policycoreutils-extra-1.36.tar.bz2 8830 BLAKE2B 
6d98e41ea379d3e95221a6e53d8a8b144e4e15ca5581381e76a529dbbaca304d5587b30419797c8c70cbd7c2b2588e5ecd62adcf97294e429950899c1c318346
 SHA512 
c6a18e6fb2d65f51dc55b88907f23241f2fbfc033d3d2888b109596d9ed31d509b2c93456727ea4d1f98544831afb15c449ff72d6aedf93b9e474b27817f7fb3

diff --git a/sys-apps/policycoreutils/files/0010-remove-sesandbox-support.patch 
b/sys-apps/policycoreutils/files/0010-remove-sesandbox-support.patch
deleted file mode 100644
index 52a34bd1f47..000
--- a/sys-apps/policycoreutils/files/0010-remove-sesandbox-support.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -uNr policycoreutils-2.4-rc2.orig/Makefile 
policycoreutils-2.4-rc2/Makefile
 policycoreutils-2.4-rc2.orig/Makefile  2014-08-28 20:13:23.212622408 
+0200
-+++ policycoreutils-2.4-rc2/Makefile   2014-08-28 20:14:24.136624808 +0200
-@@ -1,4 +1,4 @@
--SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init sandbox 
secon audit2allow sestatus semodule_package semodule semodule_link 
semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui hll
-+SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init secon 
audit2allow sestatus semodule_package semodule semodule_link semodule_expand 
semodule_deps sepolgen-ifgen setsebool scripts po man gui hll
- 
- INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
- 

diff --git 
a/sys-apps/policycoreutils/files/0020-disable-autodetection-of-pam-and-audit.patch
 
b/sys-apps/policycoreutils/files/0020-disable-autodetection-of-pam-and-audit.patch
deleted file mode 100644
index a3eeaed901d..000
--- 
a/sys-apps/policycoreutils/files/0020-disable-autodetection-of-pam-and-audit.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff -uNr policycoreutils-2.2.1.orig/newrole/Makefile 
policycoreutils-2.2.1/newrole/Makefile
 policycoreutils-2.2.1.orig/newrole/Makefile2013-11-04 
21:37:27.197018032 +0100
-+++ policycoreutils-2.2.1/newrole/Makefile 2013-11-04 21:37:47.602018075 
+0100
-@@ -4,8 +4,8 @@
- MANDIR ?= $(PREFIX)/share/man
- ETCDIR ?= $(DESTDIR)/etc
- LOCALEDIR = /usr/share/locale
--PAMH = $(shell ls /usr/include/security/pam_appl.h 2>/dev/null)
--AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
-+PAMH ?= no
-+AUDITH ?= no
- # Enable capabilities to permit newrole to generate audit records.
- # This will make newrole a setuid root program.
- # The capabilities used are: CAP_AUDIT_WRITE.
-@@ -24,7 +24,7 @@
- EXTRA_OBJS =
- override CFLAGS += -DVERSION=\"$(VERSION)\" $(LDFLAGS) -I$(PREFIX)/include 
-DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
- LDLIBS += -lselinux -L$(PREFIX)/lib
--ifeq ($(PAMH), /usr/include/security/pam_appl.h)
-+ifeq ($(PAMH), yes)
-   override CFLAGS += -DUSE_PAM
-   EXTRA_OBJS += hashtab.o
-   LDLIBS += -lpam -lpam_misc
-@@ -32,7 +32,7 @@
-   override

[gentoo-commits] repo/gentoo:master commit in: sys-apps/policycoreutils/files/, sys-apps/policycoreutils/

2017-06-13 Thread Jason Zaman 
commit: 99073dda8b3af3ceec7a559b44eb687f9b85c15e
Author: Jason Zaman  gentoo  org>
AuthorDate: Tue Jun 13 05:18:12 2017 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Tue Jun 13 15:10:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99073dda

sys-apps/policycoreutils: bump to 2.7_rc1

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 sys-apps/policycoreutils/Manifest  |   2 +
 ...policycoreutils-2.7-0001-newrole-not-suid.patch |   4 +-
 .../policycoreutils/policycoreutils-2.7_rc1.ebuild | 181 +
 3 files changed, 185 insertions(+), 2 deletions(-)

diff --git a/sys-apps/policycoreutils/Manifest 
b/sys-apps/policycoreutils/Manifest
index 867f19ae909..b38eb659f11 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,4 +1,6 @@
 DIST policycoreutils-2.5.tar.gz 4986066 SHA256 
329382cfe9fa977678abf541dcd8fe3847cf0c83b24654c8f7322343907078a1 SHA512 
0eabf046cf44c6fe2e28492f53862f4302551d602e9b678b923f34f35bfc48f03a73b62962ac71465b9d99b411016b2cfc976f3baf113133a6c0adab1e1f6f8b
 WHIRLPOOL 
27a6810d611f50ac1292f614c9936f0b73b7334be80685f1eda6fd72ec7e85fc0f7b4ff930a48c08a61ade84fd46bd9e7285f5a135ea6db6e4fe88e38d73bd16
 DIST policycoreutils-2.6.tar.gz 4660087 SHA256 
68891b376f5048edc53c6ccb2fca44da3dc7f4563f4b6894e201d70c04a05a29 SHA512 
ba289060bc348f9315bce84a5e5daf145600274289fdd2206edc10bb0ee03f9b02a9e40e9c118809961ddfe7844dee7d8952d8c9a239af7282f4fc1614c21e9d
 WHIRLPOOL 
c04a5f0f6bb044090e0d443f4497d828713fd32de4a0f5b5442e70e836da99e5e6e562a9deeedb566b07da1687c0a6b056c33b0bbe9836a71891fc6a449da60c
+DIST policycoreutils-2.7-rc1.tar.gz 2797016 SHA256 
d990b00be77838c15bf701494eeddd7d39cb8871dcc69483dd954a2c2a9eb328 SHA512 
7669041dbd6a119dde0283335967160cf477d21e5e6f170e7269351bc07e30995b489fd6eb90188e84be0b321e55e77860cbbad588fbf5f5c2b64a6f18334cfb
 WHIRLPOOL 
529f8dfc55844a712bf966b0686e522b563bcbcd2373ec113a90bf78c8a30c3f4250393ea35554e5065065dde9f583f5461a889d825ffcced1b96f383e91a086
 DIST policycoreutils-extra-1.34.tar.bz2 12107 SHA256 
56ae2aac57bf104d6a8a7837b25de7978b25e0642744ef95e6e6d483201aa4ca SHA512 
b1db6d70cf864023f22583e5bd24c85e796f1541f9c1bc878dd55309464b27346e05e414db3ef81bef2dfe8c8d7d7063ee7e0422878f38a3db56c67d9468b89d
 WHIRLPOOL 
8b094818bed0e438ce4258428afa054cb561f53e303d84e171881add5952cfc0fa577bce2765294905dac8ddd5560906904958f35c96afce0f357feb5333646d
 DIST policycoreutils-extra-1.35.tar.bz2 12124 SHA256 
25983df35c0b98fb65423f109d71c02e4d6b86415452b7a7a6e92b5e4fa4a36e SHA512 
8cc3c74afee7ec38d7d085744fdd60849d3ae97a75599d2181b12b5b472a6a4445868e8a6aff707e439c10d9c378fb55e329b4db21c0a771f41180bf3b9eabc1
 WHIRLPOOL 
863ca52e1897cbfb9252f1afe81fef497f27ede10c74e1150c07e9f355390eca0e64c9b0cc0a48e8a7442b310387b1e929b40e2b9c14a9a095850a00983cd5f6
+DIST policycoreutils-extra-1.36.tar.bz2 8830 SHA256 
2dfbe799bbbf150e68fab7e168fd71b94505c992623f30c71873213447506e8f SHA512 
c6a18e6fb2d65f51dc55b88907f23241f2fbfc033d3d2888b109596d9ed31d509b2c93456727ea4d1f98544831afb15c449ff72d6aedf93b9e474b27817f7fb3
 WHIRLPOOL 
c9772dba472b9b466181204f5bd5fb13d839042c53c84db38999a8b077b0dee1e9e78089b7b5fe4bc4076a1ad1c420528354404b292abd428a73e6f95312d0c4

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 9dcddde4fda..d4aa531063f 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
@@ -1,7 +1,7 @@
 diff --git a/policycoreutils/newrole/Makefile 
b/policycoreutils/newrole/Makefile
 index bdefbb8..9cff135 100644
 a/policycoreutils/newrole/Makefile
-+++ b/policycoreutils/newrole/Makefile
+--- policycoreutils/newrole/Makefile
 policycoreutils/newrole/Makefile
 @@ -49,7 +49,7 @@ ifeq ($(NAMESPACE_PRIV),y)
IS_SUID=y
  endif

diff --git a/sys-apps/policycoreutils/policycoreutils-2.7_rc1.ebuild 
b/sys-apps/policycoreutils/policycoreutils-2.7_rc1.ebuild
new file mode 100644
index 000..4e75a4f5dc6
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-2.7_rc1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="xml"
+
+inherit multilib python-r1 toolchain-funcs bash-completion-r1
+
+MY_P="${P//_/-}"
+
+MY_RELEASEDATE="20170609"
+EXTRAS_VER="1.36"
+SEMNG_VER="${PV}"
+SELNX_VER="${PV}"
+SEPOL_VER="${PV}"
+
+IUSE="audit pam dbus"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki";
+
+if [[ ${PV} ==  ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git";
+   
SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRA

[gentoo-commits] repo/gentoo:master commit in: sys-apps/policycoreutils/files/, sys-apps/policycoreutils/

2017-04-26 Thread Jason Zaman 
commit: 0fc3c67bb5c4530d6bc487aebd5a2eb2bc314d95
Author: Jason Zaman  gentoo  org>
AuthorDate: Wed Apr 26 18:10:37 2017 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Wed Apr 26 18:14:20 2017 +
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-.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 000..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-.ebuild 
b/sys-apps/policycoreutils/policycoreutils-.ebuild
index 4986665b85c..b3b5d467800 100644
--- a/sys-apps/policycoreutils/policycoreutils-.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-.ebuild
@@ -83,12 +83,7 @@ src_prepare() {
cd "${S}" || die "Failed to switch to ${S}"
if [[ ${PV} !=  ]] ; 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)" \