Fix bug #516608 - Keep pcre version at hand with binary compiled expressions (segfault with setfiles)

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2EDD52403B68AF47)

2 files changed, 150 insertions, 1 deletions

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index 2ac4b2b1670d..359777651bbe 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libselinux
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.124 2014/06/18 20:50:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.125 2014/07/09 18:16:31 swift Exp $
+
+*libselinux-2.3-r1 (09 Jul 2014)
+
+  09 Jul 2014; Sven Vermeulen <swift@gentoo.org> +libselinux-2.3-r1.ebuild:
+  Fix bug #516608 (segfault with setfiles)
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> libselinux-2.3.ebuild:
   Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
diff --git a/sys-libs/libselinux/libselinux-2.3-r1.ebuild b/sys-libs/libselinux/libselinux-2.3-r1.ebuild
new file mode 100644
index 000000000000..e9144efb8106
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-2.3-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.3-r1.ebuild,v 1.1 2014/07/09 18:16:31 swift Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
+USE_RUBY="ruby19 ruby20"
+
+PATCHBUNDLE="4"
+
+# No, I am not calling ruby-ng
+inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
+
+MY_P="${P//_/-}"
+
+SEPOL_VER="2.3"
+
+DESCRIPTION="SELinux userland library"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20140506/${MY_P}.tar.gz
+	http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PATCHBUNDLE}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="python ruby static-libs ruby_targets_ruby19 ruby_targets_ruby20"
+
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
+	>=dev-libs/libpcre-8.33-r1[static-libs?,${MULTILIB_USEDEP}]
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+		ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-lang/swig-2.0.9 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	EPATCH_MULTI_MSG="Applying libselinux patches ... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	epatch_user
+
+	multilib_copy_sources
+}
+
+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}
+
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
+		LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
+		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" \
+				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
+			test -f src/selinuxswig_ruby_wrap.lo && rm src/selinuxswig_ruby_wrap.lo
+			emake \
+				CC="$(tc-getCC)" \
+				RUBY=${1} \
+				RUBYINSTALL=$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]') \
+				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
+				rubywrap
+		}
+		for RUBYTARGET in ${USE_RUBY}; do
+			use ruby_targets_${RUBYTARGET} || continue
+
+			building ${RUBYTARGET}
+		done
+	fi
+}
+
+multilib_src_install() {
+	LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
+		emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use python; then
+		installation() {
+			LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" install-pywrap
+		}
+		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
+			LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" \
+				RUBY=${1} \
+				RUBYINSTALL="${D}/$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]')" \
+				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
+}
+
+pkg_postinst() {
+	# Fix bug 473502
+	for POLTYPE in ${POLICY_TYPES};
+	do
+		mkdir -p /etc/selinux/${POLTYPE}/contexts/files
+		touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local
+		# Fix bug 516608
+		for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do
+			sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE};
+		done
+	done
+}