rev 15457 - in kde-extras/kdesudo/trunk/debian: . patches
Didier Raboud
odyx-guest at alioth.debian.org
Mon Aug 3 09:10:42 UTC 2009
Author: odyx-guest
Date: 2009-08-03 09:10:42 +0000 (Mon, 03 Aug 2009)
New Revision: 15457
Added:
kde-extras/kdesudo/trunk/debian/patches/bug525292_xauth_use_add_instead_of_generate.patch
kde-extras/kdesudo/trunk/debian/patches/series
Modified:
kde-extras/kdesudo/trunk/debian/changelog
kde-extras/kdesudo/trunk/debian/control
kde-extras/kdesudo/trunk/debian/rules
Log:
kdesudo: Fix RC bug 525292 with custom patch
- Urgency high
- Quilt b-d
Modified: kde-extras/kdesudo/trunk/debian/changelog
===================================================================
--- kde-extras/kdesudo/trunk/debian/changelog 2009-08-02 20:09:31 UTC (rev 15456)
+++ kde-extras/kdesudo/trunk/debian/changelog 2009-08-03 09:10:42 UTC (rev 15457)
@@ -1,3 +1,12 @@
+kdesudo (3.4.1-2) UNRELEASED; urgency=high
+
+ * Add patch bug525292_xauth_use_add_instead_of_generate.patch . It avoids
+ using the now disabled SECURITY X extension (Closes: #525292).
+ - Set high urgency for fixing an RC bug.
+ - Add quilt build-depends
+
+ -- Didier Raboud <didier at raboud.com> Mon, 03 Aug 2009 10:39:06 +0200
+
kdesudo (3.4.1-1) unstable; urgency=low
* New upstream release for KDE 4 (Closes: #505858)
Modified: kde-extras/kdesudo/trunk/debian/control
===================================================================
--- kde-extras/kdesudo/trunk/debian/control 2009-08-02 20:09:31 UTC (rev 15456)
+++ kde-extras/kdesudo/trunk/debian/control 2009-08-03 09:10:42 UTC (rev 15457)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Didier Raboud <didier at raboud.com>
-Build-Depends: debhelper (>> 7), cdbs, kdelibs5-dev, po-debconf, cmake
+Build-Depends: debhelper (>> 7), cdbs, kdelibs5-dev, po-debconf, cmake, quilt
Standards-Version: 3.8.1
Homepage: https://launchpad.net/kdesudo
Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kdesudo/trunk/
Added: kde-extras/kdesudo/trunk/debian/patches/bug525292_xauth_use_add_instead_of_generate.patch
===================================================================
--- kde-extras/kdesudo/trunk/debian/patches/bug525292_xauth_use_add_instead_of_generate.patch (rev 0)
+++ kde-extras/kdesudo/trunk/debian/patches/bug525292_xauth_use_add_instead_of_generate.patch 2009-08-03 09:10:42 UTC (rev 15457)
@@ -0,0 +1,27 @@
+Description: Xauth: Use a list-and-add scheme instead of the generate command.
+ The "xauth generate" command doesn't work in environments where the SECURITY X
+ extension is disabled (like in Debian).
+ .
+ This is obviously an ugly hack, but "works-here™"
+Origin: vendor
+Bug: http://bugs.debian.org/525292
+Forwarded: https://bugs.launchpad.net/kdesudo/+bug/365956
+Author: Didier Raboud <didier at raboud.com>
+Last-Update: 2009-08-03
+Index: kdesudo-3.4.1/kdesudo/kdesudo.cpp
+===================================================================
+--- kdesudo-3.4.1.orig/kdesudo/kdesudo.cpp 2009-08-03 10:21:39.000000000 +0200
++++ kdesudo-3.4.1/kdesudo/kdesudo.cpp 2009-08-03 10:22:15.000000000 +0200
+@@ -163,8 +163,10 @@
+
+ QByteArray disp = m_pCookie->display();
+
+- QString c = "/usr/bin/xauth -q -f " + m_tmpName + " generate "
+- + QString::fromLocal8Bit(disp) + " . trusted timeout 60 >/dev/null 2>&1";
++ QString c = "xauth_token=`/usr/bin/xauth -q list " + QString::fromLocal8Bit(disp)
++ + " | head -n 1 | awk '{ print $3; }'` &&"
++ + "/usr/bin/xauth -q -f " + m_tmpName + " add :0 . $xauth_token 2>/dev/null &&"
++ + "echo " + m_tmpName;
+
+ blockSigChild();
+ if (!(f = popen(QFile::encodeName(c), "r"))) {
Added: kde-extras/kdesudo/trunk/debian/patches/series
===================================================================
--- kde-extras/kdesudo/trunk/debian/patches/series (rev 0)
+++ kde-extras/kdesudo/trunk/debian/patches/series 2009-08-03 09:10:42 UTC (rev 15457)
@@ -0,0 +1 @@
+bug525292_xauth_use_add_instead_of_generate.patch
Modified: kde-extras/kdesudo/trunk/debian/rules
===================================================================
--- kde-extras/kdesudo/trunk/debian/rules 2009-08-02 20:09:31 UTC (rev 15456)
+++ kde-extras/kdesudo/trunk/debian/rules 2009-08-03 09:10:42 UTC (rev 15457)
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/cmake.mk
clean::
More information about the pkg-kde-commits
mailing list