gentoo auto-resync : 17:01:2024 - 02:06:03

3 files changed, 165 insertions, 5 deletions

diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index fb0399138752..2812c2ee200f 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,4 +1,6 @@
 DIST libselinux-3.5.tar.gz 211453 BLAKE2B f7f3067c4bb0448e18bd7085135f11d94ae99728949480a655c0f660486817beb5829d8a43dff7bce286ccd50705b0c657bde85970f01c794e01fb707f469d8b SHA512 4e13261a5821018a5f3cdce676f180bb62e5bc225981ca8a498ece0d1c88d9ba8eaa0ce4099dd0849309a8a7c5a9a0953df841a9922f2c284e5a109e5d937ba7
+DIST libselinux-3.6.tar.gz 194210 BLAKE2B 615198d47ecfb4b6274810cbe32cce5953dd44d1d04e8ce244213dc4ddbd61cde3515f4650046b805cf98f341aba718af8d7a9e1d66773172031ac19599f6032 SHA512 182dcdf3510083ff4b9376a4a6d6a7b33905ac3c5e974c188bf3965686c54b663162c543ecf15eab75102f3c91a2502d33d0f1104dec01dd9b14737ef3f2b544
 EBUILD libselinux-3.5-r1.ebuild 4112 BLAKE2B 8787a7c9c9c5a6f52fbab464530539119ff1a1e8acfd61fee8738794bc79aebaf89e03b6f0ab82cd92bc8e3b56bd6346a3ca0f502b0fb6c0f9c55d0a8ba2635a SHA512 eed2053ed74bdfeea643b4495410c0174884a7ae9a94c1dea37a63367649b8a1c1aed9cf2d85f624e216ba709340ef336e7627be664fe85d5e666a95e253f429
-EBUILD libselinux-9999.ebuild 4081 BLAKE2B 653263477834909cbdf597ad7fe6f672a4d35bed5c50dd34e1eabc412b176eb0c5c37f630701f1a9072605b537a66dca6eec7f5fa685d220dfd16815fd5882db SHA512 1f66c199a91bf0f051103488efcb87c77c0790d86e8644d1ab93d0048afe5b2ed08701efdfe33109c01766744aa8df7ade990ecafdd305050ca4e0302fd39404
+EBUILD libselinux-3.6.ebuild 4081 BLAKE2B c3b3c5c5963632a63c2303e5072e69cc6c36029f938bed0766bee89799192a1b16735f163ffebea29705f5d422ffc655e17501d514f228e936bdb087cfbcdfc8 SHA512 34fcb915d280ad495cf25aca9f6b3810ae5403d3faa10f04dc7a6d928f44981fbe954709061e99bb3532520b9d9085ca377c2ac6fa718fcb59dc6f010fd13c14
+EBUILD libselinux-9999.ebuild 4081 BLAKE2B c3b3c5c5963632a63c2303e5072e69cc6c36029f938bed0766bee89799192a1b16735f163ffebea29705f5d422ffc655e17501d514f228e936bdb087cfbcdfc8 SHA512 34fcb915d280ad495cf25aca9f6b3810ae5403d3faa10f04dc7a6d928f44981fbe954709061e99bb3532520b9d9085ca377c2ac6fa718fcb59dc6f010fd13c14
 MISC metadata.xml 649 BLAKE2B 0d4704823be4492064b2d69a31581397cdedc9e5d564090d9770aa79124c53a66f98290fb4de22abb4f81e732267589ad1df3beda2bb71a3cf5a70f84b885dc4 SHA512 6b240fad142e4ba6457f70c83fb3171c6869ed4ac5729d51b8cc159b2471959c24a0a290ff91fa1d90e0f24f96be76a69487174de22c603539f3fc0e7109a561
diff --git a/sys-libs/libselinux/libselinux-3.6.ebuild b/sys-libs/libselinux/libselinux-3.6.ebuild
new file mode 100644
index 000000000000..941b189dd857
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-3.6.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# No, I am not calling ruby-ng
+inherit python-r1 toolchain-funcs multilib-minimal
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+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}/${P}/${PN}"
+else
+	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="public-domain"
+SLOT="0"
+IUSE="python ruby static-libs ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}]
+	>=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}]
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
+		ruby_targets_ruby32? ( dev-lang/ruby:3.2 )
+		ruby_targets_ruby33? ( dev-lang/ruby:3.3 )
+	)
+	elibc_musl? ( sys-libs/fts-standalone )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	python? (
+		>=dev-lang/swig-2.0.9
+		dev-python/pip[${PYTHON_USEDEP}]
+)
+	ruby? ( >=dev-lang/swig-2.0.9 )"
+
+src_prepare() {
+	eapply_user
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export AR CC PKG_CONFIG RANLIB
+
+	local -x CFLAGS="${CFLAGS} -fno-semantic-interposition"
+
+	emake \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)" \
+		LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
+		USE_PCRE2=y \
+		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=y \
+				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=y \
+				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=y \
+		install
+
+	if multilib_is_native_abi && use python; then
+		installation() {
+			emake DESTDIR="${D}" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
+				USE_PCRE2=y \
+				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=y \
+				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
+			if [[ -f "/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then
+				sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \
+				|| die "Failed to recompile contexts"
+			fi
+		done
+	done
+}
diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild
index f5475a7744c4..941b189dd857 100644
--- a/sys-libs/libselinux/libselinux-9999.ebuild
+++ b/sys-libs/libselinux/libselinux-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 # No, I am not calling ruby-ng
 inherit python-r1 toolchain-funcs multilib-minimal
@@ -26,16 +26,16 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="python ruby static-libs ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32"
+IUSE="python ruby static-libs ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}]
 	>=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}]
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
-		ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
 		ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
 		ruby_targets_ruby32? ( dev-lang/ruby:3.2 )
+		ruby_targets_ruby33? ( dev-lang/ruby:3.3 )
 	)
 	elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}"