[arch-commits] Commit in wicd/trunk (PKGBUILD dbus_string_fix.patch)

Daniel Isenmann daniel at archlinux.org
Sun May 6 20:23:38 UTC 2012


    Date: Sunday, May 6, 2012 @ 16:23:37
  Author: daniel
Revision: 158672

upgpkg: wicd 1.7.2.4-2

Bugfix release for FS#29709

Added:
  wicd/trunk/dbus_string_fix.patch
Modified:
  wicd/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   11 ++++++++---
 dbus_string_fix.patch |   16 ++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-06 19:37:42 UTC (rev 158671)
+++ PKGBUILD	2012-05-06 20:23:37 UTC (rev 158672)
@@ -5,25 +5,30 @@
 pkgbase=wicd
 pkgname=('wicd' 'wicd-gtk')
 pkgver=1.7.2.4
-pkgrel=1
+pkgrel=2
 arch=(any)
 url="http://wicd.sourceforge.net/"
 license=('GPL2')
 conflicts=('wicd-svn')
 install=wicd.install
 source=(http://launchpad.net/wicd/1.7/$pkgver/+download/wicd-$pkgver.tar.gz             wicd-daemon
-        wicd.desktop)
+        wicd.desktop
+        dbus_string_fix.patch)
 makedepends=('python2' 'python-babel' 'python2-distribute' 'gettext')
 options=('emptydirs')
 md5sums=('c2435ddfdef0b9898852d72a85a45f0f'
          'f40e5f59998d0829707a7c9976afa8f8'
-         '326df163a5732d38741371baa4fce9e5')
+         '326df163a5732d38741371baa4fce9e5'
+         '744b3c12fe901ed435351e884dc8cb1d')
 
 build() {
   cd $srcdir/$pkgbase-$pkgver
 
   find . -type f -exec sed -i 's@#!/usr.*python@#!/usr/bin/python2@' {} \;
   export PYTHON=python2
+  
+  patch -p0 < $srcdir/dbus_string_fix.patch
+  
   python2 setup.py configure --no-install-init \
 	                     --resume=/usr/share/wicd/scripts/ \
                              --suspend=/usr/share/wicd/scripts/ \

Added: dbus_string_fix.patch
===================================================================
--- dbus_string_fix.patch	                        (rev 0)
+++ dbus_string_fix.patch	2012-05-06 20:23:37 UTC (rev 158672)
@@ -0,0 +1,16 @@
+=== modified file 'wicd/misc.py'
+--- wicd/misc.py	2012-04-30 19:20:47 +0000
++++ wicd/misc.py	2012-05-03 16:01:49 +0000
+@@ -430,7 +430,10 @@
+     """ Sanitize property names to be used in config-files. """
+     allowed = string.ascii_letters + '_' + string.digits
+     table = string.maketrans(allowed, ' ' * len(allowed))
+-    return s.translate(None, table)
++
++    # s is a dbus.String -- since we don't allow unicode property keys,
++    # make it simple.
++    return str(s).translate(None, table)
+ 
+ def sanitize_escaped(s):
+     """ Sanitize double-escaped unicode strings. """
+




More information about the arch-commits mailing list