From cd2d678f43cf22138f11ff1cbfab94aacdd024b7 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 14 Jun 2023 10:44:18 +0200 Subject: [PATCH] sys-apps/checkpolicy: sync with Gentoo Commit-Ref: https://github.com/gentoo/gentoo/commit/ea4cd1f216e407735528c92434b83313e4b8a8db Signed-off-by: Mathieu Tortuyaux --- .../sys-apps/checkpolicy/Manifest | 2 - .../checkpolicy/checkpolicy-3.1.ebuild | 65 ------------------- .../sys-apps/checkpolicy/Manifest | 1 + .../checkpolicy/checkpolicy-3.5.ebuild} | 10 ++- .../checkpolicy/checkpolicy-9999.ebuild | 10 ++- .../sys-apps/checkpolicy/metadata.xml | 5 +- 6 files changed, 19 insertions(+), 74 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/checkpolicy/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/checkpolicy/checkpolicy-3.1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/Manifest rename sdk_container/src/third_party/{coreos-overlay/sys-apps/checkpolicy/checkpolicy-3.2.ebuild => portage-stable/sys-apps/checkpolicy/checkpolicy-3.5.ebuild} (83%) rename sdk_container/src/third_party/{coreos-overlay => portage-stable}/sys-apps/checkpolicy/checkpolicy-9999.ebuild (83%) rename sdk_container/src/third_party/{coreos-overlay => portage-stable}/sys-apps/checkpolicy/metadata.xml (52%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/checkpolicy/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/checkpolicy/Manifest deleted file mode 100644 index 9e0b7673d5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/checkpolicy/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST checkpolicy-3.1.tar.gz 69072 BLAKE2B 31cb5ef52533b0a62f954e770278fc5766a961d87fb86260b04abe562bcd90d0025b33931c6ad54096c64ab54150c7562c112eac80eb2f60dbcdda57f4cacfe2 SHA512 2276a5a0919286049d2ceba386ef5f6de523745b588bb81cb4fed5eced5fd0b8070249b7a3ae5a85e2abb9369a86318f727d4073aad14ab75c43750a46069168 -DIST checkpolicy-3.2.tar.gz 69035 BLAKE2B 263c582c8ed3c38822513899f3591edfc5d0132977451503a8b45d2074b5a1c5ce03973353b3ceaad44da913b4e35546cfef1988b68bd517618efdb942f994ec SHA512 133639595c2acc66c02b5a637c5e0c60d80ce2bae04f4a709d9fafabd31f9497d1a6e3334904b985c2a1bd94a7a7e3df782c2af2ae41d1fd79b69156a835edeb diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/checkpolicy/checkpolicy-3.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/checkpolicy/checkpolicy-3.1.ebuild deleted file mode 100644 index 31985d221c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/checkpolicy/checkpolicy-3.1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit toolchain-funcs - -MY_P="${P//_/-}" -MY_RELEASEDATE="20200710" - -SEPOL_VER="${PV}" -SEMNG_VER="${PV}" - -DESCRIPTION="SELinux policy compiler" -HOMEPAGE="http://userspace.selinuxproject.org" - -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 - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug" - -DEPEND=">=sys-libs/libsepol-${SEPOL_VER}" -BDEPEND="sys-devel/flex - sys-devel/bison" - -RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}" - -src_compile() { - # flatcar changes - emake \ - CC="$(tc-getCC)" \ - YACC="bison -y" \ - PREFIX="/usr" \ - LIBDIR="${ROOT:-/}\$(PREFIX)/$(get_libdir)" \ - INCLUDEDIR="${ROOT}\$(PREFIX)/include" -} - -src_install() { - # flatcar changes - # we remove the `default` behavior to override - # the LIBSEPOLA variable in order to fix cross compile - emake DESTDIR="${D}" \ - LIBSEPOLA="${ROOT:-/}/usr/$(get_libdir)/libsepol.a" \ - install - - if use debug; then - dobin "${S}/test/dismod" - dobin "${S}/test/dispol" - fi -} - -pkg_postinst() { - if ! tc-is-cross-compiler; then - einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 -d ' '` policy." - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/Manifest new file mode 100644 index 0000000000..d3279c23fc --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/Manifest @@ -0,0 +1 @@ +DIST checkpolicy-3.5.tar.gz 69904 BLAKE2B e02ccad07534568a1bbb612330018bbe486800ea40df20ed6f9dc38c88aff7f8858782a28ba7915a58c3bb384f180eb8da7a8fe97a92bcb9baa61eec18da6cbc SHA512 fcd490d865af3b4350c32c5dd9916f8406219841e1e255d8945c6dcc958535247aa27af5597a6988e19f11faea7beeabcb46e8ba2431112bb4aa5c7697bca529 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/checkpolicy/checkpolicy-3.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/checkpolicy-3.5.ebuild similarity index 83% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/checkpolicy/checkpolicy-3.2.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/checkpolicy-3.5.ebuild index f2cee80753..e3ad0c610f 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/checkpolicy/checkpolicy-3.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/checkpolicy-3.5.ebuild @@ -1,10 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" inherit toolchain-funcs +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + DESCRIPTION="SELinux policy compiler" HOMEPAGE="http://userspace.selinuxproject.org" @@ -13,8 +16,9 @@ if [[ ${PV} == 9999 ]] ; then 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" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="amd64 arm arm64 ~mips ~riscv x86" + S="${WORKDIR}/${MY_P}" fi LICENSE="GPL-2" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/checkpolicy/checkpolicy-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/checkpolicy-9999.ebuild similarity index 83% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/checkpolicy/checkpolicy-9999.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/checkpolicy-9999.ebuild index f2cee80753..496db82366 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/checkpolicy/checkpolicy-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/checkpolicy-9999.ebuild @@ -1,10 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" inherit toolchain-funcs +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + DESCRIPTION="SELinux policy compiler" HOMEPAGE="http://userspace.selinuxproject.org" @@ -13,8 +16,9 @@ if [[ ${PV} == 9999 ]] ; then 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" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86" + S="${WORKDIR}/${MY_P}" fi LICENSE="GPL-2" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/checkpolicy/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/metadata.xml similarity index 52% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/checkpolicy/metadata.xml rename to sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/metadata.xml index 9173800ffc..861770703d 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/checkpolicy/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/metadata.xml @@ -1,8 +1,11 @@ - + selinux@gentoo.org SELinux Team + + SELinuxProject/selinux +