| 1 |
commit: f1534bedb4964925c9bbfef13713c8d8e6854747 |
| 2 |
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 1 22:24:03 2011 +0000 |
| 4 |
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 1 22:24:03 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f1534bed |
| 7 |
|
| 8 |
[kde-base/kdelibs] do not suid kdeinit. Per bug #365633 |
| 9 |
|
| 10 |
--- |
| 11 |
.../files/kdelibs-4.6.3-no_suid_kdeinit.patch | 19 +++++++++++++++++++ |
| 12 |
kde-base/kdelibs/kdelibs-4.6.3.ebuild | 1 + |
| 13 |
kde-base/kdelibs/kdelibs-4.6.9999.ebuild | 1 + |
| 14 |
kde-base/kdelibs/kdelibs-9999.ebuild | 1 + |
| 15 |
4 files changed, 22 insertions(+), 0 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..4b34f62 |
| 20 |
--- /dev/null |
| 21 |
+++ b/kde-base/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch |
| 22 |
@@ -0,0 +1,19 @@ |
| 23 |
+diff -urN kdelibs-4.6.3.old/kinit/CMakeLists.txt kdelibs-4.6.3/kinit/CMakeLists.txt |
| 24 |
+--- kdelibs-4.6.3.old/kinit/CMakeLists.txt 2011-05-02 00:19:10.000000000 +0200 |
| 25 |
++++ kdelibs-4.6.3/kinit/CMakeLists.txt 2011-05-02 00:20:32.000000000 +0200 |
| 26 |
+@@ -170,15 +170,6 @@ |
| 27 |
+ install(TARGETS start_kdeinit_wrapper DESTINATION ${LIBEXEC_INSTALL_DIR}) |
| 28 |
+ endif (NOT WIN32) |
| 29 |
+ |
| 30 |
+-if (CMAKE_SYSTEM_NAME MATCHES Linux) |
| 31 |
+- MESSAGE(STATUS "Using setuid root kdeinit wrapper in order to protect it from bad Linux OOM-killer") |
| 32 |
+- set(KDEINIT_OOM_PROTECT 1) |
| 33 |
+- install(CODE " |
| 34 |
+- set(START_KDEINIT_PATH \"\$ENV{DESTDIR}${LIBEXEC_INSTALL_DIR}/start_kdeinit\") |
| 35 |
+- EXECUTE_PROCESS(COMMAND sh -c \"chown 0 '\${START_KDEINIT_PATH}' && chmod u+s '\${START_KDEINIT_PATH}'\") |
| 36 |
+- ") |
| 37 |
+-endif (CMAKE_SYSTEM_NAME MATCHES Linux) |
| 38 |
+- |
| 39 |
+ ########### install files ############### |
| 40 |
+ |
| 41 |
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KLauncher.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} ) |
| 42 |
|
| 43 |
diff --git a/kde-base/kdelibs/kdelibs-4.6.3.ebuild b/kde-base/kdelibs/kdelibs-4.6.3.ebuild |
| 44 |
index 51c7d4e..76410bc 100644 |
| 45 |
--- a/kde-base/kdelibs/kdelibs-4.6.3.ebuild |
| 46 |
+++ b/kde-base/kdelibs/kdelibs-4.6.3.ebuild |
| 47 |
@@ -133,6 +133,7 @@ PATCHES=( |
| 48 |
"${FILESDIR}/${PN}-4.5.90-mimetypes.patch" |
| 49 |
"${FILESDIR}/${PN}-4.4.90-xslt.patch" |
| 50 |
"${FILESDIR}/${PN}-4.6.2-nonepomuk.patch" |
| 51 |
+ "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" |
| 52 |
) |
| 53 |
|
| 54 |
pkg_pretend() { |
| 55 |
|
| 56 |
diff --git a/kde-base/kdelibs/kdelibs-4.6.9999.ebuild b/kde-base/kdelibs/kdelibs-4.6.9999.ebuild |
| 57 |
index c448e29..bbf33af 100644 |
| 58 |
--- a/kde-base/kdelibs/kdelibs-4.6.9999.ebuild |
| 59 |
+++ b/kde-base/kdelibs/kdelibs-4.6.9999.ebuild |
| 60 |
@@ -133,6 +133,7 @@ PATCHES=( |
| 61 |
"${FILESDIR}/${PN}-4.5.90-mimetypes.patch" |
| 62 |
"${FILESDIR}/${PN}-4.4.90-xslt.patch" |
| 63 |
"${FILESDIR}/${PN}-4.6.2-nonepomuk.patch" |
| 64 |
+ "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" |
| 65 |
) |
| 66 |
|
| 67 |
pkg_pretend() { |
| 68 |
|
| 69 |
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild |
| 70 |
index 1196c44..423e81e 100644 |
| 71 |
--- a/kde-base/kdelibs/kdelibs-9999.ebuild |
| 72 |
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild |
| 73 |
@@ -133,6 +133,7 @@ PATCHES=( |
| 74 |
"${FILESDIR}/${PN}-4.5.90-mimetypes.patch" |
| 75 |
"${FILESDIR}/${PN}-4.4.90-xslt.patch" |
| 76 |
"${FILESDIR}/${PN}-4.6.2-nonepomuk.patch" |
| 77 |
+ "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" |
| 78 |
) |
| 79 |
|
| 80 |
pkg_pretend() { |
Archives