Do not install start_kdeinit setuid, bug 365633

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

4 files changed, 46 insertions, 8 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 645d8ddf9895..fdc42fd67879 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.747 2011/05/01 13:55:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.748 2011/05/01 22:47:43 dilfridge Exp $
+
+*kdelibs-4.6.2-r3 (01 May 2011)
+
+  01 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdelibs-4.6.2-r2.ebuild, +kdelibs-4.6.2-r3.ebuild,
+  +files/kdelibs-4.6.3-no_suid_kdeinit.patch:
+  Do not install start_kdeinit setuid, bug 365633
 
   01 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> kdelibs-4.6.2-r2.ebuild:
   Add pkg_pretend check for gcc. Just moves the functionality from eclass to
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index c1b8381ffde7..0129d65ac8fe 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 RMD160 37290ce06adf1cf43b0006c02804d7fe762ed609 SHA1 8e86e06a70438c12085a595fd66e2354141fb056 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3
 AUX dist/02_gentoo_append_xdg_config_dirs-1.patch 1041 RMD160 aa41988215dc8ede62c5f1e685eb24d597c1ec46 SHA1 b715c25a4bbfbaafaba2275057071efbb187523c SHA256 849e8cf1ca67eeae9dfd063eed676176f84e13d6e6b7244789c805c93e34edb9
@@ -32,16 +32,27 @@ AUX kdelibs-4.6.1-cve20111168.patch 648 RMD160 e9ab4d57bf2c33761aaac2ac7527a69b5
 AUX kdelibs-4.6.1-sslproxy.patch 867 RMD160 7d0abcf3a1e9736d210b270159c78ba9c25c590b SHA1 8de74e66f71f8ce379c5a9a64195333892918e0a SHA256 bb8407da2c02beaf09a102474932288ecf54201088998f7f3b5f8c07c392d953
 AUX kdelibs-4.6.2-armlinking.patch 1129 RMD160 48174cfa4af1a871f4d05a880beded4a16b0408e SHA1 6fa4163e94990ed574caf3b9f0026b18b30c86df SHA256 9b076d1587bb02b85353f3a155199fd6dace7d1c76f189667787bca89192dee6
 AUX kdelibs-4.6.2-nonepomuk.patch 736 RMD160 3f6ab4acd649d47f045e2445544df3b84e7a700e SHA1 1f5af0271c6a5135bf0bc0acbd6f11abf256c81b SHA256 f27ec69f92e197bff33ecd6f25e3e47303e7599cdc28302477bca52ebe94b2a4
+AUX kdelibs-4.6.3-no_suid_kdeinit.patch 963 RMD160 d1570291799f3b87963da05ddaa949ad19b67814 SHA1 8536664b5d46f2dfd32828a4a0523f280ebe6bdf SHA256 2d0ab01c1e495e77f911a073310615d1f57b2d6981a23c9349d45be5e133d8bb
 DIST kdelibs-4.4.5.tar.bz2 14088335 RMD160 533a627116524d5365ba45f5eb17c972426f59c1 SHA1 73e37abee48536b85782d1a17f1b282313b16c4d SHA256 11d79203e70ba104bf5414cb2a4e8919793ffb5b201592f28fc8ae325c8c6085
 DIST kdelibs-4.6.2.tar.bz2 12917847 RMD160 3a6f2a95f12d15c2ebfe2c5fb1e8f1fb3f51277f SHA1 b4794a9a69492ce4725abd9eb5d00d3a50e46603 SHA256 61d8d73d56f2e0198e590d1c6f5615dea9aa955fa69676265852744a1133b561
 EBUILD kdelibs-4.4.5-r4.ebuild 9431 RMD160 370b23f5eadc02bbf37814485ce3cd5fd702dd99 SHA1 4eea10a2fcbe97f1c4a52bd211caddf0cf64bed3 SHA256 a9dfaaaf91d83c7beadbdc065d0b103f0b7270a4d8ee569ca0849258cd737fa2
-EBUILD kdelibs-4.6.2-r2.ebuild 10109 RMD160 038d036bcf51e61e6e6f008eb3f557960dbc89ac SHA1 390e69aba8ceebafc8c784953e1d1a3a81226b58 SHA256 47fee910a34165964101540db01154c641bb1138e0ba686ed6679b43bdf0c700
-MISC ChangeLog 124725 RMD160 e5020b0dd0be90f95f4a6c4d205f953bb50f1350 SHA1 3debc139665f2842c9f781d25643bc8195150ed9 SHA256 45d67189cd77fa4d4650e59629188a3827a5a9590338774f7c8abbbd705d49d5
+EBUILD kdelibs-4.6.2-r3.ebuild 10158 RMD160 8ba72b945ebf115776523cf9f60cc1078d79e93b SHA1 8fac35bb6d04702b664950820eefaff46d454b61 SHA256 986347c790894d149365b4986b08d4674b8e80468b9b41003db89b37995ce4f3
+MISC ChangeLog 124966 RMD160 2aa259db99e9a413533afaad7b42ad352c83c4d9 SHA1 b04ae4e132a78ea7db863eb7d636629f9d29450c SHA256 9e27374ce0a0d0012d685ee29a2bbe948db5083fa562651c2429095721f87b6b
 MISC metadata.xml 250 RMD160 1cf3a68b9ec97616d8ad515fba750a045cd261e5 SHA1 e13cc9329dd1557d621d84e042a3cfac56490548 SHA256 01ebccaddc9d829aec527fdcfd6d81dc72b5034d0eb59881838ecc10131c12a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk29ZicACgkQHB6c3gNBRYdvugCfWCKKSppABkwc9krsyVy4hInm
-5NwAmwT2EWPBMLHalBYnV1MZiUz96uQL
-=XrlX
+iQIcBAEBCgAGBQJNveOhAAoJENwGBM22xffeYgsP/0l85JHkKyrA+37O3d7JrygR
+FmoQibNLNHkMdOgf527P+Vi5zXNbZlL1n7qt10guyjwW8MerP1n26Bz5yXMBhq52
+zuIPud6pAzhHJCIYb2JKzUU3qcldpaP8FC9AJF5gDBoOOMogqfIfzSVxm3DlEyXz
+qw+Oqj72EDRzTw8fqbwXymYlslT97J8a/XLDjigh34E8Fi23KlWXPqYvJhgSBZfo
+oVCfqfgTJUW55DYQ7PE0TPeoTMAR5tiusIHrJ8mEGbqg3OgxgPsv7+zcnaDZN+BB
+zA7X1USFQVa8A+zeaC1T1F9JkG30IqBun4ePY8/JGdARy8qoA28dKLJ2JPxnr1MS
+2vQA10RXZ7cWdMNKUsW8Am30kwcXfKW4+yeg5imo86sXSnNzhUhCmztlPuSh2iTd
+3H7wJCVt7YuPKJteLroZiWhnwuQrP45DQENTAOtkFod11/hdskByZ1fQrb8Ag3aA
+R8fpPIAaAUHoi8QVDYuJ5B3vo1W7Q61EniQ2PYEJNIInk1XuiaEAs9u28orOGXdR
+McoDdWVaUo6xqNZvXpHNLJUTaE8+KTGeOGQ4ojAtzMdbQRPZFOnnBIrp9EYpddf1
+lLizk30yHK5Mr8YrPz5Djbz7aKrYR+HI/s3/OYbjvsqQlXH245iMT1iv0Apbc9nT
+u+r4zHbs8SscNXV30iFP
+=S0pE
 -----END PGP SIGNATURE-----
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} )
diff --git a/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild b/kde-base/kdelibs/kdelibs-4.6.2-r3.ebuild
index cad88ad09eb8..3b2c93717d4a 100644
--- a/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.6.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild,v 1.5 2011/05/01 13:55:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.2-r3.ebuild,v 1.1 2011/05/01 22:47:43 dilfridge Exp $
 
 EAPI=4
 
@@ -138,6 +138,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
 	"${FILESDIR}/${PN}-4.6.0-kateacc.patch"
 	"${FILESDIR}/${PN}-4.6.2-nonepomuk.patch"
+	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
 )
 
 pkg_pretend() {