commit: 07dec6294e18a9d175648e34b6965899f4c487ed
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Jun 13 17:19:48 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Tue Jun 13 17:19:48 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=07dec629
sys-libs/libselinux: version bump to 2.7_rc1
sys-libs/libselinux/Manifest | 5 +++-
.../files/libselinux-2.7-fts_ldlibs.patch | 12 +++++++++
sys-libs/libselinux/libselinux-2.6.ebuild | 3 +--
...elinux-2.6.ebuild => libselinux-2.7_rc1.ebuild} | 30 +++++++++++-----------
4 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 023a969..3892acf 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,4 +1,7 @@
AUX libselinux-2.6-0007-build-related-fixes-bug-500674.patch 3580 SHA256
a9803f0f0876b12d909aa16da3968f80ed44fd56a59e2737df6196097ea59c4d SHA512
51c3b1bc1541b8b97ef7a25b01740cc6d05ee7bf7f6264e1f5d78e4fba02c957d48c437826d797354f295a92e53f51957e3e8c68d7ea1ba1113458c0b964ea23
WHIRLPOOL
b8bf31c73401950afd7b11e57746399b214fb77cd8a1c3cc853d86c95f30665941e736782fd625b37af976c905cd467f9304c8c115ee541bd896edd8e1cec4df
+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
-EBUILD libselinux-2.6.ebuild 4442 SHA256
a3b6ef729d94d8fcbbf63cfae9afedc805e92b7e06d57c157e62c71b01a72259 SHA512
de6ae67995c2782cdc5698b88a6beca6f0474aec67da5b73f36e2f4af3b488751d39ab17422b11f15af1a70671154325ab4f531cd14208dbfe3c2418fbc17885
WHIRLPOOL
ba1a3aba1617eb3e4b4d6058602f5d0c1f16192fd45b4193f7b9f790633037f6ff8323e768f1a2c711dad805124da70a1afeb4d2b2b2fead4b8b3273941bc0c7
+DIST libselinux-2.7-rc1.tar.gz 186897 SHA256
213e1ca473855a61e8147e027b6ee5edf4162c9fbfc00749643f0ecc0a08371c SHA512
fe7fe67f14e5483fbb237eeb33f6eca48f1d3f6a3ab7fa1cfa99e5143ce4d6a03c9033a03a82bb3954d07c4d1a2c211cf5dea80030c727f9adcb3cc6bd72e641
WHIRLPOOL
dfee20eaf3ea9e3cb7caa21ac10e710799ed324eee833650fc0bdf17c3fbcd3426bea7d915f6d6b79ca4440b99c57805a018bbd6a6103d97cb590f52d58f0e40
+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
MISC metadata.xml 676 SHA256
288211da34dc4cabaeaa85c52462c3ad2792347abbf88f78eae812a4e3dc8c8c SHA512
7b33e0d113637a129a7894d8720feb9024d67466b86d475fbc3398f514b2ecc28c70dc759952376208d2022a00658eb120fc3561edbb9c7ecdc4404bed5f57a7
WHIRLPOOL
bd4938862e3ec119c1da448d5bc8c99a6063704a65c8a906514f5160adf65851af64c6a1c4626e97438e9f4a7288ef002b06a876b9d73e67d70e38ca31cc1319
diff --git a/sys-libs/libselinux/files/libselinux-2.7-fts_ldlibs.patch
b/sys-libs/libselinux/files/libselinux-2.7-fts_ldlibs.patch
new file mode 100644
index 0000000..778276a
--- /dev/null
+++ b/sys-libs/libselinux/files/libselinux-2.7-fts_ldlibs.patch
@@ -0,0 +1,12 @@
+diff -Naur libselinux-2.7-rc1.orig/src/Makefile libselinux-2.7-rc1/src/Makefile
+--- libselinux-2.7-rc1.orig/src/Makefile 2017-06-13 10:16:48.664402029
-0700
++++ libselinux-2.7-rc1/src/Makefile 2017-06-13 10:18:01.124009953 -0700
+@@ -144,7 +144,7 @@
+ $(RANLIB) $@
+
+ $(LIBSO): $(LOBJS)
+- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ $(PCRE_LDLIBS) -ldl
-Wl,$(LD_SONAME_FLAGS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ $(PCRE_LDLIBS)
$(FTS_LDLIBS) -ldl -Wl,$(LD_SONAME_FLAGS)
+ ln -sf $@ $(TARGET)
+
+ $(LIBPC): $(LIBPC).in ../VERSION
diff --git a/sys-libs/libselinux/libselinux-2.6.ebuild
b/sys-libs/libselinux/libselinux-2.6.ebuild
index 33b9bbf..741579c 100644
--- a/sys-libs/libselinux/libselinux-2.6.ebuild
+++ b/sys-libs/libselinux/libselinux-2.6.ebuild
@@ -1,6 +1,5 @@
# 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 python3_6 )
@@ -28,8 +27,8 @@ 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}]
)
diff --git a/sys-libs/libselinux/libselinux-2.6.ebuild
b/sys-libs/libselinux/libselinux-2.7_rc1.ebuild
similarity index 86%
copy from sys-libs/libselinux/libselinux-2.6.ebuild
copy to sys-libs/libselinux/libselinux-2.7_rc1.ebuild
index 33b9bbf..8ca0dfb 100644
--- a/sys-libs/libselinux/libselinux-2.6.ebuild
+++ b/sys-libs/libselinux/libselinux-2.7_rc1.ebuild
@@ -1,6 +1,5 @@
# 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 python3_6 )
@@ -11,7 +10,7 @@ inherit multilib python-r1 toolchain-funcs multilib-minimal
MY_P="${P//_/-}"
SEPOL_VER="${PV}"
-MY_RELEASEDATE="20161014"
+MY_RELEASEDATE="20170609"
DESCRIPTION="SELinux userland library"
HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki";
@@ -22,14 +21,14 @@ 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_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}]
)
@@ -48,7 +47,7 @@ DEPEND="${RDEPEND}
src_prepare() {
if [[ ${PV} != 9999 ]] ; then
# If needed for live builds, place them in /etc/portage/patches
- eapply
"${FILESDIR}/libselinux-2.6-0007-build-related-fixes-bug-500674.patch"
+ eapply "${FILESDIR}/libselinux-2.7-fts_ldlibs.patch"
fi
eapply_user
@@ -64,16 +63,14 @@ multilib_src_compile() {
SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
USE_PCRE2="$(usex pcre2 y n)" \
- FTS_LDFLAGS="$(usex elibc_musl '-lfts' '')" \
+ FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
all
if multilib_is_native_abi && use python; then
building() {
- python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
emake \
- PYINC="-I${PYTHON_INCLUDEDIR}" \
LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
- FTS_LDFLAGS="$(usex elibc_musl '-lfts' '')" \
+ FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
LIBDIR="\$(PREFIX)/$(get_libdir)" \
SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
USE_PCRE2="$(usex pcre2 y n)" \
@@ -90,7 +87,7 @@ multilib_src_compile() {
emake \
RUBY=${1} \
LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
- FTS_LDFLAGS="$(usex elibc_musl '-lfts' '')" \
+ FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
LIBDIR="\$(PREFIX)/$(get_libdir)" \
SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
USE_PCRE2="$(usex pcre2 y n)" \
@@ -105,16 +102,18 @@ multilib_src_compile() {
}
multilib_src_install() {
- emake DESTDIR="${D}" \
- LIBDIR="\$(PREFIX)/$(get_libdir)" \
- SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
- USE_PCRE2="$(usex pcre2 y n)" \
- 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
@@ -129,6 +128,7 @@ multilib_src_install() {
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
