dcantrel pushed to wicd (master). "Upgrade to wicd-1.7.3 (#1176990)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 9 17:20:04 UTC 2015
>From 96a18146b22e2fa0eb624ff4ef6e57a7a874bfa7 Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrell at redhat.com>
Date: Thu, 9 Apr 2015 13:19:41 -0400
Subject: Upgrade to wicd-1.7.3 (#1176990)
diff --git a/.gitignore b/.gitignore
index fe25d73..30930fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-wicd-1.7.2.4.tar.gz
+wicd-1.7.3.tar.gz
diff --git a/770_769.diff b/770_769.diff
deleted file mode 100644
index 2fddc9a..0000000
--- a/770_769.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-=== 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/sources b/sources
index 9a163ee..775e7d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c2435ddfdef0b9898852d72a85a45f0f wicd-1.7.2.4.tar.gz
+162ca2e6f4ab903bb7ab2bc0adb7d1aa wicd-1.7.3.tar.gz
diff --git a/wicd-1.7.0-remove-WHEREAREMYFILES.patch b/wicd-1.7.0-remove-WHEREAREMYFILES.patch
deleted file mode 100644
index cf08ae5..0000000
--- a/wicd-1.7.0-remove-WHEREAREMYFILES.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -up wicd-1.7.0/in/man=wicd-curses.8.in.orig wicd-1.7.0/in/man=wicd-curses.8.in
---- wicd-1.7.0/in/man=wicd-curses.8.in.orig 2010-01-14 18:49:11.000000000 -1000
-+++ wicd-1.7.0/in/man=wicd-curses.8.in 2010-05-19 09:20:00.000000000 -1000
-@@ -57,10 +57,6 @@ Bring up instructions on how to edit the
- .BR O
- Raise the Ad-Hoc network creation dialog
-
--.SH "FILES"
--.TP
--.I ~/.wicd/WHEREAREMYFILES
--Reminder that your network configuration files are not here ;-)
- .PP
- .SH "SEE ALSO"
- .BR wicd-client (1),
-diff -up wicd-1.7.0/in/scripts=wicd-client.in.orig wicd-1.7.0/in/scripts=wicd-client.in
---- wicd-1.7.0/in/scripts=wicd-client.in.orig 2010-01-14 18:49:11.000000000 -1000
-+++ wicd-1.7.0/in/scripts=wicd-client.in 2010-05-19 09:20:25.000000000 -1000
-@@ -6,10 +6,6 @@ NC=$(tput sgr0)
- if [ ! -d "$HOME/.wicd" ]; then
- mkdir -p "$HOME/.wicd"
- fi
--# Make sure the user knows WHEREAREMYFILES ;-)
--if [ -e "%VARLIB%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then
-- ln -s "%VARLIB%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES"
--fi
- if [ "$DISPLAY" = "" ]; then
- if [ -x "%BIN%wicd-curses" ]; then
- if [ ! -f "$HOME/.wicd/CLIENT_CURSES_WARNING" ]; then
-diff -up wicd-1.7.0/in/scripts=wicd-curses.in.orig wicd-1.7.0/in/scripts=wicd-curses.in
---- wicd-1.7.0/in/scripts=wicd-curses.in.orig 2010-01-14 18:49:11.000000000 -1000
-+++ wicd-1.7.0/in/scripts=wicd-curses.in 2010-05-19 09:20:36.000000000 -1000
-@@ -2,8 +2,5 @@
- if [ ! -d "$HOME/.wicd" ]; then
- mkdir -p "$HOME/.wicd"
- fi
--if [ -e "%VARLIB%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then
-- ln -s "%VARLIB%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES"
--fi
-
- exec %PYTHON% -O %SHARE%curses/wicd-curses.py $@
-diff -up wicd-1.7.0/in/scripts=wicd-gtk.in.orig wicd-1.7.0/in/scripts=wicd-gtk.in
---- wicd-1.7.0/in/scripts=wicd-gtk.in.orig 2010-01-14 18:49:11.000000000 -1000
-+++ wicd-1.7.0/in/scripts=wicd-gtk.in 2010-05-19 09:20:44.000000000 -1000
-@@ -4,9 +4,5 @@
- if [ ! -d "$HOME/.wicd" ]; then
- mkdir -p "$HOME/.wicd"
- fi
--# Make sure the user knows WHEREAREMYFILES ;-)
--if [ -e "/var/lib/wicd/WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then
-- ln -s "/var/lib/wicd/WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES"
--fi
-
- exec %PYTHON% -O %SHARE%gtk/wicd-client.py $@
diff --git a/wicd-1.7.1-DaemonClosing.patch b/wicd-1.7.1-DaemonClosing.patch
deleted file mode 100644
index 1079523..0000000
--- a/wicd-1.7.1-DaemonClosing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up wicd-1.7.1/wicd/wicd-daemon.py.orig wicd-1.7.1/wicd/wicd-daemon.py
---- wicd-1.7.1/wicd/wicd-daemon.py.orig 2012-02-02 11:38:26.000000000 -0500
-+++ wicd-1.7.1/wicd/wicd-daemon.py 2012-03-22 10:21:38.735140300 -0400
-@@ -812,7 +812,7 @@ class WicdDaemon(dbus.service.Object):
- pass
-
- @dbus.service.signal(dbus_interface='org.wicd.daemon', signature='')
-- def DaemonClosing(self):
-+ def DaemonClosing(self, arg1=None, arg2=None):
- """ Emits a signal indicating the daemon will be closing. """
- pass
-
diff --git a/wicd-1.7.1-dbus-failure.patch b/wicd-1.7.1-dbus-failure.patch
deleted file mode 100644
index a9767e7..0000000
--- a/wicd-1.7.1-dbus-failure.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -up wicd-1.7.1/cli/wicd-cli.py.dbus-failure wicd-1.7.1/cli/wicd-cli.py
---- wicd-1.7.1/cli/wicd-cli.py.dbus-failure 2012-01-15 09:19:03.000000000 -0500
-+++ wicd-1.7.1/cli/wicd-cli.py 2012-02-10 15:26:31.709169719 -0500
-@@ -47,6 +47,10 @@ if not daemon:
- print 'Error connecting to wicd via D-Bus. Please make sure the wicd service is running.'
- sys.exit(3)
-
-+if daemon is None:
-+ print 'Error connecting to wicd via D-Bus. Please make sure the wicd service is running.'
-+ sys.exit(3)
-+
- parser = optparse.OptionParser()
-
- parser.add_option('--network', '-n', type='int', default=-1)
-diff -up wicd-1.7.1/curses/wicd-curses.py.dbus-failure wicd-1.7.1/curses/wicd-curses.py
---- wicd-1.7.1/curses/wicd-curses.py.dbus-failure 2012-02-02 11:38:26.000000000 -0500
-+++ wicd-1.7.1/curses/wicd-curses.py 2012-02-10 15:26:31.709169719 -0500
-@@ -1037,6 +1037,10 @@ def setup_dbus(force=True):
- print 'Error connecting to wicd via D-Bus. Please make sure the wicd service is running.'
- sys.exit(3)
-
-+ if daemon is None:
-+ print 'Error connecting to wicd via D-Bus. Please make sure the wicd service is running.'
-+ sys.exit(3)
-+
- netentry_curses.dbus_init(dbus_ifaces)
- return True
-
-diff -up wicd-1.7.1/gtk/gui.py.dbus-failure wicd-1.7.1/gtk/gui.py
---- wicd-1.7.1/gtk/gui.py.dbus-failure 2012-01-15 09:24:23.000000000 -0500
-+++ wicd-1.7.1/gtk/gui.py 2012-02-10 15:26:31.711170031 -0500
-@@ -158,6 +158,17 @@ class appGui(object):
- d.run()
- sys.exit(1)
-
-+ if daemon is None:
-+ errmsg = "Error connecting to wicd service via D-Bus." + \
-+ "Please ensure the wicd service is running."
-+ d = gtk.MessageDialog(parent=None,
-+ flags=gtk.DIALOG_MODAL,
-+ type=gtk.MESSAGE_ERROR,
-+ buttons=gtk.BUTTONS_OK,
-+ message_format=errmsg)
-+ d.run()
-+ sys.exit(1)
-+
- self.tray = tray
-
- gladefile = os.path.join(wpath.gtk, "wicd.ui")
diff --git a/wicd-1.7.2.4-curses_bz894646.patch b/wicd-1.7.2.4-curses_bz894646.patch
deleted file mode 100644
index 50495bd..0000000
--- a/wicd-1.7.2.4-curses_bz894646.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/curses/curses_misc.py b/curses/curses_misc.py
-index a779fa3..99a7db9 100644
---- a/curses/curses_misc.py
-+++ b/curses/curses_misc.py
-@@ -314,9 +314,9 @@ class ComboBox(urwid.WidgetWrap):
- #Send key to underlying widget:
- self._w.keypress(dim, k)
-
-- #def get_size(self):
--
-- def __init__(self,label='',list=[],attrs=('body','editnfc'),focus_attr='focus',use_enter=True,focus=0,callback=None,user_args=None):
-+ def __init__(self, label='', list=[], attrs=('body','editnfc'),
-+ focus_attr='focus', use_enter=True, focus=0, callback=None,
-+ user_args=None):
- """
- label : bit of text that preceeds the combobox. If it is "", then
- ignore it
-@@ -349,7 +349,7 @@ class ComboBox(urwid.WidgetWrap):
- # We need this to pick our keypresses
- self.use_enter = use_enter
-
-- self.focus = focus
-+ self._focus = focus
-
- self.callback = callback
- self.user_args = user_args
-@@ -358,6 +358,19 @@ class ComboBox(urwid.WidgetWrap):
- self.parent = None
- self.ui = None
- self.row = None
-+
-+ @property
-+ def focus(self):
-+ return self._focus
-+
-+ @focus.setter
-+ def focus(self, index):
-+ self._focus = index
-+
-+ @focus.deleter
-+ def focus(self):
-+ del self._focus
-+
- def set_list(self,list):
- self.list = list
-
diff --git a/wicd-1.7.2.4-prof_name.patch b/wicd-1.7.2.4-prof_name.patch
deleted file mode 100644
index 796647f..0000000
--- a/wicd-1.7.2.4-prof_name.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up wicd-1.7.2.4/curses/netentry_curses.py.orig wicd-1.7.2.4/curses/netentry_curses.py
---- wicd-1.7.2.4/curses/netentry_curses.py.orig 2014-11-25 11:22:47.141413897 -0500
-+++ wicd-1.7.2.4/curses/netentry_curses.py 2014-11-25 11:25:19.904413897 -0500
-@@ -264,7 +264,7 @@ class WiredSettingsDialog(AdvancedSettin
- self.set_values()
-
- self.prof_name = name
-- title = ''.join([_('Configuring preferences for wired profile'), self.prog_name])
-+ title = ''.join([_('Configuring preferences for wired profile'), self.prof_name])
- self._w.header = urwid.Text( ('header',title),align='right' )
-
- self.set_values()
diff --git a/wicd-1.7.2.4-sanitize.patch b/wicd-1.7.2.4-sanitize.patch
deleted file mode 100644
index 9722d92..0000000
--- a/wicd-1.7.2.4-sanitize.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up wicd-1.7.2.4/wicd/wicd-daemon.py.sanitize wicd-1.7.2.4/wicd/wicd-daemon.py
---- wicd-1.7.2.4/wicd/wicd-daemon.py.sanitize 2014-07-02 11:24:51.171030709 -0400
-+++ wicd-1.7.2.4/wicd/wicd-daemon.py 2014-07-02 11:25:09.780030709 -0400
-@@ -1064,7 +1064,7 @@ class WirelessDaemon(dbus.service.Object
- def SetWirelessProperty(self, netid, prop, value):
- """ Sets property to value in network specified. """
- # We don't write script settings here.
-- prop = misc.sanitize_config(prop)
-+ prop = misc.sanitize_config(str(prop))
- if prop.endswith('script'):
- print 'Setting script properties through the daemon' \
- + ' is not permitted.'
-@@ -1265,7 +1265,7 @@ class WirelessDaemon(dbus.service.Object
- @dbus.service.method('org.wicd.daemon.wireless')
- def SaveWirelessNetworkProperty(self, id, option):
- """ Writes a particular wireless property to disk. """
-- option = misc.sanitize_config(option)
-+ option = misc.sanitize_config(str(option))
- if option.endswith("script"):
- print 'You cannot save script information to disk through ' + \
- 'the daemon.'
-@@ -1408,7 +1408,7 @@ class WiredDaemon(dbus.service.Object):
- def SetWiredProperty(self, prop, value):
- """ Sets the given property to the given value. """
- if self.WiredNetwork:
-- prop = misc.sanitize_config(prop)
-+ prop = misc.sanitize_config(str(prop))
- if prop.endswith('script'):
- print 'Setting script properties through the daemon' \
- + ' is not permitted.'
diff --git a/wicd-1.7.2.4-translate-args.patch b/wicd-1.7.2.4-translate-args.patch
deleted file mode 100644
index ec0508d..0000000
--- a/wicd-1.7.2.4-translate-args.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up wicd-1.7.2.4/wicd/misc.py.orig wicd-1.7.2.4/wicd/misc.py
---- wicd-1.7.2.4/wicd/misc.py.orig 2014-09-25 15:58:24.170052173 -0400
-+++ wicd-1.7.2.4/wicd/misc.py 2014-09-25 16:00:04.175052173 -0400
-@@ -433,7 +433,7 @@ def sanitize_config(s):
-
- # s is a dbus.String -- since we don't allow unicode property keys,
- # make it simple.
-- return str(s).translate(None, table)
-+ return str(s).translate(table)
-
- def sanitize_escaped(s):
- """ Sanitize double-escaped unicode strings. """
diff --git a/wicd-1.7.2.4-unicode.patch b/wicd-1.7.2.4-unicode.patch
deleted file mode 100644
index 40ab99a..0000000
--- a/wicd-1.7.2.4-unicode.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up wicd-1.7.2.4/curses/netentry_curses.py.unicode wicd-1.7.2.4/curses/netentry_curses.py
---- wicd-1.7.2.4/curses/netentry_curses.py.unicode 2012-02-11 15:35:45.000000000 -0500
-+++ wicd-1.7.2.4/curses/netentry_curses.py 2012-10-23 14:06:36.537948070 -0400
-@@ -264,7 +264,7 @@ class WiredSettingsDialog(AdvancedSettin
- self.set_values()
-
- self.prof_name = name
-- title = _('Configuring preferences for wired profile "$A"').replace('$A',self.prof_name)
-+ title = ''.join([_('Configuring preferences for wired profile'), self.prog_name])
- self._w.header = urwid.Text( ('header',title),align='right' )
-
- self.set_values()
-@@ -386,7 +386,7 @@ class WirelessSettingsDialog(AdvancedSet
- self.encrypt_types = misc.LoadEncryptionMethods()
- self.set_values()
-
-- title = _('Configuring preferences for wireless network "$A" ($B)').replace('$A',wireless.GetWirelessProperty(networkID,'essid')).replace('$B',wireless.GetWirelessProperty(networkID,'bssid'))
-+ title = ''.join([_('Configuring preferences for wireless network'), wireless.GetWirelessProperty(networkID,'essid'), "(%s)" % wireless.GetWirelessProperty(networkID,'bssid')])
- self._w.header = urwid.Text(('header',title),align='right' )
-
- def set_values(self):
diff --git a/wicd-1.7.3-DaemonClosing.patch b/wicd-1.7.3-DaemonClosing.patch
new file mode 100644
index 0000000..782505b
--- /dev/null
+++ b/wicd-1.7.3-DaemonClosing.patch
@@ -0,0 +1,12 @@
+diff -up wicd-1.7.3/wicd/wicd-daemon.py.orig wicd-1.7.3/wicd/wicd-daemon.py
+--- wicd-1.7.3/wicd/wicd-daemon.py.orig 2014-12-21 14:40:46.000000000 -0500
++++ wicd-1.7.3/wicd/wicd-daemon.py 2015-04-09 10:27:54.203884159 -0400
+@@ -835,7 +835,7 @@ class WicdDaemon(dbus.service.Object, ob
+ pass
+
+ @dbus.service.signal(dbus_interface='org.wicd.daemon', signature='')
+- def DaemonClosing(self):
++ def DaemonClosing(self, arg1=None, arg2=None):
+ """ Emits a signal indicating the daemon will be closing. """
+ # By default, disconnect network links on close.
+ if not self.keep_connection:
diff --git a/wicd-1.7.3-dbus-failure.patch b/wicd-1.7.3-dbus-failure.patch
new file mode 100644
index 0000000..70a786a
--- /dev/null
+++ b/wicd-1.7.3-dbus-failure.patch
@@ -0,0 +1,49 @@
+diff -up wicd-1.7.3/cli/wicd-cli.py.orig wicd-1.7.3/cli/wicd-cli.py
+--- wicd-1.7.3/cli/wicd-cli.py.orig 2014-12-21 14:40:46.000000000 -0500
++++ wicd-1.7.3/cli/wicd-cli.py 2015-04-09 10:25:48.171078635 -0400
+@@ -61,6 +61,10 @@ if not daemon:
+ 'Please make sure the wicd service is running.'
+ sys.exit(3)
+
++if daemon is None:
++ print 'Error connecting to wicd via D-Bus. Please make sure the wicd service is running.'
++ sys.exit(3)
++
+ parser = optparse.OptionParser()
+
+ parser.add_option('--network', '-n', type='int', default=-1)
+diff -up wicd-1.7.3/curses/wicd-curses.py.orig wicd-1.7.3/curses/wicd-curses.py
+--- wicd-1.7.3/curses/wicd-curses.py.orig 2014-12-21 14:40:46.000000000 -0500
++++ wicd-1.7.3/curses/wicd-curses.py 2015-04-09 10:25:48.184078719 -0400
+@@ -1277,6 +1277,10 @@ def setup_dbus(force=True):
+ 'Please make sure the wicd service is running.'
+ sys.exit(3)
+
++ if daemon is None:
++ print 'Error connecting to wicd via D-Bus. Please make sure the wicd service is running.'
++ sys.exit(3)
++
+ netentry_curses.dbus_init(dbus_ifaces)
+ return True
+
+diff -up wicd-1.7.3/gtk/gui.py.orig wicd-1.7.3/gtk/gui.py
+--- wicd-1.7.3/gtk/gui.py.orig 2014-12-21 14:40:46.000000000 -0500
++++ wicd-1.7.3/gtk/gui.py 2015-04-09 10:25:48.184078719 -0400
+@@ -183,6 +183,17 @@ class appGui(object):
+ d.run()
+ sys.exit(1)
+
++ if daemon is None:
++ errmsg = "Error connecting to wicd service via D-Bus." + \
++ "Please ensure the wicd service is running."
++ d = gtk.MessageDialog(parent=None,
++ flags=gtk.DIALOG_MODAL,
++ type=gtk.MESSAGE_ERROR,
++ buttons=gtk.BUTTONS_OK,
++ message_format=errmsg)
++ d.run()
++ sys.exit(1)
++
+ self.tray = tray
+
+ gladefile = os.path.join(wpath.gtk, "wicd.ui")
diff --git a/wicd-1.7.3-remove-WHEREAREMYFILES.patch b/wicd-1.7.3-remove-WHEREAREMYFILES.patch
new file mode 100644
index 0000000..2b86867
--- /dev/null
+++ b/wicd-1.7.3-remove-WHEREAREMYFILES.patch
@@ -0,0 +1,53 @@
+diff -up wicd-1.7.3/in/man=wicd-curses.8.in.orig wicd-1.7.3/in/man=wicd-curses.8.in
+--- wicd-1.7.3/in/man=wicd-curses.8.in.orig 2014-12-21 14:40:46.000000000 -0500
++++ wicd-1.7.3/in/man=wicd-curses.8.in 2015-04-09 10:24:30.923580121 -0400
+@@ -60,10 +60,6 @@ Raise the Ad-Hoc network creation dialog
+ .BR X
+ Show the list of saved wireless networks, to be able to remove them
+
+-.SH "FILES"
+-.TP
+-.I ~/.wicd/WHEREAREMYFILES
+-Reminder that your network configuration files are not here ;-)
+ .PP
+ .SH "SEE ALSO"
+ .BR wicd-client (1),
+diff -up wicd-1.7.3/in/scripts=wicd-client.in.orig wicd-1.7.3/in/scripts=wicd-client.in
+--- wicd-1.7.3/in/scripts=wicd-client.in.orig 2014-12-21 14:40:46.000000000 -0500
++++ wicd-1.7.3/in/scripts=wicd-client.in 2015-04-09 10:24:30.923580121 -0400
+@@ -3,10 +3,6 @@
+ if [ ! -d "$HOME/.wicd" ]; then
+ mkdir -p "$HOME/.wicd"
+ fi
+-# Make sure the user knows WHEREAREMYFILES ;-)
+-if [ -e "%VARLIB%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then
+- ln -s "%VARLIB%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES"
+-fi
+ if [ "$DISPLAY" = "" ]; then
+ BOLD=$(tput bold)
+ BLUE=$(tput setaf 4)
+diff -up wicd-1.7.3/in/scripts=wicd-curses.in.orig wicd-1.7.3/in/scripts=wicd-curses.in
+--- wicd-1.7.3/in/scripts=wicd-curses.in.orig 2014-12-21 14:40:46.000000000 -0500
++++ wicd-1.7.3/in/scripts=wicd-curses.in 2015-04-09 10:24:30.924580127 -0400
+@@ -2,8 +2,5 @@
+ if [ ! -d "$HOME/.wicd" ]; then
+ mkdir -p "$HOME/.wicd"
+ fi
+-if [ -e "%VARLIB%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then
+- ln -s "%VARLIB%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES"
+-fi
+
+ exec %PYTHON% -O %SHARE%curses/wicd-curses.py $@
+diff -up wicd-1.7.3/in/scripts=wicd-gtk.in.orig wicd-1.7.3/in/scripts=wicd-gtk.in
+--- wicd-1.7.3/in/scripts=wicd-gtk.in.orig 2014-12-21 14:40:46.000000000 -0500
++++ wicd-1.7.3/in/scripts=wicd-gtk.in 2015-04-09 10:24:30.924580127 -0400
+@@ -4,9 +4,5 @@
+ if [ ! -d "$HOME/.wicd" ]; then
+ mkdir -p "$HOME/.wicd"
+ fi
+-# Make sure the user knows WHEREAREMYFILES ;-)
+-if [ -e "/var/lib/wicd/WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then
+- ln -s "/var/lib/wicd/WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES"
+-fi
+
+ exec %PYTHON% -O %SHARE%gtk/wicd-client.py $@
diff --git a/wicd-1.7.3-sanitize.patch b/wicd-1.7.3-sanitize.patch
new file mode 100644
index 0000000..d44137e
--- /dev/null
+++ b/wicd-1.7.3-sanitize.patch
@@ -0,0 +1,30 @@
+diff -up wicd-1.7.3/wicd/wicd-daemon.py.orig wicd-1.7.3/wicd/wicd-daemon.py
+--- wicd-1.7.3/wicd/wicd-daemon.py.orig 2015-04-09 13:13:54.419639555 -0400
++++ wicd-1.7.3/wicd/wicd-daemon.py 2015-04-09 13:14:28.473858534 -0400
+@@ -1111,7 +1111,7 @@ class WirelessDaemon(dbus.service.Object
+ def SetWirelessProperty(self, netid, prop, value):
+ """ Sets property to value in network specified. """
+ # We don't write script settings here.
+- prop = misc.sanitize_config(prop)
++ prop = misc.sanitize_config(str(prop))
+ if prop.endswith('script'):
+ print 'Setting script properties through the daemon' \
+ + ' is not permitted.'
+@@ -1321,7 +1321,7 @@ class WirelessDaemon(dbus.service.Object
+ @dbus.service.method('org.wicd.daemon.wireless')
+ def SaveWirelessNetworkProperty(self, nid, option):
+ """ Writes a particular wireless property to disk. """
+- option = misc.sanitize_config(option)
++ option = misc.sanitize_config(str(option))
+ if option.endswith("script"):
+ print 'You cannot save script information to disk through ' + \
+ 'the daemon.'
+@@ -1488,7 +1488,7 @@ class WiredDaemon(dbus.service.Object, o
+ def SetWiredProperty(self, prop, value):
+ """ Sets the given property to the given value. """
+ if self.WiredNetwork:
+- prop = misc.sanitize_config(prop)
++ prop = misc.sanitize_config(str(prop))
+ if prop.endswith('script'):
+ print 'Setting script properties through the daemon' \
+ + ' is not permitted.'
diff --git a/wicd-1.7.3-unicode.patch b/wicd-1.7.3-unicode.patch
new file mode 100644
index 0000000..91763f1
--- /dev/null
+++ b/wicd-1.7.3-unicode.patch
@@ -0,0 +1,26 @@
+diff -up wicd-1.7.3/curses/netentry_curses.py.orig wicd-1.7.3/curses/netentry_curses.py
+--- wicd-1.7.3/curses/netentry_curses.py.orig 2014-12-21 14:40:46.000000000 -0500
++++ wicd-1.7.3/curses/netentry_curses.py 2015-04-09 13:18:04.624248481 -0400
+@@ -340,8 +340,7 @@ class WiredSettingsDialog(AdvancedSettin
+ self.set_values()
+
+ self.prof_name = name
+- title = _('Configuring preferences for wired profile "$A"'). \
+- replace('$A', self.prof_name)
++ title = ' '.join([_('Configuring preferences for wired profile'), self.prof_name])
+ self._w.header = urwid.Text(('header', title), align='right')
+
+ self.set_values()
+@@ -502,9 +501,9 @@ class WirelessSettingsDialog(AdvancedSet
+ self.encrypt_types = misc.LoadEncryptionMethods()
+ self.set_values()
+
+- title = _('Configuring preferences for wireless network "$A" ($B)'). \
+- replace('$A', wireless.GetWirelessProperty(networkID, 'essid')). \
+- replace('$B', wireless.GetWirelessProperty(networkID, 'bssid'))
++ title = ' '.join([_('Configuring preferences for wireless network'),
++ wireless.GetWirelessProperty(networkID,'essid'),
++ "(%s)" % wireless.GetWirelessProperty(networkID,'bssid')])
+ self._w.header = urwid.Text(('header', title), align='right')
+
+ def set_values(self):
diff --git a/wicd.spec b/wicd.spec
index edceffa..a153c20 100644
--- a/wicd.spec
+++ b/wicd.spec
@@ -8,26 +8,23 @@
%define debug_package %{nil}
Name: wicd
-Version: 1.7.2.4
-Release: 16%{?dist}
+Version: 1.7.3
+Release: 1%{?dist}
Summary: Wireless and wired network connection manager
Group: System Environment/Base
License: GPLv2+
-URL: http://wicd.sourceforge.net/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+URL: https://launchpad.net/wicd/
+Source0: https://launchpad.net/wicd/1.7/%{version}/+download/%{name}-%{version}.tar.gz
Source1: org.wicd.daemon.service
-Patch0: wicd-1.7.0-remove-WHEREAREMYFILES.patch
-Patch1: wicd-1.7.1-dbus-failure.patch
+Patch0: wicd-1.7.3-remove-WHEREAREMYFILES.patch
+Patch1: wicd-1.7.3-dbus-failure.patch
Patch2: wicd-1.7.2.4-dbus-policy.patch
-Patch3: wicd-1.7.1-DaemonClosing.patch
-Patch4: wicd-1.7.2.4-unicode.patch
-Patch5: 770_769.diff
-Patch6: wicd-1.7.2.4-curses_bz894646.patch
-Patch7: wicd-1.7.2.4-sanitize.patch
+Patch3: wicd-1.7.3-DaemonClosing.patch
+Patch4: wicd-1.7.3-unicode.patch
+Patch7: wicd-1.7.3-sanitize.patch
Patch8: wicd-1.7.2.4-translate-args.patch
-Patch9: wicd-1.7.2.4-prof_name.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: babel
@@ -108,29 +105,13 @@ Client program for wicd that uses a GTK+ interface.
%patch3 -p1
# 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
-
-# Fix curses client crash on startup.
-# https://bugzilla.redhat.com/show_bug.cgi?id=894646
-%patch6 -p1
+%patch4 -p1 -b .orig
# Prevent crash when saving network settings
# Upstream bug report and patch:
# https://bugs.launchpad.net/wicd/+bug/993912
%patch7 -p1
-# translate() on a string requires the table as the first argument
-# https://bugzilla.redhat.com/show_bug.cgi?id=1005515
-%patch8 -p1
-
-# self.prog_name should be self.prof_name (#1162118)
-%patch9 -p1
-
%build
rm -f po/ast.po
%{__python} setup.py configure \
@@ -299,6 +280,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg
%changelog
+* Thu Apr 09 2015 David Cantrell <dcantrell at redhat.com> - 1.7.3-1
+- Upgrade to wicd-1.7.3 (#1176990)
+
* Thu Apr 09 2015 David Cantrell <dcantrell at redhat.com> - 1.7.2.4-16
- Remove dependency on pm-utils (#1208313)
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/wicd.git/commit/?h=master&id=96a18146b22e2fa0eb624ff4ef6e57a7a874bfa7
More information about the scm-commits
mailing list