From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QGf4a-0003vv-Vx for garchives@archives.gentoo.org; Sun, 01 May 2011 22:25:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 327E91C027; Sun, 1 May 2011 22:24:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DE7311C027 for ; Sun, 1 May 2011 22:24:57 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4C81C1B403A for ; Sun, 1 May 2011 22:24:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8318B80505 for ; Sun, 1 May 2011 22:24:56 +0000 (UTC) From: "Tomas Chvatal" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tomas Chvatal" Message-ID: Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch kde-base/kdelibs/kdelibs-4.6.3.ebuild kde-base/kdelibs/kdelibs-4.6.9999.ebuild kde-base/kdelibs/kdelibs-9999.ebuild X-VCS-Directories: kde-base/kdelibs/ kde-base/kdelibs/files/ X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal X-VCS-Revision: f1534bedb4964925c9bbfef13713c8d8e6854747 Date: Sun, 1 May 2011 22:24:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: f9c479fe2ac8a055e568b47da16b9a0b commit: f1534bedb4964925c9bbfef13713c8d8e6854747 Author: Tomas Chvatal gentoo org> AuthorDate: Sun May 1 22:24:03 2011 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Sun May 1 22:24:03 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Df1534bed [kde-base/kdelibs] do not suid kdeinit. Per bug #365633 --- .../files/kdelibs-4.6.3-no_suid_kdeinit.patch | 19 ++++++++++++++= +++++ kde-base/kdelibs/kdelibs-4.6.3.ebuild | 1 + kde-base/kdelibs/kdelibs-4.6.9999.ebuild | 1 + kde-base/kdelibs/kdelibs-9999.ebuild | 1 + 4 files changed, 22 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 0000000..4b34f62 --- /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/CMa= keLists.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 +02= 00 +@@ -170,15 +170,6 @@ + install(TARGETS start_kdeinit_wrapper DESTINATION ${LIBEXEC_INSTALL_D= IR}) + endif (NOT WIN32) +=20 +-if (CMAKE_SYSTEM_NAME MATCHES Linux) +- MESSAGE(STATUS "Using setuid root kdeinit wrapper in order to prote= ct it from bad Linux OOM-killer") +- set(KDEINIT_OOM_PROTECT 1) +- install(CODE " +- set(START_KDEINIT_PATH \"\$ENV{DESTDIR}${LIBEXEC_INSTALL_DIR}/s= tart_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 ############### +=20 + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KLauncher.xml DESTIN= ATION ${DBUS_INTERFACES_INSTALL_DIR} ) diff --git a/kde-base/kdelibs/kdelibs-4.6.3.ebuild b/kde-base/kdelibs/kde= libs-4.6.3.ebuild index 51c7d4e..76410bc 100644 --- a/kde-base/kdelibs/kdelibs-4.6.3.ebuild +++ b/kde-base/kdelibs/kdelibs-4.6.3.ebuild @@ -133,6 +133,7 @@ PATCHES=3D( "${FILESDIR}/${PN}-4.5.90-mimetypes.patch" "${FILESDIR}/${PN}-4.4.90-xslt.patch" "${FILESDIR}/${PN}-4.6.2-nonepomuk.patch" + "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" ) =20 pkg_pretend() { diff --git a/kde-base/kdelibs/kdelibs-4.6.9999.ebuild b/kde-base/kdelibs/= kdelibs-4.6.9999.ebuild index c448e29..bbf33af 100644 --- a/kde-base/kdelibs/kdelibs-4.6.9999.ebuild +++ b/kde-base/kdelibs/kdelibs-4.6.9999.ebuild @@ -133,6 +133,7 @@ PATCHES=3D( "${FILESDIR}/${PN}-4.5.90-mimetypes.patch" "${FILESDIR}/${PN}-4.4.90-xslt.patch" "${FILESDIR}/${PN}-4.6.2-nonepomuk.patch" + "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" ) =20 pkg_pretend() { diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdel= ibs-9999.ebuild index 1196c44..423e81e 100644 --- a/kde-base/kdelibs/kdelibs-9999.ebuild +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -133,6 +133,7 @@ PATCHES=3D( "${FILESDIR}/${PN}-4.5.90-mimetypes.patch" "${FILESDIR}/${PN}-4.4.90-xslt.patch" "${FILESDIR}/${PN}-4.6.2-nonepomuk.patch" + "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" ) =20 pkg_pretend() {