summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2010-04-09 01:30:52 +0200
committerMaciej Mrozowski <reavertm@gentoo.org>2010-04-09 01:30:52 +0200
commit7a15fa3da3c3db4004766efc8d4a04fffaf3814c (patch)
treebcde67bf940bd3227156c99296c413ccb3b7ffdc
parent6145455d103244ac4a08e1ff86d3e7fbe3842f8f (diff)
downloadkde-7a15fa3da3c3db4004766efc8d4a04fffaf3814c.tar.gz
kde-7a15fa3da3c3db4004766efc8d4a04fffaf3814c.tar.bz2
kde-7a15fa3da3c3db4004766efc8d4a04fffaf3814c.zip
[kde-base/kcheckpass] Dp not install SUID/GUID executables (bug 158206)
-rw-r--r--kde-base/kcheckpass/Manifest5
-rw-r--r--kde-base/kcheckpass/files/kcheckpass-4.4.2-no-SUID-no-GUID.patch15
-rw-r--r--kde-base/kcheckpass/kcheckpass-4.4.9999.ebuild5
-rw-r--r--kde-base/kcheckpass/kcheckpass-9999.ebuild5
4 files changed, 26 insertions, 4 deletions
diff --git a/kde-base/kcheckpass/Manifest b/kde-base/kcheckpass/Manifest
index be0588225f0..47246314ff5 100644
--- a/kde-base/kcheckpass/Manifest
+++ b/kde-base/kcheckpass/Manifest
@@ -1,4 +1,5 @@
+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
-EBUILD kcheckpass-4.4.9999.ebuild 539 RMD160 94fdf77dc86663fdc1dfe4db46b57e7be9864b6d SHA1 8fb3ac41988785ce81ad38ba6cb78c2bfa855459 SHA256 31efc60cd38f31ec2fdef01db296b39b2eb0af541609b856a1926b3d7e59e732
-EBUILD kcheckpass-9999.ebuild 539 RMD160 94fdf77dc86663fdc1dfe4db46b57e7be9864b6d SHA1 8fb3ac41988785ce81ad38ba6cb78c2bfa855459 SHA256 31efc60cd38f31ec2fdef01db296b39b2eb0af541609b856a1926b3d7e59e732
+EBUILD kcheckpass-4.4.9999.ebuild 589 RMD160 aac017beefd0f0c590b50422d547c2bca634c9ed SHA1 d8c6faaeca5fcb301d88df149da262584c14ec5d SHA256 497ed5d734071934fff830797828a3788fadb6dd89a3fe2903bc1207c08ddc16
+EBUILD kcheckpass-9999.ebuild 589 RMD160 aac017beefd0f0c590b50422d547c2bca634c9ed SHA1 d8c6faaeca5fcb301d88df149da262584c14ec5d SHA256 497ed5d734071934fff830797828a3788fadb6dd89a3fe2903bc1207c08ddc16
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 00000000000..78520d4acc4
--- /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.9999.ebuild b/kde-base/kcheckpass/kcheckpass-4.4.9999.ebuild
index 901a090bb86..e3cff1e14c7 100644
--- a/kde-base/kcheckpass/kcheckpass-4.4.9999.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-4.4.9999.ebuild
@@ -19,7 +19,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" )
+PATCHES=(
+ "${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
+ "${FILESDIR}/${PN}-4.4.2-no-SUID-no-GUID.patch"
+)
src_configure() {
mycmakeargs=(
diff --git a/kde-base/kcheckpass/kcheckpass-9999.ebuild b/kde-base/kcheckpass/kcheckpass-9999.ebuild
index 901a090bb86..e3cff1e14c7 100644
--- a/kde-base/kcheckpass/kcheckpass-9999.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-9999.ebuild
@@ -19,7 +19,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" )
+PATCHES=(
+ "${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
+ "${FILESDIR}/${PN}-4.4.2-no-SUID-no-GUID.patch"
+)
src_configure() {
mycmakeargs=(