From 07f407b9ba5b94fa08141bf4072592c10f79b42d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 3 Jul 2023 07:18:22 +0000 Subject: [PATCH] sys-apps/semodule-utils: Sync with Gentoo It's from Gentoo commit 7e5bbadacea1706b9a1590caf8d7c896e5c48adc. --- .../sys-apps/semodule-utils/Manifest | 3 +- .../sys-apps/semodule-utils/metadata.xml | 2 +- .../semodule-utils/semodule-utils-3.1.ebuild | 52 ------------------- ...s-3.2.ebuild => semodule-utils-3.5.ebuild} | 18 ++++--- .../semodule-utils/semodule-utils-9999.ebuild | 16 +++--- 5 files changed, 21 insertions(+), 70 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.1.ebuild rename sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/{semodule-utils-3.2.ebuild => semodule-utils-3.5.ebuild} (80%) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/Manifest index 278c76d9d8..7251728035 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/Manifest @@ -1,2 +1 @@ -DIST semodule-utils-3.1.tar.gz 14257 BLAKE2B c8c9a1ce7c9c4f53b1f4c728d16b149fdc284f4cff8b4fce0cb59b77d37d6d7e9bf2102c7177c4eaf94677af6147e42d8d0bd55c0bf3a358968d0162d5a6c65a SHA512 b92794bbfbce5834ee7f62fddb40b5506e9291e8fa7c5d669b2e281089b8f8dc40c4522ea287ac5deffdaee751442ba8e691e2ac45fdd378b60d5d6b2527d157 -DIST semodule-utils-3.2.tar.gz 14260 BLAKE2B 35c071c96071028d4a912a89b88d02672f1fb8c2d8d23c3cb472b607dad55acdf351ef870b4d52bb2bed7b816a199c18947afcd16e77b66268822288feb4af2a SHA512 f937647cc22f7ed719908bad64415d706fd97cf1dce484dbca2484b05b3295de40e31bec643b6caaf4e8be742b1f911428d393c5e2d1d0ae39a2a37fd3be9bc1 +DIST semodule-utils-3.5.tar.gz 14383 BLAKE2B a1bb432013bca1023d99b32f43b2c972b6b807a4677f9d8c9fb9aff10225232506f3ecca86fc231b4c63d04582a91a1c4218f87ce5532a4d35a26a09665c6f10 SHA512 7c32f425ae71745040d1c6a6585149a1efb319913aa9d4c8bf185b0a4216dc66378fa38595b171614ee3ae4ade997d3ae56a060346e334faec55c419a87d71dd diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/metadata.xml index 855cbdbdb7..d159ea8775 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/metadata.xml @@ -1,5 +1,5 @@ - + selinux@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.1.ebuild deleted file mode 100644 index 2002f71e94..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# 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 -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.5.ebuild similarity index 80% rename from sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.2.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.5.ebuild index 13fc0d8627..b67d886e7b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.5.ebuild @@ -1,29 +1,31 @@ -# 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 -IUSE="" +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="SELinux policy module utilities" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" 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" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${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" +IUSE="" DEPEND=">=sys-libs/libsepol-${PV}:=" - RDEPEND="${DEPEND}" src_prepare() { diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-9999.ebuild index 13fc0d8627..525188411f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-9999.ebuild @@ -1,29 +1,31 @@ -# 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 -IUSE="" +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="SELinux policy module utilities" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" 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" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${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" +IUSE="" DEPEND=">=sys-libs/libsepol-${PV}:=" - RDEPEND="${DEPEND}" src_prepare() {