Compare commits
58 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a41ebbd2ab | ||
|
|
94cd0795b6 | ||
| 441fb36941 | |||
|
|
5e145af3d2 | ||
|
|
5ad4e702cd | ||
|
|
ddae43d1f7 | ||
|
|
3eac356f55 | ||
| e5ca93f251 | |||
|
|
7eff0d6285 | ||
|
|
25cb05879d | ||
|
|
ce8c6c89ee | ||
|
|
841eee5a4f | ||
|
|
ae7742dcd7 | ||
|
|
2179b70a4b | ||
|
|
90b42cc9b4 | ||
|
|
48ba61c71e | ||
|
|
5474a54f73 | ||
|
|
0055b5a448 | ||
|
|
17a18bb8db | ||
|
|
65440e4966 | ||
|
|
59d72d40cc | ||
|
|
b833dc34e0 | ||
|
|
96a18146b2 | ||
|
|
97a738e359 | ||
|
|
4a5124dbc2 | ||
|
|
7523d014a3 | ||
|
|
01a181a9fb | ||
|
|
7baa159fe9 | ||
|
|
55b6a950f7 | ||
| a418458e3c | |||
|
|
1828b1dd1e | ||
|
|
aa678f6fce | ||
|
|
f2dc53aa3f | ||
|
|
a45da003c0 | ||
|
|
0e0fcc5867 | ||
|
|
60425f8a7c | ||
|
|
357efedf47 | ||
|
|
9d2447bd84 | ||
|
|
8def0d7bbe | ||
|
|
299042626c | ||
|
|
35e4310725 | ||
|
|
80eafe0546 | ||
|
|
238c818670 | ||
|
|
fa1e9f6038 | ||
|
|
29a13776ba | ||
|
|
f0c195baf1 | ||
|
|
4dee156ed8 | ||
|
|
ed242365fb | ||
|
|
693809f4a3 | ||
|
|
cd9993d45e | ||
|
|
eb6827b624 | ||
|
|
a5fe60f17b | ||
|
|
32a2db9bf6 | ||
|
|
89370f8843 | ||
|
|
c2d5eff08c | ||
|
|
befbfe6e38 | ||
|
|
95559128ea | ||
|
|
72dbba8484 |
13 changed files with 1 additions and 768 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1 +0,0 @@
|
|||
wicd-1.7.2.1.tar.gz
|
||||
1
dead.package
Normal file
1
dead.package
Normal file
|
|
@ -0,0 +1 @@
|
|||
Orphaned for 6+ weeks
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# This D-Bus service activation file is only for systemd support since
|
||||
# an auto-activated wicd would be quite surprising for those people
|
||||
# who have wicd installed but turned off. Thus the Exec path available to
|
||||
# D-Bus is /bin/false, but systemd knows the real Exec path due to the
|
||||
# wicd systemd .service file.
|
||||
|
||||
[D-BUS Service]
|
||||
Name=org.wicd.daemon
|
||||
Exec=/bin/false
|
||||
User=root
|
||||
SystemdService=dbus-org.wicd.daemon.service
|
||||
1
sources
1
sources
|
|
@ -1 +0,0 @@
|
|||
96c0a08b2bc0c7f1977219a58ad70cd9 wicd-1.7.2.1.tar.gz
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
diff -up wicd-1.7.0/in/other=wicd.conf.in.orig wicd-1.7.0/in/other=wicd.conf.in
|
||||
--- wicd-1.7.0/in/other=wicd.conf.in.orig 2010-01-14 23:49:11.000000000 -0500
|
||||
+++ wicd-1.7.0/in/other=wicd.conf.in 2011-08-11 16:57:20.818332542 -0400
|
||||
@@ -7,41 +7,24 @@
|
||||
<allow own="org.wicd.daemon"/>
|
||||
<allow send_destination="org.wicd.daemon"/>
|
||||
<allow send_interface="org.wicd.daemon"/>
|
||||
- <allow send_destination="org.wicd.daemon.wireless"/>
|
||||
- <allow send_interface="org.wicd.daemon.wireless"/>
|
||||
- <allow send_destination="org.wicd.daemon.wired"/>
|
||||
- <allow send_interface="org.wicd.daemon.wired"/>
|
||||
+ <allow send_destination="org.wicd.daemon.wireless"/>
|
||||
+ <allow send_interface="org.wicd.daemon.wireless"/>
|
||||
+ <allow send_destination="org.wicd.daemon.wired"/>
|
||||
+ <allow send_interface="org.wicd.daemon.wired"/>
|
||||
</policy>
|
||||
|
||||
<policy context="default">
|
||||
<deny own="org.wicd.daemon"/>
|
||||
</policy>
|
||||
|
||||
- <!-- This Unix group will have permission to use Wicd's gui -->
|
||||
- <policy group="%WICDGROUP%">
|
||||
- <allow send_destination="org.wicd.daemon"/>
|
||||
- <allow send_interface="org.wicd.daemon"/>
|
||||
- <allow send_interface="org.freedesktop.DBus.Introspectable"/>
|
||||
- <!-- The Introspectable allow shouldn't be needed here, but
|
||||
- it seems that a few distributions aren't yet allowing
|
||||
- it in their hal configs, and we need it here, so... -->
|
||||
- </policy>
|
||||
-
|
||||
- <!-- Comment the block below if you do not want all users logged in
|
||||
- locally to have permission to use wicd-client. This ignores the
|
||||
- group based permission model defined above for the "%WICDGROUP%"
|
||||
- group. Note that this only applies if you are using ConsoleKit -
|
||||
- if you do not have ConsoleKit installed and in use, then this
|
||||
- block makes no difference either way. -->
|
||||
-
|
||||
<policy at_console="true">
|
||||
<allow send_destination="org.wicd.daemon"/>
|
||||
<allow send_interface="org.wicd.daemon"/>
|
||||
- <allow send_destination="org.wicd.daemon.wireless"/>
|
||||
- <allow send_interface="org.wicd.daemon.wireless"/>
|
||||
- <allow send_destination="org.wicd.daemon.wired"/>
|
||||
- <allow send_interface="org.wicd.daemon.wired"/>
|
||||
- <allow send_interface="org.freedesktop.DBus.Introspectable"/>
|
||||
+ <allow send_destination="org.wicd.daemon.wireless"/>
|
||||
+ <allow send_interface="org.wicd.daemon.wireless"/>
|
||||
+ <allow send_destination="org.wicd.daemon.wired"/>
|
||||
+ <allow send_interface="org.wicd.daemon.wired"/>
|
||||
+ <allow send_interface="org.freedesktop.DBus.Introspectable"/>
|
||||
</policy>
|
||||
|
||||
</busconfig>
|
||||
|
|
@ -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 $@
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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")
|
||||
|
|
@ -1,84 +0,0 @@
|
|||
diff -up wicd-1.7.2.1/wicd/wicd-daemon.py.CVE-2012-2095 wicd-1.7.2.1/wicd/wicd-daemon.py
|
||||
--- wicd-1.7.2.1/wicd/wicd-daemon.py.CVE-2012-2095 2012-08-02 13:30:29.880928627 -0400
|
||||
+++ wicd-1.7.2.1/wicd/wicd-daemon.py 2012-08-02 13:32:44.938076206 -0400
|
||||
@@ -946,28 +946,6 @@ class WirelessDaemon(dbus.service.Object
|
||||
self.LastScan = []
|
||||
self.config = ConfigManager(wireless_conf, debug=debug)
|
||||
|
||||
- self._validProperties = (
|
||||
- 'bssid',
|
||||
- 'essid',
|
||||
- 'hidden',
|
||||
- 'channel',
|
||||
- 'mode',
|
||||
- 'enctype',
|
||||
- 'encryption_method',
|
||||
- 'key',
|
||||
- 'automatic',
|
||||
- 'ip',
|
||||
- 'netmask',
|
||||
- 'broadcast',
|
||||
- 'gateway',
|
||||
- 'use_static_dns',
|
||||
- 'use_global_dns',
|
||||
- 'dns1',
|
||||
- 'dns2',
|
||||
- 'dns3',
|
||||
- 'use_settings_globally',
|
||||
- )
|
||||
-
|
||||
def get_debug_mode(self):
|
||||
return self._debug_mode
|
||||
def set_debug_mode(self, mode):
|
||||
@@ -1086,9 +1064,9 @@ 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.
|
||||
- if prop.strip() not in self._validProperties:
|
||||
- print "Trying to set invalid property (or property not " \
|
||||
- "permitted): "+ prop.strip() + "."
|
||||
+ if misc.sanitize_config(prop).endswith('script'):
|
||||
+ print 'Setting script properties through the daemon' \
|
||||
+ + ' is not permitted.'
|
||||
return False
|
||||
self.LastScan[netid][prop] = misc.to_unicode(misc.Noneify(value))
|
||||
|
||||
@@ -1377,25 +1355,6 @@ class WiredDaemon(dbus.service.Object):
|
||||
self.WiredNetwork = {}
|
||||
self.config = ConfigManager(wired_conf, debug=debug)
|
||||
|
||||
- self._validProperties = (
|
||||
- 'ip',
|
||||
- 'broadcast',
|
||||
- 'netmask',
|
||||
- 'gateway',
|
||||
- 'search_domain',
|
||||
- 'dns_domain',
|
||||
- 'dns1',
|
||||
- 'dns2',
|
||||
- 'dns3',
|
||||
- 'encryption_enabled',
|
||||
- 'default',
|
||||
- 'dhcphostname',
|
||||
- 'lastused',
|
||||
- 'profilename',
|
||||
- 'use_global_dns',
|
||||
- 'use_static_dns',
|
||||
- )
|
||||
-
|
||||
def get_debug_mode(self):
|
||||
return self._debug_mode
|
||||
def set_debug_mode(self, mode):
|
||||
@@ -1447,9 +1406,9 @@ class WiredDaemon(dbus.service.Object):
|
||||
def SetWiredProperty(self, prop, value):
|
||||
""" Sets the given property to the given value. """
|
||||
if self.WiredNetwork:
|
||||
- if prop.strip() not in self._validProperties:
|
||||
- print "Trying to set invalid property (or property not " \
|
||||
- "permitted): "+ prop.strip() + "."
|
||||
+ if misc.sanitize_config(prop).endswith('script'):
|
||||
+ print 'Setting script properties through the daemon' \
|
||||
+ + ' is not permitted.'
|
||||
return False
|
||||
self.WiredNetwork[prop] = misc.to_unicode(misc.Noneify(value))
|
||||
return True
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
diff -up wicd-1.7.2.1/curses/curses_misc.py.orig wicd-1.7.2.1/curses/curses_misc.py
|
||||
--- wicd-1.7.2.1/curses/curses_misc.py.orig 2011-10-18 17:26:55.000000000 -0400
|
||||
+++ wicd-1.7.2.1/curses/curses_misc.py 2013-03-14 14:48:27.145602491 -0400
|
||||
@@ -350,6 +350,10 @@ class ComboBox(urwid.WidgetWrap):
|
||||
self.use_enter = use_enter
|
||||
|
||||
self.focus = focus
|
||||
+ if urwid.VERSION < (1, 1, 0):
|
||||
+ self.focus = focus
|
||||
+ else:
|
||||
+ self._w.focus_position = focus
|
||||
|
||||
self.callback = callback
|
||||
self.user_args = user_args
|
||||
@@ -363,6 +367,14 @@ class ComboBox(urwid.WidgetWrap):
|
||||
|
||||
def set_focus(self,index):
|
||||
self.focus = index
|
||||
+ if urwid.VERSION < (1, 1, 0):
|
||||
+ self.focus = index
|
||||
+ else:
|
||||
+ try:
|
||||
+ self._w.focus_position = index
|
||||
+ except IndexError:
|
||||
+ pass
|
||||
+
|
||||
# API changed between urwid 0.9.8.4 and 0.9.9
|
||||
try:
|
||||
self.cbox.set_w(SelText(self.list[index]+self.DOWN_ARROW))
|
||||
@@ -376,16 +388,21 @@ class ComboBox(urwid.WidgetWrap):
|
||||
def build_combobox(self,parent,ui,row):
|
||||
str,trash = self.label.get_text()
|
||||
|
||||
- self.cbox = DynWrap(SelText([self.list[self.focus]+self.DOWN_ARROW]),
|
||||
+ if urwid.VERSION < (1, 1, 0):
|
||||
+ index = self.focus
|
||||
+ else:
|
||||
+ index = self._w.focus_position
|
||||
+
|
||||
+ self.cbox = DynWrap(SelText([self.list[index]+self.DOWN_ARROW]),
|
||||
attrs=self.attrs,focus_attr=self.focus_attr)
|
||||
if str != '':
|
||||
w = urwid.Columns([('fixed',len(str),self.label),self.cbox],
|
||||
dividechars=1)
|
||||
- self.overlay = self.ComboSpace(self.list,parent,ui,self.focus,
|
||||
+ self.overlay = self.ComboSpace(self.list,parent,ui,index,
|
||||
pos=(len(str)+1,row))
|
||||
else:
|
||||
w = urwid.Columns([self.cbox])
|
||||
- self.overlay = self.ComboSpace(self.list,parent,ui,self.focus,
|
||||
+ self.overlay = self.ComboSpace(self.list,parent,ui,index,
|
||||
pos=(0,row))
|
||||
|
||||
self._w = w
|
||||
@@ -419,7 +436,10 @@ class ComboBox(urwid.WidgetWrap):
|
||||
if self.overlay:
|
||||
return self.overlay._listbox.get_focus()
|
||||
else:
|
||||
- return None,self.focus
|
||||
+ if urwid.VERSION < (1, 1, 0):
|
||||
+ return None, self.focus
|
||||
+ else:
|
||||
+ return None, self._w.focus_position
|
||||
|
||||
def get_sensitive(self):
|
||||
return self.cbox.get_sensitive()
|
||||
diff -up wicd-1.7.2.1/curses/wicd-curses.py.orig wicd-1.7.2.1/curses/wicd-curses.py
|
||||
--- wicd-1.7.2.1/curses/wicd-curses.py.orig 2012-04-12 15:59:00.000000000 -0400
|
||||
+++ wicd-1.7.2.1/curses/wicd-curses.py 2013-03-14 14:41:35.895635604 -0400
|
||||
@@ -1042,6 +1042,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
|
||||
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
diff -up wicd-1.7.2.1/wicd/misc.py.orig wicd-1.7.2.1/wicd/misc.py
|
||||
--- wicd-1.7.2.1/wicd/misc.py.orig 2012-02-17 08:19:13.000000000 -0500
|
||||
+++ wicd-1.7.2.1/wicd/misc.py 2013-03-14 14:54:12.672935263 -0400
|
||||
@@ -612,3 +612,12 @@ def grouper(n, iterable, fillvalue=None)
|
||||
"""
|
||||
args = [iter(iterable)] * n
|
||||
return izip_longest(fillvalue=fillvalue, *args)
|
||||
+
|
||||
+def sanitize_config(s):
|
||||
+ """ Sanitize property names to be used in config-files. """
|
||||
+ allowed = string.ascii_letters + '_' + string.digits
|
||||
+ table = string.maketrans(allowed, ' ' * len(allowed))
|
||||
+
|
||||
+ # s is a dbus.String -- since we don't allow unicode property keys,
|
||||
+ # make it simple.
|
||||
+ return s.encode('ascii', 'replace').translate(None, table)
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
diff -up wicd-1.7.2.1/curses/netentry_curses.py.unicode wicd-1.7.2.1/curses/netentry_curses.py
|
||||
--- wicd-1.7.2.1/curses/netentry_curses.py.unicode 2012-02-11 15:35:45.000000000 -0500
|
||||
+++ wicd-1.7.2.1/curses/netentry_curses.py 2012-10-23 14:18:22.243926856 -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):
|
||||
386
wicd.spec
386
wicd.spec
|
|
@ -1,386 +0,0 @@
|
|||
%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
|
||||
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
||||
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
|
||||
%endif
|
||||
|
||||
%{!?_systemd_unitdir: %global _systemd_unitdir %(pkg-config systemd --variable=systemdsystemunitdir)}
|
||||
|
||||
%define debug_package %{nil}
|
||||
|
||||
Name: wicd
|
||||
Version: 1.7.2.1
|
||||
Release: 5%{?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
|
||||
Source1: org.wicd.daemon.service
|
||||
|
||||
Patch0: wicd-1.7.0-remove-WHEREAREMYFILES.patch
|
||||
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.1-CVE-2012-2095.patch
|
||||
Patch5: wicd-1.7.2.1-unicode.patch
|
||||
Patch6: wicd-1.7.2.1-new-urwid.patch
|
||||
Patch7: wicd-1.7.2.1-sanitize_config.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
|
||||
BuildRequires: babel
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: systemd-units
|
||||
|
||||
Requires: pm-utils >= 1.2.4
|
||||
Requires: %{name}-common = %{version}-%{release}
|
||||
|
||||
%description
|
||||
Wicd is designed to give the user as much control over behavior of network
|
||||
connections as possible. Every network, both wired and wireless, has its
|
||||
own profile with its own configuration options and connection behavior.
|
||||
Wicd will try to automatically connect only to networks the user specifies
|
||||
it should try, with a preference first to a wired network, then to wireless.
|
||||
|
||||
This package provides the architecture-dependent components of wicd.
|
||||
|
||||
%package common
|
||||
Summary: Wicd common files
|
||||
Group: System Environment/Base
|
||||
BuildArch: noarch
|
||||
Requires: dbus
|
||||
Requires: dbus-python
|
||||
Requires: dhclient
|
||||
Requires: ethtool
|
||||
Requires: iproute
|
||||
Requires: logrotate
|
||||
Requires: net-tools
|
||||
Requires: wireless-tools
|
||||
Requires: wpa_supplicant
|
||||
Requires: pygobject2
|
||||
Requires(post): systemd-units
|
||||
Requires(preun): systemd-units
|
||||
Requires(postun): systemd-units
|
||||
|
||||
%description common
|
||||
This package provides the main wicd daemon and the wicd-cli front-end.
|
||||
|
||||
%package curses
|
||||
Summary: Curses client for wicd
|
||||
Group: Applications/System
|
||||
BuildArch: noarch
|
||||
Requires: %{name}-common = %{version}-%{release}
|
||||
Requires: python-urwid >= 0.9.8.3
|
||||
|
||||
%description curses
|
||||
Client program for wicd that uses a curses interface.
|
||||
|
||||
%package gtk
|
||||
Summary: GTK+ client for wicd
|
||||
Group: Applications/Internet
|
||||
BuildArch: noarch
|
||||
Requires: %{name}-common = %{version}-%{release}
|
||||
Requires: notify-python
|
||||
Requires: pygtk2-libglade >= 2.10
|
||||
|
||||
%description gtk
|
||||
Client program for wicd that uses a GTK+ interface.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
# Remove the WHEREAREMYFILES and resetting of ~/.wicd/WHEREAREMYFILES
|
||||
# This is pointless. The documentation can just provide WHEREAREMYFILES,
|
||||
# which we do in this package.
|
||||
%patch0 -p1
|
||||
|
||||
# Handle D-Bus connection failures a little better
|
||||
%patch1 -p1
|
||||
|
||||
# Allow users at the console to control wicd
|
||||
%patch2 -p1
|
||||
|
||||
# Work around bug in DaemonClosing() calls
|
||||
%patch3 -p1
|
||||
|
||||
# Correct errors with the original fix for CVE-2012-2095
|
||||
# (see f16 branch for more details on this change)
|
||||
%patch4 -p1
|
||||
|
||||
# Fix some Unicode text handling problems
|
||||
%patch5 -p1
|
||||
|
||||
# Attempt to work with the latest python-urwid
|
||||
# There are upstream patches and the problem is described here:
|
||||
# https://bugs.launchpad.net/wicd/+bug/1075399
|
||||
# Gentoo appears to be successfully (?) using these patches, whatever
|
||||
# that's worth.
|
||||
%patch6 -p1
|
||||
|
||||
# Add missing sanitize_config() function from upstream
|
||||
%patch7 -p1
|
||||
|
||||
%build
|
||||
rm -f po/ast.po
|
||||
%{__python} setup.py configure \
|
||||
--distro redhat \
|
||||
--lib %{_libdir} \
|
||||
--share %{_datadir}/wicd \
|
||||
--etc %{_sysconfdir}/wicd \
|
||||
--bin %{_bindir} \
|
||||
--pmutils %{_libdir}/pm-utils/sleep.d \
|
||||
--log %{_localstatedir}/log \
|
||||
--systemd %{_systemd_unitdir} \
|
||||
--no-install-init
|
||||
%{__python} setup.py build
|
||||
%{__python} setup.py compile_translations
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
%{__python} setup.py install --skip-build --no-compile --root %{buildroot}
|
||||
sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/backends/be-external.py
|
||||
sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/backends/be-ioctl.py
|
||||
sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/cli/wicd-cli.py
|
||||
sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/curses/curses_misc.py
|
||||
sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/curses/netentry_curses.py
|
||||
sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/curses/prefs_curses.py
|
||||
sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/daemon/wicd-daemon.py
|
||||
sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/gtk/gui.py
|
||||
sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/gtk/prefs.py
|
||||
sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/gtk/wicd-client.py
|
||||
|
||||
rm -f %{buildroot}%{_localstatedir}/lib/wicd/WHEREAREMYFILES
|
||||
rm -rf %{buildroot}%{_datadir}/doc
|
||||
find %{buildroot} -type f -name ".empty_on_purpose" | xargs rm
|
||||
|
||||
for lib in %{buildroot}%{python_sitelib}/wicd/*.py ; do
|
||||
sed '/\/usr\/bin\/env/d' $lib > $lib.new &&
|
||||
touch -r $lib $lib.new &&
|
||||
mv $lib.new $lib
|
||||
done
|
||||
|
||||
mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services
|
||||
install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/dbus-1/system-services/org.wicd.daemon.service
|
||||
|
||||
mv %{buildroot}%{_sysconfdir}/logrotate.d/%{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
|
||||
|
||||
desktop-file-install \
|
||||
--remove-category="Application" \
|
||||
--delete-original \
|
||||
--dir=%{buildroot}%{_datadir}/applications \
|
||||
%{buildroot}%{_datadir}/applications/wicd.desktop
|
||||
|
||||
desktop-file-install \
|
||||
--dir=%{buildroot}%{_sysconfdir}/xdg/autostart \
|
||||
%{buildroot}%{_sysconfdir}/xdg/autostart/wicd-tray.desktop
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%post common
|
||||
if [ $1 -eq 1 ]; then
|
||||
# Package install, not upgrade
|
||||
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%preun common
|
||||
if [ $1 -eq 0 ] ; then
|
||||
# Package removal, not upgrade
|
||||
/bin/systemctl disable wicd.service > /dev/null 2>&1 || :
|
||||
/bin/systemctl stop wicd.service > /dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%postun common
|
||||
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
|
||||
if [ $1 -ge 1 ] ; then
|
||||
# Package upgrade, not uninstall
|
||||
/bin/systemctl try-restart wicd.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%triggerun -- wicd-common < 1.7.0-5
|
||||
if /sbin/chkconfig --level 3 wicd ; then
|
||||
/bin/systemctl enable wicd.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%post gtk
|
||||
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
%postun gtk
|
||||
if [ $1 -eq 0 ]; then
|
||||
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
|
||||
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
fi
|
||||
|
||||
%posttrans gtk
|
||||
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/pm-utils/sleep.d/55wicd
|
||||
|
||||
%files common -f %{name}.lang
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS CHANGES LICENSE NEWS README other/WHEREAREMYFILES
|
||||
%dir %{python_sitelib}/wicd
|
||||
%dir %{_sysconfdir}/wicd
|
||||
%dir %{_sysconfdir}/wicd/encryption
|
||||
%dir %{_sysconfdir}/wicd/encryption/templates
|
||||
%dir %{_sysconfdir}/wicd/scripts
|
||||
%dir %{_sysconfdir}/wicd/scripts/postconnect
|
||||
%dir %{_sysconfdir}/wicd/scripts/postdisconnect
|
||||
%dir %{_sysconfdir}/wicd/scripts/preconnect
|
||||
%dir %{_sysconfdir}/wicd/scripts/predisconnect
|
||||
%{_sysconfdir}/acpi/resume.d/80-wicd-connect.sh
|
||||
%{_sysconfdir}/acpi/suspend.d/50-wicd-suspend.sh
|
||||
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/wicd.conf
|
||||
%config(noreplace) %{_sysconfdir}/wicd/dhclient.conf.template.default
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/wicd
|
||||
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/active
|
||||
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/active_wired
|
||||
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/eap
|
||||
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/eap-tls
|
||||
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/leap
|
||||
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/peap
|
||||
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/peap-tkip
|
||||
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/psu
|
||||
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/ttls
|
||||
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wep-hex
|
||||
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wep-passphrase
|
||||
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wep-shared
|
||||
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wired_8021x
|
||||
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa
|
||||
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa-psk
|
||||
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa-peap
|
||||
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa2-leap
|
||||
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa2-peap
|
||||
%{_systemd_unitdir}/wicd.service
|
||||
%{python_sitelib}/wicd/*
|
||||
%{python_sitelib}/wicd-%{version}*.egg-info
|
||||
%{_bindir}/wicd-cli
|
||||
%{_bindir}/wicd-client
|
||||
%{_sbindir}/wicd
|
||||
%{_datadir}/applications/wicd.desktop
|
||||
%{_datadir}/dbus-1/system-services/org.wicd.daemon.service
|
||||
%{_datadir}/man/man1/wicd-client.1*
|
||||
%{_datadir}/man/man5/wicd-manager-settings.conf.5*
|
||||
%{_datadir}/man/man5/wicd-wired-settings.conf.5*
|
||||
%{_datadir}/man/man5/wicd-wireless-settings.conf.5*
|
||||
%{_datadir}/man/man8/wicd-cli.8*
|
||||
%{_datadir}/man/man8/wicd.8*
|
||||
%lang(nl) %{_datadir}/man/nl/man1/wicd-client.1*
|
||||
%lang(nl) %{_datadir}/man/nl/man5/wicd-manager-settings.conf.5*
|
||||
%lang(nl) %{_datadir}/man/nl/man5/wicd-wired-settings.conf.5*
|
||||
%lang(nl) %{_datadir}/man/nl/man5/wicd-wireless-settings.conf.5*
|
||||
%lang(nl) %{_datadir}/man/nl/man8/wicd.8*
|
||||
%dir %{_datadir}/wicd
|
||||
%dir %{_datadir}/wicd/backends
|
||||
%dir %{_datadir}/wicd/cli
|
||||
%dir %{_datadir}/wicd/daemon
|
||||
%{_datadir}/wicd/backends/*
|
||||
%{_datadir}/wicd/cli/*
|
||||
%{_datadir}/wicd/daemon/*
|
||||
%dir %{_localstatedir}/lib/wicd
|
||||
%dir %{_localstatedir}/lib/wicd/configurations
|
||||
|
||||
%files curses
|
||||
%defattr(-,root,root,-)
|
||||
%dir %{_datadir}/wicd/curses
|
||||
%{_datadir}/wicd/curses/*
|
||||
%{_bindir}/wicd-curses
|
||||
%{_datadir}/man/man8/wicd-curses.8*
|
||||
%lang(nl) %{_datadir}/man/nl/man8/wicd-curses.8*
|
||||
|
||||
%files gtk
|
||||
%defattr(-,root,root,-)
|
||||
%dir %{_datadir}/wicd/gtk
|
||||
%dir %{_datadir}/pixmaps/wicd
|
||||
%{_sysconfdir}/xdg/autostart/wicd-tray.desktop
|
||||
%{_datadir}/wicd/gtk/*
|
||||
%{_datadir}/pixmaps/wicd/*
|
||||
%{_datadir}/pixmaps/wicd-gtk.xpm
|
||||
%{_bindir}/wicd-gtk
|
||||
%{_datadir}/icons/hicolor/*/apps/wicd-gtk.png
|
||||
%{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg
|
||||
|
||||
%changelog
|
||||
* Thu Mar 14 2013 David Cantrell <dcantrell@redhat.com> - 1.7.2.1-5
|
||||
- Attempt to work with the latest upstream python-urwid (#879155)
|
||||
- Add missing sanitize_config() function (#873016)
|
||||
|
||||
* Tue Oct 23 2012 David Cantrell <dcantrell@redhat.com> - 1.7.2.1-4
|
||||
- Fix some Unicode text handling problems (#845749)
|
||||
|
||||
* Thu Aug 02 2012 David Cantrell <dcantrell@redhat.com> - 1.7.2.1-3
|
||||
- Fix property handling for CVE-2012-2095 upstream patch (#820166)
|
||||
|
||||
* Thu Aug 02 2012 David Cantrell <dcantrell@redhat.com> - 1.7.2.1-2
|
||||
- Remove duplicate logrotate file (#820139)
|
||||
|
||||
* Fri Apr 13 2012 David Cantrell <dcantrell@redhat.com> - 1.7.2.1-1
|
||||
- Upgrade to wicd-1.7.2.1 to fix CVE-2012-2095 (#811763)
|
||||
|
||||
* Mon Mar 26 2012 David Cantrell <dcantrell@redhat.com> - 1.7.1-1
|
||||
- Remove our wicd.service file, this is provided by upstream now
|
||||
- Make sure systemd unit files go to /usr/lib/systemd
|
||||
- Stop mangling logfile.py so bytecompiling will actually work
|
||||
- 91wicd -> 55wicd
|
||||
- Pick up new encryption template files in the %%files list
|
||||
- BR babel
|
||||
- Remove po/ast.po because babel doesn't understand it
|
||||
- Ensure wpath.etc is set to /etc/wicd, not /etc/dhcp (#754412)
|
||||
- Initialize child_pid to None in wicd-daemon.py (#798692)
|
||||
- Make wicd-gtk subpackage require notify-python (#748258)
|
||||
- Work around no-op problem in DaemonClosing calls (#740317)
|
||||
- Upgrade to wicd-1.7.1 final release (#789380)
|
||||
- Have wicd-common require pygobject2 (#754416)
|
||||
- Remove patches that have been incorporated upstream
|
||||
|
||||
* Wed Mar 21 2012 David Cantrell <dcantrell@redhat.com> - 1.7.1b2-0.4
|
||||
- Make wicd-common require pygobject2 (#799537)
|
||||
|
||||
* Fri Jan 27 2012 David Cantrell <dcantrell@redhat.com> - 1.7.1b2-0.3
|
||||
- Fix CVE-2012-0813 (#785147)
|
||||
|
||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.1-0.2.b2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Fri Aug 19 2011 David Cantrell <dcantrell@redhat.com> - 1.7.1b2-0.1
|
||||
- Upgrade to wicd-1.7.1b2
|
||||
|
||||
* Fri Aug 19 2011 David Cantrell <dcantrell@redhat.com> - 1.7.0-9
|
||||
- Initialize appGui._wired_showing in __init__ (#723553)
|
||||
- Make sure check and message in wicd-cli are a lambda (#712435)
|
||||
- Correct systemd unit file for wicd, add D-Bus service file (#699116)
|
||||
- Move docs to the wicd-common subpackage
|
||||
- Correct /etc/dbus-1/system.d/wicd.conf (#699116)
|
||||
|
||||
* Mon May 09 2011 Bill Nottingham <notting@redhat.com> - 1.7.0-8
|
||||
- fix systemd scriptlets for upgrade
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Sat Jan 15 2011 David Cantrell <dcantrell@redhat.com> - 1.7.0-6
|
||||
- Correct typo with _systemd_unitdir macro usage in spec file
|
||||
|
||||
* Sat Jan 15 2011 David Cantrell <dcantrell@redhat.com> - 1.7.0-5
|
||||
- Replace existing init script with systemd unit file (#661226)
|
||||
|
||||
* Fri Oct 22 2010 David Cantrell <dcantrell@redhat.com> - 1.7.0-4
|
||||
- Use cPickle instead of deepcopy in configmanager.py (#645251)
|
||||
|
||||
* Wed Aug 25 2010 David Cantrell <dcantrell@redhat.com> - 1.7.0-3
|
||||
- Remove hard dependency on the base package by wicd-common. The
|
||||
base package is arch-specific and contains optional components
|
||||
for wicd. If it is present, wicd will make use of it, but it is
|
||||
not required for normal functionality.
|
||||
|
||||
* Fri Jul 30 2010 Thomas Spura <tomspur@fedoraproject.org> - 1.7.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
|
||||
|
||||
* Mon Jun 21 2010 David Cantrell <dcantrell@redhat.com> - 1.7.0-1
|
||||
- Initial package
|
||||
Reference in a new issue