[wicd] Apply upstream patch to fix exception when changing properties in

David Cantrell dcantrel at fedoraproject.org
Mon Dec 9 13:56:48 UTC 2013


commit a45da003c00a1f5b285ec9686833f0c5cfa08343
Author: David Cantrell <dcantrell at redhat.com>
Date:   Mon Dec 9 08:56:19 2013 -0500

    Apply upstream patch to fix exception when changing properties in
    
      wicd-gtk (#981667)

 770_769.diff |   16 ++++++++++++++++
 wicd.spec    |   12 +++++++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/770_769.diff b/770_769.diff
new file mode 100644
index 0000000..2fddc9a
--- /dev/null
+++ b/770_769.diff
@@ -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. """
+
diff --git a/wicd.spec b/wicd.spec
index 9b84364..d79771f 100644
--- a/wicd.spec
+++ b/wicd.spec
@@ -9,7 +9,7 @@
 
 Name:                wicd
 Version:             1.7.2.4
-Release:             7%{?dist}
+Release:             8%{?dist}
 Summary:             Wireless and wired network connection manager
 
 Group:               System Environment/Base
@@ -23,6 +23,7 @@ Patch1:              wicd-1.7.1-dbus-failure.patch
 Patch2:              wicd-1.7.0-dbus-policy.patch
 Patch3:              wicd-1.7.1-DaemonClosing.patch
 Patch4:              wicd-1.7.2.4-unicode.patch
+Patch5:              770_769.diff
 
 BuildRoot:           %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:       babel
@@ -106,6 +107,11 @@ Client program for wicd that uses a GTK+ interface.
 # Unicode string handling problems
 %patch4 -p1
 
+# Upstream patch:
+# http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/770
+# For https://bugzilla.redhat.com/show_bug.cgi?id=981667
+%patch5 -p0
+
 %build
 rm -f po/ast.po
 %{__python} setup.py configure \
@@ -275,6 +281,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg
 
 %changelog
+* Mon Dec 09 2013 David Cantrell <dcantrell at redhat.com> - 1.7.2.4-8
+- Apply upstream patch to fix exception when changing properties in
+  wicd-gtk (#981667)
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.2.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list