aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-05-31 01:36:44 +0100
committerSam James <sam@gentoo.org>2023-05-31 01:36:44 +0100
commit3260a63be66e9c08bd92b6741956916df9617106 (patch)
treeacd1b809afa3b2337c7fd8b10d7214d9fb11ab38 /sys-apps
parentapp-emulation/qemu: treeclean (diff)
downloadmusl-3260a63be66e9c08bd92b6741956916df9617106.tar.gz
musl-3260a63be66e9c08bd92b6741956916df9617106.tar.bz2
musl-3260a63be66e9c08bd92b6741956916df9617106.zip
sys-apps/policycoreutils: treeclean
::gentoo works, was fixed upstream in https://github.com/SELinuxProject/selinux/commit/310470235af42c6ce62cedea6db51e28c0c8ea59. Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/policycoreutils/Manifest2
-rw-r--r--sys-apps/policycoreutils/files/policycoreutils-2.7-musl.patch34
-rw-r--r--sys-apps/policycoreutils/files/policycoreutils-3.1-0001-newrole-not-suid.patch11
-rw-r--r--sys-apps/policycoreutils/metadata.xml27
-rw-r--r--sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild180
5 files changed, 0 insertions, 254 deletions
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
deleted file mode 100644
index 0065910b..00000000
--- a/sys-apps/policycoreutils/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST policycoreutils-3.1.tar.gz 2817914 BLAKE2B ef68bb5f9cf577164ead44803b6be2bd6401c9e923d2c775c7c8c47f0e803749feaec4247fec5cc1cb766314954402fd2506370bb397f746437ecfcf65b384f3 SHA512 0592f218563a99ba95d2cfd07fdc3761b61c1cc3c01a17ab89ad840169e1a7d4083521d5cacc72d1b76911d516bf592db7a3f90d9ef0cc11ceed007e4580e140
-DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f
diff --git a/sys-apps/policycoreutils/files/policycoreutils-2.7-musl.patch b/sys-apps/policycoreutils/files/policycoreutils-2.7-musl.patch
deleted file mode 100644
index dc12f9df..00000000
--- a/sys-apps/policycoreutils/files/policycoreutils-2.7-musl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From fa4f156c37043b2b60a75c968074a07c2bee0575 Mon Sep 17 00:00:00 2001
-From: Luis Ressel <aranea@aixah.de>
-Date: Mon, 13 Nov 2017 07:41:42 +0100
-Subject: [PATCH] Musl compatibility
-
-musl doesn't implement GLOB_BRACE and GLOB_TILDE, so simply don't use
-them there. This only affects "setfiles -f", which I don't expect many
-people use, and it's undocumented anyway that it expands globs.
----
- setfiles/restore.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/setfiles/restore.c b/setfiles/restore.c
-index 50d192a..9dea565 100644
---- a/setfiles/restore.c
-+++ b/setfiles/restore.c
-@@ -6,6 +6,14 @@
- #include "restore.h"
- #include <glob.h>
-
-+#ifndef GLOB_BRACE
-+#define GLOB_BRACE 0
-+#endif
-+
-+#ifndef GLOB_TILDE
-+#define GLOB_TILDE 0
-+#endif
-+
- char **exclude_list;
- int exclude_count;
-
---
-2.15.0
-
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
deleted file mode 100644
index 360a4904..00000000
--- a/sys-apps/policycoreutils/files/policycoreutils-3.1-0001-newrole-not-suid.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/metadata.xml b/sys-apps/policycoreutils/metadata.xml
deleted file mode 100644
index 4d3c72d8..00000000
--- a/sys-apps/policycoreutils/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>selinux@gentoo.org</email>
- <name>SELinux Team</name>
- </maintainer>
- <longdescription>
- Policycoreutils contains the policy core utilities that are required
- for basic operation of a SELinux system. These utilities include
- load_policy to load policies, setfiles to label filesystems, newrole
- to switch roles, and run_init to run /etc/init.d scripts in the proper
- context.
-
- Gentoo-specific tools include rlpkg for relabeling packages by name,
- avc_toggle to toggle between enforcing and permissive modes, and
- avc_enforcing to query the current mode of the system, enforcing or
- permissive.
- </longdescription>
- <use>
- <flag name="audit">Enable support for <pkg>sys-process/audit</pkg> and use the audit_* functions (like audit_getuid instead of getuid())</flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:redhat:policycoreutils</remote-id>
- <remote-id type="github">SELinuxProject/selinux</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild b/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild
deleted file mode 100644
index 04c73ff6..00000000
--- a/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python{3_7,3_8} )
-PYTHON_REQ_USE="xml"
-
-inherit multilib python-r1 toolchain-funcs bash-completion-r1
-
-MY_P="${P//_/-}"
-
-MY_RELEASEDATE="20200710"
-EXTRAS_VER="1.37"
-SEMNG_VER="${PV}"
-SELNX_VER="${PV}"
-SEPOL_VER="${PV}"
-
-IUSE="audit dbus pam split-usr"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DESCRIPTION="SELinux core utilities"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-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"
- S1="${WORKDIR}/${MY_P}/${PN}"
- S2="${WORKDIR}/policycoreutils-extra"
- S="${S1}"
-else
- 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 ~arm64 ~mips x86"
- S1="${WORKDIR}/${MY_P}"
- S2="${WORKDIR}/policycoreutils-extra"
- S="${S1}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
- >=sys-libs/libcap-1.10-r10:=
- >=sys-libs/libsemanage-${SEMNG_VER}:=[python(+),${PYTHON_USEDEP}]
- sys-libs/libcap-ng:=
- >=sys-libs/libsepol-${SEPOL_VER}:=
- >=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
- dev-python/IPy[${PYTHON_USEDEP}]
- dbus? (
- sys-apps/dbus
- dev-libs/dbus-glib:=
- )
- audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
- pam? ( sys-libs/pam:= )
- ${PYTHON_DEPS}"
-
-# Avoid dependency loop in the cross-compile case, bug #755173
-# (Still exists in native)
-BDEPEND="sys-devel/gettext"
-
-### libcgroup -> seunshare
-### dbus -> restorecond
-
-# pax-utils for scanelf used by rlpkg
-RDEPEND="${DEPEND}
- app-misc/pax-utils"
-
-PDEPEND="sys-apps/semodule-utils
- sys-apps/selinux-python"
-
-src_unpack() {
- # Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
- default
- if [[ ${PV} == 9999 ]] ; then
- git-r3_src_unpack
- fi
-}
-
-src_prepare() {
- S="${S1}"
- 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-3.1-0001-newrole-not-suid.patch"
- eapply "${FILESDIR}/${PN}-2.7-musl.patch"
- fi
-
- # rlpkg is more useful than fixfiles
- sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
- || die "fixfiles sed 1 failed"
- sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
- || die "fixfiles sed 2 failed"
-
- eapply_user
-
- sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror"
-
- python_copy_sources
- # Our extra code is outside the regular directory, so set it to the extra
- # directory. We really should optimize this as it is ugly, but the extra
- # code is needed for Gentoo at the same time that policycoreutils is present
- # (so we cannot use an additional package for now).
- S="${S2}"
- python_copy_sources
-}
-
-src_compile() {
- building() {
- emake -C "${BUILD_DIR}" \
- AUDIT_LOG_PRIVS="y" \
- AUDITH="$(usex audit y n)" \
- PAMH="$(usex pam y n)" \
- INOTIFYH="$(usex dbus y n)" \
- SESANDBOX="n" \
- CC="$(tc-getCC)" \
- LIBDIR="\$(PREFIX)/$(get_libdir)"
- }
- S="${S1}" # Regular policycoreutils
- python_foreach_impl building
- S="${S2}" # Extra set
- python_foreach_impl building
-}
-
-src_install() {
- # Python scripts are present in many places. There are no extension modules.
- 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" \
- CC="$(tc-getCC)" \
- LIBDIR="\$(PREFIX)/$(get_libdir)" \
- install
- python_optimize
- }
-
- installation-extras() {
- einfo "Installing policycoreutils-extra"
- emake -C "${BUILD_DIR}" \
- DESTDIR="${D}" \
- install
- python_optimize
- }
-
- S="${S1}" # policycoreutils
- python_foreach_impl installation-policycoreutils
- S="${S2}" # extras
- python_foreach_impl installation-extras
- S="${S1}" # back for later
-
- # remove redhat-style init script
- rm -fR "${D}/etc/rc.d" || die
-
- # compatibility symlinks
- use split-usr && dosym ../../sbin/setfiles /usr/sbin/setfiles
-
- bashcomp_alias setsebool getsebool
-
- # location for policy definitions
- dodir /var/lib/selinux
- keepdir /var/lib/selinux
-
- # Set version-specific scripts
- for pyscript in rlpkg; do
- python_replicate_script "${ED}/usr/sbin/${pyscript}"
- done
-}
-
-pkg_postinst() {
- for POLICY_TYPE in ${POLICY_TYPES} ; do
- # There have been some changes to the policy store, rebuilding now.
- # https://marc.info/?l=selinux&m=143757277819717&w=2
- einfo "Rebuilding store ${POLICY_TYPE} (without re-loading)."
- semodule -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
- done
-}