Do not install SUID/GUID executables, bug 158206

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

4 files changed, 59 insertions, 2 deletions

diff --git a/kde-base/kcheckpass/ChangeLog b/kde-base/kcheckpass/ChangeLog
index 9e7365cfc599..2b6e1ab24f80 100644
--- 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.156 2010/03/31 22:10:32 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.157 2010/04/09 04:00:09 tampakrap Exp $
+
+*kcheckpass-4.4.2-r1 (09 Apr 2010)
+
+  09 Apr 2010; Theo Chatzimichos <tampakrap@gentoo.org>
+  kcheckpass-4.4.2.ebuild, +kcheckpass-4.4.2-r1.ebuild,
+  +files/kcheckpass-4.4.2-no-SUID-no-GUID.patch:
+  Do not install SUID/GUID executables, bug 158206
 
   31 Mar 2010; Dror Levin <spatz@gentoo.org> -kcheckpass-4.3.4.ebuild,
   -kcheckpass-4.4.0.ebuild:
diff --git a/kde-base/kcheckpass/Manifest b/kde-base/kcheckpass/Manifest
index 79c8ac9b490d..4565e072af6a 100644
--- a/kde-base/kcheckpass/Manifest
+++ b/kde-base/kcheckpass/Manifest
@@ -1,3 +1,4 @@
+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
 DIST kdebase-workspace-4.3.5.tar.bz2 62525359 RMD160 dcf04a40412ba236365423afc877ea0c2066f972 SHA1 703582cb8a3471c5821986dbdfc3c6deedac0ff3 SHA256 7985634ed1f87889bcd6613ef41127196df442017bf895be6fb2afb196ce149b
@@ -6,6 +7,7 @@ DIST kdebase-workspace-4.4.2.tar.bz2 77039701 RMD160 0558ff2102cb380127667a94b69
 EBUILD kcheckpass-4.3.3.ebuild 697 RMD160 f2792c84fff1c26d45e707c629936d2a8b3a4763 SHA1 fddb70f8c528abaf887a2091ac3e97785fa8e974 SHA256 ca44e814acde03593137dc726cfaf512b41ce54e88564435981b26a32068f6df
 EBUILD kcheckpass-4.3.5.ebuild 719 RMD160 77c86fec92a19aba8b391ba9a6e116cea1a6326a SHA1 2b4d95e8880c3407a3354538993e8859a83c5968 SHA256 92fc8c0206bc5771ee961df38045b0d1e66d387c40c64f52f9855d19db0d93db
 EBUILD kcheckpass-4.4.1.ebuild 725 RMD160 d6ed5690a9ad9f3d97665c13775fe10cf0a2e266 SHA1 93a600c399a924f5e904a4a3f4f5ff45cfab491b SHA256 9d306331b83c77c0f807238908d4a60ac48f9235346ce2727745daa12dc8c0a2
+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
-MISC ChangeLog 19282 RMD160 5f6afc9cd3076b245b45a65aa35e5c526d88bd64 SHA1 c145638f6ec6e6992fb46b72f602858cd4ead829 SHA256 ab4db764fa51d586234100572aade277786edd75eced595a34332e58a48de868
+MISC ChangeLog 19535 RMD160 2b5f280c53233d2db76027aad509a477acae02ee SHA1 2a00fe3556f868bfd388427f8a2ce8cadd5309b6 SHA256 66d456193ced440b4cb32f2d48ec4311acd941639108b5e04dcef45beb2f5752
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kcheckpass/files/kcheckpass-4.4.2-no-SUID-no-GUID.patch b/kde-base/kcheckpass/files/kcheckpass-4.4.2-no-SUID-no-GUID.patch
new file mode 100644
index 000000000000..78520d4acc4b
--- /dev/null
+++ b/kde-base/kcheckpass/files/kcheckpass-4.4.2-no-SUID-no-GUID.patch
@@ -0,0 +1,15 @@
+Index: kcheckpass/CMakeLists.txt
+===================================================================
+--- kcheckpass/CMakeLists.txt	(revision 1112521)
++++ kcheckpass/CMakeLists.txt	(working copy)
+@@ -23,10 +23,6 @@
+ macro_add_compile_flags(kcheckpass -U_REENTRANT)
+ target_link_libraries(kcheckpass ${KDE4_KDEFAKES_LIBS} ${UNIXAUTH_LIBRARIES} ${SOCKET_LIBRARIES})
+ install(TARGETS kcheckpass DESTINATION ${LIBEXEC_INSTALL_DIR})
+-install(CODE "
+-    set(KCP_PATH \"\$ENV{DESTDIR}${LIBEXEC_INSTALL_DIR}/kcheckpass\")
+-    EXECUTE_PROCESS(COMMAND sh -c \"chown root '\${KCP_PATH}' && chmod +s '\${KCP_PATH}'\")
+-")
+ 
+ install_pam_service(kcheckpass)
+ 
diff --git a/kde-base/kcheckpass/kcheckpass-4.4.2-r1.ebuild b/kde-base/kcheckpass/kcheckpass-4.4.2-r1.ebuild
new file mode 100644
index 000000000000..920c77876830
--- /dev/null
+++ b/kde-base/kcheckpass/kcheckpass-4.4.2-r1.ebuild
@@ -0,0 +1,33 @@
+# 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.2-r1.ebuild,v 1.1 2010/04/09 04:00:09 tampakrap Exp $
+
+EAPI="3"
+
+KMNAME="kdebase-workspace"
+inherit kde4-meta
+
+DESCRIPTION="A simple password checker, used by any software in need of user authentication."
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug pam"
+
+DEPEND="
+	pam? (
+		>=kde-base/kdebase-pam-7
+		virtual/pam
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+		"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
+		"${FILESDIR}/${P}-no-SUID-no-GUID.patch"
+		)
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with pam)
+	)
+
+	kde4-meta_src_configure
+}