commit: 650c263bc4e20c6e4a94bfdc359a4bc66137d856
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 02:57:52 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 02:57:52 2019 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=650c263b
sys-apps/policycoreutils: sync with the tree
Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --force
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-apps/policycoreutils/Manifest | 5 +++--
...utils-2.7.ebuild => policycoreutils-2.9.ebuild} | 22 +++++++++---------
...utils-2.7.ebuild => policycoreutils-3.0.ebuild} | 26 +++++++++-------------
3 files changed, 24 insertions(+), 29 deletions(-)
diff --git a/sys-apps/policycoreutils/Manifest
b/sys-apps/policycoreutils/Manifest
index 9703b5b..86052aa 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,2 +1,3 @@
-DIST policycoreutils-2.7.tar.gz 2796707 SHA256
0a1b8a4a323b854981c6755ff025fe98a0f1cff307f109abb260f0490f13e4f4 SHA512
ce97d659f72058fd23d8dab8db98fc7c0003806a636c521fa15da465d7358d40ccc8e3eaa9675f00a9b0b8aaa1465d3fb650bc0ebbbf00164e121230673256fb
WHIRLPOOL
f2360ab5e83f1a9a0f9e63bf700a89c28b61d13f8101c9ea2b68e9f071ede23557a0a5bec9a077b96b42be063421018ab8b85c4443e3bc1021f0d251a62de301
-DIST policycoreutils-extra-1.36.tar.bz2 8830 SHA256
2dfbe799bbbf150e68fab7e168fd71b94505c992623f30c71873213447506e8f SHA512
c6a18e6fb2d65f51dc55b88907f23241f2fbfc033d3d2888b109596d9ed31d509b2c93456727ea4d1f98544831afb15c449ff72d6aedf93b9e474b27817f7fb3
WHIRLPOOL
c9772dba472b9b466181204f5bd5fb13d839042c53c84db38999a8b077b0dee1e9e78089b7b5fe4bc4076a1ad1c420528354404b292abd428a73e6f95312d0c4
+DIST policycoreutils-2.9.tar.gz 2819360 BLAKE2B
b0af912e3b4fb2c9598b10ce413c8ffb3f5972a4d5d59270cff40abe8d4e385e0664e24a4f533a95ad2d1657644f3368213f955ac63d9f8c46a661417b07c8b3
SHA512
d8356115671ba66de05f1c13193ab47fab69cc4d09603a92171ed40afafc084dd191591bf336b7d722de637378ad09622ebb6eca85c06063ca9ddd6db10e02a2
+DIST policycoreutils-3.0.tar.gz 2818089 BLAKE2B
6e4aa6d6eecf809efaefccbfa16c44050242d129f496594763aacbb9aaeca23d92b27d30a6f9ae0e49513adc0a1bd58499253eb9ffc003547387c04aa643b462
SHA512
d8d25db48c1caef69228e87d7ebb2c0f075e44e4ff6bf18a26af341d948b81375b33945128cd0410ffebc64ca478fd19a207295189c716c95e6a3c586e9f053d
+DIST policycoreutils-extra-1.36.tar.bz2 8830 BLAKE2B
6d98e41ea379d3e95221a6e53d8a8b144e4e15ca5581381e76a529dbbaca304d5587b30419797c8c70cbd7c2b2588e5ecd62adcf97294e429950899c1c318346
SHA512
c6a18e6fb2d65f51dc55b88907f23241f2fbfc033d3d2888b109596d9ed31d509b2c93456727ea4d1f98544831afb15c449ff72d6aedf93b9e474b27817f7fb3
diff --git a/sys-apps/policycoreutils/policycoreutils-2.7.ebuild
b/sys-apps/policycoreutils/policycoreutils-2.9.ebuild
similarity index 90%
copy from sys-apps/policycoreutils/policycoreutils-2.7.ebuild
copy to sys-apps/policycoreutils/policycoreutils-2.9.ebuild
index 42bcda2..7ab9455 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.7.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.9.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{3_5,3_6} )
PYTHON_REQ_USE="xml"
inherit multilib python-r1 toolchain-funcs bash-completion-r1
MY_P="${P//_/-}"
-MY_RELEASEDATE="20170804"
+MY_RELEASEDATE="20190315"
EXTRAS_VER="1.36"
SEMNG_VER="${PV}"
SELNX_VER="${PV}"
@@ -21,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DESCRIPTION="SELinux core utilities"
HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki";
-if [[ ${PV} == 9999 ]] ; then
+if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git";
SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2";
@@ -29,9 +29,9 @@ if [[ ${PV} == 9999 ]] ; then
S2="${WORKDIR}/policycoreutils-extra"
S="${S1}"
else
-
SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz
+
SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz
https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2";
- KEYWORDS="amd64 ~mips x86"
+ KEYWORDS="amd64 ~arm64 ~mips x86"
S1="${WORKDIR}/${MY_P}"
S2="${WORKDIR}/policycoreutils-extra"
S="${S1}"
@@ -45,7 +45,7 @@
DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
>=sys-libs/libsemanage-${SEMNG_VER}:=[python,${PYTHON_USEDEP}]
sys-libs/libcap-ng:=
>=sys-libs/libsepol-${SEPOL_VER}:=
- >=app-admin/setools-4.1.1[${PYTHON_USEDEP}]
+ >=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
sys-devel/gettext
dev-python/ipy[${PYTHON_USEDEP}]
dbus? (
@@ -83,7 +83,7 @@ src_prepare() {
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}/${P}-musl.patch"
+ eapply "${FILESDIR}/${PN}-2.7-musl.patch"
fi
# rlpkg is more useful than fixfiles
@@ -114,7 +114,6 @@ src_compile() {
INOTIFYH="$(usex dbus y n)" \
SESANDBOX="n" \
CC="$(tc-getCC)" \
- PYLIBVER="${EPYTHON}" \
LIBDIR="\$(PREFIX)/$(get_libdir)"
}
S="${S1}" # Regular policycoreutils
@@ -128,11 +127,12 @@ src_install() {
installation-policycoreutils() {
einfo "Installing policycoreutils"
emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+ AUDIT_LOG_PRIVS="y" \
AUDITH="$(usex audit y n)" \
PAMH="$(usex pam y n)" \
INOTIFYH="$(usex dbus y n)" \
SESANDBOX="n" \
- AUDIT_LOG_PRIV="y" \
+ CC="$(tc-getCC)" \
LIBDIR="\$(PREFIX)/$(get_libdir)" \
install
python_optimize
@@ -142,8 +142,6 @@ src_install() {
einfo "Installing policycoreutils-extra"
emake -C "${BUILD_DIR}" \
DESTDIR="${D}" \
- INOTIFYH="$(usex dbus)" \
- SHLIBDIR="${D}$(get_libdir)/rc" \
install
python_optimize
}
diff --git a/sys-apps/policycoreutils/policycoreutils-2.7.ebuild
b/sys-apps/policycoreutils/policycoreutils-3.0.ebuild
similarity index 87%
rename from sys-apps/policycoreutils/policycoreutils-2.7.ebuild
rename to sys-apps/policycoreutils/policycoreutils-3.0.ebuild
index 42bcda2..3903858 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.7.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-3.0.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
PYTHON_REQ_USE="xml"
inherit multilib python-r1 toolchain-funcs bash-completion-r1
MY_P="${P//_/-}"
-MY_RELEASEDATE="20170804"
+MY_RELEASEDATE="20191204"
EXTRAS_VER="1.36"
SEMNG_VER="${PV}"
SELNX_VER="${PV}"
@@ -21,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DESCRIPTION="SELinux core utilities"
HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki";
-if [[ ${PV} == 9999 ]] ; then
+if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git";
SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2";
@@ -29,9 +29,9 @@ if [[ ${PV} == 9999 ]] ; then
S2="${WORKDIR}/policycoreutils-extra"
S="${S1}"
else
-
SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz
+
SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz
https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2";
- KEYWORDS="amd64 ~mips x86"
+ KEYWORDS="~amd64 ~arm64 ~mips ~x86"
S1="${WORKDIR}/${MY_P}"
S2="${WORKDIR}/policycoreutils-extra"
S="${S1}"
@@ -45,7 +45,7 @@
DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
>=sys-libs/libsemanage-${SEMNG_VER}:=[python,${PYTHON_USEDEP}]
sys-libs/libcap-ng:=
>=sys-libs/libsepol-${SEPOL_VER}:=
- >=app-admin/setools-4.1.1[${PYTHON_USEDEP}]
+ >=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
sys-devel/gettext
dev-python/ipy[${PYTHON_USEDEP}]
dbus? (
@@ -54,9 +54,7 @@
DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
)
audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
pam? ( sys-libs/pam:= )
- ${PYTHON_DEPS}
- !<sec-policy/selinux-base-policy-2.20151208-r6"
-# 2.20151208-r6 and higher has support for new setfiles
+ ${PYTHON_DEPS}"
### libcgroup -> seunshare
### dbus -> restorecond
@@ -83,7 +81,7 @@ src_prepare() {
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}/${P}-musl.patch"
+ eapply "${FILESDIR}/${PN}-2.7-musl.patch"
fi
# rlpkg is more useful than fixfiles
@@ -114,7 +112,6 @@ src_compile() {
INOTIFYH="$(usex dbus y n)" \
SESANDBOX="n" \
CC="$(tc-getCC)" \
- PYLIBVER="${EPYTHON}" \
LIBDIR="\$(PREFIX)/$(get_libdir)"
}
S="${S1}" # Regular policycoreutils
@@ -128,11 +125,12 @@ src_install() {
installation-policycoreutils() {
einfo "Installing policycoreutils"
emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+ AUDIT_LOG_PRIVS="y" \
AUDITH="$(usex audit y n)" \
PAMH="$(usex pam y n)" \
INOTIFYH="$(usex dbus y n)" \
SESANDBOX="n" \
- AUDIT_LOG_PRIV="y" \
+ CC="$(tc-getCC)" \
LIBDIR="\$(PREFIX)/$(get_libdir)" \
install
python_optimize
@@ -142,8 +140,6 @@ src_install() {
einfo "Installing policycoreutils-extra"
emake -C "${BUILD_DIR}" \
DESTDIR="${D}" \
- INOTIFYH="$(usex dbus)" \
- SHLIBDIR="${D}$(get_libdir)/rc" \
install
python_optimize
}
