Fix bug #516608 - Backport pcre version fix from libselinux-2.3

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

3 files changed, 28 insertions, 58 deletions

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index 359777651bbe..4e432d1744cb 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,9 @@
 # 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.125 2014/07/09 18:16:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.126 2014/07/09 19:29:44 swift Exp $
+
+  09 Jul 2014; Sven Vermeulen <swift@gentoo.org> libselinux-2.2.2-r5.ebuild:
+  Fix bug #516608 - Backport pcre version fix from libselinux-2.3
 
 *libselinux-2.3-r1 (09 Jul 2014)
 
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 7ffdcb9ffa77..f67237438c06 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -5,31 +5,32 @@ DIST libselinux-2.2.2.tar.gz 171013 SHA256 30ab363416806da907b86b97f1d31c252473e
 DIST libselinux-2.3-rc1.tar.gz 171271 SHA256 154dcee626a30c7a8a1083ea209c77336310517607d9ebd22d95bd5a462e2123 SHA512 3bd86207e257531006c273d374829f674fb63153919eb551ef074ff8b6e6280b23fde7776996ef8896b04c1ffe032ad7e7a0fd0651d9ff025fb8c51fe31bf867 WHIRLPOOL 0deeda057923ac20d8d521b1ffba90ed3854c270bc472df36648bdf4921e5ecd8cb57770135c77415045e30754dfaf70327e19e9c7b0f9c600e9f27304a6ad4f
 DIST libselinux-2.3.tar.gz 171254 SHA256 0b1e0b43ecd84a812713d09564019b08e7c205d89072b5cbcd07b052cd8e77b2 SHA512 8cfcd20ab0b43ffbb32389e0498b21e43cde643dcdf471a2354f1ca557f11641d250871ed5e71b9dde4c5f47ac1048746fe514f8f6cfad668fa179ed5136e802 WHIRLPOOL e975a391559aca3f8b251d2aa484cf8e344d09caa43ff56dd929e75a0ad195cf8d9a88b950679f589f4deb74aea0d22be4e7ad00b11eacc080288df0b5ac7ccb
 DIST patchbundle-libselinux-2.2.2-r4.tar.gz 1500 SHA256 a502a3958f8e0949bc65c23bc2f3629fb8aeb38525dad5ccef531a08a3a9bb1a SHA512 7a13b69cae815845cc01bdfa26b3af051d12ef5e83dab8e50aab853952d5a365e60cb99a56e84b73d0273a3675fba65b6998f7bab524d06a7a78c77b64a57bbf WHIRLPOOL a6c1e0ec3b9cb5c3bbbeaa90ff64d794ab5d522730df05cbef66c13a3d6f48fbde83646437b1d5fca851e8a425ab7becc26eeb246a08f7d349143792cddc6124
+DIST patchbundle-libselinux-2.2.2-r5.tar.gz 2304 SHA256 ad77f499c05ec3b5707cb9db518a891dd9c84ccb77db07e686c87e5799e1802c SHA512 a01db39a7aade27b0127dd0e2f3185587ff4d913b7b1be7beac36dc2d3e1007de5e6bae8a11bc84567385420fff064ba54892d8e113c8fd54ad3c598dde7648d WHIRLPOOL 5886d9de6fcf073d54ca5e0eac3f8b4754c44382e7044debb223f94ecc81ea0e26b7638037eef17eb6f8ce4cc5046a4bb9f93b9b7767480908ee5b2ced0413ac
 DIST patchbundle-libselinux-2.3_rc1.tar.gz 1500 SHA256 a502a3958f8e0949bc65c23bc2f3629fb8aeb38525dad5ccef531a08a3a9bb1a SHA512 7a13b69cae815845cc01bdfa26b3af051d12ef5e83dab8e50aab853952d5a365e60cb99a56e84b73d0273a3675fba65b6998f7bab524d06a7a78c77b64a57bbf WHIRLPOOL a6c1e0ec3b9cb5c3bbbeaa90ff64d794ab5d522730df05cbef66c13a3d6f48fbde83646437b1d5fca851e8a425ab7becc26eeb246a08f7d349143792cddc6124
 DIST patchbundle-libselinux-3.tar.gz 1500 SHA256 a502a3958f8e0949bc65c23bc2f3629fb8aeb38525dad5ccef531a08a3a9bb1a SHA512 7a13b69cae815845cc01bdfa26b3af051d12ef5e83dab8e50aab853952d5a365e60cb99a56e84b73d0273a3675fba65b6998f7bab524d06a7a78c77b64a57bbf WHIRLPOOL a6c1e0ec3b9cb5c3bbbeaa90ff64d794ab5d522730df05cbef66c13a3d6f48fbde83646437b1d5fca851e8a425ab7becc26eeb246a08f7d349143792cddc6124
 DIST patchbundle-libselinux-4.tar.gz 2631 SHA256 91bf43c84ce3d3178c8d21fdcf97380a635fa2465d1611fe4e0e3838a586c78c SHA512 bd2f9762f095e3dbc67e77ee04968cb8e87d460fdf10feff91cb1ce6027e19a660bb57617887e44608d39720e8f95500c451c4b284d58c0a756a04b08fa305c2 WHIRLPOOL 07a6a69d33c46c443907aae2ae4f3646a0360565e28d0a50cbcf81f8b5d8c259812d3e086841fc21c2a8104ce9863fc6c9c1d32e28ea08ebc7baf2d45af3509f
 EBUILD libselinux-2.2.2-r4.ebuild 2354 SHA256 c36409df2746b35757041d975a03a3717db52372d996651ba5d4c1dcad01cdfa SHA512 1ae0948a24b5d418e266a752369bf98b23087545ebbb7939530c9d9a814175009c99b08a826607d441b5d80a0decdd591a42f625bc69f58ad6cc8e18c69e523d WHIRLPOOL 5b14cdcf4545035047254f70404ba33c193ba2fe75e9f7d7a6ca597d0e55e07add522c6e8bf771ea2f986faceb40411ba04285055fda31a6d089072e2dc37c48
-EBUILD libselinux-2.2.2-r5.ebuild 3537 SHA256 e517234b37920ff48029868b3b00a0c052c29588139d6c06319de4623bc39461 SHA512 21c3ffe4141c554f6faf54e2ff884ecd8539c98a2ff363d6981c5560aa729cd3f6c84ce3e59072e1a235810ad88d2e28fb685012d2568fd75e5cf056cb2a881c WHIRLPOOL 0dd31dab0fe1f646441285dfbfff525d1badce6143de5cd479250bf7714ae048ba7b9010e69db048e652218ac6d0e798ba7417e558aade1762143a77b7abef18
+EBUILD libselinux-2.2.2-r5.ebuild 2536 SHA256 38d9d34e9e2480a026f919915553716ad78e1f48dba76568e5ccacdf55df6bb9 SHA512 4ea1c10a052724dd675f555d4811ce3fa6102fd8e4168d55859830db6df5f8dda4ffff0f346681af35542afaeff0622694b0c3a15f6f37347a904158b2997f4f WHIRLPOOL 8813e5cc31df3ae8cc13ddbd50ece8679292b69536e96a6a10dc6e45f819960d9e51831762703a61082ea9c2479f9a5aea4e1d43ab8d5e67e5a3d12d98f8d67d
 EBUILD libselinux-2.3-r1.ebuild 3907 SHA256 a4216eb46a84914cf1131fc3a6d48dc58e7f570219de0a1f302eb28027a077de SHA512 714913938171e586d55332b5762137f147a85c9a94e57d16a947d63598506443e02c9ad73f47b2449e9f5d87ecf174b6775c67b0c43cd872488e55245b1dc259 WHIRLPOOL 06e648cabedfc487d57b97b2d123c7c83d448dd16976a9dcbbae730c5682380c6639f64b95abd45cd27a9c8b43457b6c54c3ca0918895f16f5874ee92b4f0129
 EBUILD libselinux-2.3.ebuild 3725 SHA256 41d8478a269262d3f133742b607c0e133e34605b437be4b3f93e7ab4384c1bcd SHA512 4107a140923e81ec6541cd7351c07a53f6020a1d3d1471c69e4b7c6db4a5e9d27b2243bc9aa8806e988a2b98c582d5ecb007dd5b47a5c5e09d4f32fd1d7f0537 WHIRLPOOL a323974e5b321f973f7ebee21102db2dffdbce3efe2ada116e79ced36be3fc8daefc3ae0e83de983ed6ea2e074076d2acf7f19f9b036f8b7204c8b269146c728
 EBUILD libselinux-2.3_rc1-r1.ebuild 3587 SHA256 88d9c4b871351eaff50c1b2927187ddd99a7f083a212c02c2b4e706c9155f8a4 SHA512 7ad8c17c883176ef9f91989778948e96d8649bf7de95d056f248172ddf1e0df6e75d5b70f5f6f0b94ef773139aba632f331fb959632b99cff0d07726649a7562 WHIRLPOOL f1a84dc37620b5cc6e597fc7387e0edb626b4b93af2bbdb06e1a6890badce41fdd80044d8dc1e4ac7f4086b6154c0ce3dc374afc8aa559dfd5c282d4fe0dc308
 EBUILD libselinux-2.3_rc1.ebuild 2400 SHA256 2c4102756d09f4819c078e5224b45cb69b9c34f6e72aa7d894ed1b86e7b35622 SHA512 2e0af0c787760a58df95abce32e0808fe68e638b71520689e13618ea94c30bf16a581f8851eaa85527d99cbe158f0802dde8083eab3211b8ef22686259253e67 WHIRLPOOL e73128ac49a20f8005961b99591400ffeffa0bf753eabae4ffd9d1a9f1d09ca3bc16df43c2d6b65231925b3cc6a1a8f663fbcbec1e64ee244685ef964ca567fa
-MISC ChangeLog 18545 SHA256 86250fa7da391f1dd22bd7d2bf56a21d542cfdb0b310543a4cd6e37f68005bd5 SHA512 aac81840a8ad111a5c634fe80cf176ee277e59712489e20f5a87e7357c80e804be23c5248e900c057000ca68a362d088777522e67979e2e8956a15e4e02d3431 WHIRLPOOL 7c29144fc215724cd1159ff2a9f77198013c97b6a4f629b7a70cba6faebab49718f06f6fd9561d9c34500c01e506e3f08f827ca88bdaeca911b3db31a7c91e17
+MISC ChangeLog 18689 SHA256 590399ef07c7b6b1541a9226f26023398db2c91609bd2fa933d773deda932cb5 SHA512 50ffc1210e9ad39762af521d0fd05da6b0620a92c479274241df4183925fd6a891acb9b80d27bfea024160c0bfe68320a9f5862edd7b86da04cce8dec95b342f WHIRLPOOL 0d2278602798f388b1a681542b664182d470f7f80ee7c0621767193581f68ac02f7afb1fc0d62cae4ac394d5fbbac3af88cff6a3018cd6775b6c85082d401925
 MISC metadata.xml 406 SHA256 934da6149d008c09754c0654dbea6c49da117923adc6fbf3fcabac58195b9c45 SHA512 5bd2b0637c4d77b6113540dff5c4253390b1fcc69b864aaf2196d2c6e8c2c10fbb06bfcb69ba73978e3a2c3ca60fc6e4eccc0ea02a818b34a66c137f993a33a0 WHIRLPOOL f34ec6f0a7f35b9c2a8f29688fc58b6228484e3ba0568d65b6d8e24cc91662b6704ea532e036cf0a6ceca83b4e118bb7c8a64c6c4ba45bd60e2fa2d73d2d2abd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJTvYbMAAoJEC7dUkA7aK9H0VsP/i0GRqf0Rig5BnTBzxe0nIKk
-zey14iRy870XOIl5IBPoA/dcCreW8T4TT8k4NowyWB6/QYWz4RgKSNeDQK2B9U0C
-xpRP+bvxJZHDqEIbgHtIKgzPhsyfabybJRjGGsjKsN+iI7MMGeLPS6a83TIwWi7n
-L2k/hv+NX2KWIJs4H9LL9ocPwX7AZBOay0Yic+6wJBt0j6aIjl5h/kEDYqqHGc+f
-bo8HA9imAacX50QajDOt2q+Y99Vvl8QYzoW7IvS0QmHzu5deYWsBNujAzAiqRiXm
-fYxe6qRuou705zx/iUbFQb6dpsYIV7bZoi2uK8VmFWOAZGqesdZJfjjiAmew/hYp
-WMQT1lbOOVHtxwCureoOeURIsAMZaFCTvT11H5IN/PbL6AyFxtLsFcppG4drP9XP
-beFnfErqca54KBSdsqf6rEwl5dT+PBB5O9U03deLYPOor1V8fhSvlkbylb5AmcrY
-qvJaq1VkeSSsVNsqlkho5wMefF/kHpjCgeV1i4lVMNjLN3nZ+B/FyeBP2xF8ip7O
-NLnpwmO3490cxKyz9O7zBEPM90uYH/d0Y+jFqovII/NgtRJllQJ3wR4hSLJDb8g7
-pzHWHbciFA93lxll8Jx+Y6wpjQckh3syalvgoP6ZwoLplAc9OBlncv/se4X6WbMC
-WB+smM4HCoEOMoXprjOz
-=PgQ1
+iQIcBAEBCAAGBQJTvZf1AAoJEC7dUkA7aK9HyLYP/AxFVxvA+bJok64nLn2lY8BG
+hLs4isY+TKGCuDq6SChcNLoosEWVPddUNy/G4Ae4SJzqWdo3+MbLIdl39fCrUBid
+Juej5jg1mAaSVU/XZqo6oT00zAfBB1vpdMmbw9gaKCkE+fXj0Zi0sWVhXQ/rBRhe
+TQv2enVQDdanBct3Q++cQNEHGVIhetsV25Wd9bx/eWNsIMFA0jT0CW8uvbX8FxGT
+kw7udgdWzCzY0F1fjeypr+S9NMm6ZNzEkHF5eBTIRwiZPvjMoUc7ZzdSQIIN0GNF
+9YaOjq5kiR71fWtcn0lw6ar3lO6n0/fUoQFMlW+6irG1VceGxTRAIa6UvShO4uql
+91bONfMPykMnyS5DOaDiFTL9MfbfPQeRaOAfwiR9/VQ756ZRrlBTTr3UjlAfIk0G
+ifhItWTNeAUeA5MD1oyF0P98h5/RUsmMGxh08rKA60i8D4umcy4+671iIVpEJjU0
+gl0rFtrVs69rzPgnFO+iGw81+YLhG+pBNx2/sgWEgxjEF7TFwUayWY61vwiD8e8H
+yp5IxirzzU6gKm0+XvQjE1SWAGWnepzmehYuvhWIyxTThI0kF6dNh/MvcLmWJzrC
+aYCVbVvBoJQaj1T8nzlaG3Rj4qFUedvfoWEtMYkr8dIpesXOvtf0vvklE+C+Sa53
+dRiE9ngUw4VKJMANWNSJ
+=orXd
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libselinux/libselinux-2.2.2-r5.ebuild b/sys-libs/libselinux/libselinux-2.2.2-r5.ebuild
index 0f8ddbb58b36..e41a90b981c7 100644
--- a/sys-libs/libselinux/libselinux-2.2.2-r5.ebuild
+++ b/sys-libs/libselinux/libselinux-2.2.2-r5.ebuild
@@ -1,12 +1,10 @@
 # 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.2.2-r5.ebuild,v 1.2 2014/04/30 17:11:30 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.2.2-r5.ebuild,v 1.3 2014/07/09 19:29:44 swift Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
-USE_RUBY="ruby18 ruby19 ruby20"
 
-# No, I am not calling ruby-ng
 inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
 
 SEPOL_VER="2.2"
@@ -14,12 +12,12 @@ SEPOL_VER="2.2"
 DESCRIPTION="SELinux userland library"
 HOMEPAGE="http://userspace.selinuxproject.org"
 SRC_URI="http://userspace.selinuxproject.org/releases/20131030/${P}.tar.gz
-	http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${P}-r4.tar.gz"
+	http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${P}-r5.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="python ruby static-libs ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20"
+KEYWORDS="~amd64 ~x86"
+IUSE="python static-libs"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}
 	>=dev-libs/libpcre-8.30-r2[static-libs?]
@@ -67,25 +65,6 @@ multilib_src_compile() {
 		}
 		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() {
@@ -99,23 +78,6 @@ multilib_src_install() {
 		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
 }
 
@@ -125,5 +87,9 @@ pkg_postinst() {
 	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
 }