Set SUID bit depending on pam USE flag, bug 314841. Thanks to Andreas K. Huettel

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/kde-base/kcheckpass/ChangeLog b/kde-base/kcheckpass/ChangeLog
index f54ed3156ba94c80bec7b8aa54d6c2c791ade3ad..98454ef1555c9b7dcf37f05697fb69c99345e83c 100644 (file)
--- a/kde-base/kcheckpass/ChangeLog
+++ b/kde-base/kcheckpass/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kcheckpass
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.159 2010/05/03 21:19:34 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.160 2010/06/04 20:14:41 reavertm Exp $
+
+*kcheckpass-4.4.3-r1 (04 Jun 2010)
+
+  04 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -kcheckpass-4.4.3.ebuild, +kcheckpass-4.4.3-r1.ebuild:
+  Set SUID bit depending on pam USE flag, bug 314841. Thanks to Andreas K.
+  Huettel.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kcheckpass-4.4.1.ebuild:
   Drop KDE SC 4.4.1

diff --git a/kde-base/kcheckpass/Manifest b/kde-base/kcheckpass/Manifest
index ac596a56e0b33878c5e7fee3fccc64a0b0dc8ff7..f9541c74a63b5ef5c406c80d588f9ea0bcfe4d21 100644 (file)
--- a/kde-base/kcheckpass/Manifest
+++ b/kde-base/kcheckpass/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kcheckpass-4.4.2-no-SUID-no-GUID.patch 648 RMD160 e8122c5c2f495bb03852cd649acd357de7e5385a SHA1 f8d301999328a8c2ab8d546fb002cdd2b5fffbb9 SHA256 d685abdd0eab0a6215ab052caa457712cb6e03c82f8877ee277c8c090e57be6d
 AUX kdebase-4.0.2-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea
 DIST kdebase-workspace-4.3.3.tar.bz2 62496238 RMD160 48ab90a519c7811e9fe4aa4e77f06134d2dc4afa SHA1 2839e913cecef8ead0685bd50e9515ccd8bc0a9d SHA256 b66b4e3eefe88edfd9ddd0501b2b6eece39b85fd78f2320967b937f2529c6d3b
@@ -11,13 +8,6 @@ EBUILD kcheckpass-4.3.3.ebuild 697 RMD160 f2792c84fff1c26d45e707c629936d2a8b3a47
 EBUILD kcheckpass-4.3.5.ebuild 719 RMD160 77c86fec92a19aba8b391ba9a6e116cea1a6326a SHA1 2b4d95e8880c3407a3354538993e8859a83c5968 SHA256 92fc8c0206bc5771ee961df38045b0d1e66d387c40c64f52f9855d19db0d93db
 EBUILD kcheckpass-4.4.2-r1.ebuild 775 RMD160 d4eb6e40ed3de7371184d5bfbf821ec1a8e95b37 SHA1 d466eba85c7647ed76746bc3d125cb908fbb2a47 SHA256 82369c63f614aad6348cc2d2c079cf6fced15455d9a9f6fabaaf9c9c8b2cb0bc
 EBUILD kcheckpass-4.4.2.ebuild 721 RMD160 feb7656e92760fc13f09f72841c6df1b500a40cc SHA1 8c24719af906b59a91edd45a5cb27ff11e5271a7 SHA256 41ac285c25de96737473c2899b70c107b6ccd70ab60ae5ce2c995c6feb671331
-EBUILD kcheckpass-4.4.3.ebuild 772 RMD160 22f157cec1649a55035225b8b14cf35d2edf6b60 SHA1 541620af2f81509f8dd5a1f7eb56478f55cc0261 SHA256 0aaa84f3c0958e6b41f320845fda641a12a1f64fe6936cac61b132f2fa9d3a55
-MISC ChangeLog 19756 RMD160 c277f2d6df013c71c068c64bc0795b06dde90cb4 SHA1 d100ccbbaf21cb18643a44555c9cb6f80944853d SHA256 a37eab55eb9f04236b4268e48ad72f1149b6cb1fe5099287588399100968cf67
+EBUILD kcheckpass-4.4.3-r1.ebuild 838 RMD160 df343e94f4c17e16243879c86e61d006273460ca SHA1 424ffb3574efa07221aa002e0e18bdbd8beaf039 SHA256 88098e6397514c1f9fd7b6d67f08daf6b57f3a6b552325eecfc42750fe498330
+MISC ChangeLog 19992 RMD160 552825ad55f8dfbc4a3cd234f04177866cbfe1e9 SHA1 aeda88871470513d67062d1c548f4065cce1d3b4 SHA256 89cfa987319b25ee4f9316d83313ecca1c3f0d26ce58edeb7cd618b4f4818beb
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkvfPnAACgkQ5BmOA85PVLjN7wCfUDOHDvkYAXno0tSecN7BNthC
-ILYAnAvWGVTPLjRSA5T206Q6u65AVSwQ
-=OKk7
------END PGP SIGNATURE-----

diff --git a/kde-base/kcheckpass/kcheckpass-4.4.3.ebuild b/kde-base/kcheckpass/kcheckpass-4.4.3-r1.ebuild
similarity index 79%
rename from kde-base/kcheckpass/kcheckpass-4.4.3.ebuild
rename to kde-base/kcheckpass/kcheckpass-4.4.3-r1.ebuild
index 31ba9936a841701a20ae504a3aaacc142a588bb3..c09279cc8dd931857249c80952475b0db9ca7714 100644 (file)
--- a/kde-base/kcheckpass/kcheckpass-4.4.3.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-4.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-4.4.3.ebuild,v 1.1 2010/05/03 20:24:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-4.4.3-r1.ebuild,v 1.1 2010/06/04 20:14:41 reavertm Exp $
 
 EAPI="3"
 
@@ -21,9 +21,14 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
        "${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
-       "${FILESDIR}/${PN}-4.4.2-no-SUID-no-GUID.patch"
 )
 
+src_prepare() {
+       kde4-meta_src_prepare
+
+       use pam && epatch "${FILESDIR}/${PN}-4.4.2-no-SUID-no-GUID.patch"
+}
+
 src_configure() {
        mycmakeargs=(
                $(cmake-utils_use_with pam)