public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/musl:master commit in: sys-libs/libselinux/
@ 2017-01-15 21:46 Aric Belsito
  0 siblings, 0 replies; 10+ messages in thread
From: Aric Belsito @ 2017-01-15 21:46 UTC (permalink / raw
  To: gentoo-commits

commit:     fa608cd4cabf6a40283262cb1835d8596b503884
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sun Jan 15 21:45:14 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sun Jan 15 21:45:14 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=fa608cd4

sys-libs/libselinux: Switch to fts-standalone

 sys-libs/libselinux/Manifest              | 2 +-
 sys-libs/libselinux/libselinux-2.6.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 57a6f49..02efa12 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,4 +1,4 @@
 AUX libselinux-2.6-0007-build-related-fixes-bug-500674.patch 3580 SHA256 a9803f0f0876b12d909aa16da3968f80ed44fd56a59e2737df6196097ea59c4d SHA512 51c3b1bc1541b8b97ef7a25b01740cc6d05ee7bf7f6264e1f5d78e4fba02c957d48c437826d797354f295a92e53f51957e3e8c68d7ea1ba1113458c0b964ea23 WHIRLPOOL b8bf31c73401950afd7b11e57746399b214fb77cd8a1c3cc853d86c95f30665941e736782fd625b37af976c905cd467f9304c8c115ee541bd896edd8e1cec4df
 DIST libselinux-2.6.tar.gz 203119 SHA256 4ea2dde50665c202253ba5caac7738370ea0337c47b251ba981c60d24e1a118a SHA512 906e1bf98c669862ab4f4e883d511db8d739a5763dc857c9405ad3cc6c70766a482853d07134698a1a98257a8632cc756d0549a7640c2915d051714f502ff14b WHIRLPOOL bf60ce907b7057ada5d19e3a0cd1f092a7dfc2de774e504762424c325c657a4f144fbe252e7d908f7c6d902d80388517e15134a289f4358e564c8720ea6534d9
-EBUILD libselinux-2.6.ebuild 4424 SHA256 bc60e0b28023cef4071582d410c852eda913e8bda3df42d3d300808b144130cf SHA512 8e40549853e7fe388eb367473789b6daa23b1cf55a508d464030c6f10a7404be15d56973b810f40ac8efa1bce0f7e27269b64a3360db6d0e466fff5d665c8780 WHIRLPOOL f330b7e670d10de160a92b0c6da898075d5ad6ca30438f6baf8cf626d666e3e3ff998b21ed1daefcae7ff5077f2c9a6702ad53eb51fb8c579b3c10f2d88b3d0f
+EBUILD libselinux-2.6.ebuild 4430 SHA256 caae61333c7514cc687d084799b6e75079548e0c7e350b56e66daa532fda630a SHA512 cc5bf39c23a62c5b3fe25fcd9032219ea42dfd9afb70c46c356e22cf4b7e0c20d365764e4e09d2a5d9542f48e8bb0f5a3f7bd11a534b4c63fb9c6b9d7b1e869a WHIRLPOOL 9f3a783ffe5f4cc5dc6be8b588600f1a1f86ac3e339d65bfb521eeea04c1118774da3fe2654dc9690a1c23244d6fc8cc1cdbeacf49bdc8f12a2f60906e199449
 MISC metadata.xml 676 SHA256 288211da34dc4cabaeaa85c52462c3ad2792347abbf88f78eae812a4e3dc8c8c SHA512 7b33e0d113637a129a7894d8720feb9024d67466b86d475fbc3398f514b2ecc28c70dc759952376208d2022a00658eb120fc3561edbb9c7ecdc4404bed5f57a7 WHIRLPOOL bd4938862e3ec119c1da448d5bc8c99a6063704a65c8a906514f5160adf65851af64c6a1c4626e97438e9f4a7288ef002b06a876b9d73e67d70e38ca31cc1319

diff --git a/sys-libs/libselinux/libselinux-2.6.ebuild b/sys-libs/libselinux/libselinux-2.6.ebuild
index c88f863..17308f0 100644
--- a/sys-libs/libselinux/libselinux-2.6.ebuild
+++ b/sys-libs/libselinux/libselinux-2.6.ebuild
@@ -40,7 +40,7 @@ RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
 		ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 	)
-	elibc_musl? ( sys-libs/musl-fts )"
+	elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	python? ( >=dev-lang/swig-2.0.9 )"


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/musl:master commit in: sys-libs/libselinux/
@ 2017-02-28 18:20 Aric Belsito
  0 siblings, 0 replies; 10+ messages in thread
From: Aric Belsito @ 2017-02-28 18:20 UTC (permalink / raw
  To: gentoo-commits

commit:     a4d21f537fbab72a079c794f79b7c0a616f24c69
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Feb 28 18:17:19 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Tue Feb 28 18:17:19 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=a4d21f53

sys-libs/libselinux: sync with upstream

 sys-libs/libselinux/Manifest              | 2 +-
 sys-libs/libselinux/libselinux-2.6.ebuild | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 02efa12..023a969 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,4 +1,4 @@
 AUX libselinux-2.6-0007-build-related-fixes-bug-500674.patch 3580 SHA256 a9803f0f0876b12d909aa16da3968f80ed44fd56a59e2737df6196097ea59c4d SHA512 51c3b1bc1541b8b97ef7a25b01740cc6d05ee7bf7f6264e1f5d78e4fba02c957d48c437826d797354f295a92e53f51957e3e8c68d7ea1ba1113458c0b964ea23 WHIRLPOOL b8bf31c73401950afd7b11e57746399b214fb77cd8a1c3cc853d86c95f30665941e736782fd625b37af976c905cd467f9304c8c115ee541bd896edd8e1cec4df
 DIST libselinux-2.6.tar.gz 203119 SHA256 4ea2dde50665c202253ba5caac7738370ea0337c47b251ba981c60d24e1a118a SHA512 906e1bf98c669862ab4f4e883d511db8d739a5763dc857c9405ad3cc6c70766a482853d07134698a1a98257a8632cc756d0549a7640c2915d051714f502ff14b WHIRLPOOL bf60ce907b7057ada5d19e3a0cd1f092a7dfc2de774e504762424c325c657a4f144fbe252e7d908f7c6d902d80388517e15134a289f4358e564c8720ea6534d9
-EBUILD libselinux-2.6.ebuild 4430 SHA256 caae61333c7514cc687d084799b6e75079548e0c7e350b56e66daa532fda630a SHA512 cc5bf39c23a62c5b3fe25fcd9032219ea42dfd9afb70c46c356e22cf4b7e0c20d365764e4e09d2a5d9542f48e8bb0f5a3f7bd11a534b4c63fb9c6b9d7b1e869a WHIRLPOOL 9f3a783ffe5f4cc5dc6be8b588600f1a1f86ac3e339d65bfb521eeea04c1118774da3fe2654dc9690a1c23244d6fc8cc1cdbeacf49bdc8f12a2f60906e199449
+EBUILD libselinux-2.6.ebuild 4442 SHA256 a3b6ef729d94d8fcbbf63cfae9afedc805e92b7e06d57c157e62c71b01a72259 SHA512 de6ae67995c2782cdc5698b88a6beca6f0474aec67da5b73f36e2f4af3b488751d39ab17422b11f15af1a70671154325ab4f531cd14208dbfe3c2418fbc17885 WHIRLPOOL ba1a3aba1617eb3e4b4d6058602f5d0c1f16192fd45b4193f7b9f790633037f6ff8323e768f1a2c711dad805124da70a1afeb4d2b2b2fead4b8b3273941bc0c7
 MISC metadata.xml 676 SHA256 288211da34dc4cabaeaa85c52462c3ad2792347abbf88f78eae812a4e3dc8c8c SHA512 7b33e0d113637a129a7894d8720feb9024d67466b86d475fbc3398f514b2ecc28c70dc759952376208d2022a00658eb120fc3561edbb9c7ecdc4404bed5f57a7 WHIRLPOOL bd4938862e3ec119c1da448d5bc8c99a6063704a65c8a906514f5160adf65851af64c6a1c4626e97438e9f4a7288ef002b06a876b9d73e67d70e38ca31cc1319

diff --git a/sys-libs/libselinux/libselinux-2.6.ebuild b/sys-libs/libselinux/libselinux-2.6.ebuild
index 17308f0..33b9bbf 100644
--- a/sys-libs/libselinux/libselinux-2.6.ebuild
+++ b/sys-libs/libselinux/libselinux-2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
 USE_RUBY="ruby21 ruby22 ruby23"
 
 # No, I am not calling ruby-ng
@@ -72,7 +72,7 @@ multilib_src_compile() {
 			python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
 			emake \
 				PYINC="-I${PYTHON_INCLUDEDIR}" \
-				LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
+				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
 				FTS_LDFLAGS="$(usex elibc_musl '-lfts' '')" \
 				LIBDIR="\$(PREFIX)/$(get_libdir)" \
 				SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
@@ -89,7 +89,7 @@ multilib_src_compile() {
 			rm -f src/selinuxswig_ruby_wrap.lo || die
 			emake \
 				RUBY=${1} \
-				LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
+				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
 				FTS_LDFLAGS="$(usex elibc_musl '-lfts' '')" \
 				LIBDIR="\$(PREFIX)/$(get_libdir)" \
 				SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/musl:master commit in: sys-libs/libselinux/
@ 2017-07-09 17:31 Aric Belsito
  0 siblings, 0 replies; 10+ messages in thread
From: Aric Belsito @ 2017-07-09 17:31 UTC (permalink / raw
  To: gentoo-commits

commit:     774ecf6a452a0a7a1f6d5b9005b51fea15b27618
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sun Jul  9 17:30:51 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sun Jul  9 17:30:51 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=774ecf6a

sys-libs/libselinux: version bump to 2.7_rc4

libsepol no longer needs patching.

 sys-libs/libselinux/Manifest                  |   2 +
 sys-libs/libselinux/libselinux-2.7_rc4.ebuild | 160 ++++++++++++++++++++++++++
 2 files changed, 162 insertions(+)

diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 3892acf..dda67a1 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -2,6 +2,8 @@ AUX libselinux-2.6-0007-build-related-fixes-bug-500674.patch 3580 SHA256 a9803f0
 AUX libselinux-2.7-fts_ldlibs.patch 536 SHA256 8baac2b87e3f50b071a70651d965d564ad86344f9205a91029f9d34e0987d308 SHA512 71452e5f110af7f9e86c567e765a7fb069151cc174a179f7dcb7862af589a8a01df899a54c25ccec18b047e3e57cd35308c46d26b9d5241741829f42a655fae6 WHIRLPOOL eaa7d9e92aa50da4102f3f08de6ea089bd839eb7c842aa62c7ef37c8ac7d0749cf97231f572ac713ad2c2087457702d504bf769cfcfb88a4529355faad7945b8
 DIST libselinux-2.6.tar.gz 203119 SHA256 4ea2dde50665c202253ba5caac7738370ea0337c47b251ba981c60d24e1a118a SHA512 906e1bf98c669862ab4f4e883d511db8d739a5763dc857c9405ad3cc6c70766a482853d07134698a1a98257a8632cc756d0549a7640c2915d051714f502ff14b WHIRLPOOL bf60ce907b7057ada5d19e3a0cd1f092a7dfc2de774e504762424c325c657a4f144fbe252e7d908f7c6d902d80388517e15134a289f4358e564c8720ea6534d9
 DIST libselinux-2.7-rc1.tar.gz 186897 SHA256 213e1ca473855a61e8147e027b6ee5edf4162c9fbfc00749643f0ecc0a08371c SHA512 fe7fe67f14e5483fbb237eeb33f6eca48f1d3f6a3ab7fa1cfa99e5143ce4d6a03c9033a03a82bb3954d07c4d1a2c211cf5dea80030c727f9adcb3cc6bd72e641 WHIRLPOOL dfee20eaf3ea9e3cb7caa21ac10e710799ed324eee833650fc0bdf17c3fbcd3426bea7d915f6d6b79ca4440b99c57805a018bbd6a6103d97cb590f52d58f0e40
+DIST libselinux-2.7-rc4.tar.gz 186904 SHA256 27c1780d6c623ab70ccf6923b8c8f386f8984ec99b7b4734f7b23d3d25809970 SHA512 788beb44ca2d2b6d84b57193538ed6f9c25f536c129903d58a852a64fc2c46a4e4249c4acd6234a6242a6ac0ea828a553f42a0e80fd9405ff5225c8a722c395f WHIRLPOOL 709ba4c3021d8b9e260ec8dbb0ff0ecd2a06a32cb44ce2c6fc486004e4c7f8cc28728150df40967472d00b97a26194dc36702dc990f5dd7055b2571714ccd37a
 EBUILD libselinux-2.6.ebuild 4484 SHA256 ce11a2196a960e75df6ff4eafd8ab670687c7ead2cca6f51c15d5c9688d34e26 SHA512 6bf726dc5594ffba0aa36e4f97fc4131c4c4b78ad498c0c36dffdd335ca9772d1f3d6c57dc8de87e431b06bbb2e190f220932dc166e8220d68cf6293bca518f4 WHIRLPOOL 5a7df89e0c1f21f3bc3f0a6e3f590520c51879b9a62a78c42435fd0a7ee9e876d47a7d3d5c48a659aedc18fa0835fd59164773073ed30ed1167648771b98f540
 EBUILD libselinux-2.7_rc1.ebuild 4508 SHA256 8273a5a82155cdc299135f00250410047e81a4941c900d96802f6107718a81c5 SHA512 c5afe914323f99c45cdd5058c45754231c8d1d29a17a4ac4046d99c6697fac6366ea4fac854f64c849edc15a74525ef2d8c34826957048a35eb455253ab5caa5 WHIRLPOOL 2ed67afde472c91f9397a3a21ff19652c32e03e746619c542202afe99e51e5ab17833b6e7b62d0020f7a3249c27c1e667126510217578ec9a97c6995a6cdc0e6
+EBUILD libselinux-2.7_rc4.ebuild 4508 SHA256 0dbd2576be8d3e485d0fd5c312fa786e673258c06eaee5cf3b1d1a1544feb394 SHA512 ea38b6042023e2993958e3634733549a58f935cc77853a7443b5d5d948f8becbbd3d5aabfedad12bc9c3f51bbc80be9462a276397371cbb91137c96ed40ab82a WHIRLPOOL 706f99fb0c39dee6785009208a44e2d9409f267021cabf1393604a4f3f165c23a312f7dc83dc2646e97a9442a6925667de8664a12515ede3c5044eff29f0d30e
 MISC metadata.xml 676 SHA256 288211da34dc4cabaeaa85c52462c3ad2792347abbf88f78eae812a4e3dc8c8c SHA512 7b33e0d113637a129a7894d8720feb9024d67466b86d475fbc3398f514b2ecc28c70dc759952376208d2022a00658eb120fc3561edbb9c7ecdc4404bed5f57a7 WHIRLPOOL bd4938862e3ec119c1da448d5bc8c99a6063704a65c8a906514f5160adf65851af64c6a1c4626e97438e9f4a7288ef002b06a876b9d73e67d70e38ca31cc1319

diff --git a/sys-libs/libselinux/libselinux-2.7_rc4.ebuild b/sys-libs/libselinux/libselinux-2.7_rc4.ebuild
new file mode 100644
index 0000000..217cfe9
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-2.7_rc4.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+USE_RUBY="ruby21 ruby22 ruby23"
+
+# No, I am not calling ruby-ng
+inherit multilib python-r1 toolchain-funcs multilib-minimal
+
+MY_P="${P//_/-}"
+SEPOL_VER="${PV}"
+MY_RELEASEDATE="20170630"
+
+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://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${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_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
+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_ruby21? ( dev-lang/ruby:2.1 )
+		ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+	)
+	elibc_musl? ( sys-libs/fts-standalone )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-lang/swig-2.0.9 )"
+
+src_prepare() {
+	if [[ ${PV} != 9999 ]] ; then
+		# If needed for live builds, place them in /etc/portage/patches
+		eapply "${FILESDIR}/libselinux-2.7-fts_ldlibs.patch"
+	fi
+
+	eapply_user
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export AR CC PKG_CONFIG RANLIB
+
+	emake \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="\$(DESTDIR)/$(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" \
+				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				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" \
+				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				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="\$(DESTDIR)/$(get_libdir)" \
+		LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
+		USE_PCRE2="$(usex pcre2 y n)" \
+		install
+
+	if multilib_is_native_abi && use python; then
+		installation() {
+			emake DESTDIR="${D}" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
+				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)" \
+				LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
+				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
+			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
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/musl:master commit in: sys-libs/libselinux/
@ 2017-07-22 15:57 Aric Belsito
  0 siblings, 0 replies; 10+ messages in thread
From: Aric Belsito @ 2017-07-22 15:57 UTC (permalink / raw
  To: gentoo-commits

commit:     0d93fa3157f99016175661613dae4112bd58752e
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sat Jul 22 15:56:15 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sat Jul 22 15:57:23 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=0d93fa31

sys-libs/libselinux: version bump to 2.7_rc5

 sys-libs/libselinux/Manifest                  |   2 +
 sys-libs/libselinux/libselinux-2.7_rc5.ebuild | 160 ++++++++++++++++++++++++++
 2 files changed, 162 insertions(+)

diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index dda67a1..b9dc29f 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -3,7 +3,9 @@ AUX libselinux-2.7-fts_ldlibs.patch 536 SHA256 8baac2b87e3f50b071a70651d965d564a
 DIST libselinux-2.6.tar.gz 203119 SHA256 4ea2dde50665c202253ba5caac7738370ea0337c47b251ba981c60d24e1a118a SHA512 906e1bf98c669862ab4f4e883d511db8d739a5763dc857c9405ad3cc6c70766a482853d07134698a1a98257a8632cc756d0549a7640c2915d051714f502ff14b WHIRLPOOL bf60ce907b7057ada5d19e3a0cd1f092a7dfc2de774e504762424c325c657a4f144fbe252e7d908f7c6d902d80388517e15134a289f4358e564c8720ea6534d9
 DIST libselinux-2.7-rc1.tar.gz 186897 SHA256 213e1ca473855a61e8147e027b6ee5edf4162c9fbfc00749643f0ecc0a08371c SHA512 fe7fe67f14e5483fbb237eeb33f6eca48f1d3f6a3ab7fa1cfa99e5143ce4d6a03c9033a03a82bb3954d07c4d1a2c211cf5dea80030c727f9adcb3cc6bd72e641 WHIRLPOOL dfee20eaf3ea9e3cb7caa21ac10e710799ed324eee833650fc0bdf17c3fbcd3426bea7d915f6d6b79ca4440b99c57805a018bbd6a6103d97cb590f52d58f0e40
 DIST libselinux-2.7-rc4.tar.gz 186904 SHA256 27c1780d6c623ab70ccf6923b8c8f386f8984ec99b7b4734f7b23d3d25809970 SHA512 788beb44ca2d2b6d84b57193538ed6f9c25f536c129903d58a852a64fc2c46a4e4249c4acd6234a6242a6ac0ea828a553f42a0e80fd9405ff5225c8a722c395f WHIRLPOOL 709ba4c3021d8b9e260ec8dbb0ff0ecd2a06a32cb44ce2c6fc486004e4c7f8cc28728150df40967472d00b97a26194dc36702dc990f5dd7055b2571714ccd37a
+DIST libselinux-2.7-rc5.tar.gz 186909 SHA256 b002ec2fc5ab74041a5138ebc680e5bc2045c7a5089699f39c494ac1f0b482b2 SHA512 01a600d03ff2a04f91efee8ab6ef9dccc3e39c64e2857be57b84ab0a38e01a55710d7c1b4e3d33b69f0ed0f04e1af14b9569d65ce419294d40177baff283a8b7 WHIRLPOOL 05fa39c10669eeaf7e91609ff77967c0b3187c27d9edeee0614110e9dbe54068df317df73ce421e9a0a5511705a374f02abcf8f5dc3f8006ef73d88cb597534a
 EBUILD libselinux-2.6.ebuild 4484 SHA256 ce11a2196a960e75df6ff4eafd8ab670687c7ead2cca6f51c15d5c9688d34e26 SHA512 6bf726dc5594ffba0aa36e4f97fc4131c4c4b78ad498c0c36dffdd335ca9772d1f3d6c57dc8de87e431b06bbb2e190f220932dc166e8220d68cf6293bca518f4 WHIRLPOOL 5a7df89e0c1f21f3bc3f0a6e3f590520c51879b9a62a78c42435fd0a7ee9e876d47a7d3d5c48a659aedc18fa0835fd59164773073ed30ed1167648771b98f540
 EBUILD libselinux-2.7_rc1.ebuild 4508 SHA256 8273a5a82155cdc299135f00250410047e81a4941c900d96802f6107718a81c5 SHA512 c5afe914323f99c45cdd5058c45754231c8d1d29a17a4ac4046d99c6697fac6366ea4fac854f64c849edc15a74525ef2d8c34826957048a35eb455253ab5caa5 WHIRLPOOL 2ed67afde472c91f9397a3a21ff19652c32e03e746619c542202afe99e51e5ab17833b6e7b62d0020f7a3249c27c1e667126510217578ec9a97c6995a6cdc0e6
 EBUILD libselinux-2.7_rc4.ebuild 4508 SHA256 0dbd2576be8d3e485d0fd5c312fa786e673258c06eaee5cf3b1d1a1544feb394 SHA512 ea38b6042023e2993958e3634733549a58f935cc77853a7443b5d5d948f8becbbd3d5aabfedad12bc9c3f51bbc80be9462a276397371cbb91137c96ed40ab82a WHIRLPOOL 706f99fb0c39dee6785009208a44e2d9409f267021cabf1393604a4f3f165c23a312f7dc83dc2646e97a9442a6925667de8664a12515ede3c5044eff29f0d30e
+EBUILD libselinux-2.7_rc5.ebuild 4508 SHA256 0044e655fea9123afcb9e03769ebaccedf969365a83324540c069886075591a4 SHA512 3d1633ad5ffc75178c8053cc70b946f6837cc9336e451c18788b9f22d2eea2a10712a2d6ea11a42d1bc03bdd372899a0942d879c74ae4970f35b2cc52b40a9b5 WHIRLPOOL fe4362ec75da5187f2139c7b562fac2235625771a0ecf959e9bcd463dd8c1d79d95dc1d7c06c6b80231554dcb44b1fb1ea1cd65cf9140c8a6205810829f0d1c6
 MISC metadata.xml 676 SHA256 288211da34dc4cabaeaa85c52462c3ad2792347abbf88f78eae812a4e3dc8c8c SHA512 7b33e0d113637a129a7894d8720feb9024d67466b86d475fbc3398f514b2ecc28c70dc759952376208d2022a00658eb120fc3561edbb9c7ecdc4404bed5f57a7 WHIRLPOOL bd4938862e3ec119c1da448d5bc8c99a6063704a65c8a906514f5160adf65851af64c6a1c4626e97438e9f4a7288ef002b06a876b9d73e67d70e38ca31cc1319

diff --git a/sys-libs/libselinux/libselinux-2.7_rc5.ebuild b/sys-libs/libselinux/libselinux-2.7_rc5.ebuild
new file mode 100644
index 0000000..f263966
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-2.7_rc5.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+USE_RUBY="ruby21 ruby22 ruby23"
+
+# No, I am not calling ruby-ng
+inherit multilib python-r1 toolchain-funcs multilib-minimal
+
+MY_P="${P//_/-}"
+SEPOL_VER="${PV}"
+MY_RELEASEDATE="20170718"
+
+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://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${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_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
+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_ruby21? ( dev-lang/ruby:2.1 )
+		ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+	)
+	elibc_musl? ( sys-libs/fts-standalone )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-lang/swig-2.0.9 )"
+
+src_prepare() {
+	if [[ ${PV} != 9999 ]] ; then
+		# If needed for live builds, place them in /etc/portage/patches
+		eapply "${FILESDIR}/libselinux-2.7-fts_ldlibs.patch"
+	fi
+
+	eapply_user
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export AR CC PKG_CONFIG RANLIB
+
+	emake \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="\$(DESTDIR)/$(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" \
+				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				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" \
+				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				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="\$(DESTDIR)/$(get_libdir)" \
+		LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
+		USE_PCRE2="$(usex pcre2 y n)" \
+		install
+
+	if multilib_is_native_abi && use python; then
+		installation() {
+			emake DESTDIR="${D}" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
+				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)" \
+				LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
+				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
+			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
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/musl:master commit in: sys-libs/libselinux/
@ 2017-08-07 17:49 Aric Belsito
  0 siblings, 0 replies; 10+ messages in thread
From: Aric Belsito @ 2017-08-07 17:49 UTC (permalink / raw
  To: gentoo-commits

commit:     568bbeb8f981b3c5e95995389a9e6fd0f012d099
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Aug  7 17:43:02 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Aug  7 17:43:02 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=568bbeb8

sys-libs/libselinux: version bump to 2.7

 sys-libs/libselinux/Manifest              |   2 +
 sys-libs/libselinux/libselinux-2.7.ebuild | 160 ++++++++++++++++++++++++++++++
 2 files changed, 162 insertions(+)

diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index b9dc29f..f6bc675 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -4,7 +4,9 @@ DIST libselinux-2.6.tar.gz 203119 SHA256 4ea2dde50665c202253ba5caac7738370ea0337
 DIST libselinux-2.7-rc1.tar.gz 186897 SHA256 213e1ca473855a61e8147e027b6ee5edf4162c9fbfc00749643f0ecc0a08371c SHA512 fe7fe67f14e5483fbb237eeb33f6eca48f1d3f6a3ab7fa1cfa99e5143ce4d6a03c9033a03a82bb3954d07c4d1a2c211cf5dea80030c727f9adcb3cc6bd72e641 WHIRLPOOL dfee20eaf3ea9e3cb7caa21ac10e710799ed324eee833650fc0bdf17c3fbcd3426bea7d915f6d6b79ca4440b99c57805a018bbd6a6103d97cb590f52d58f0e40
 DIST libselinux-2.7-rc4.tar.gz 186904 SHA256 27c1780d6c623ab70ccf6923b8c8f386f8984ec99b7b4734f7b23d3d25809970 SHA512 788beb44ca2d2b6d84b57193538ed6f9c25f536c129903d58a852a64fc2c46a4e4249c4acd6234a6242a6ac0ea828a553f42a0e80fd9405ff5225c8a722c395f WHIRLPOOL 709ba4c3021d8b9e260ec8dbb0ff0ecd2a06a32cb44ce2c6fc486004e4c7f8cc28728150df40967472d00b97a26194dc36702dc990f5dd7055b2571714ccd37a
 DIST libselinux-2.7-rc5.tar.gz 186909 SHA256 b002ec2fc5ab74041a5138ebc680e5bc2045c7a5089699f39c494ac1f0b482b2 SHA512 01a600d03ff2a04f91efee8ab6ef9dccc3e39c64e2857be57b84ab0a38e01a55710d7c1b4e3d33b69f0ed0f04e1af14b9569d65ce419294d40177baff283a8b7 WHIRLPOOL 05fa39c10669eeaf7e91609ff77967c0b3187c27d9edeee0614110e9dbe54068df317df73ce421e9a0a5511705a374f02abcf8f5dc3f8006ef73d88cb597534a
+DIST libselinux-2.7.tar.gz 187574 SHA256 d0fec0769b3ad60aa7baf9b9a4b7a056827769dc2dadda0dc0eb59b3d1c18c57 SHA512 415d10306692d4323455b61fb61d7e56e53b9144276ff206d72760e1df9b04ab07c62a4d6f04bf4e5fa708f9f14b21a9801069b16ece0a0aade886950941ab8d WHIRLPOOL dd9175c91fa8f6f87add7b0ad1b90706b1fb203ade866b42d886faeb3710e1138fc08a2d7d371fbc8c9480148f8fdec6f0a6dd3f7142f194da580365cd527351
 EBUILD libselinux-2.6.ebuild 4484 SHA256 ce11a2196a960e75df6ff4eafd8ab670687c7ead2cca6f51c15d5c9688d34e26 SHA512 6bf726dc5594ffba0aa36e4f97fc4131c4c4b78ad498c0c36dffdd335ca9772d1f3d6c57dc8de87e431b06bbb2e190f220932dc166e8220d68cf6293bca518f4 WHIRLPOOL 5a7df89e0c1f21f3bc3f0a6e3f590520c51879b9a62a78c42435fd0a7ee9e876d47a7d3d5c48a659aedc18fa0835fd59164773073ed30ed1167648771b98f540
+EBUILD libselinux-2.7.ebuild 4508 SHA256 a48489e974f4d994cb6f6432e6edd51a947da764fd7f1f8a13d105bdf6c75e7f SHA512 39b925648f1923a038c1145c4b8ac2f58502c949f0fccdc2e9ce4fe841ca216fc3de6f487c3b148c441ed2d3410cb6bbf4f071d5da0dfb04f1a68338d6b1735f WHIRLPOOL b1ecba437c9deea9e251619f9c008a66b18b84cf12086ffcfa733368b9ab110a2a662f28081416fafb59a0e77ca1eda8e7c81030d28f8badd862166c6b10b154
 EBUILD libselinux-2.7_rc1.ebuild 4508 SHA256 8273a5a82155cdc299135f00250410047e81a4941c900d96802f6107718a81c5 SHA512 c5afe914323f99c45cdd5058c45754231c8d1d29a17a4ac4046d99c6697fac6366ea4fac854f64c849edc15a74525ef2d8c34826957048a35eb455253ab5caa5 WHIRLPOOL 2ed67afde472c91f9397a3a21ff19652c32e03e746619c542202afe99e51e5ab17833b6e7b62d0020f7a3249c27c1e667126510217578ec9a97c6995a6cdc0e6
 EBUILD libselinux-2.7_rc4.ebuild 4508 SHA256 0dbd2576be8d3e485d0fd5c312fa786e673258c06eaee5cf3b1d1a1544feb394 SHA512 ea38b6042023e2993958e3634733549a58f935cc77853a7443b5d5d948f8becbbd3d5aabfedad12bc9c3f51bbc80be9462a276397371cbb91137c96ed40ab82a WHIRLPOOL 706f99fb0c39dee6785009208a44e2d9409f267021cabf1393604a4f3f165c23a312f7dc83dc2646e97a9442a6925667de8664a12515ede3c5044eff29f0d30e
 EBUILD libselinux-2.7_rc5.ebuild 4508 SHA256 0044e655fea9123afcb9e03769ebaccedf969365a83324540c069886075591a4 SHA512 3d1633ad5ffc75178c8053cc70b946f6837cc9336e451c18788b9f22d2eea2a10712a2d6ea11a42d1bc03bdd372899a0942d879c74ae4970f35b2cc52b40a9b5 WHIRLPOOL fe4362ec75da5187f2139c7b562fac2235625771a0ecf959e9bcd463dd8c1d79d95dc1d7c06c6b80231554dcb44b1fb1ea1cd65cf9140c8a6205810829f0d1c6

diff --git a/sys-libs/libselinux/libselinux-2.7.ebuild b/sys-libs/libselinux/libselinux-2.7.ebuild
new file mode 100644
index 0000000..799bc59
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-2.7.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+USE_RUBY="ruby21 ruby22 ruby23"
+
+# No, I am not calling ruby-ng
+inherit multilib python-r1 toolchain-funcs multilib-minimal
+
+MY_P="${P//_/-}"
+SEPOL_VER="${PV}"
+MY_RELEASEDATE="20170804"
+
+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://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${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_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
+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_ruby21? ( dev-lang/ruby:2.1 )
+		ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+	)
+	elibc_musl? ( sys-libs/fts-standalone )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-lang/swig-2.0.9 )"
+
+src_prepare() {
+	if [[ ${PV} != 9999 ]] ; then
+		# If needed for live builds, place them in /etc/portage/patches
+		eapply "${FILESDIR}/libselinux-2.7-fts_ldlibs.patch"
+	fi
+
+	eapply_user
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export AR CC PKG_CONFIG RANLIB
+
+	emake \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="\$(DESTDIR)/$(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" \
+				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				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" \
+				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				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="\$(DESTDIR)/$(get_libdir)" \
+		LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
+		USE_PCRE2="$(usex pcre2 y n)" \
+		install
+
+	if multilib_is_native_abi && use python; then
+		installation() {
+			emake DESTDIR="${D}" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
+				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)" \
+				LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
+				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
+			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
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/musl:master commit in: sys-libs/libselinux/
@ 2017-09-03 21:18 Anthony G. Basile
  0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2017-09-03 21:18 UTC (permalink / raw
  To: gentoo-commits

commit:     a8bda2bac184c8756474a1158fa497dbd97e38d7
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 21:18:25 2017 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 21:18:25 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=a8bda2ba

sys-libs/libselinux: drop dependence on ruby21

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 sys-libs/libselinux/Manifest                  | 10 +++++-----
 sys-libs/libselinux/libselinux-2.6.ebuild     |  5 ++---
 sys-libs/libselinux/libselinux-2.7.ebuild     |  5 ++---
 sys-libs/libselinux/libselinux-2.7_rc1.ebuild |  5 ++---
 sys-libs/libselinux/libselinux-2.7_rc4.ebuild |  5 ++---
 sys-libs/libselinux/libselinux-2.7_rc5.ebuild |  5 ++---
 6 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index f6bc675..b2f80c9 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -5,9 +5,9 @@ DIST libselinux-2.7-rc1.tar.gz 186897 SHA256 213e1ca473855a61e8147e027b6ee5edf41
 DIST libselinux-2.7-rc4.tar.gz 186904 SHA256 27c1780d6c623ab70ccf6923b8c8f386f8984ec99b7b4734f7b23d3d25809970 SHA512 788beb44ca2d2b6d84b57193538ed6f9c25f536c129903d58a852a64fc2c46a4e4249c4acd6234a6242a6ac0ea828a553f42a0e80fd9405ff5225c8a722c395f WHIRLPOOL 709ba4c3021d8b9e260ec8dbb0ff0ecd2a06a32cb44ce2c6fc486004e4c7f8cc28728150df40967472d00b97a26194dc36702dc990f5dd7055b2571714ccd37a
 DIST libselinux-2.7-rc5.tar.gz 186909 SHA256 b002ec2fc5ab74041a5138ebc680e5bc2045c7a5089699f39c494ac1f0b482b2 SHA512 01a600d03ff2a04f91efee8ab6ef9dccc3e39c64e2857be57b84ab0a38e01a55710d7c1b4e3d33b69f0ed0f04e1af14b9569d65ce419294d40177baff283a8b7 WHIRLPOOL 05fa39c10669eeaf7e91609ff77967c0b3187c27d9edeee0614110e9dbe54068df317df73ce421e9a0a5511705a374f02abcf8f5dc3f8006ef73d88cb597534a
 DIST libselinux-2.7.tar.gz 187574 SHA256 d0fec0769b3ad60aa7baf9b9a4b7a056827769dc2dadda0dc0eb59b3d1c18c57 SHA512 415d10306692d4323455b61fb61d7e56e53b9144276ff206d72760e1df9b04ab07c62a4d6f04bf4e5fa708f9f14b21a9801069b16ece0a0aade886950941ab8d WHIRLPOOL dd9175c91fa8f6f87add7b0ad1b90706b1fb203ade866b42d886faeb3710e1138fc08a2d7d371fbc8c9480148f8fdec6f0a6dd3f7142f194da580365cd527351
-EBUILD libselinux-2.6.ebuild 4484 SHA256 ce11a2196a960e75df6ff4eafd8ab670687c7ead2cca6f51c15d5c9688d34e26 SHA512 6bf726dc5594ffba0aa36e4f97fc4131c4c4b78ad498c0c36dffdd335ca9772d1f3d6c57dc8de87e431b06bbb2e190f220932dc166e8220d68cf6293bca518f4 WHIRLPOOL 5a7df89e0c1f21f3bc3f0a6e3f590520c51879b9a62a78c42435fd0a7ee9e876d47a7d3d5c48a659aedc18fa0835fd59164773073ed30ed1167648771b98f540
-EBUILD libselinux-2.7.ebuild 4508 SHA256 a48489e974f4d994cb6f6432e6edd51a947da764fd7f1f8a13d105bdf6c75e7f SHA512 39b925648f1923a038c1145c4b8ac2f58502c949f0fccdc2e9ce4fe841ca216fc3de6f487c3b148c441ed2d3410cb6bbf4f071d5da0dfb04f1a68338d6b1735f WHIRLPOOL b1ecba437c9deea9e251619f9c008a66b18b84cf12086ffcfa733368b9ab110a2a662f28081416fafb59a0e77ca1eda8e7c81030d28f8badd862166c6b10b154
-EBUILD libselinux-2.7_rc1.ebuild 4508 SHA256 8273a5a82155cdc299135f00250410047e81a4941c900d96802f6107718a81c5 SHA512 c5afe914323f99c45cdd5058c45754231c8d1d29a17a4ac4046d99c6697fac6366ea4fac854f64c849edc15a74525ef2d8c34826957048a35eb455253ab5caa5 WHIRLPOOL 2ed67afde472c91f9397a3a21ff19652c32e03e746619c542202afe99e51e5ab17833b6e7b62d0020f7a3249c27c1e667126510217578ec9a97c6995a6cdc0e6
-EBUILD libselinux-2.7_rc4.ebuild 4508 SHA256 0dbd2576be8d3e485d0fd5c312fa786e673258c06eaee5cf3b1d1a1544feb394 SHA512 ea38b6042023e2993958e3634733549a58f935cc77853a7443b5d5d948f8becbbd3d5aabfedad12bc9c3f51bbc80be9462a276397371cbb91137c96ed40ab82a WHIRLPOOL 706f99fb0c39dee6785009208a44e2d9409f267021cabf1393604a4f3f165c23a312f7dc83dc2646e97a9442a6925667de8664a12515ede3c5044eff29f0d30e
-EBUILD libselinux-2.7_rc5.ebuild 4508 SHA256 0044e655fea9123afcb9e03769ebaccedf969365a83324540c069886075591a4 SHA512 3d1633ad5ffc75178c8053cc70b946f6837cc9336e451c18788b9f22d2eea2a10712a2d6ea11a42d1bc03bdd372899a0942d879c74ae4970f35b2cc52b40a9b5 WHIRLPOOL fe4362ec75da5187f2139c7b562fac2235625771a0ecf959e9bcd463dd8c1d79d95dc1d7c06c6b80231554dcb44b1fb1ea1cd65cf9140c8a6205810829f0d1c6
+EBUILD libselinux-2.6.ebuild 4412 SHA256 b0f408aaf2310d8d1828f2ed4a40016e3b4cc353213eeab12fd250b167575d4a SHA512 5fe02ddefcb20d4ad411dc2754cf265ea6acea011176d33f6b115bbc027999d663076e28d7b9edbccda267b550cba4477929dac94f020c6d56713576d5c2717f WHIRLPOOL 099cbb60b1a5dc80ce32e92de3f27a1c282b47b42b02a8b19fa1000d39bbcdbe6e527d5fdd1a0f3d1914322253c9aee674831e504e3ed70561902002a48b324e
+EBUILD libselinux-2.7.ebuild 4436 SHA256 1d3fa52552b36378cc74c79ff3ba30ef04ed03c642399661e3af18240c747c1d SHA512 72ea1b77926dab8b4087a7fa4583cb544f71f8c821daceb303805f8cea32bc5acac09e758068bc1e14a85365d72ef2b0f7a0ab21effead7686b7f35580f9b9ab WHIRLPOOL 78afa3c9991d6034d70f1cb9c2aefb9d063e77422a8bbb7185b6bbf41bd3ff6828e5044d3bf90235b6dae97d51ec35450344bcb1cceba5f9469734a2af21d3ff
+EBUILD libselinux-2.7_rc1.ebuild 4436 SHA256 9124f3374441e71d9b00364b193de1c16dddd6f3ea33a4a80e02c18b4d6d9ad5 SHA512 9e096f7731b5320aba1b4497dc777e5af17f4b83233b6842f9e9766f00fa0beeb7bb0a5a8532496d08dfb6249ca1e5b7a8c8ac8187f40b8a1badcae9c60dad01 WHIRLPOOL d2ff5b2fab99db139ced4575548d034e6caeb2f44b549d124119cbf36087902afd1caa84b9ea193b23a687221f4fee9bc8c70898f2d73df4de5ca350b8dace1e
+EBUILD libselinux-2.7_rc4.ebuild 4436 SHA256 b95dc4e077127a7da534753fc36d022e04c7d5a44299d83bc83032672956d8e8 SHA512 78d90021e2508820ecfcd7cba4dba26dac354949c5e0042b3113b9e761f7b1fba7517a870b03e7bcd440283de953f27982a2e9ba706c7870bdccc47bd8d1620c WHIRLPOOL 01a8f069da666e77c30a66bd721f68bfb458f1d051984d2b604c34a70fb42daebdddc230e7ccd6c13182fca802d2e312fa71d98ec19588f580a440acfb1c1a80
+EBUILD libselinux-2.7_rc5.ebuild 4436 SHA256 d711036d6da950fc65685fa04b60c560dd47b17f4d4b3e5faca4950267386736 SHA512 5d2948a98389afd2af645a78028b2f552e5c9f8aea4594b52d1bebc3c7d11fe96ce9f77e7498f2aa338d676fb85ec195d695df21f494b7eefbd81e2e4f6fc4ce WHIRLPOOL 0ec198e258108ecb71aa5297272f7c169c3cdae7391baa7ff0812a8684d0b7ca9e7a4e09f2976dcd6edf956b8681b90745ff39e5178bcf3d856a6d18c5fc03fd
 MISC metadata.xml 676 SHA256 288211da34dc4cabaeaa85c52462c3ad2792347abbf88f78eae812a4e3dc8c8c SHA512 7b33e0d113637a129a7894d8720feb9024d67466b86d475fbc3398f514b2ecc28c70dc759952376208d2022a00658eb120fc3561edbb9c7ecdc4404bed5f57a7 WHIRLPOOL bd4938862e3ec119c1da448d5bc8c99a6063704a65c8a906514f5160adf65851af64c6a1c4626e97438e9f4a7288ef002b06a876b9d73e67d70e38ca31cc1319

diff --git a/sys-libs/libselinux/libselinux-2.6.ebuild b/sys-libs/libselinux/libselinux-2.6.ebuild
index 741579c..f088985 100644
--- a/sys-libs/libselinux/libselinux-2.6.ebuild
+++ b/sys-libs/libselinux/libselinux-2.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23"
 
 # No, I am not calling ruby-ng
 inherit multilib python-r1 toolchain-funcs multilib-minimal
@@ -27,7 +27,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby22 ruby_targets_ruby23"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
@@ -35,7 +35,6 @@ RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
 	pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
-		ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
 		ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 	)

diff --git a/sys-libs/libselinux/libselinux-2.7.ebuild b/sys-libs/libselinux/libselinux-2.7.ebuild
index 799bc59..d53df5f 100644
--- a/sys-libs/libselinux/libselinux-2.7.ebuild
+++ b/sys-libs/libselinux/libselinux-2.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23"
 
 # No, I am not calling ruby-ng
 inherit multilib python-r1 toolchain-funcs multilib-minimal
@@ -27,7 +27,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby22 ruby_targets_ruby23"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
@@ -35,7 +35,6 @@ RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
 	pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
-		ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
 		ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 	)

diff --git a/sys-libs/libselinux/libselinux-2.7_rc1.ebuild b/sys-libs/libselinux/libselinux-2.7_rc1.ebuild
index 8ca0dfb..b10e9ef 100644
--- a/sys-libs/libselinux/libselinux-2.7_rc1.ebuild
+++ b/sys-libs/libselinux/libselinux-2.7_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23"
 
 # No, I am not calling ruby-ng
 inherit multilib python-r1 toolchain-funcs multilib-minimal
@@ -27,7 +27,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby22 ruby_targets_ruby23"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
@@ -35,7 +35,6 @@ RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
 	pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
-		ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
 		ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 	)

diff --git a/sys-libs/libselinux/libselinux-2.7_rc4.ebuild b/sys-libs/libselinux/libselinux-2.7_rc4.ebuild
index 217cfe9..fabcf97 100644
--- a/sys-libs/libselinux/libselinux-2.7_rc4.ebuild
+++ b/sys-libs/libselinux/libselinux-2.7_rc4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23"
 
 # No, I am not calling ruby-ng
 inherit multilib python-r1 toolchain-funcs multilib-minimal
@@ -27,7 +27,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby22 ruby_targets_ruby23"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
@@ -35,7 +35,6 @@ RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
 	pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
-		ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
 		ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 	)

diff --git a/sys-libs/libselinux/libselinux-2.7_rc5.ebuild b/sys-libs/libselinux/libselinux-2.7_rc5.ebuild
index f263966..1dc0ab9 100644
--- a/sys-libs/libselinux/libselinux-2.7_rc5.ebuild
+++ b/sys-libs/libselinux/libselinux-2.7_rc5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23"
 
 # No, I am not calling ruby-ng
 inherit multilib python-r1 toolchain-funcs multilib-minimal
@@ -27,7 +27,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby22 ruby_targets_ruby23"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
@@ -35,7 +35,6 @@ RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
 	pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
-		ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
 		ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 	)


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/musl:master commit in: sys-libs/libselinux/
@ 2017-11-13 21:23 Aric Belsito
  0 siblings, 0 replies; 10+ messages in thread
From: Aric Belsito @ 2017-11-13 21:23 UTC (permalink / raw
  To: gentoo-commits

commit:     77b202ece0576c102d6bb361b5c5f08b5b0bed31
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Nov 13 21:22:43 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Nov 13 21:22:43 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=77b202ec

sys-libs/libselinux: cleanup release candidates

sync with tree

 sys-libs/libselinux/Manifest                  |   3 -
 sys-libs/libselinux/libselinux-2.6.ebuild     |   2 +-
 sys-libs/libselinux/libselinux-2.7.ebuild     |   9 +-
 sys-libs/libselinux/libselinux-2.7_rc1.ebuild | 159 --------------------------
 sys-libs/libselinux/libselinux-2.7_rc4.ebuild | 159 --------------------------
 sys-libs/libselinux/libselinux-2.7_rc5.ebuild | 159 --------------------------
 6 files changed, 3 insertions(+), 488 deletions(-)

diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 41a7270..03d2c3b 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,5 +1,2 @@
 DIST libselinux-2.6.tar.gz 203119 SHA256 4ea2dde50665c202253ba5caac7738370ea0337c47b251ba981c60d24e1a118a SHA512 906e1bf98c669862ab4f4e883d511db8d739a5763dc857c9405ad3cc6c70766a482853d07134698a1a98257a8632cc756d0549a7640c2915d051714f502ff14b WHIRLPOOL bf60ce907b7057ada5d19e3a0cd1f092a7dfc2de774e504762424c325c657a4f144fbe252e7d908f7c6d902d80388517e15134a289f4358e564c8720ea6534d9
-DIST libselinux-2.7-rc1.tar.gz 186897 SHA256 213e1ca473855a61e8147e027b6ee5edf4162c9fbfc00749643f0ecc0a08371c SHA512 fe7fe67f14e5483fbb237eeb33f6eca48f1d3f6a3ab7fa1cfa99e5143ce4d6a03c9033a03a82bb3954d07c4d1a2c211cf5dea80030c727f9adcb3cc6bd72e641 WHIRLPOOL dfee20eaf3ea9e3cb7caa21ac10e710799ed324eee833650fc0bdf17c3fbcd3426bea7d915f6d6b79ca4440b99c57805a018bbd6a6103d97cb590f52d58f0e40
-DIST libselinux-2.7-rc4.tar.gz 186904 SHA256 27c1780d6c623ab70ccf6923b8c8f386f8984ec99b7b4734f7b23d3d25809970 SHA512 788beb44ca2d2b6d84b57193538ed6f9c25f536c129903d58a852a64fc2c46a4e4249c4acd6234a6242a6ac0ea828a553f42a0e80fd9405ff5225c8a722c395f WHIRLPOOL 709ba4c3021d8b9e260ec8dbb0ff0ecd2a06a32cb44ce2c6fc486004e4c7f8cc28728150df40967472d00b97a26194dc36702dc990f5dd7055b2571714ccd37a
-DIST libselinux-2.7-rc5.tar.gz 186909 SHA256 b002ec2fc5ab74041a5138ebc680e5bc2045c7a5089699f39c494ac1f0b482b2 SHA512 01a600d03ff2a04f91efee8ab6ef9dccc3e39c64e2857be57b84ab0a38e01a55710d7c1b4e3d33b69f0ed0f04e1af14b9569d65ce419294d40177baff283a8b7 WHIRLPOOL 05fa39c10669eeaf7e91609ff77967c0b3187c27d9edeee0614110e9dbe54068df317df73ce421e9a0a5511705a374f02abcf8f5dc3f8006ef73d88cb597534a
 DIST libselinux-2.7.tar.gz 187574 SHA256 d0fec0769b3ad60aa7baf9b9a4b7a056827769dc2dadda0dc0eb59b3d1c18c57 SHA512 415d10306692d4323455b61fb61d7e56e53b9144276ff206d72760e1df9b04ab07c62a4d6f04bf4e5fa708f9f14b21a9801069b16ece0a0aade886950941ab8d WHIRLPOOL dd9175c91fa8f6f87add7b0ad1b90706b1fb203ade866b42d886faeb3710e1138fc08a2d7d371fbc8c9480148f8fdec6f0a6dd3f7142f194da580365cd527351

diff --git a/sys-libs/libselinux/libselinux-2.6.ebuild b/sys-libs/libselinux/libselinux-2.6.ebuild
index f088985..16b3e82 100644
--- a/sys-libs/libselinux/libselinux-2.6.ebuild
+++ b/sys-libs/libselinux/libselinux-2.6.ebuild
@@ -27,7 +27,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby22 ruby_targets_ruby23"
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]

diff --git a/sys-libs/libselinux/libselinux-2.7.ebuild b/sys-libs/libselinux/libselinux-2.7.ebuild
index d53df5f..3c754d7 100644
--- a/sys-libs/libselinux/libselinux-2.7.ebuild
+++ b/sys-libs/libselinux/libselinux-2.7.ebuild
@@ -21,13 +21,13 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby22 ruby_targets_ruby23"
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
@@ -44,11 +44,6 @@ DEPEND="${RDEPEND}
 	python? ( >=dev-lang/swig-2.0.9 )"
 
 src_prepare() {
-	if [[ ${PV} != 9999 ]] ; then
-		# If needed for live builds, place them in /etc/portage/patches
-		eapply "${FILESDIR}/libselinux-2.7-fts_ldlibs.patch"
-	fi
-
 	eapply_user
 
 	multilib_copy_sources

diff --git a/sys-libs/libselinux/libselinux-2.7_rc1.ebuild b/sys-libs/libselinux/libselinux-2.7_rc1.ebuild
deleted file mode 100644
index b10e9ef..0000000
--- a/sys-libs/libselinux/libselinux-2.7_rc1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-USE_RUBY="ruby22 ruby23"
-
-# No, I am not calling ruby-ng
-inherit multilib python-r1 toolchain-funcs multilib-minimal
-
-MY_P="${P//_/-}"
-SEPOL_VER="${PV}"
-MY_RELEASEDATE="20170609"
-
-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://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${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_ruby22 ruby_targets_ruby23"
-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_ruby22? ( dev-lang/ruby:2.2 )
-		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-	)
-	elibc_musl? ( sys-libs/fts-standalone )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0.9 )"
-
-src_prepare() {
-	if [[ ${PV} != 9999 ]] ; then
-		# If needed for live builds, place them in /etc/portage/patches
-		eapply "${FILESDIR}/libselinux-2.7-fts_ldlibs.patch"
-	fi
-
-	eapply_user
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export AR CC PKG_CONFIG RANLIB
-
-	emake \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="\$(DESTDIR)/$(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" \
-				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				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" \
-				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				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="\$(DESTDIR)/$(get_libdir)" \
-		LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
-		USE_PCRE2="$(usex pcre2 y n)" \
-		install
-
-	if multilib_is_native_abi && use python; then
-		installation() {
-			emake DESTDIR="${D}" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
-				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)" \
-				LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
-				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
-			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-2.7_rc4.ebuild b/sys-libs/libselinux/libselinux-2.7_rc4.ebuild
deleted file mode 100644
index fabcf97..0000000
--- a/sys-libs/libselinux/libselinux-2.7_rc4.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-USE_RUBY="ruby22 ruby23"
-
-# No, I am not calling ruby-ng
-inherit multilib python-r1 toolchain-funcs multilib-minimal
-
-MY_P="${P//_/-}"
-SEPOL_VER="${PV}"
-MY_RELEASEDATE="20170630"
-
-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://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${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_ruby22 ruby_targets_ruby23"
-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_ruby22? ( dev-lang/ruby:2.2 )
-		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-	)
-	elibc_musl? ( sys-libs/fts-standalone )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0.9 )"
-
-src_prepare() {
-	if [[ ${PV} != 9999 ]] ; then
-		# If needed for live builds, place them in /etc/portage/patches
-		eapply "${FILESDIR}/libselinux-2.7-fts_ldlibs.patch"
-	fi
-
-	eapply_user
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export AR CC PKG_CONFIG RANLIB
-
-	emake \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="\$(DESTDIR)/$(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" \
-				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				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" \
-				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				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="\$(DESTDIR)/$(get_libdir)" \
-		LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
-		USE_PCRE2="$(usex pcre2 y n)" \
-		install
-
-	if multilib_is_native_abi && use python; then
-		installation() {
-			emake DESTDIR="${D}" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
-				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)" \
-				LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
-				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
-			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-2.7_rc5.ebuild b/sys-libs/libselinux/libselinux-2.7_rc5.ebuild
deleted file mode 100644
index 1dc0ab9..0000000
--- a/sys-libs/libselinux/libselinux-2.7_rc5.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-USE_RUBY="ruby22 ruby23"
-
-# No, I am not calling ruby-ng
-inherit multilib python-r1 toolchain-funcs multilib-minimal
-
-MY_P="${P//_/-}"
-SEPOL_VER="${PV}"
-MY_RELEASEDATE="20170718"
-
-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://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${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_ruby22 ruby_targets_ruby23"
-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_ruby22? ( dev-lang/ruby:2.2 )
-		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-	)
-	elibc_musl? ( sys-libs/fts-standalone )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0.9 )"
-
-src_prepare() {
-	if [[ ${PV} != 9999 ]] ; then
-		# If needed for live builds, place them in /etc/portage/patches
-		eapply "${FILESDIR}/libselinux-2.7-fts_ldlibs.patch"
-	fi
-
-	eapply_user
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export AR CC PKG_CONFIG RANLIB
-
-	emake \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="\$(DESTDIR)/$(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" \
-				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				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" \
-				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				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="\$(DESTDIR)/$(get_libdir)" \
-		LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
-		USE_PCRE2="$(usex pcre2 y n)" \
-		install
-
-	if multilib_is_native_abi && use python; then
-		installation() {
-			emake DESTDIR="${D}" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
-				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)" \
-				LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
-				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
-			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
-}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/musl:master commit in: sys-libs/libselinux/
@ 2017-11-14 18:08 Aric Belsito
  0 siblings, 0 replies; 10+ messages in thread
From: Aric Belsito @ 2017-11-14 18:08 UTC (permalink / raw
  To: gentoo-commits

commit:     66ba44498f9fb3dae27844daba7164b7059a9531
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Nov 14 18:07:28 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Tue Nov 14 18:07:28 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=66ba4449

sys-libs/libselinux: actually apply musl patch

Close #71
Thanks, @atlua

 sys-libs/libselinux/libselinux-2.7.ebuild | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sys-libs/libselinux/libselinux-2.7.ebuild b/sys-libs/libselinux/libselinux-2.7.ebuild
index 3c754d7..e85613f 100644
--- a/sys-libs/libselinux/libselinux-2.7.ebuild
+++ b/sys-libs/libselinux/libselinux-2.7.ebuild
@@ -44,6 +44,11 @@ DEPEND="${RDEPEND}
 	python? ( >=dev-lang/swig-2.0.9 )"
 
 src_prepare() {
+	if [[ ${PV} != 9999 ]] ; then
+		# If needed for live builds, place them in /etc/portage/patches
+		eapply "${FILESDIR}/libselinux-2.7-fts_ldlibs.patch"
+	fi
+
 	eapply_user
 
 	multilib_copy_sources


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/musl:master commit in: sys-libs/libselinux/
@ 2018-04-27 13:12 Anthony G. Basile
  0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2018-04-27 13:12 UTC (permalink / raw
  To: gentoo-commits

commit:     ddd6e548a990d18597d81d6a469410ece59c84db
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 27 13:12:34 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Apr 27 13:12:34 2018 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=ddd6e548

sys-libs/libselinux: remove ruby22

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-libs/libselinux/Manifest              | 2 +-
 sys-libs/libselinux/libselinux-2.6.ebuild | 7 +++----
 sys-libs/libselinux/libselinux-2.7.ebuild | 7 +++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 03d2c3b..7ddb158 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,2 +1,2 @@
 DIST libselinux-2.6.tar.gz 203119 SHA256 4ea2dde50665c202253ba5caac7738370ea0337c47b251ba981c60d24e1a118a SHA512 906e1bf98c669862ab4f4e883d511db8d739a5763dc857c9405ad3cc6c70766a482853d07134698a1a98257a8632cc756d0549a7640c2915d051714f502ff14b WHIRLPOOL bf60ce907b7057ada5d19e3a0cd1f092a7dfc2de774e504762424c325c657a4f144fbe252e7d908f7c6d902d80388517e15134a289f4358e564c8720ea6534d9
-DIST libselinux-2.7.tar.gz 187574 SHA256 d0fec0769b3ad60aa7baf9b9a4b7a056827769dc2dadda0dc0eb59b3d1c18c57 SHA512 415d10306692d4323455b61fb61d7e56e53b9144276ff206d72760e1df9b04ab07c62a4d6f04bf4e5fa708f9f14b21a9801069b16ece0a0aade886950941ab8d WHIRLPOOL dd9175c91fa8f6f87add7b0ad1b90706b1fb203ade866b42d886faeb3710e1138fc08a2d7d371fbc8c9480148f8fdec6f0a6dd3f7142f194da580365cd527351
+DIST libselinux-2.7.tar.gz 187574 BLAKE2B cc6ee51d5015943dd73fe16efb2ce2478616f43eaf7da55655de50502010e69973c2de13c8a562c8814a31211a8dbd7200fa2f22761f3d0f81fa3a1d3cd1e998 SHA512 415d10306692d4323455b61fb61d7e56e53b9144276ff206d72760e1df9b04ab07c62a4d6f04bf4e5fa708f9f14b21a9801069b16ece0a0aade886950941ab8d

diff --git a/sys-libs/libselinux/libselinux-2.6.ebuild b/sys-libs/libselinux/libselinux-2.6.ebuild
index d733c5b..e09f229 100644
--- a/sys-libs/libselinux/libselinux-2.6.ebuild
+++ b/sys-libs/libselinux/libselinux-2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby23"
 
 # No, I am not calling ruby-ng
 inherit multilib python-r1 toolchain-funcs multilib-minimal
@@ -27,7 +27,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby23"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
@@ -35,7 +35,6 @@ RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
 	pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
-		ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 	)
 	elibc_musl? ( sys-libs/fts-standalone )"

diff --git a/sys-libs/libselinux/libselinux-2.7.ebuild b/sys-libs/libselinux/libselinux-2.7.ebuild
index 7e29e76..a322103 100644
--- a/sys-libs/libselinux/libselinux-2.7.ebuild
+++ b/sys-libs/libselinux/libselinux-2.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby23"
 
 # No, I am not calling ruby-ng
 inherit multilib python-r1 toolchain-funcs multilib-minimal
@@ -27,7 +27,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby23"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
@@ -35,7 +35,6 @@ RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
 	pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
-		ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 	)
 	elibc_musl? ( sys-libs/fts-standalone )"


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/musl:master commit in: sys-libs/libselinux/
@ 2021-02-10 20:18 Sam James
  0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2021-02-10 20:18 UTC (permalink / raw
  To: gentoo-commits

commit:     7e2bd8c8549b0f90e3f356a1056fb5aaddbe77ba
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 20:18:12 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 20:18:12 2021 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=7e2bd8c8

sys-libs/libselinux: fix PYTHON_COMPAT

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/libselinux/libselinux-2.6.ebuild | 4 ++--
 sys-libs/libselinux/libselinux-2.7.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-libs/libselinux/libselinux-2.6.ebuild b/sys-libs/libselinux/libselinux-2.6.ebuild
index a905262..1a22ba6 100644
--- a/sys-libs/libselinux/libselinux-2.6.ebuild
+++ b/sys-libs/libselinux/libselinux-2.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 USE_RUBY="ruby23"
 
 # No, I am not calling ruby-ng

diff --git a/sys-libs/libselinux/libselinux-2.7.ebuild b/sys-libs/libselinux/libselinux-2.7.ebuild
index 19d5a06..3a7dc58 100644
--- a/sys-libs/libselinux/libselinux-2.7.ebuild
+++ b/sys-libs/libselinux/libselinux-2.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 USE_RUBY="ruby23"
 
 # No, I am not calling ruby-ng


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2021-02-10 20:18 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-28 18:20 [gentoo-commits] proj/musl:master commit in: sys-libs/libselinux/ Aric Belsito
  -- strict thread matches above, loose matches on Subject: below --
2021-02-10 20:18 Sam James
2018-04-27 13:12 Anthony G. Basile
2017-11-14 18:08 Aric Belsito
2017-11-13 21:23 Aric Belsito
2017-09-03 21:18 Anthony G. Basile
2017-08-07 17:49 Aric Belsito
2017-07-22 15:57 Aric Belsito
2017-07-09 17:31 Aric Belsito
2017-01-15 21:46 Aric Belsito

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox