From: Mike Frysinger Date: Tue, 3 Jan 2012 18:44:35 +0000 (+0000) Subject: Fix handling of selinux searching cache vars #397443 by Amadeusz Sławiński. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1d705d7b41c4650cf962692e2775a9cad48713d7;p=gentoo.git Fix handling of selinux searching cache vars #397443 by Amadeusz Sławiński. Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64 --- diff --git a/sys-apps/sed/ChangeLog b/sys-apps/sed/ChangeLog index 3146af2ae2f1..d290dd870186 100644 --- a/sys-apps/sed/ChangeLog +++ b/sys-apps/sed/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/sed -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/ChangeLog,v 1.112 2011/12/31 07:33:57 vapier Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/ChangeLog,v 1.113 2012/01/03 18:44:35 vapier Exp $ + + 03 Jan 2012; Mike Frysinger sed-4.2.1.ebuild, + sed-4.2.1-r1.ebuild: + Fix handling of selinux searching cache vars #397443 by Amadeusz Sławiński. 31 Dec 2011; Mike Frysinger sed-4.2.1.ebuild, sed-4.2.1-r1.ebuild: diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest index 9b99d72c7bb0..4bfa8c266438 100644 --- a/sys-apps/sed/Manifest +++ b/sys-apps/sed/Manifest @@ -7,25 +7,25 @@ AUX sed-4.2.1-handle-incomplete-sequences-as-if-they-were-invalid.patch 1507 RMD AUX unix2dos 36 RMD160 a5081a06798106458311b0a628979575b77ffea6 SHA1 868114224967197337668b6cd634bde82ee6c52b SHA256 261d335cf9cd3b938d90e07ed66445b5512ab1e534e1bd68c322a3119d4201c9 DIST sed-4.2.1.tar.bz2 899091 RMD160 f664dca0ca4472554ea0d595d544e232a3de51ad SHA1 ace93d23eabc00d3a8187ecf07d3a02b1b297810 SHA256 2ac3b36ca37bfeb43c4ef4025778cd66d89c77abb843d90552a515a7c9d2948f DIST sed-4.2.tar.bz2 882586 RMD160 c0e901c6fc74a95633d89ef77dc609955f72c0fd SHA1 ee7af3cd1ebbc6cdf17a7d1abbce00db0c7b5a0d SHA256 ee7755e3ab038e7deecebdf44fd43ad65a96890962c3b44206cce672368b45c8 -EBUILD sed-4.2.1-r1.ebuild 1919 RMD160 193e7f486db164676dc3a02291fdf9fdf3511626 SHA1 c18e4a3008545dbc727f279b1cf8d2ddc02237db SHA256 7a0f29e5258de9197c1278e1fd279557251ba1e88d0a47ddd0e5afaaa23f0148 -EBUILD sed-4.2.1.ebuild 1812 RMD160 8af86e634e0f7c882400573a7ed0aedcc85e44c3 SHA1 26b11f110cb8d4056524e2daf71a23b96dda7106 SHA256 8633a62ff3ef2e43b9c84e0eeaa9ba7083345c26eca80212b1ef8d6e2bd9277d +EBUILD sed-4.2.1-r1.ebuild 1957 RMD160 4ee0f223b6ee82de1abc2e4c540600d59fbfc763 SHA1 ab88a9ddeb997b8f04694e363af924b869bbf276 SHA256 5403478ee09ef1a206347034349d151a8b274f215d694b12269d717843d5e8b0 +EBUILD sed-4.2.1.ebuild 1850 RMD160 dc4229e6e25266e5aaeead83334db71e8b306648 SHA1 13f967b864e26b293f81b115abf923b740c81f41 SHA256 7670f4feccfcd0f23a5d2608111d110beae96a8d05e70ab34a7425a12201b057 EBUILD sed-4.2.ebuild 1717 RMD160 e5d40b81ec73582fedc4b6c2dd685d0b4fdf4881 SHA1 7c8718c44a0e2d5e645e7df165d5ce71b601a147 SHA256 f929056f93a8bdc9e59e098fc051ce97805d165be2ce66c3dd3292dc4bbdd0bd -MISC ChangeLog 14391 RMD160 48cd1fe066b9bc7d1131fd006bf4ed422e16bcf4 SHA1 6f420e96c2b5e3f0b6cd54d3375b8f811f4e9b87 SHA256 3f4d9a49528d381dc659f35e821da65d7d377423f6903ad8b8251606260ae262 +MISC ChangeLog 14563 RMD160 b7acd19f022ec7285e34ee647a9fdc22330195b2 SHA1 1a9c4a3dd3283f1aa07da5be1a80e5aea7ca817c SHA256 392704a1a2e146749fc65282803494abf8935afd8f742c2a0b609316bd45ae17 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJO/rr0AAoJELEHsLL7fEFWG3EQALUZZf13P7qBgHrYSrlaOZhS -JVauJkGh9GMVUVEQxlY/88vSoTg75sB6iG/cKi5uElk9M33nt4t7NY0XgAD95oWj -Yb3xhetrQiaMTnxm1cWvviQfjtSErwPstkk2stHC0j0am2SvRGH8xXECiOL4A0WP -YFNlYgKcZuzAhHjPDmIAPP+SrtPPFtFoEq6p0u+ndmuhfOe/nL/o1SYRnaIgRTE/ -0IjLLtInYJ/aWX6xvC9z8hUhKEKGyaZgBrZGt2U/Ba3QQqMC5pxqFCtvSvrakckz -4cw0snPEJYX//pPBDQuo4zxnkj2n5gSQrH1q8dpwqX1o3LUzFyUJIH59UhJZhLcX -SUYuA4ZBf1S3YXzBfkYpY7bZa0iuBDGX4S6BPD7ysx4enHc+Jebh+hxk0ReUnHgr -jKEIsdHEO7EVfYocX85B7jcw3e1DmVII+nR3lHqV2ffwg9hnnJ5GZh7ipf81qWZG -nogq8p6uqBGxAdTMieZd/kH0iXGVT/QCnFPGczILGojcwKwQs4Gt7I0qPzEPv1J0 -oYYsnjpXjO4Zo/MBBtajs4hLoUQqakFkes000oXc9qxsZn4D3OuH21LREO+jXvOH -HoWlgKSnJhFwEoZsVmAdZFDRWxwm3wGIVVyTjxg7T14xO8YWT5YFZopOjo6oPyyA -weUHlBp8opORrzJM6f+x -=Io69 +iQIcBAEBAgAGBQJPA0ymAAoJELEHsLL7fEFWBPcP/3yfQ4rv9mRV7kHePG4Z9DN7 +ZzsGIOECIW1Kw+ozxuLR8dnc1Lrf52rKk3P6+1CRrcXscTTRk2SR7LNfa1jRkwL/ +46OEQfnup4h7l6R1vv/jF2VYg4T79TvpdnT9KLgfmtwgFhZOtfQtjRg/ZuTqcyFL +bXq84/Pdf+D5pekIkVNU5y4G352lbBi28bfdMO1LWQ1aLCv15l6NA9s0n+0VJ2hr +duURsK9/o/NM5TWljQnfUzOOGD92PX+nQOYI4P6Jhes8jgWbJ6/080VLagzIZZfJ +Ncfwxly7vePrqrUXCihA5OwBhBz6i2X1pr5acyUo5SaQ3pvqb9HVcb/BxB6cqD8a +D3MvEW6HPM3cpjVR/bnV2/s4NI4q5QtlBKfT+FuNHFiUcU1wSTd56PSPjxVts/a+ +PKeelNqZZQMIoaC4ekdJeb+2BaRbrLSuWcbwPAcm0b0sXF3xx4+I1O0BjH4KVPud +uORGYcnurZq9KJPfKudSO1zomk/KxM7aM3K0LT/VndhiUu3a0TnzVDp9oqyP7zyO +2QpCqqcwyJppZmFYp3dc6qoKhy8k9+8eC403/FonUbbT3QrKEcxID6lkFvV0IddT +DD6utWxxFCIiJWneQloc0qOEVc/PtzF9jvtjye3Mf9JBuq5OeifbeKA9vb7rl9BU +zehWtK69L/C/FQGwhAiV +=kTBQ -----END PGP SIGNATURE----- diff --git a/sys-apps/sed/sed-4.2.1-r1.ebuild b/sys-apps/sed/sed-4.2.1-r1.ebuild index 6a3efffa1e3a..be8e92d9391d 100644 --- a/sys-apps/sed/sed-4.2.1-r1.ebuild +++ b/sys-apps/sed/sed-4.2.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.2.1-r1.ebuild,v 1.2 2011/12/31 07:33:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.2.1-r1.ebuild,v 1.3 2012/01/03 18:44:35 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -51,7 +51,8 @@ src_compile() { bindir=/usr/bin fi - export ac_cv_{search_setfilecon,header_selinux_{context,selinux}_h}=$(usex selinux) + export ac_cv_search_setfilecon=$(usex selinux -lselinux) + export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux) use static && append-ldflags -static econf \ --bindir=${bindir} \ diff --git a/sys-apps/sed/sed-4.2.1.ebuild b/sys-apps/sed/sed-4.2.1.ebuild index 8ebd8cd5dfa4..7538d1ba57df 100644 --- a/sys-apps/sed/sed-4.2.1.ebuild +++ b/sys-apps/sed/sed-4.2.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.2.1.ebuild,v 1.10 2011/12/31 07:33:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.2.1.ebuild,v 1.11 2012/01/03 18:44:35 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -50,7 +50,8 @@ src_compile() { bindir=/usr/bin fi - export ac_cv_{search_setfilecon,header_selinux_{context,selinux}_h}=$(usex selinux) + export ac_cv_search_setfilecon=$(usex selinux -lselinux) + export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux) use static && append-ldflags -static econf \ --bindir=${bindir} \