diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/Manifest deleted file mode 100644 index 3ba4acc00b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST libselinux-3.1.tar.gz 204703 BLAKE2B 72ff2d99dd6640405e804f58bdfbf05e152615ea92f902b3942602af13dc17080afeabb942ed33ae6b3f528870f4b11584e533848e455a97bf8f7151a8d44646 SHA512 57730cddd2d4751556d9e1f207c0f85119c81848f0620c16239e997150989e3f9a586a8c23861fd51ed89f7e084ad441190a58a288258a49a95f7beef7dbbb13 -DIST libselinux-3.2.tar.gz 206380 BLAKE2B 544eaaa87b9738c61929abe48713b530a8909eaea017890040f2fe299af86f09b6eb2cf4c9a68e06268ba09923b2b67703ac7a2b973906acb45f698e9ccaeed2 SHA512 18129ac0b9936e1f66021f1b311cf1c1e27a01e50cb70f08a3e1c642c5251e4538aec25a8427778569dfecf5333cf1fb84f1a59afdce8019328d0cff7e5833c5 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/libselinux-3.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/libselinux-3.1-r3.ebuild deleted file mode 100644 index 94c25dfda6..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/libselinux-3.1-r3.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=( python3_{6..11} ) -USE_RUBY="ruby25 ruby26 ruby27" - -# No, I am not calling ruby-ng -inherit python-r1 toolchain-funcs multilib-minimal - -MY_P="${P//_/-}" -SEPOL_VER="${PV}" -MY_RELEASEDATE="20200710" - -DESCRIPTION="SELinux userland library" -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}/${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="public-domain" -SLOT="0" -IUSE="pcre2 python ruby static-libs ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}] - !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] ) - pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) - ruby? ( - ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) - ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) - ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) - ) - elibc_musl? ( sys-libs/fts-standalone )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - python? ( >=dev-lang/swig-2.0.9 ) - ruby? ( >=dev-lang/swig-2.0.9 )" - -src_prepare() { - eapply_user - - multilib_copy_sources -} - -multilib_src_compile() { - tc-export AR CC PKG_CONFIG RANLIB - - emake \ - LIBDIR="\$(PREFIX)/$(get_libdir)" \ - SHLIBDIR="/$(get_libdir)" \ - LDFLAGS="-fPIC ${LDFLAGS} -pthread" \ - USE_PCRE2="$(usex pcre2 y n)" \ - FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ - all - - if multilib_is_native_abi && use python; then - building() { - emake \ - LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" \ - SHLIBDIR="/$(get_libdir)" \ - USE_PCRE2="$(usex pcre2 y n)" \ - FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ - pywrap - } - python_foreach_impl building - fi - - if multilib_is_native_abi && use ruby; then - building() { - einfo "Calling rubywrap for ${1}" - # Clean up .lo file to force rebuild - rm -f src/selinuxswig_ruby_wrap.lo || die - emake \ - RUBY=${1} \ - LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" \ - SHLIBDIR="/$(get_libdir)" \ - USE_PCRE2="$(usex pcre2 y n)" \ - FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ - rubywrap - } - for RUBYTARGET in ${USE_RUBY}; do - use ruby_targets_${RUBYTARGET} || continue - - building ${RUBYTARGET} - done - fi -} - -multilib_src_install() { - emake DESTDIR="${D}" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" \ - SHLIBDIR="/$(get_libdir)" \ - USE_PCRE2="$(usex pcre2 y n)" \ - install - - if multilib_is_native_abi && use python; then - installation() { - emake DESTDIR="${D}" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" \ - SHLIBDIR="/$(get_libdir)" \ - USE_PCRE2="$(usex pcre2 y n)" \ - install-pywrap - python_optimize # bug 531638 - } - python_foreach_impl installation - fi - - if multilib_is_native_abi && use ruby; then - installation() { - einfo "Calling install-rubywrap for ${1}" - # Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions - rm src/selinuxswig_ruby_wrap.lo - emake DESTDIR="${D}" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" \ - SHLIBDIR="/$(get_libdir)" \ - RUBY=${1} \ - USE_PCRE2="$(usex pcre2 y n)" \ - install-rubywrap - } - for RUBYTARGET in ${USE_RUBY}; do - use ruby_targets_${RUBYTARGET} || continue - - installation ${RUBYTARGET} - done - fi - - use static-libs || rm "${D}"/usr/lib*/*.a || die -} - -pkg_postinst() { - # Fix bug 473502 - for POLTYPE in ${POLICY_TYPES}; - do - mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die - touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die - # Fix bug 516608 - for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do - # flatcar changes: - # since libselinux is installed under `/build/amd64-usr`, we need to - # specify abspath to the binary `sefcontext_compile`, as well as abspath - # to the policy files. - if [[ -f "${ROOT}/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then - ${ROOT}/usr/sbin/sefcontext_compile ${ROOT}/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \ - || die "Failed to recompile contexts" - fi - done - done -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/Manifest new file mode 100644 index 0000000000..c6efbb8e1e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/Manifest @@ -0,0 +1 @@ +DIST libselinux-3.5.tar.gz 211453 BLAKE2B f7f3067c4bb0448e18bd7085135f11d94ae99728949480a655c0f660486817beb5829d8a43dff7bce286ccd50705b0c657bde85970f01c794e01fb707f469d8b SHA512 4e13261a5821018a5f3cdce676f180bb62e5bc225981ca8a498ece0d1c88d9ba8eaa0ce4099dd0849309a8a7c5a9a0953df841a9922f2c284e5a109e5d937ba7 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/libselinux-3.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.5-r1.ebuild similarity index 73% rename from sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/libselinux-3.2-r1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.5-r1.ebuild index 91e457f8dd..1ed1db1ec9 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/libselinux-3.2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.5-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_{6..10} ) -USE_RUBY="ruby25 ruby26 ruby27" +PYTHON_COMPAT=( python3_{10..12} ) +USE_RUBY="ruby30 ruby31 ruby32" # No, I am not calling ruby-ng inherit python-r1 toolchain-funcs multilib-minimal @@ -20,28 +20,30 @@ if [[ ${PV} == 9999 ]]; then S="${WORKDIR}/${P}/${PN}" else SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips ~riscv x86" S="${WORKDIR}/${MY_P}" fi LICENSE="public-domain" SLOT="0" -IUSE="pcre2 python ruby static-libs ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27" +IUSE="python ruby static-libs ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND=">=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}] - !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] ) - pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] ) +RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] + >=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}] python? ( ${PYTHON_DEPS} ) ruby? ( - ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) - ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) - ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) + ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) + ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) + ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ) elibc_musl? ( sys-libs/fts-standalone )" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig - python? ( >=dev-lang/swig-2.0.9 ) + python? ( + >=dev-lang/swig-2.0.9 + dev-python/pip[${PYTHON_USEDEP}] + ) ruby? ( >=dev-lang/swig-2.0.9 )" src_prepare() { @@ -59,7 +61,7 @@ multilib_src_compile() { LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="/$(get_libdir)" \ LDFLAGS="-fPIC ${LDFLAGS} -pthread" \ - USE_PCRE2="$(usex pcre2 y n)" \ + USE_PCRE2=y \ FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ all @@ -69,7 +71,7 @@ multilib_src_compile() { LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="/$(get_libdir)" \ - USE_PCRE2="$(usex pcre2 y n)" \ + USE_PCRE2=y \ FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ pywrap } @@ -86,7 +88,7 @@ multilib_src_compile() { LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="/$(get_libdir)" \ - USE_PCRE2="$(usex pcre2 y n)" \ + USE_PCRE2=y \ FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ rubywrap } @@ -102,7 +104,7 @@ multilib_src_install() { emake DESTDIR="${D}" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="/$(get_libdir)" \ - USE_PCRE2="$(usex pcre2 y n)" \ + USE_PCRE2=y \ install if multilib_is_native_abi && use python; then @@ -110,7 +112,7 @@ multilib_src_install() { emake DESTDIR="${D}" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="/$(get_libdir)" \ - USE_PCRE2="$(usex pcre2 y n)" \ + USE_PCRE2=y \ install-pywrap python_optimize # bug 531638 } @@ -126,7 +128,7 @@ multilib_src_install() { LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="/$(get_libdir)" \ RUBY=${1} \ - USE_PCRE2="$(usex pcre2 y n)" \ + USE_PCRE2=y \ install-rubywrap } for RUBYTARGET in ${USE_RUBY}; do @@ -143,12 +145,12 @@ pkg_postinst() { # Fix bug 473502 for POLTYPE in ${POLICY_TYPES}; do - mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die - touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die + mkdir -p "${ROOT}/etc/selinux/${POLTYPE}/contexts/files" || die + touch "${ROOT}/etc/selinux/${POLTYPE}/contexts/files/file_contexts.local" || die # Fix bug 516608 for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do - if [[ -f "/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then - sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \ + if [[ -f "${ROOT}/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then + sefcontext_compile "${ROOT}/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" \ || die "Failed to recompile contexts" fi done diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/libselinux-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-9999.ebuild similarity index 80% rename from sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/libselinux-9999.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-9999.ebuild index 91e457f8dd..f5475a7744 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/libselinux-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_{6..10} ) -USE_RUBY="ruby25 ruby26 ruby27" +PYTHON_COMPAT=( python3_{10..12} ) +USE_RUBY="ruby30 ruby31 ruby32" # No, I am not calling ruby-ng inherit python-r1 toolchain-funcs multilib-minimal @@ -20,28 +20,30 @@ if [[ ${PV} == 9999 ]]; then S="${WORKDIR}/${P}/${PN}" else SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86" S="${WORKDIR}/${MY_P}" fi LICENSE="public-domain" SLOT="0" -IUSE="pcre2 python ruby static-libs ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27" +IUSE="python ruby static-libs ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND=">=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}] - !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] ) - pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] ) +RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] + >=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}] python? ( ${PYTHON_DEPS} ) ruby? ( - ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) - ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) - ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) + ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) + ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) + ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ) elibc_musl? ( sys-libs/fts-standalone )" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig - python? ( >=dev-lang/swig-2.0.9 ) + python? ( + >=dev-lang/swig-2.0.9 + dev-python/pip[${PYTHON_USEDEP}] +) ruby? ( >=dev-lang/swig-2.0.9 )" src_prepare() { @@ -59,7 +61,7 @@ multilib_src_compile() { LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="/$(get_libdir)" \ LDFLAGS="-fPIC ${LDFLAGS} -pthread" \ - USE_PCRE2="$(usex pcre2 y n)" \ + USE_PCRE2=y \ FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ all @@ -69,7 +71,7 @@ multilib_src_compile() { LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="/$(get_libdir)" \ - USE_PCRE2="$(usex pcre2 y n)" \ + USE_PCRE2=y \ FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ pywrap } @@ -86,7 +88,7 @@ multilib_src_compile() { LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="/$(get_libdir)" \ - USE_PCRE2="$(usex pcre2 y n)" \ + USE_PCRE2=y \ FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ rubywrap } @@ -102,7 +104,7 @@ multilib_src_install() { emake DESTDIR="${D}" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="/$(get_libdir)" \ - USE_PCRE2="$(usex pcre2 y n)" \ + USE_PCRE2=y \ install if multilib_is_native_abi && use python; then @@ -110,7 +112,7 @@ multilib_src_install() { emake DESTDIR="${D}" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="/$(get_libdir)" \ - USE_PCRE2="$(usex pcre2 y n)" \ + USE_PCRE2=y \ install-pywrap python_optimize # bug 531638 } @@ -126,7 +128,7 @@ multilib_src_install() { LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="/$(get_libdir)" \ RUBY=${1} \ - USE_PCRE2="$(usex pcre2 y n)" \ + USE_PCRE2=y \ install-rubywrap } for RUBYTARGET in ${USE_RUBY}; do diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/metadata.xml similarity index 77% rename from sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/metadata.xml rename to sdk_container/src/third_party/portage-stable/sys-libs/libselinux/metadata.xml index 92059a54b9..dfd7bb04e0 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/metadata.xml @@ -1,5 +1,5 @@ - + selinux@gentoo.org @@ -10,9 +10,6 @@ process and file security contexts and to obtain security policy decisions. Required for any applications that use the SELinux API. - - Use dev-libs/libpcre2 for fcontext regexes - cpe:/a:selinuxproject:libselinux SELinuxProject/selinux