* [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/
@ 2016-03-23 22:37 Jason Zaman
0 siblings, 0 replies; 17+ messages in thread
From: Jason Zaman @ 2016-03-23 22:37 UTC (permalink / raw
To: gentoo-commits
commit: 73c377eb046eb11dd15043b1fc93b44b831f55c7
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 22:35:48 2016 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 22:37:03 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73c377eb
sec-policy/selinux-base-policy: stabilize missed for -r2 policy
Package-Manager: portage-2.2.26
sec-policy/selinux-base-policy/selinux-base-policy-2.20151208-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20151208-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20151208-r2.ebuild
index 452dec5..1283a43 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20151208-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20151208-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
else
SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
fi
HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/
@ 2016-06-04 8:49 Jason Zaman
0 siblings, 0 replies; 17+ messages in thread
From: Jason Zaman @ 2016-06-04 8:49 UTC (permalink / raw
To: gentoo-commits
commit: b65c47d23d4d567a767bedb6a30eb59a349dc6f2
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 4 08:24:25 2016 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Jun 4 08:48:56 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b65c47d2
sec-policy/selinux-base-policy: Add systemd useflag and module
Package-Manager: portage-2.2.28
.../selinux-base-policy/selinux-base-policy-9999.ebuild | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index 21b98bd..062dec6 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
@@ -20,9 +20,9 @@ fi
HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
DESCRIPTION="SELinux policy for core modules"
-IUSE="+unconfined"
+IUSE="systemd +unconfined"
-RDEPEND="=sec-policy/selinux-base-${PVR}"
+RDEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
DEPEND=""
@@ -35,6 +35,12 @@ S="${WORKDIR}/"
# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
# added) needs to remain then.
+pkg_setup() {
+ if use systemd; then
+ MODS="${MODS} systemd"
+ fi
+}
+
pkg_pretend() {
for i in ${POLICY_TYPES}; do
if [[ "${i}" == "targeted" ]] && ! use unconfined; then
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/
@ 2016-06-05 9:00 Sven Vermeulen
0 siblings, 0 replies; 17+ messages in thread
From: Sven Vermeulen @ 2016-06-05 9:00 UTC (permalink / raw
To: gentoo-commits
commit: bd8c6b29053fd5ff330dbb4ea933c848b575bdf2
Author: Sven Vermeulen <swift <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 5 08:58:28 2016 +0000
Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Sun Jun 5 09:00:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd8c6b29
sec-policy/selinux-base-policy: Use DEPEND on selinux-base rather than RDEPEND
The sec-policy/selinux-base-policy package builds the base SELinux policy
modules for a system, and requires the interface files for it that are
provided by the sec-policy/selinux-base package. As such, we need a DEPEND
on this rather than an RDEPEND.
Package-Manager: portage-2.2.28
sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index 062dec6..0a47b94 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -22,9 +22,8 @@ DESCRIPTION="SELinux policy for core modules"
IUSE="systemd +unconfined"
-RDEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
-DEPEND=""
+DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
LICENSE="GPL-2"
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/
@ 2016-12-11 20:01 Jason Zaman
0 siblings, 0 replies; 17+ messages in thread
From: Jason Zaman @ 2016-12-11 20:01 UTC (permalink / raw
To: gentoo-commits
commit: 8f56c2eff72a065f43181f002e1601b0865ee3a1
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 16:31:25 2016 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 19:59:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f56c2ef
sec-policy/selinux-base-policy: update to EAPI6
Package-Manager: portage-2.3.0
.../selinux-base-policy-9999.ebuild | 52 ++++++----------------
1 file changed, 14 insertions(+), 38 deletions(-)
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index 0a47b94..b7ba9e2 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -1,9 +1,7 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
-
-inherit eutils
+EAPI="6"
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://anongit.gentoo.org/proj/hardened-refpolicy.git https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
@@ -52,37 +50,11 @@ src_prepare() {
local modfiles
if [[ ${PV} != 9999* ]]; then
- # Patch the source with the base patchbundle
- cd "${S}"
- EPATCH_MULTI_MSG="Applying SELinux policy updates ... " \
- EPATCH_SUFFIX="patch" \
- EPATCH_SOURCE="${WORKDIR}" \
- EPATCH_FORCE="yes" \
- epatch
+ einfo "Applying SELinux policy updates ... "
+ eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
fi
- # Apply the additional patches refered to by the module ebuild.
- # But first some magic to differentiate between bash arrays and strings
- if [[ "$(declare -p POLICY_PATCH 2>/dev/null 2>&1)" == "declare -a"* ]];
- then
- cd "${S}/refpolicy/policy/modules"
- for POLPATCH in "${POLICY_PATCH[@]}";
- do
- epatch "${POLPATCH}"
- done
- else
- if [[ -n ${POLICY_PATCH} ]];
- then
- cd "${S}/refpolicy/policy/modules"
- for POLPATCH in ${POLICY_PATCH};
- do
- epatch "${POLPATCH}"
- done
- fi
- fi
-
- # Calling user patches
- epatch_user
+ eapply_user
# Collect only those files needed for this particular module
for i in ${MODS}; do
@@ -120,9 +92,13 @@ src_install() {
pkg_postinst() {
# Override the command from the eclass, we need to load in base as well here
- local COMMAND
+ local COMMAND="-i base.pp"
+ if has_version "<sys-apps/policycoreutils-2.5"; then
+ COMMAND="-b base.pp"
+ fi
+
for i in ${MODS}; do
- COMMAND="-i ${i}.pp ${COMMAND}"
+ COMMAND="${COMMAND} -i ${i}.pp"
done
for i in ${POLICY_TYPES}; do
@@ -130,17 +106,17 @@ pkg_postinst() {
cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
- semodule -s ${i} -b base.pp ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store"
+ semodule -s ${i} ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store"
done
# Relabel depending packages
local PKGSET="";
- if [ -x /usr/bin/qdepends ] ; then
+ if [[ -x /usr/bin/qdepends ]] ; then
PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
- elif [ -x /usr/bin/equery ] ; then
+ elif [[ -x /usr/bin/equery ]] ; then
PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
fi
- if [ -n "${PKGSET}" ] ; then
+ if [[ -n "${PKGSET}" ]] ; then
rlpkg ${PKGSET};
fi
}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/
@ 2017-08-27 14:58 Jason Zaman
0 siblings, 0 replies; 17+ messages in thread
From: Jason Zaman @ 2017-08-27 14:58 UTC (permalink / raw
To: gentoo-commits
commit: 99671357eec47b94529aa16e5d3cc6aca974a71d
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 14:57:39 2017 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 14:57:39 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99671357
sec-policy/selinux-base-policy: drop insecure git:// path in favour of https://
Package-Manager: Portage-2.3.6, Repoman-2.3.1
sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index 24ff4807a9d..7aa38de444d 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -3,7 +3,7 @@
EAPI="6"
if [[ ${PV} == 9999* ]]; then
- EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://anongit.gentoo.org/proj/hardened-refpolicy.git https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
+ EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/
@ 2018-01-09 17:58 Jason Zaman
0 siblings, 0 replies; 17+ messages in thread
From: Jason Zaman @ 2018-01-09 17:58 UTC (permalink / raw
To: gentoo-commits
commit: f03eee7017c288deabdfc593079397d480ea473a
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 9 17:47:21 2018 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Tue Jan 9 17:58:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f03eee70
sec-policy/selinux-base-policy: postinst should not die
It breaks catalyst stage building.
Package-Manager: Portage-2.3.13, Repoman-2.3.3
.../selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild | 4 ++--
.../selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild
index c3e96688105..8ef5919d347 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -106,7 +106,7 @@ pkg_postinst() {
cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
- semodule -s ${i} ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store"
+ semodule -s ${i} ${COMMAND}
done
# Relabel depending packages
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild
index 111bd573773..33d98c80502 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -106,7 +106,7 @@ pkg_postinst() {
cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
- semodule -s ${i} ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store"
+ semodule -s ${i} ${COMMAND}
done
# Relabel depending packages
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/
@ 2018-02-04 14:23 Jason Zaman
0 siblings, 0 replies; 17+ messages in thread
From: Jason Zaman @ 2018-02-04 14:23 UTC (permalink / raw
To: gentoo-commits
commit: f8698a457a75d4cfc7a8cc71d7ad1c98d3c60bbc
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 4 13:59:24 2018 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Feb 4 14:20:16 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8698a45
sec-policy/selinux-base-policy: postinst should not die
postinst is not allowed to die and it breaks catalyst stage building.
commit f03eee7017c288deabdfc593079397d480ea473a fixed this for some
versions, this fixes all the other ebuilds too that were missed.
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild | 6 +++---
.../selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild | 6 +++---
.../selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild | 6 +++---
.../selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild | 6 +++---
.../selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild | 6 +++---
.../selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild | 2 +-
.../selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild | 2 +-
.../selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild | 4 ++--
sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild | 6 +++---
9 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild
index 6782cb71930..159a4384e56 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -104,9 +104,9 @@ pkg_postinst() {
for i in ${POLICY_TYPES}; do
einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
- cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
+ cd /usr/share/selinux/${i}
- semodule -s ${i} ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store"
+ semodule -s ${i} ${COMMAND}
done
# Relabel depending packages
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild
index dfe1dece31a..5627947be22 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -104,9 +104,9 @@ pkg_postinst() {
for i in ${POLICY_TYPES}; do
einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
- cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
+ cd /usr/share/selinux/${i}
- semodule -s ${i} ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store"
+ semodule -s ${i} ${COMMAND}
done
# Relabel depending packages
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild
index dfe1dece31a..5627947be22 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -104,9 +104,9 @@ pkg_postinst() {
for i in ${POLICY_TYPES}; do
einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
- cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
+ cd /usr/share/selinux/${i}
- semodule -s ${i} ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store"
+ semodule -s ${i} ${COMMAND}
done
# Relabel depending packages
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild
index dfe1dece31a..5627947be22 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -104,9 +104,9 @@ pkg_postinst() {
for i in ${POLICY_TYPES}; do
einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
- cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
+ cd /usr/share/selinux/${i}
- semodule -s ${i} ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store"
+ semodule -s ${i} ${COMMAND}
done
# Relabel depending packages
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild
index c3e96688105..27177f64715 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -104,9 +104,9 @@ pkg_postinst() {
for i in ${POLICY_TYPES}; do
einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
- cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
+ cd /usr/share/selinux/${i}
- semodule -s ${i} ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store"
+ semodule -s ${i} ${COMMAND}
done
# Relabel depending packages
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild
index 8ef5919d347..27177f64715 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild
@@ -104,7 +104,7 @@ pkg_postinst() {
for i in ${POLICY_TYPES}; do
einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
- cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
+ cd /usr/share/selinux/${i}
semodule -s ${i} ${COMMAND}
done
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild
index 33d98c80502..e58899c1855 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild
@@ -104,7 +104,7 @@ pkg_postinst() {
for i in ${POLICY_TYPES}; do
einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
- cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
+ cd /usr/share/selinux/${i}
semodule -s ${i} ${COMMAND}
done
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild
index 5dadfcb0904..e58899c1855 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild
@@ -104,9 +104,9 @@ pkg_postinst() {
for i in ${POLICY_TYPES}; do
einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
- cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
+ cd /usr/share/selinux/${i}
- semodule -s ${i} ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store"
+ semodule -s ${i} ${COMMAND}
done
# Relabel depending packages
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index 111bd573773..e58899c1855 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -104,9 +104,9 @@ pkg_postinst() {
for i in ${POLICY_TYPES}; do
einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
- cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
+ cd /usr/share/selinux/${i}
- semodule -s ${i} ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store"
+ semodule -s ${i} ${COMMAND}
done
# Relabel depending packages
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/
@ 2018-02-18 17:16 Patrice Clement
0 siblings, 0 replies; 17+ messages in thread
From: Patrice Clement @ 2018-02-18 17:16 UTC (permalink / raw
To: gentoo-commits
commit: 955ea743c2fd787392805219a875be480e4747af
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Feb 17 15:55:19 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 17:15:02 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=955ea743
sec-policy/selinux-base-policy: fix HOMEPAGE.
Closes: https://github.com/gentoo/gentoo/pull/7214
sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild | 2 +-
sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild | 2 +-
sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild | 2 +-
sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild | 2 +-
sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild | 2 +-
sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild | 2 +-
sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild | 2 +-
sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild | 2 +-
sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild
index 159a4384e56..0c6f6a24107 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild
@@ -15,7 +15,7 @@ else
KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
fi
-HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
DESCRIPTION="SELinux policy for core modules"
IUSE="systemd +unconfined"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild
index 5627947be22..b92e2c6358c 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild
@@ -15,7 +15,7 @@ else
KEYWORDS="amd64 -arm ~arm64 ~mips x86"
fi
-HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
DESCRIPTION="SELinux policy for core modules"
IUSE="systemd +unconfined"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild
index 5627947be22..b92e2c6358c 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild
@@ -15,7 +15,7 @@ else
KEYWORDS="amd64 -arm ~arm64 ~mips x86"
fi
-HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
DESCRIPTION="SELinux policy for core modules"
IUSE="systemd +unconfined"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild
index 5627947be22..b92e2c6358c 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild
@@ -15,7 +15,7 @@ else
KEYWORDS="amd64 -arm ~arm64 ~mips x86"
fi
-HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
DESCRIPTION="SELinux policy for core modules"
IUSE="systemd +unconfined"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild
index 27177f64715..a72df4c245a 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild
@@ -15,7 +15,7 @@ else
KEYWORDS="amd64 -arm ~arm64 ~mips x86"
fi
-HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
DESCRIPTION="SELinux policy for core modules"
IUSE="systemd +unconfined"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild
index 27177f64715..a72df4c245a 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild
@@ -15,7 +15,7 @@ else
KEYWORDS="amd64 -arm ~arm64 ~mips x86"
fi
-HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
DESCRIPTION="SELinux policy for core modules"
IUSE="systemd +unconfined"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild
index e58899c1855..ffcbe80f607 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild
@@ -15,7 +15,7 @@ else
KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
fi
-HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
DESCRIPTION="SELinux policy for core modules"
IUSE="systemd +unconfined"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild
index 27177f64715..a72df4c245a 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild
@@ -15,7 +15,7 @@ else
KEYWORDS="amd64 -arm ~arm64 ~mips x86"
fi
-HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
DESCRIPTION="SELinux policy for core modules"
IUSE="systemd +unconfined"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index e58899c1855..ffcbe80f607 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -15,7 +15,7 @@ else
KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
fi
-HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
DESCRIPTION="SELinux policy for core modules"
IUSE="systemd +unconfined"
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/
@ 2018-06-09 5:09 Jason Zaman
0 siblings, 0 replies; 17+ messages in thread
From: Jason Zaman @ 2018-06-09 5:09 UTC (permalink / raw
To: gentoo-commits
commit: 8f88bc159a81c30c0d49aad62cfe63df5a0d9815
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 9 04:07:41 2018 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Jun 9 04:27:04 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f88bc15
sec-policy/selinux-base-policy: Fix policy load when cross compiling
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../selinux-base-policy-2.20180114-r2.ebuild | 34 ++++++++++++++--------
.../selinux-base-policy-9999.ebuild | 34 ++++++++++++++--------
2 files changed, 44 insertions(+), 24 deletions(-)
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild
index ffcbe80f607..b2976ccee54 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild
@@ -22,6 +22,7 @@ IUSE="systemd +unconfined"
PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
+RDEPEND="$DEPEND"
MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
LICENSE="GPL-2"
@@ -74,7 +75,7 @@ src_prepare() {
src_compile() {
for i in ${POLICY_TYPES}; do
- emake NAME=$i -C "${S}"/${i} || die "${i} compile failed"
+ emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} || die "${i} compile failed"
done
}
@@ -91,6 +92,12 @@ src_install() {
}
pkg_postinst() {
+ # Set root path and don't load policy into the kernel when cross compiling
+ local root_opts=""
+ if [[ "${ROOT%/}" != "" ]]; then
+ root_opts="-p ${ROOT%/} -n"
+ fi
+
# Override the command from the eclass, we need to load in base as well here
local COMMAND="-i base.pp"
if has_version "<sys-apps/policycoreutils-2.5"; then
@@ -104,19 +111,22 @@ pkg_postinst() {
for i in ${POLICY_TYPES}; do
einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
- cd /usr/share/selinux/${i}
+ cd "${ROOT%/}/usr/share/selinux/${i}"
- semodule -s ${i} ${COMMAND}
+ semodule ${root_opts} -s ${i} ${COMMAND}
done
- # Relabel depending packages
- local PKGSET="";
- if [[ -x /usr/bin/qdepends ]] ; then
- PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
- elif [[ -x /usr/bin/equery ]] ; then
- PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
- fi
- if [[ -n "${PKGSET}" ]] ; then
- rlpkg ${PKGSET};
+ # Don't relabel when cross compiling
+ if [[ "${ROOT%/}" == "" ]]; then
+ # Relabel depending packages
+ local PKGSET="";
+ if [[ -x /usr/bin/qdepends ]] ; then
+ PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
+ elif [[ -x /usr/bin/equery ]] ; then
+ PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
+ fi
+ if [[ -n "${PKGSET}" ]] ; then
+ rlpkg ${PKGSET};
+ fi
fi
}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index ffcbe80f607..b2976ccee54 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -22,6 +22,7 @@ IUSE="systemd +unconfined"
PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
+RDEPEND="$DEPEND"
MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
LICENSE="GPL-2"
@@ -74,7 +75,7 @@ src_prepare() {
src_compile() {
for i in ${POLICY_TYPES}; do
- emake NAME=$i -C "${S}"/${i} || die "${i} compile failed"
+ emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} || die "${i} compile failed"
done
}
@@ -91,6 +92,12 @@ src_install() {
}
pkg_postinst() {
+ # Set root path and don't load policy into the kernel when cross compiling
+ local root_opts=""
+ if [[ "${ROOT%/}" != "" ]]; then
+ root_opts="-p ${ROOT%/} -n"
+ fi
+
# Override the command from the eclass, we need to load in base as well here
local COMMAND="-i base.pp"
if has_version "<sys-apps/policycoreutils-2.5"; then
@@ -104,19 +111,22 @@ pkg_postinst() {
for i in ${POLICY_TYPES}; do
einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
- cd /usr/share/selinux/${i}
+ cd "${ROOT%/}/usr/share/selinux/${i}"
- semodule -s ${i} ${COMMAND}
+ semodule ${root_opts} -s ${i} ${COMMAND}
done
- # Relabel depending packages
- local PKGSET="";
- if [[ -x /usr/bin/qdepends ]] ; then
- PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
- elif [[ -x /usr/bin/equery ]] ; then
- PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
- fi
- if [[ -n "${PKGSET}" ]] ; then
- rlpkg ${PKGSET};
+ # Don't relabel when cross compiling
+ if [[ "${ROOT%/}" == "" ]]; then
+ # Relabel depending packages
+ local PKGSET="";
+ if [[ -x /usr/bin/qdepends ]] ; then
+ PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
+ elif [[ -x /usr/bin/equery ]] ; then
+ PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
+ fi
+ if [[ -n "${PKGSET}" ]] ; then
+ rlpkg ${PKGSET};
+ fi
fi
}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/
@ 2018-07-12 15:30 Jason Zaman
0 siblings, 0 replies; 17+ messages in thread
From: Jason Zaman @ 2018-07-12 15:30 UTC (permalink / raw
To: gentoo-commits
commit: ac8c32c38dff404a306d4145405d630bfbdafae3
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 12 14:33:04 2018 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 15:28:35 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac8c32c3
sec-policy/selinux-base-policy: update SRC_URI
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index b2976ccee54..f68a3519c79 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
- SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
+ SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
fi
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/
@ 2019-04-20 8:24 Jason Zaman
0 siblings, 0 replies; 17+ messages in thread
From: Jason Zaman @ 2019-04-20 8:24 UTC (permalink / raw
To: gentoo-commits
commit: 1f47aaf9fb2942f28e561ba97e7e426a48211bd4
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 08:23:08 2019 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 08:23:42 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f47aaf9
sec-policy/selinux-base-policy: move patches to my dev space
Swift is retiring so move the SRC_URI for all the patches to
dev.gentoo.org/~perfinion/patches/ instead.
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
.../selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild | 4 ++--
.../selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild | 4 ++--
.../selinux-base-policy/selinux-base-policy-2.20180114-r3.ebuild | 4 ++--
.../selinux-base-policy/selinux-base-policy-2.20180701-r1.ebuild | 4 ++--
.../selinux-base-policy/selinux-base-policy-2.20180701-r2.ebuild | 4 ++--
.../selinux-base-policy/selinux-base-policy-2.20190201-r1.ebuild | 2 +-
sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild | 4 ++--
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild
index a72df4c245a..f912f538e6e 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
- https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
+ https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
KEYWORDS="amd64 -arm ~arm64 ~mips x86"
fi
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild
index 64fe2748029..168222b8066 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
- https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
+ https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
KEYWORDS="amd64 -arm ~arm64 ~mips x86"
fi
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r3.ebuild
index b2976ccee54..2ec944121ac 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r3.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
- https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
+ https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
fi
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r1.ebuild
index 898b28a71b8..edafab22ce1 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
- https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
+ https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
KEYWORDS="amd64 -arm ~arm64 ~mips x86"
fi
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r2.ebuild
index 58046fa74ff..6905e0f1486 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
- https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
+ https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
fi
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20190201-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20190201-r1.ebuild
index 5da851fdae6..6905e0f1486 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20190201-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
- https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
+ https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
fi
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index f68a3519c79..6905e0f1486 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
- https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
+ https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
fi
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/
@ 2019-12-21 14:11 Jason Zaman
0 siblings, 0 replies; 17+ messages in thread
From: Jason Zaman @ 2019-12-21 14:11 UTC (permalink / raw
To: gentoo-commits
commit: 670a91367f929f3d962448f831cecc343f8c2794
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 17 15:48:23 2019 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Dec 21 14:00:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=670a9136
sec-policy/selinux-base-policy: Add systemd module unconditionally
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index 7b6afaf3e21..17908940fcb 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -24,7 +24,7 @@ PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
RDEPEND="$DEPEND"
-MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
+MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork systemd tmpfiles udev userdomain usermanage unprivuser xdg"
LICENSE="GPL-2"
SLOT="0"
S="${WORKDIR}/"
@@ -33,12 +33,6 @@ S="${WORKDIR}/"
# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
# added) needs to remain then.
-pkg_setup() {
- if use systemd; then
- MODS="${MODS} systemd"
- fi
-}
-
pkg_pretend() {
for i in ${POLICY_TYPES}; do
if [[ "${i}" == "targeted" ]] && ! use unconfined; then
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/
@ 2021-02-02 4:14 Jason Zaman
0 siblings, 0 replies; 17+ messages in thread
From: Jason Zaman @ 2021-02-02 4:14 UTC (permalink / raw
To: gentoo-commits
commit: b68f651e8f41695ba7edd0617a82f39569cfb472
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 1 05:51:55 2021 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Tue Feb 2 03:59:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b68f651e
sec-policy/selinux-base-policy: Drop removed hotplug policy module
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index 5de9dfd5ff4..171244e9e45 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -27,7 +27,7 @@ BDEPEND="
sys-apps/checkpolicy
sys-devel/m4"
-MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork systemd tmpfiles udev userdomain usermanage unprivuser xdg"
+MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork systemd tmpfiles udev userdomain usermanage unprivuser xdg"
LICENSE="GPL-2"
SLOT="0"
S="${WORKDIR}/"
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/
@ 2022-01-01 22:44 Jason Zaman
0 siblings, 0 replies; 17+ messages in thread
From: Jason Zaman @ 2022-01-01 22:44 UTC (permalink / raw
To: gentoo-commits
commit: dff61709d44bbd83f843d88ff1c7c8069039069c
Author: Grzegorz Filo <gf578 <AT> wp <DOT> pl>
AuthorDate: Wed Dec 29 19:53:34 2021 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Jan 1 22:43:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff61709
sec-policy/selinux-base-policy: Remove obsolete selinux modules
Closes: https://github.com/gentoo/gentoo/pull/23568
Signed-off-by: Grzegorz Filo <gf578 <AT> wp.pl>
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
.../selinux-base-policy-2.20210203-r1.ebuild | 12 ++++++++++++
.../selinux-base-policy-2.20210908-r1.ebuild | 12 ++++++++++++
.../selinux-base-policy/selinux-base-policy-9999.ebuild | 12 ++++++++++++
3 files changed, 36 insertions(+)
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild
index 56db7e92b5d0..cb444f4de09d 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild
@@ -28,6 +28,7 @@ BDEPEND="
sys-devel/m4"
MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork systemd tmpfiles udev userdomain usermanage unprivuser xdg"
+DEL_MODS="hotplug"
LICENSE="GPL-2"
SLOT="0"
S="${WORKDIR}/"
@@ -60,6 +61,10 @@ src_prepare() {
modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
done
+ for i in ${DEL_MODS}; do
+ [[ "${MODS}" != *${i}* ]] || die "Duplicate module in MODS and DEL_MODS: ${i}"
+ done
+
for i in ${POLICY_TYPES}; do
mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
@@ -111,6 +116,13 @@ pkg_postinst() {
cd "${ROOT}/usr/share/selinux/${i}"
semodule ${root_opts} -s ${i} ${COMMAND}
+
+ for mod in ${DEL_MODS}; do
+ if semodule ${root_opts} -s ${i} -l | grep -q "\b${mod}\b"; then
+ einfo "Removing obsolete ${i} ${mod} policy package"
+ semodule ${root_opts} -s ${i} -r ${mod}
+ fi
+ done
done
# Don't relabel when cross compiling
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210908-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210908-r1.ebuild
index 56db7e92b5d0..cb444f4de09d 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210908-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210908-r1.ebuild
@@ -28,6 +28,7 @@ BDEPEND="
sys-devel/m4"
MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork systemd tmpfiles udev userdomain usermanage unprivuser xdg"
+DEL_MODS="hotplug"
LICENSE="GPL-2"
SLOT="0"
S="${WORKDIR}/"
@@ -60,6 +61,10 @@ src_prepare() {
modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
done
+ for i in ${DEL_MODS}; do
+ [[ "${MODS}" != *${i}* ]] || die "Duplicate module in MODS and DEL_MODS: ${i}"
+ done
+
for i in ${POLICY_TYPES}; do
mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
@@ -111,6 +116,13 @@ pkg_postinst() {
cd "${ROOT}/usr/share/selinux/${i}"
semodule ${root_opts} -s ${i} ${COMMAND}
+
+ for mod in ${DEL_MODS}; do
+ if semodule ${root_opts} -s ${i} -l | grep -q "\b${mod}\b"; then
+ einfo "Removing obsolete ${i} ${mod} policy package"
+ semodule ${root_opts} -s ${i} -r ${mod}
+ fi
+ done
done
# Don't relabel when cross compiling
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index 76791df9dcb2..adeb92d6f444 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -28,6 +28,7 @@ BDEPEND="
sys-devel/m4"
MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork systemd tmpfiles udev userdomain usermanage unprivuser xdg"
+DEL_MODS="hotplug"
LICENSE="GPL-2"
SLOT="0"
S="${WORKDIR}/"
@@ -60,6 +61,10 @@ src_prepare() {
modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
done
+ for i in ${DEL_MODS}; do
+ [[ "${MODS}" != *${i}* ]] || die "Duplicate module in MODS and DEL_MODS: ${i}"
+ done
+
for i in ${POLICY_TYPES}; do
mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
@@ -111,6 +116,13 @@ pkg_postinst() {
cd "${ROOT}/usr/share/selinux/${i}"
semodule ${root_opts} -s ${i} ${COMMAND}
+
+ for mod in ${DEL_MODS}; do
+ if semodule ${root_opts} -s ${i} -l | grep -q "\b${mod}\b"; then
+ einfo "Removing obsolete ${i} ${mod} policy package"
+ semodule ${root_opts} -s ${i} -r ${mod}
+ fi
+ done
done
# Don't relabel when cross compiling
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/
@ 2022-01-09 5:46 Jason Zaman
0 siblings, 0 replies; 17+ messages in thread
From: Jason Zaman @ 2022-01-09 5:46 UTC (permalink / raw
To: gentoo-commits
commit: 27c82e515cd528feba5bfc69875b37ffa7afe745
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 9 05:43:23 2022 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Jan 9 05:46:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c82e51
sec-policy/selinux-base-policy: Fix use of $ROOT in src_compile
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
.../selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild | 4 ++--
.../selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild | 4 ++--
.../selinux-base-policy/selinux-base-policy-2.20210908-r1.ebuild | 4 ++--
sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild
index 8f43b477ccee..9e42cf570b5f 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -72,7 +72,7 @@ src_prepare() {
src_compile() {
for i in ${POLICY_TYPES}; do
- emake NAME=$i SHAREDIR="${ROOT}"/usr/share/selinux -C "${S}"/${i}
+ emake NAME=$i SHAREDIR="${SYSROOT%/}/usr/share/selinux" -C "${S}"/${i}
done
}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild
index cb444f4de09d..612ab55a8ac5 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -77,7 +77,7 @@ src_prepare() {
src_compile() {
for i in ${POLICY_TYPES}; do
- emake NAME=$i SHAREDIR="${ROOT}"/usr/share/selinux -C "${S}"/${i}
+ emake NAME=$i SHAREDIR="${SYSROOT%/}/usr/share/selinux" -C "${S}"/${i}
done
}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210908-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210908-r1.ebuild
index cb444f4de09d..612ab55a8ac5 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210908-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210908-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -77,7 +77,7 @@ src_prepare() {
src_compile() {
for i in ${POLICY_TYPES}; do
- emake NAME=$i SHAREDIR="${ROOT}"/usr/share/selinux -C "${S}"/${i}
+ emake NAME=$i SHAREDIR="${SYSROOT%/}/usr/share/selinux" -C "${S}"/${i}
done
}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index adeb92d6f444..c6f79d31df40 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -77,7 +77,7 @@ src_prepare() {
src_compile() {
for i in ${POLICY_TYPES}; do
- emake NAME=$i SHAREDIR="${ROOT}"/usr/share/selinux -C "${S}"/${i}
+ emake NAME=$i SHAREDIR="${SYSROOT%/}/usr/share/selinux" -C "${S}"/${i}
done
}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/
@ 2022-11-09 19:50 Arthur Zamarin
0 siblings, 0 replies; 17+ messages in thread
From: Arthur Zamarin @ 2022-11-09 19:50 UTC (permalink / raw
To: gentoo-commits
commit: 9b90c870f6b1d9052e9b8f19b8489379e96d6d34
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 9 19:47:28 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 9 19:50:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b90c870
sec-policy/selinux-base-policy: fix UnquotedVariable
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
.../selinux-base-policy/selinux-base-policy-2.20220106-r3.ebuild | 4 ++--
.../selinux-base-policy/selinux-base-policy-2.20220520-r1.ebuild | 4 ++--
.../selinux-base-policy/selinux-base-policy-2.20221101-r2.ebuild | 4 ++--
sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20220106-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20220106-r3.ebuild
index 612ab55a8ac5..53278241d091 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20220106-r3.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20220106-r3.ebuild
@@ -57,8 +57,8 @@ src_prepare() {
# Collect only those files needed for this particular module
for i in ${MODS}; do
- modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
- modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
+ modfiles="$(find "${S}"/refpolicy/policy/modules -iname $i.te) $modfiles"
+ modfiles="$(find "${S}"/refpolicy/policy/modules -iname $i.fc) $modfiles"
done
for i in ${DEL_MODS}; do
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20220520-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20220520-r1.ebuild
index 612ab55a8ac5..53278241d091 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20220520-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20220520-r1.ebuild
@@ -57,8 +57,8 @@ src_prepare() {
# Collect only those files needed for this particular module
for i in ${MODS}; do
- modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
- modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
+ modfiles="$(find "${S}"/refpolicy/policy/modules -iname $i.te) $modfiles"
+ modfiles="$(find "${S}"/refpolicy/policy/modules -iname $i.fc) $modfiles"
done
for i in ${DEL_MODS}; do
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20221101-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20221101-r2.ebuild
index c6f79d31df40..9ca7ee646d2e 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20221101-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20221101-r2.ebuild
@@ -57,8 +57,8 @@ src_prepare() {
# Collect only those files needed for this particular module
for i in ${MODS}; do
- modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
- modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
+ modfiles="$(find "${S}"/refpolicy/policy/modules -iname $i.te) $modfiles"
+ modfiles="$(find "${S}"/refpolicy/policy/modules -iname $i.fc) $modfiles"
done
for i in ${DEL_MODS}; do
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index c6f79d31df40..9ca7ee646d2e 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -57,8 +57,8 @@ src_prepare() {
# Collect only those files needed for this particular module
for i in ${MODS}; do
- modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
- modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
+ modfiles="$(find "${S}"/refpolicy/policy/modules -iname $i.te) $modfiles"
+ modfiles="$(find "${S}"/refpolicy/policy/modules -iname $i.fc) $modfiles"
done
for i in ${DEL_MODS}; do
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/
@ 2024-07-19 19:50 Jakov Smolić
0 siblings, 0 replies; 17+ messages in thread
From: Jakov Smolić @ 2024-07-19 19:50 UTC (permalink / raw
To: gentoo-commits
commit: 7c6290f0b18394010d91af16a3951f7f5c270a99
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 19 19:50:28 2024 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Jul 19 19:50:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c6290f0
sec-policy/selinux-base-policy: Keyword 2.20240226-r2 riscv, #936297
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
sec-policy/selinux-base-policy/selinux-base-policy-2.20240226-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20240226-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20240226-r2.ebuild
index f9e01b16f6fc..9afff17a04b7 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20240226-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
else
SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
- KEYWORDS="amd64 arm arm64 ~mips x86"
+ KEYWORDS="amd64 arm arm64 ~mips ~riscv x86"
fi
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
^ permalink raw reply related [flat|nested] 17+ messages in thread
end of thread, other threads:[~2024-07-19 19:50 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-21 14:11 [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/ Jason Zaman
-- strict thread matches above, loose matches on Subject: below --
2024-07-19 19:50 Jakov Smolić
2022-11-09 19:50 Arthur Zamarin
2022-01-09 5:46 Jason Zaman
2022-01-01 22:44 Jason Zaman
2021-02-02 4:14 Jason Zaman
2019-04-20 8:24 Jason Zaman
2018-07-12 15:30 Jason Zaman
2018-06-09 5:09 Jason Zaman
2018-02-18 17:16 Patrice Clement
2018-02-04 14:23 Jason Zaman
2018-01-09 17:58 Jason Zaman
2017-08-27 14:58 Jason Zaman
2016-12-11 20:01 Jason Zaman
2016-06-05 9:00 Sven Vermeulen
2016-06-04 8:49 Jason Zaman
2016-03-23 22:37 Jason Zaman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox