commit:     cb4e07769b3f0b7ec6ad3f3a9b6b6b3e45705d0a
Author:     Jonathan Davies <jpds <AT> protonmail <DOT> com>
AuthorDate: Tue Sep  1 20:21:30 2020 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 03:40:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb4e0776

sys-apps/policycoreutils: Version bump to 3.1.

Signed-off-by: Jonathan Davies <jpds <AT> protonmail.com>
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>

 sys-apps/policycoreutils/Manifest                             |  2 ++
 .../files/policycoreutils-3.1-0001-newrole-not-suid.patch     | 11 +++++++++++
 ...policycoreutils-9999.ebuild => policycoreutils-3.1.ebuild} |  8 ++++----
 sys-apps/policycoreutils/policycoreutils-9999.ebuild          |  8 ++++----
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/sys-apps/policycoreutils/Manifest 
b/sys-apps/policycoreutils/Manifest
index 86052aaf9b0..f5fdac8fb42 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,3 +1,5 @@
 DIST policycoreutils-2.9.tar.gz 2819360 BLAKE2B 
b0af912e3b4fb2c9598b10ce413c8ffb3f5972a4d5d59270cff40abe8d4e385e0664e24a4f533a95ad2d1657644f3368213f955ac63d9f8c46a661417b07c8b3
 SHA512 
d8356115671ba66de05f1c13193ab47fab69cc4d09603a92171ed40afafc084dd191591bf336b7d722de637378ad09622ebb6eca85c06063ca9ddd6db10e02a2
 DIST policycoreutils-3.0.tar.gz 2818089 BLAKE2B 
6e4aa6d6eecf809efaefccbfa16c44050242d129f496594763aacbb9aaeca23d92b27d30a6f9ae0e49513adc0a1bd58499253eb9ffc003547387c04aa643b462
 SHA512 
d8d25db48c1caef69228e87d7ebb2c0f075e44e4ff6bf18a26af341d948b81375b33945128cd0410ffebc64ca478fd19a207295189c716c95e6a3c586e9f053d
+DIST policycoreutils-3.1.tar.gz 2817914 BLAKE2B 
ef68bb5f9cf577164ead44803b6be2bd6401c9e923d2c775c7c8c47f0e803749feaec4247fec5cc1cb766314954402fd2506370bb397f746437ecfcf65b384f3
 SHA512 
0592f218563a99ba95d2cfd07fdc3761b61c1cc3c01a17ab89ad840169e1a7d4083521d5cacc72d1b76911d516bf592db7a3f90d9ef0cc11ceed007e4580e140
 DIST policycoreutils-extra-1.36.tar.bz2 8830 BLAKE2B 
6d98e41ea379d3e95221a6e53d8a8b144e4e15ca5581381e76a529dbbaca304d5587b30419797c8c70cbd7c2b2588e5ecd62adcf97294e429950899c1c318346
 SHA512 
c6a18e6fb2d65f51dc55b88907f23241f2fbfc033d3d2888b109596d9ed31d509b2c93456727ea4d1f98544831afb15c449ff72d6aedf93b9e474b27817f7fb3
+DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B 
a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5
 SHA512 
0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f

diff --git 
a/sys-apps/policycoreutils/files/policycoreutils-3.1-0001-newrole-not-suid.patch
 
b/sys-apps/policycoreutils/files/policycoreutils-3.1-0001-newrole-not-suid.patch
new file mode 100644
index 00000000000..360a4904978
--- /dev/null
+++ 
b/sys-apps/policycoreutils/files/policycoreutils-3.1-0001-newrole-not-suid.patch
@@ -0,0 +1,11 @@
+--- a/newrole/Makefile
++++ b/newrole/Makefile
+@@ -50,7 +50,7 @@ ifeq ($(NAMESPACE_PRIV),y)
+       IS_SUID=y
+ endif
+ ifeq ($(IS_SUID),y)
+-      MODE := 4555
++      MODE := 0555
+       override LDLIBS += -lcap-ng
+ else
+       MODE := 0555

diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild 
b/sys-apps/policycoreutils/policycoreutils-3.1.ebuild
similarity index 97%
copy from sys-apps/policycoreutils/policycoreutils-9999.ebuild
copy to sys-apps/policycoreutils/policycoreutils-3.1.ebuild
index d083c523220..569dc07cfcf 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-3.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
@@ -9,8 +9,8 @@ inherit multilib python-r1 toolchain-funcs bash-completion-r1
 
 MY_P="${P//_/-}"
 
-MY_RELEASEDATE="20191204"
-EXTRAS_VER="1.36"
+MY_RELEASEDATE="20200710"
+EXTRAS_VER="1.37"
 SEMNG_VER="${PV}"
 SELNX_VER="${PV}"
 SEPOL_VER="${PV}"
@@ -79,7 +79,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-3.1-0001-newrole-not-suid.patch"
        fi
 
        # rlpkg is more useful than fixfiles

diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild 
b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index d083c523220..569dc07cfcf 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
@@ -9,8 +9,8 @@ inherit multilib python-r1 toolchain-funcs bash-completion-r1
 
 MY_P="${P//_/-}"
 
-MY_RELEASEDATE="20191204"
-EXTRAS_VER="1.36"
+MY_RELEASEDATE="20200710"
+EXTRAS_VER="1.37"
 SEMNG_VER="${PV}"
 SELNX_VER="${PV}"
 SEPOL_VER="${PV}"
@@ -79,7 +79,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-3.1-0001-newrole-not-suid.patch"
        fi
 
        # rlpkg is more useful than fixfiles

Reply via email to