summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2011-05-01 22:47:43 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2011-05-01 22:47:43 +0000
commit4a1ddcf80142c2082556d9168e7174d4d0d7d5a1 (patch)
tree2f6b5b5700e71c788d4f9c8c11db15e8acc1e07c /kde-base/kdelibs/files
parentTweak USE=-tcpd build flag #365575 by El Goretto. (diff)
downloadgentoo-2-4a1ddcf80142c2082556d9168e7174d4d0d7d5a1.tar.gz
gentoo-2-4a1ddcf80142c2082556d9168e7174d4d0d7d5a1.tar.bz2
gentoo-2-4a1ddcf80142c2082556d9168e7174d4d0d7d5a1.zip
Do not install start_kdeinit setuid, bug 365633
(Portage version: 2.1.9.46/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kdelibs/files')
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch b/kde-base/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch
new file mode 100644
index 000000000000..4b34f62c2be4
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch
@@ -0,0 +1,19 @@
+diff -urN kdelibs-4.6.3.old/kinit/CMakeLists.txt kdelibs-4.6.3/kinit/CMakeLists.txt
+--- kdelibs-4.6.3.old/kinit/CMakeLists.txt 2011-05-02 00:19:10.000000000 +0200
++++ kdelibs-4.6.3/kinit/CMakeLists.txt 2011-05-02 00:20:32.000000000 +0200
+@@ -170,15 +170,6 @@
+ install(TARGETS start_kdeinit_wrapper DESTINATION ${LIBEXEC_INSTALL_DIR})
+ endif (NOT WIN32)
+
+-if (CMAKE_SYSTEM_NAME MATCHES Linux)
+- MESSAGE(STATUS "Using setuid root kdeinit wrapper in order to protect it from bad Linux OOM-killer")
+- set(KDEINIT_OOM_PROTECT 1)
+- install(CODE "
+- set(START_KDEINIT_PATH \"\$ENV{DESTDIR}${LIBEXEC_INSTALL_DIR}/start_kdeinit\")
+- EXECUTE_PROCESS(COMMAND sh -c \"chown 0 '\${START_KDEINIT_PATH}' && chmod u+s '\${START_KDEINIT_PATH}'\")
+- ")
+-endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+-
+ ########### install files ###############
+
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KLauncher.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )