New upstream SELinux utilities release

(Portage version: 2.1.11.9/cvs/Linux x86_64)

5 files changed, 228 insertions, 1 deletions

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index 3750aa8b961c..efc17d946d4b 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/libselinux
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.86 2012/10/06 16:36:49 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.87 2012/10/09 20:00:12 swift Exp $
+
+*libselinux-2.1.12 (09 Oct 2012)
+*libselinux-2.1.9-r3 (09 Oct 2012)
+
+  09 Oct 2012; <swift@gentoo.org> +libselinux-2.1.9-r3.ebuild,
+  +files/libselinux-2.1.9-support_ruby19.patch, +libselinux-2.1.12.ebuild,
+  +files/libselinux-2.1.12-mountsys.patch:
+  Introducing upstream version and fix for ruby19
 
   06 Oct 2012; <swift@gentoo.org> libselinux-2.1.9-r2.ebuild:
   Stabilize
diff --git a/sys-libs/libselinux/files/libselinux-2.1.12-mountsys.patch b/sys-libs/libselinux/files/libselinux-2.1.12-mountsys.patch
new file mode 100644
index 000000000000..625ccfb60804
--- /dev/null
+++ b/sys-libs/libselinux/files/libselinux-2.1.12-mountsys.patch
@@ -0,0 +1,22 @@
+diff -ur libselinux-2.1.12.orig/src/load_policy.c libselinux-2.1.12/src/load_policy.c
+--- libselinux-2.1.12.orig/src/load_policy.c	2012-09-29 09:32:18.374170451 +0200
++++ libselinux-2.1.12/src/load_policy.c	2012-09-29 09:34:05.130172917 +0200
+@@ -370,8 +370,16 @@
+ 	 * mount it if present for use in the calls below.  
+ 	 */
+ 	const char *mntpoint = NULL;
+-	if (mount(SELINUXFS, SELINUXMNT, SELINUXFS, 0, 0) == 0 || errno == EBUSY) {
+-		mntpoint = SELINUXMNT;
++	/* First make sure /sys is mounted */
++	if (mount("sysfs", "/sys", "sysfs", 0, 0) == 0 || errno == EBUSY) {
++		if (mount(SELINUXFS, SELINUXMNT, SELINUXFS, 0, 0) == 0 || errno == EBUSY) {
++			mntpoint = SELINUXMNT;
++		} else {
++			/* check old mountpoint */
++			if (mount(SELINUXFS, OLDSELINUXMNT, SELINUXFS, 0, 0) == 0 || errno == EBUSY) {
++				mntpoint = OLDSELINUXMNT;
++			}
++		}
+ 	} else {
+ 		/* check old mountpoint */
+ 		if (mount(SELINUXFS, OLDSELINUXMNT, SELINUXFS, 0, 0) == 0 || errno == EBUSY) {
diff --git a/sys-libs/libselinux/files/libselinux-2.1.9-support_ruby19.patch b/sys-libs/libselinux/files/libselinux-2.1.9-support_ruby19.patch
new file mode 100644
index 000000000000..02ee2b39bc7f
--- /dev/null
+++ b/sys-libs/libselinux/files/libselinux-2.1.9-support_ruby19.patch
@@ -0,0 +1,12 @@
+diff -ur libselinux-2.1.9.orig/src/Makefile libselinux-2.1.9/src/Makefile
+--- libselinux-2.1.9.orig/src/Makefile	2012-10-06 21:11:43.140757973 +0200
++++ libselinux-2.1.9/src/Makefile	2012-10-06 21:12:54.896758126 +0200
+@@ -15,7 +15,7 @@
+ PYLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
+ RUBYLIBVER ?= $(shell ruby -e 'print RUBY_VERSION.split(".")[0..1].join(".")')
+ RUBYPLATFORM ?= $(shell ruby -e 'print RUBY_PLATFORM')
+-RUBYINC ?= $(LIBDIR)/ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
++RUBYINC ?= $(shell pkg-config --cflags ruby-$(RUBYLIBVER))
+ RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
+ LIBBASE=$(shell basename $(LIBDIR))
+ 
diff --git a/sys-libs/libselinux/libselinux-2.1.12.ebuild b/sys-libs/libselinux/libselinux-2.1.12.ebuild
new file mode 100644
index 000000000000..144eb08e51f7
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-2.1.12.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.1.12.ebuild,v 1.1 2012/10/09 20:00:12 swift Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.5 *-jython *-pypy-*"
+
+inherit multilib python toolchain-funcs eutils
+
+SEPOL_VER="2.1.8"
+
+DESCRIPTION="SELinux userland library"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20120924/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python ruby"
+
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}
+	>=dev-libs/libpcre-8.30-r2
+	ruby? ( dev-lang/ruby )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	ruby? ( dev-lang/swig )
+	python? ( dev-lang/swig )"
+
+S="${WORKDIR}/${P}"
+
+pkg_setup() {
+	if use python; then
+		python_pkg_setup
+	fi
+}
+
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	# fix up paths for multilib
+	sed -i \
+		-e "/^LIBDIR/s/lib/$(get_libdir)/" \
+		-e "/^SHLIBDIR/s/lib/$(get_libdir)/" \
+		src/Makefile utils/Makefile || die
+	epatch "${FILESDIR}/${P}-mountsys.patch"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)" LDFLAGS="-fPIC $(pkg-config --libs libpcre) ${LDFLAGS}" all || die
+
+	if use python; then
+		python_copy_sources src
+		building() {
+			emake CC="$(tc-getCC)" PYINC="-I$(python_get_includedir)" PYTHONLIBDIR="$(python_get_library -l)" PYPREFIX="python-$(python_get_version)" LDFLAGS="-fPIC $(pkg-config --libs libpcre) ${LDFLAGS}" pywrap
+		}
+		python_execute_function -s --source-dir src building
+	fi
+
+	if use ruby; then
+		emake CC="$(tc-getCC)" rubywrap || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	if use python; then
+		installation() {
+			emake DESTDIR="${D}" PYLIBVER="python$(python_get_version)" PYPREFIX="python-$(python_get_version)" install-pywrap
+		}
+		python_execute_function -s --source-dir src installation
+	fi
+
+	if use ruby; then
+		emake DESTDIR="${D}" install-rubywrap || die
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize selinux
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup selinux
+	fi
+}
diff --git a/sys-libs/libselinux/libselinux-2.1.9-r3.ebuild b/sys-libs/libselinux/libselinux-2.1.9-r3.ebuild
new file mode 100644
index 000000000000..f456ac1951df
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-2.1.9-r3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.1.9-r3.ebuild,v 1.1 2012/10/09 20:00:12 swift Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.5 *-jython *-pypy-*"
+
+inherit multilib python toolchain-funcs eutils
+
+SEPOL_VER="2.1.4"
+
+DESCRIPTION="SELinux userland library"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20120216/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python ruby"
+
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}
+	ruby? ( dev-lang/ruby )"
+DEPEND="${RDEPEND}
+	ruby? ( dev-lang/swig )
+	python? ( dev-lang/swig )"
+
+S="${WORKDIR}/${P}"
+
+pkg_setup() {
+	if use python; then
+		python_pkg_setup
+	fi
+}
+
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	# fix up paths for multilib
+	sed -i \
+		-e "/^LIBDIR/s/lib/$(get_libdir)/" \
+		-e "/^SHLIBDIR/s/lib/$(get_libdir)/" \
+		src/Makefile utils/Makefile || die
+	epatch "${FILESDIR}/${P}-mountsys.patch"
+	epatch "${FILESDIR}/${P}-support_ruby19.patch"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)" LDFLAGS="-fPIC ${LDFLAGS}" all || die
+
+	if use python; then
+		python_copy_sources src
+		building() {
+			emake CC="$(tc-getCC)" PYINC="-I$(python_get_includedir)" PYTHONLIBDIR="$(python_get_library -l)" PYPREFIX="python-$(python_get_version)" LDFLAGS="-fPIC ${LDFLAGS}" pywrap
+		}
+		python_execute_function -s --source-dir src building
+	fi
+
+	if use ruby; then
+		emake CC="$(tc-getCC)" rubywrap || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	if use python; then
+		installation() {
+			emake DESTDIR="${D}" PYLIBVER="python$(python_get_version)" PYPREFIX="python-$(python_get_version)" install-pywrap
+		}
+		python_execute_function -s --source-dir src installation
+	fi
+
+	if use ruby; then
+		emake DESTDIR="${D}" install-rubywrap || die
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize selinux
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup selinux
+	fi
+}