rev 18164 - in trunk/packages/kdelibs/debian: . patches

[Modestas Vainius]

Author: modax
Date: 2010-05-31 19:42:40 +0000 (Mon, 31 May 2010)
New Revision: 18164

Added:
   trunk/packages/kdelibs/debian/patches/30_kfileshare_kdesu_fileshareset.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/patches/series
Log:
Add 30_kfileshare_kdesu_fileshareset.diff patch to run libexec/fileshareset
with kdesu rather than expect it (perl script) to be suid root.

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2010-05-31 19:25:26 UTC (rev 18163)
+++ trunk/packages/kdelibs/debian/changelog	2010-05-31 19:42:40 UTC (rev 18164)
@@ -19,6 +19,8 @@
   * Drop patch system stuff from debian/README.source. Patch support is part of
     source format now.
   * Drop 00_4.4.3_final_tarball.diff patch, it was stolen from upstream.
+  * Add 30_kfileshare_kdesu_fileshareset.diff patch to run libexec/fileshareset
+    with kdesu rather than expect it (perl script) to be suid root.
 
   [ Pino Toscano ]
   * Fix typo in description of kdelibs-bin. (Closes: #582433)

Added: trunk/packages/kdelibs/debian/patches/30_kfileshare_kdesu_fileshareset.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/30_kfileshare_kdesu_fileshareset.diff	                        (rev 0)
+++ trunk/packages/kdelibs/debian/patches/30_kfileshare_kdesu_fileshareset.diff	2010-05-31 19:42:40 UTC (rev 18164)
@@ -0,0 +1,33 @@
+Description: run libexec/fileshareset with kdesu rather than setuid
+ Run fileshareset with kdesu rather than rely on it to be setuid. filesharelist
+ should not need root permissions on standard debian install.
+Author: Modestas Vainius <modax at debian.org>
+Forwareded: no
+Origin: vendor
+Last-Update: 2010-05-31
+
+
+--- a/kio/kio/kfileshare.cpp
++++ b/kio/kio/kfileshare.cpp
+@@ -239,17 +239,19 @@ bool KFileShare::setShared( const QStrin
+        return false;
+ 
+     kDebug(7000) << path << "," << shared;
++    QString kdesu = ::findExe("kdesu");
+     QString exe = ::findExe( "fileshareset" );
+-    if (exe.isEmpty())
++    if (kdesu.isEmpty() || exe.isEmpty())
+         return false;
+ 
+     QStringList args;
++    args << "--" << exe;
+     if ( shared )
+         args << "--add";
+     else
+         args << "--remove";
+     args << path ;
+-    int ec = QProcess::execute( exe, args ); // should be ok, the perl script terminates fast
++    int ec = QProcess::execute( kdesu, args ); // should be ok, the perl script terminates fast
+     kDebug(7000) << "exitCode=" << ec;
+     bool ok = !ec;
+     switch (ec) {

Modified: trunk/packages/kdelibs/debian/patches/series
===================================================================
--- trunk/packages/kdelibs/debian/patches/series	2010-05-31 19:25:26 UTC (rev 18163)
+++ trunk/packages/kdelibs/debian/patches/series	2010-05-31 19:42:40 UTC (rev 18164)
@@ -15,3 +15,4 @@
 27_konsole_kfreebsd_fix.diff
 28_find_old_kde4_html_documentation.diff
 29_hurd_support.diff
+30_kfileshare_kdesu_fileshareset.diff