commit: d2e6a0825a951d92abe34fa7703ba89057eae912 Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> AuthorDate: Sat Oct 1 03:26:58 2016 +0000 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> CommitDate: Mon Oct 3 07:02:28 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2e6a082
sys-libs/libselinux: bump to 2.6-rc1 Package-Manager: portage-2.3.0 sys-libs/libselinux/Manifest | 1 + ...2.6-0005-use-ruby-include-with-rubylibver.patch | 39 ++++++++++ ...x-2.6-0007-build-related-fixes-bug-500674.patch | 91 ++++++++++++++++++++++ ...linux-9999.ebuild => libselinux-2.6_rc1.ebuild} | 45 +++++------ sys-libs/libselinux/libselinux-9999.ebuild | 45 +++++------ sys-libs/libselinux/metadata.xml | 3 + 6 files changed, 180 insertions(+), 44 deletions(-) diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest index 81ff468..c2a779e 100644 --- a/sys-libs/libselinux/Manifest +++ b/sys-libs/libselinux/Manifest @@ -1 +1,2 @@ DIST libselinux-2.5.tar.gz 189019 SHA256 94c9e97706280bedcc288f784f67f2b9d3d6136c192b2c9f812115edba58514f SHA512 1c6718aa6fa05c8635427cd6f5a89ce47fb6bb9bd2fec417293122826695d1ebb0e0b86e83711abb5c4fe71c67dce6f2e18745592833d1711f0ab2d01246b8c7 WHIRLPOOL 96192b856d32a82b9b4413137085e69ad52cbf2e0d274603a90d904e9a318a80c83f337aef26f54c685a689972432955f0f9de67949e0bb4f844611df22d3589 +DIST libselinux-2.6-rc1.tar.gz 203034 SHA256 4ef2bbb1bdb1d0c43ed14b237066364b07bd1d2ae0a16dcd475bbf7793723928 SHA512 72a8a1d244fea3902cecff69fda48c1bc8d7ce1789902126565272782105bd43205e517af8a4cac5cc5cab47c48f0cd3b287c42a408ae3889b51b19b0b38632b WHIRLPOOL b9012b74a3f073e25b63d83003194f23f7177cdd0e33443de87ff7491e0ecffa72eea07be04247cafd3045773427dbf98f592e02346c8fa32bc161be624cc2b4 diff --git a/sys-libs/libselinux/files/libselinux-2.6-0005-use-ruby-include-with-rubylibver.patch b/sys-libs/libselinux/files/libselinux-2.6-0005-use-ruby-include-with-rubylibver.patch new file mode 100644 index 00000000..a2f704d --- /dev/null +++ b/sys-libs/libselinux/files/libselinux-2.6-0005-use-ruby-include-with-rubylibver.patch @@ -0,0 +1,39 @@ +From 024a8628e698e8c90f7876a35c820f30c6957031 Mon Sep 17 00:00:00 2001 +From: Jason Zaman <[email protected]> +Date: Sun, 2 Oct 2016 02:06:35 +0800 +Subject: [PATCH] libselinux: versioned ruby pkg-config and query vendorarchdir + properly + +Gentoo and Arch have pkg-config entries for "ruby-$(RUBYLIBVER)" but not +for "ruby". Check if that exists first then fall back to plain ruby if +it does not. + +The ruby install paths were incorrect. Fedora 20 installed to +/usr/lib64/ruby/vendor_ruby/, Arch needs it to be vendor_ruby as well, +site_ruby does not work. Thanks to Nicolas Iooss for the correct way to +query for the path. + +Signed-off-by: Jason Zaman <[email protected]> +--- + libselinux/src/Makefile | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile +index 7169230..f9e3de1 100644 +--- libselinux/src/Makefile ++++ libselinux/src/Makefile +@@ -16,9 +16,8 @@ PYLIBVER ?= $(shell $(PYTHON) -c 'import sys;print("python%d.%d" % sys.version_i + PYINC ?= $(shell $(PKG_CONFIG) --cflags $(PYPREFIX)) + PYLIBDIR ?= $(LIBDIR)/$(PYLIBVER) + RUBYLIBVER ?= $(shell $(RUBY) -e 'print RUBY_VERSION.split(".")[0..1].join(".")') +-RUBYPLATFORM ?= $(shell $(RUBY) -e 'print RUBY_PLATFORM') +-RUBYINC ?= $(shell $(PKG_CONFIG) --cflags ruby) +-RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM) ++RUBYINC ?= $(shell $(PKG_CONFIG) --exists ruby-$(RUBYLIBVER) && $(PKG_CONFIG) --cflags ruby-$(RUBYLIBVER) || $(PKG_CONFIG) --cflags ruby) ++RUBYINSTALL ?= $(DESTDIR)$(shell $(RUBY) -e 'puts RbConfig::CONFIG["vendorarchdir"]') + LIBBASE ?= $(shell basename $(LIBDIR)) + + VERSION = $(shell cat ../VERSION) +-- +2.7.3 + diff --git a/sys-libs/libselinux/files/libselinux-2.6-0007-build-related-fixes-bug-500674.patch b/sys-libs/libselinux/files/libselinux-2.6-0007-build-related-fixes-bug-500674.patch new file mode 100644 index 00000000..83596e8 --- /dev/null +++ b/sys-libs/libselinux/files/libselinux-2.6-0007-build-related-fixes-bug-500674.patch @@ -0,0 +1,91 @@ +https://bugs.gentoo.org/500674 + +random fixes: +- make sure PCRE_CFLAGS get used +- use PCRE_LIBS via pkg-config +- move LDFLAGS to before objects, not after +- do not hardcode -L$(LIBDIR) (let the toolchain handle it) +- do not hardcode -I$(INCLUDEDIR) (let the toolchain handle it) + +diff --git a/libselinux/Makefile b/libselinux/Makefile +index baa0db3..4dc5aa0 100644 +--- libselinux/Makefile ++++ libselinux/Makefile +@@ -1,5 +1,6 @@ + SUBDIRS = src include utils man + ++PKG_CONFIG ?= pkg-config + DISABLE_SETRANS ?= n + DISABLE_RPM ?= n + ANDROID_HOST ?= n +@@ -20,10 +21,11 @@ export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS ANDROID_HOST + + USE_PCRE2 ?= n + ifeq ($(USE_PCRE2),y) +- PCRE_CFLAGS := -DUSE_PCRE2 -DPCRE2_CODE_UNIT_WIDTH=8 +- PCRE_LDFLAGS := -lpcre2-8 ++ PCRE_CFLAGS := -DUSE_PCRE2 -DPCRE2_CODE_UNIT_WIDTH=8 $(shell $(PKG_CONFIG) --cflags libpcre2-8) ++ PCRE_LDFLAGS := $(shell $(PKG_CONFIG) --libs libpcre2-8) + else +- PCRE_LDFLAGS := -lpcre ++ PCRE_CFLAGS := $(shell $(PKG_CONFIG) --cflags libpcre) ++ PCRE_LDFLAGS := $(shell $(PKG_CONFIG) --libs libpcre) + endif + export PCRE_CFLAGS PCRE_LDFLAGS + +diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile +index 13501cd..42cb2f6 100644 +--- libselinux/src/Makefile ++++ libselinux/src/Makefile +@@ -67,7 +67,7 @@ CFLAGS ?= -O -Wall -W -Wundef -Wformat-y2k -Wformat-security -Winit-self -Wmissi + + PCRE_LDFLAGS ?= -lpcre + +-override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) ++override CFLAGS += -I../include -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) + + SWIG_CFLAGS += -Wno-error -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-parameter \ + -Wno-shadow -Wno-uninitialized -Wno-missing-prototypes -Wno-missing-declarations +@@ -107,17 +107,17 @@ $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT) + $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $< + + $(SWIGSO): $(SWIGLOBJ) +- $(CC) $(CFLAGS) -shared -o $@ $< -L. -lselinux $(LDFLAGS) -L$(LIBDIR) ++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux + + $(SWIGRUBYSO): $(SWIGRUBYLOBJ) +- $(CC) $(CFLAGS) -shared -o $@ $^ -L. -lselinux $(LDFLAGS) -L$(LIBDIR) ++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux + + $(LIBA): $(OBJS) + $(AR) rcs $@ $^ + $(RANLIB) $@ + + $(LIBSO): $(LOBJS) +- $(CC) $(CFLAGS) -shared -o $@ $^ $(PCRE_LDFLAGS) -ldl $(LDFLAGS) -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro ++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ $(PCRE_LDFLAGS) -ldl -Wl,-soname,$(LIBSO),-z,defs,-z,relro + ln -sf $@ $(TARGET) + + $(LIBPC): $(LIBPC).in ../VERSION +@@ -130,7 +130,7 @@ $(AUDIT2WHYLOBJ): audit2why.c + $(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $< + + $(AUDIT2WHYSO): $(AUDIT2WHYLOBJ) +- $(CC) $(CFLAGS) -shared -o $@ $^ -L. $(LDFLAGS) -lselinux $(LIBDIR)/libsepol.a -L$(LIBDIR) ++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LIBDIR)/libsepol.a + + %.o: %.c policy.h + $(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $< +diff --git a/libselinux/utils/Makefile b/libselinux/utils/Makefile +index e56a953..6fd205a 100644 +--- libselinux/utils/Makefile ++++ libselinux/utils/Makefile +@@ -25,7 +25,7 @@ CFLAGS ?= -O -Wall -W -Wundef -Wformat-y2k -Wformat-security -Winit-self -Wmissi + -fipa-pure-const -Wno-suggest-attribute=pure -Wno-suggest-attribute=const \ + -Werror -Wno-aggregate-return -Wno-redundant-decls + override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) +-LDLIBS += -L../src -lselinux -L$(LIBDIR) ++LDLIBS += -L../src -lselinux + PCRE_LDFLAGS ?= -lpcre + + ifeq ($(ANDROID_HOST),y) diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-2.6_rc1.ebuild similarity index 75% copy from sys-libs/libselinux/libselinux-9999.ebuild copy to sys-libs/libselinux/libselinux-2.6_rc1.ebuild index 54de3c9..84092cb 100644 --- a/sys-libs/libselinux/libselinux-9999.ebuild +++ b/sys-libs/libselinux/libselinux-2.6_rc1.ebuild @@ -11,7 +11,7 @@ inherit multilib python-r1 toolchain-funcs multilib-minimal MY_P="${P//_/-}" SEPOL_VER="${PV}" -MY_RELEASEDATE="20160223" +MY_RELEASEDATE="20160930" DESCRIPTION="SELinux userland library" HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"; @@ -29,10 +29,11 @@ fi LICENSE="public-domain" SLOT="0" -IUSE="python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23" +IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23" -RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}] - >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] +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 ) @@ -46,8 +47,8 @@ DEPEND="${RDEPEND} src_prepare() { if [[ ${PV} != 9999 ]] ; then # If needed for live builds, place them in /etc/portage/patches - eapply "${FILESDIR}/0005-use-ruby-include-with-rubylibver.patch" - eapply "${FILESDIR}/0007-build-related-fixes-bug-500674-for-2.5.patch" + eapply "${FILESDIR}/libselinux-2.6-0005-use-ruby-include-with-rubylibver.patch" + eapply "${FILESDIR}/libselinux-2.6-0007-build-related-fixes-bug-500674.patch" fi eapply_user @@ -56,30 +57,24 @@ src_prepare() { } multilib_src_compile() { - tc-export PKG_CONFIG RANLIB - local PCRE_CFLAGS=$(${PKG_CONFIG} libpcre --cflags) - local PCRE_LIBS=$(${PKG_CONFIG} libpcre --libs) - export PCRE_{CFLAGS,LIBS} + tc-export AR CC PKG_CONFIG RANLIB emake \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ LDFLAGS="-fPIC ${LDFLAGS} -pthread" \ + USE_PCRE2="$(usex pcre2 y n)" \ all if multilib_is_native_abi && use python; then building() { python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH emake \ - CC="$(tc-getCC)" \ PYINC="-I${PYTHON_INCLUDEDIR}" \ - PYTHONLIBDIR="${PYTHON_LIBPATH}" \ - PYPREFIX="${EPYTHON##*/}" \ LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ + USE_PCRE2="$(usex pcre2 y n)" \ pywrap } python_foreach_impl building @@ -91,12 +86,11 @@ multilib_src_compile() { # Clean up .lo file to force rebuild rm -f src/selinuxswig_ruby_wrap.lo || die emake \ - CC="$(tc-getCC)" \ RUBY=${1} \ - RUBYINSTALL=$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]') \ LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ + USE_PCRE2="$(usex pcre2 y n)" \ rubywrap } for RUBYTARGET in ${USE_RUBY}; do @@ -108,12 +102,18 @@ multilib_src_compile() { } multilib_src_install() { - LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ - emake DESTDIR="${D}" install + emake DESTDIR="${D}" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ + USE_PCRE2="$(usex pcre2 y n)" \ + install if multilib_is_native_abi && use python; then installation() { - LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" install-pywrap + emake DESTDIR="${D}" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + USE_PCRE2="$(usex pcre2 y n)" \ + install-pywrap python_optimize # bug 531638 } python_foreach_impl installation @@ -124,9 +124,10 @@ multilib_src_install() { 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 - LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" \ + emake DESTDIR="${D}" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ RUBY=${1} \ - RUBYINSTALL="${D}/$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]')" \ + USE_PCRE2="$(usex pcre2 y n)" \ install-rubywrap } for RUBYTARGET in ${USE_RUBY}; do diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild index 54de3c9..84092cb 100644 --- a/sys-libs/libselinux/libselinux-9999.ebuild +++ b/sys-libs/libselinux/libselinux-9999.ebuild @@ -11,7 +11,7 @@ inherit multilib python-r1 toolchain-funcs multilib-minimal MY_P="${P//_/-}" SEPOL_VER="${PV}" -MY_RELEASEDATE="20160223" +MY_RELEASEDATE="20160930" DESCRIPTION="SELinux userland library" HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"; @@ -29,10 +29,11 @@ fi LICENSE="public-domain" SLOT="0" -IUSE="python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23" +IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23" -RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}] - >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] +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 ) @@ -46,8 +47,8 @@ DEPEND="${RDEPEND} src_prepare() { if [[ ${PV} != 9999 ]] ; then # If needed for live builds, place them in /etc/portage/patches - eapply "${FILESDIR}/0005-use-ruby-include-with-rubylibver.patch" - eapply "${FILESDIR}/0007-build-related-fixes-bug-500674-for-2.5.patch" + eapply "${FILESDIR}/libselinux-2.6-0005-use-ruby-include-with-rubylibver.patch" + eapply "${FILESDIR}/libselinux-2.6-0007-build-related-fixes-bug-500674.patch" fi eapply_user @@ -56,30 +57,24 @@ src_prepare() { } multilib_src_compile() { - tc-export PKG_CONFIG RANLIB - local PCRE_CFLAGS=$(${PKG_CONFIG} libpcre --cflags) - local PCRE_LIBS=$(${PKG_CONFIG} libpcre --libs) - export PCRE_{CFLAGS,LIBS} + tc-export AR CC PKG_CONFIG RANLIB emake \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ LDFLAGS="-fPIC ${LDFLAGS} -pthread" \ + USE_PCRE2="$(usex pcre2 y n)" \ all if multilib_is_native_abi && use python; then building() { python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH emake \ - CC="$(tc-getCC)" \ PYINC="-I${PYTHON_INCLUDEDIR}" \ - PYTHONLIBDIR="${PYTHON_LIBPATH}" \ - PYPREFIX="${EPYTHON##*/}" \ LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ + USE_PCRE2="$(usex pcre2 y n)" \ pywrap } python_foreach_impl building @@ -91,12 +86,11 @@ multilib_src_compile() { # Clean up .lo file to force rebuild rm -f src/selinuxswig_ruby_wrap.lo || die emake \ - CC="$(tc-getCC)" \ RUBY=${1} \ - RUBYINSTALL=$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]') \ LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ + USE_PCRE2="$(usex pcre2 y n)" \ rubywrap } for RUBYTARGET in ${USE_RUBY}; do @@ -108,12 +102,18 @@ multilib_src_compile() { } multilib_src_install() { - LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ - emake DESTDIR="${D}" install + emake DESTDIR="${D}" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ + USE_PCRE2="$(usex pcre2 y n)" \ + install if multilib_is_native_abi && use python; then installation() { - LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" install-pywrap + emake DESTDIR="${D}" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + USE_PCRE2="$(usex pcre2 y n)" \ + install-pywrap python_optimize # bug 531638 } python_foreach_impl installation @@ -124,9 +124,10 @@ multilib_src_install() { 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 - LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" \ + emake DESTDIR="${D}" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ RUBY=${1} \ - RUBYINSTALL="${D}/$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]')" \ + USE_PCRE2="$(usex pcre2 y n)" \ install-rubywrap } for RUBYTARGET in ${USE_RUBY}; do diff --git a/sys-libs/libselinux/metadata.xml b/sys-libs/libselinux/metadata.xml index 932a69e..0f6264f 100644 --- a/sys-libs/libselinux/metadata.xml +++ b/sys-libs/libselinux/metadata.xml @@ -10,6 +10,9 @@ process and file security contexts and to obtain security policy decisions. Required for any applications that use the SELinux API. </longdescription> + <use> + <flag name="pcre2">Use <pkg>sys-libs/pcre2</pkg> for fcontext regexes</flag> + </use> <upstream> <remote-id type="github">SELinuxProject/selinux</remote-id> </upstream>
