This repository has been archived by the owner on May 30, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 11
selinux: update eclass, libsepol to 3.1 and semodule-utils #172
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
8043fd4
sys-libs/libsepol: sync with the upstream
tormath1 910cf80
eclass/selinux-policy-2: sync with upstream
e7afdb5
eclass/selinux: fix POLICY_PATCH applying
aa06a68
sys-apps/semodule-utils: add new package
3c8bfa6
sys-apps/semodule-utils: apply tmp flatcar changes
ba4edc2
acct-{group, user}/messagebus: Add the new dependencies for dbus
sayanchowdhury File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
# Copyright 2019-2020 Gentoo Authors | ||
# Distributed under the terms of the GNU General Public License v2 | ||
|
||
EAPI=7 | ||
|
||
inherit acct-group | ||
|
||
ACCT_GROUP_ID=101 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> | ||
<pkgmetadata> | ||
<maintainer type="project"> | ||
<email>freedesktop-bugs@gentoo.org</email> | ||
</maintainer> | ||
</pkgmetadata> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
# Copyright 2019-2020 Gentoo Authors | ||
# Distributed under the terms of the GNU General Public License v2 | ||
|
||
EAPI=7 | ||
|
||
inherit acct-user | ||
|
||
ACCT_USER_ID=101 | ||
ACCT_USER_GROUPS=( messagebus ) | ||
|
||
acct-user_add_deps |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> | ||
<pkgmetadata> | ||
<maintainer type="project"> | ||
<email>freedesktop-bugs@gentoo.org</email> | ||
</maintainer> | ||
</pkgmetadata> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
DIST semodule-utils-3.1.tar.gz 14257 BLAKE2B c8c9a1ce7c9c4f53b1f4c728d16b149fdc284f4cff8b4fce0cb59b77d37d6d7e9bf2102c7177c4eaf94677af6147e42d8d0bd55c0bf3a358968d0162d5a6c65a SHA512 b92794bbfbce5834ee7f62fddb40b5506e9291e8fa7c5d669b2e281089b8f8dc40c4522ea287ac5deffdaee751442ba8e691e2ac45fdd378b60d5d6b2527d157 | ||
DIST semodule-utils-3.2.tar.gz 14260 BLAKE2B 35c071c96071028d4a912a89b88d02672f1fb8c2d8d23c3cb472b607dad55acdf351ef870b4d52bb2bed7b816a199c18947afcd16e77b66268822288feb4af2a SHA512 f937647cc22f7ed719908bad64415d706fd97cf1dce484dbca2484b05b3295de40e31bec643b6caaf4e8be742b1f911428d393c5e2d1d0ae39a2a37fd3be9bc1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> | ||
<pkgmetadata> | ||
<maintainer type="project"> | ||
<email>selinux@gentoo.org</email> | ||
<name>SELinux Team</name> | ||
</maintainer> | ||
<upstream> | ||
<remote-id type="cpe">cpe:/a:redhat:policycoreutils</remote-id> | ||
<remote-id type="github">SELinuxProject/selinux</remote-id> | ||
</upstream> | ||
</pkgmetadata> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
# Copyright 1999-2020 Gentoo Authors | ||
# Distributed under the terms of the GNU General Public License v2 | ||
|
||
EAPI="7" | ||
|
||
inherit toolchain-funcs | ||
|
||
MY_RELEASEDATE="20200710" | ||
SEPOL_VER="${PV}" | ||
SELNX_VER="${PV}" | ||
|
||
MY_P="${P//_/-}" | ||
IUSE="" | ||
|
||
if [[ ${PV} == *9999 ]] ; then | ||
inherit git-r3 | ||
EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" | ||
S="${WORKDIR}/${MY_P}/${PN}" | ||
else | ||
SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz" | ||
KEYWORDS="amd64 ~arm ~arm64 ~mips x86" | ||
S="${WORKDIR}/${MY_P}" | ||
fi | ||
|
||
DESCRIPTION="SELinux policy module utilities" | ||
HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" | ||
|
||
LICENSE="GPL-2" | ||
SLOT="0" | ||
|
||
DEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=" | ||
|
||
# flatcar changes: add a weak blocker on policycoreutils-2.4 | ||
# to prevent file collisions | ||
# policycoreutils-2.4 and semodule-utils provide the same files | ||
RDEPEND="${DEPEND} | ||
!=sys-apps/policycoreutils-2.4-r2 | ||
" | ||
|
||
src_prepare() { | ||
default | ||
|
||
sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror" | ||
} | ||
|
||
src_compile() { | ||
emake CC="$(tc-getCC)" | ||
} | ||
|
||
src_install() { | ||
emake DESTDIR="${D}" install | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
# Copyright 1999-2021 Gentoo Authors | ||
# Distributed under the terms of the GNU General Public License v2 | ||
|
||
EAPI="7" | ||
|
||
inherit toolchain-funcs | ||
|
||
IUSE="" | ||
|
||
if [[ ${PV} == *9999 ]] ; then | ||
inherit git-r3 | ||
EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" | ||
S="${WORKDIR}/${P}/${PN}" | ||
else | ||
SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" | ||
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" | ||
fi | ||
|
||
DESCRIPTION="SELinux policy module utilities" | ||
HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" | ||
|
||
LICENSE="GPL-2" | ||
SLOT="0" | ||
|
||
DEPEND=">=sys-libs/libsepol-${PV}:=" | ||
|
||
RDEPEND="${DEPEND}" | ||
|
||
src_prepare() { | ||
default | ||
|
||
sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror" | ||
} | ||
|
||
src_compile() { | ||
emake CC="$(tc-getCC)" | ||
} | ||
|
||
src_install() { | ||
emake DESTDIR="${D}" install | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
# Copyright 1999-2021 Gentoo Authors | ||
# Distributed under the terms of the GNU General Public License v2 | ||
|
||
EAPI="7" | ||
|
||
inherit toolchain-funcs | ||
|
||
IUSE="" | ||
|
||
if [[ ${PV} == *9999 ]] ; then | ||
inherit git-r3 | ||
EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" | ||
S="${WORKDIR}/${P}/${PN}" | ||
else | ||
SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" | ||
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" | ||
fi | ||
|
||
DESCRIPTION="SELinux policy module utilities" | ||
HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" | ||
|
||
LICENSE="GPL-2" | ||
SLOT="0" | ||
|
||
DEPEND=">=sys-libs/libsepol-${PV}:=" | ||
|
||
RDEPEND="${DEPEND}" | ||
|
||
src_prepare() { | ||
default | ||
|
||
sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror" | ||
} | ||
|
||
src_compile() { | ||
emake CC="$(tc-getCC)" | ||
} | ||
|
||
src_install() { | ||
emake DESTDIR="${D}" install | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If semodule-utils requires Flatcar changes, then why don't we move it to coreos-overlay?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's right - it's an edge case actually: starting from policycoreutils-2.7,
semodule-utils
becomes a single entity; see this commit: SELinuxProject/selinux@c9c97d6.In the current way we upgrade the things,
semodule-utils
needs to be installed after thepolicycoreutils
upgrade - otherwisesemodule-utils-3.1
will collide with some files provided bypolicycoreutils-2.4
.This blocker allows portage to first upgrade
policycoreutils
then installsemodule-utils
.We can certainly move
semodule-utils
to::coreos-overlay
but we would need to move it back in::portage-stable
once the upgrade done. :)