Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-misc/wicd/files
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/wicd/files')
-rw-r--r--net-misc/wicd/files/add-wpa-psk-hex-template.patch29
-rw-r--r--net-misc/wicd/files/wicd-1.7.1-provide-net.patch11
-rw-r--r--net-misc/wicd/files/wicd-1.7.1_beta2-init.patch11
-rw-r--r--net-misc/wicd/files/wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch30
-rw-r--r--net-misc/wicd/files/wicd-1.7.2.4-fix-dbus-error.patch16
-rw-r--r--net-misc/wicd/files/wicd-1.7.2.4-fix-desktop-categories.patch20
-rw-r--r--net-misc/wicd/files/wicd-1.7.2.4-second-urwid.patch43
-rw-r--r--net-misc/wicd/files/wicd-1.7.2.4-urwid.patch66
-rw-r--r--net-misc/wicd/files/wicd-1.7.3-add-missing-gnome-shell-extension.patch39
-rw-r--r--net-misc/wicd/files/wicd-1.7.3-undefined-LANG.patch24
-rw-r--r--net-misc/wicd/files/wicd-1.7.3-urwid-1.3.0.patch15
-rw-r--r--net-misc/wicd/files/wicd-init-sve-start.patch10
-rw-r--r--net-misc/wicd/files/wicd-init.d24
13 files changed, 338 insertions, 0 deletions
diff --git a/net-misc/wicd/files/add-wpa-psk-hex-template.patch b/net-misc/wicd/files/add-wpa-psk-hex-template.patch
new file mode 100644
index 000000000000..21daaf3e5091
--- /dev/null
+++ b/net-misc/wicd/files/add-wpa-psk-hex-template.patch
@@ -0,0 +1,29 @@
+diff -U 3 -dHrN wicd-1.7.1b2/encryption/templates/active wicd-1.7.1b2.new/encryption/templates/active
+--- wicd-1.7.1b2/encryption/templates/active 2010-10-29 16:36:55.000000000 +0100
++++ wicd-1.7.1b2.new/encryption/templates/active 2011-09-13 19:58:54.000000000 +0100
+@@ -1,5 +1,6 @@
+ wpa
+ wpa-psk
++wpa-psk-hex
+ wep-hex
+ wep-passphrase
+ wep-shared
+diff -U 3 -dHrN wicd-1.7.1b2/encryption/templates/wpa-psk-hex wicd-1.7.1b2.new/encryption/templates/wpa-psk-hex
+--- wicd-1.7.1b2/encryption/templates/wpa-psk-hex 1970-01-01 01:00:00.000000000 +0100
++++ wicd-1.7.1b2.new/encryption/templates/wpa-psk-hex 2011-09-13 19:59:11.000000000 +0100
+@@ -0,0 +1,15 @@
++name = WPA 1/2 (Preshared Hex Key)
++author = Thomas Kahle
++version = 1
++require apsk *Preshared_Key
++-----
++ctrl_interface=/var/run/wpa_supplicant
++network={
++ ssid="$_ESSID"
++ scan_ssid=$_SCAN
++ proto=WPA RSN
++ key_mgmt=WPA-PSK
++ pairwise=CCMP TKIP
++ group=CCMP TKIP
++ psk=$_APSK
++}
diff --git a/net-misc/wicd/files/wicd-1.7.1-provide-net.patch b/net-misc/wicd/files/wicd-1.7.1-provide-net.patch
new file mode 100644
index 000000000000..f325bcbaa89d
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.1-provide-net.patch
@@ -0,0 +1,11 @@
+diff -U 3 -dHrN wicd-1.7.1.orig/in/init=gentoo=wicd.in wicd-1.7.1/in/init=gentoo=wicd.in
+--- wicd-1.7.1.orig/in/init=gentoo=wicd.in 2012-02-27 21:49:36.422873826 +0100
++++ wicd-1.7.1/in/init=gentoo=wicd.in 2012-02-27 21:50:26.957127714 +0100
+@@ -10,6 +10,7 @@
+ depend() {
+ need dbus
+ after hald
++ provide net
+ }
+
+ start() {
diff --git a/net-misc/wicd/files/wicd-1.7.1_beta2-init.patch b/net-misc/wicd/files/wicd-1.7.1_beta2-init.patch
new file mode 100644
index 000000000000..6a736f9e2cdd
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.1_beta2-init.patch
@@ -0,0 +1,11 @@
+--- in/init=gentoo=wicd.in 2010-10-29 11:36:55.000000000 -0400
++++ in/init=gentoo=wicd.in.new 2011-03-28 09:40:27.245339002 -0400
+@@ -15,7 +15,7 @@
+ start() {
+ ebegin "Starting wicd daemon"
+ # fix Gentoo bug 296197
+- sed -i 's/^\[\]$//' /etc/wicd/wired-settings.conf
++ [ -f /etc/wicd/wired-settings.conf ] && sed -i 's/^\[\]$//' /etc/wicd/wired-settings.conf
+ "${WICD_DAEMON}" >/dev/null 2>&1
+ eend $?
+ }
diff --git a/net-misc/wicd/files/wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch b/net-misc/wicd/files/wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch
new file mode 100644
index 000000000000..6736cb7b8d1b
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch
@@ -0,0 +1,30 @@
+diff -U 3 -dHrN wicd.org/encryption/templates/active wicd/encryption/templates/active
+--- wicd.org/encryption/templates/active 2011-12-05 16:22:49.584224158 +0100
++++ wicd/encryption/templates/active 2011-12-05 16:16:10.736172566 +0100
+@@ -1,6 +1,7 @@
+ wpa
+ wpa-peap
+ wpa-psk
++wpa-psk-hex
+ wpa2-leap
+ wpa2-peap
+ wep-hex
+diff -U 3 -dHrN wicd.org/encryption/templates/wpa-psk-hex wicd/encryption/templates/wpa-psk-hex
+--- wicd.org/encryption/templates/wpa-psk-hex 1970-01-01 01:00:00.000000000 +0100
++++ wicd/encryption/templates/wpa-psk-hex 2011-12-05 16:16:43.428012863 +0100
+@@ -0,0 +1,15 @@
++name = WPA 1/2 (Preshared Hex Key)
++author = Thomas Kahle
++version = 1
++require apsk *Preshared_Key
++-----
++ctrl_interface=/var/run/wpa_supplicant
++network={
++ ssid="$_ESSID"
++ scan_ssid=$_SCAN
++ proto=WPA RSN
++ key_mgmt=WPA-PSK
++ pairwise=CCMP TKIP
++ group=CCMP TKIP
++ psk=$_APSK
++}
diff --git a/net-misc/wicd/files/wicd-1.7.2.4-fix-dbus-error.patch b/net-misc/wicd/files/wicd-1.7.2.4-fix-dbus-error.patch
new file mode 100644
index 000000000000..2fddc9a2e55f
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.2.4-fix-dbus-error.patch
@@ -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/net-misc/wicd/files/wicd-1.7.2.4-fix-desktop-categories.patch b/net-misc/wicd/files/wicd-1.7.2.4-fix-desktop-categories.patch
new file mode 100644
index 000000000000..d2b856236606
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.2.4-fix-desktop-categories.patch
@@ -0,0 +1,20 @@
+diff -U 3 -dHrN wicd-1.7.2.4.orig/other/wicd.desktop wicd-1.7.2.4/other/wicd.desktop
+--- wicd-1.7.2.4.orig/other/wicd.desktop 2013-06-24 22:18:00.715578998 +0200
++++ wicd-1.7.2.4/other/wicd.desktop 2013-06-24 22:18:57.672595363 +0200
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Categories=Application;Network;
++Categories=Network;Settings;Utility;
+ Exec=wicd-gtk --no-tray
+ GenericName=Network Manager
+ Icon=wicd-gtk
+diff -U 3 -dHrN wicd-1.7.2.4.orig/other/wicd-tray.desktop wicd-1.7.2.4/other/wicd-tray.desktop
+--- wicd-1.7.2.4.orig/other/wicd-tray.desktop 2013-06-24 22:18:00.715578998 +0200
++++ wicd-1.7.2.4/other/wicd-tray.desktop 2013-06-24 22:18:59.864595996 +0200
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Categories=Application;Network;
++Categories=Network;Settings;Utility;
+ Exec=wicd-gtk --tray
+ GenericName=Network Manager
+ Icon=wicd-gtk
diff --git a/net-misc/wicd/files/wicd-1.7.2.4-second-urwid.patch b/net-misc/wicd/files/wicd-1.7.2.4-second-urwid.patch
new file mode 100644
index 000000000000..9a0bae6c9625
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.2.4-second-urwid.patch
@@ -0,0 +1,43 @@
+=== modified file 'curses/curses_misc.py'
+--- curses/curses_misc.py 2012-11-15 09:26:21 +0000
++++ curses/curses_misc.py 2012-11-16 09:22:47 +0000
+@@ -352,7 +352,7 @@
+ if urwid.VERSION < (1, 1, 0):
+ self.focus = focus
+ else:
+- self.focus_position = focus
++ self._w.focus_position = focus
+
+ self.callback = callback
+ self.user_args = user_args
+@@ -368,7 +368,10 @@
+ if urwid.VERSION < (1, 1, 0):
+ self.focus = index
+ else:
+- self.focus_position = index
++ try:
++ self._w.focus_position = index
++ except IndexError:
++ pass
+
+ # API changed between urwid 0.9.8.4 and 0.9.9
+ try:
+@@ -386,7 +389,7 @@
+ if urwid.VERSION < (1, 1, 0):
+ index = self.focus
+ else:
+- index = self.focus_position
++ index = self._w.focus_position
+
+ self.cbox = DynWrap(SelText([self.list[index]+self.DOWN_ARROW]),
+ attrs=self.attrs,focus_attr=self.focus_attr)
+@@ -434,7 +437,7 @@
+ if urwid.VERSION < (1, 1, 0):
+ return None, self.focus
+ else:
+- return None, self.focus_position
++ return None, self._w.focus_position
+
+ def get_sensitive(self):
+ return self.cbox.get_sensitive()
+
diff --git a/net-misc/wicd/files/wicd-1.7.2.4-urwid.patch b/net-misc/wicd/files/wicd-1.7.2.4-urwid.patch
new file mode 100644
index 000000000000..63eba2ed48b6
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.2.4-urwid.patch
@@ -0,0 +1,66 @@
+=== modified file 'curses/curses_misc.py'
+--- curses/curses_misc.py 2012-05-06 15:16:15 +0000
++++ curses/curses_misc.py 2012-11-15 09:26:21 +0000
+@@ -349,7 +349,10 @@
+ # We need this to pick our keypresses
+ self.use_enter = use_enter
+
+- self.focus = focus
++ if urwid.VERSION < (1, 1, 0):
++ self.focus = focus
++ else:
++ self.focus_position = focus
+
+ self.callback = callback
+ self.user_args = user_args
+@@ -362,7 +365,11 @@
+ self.list = list
+
+ def set_focus(self,index):
+- self.focus = index
++ if urwid.VERSION < (1, 1, 0):
++ self.focus = index
++ else:
++ self.focus_position = index
++
+ # 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 +383,21 @@
+ 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.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 +431,10 @@
+ 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.focus_position
+
+ def get_sensitive(self):
+ return self.cbox.get_sensitive()
+
diff --git a/net-misc/wicd/files/wicd-1.7.3-add-missing-gnome-shell-extension.patch b/net-misc/wicd/files/wicd-1.7.3-add-missing-gnome-shell-extension.patch
new file mode 100644
index 000000000000..9ea419eb4e71
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.3-add-missing-gnome-shell-extension.patch
@@ -0,0 +1,39 @@
+diff -U 3 -dHrN wicd-1.7.3.orig/gnome-shell/extension.js wicd-1.7.3/gnome-shell/extension.js
+--- wicd-1.7.3.orig/gnome-shell/extension.js 1970-01-01 01:00:00.000000000 +0100
++++ wicd-1.7.3/gnome-shell/extension.js 2015-01-19 14:12:12.962333228 +0100
+@@ -0,0 +1,29 @@
++/*
++ * Copyright © 2012, David Paleino <d.paleino@gmail.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License Version 2 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program. If not, see <http://www.gnu.org/licenses/>.
++ *
++ */
++
++const StatusIconDispatcher = imports.ui.statusIconDispatcher;
++
++function init(metadata) {
++}
++
++function enable() {
++ StatusIconDispatcher.STANDARD_TRAY_ICON_IMPLEMENTATIONS['wicd-client.py'] = 'wicd-gtk';
++}
++
++function disable() {
++ StatusIconDispatcher.STANDARD_TRAY_ICON_IMPLEMENTATIONS['wicd-client.py'] = '';
++}
+diff -U 3 -dHrN wicd-1.7.3.orig/gnome-shell/metadata.json wicd-1.7.3/gnome-shell/metadata.json
+--- wicd-1.7.3.orig/gnome-shell/metadata.json 1970-01-01 01:00:00.000000000 +0100
++++ wicd-1.7.3/gnome-shell/metadata.json 2015-01-19 14:12:12.962333228 +0100
+@@ -0,0 +1 @@
++{"shell-version": ["3.4.2"], "uuid": "wicd@code.hanskalabs.net", "name": "WICD Network Manager", "description": "Show status of WICD"}
+\ No newline at end of file
diff --git a/net-misc/wicd/files/wicd-1.7.3-undefined-LANG.patch b/net-misc/wicd/files/wicd-1.7.3-undefined-LANG.patch
new file mode 100644
index 000000000000..b854607d9583
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.3-undefined-LANG.patch
@@ -0,0 +1,24 @@
+Fixes compilation errors when os.environ['LANG'] is undefiend
+--- ./setup.py
++++ ./setup.py
+@@ -621,7 +621,7 @@ class compile_translations(Command):
+ shutil.rmtree('translations/')
+ os.makedirs('translations')
+
+- oldlang = os.environ['LANG']
++ oldlang = os.environ.get('LANG', None)
+ os.environ['LANG'] = 'C'
+
+ for pofile in sorted(glob('po/*.po')):
+@@ -656,7 +656,10 @@ class compile_translations(Command):
+ os.makedirs('translations/' + lang + '/LC_MESSAGES/')
+ os.system('pybabel compile -D wicd -i %s -l %s -d translations/' % (pofile, lang))
+
+- os.environ['LANG'] = oldlang
++ if oldlang is not None:
++ os.environ['LANG'] = oldlang
++ else:
++ del os.environ['LANG']
+
+ class uninstall(Command):
+ description = "remove Wicd using uninstall.sh and install.log"
diff --git a/net-misc/wicd/files/wicd-1.7.3-urwid-1.3.0.patch b/net-misc/wicd/files/wicd-1.7.3-urwid-1.3.0.patch
new file mode 100644
index 000000000000..a028059f5615
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.3-urwid-1.3.0.patch
@@ -0,0 +1,15 @@
+--- curses/wicd-curses.py 2015-01-27 22:35:25.414781192 -0300
++++ cursesb/wicd-curses.py 2015-01-28 01:13:48.078904587 -0300
+@@ -1153,9 +1153,10 @@
+ if not ui._started:
+ return False
+
+- input_data = ui.get_input_nonblocking()
++ ui.set_input_timeouts(max_wait=0)
++ input_data = ui.get_input()
+ # Resolve any "alarms" in the waiting
+- self.handle_keys(input_data[1])
++ self.handle_keys(input_data)
+
+ # Update the screen
+ canvas = self.frame.render((self.size), True)
diff --git a/net-misc/wicd/files/wicd-init-sve-start.patch b/net-misc/wicd/files/wicd-init-sve-start.patch
new file mode 100644
index 000000000000..c6314920d74a
--- /dev/null
+++ b/net-misc/wicd/files/wicd-init-sve-start.patch
@@ -0,0 +1,10 @@
+diff -U 3 -dHrN wicd-1.7.1b2.old/in/init=gentoo=wicd.in wicd-1.7.1b2/in/init=gentoo=wicd.in
+--- wicd-1.7.1b2.old/in/init=gentoo=wicd.in 2011-05-07 20:52:13.000000000 +0200
++++ wicd-1.7.1b2/in/init=gentoo=wicd.in 2011-05-07 20:52:43.000000000 +0200
+@@ -35,5 +35,5 @@
+
+ restart() {
+ force_kill
+- start
++ sve_start
+ }
diff --git a/net-misc/wicd/files/wicd-init.d b/net-misc/wicd/files/wicd-init.d
new file mode 100644
index 000000000000..3f14f094624c
--- /dev/null
+++ b/net-misc/wicd/files/wicd-init.d
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+opts="start stop restart"
+
+WICD_DAEMON=/usr/sbin/wicd
+WICD_PIDFILE=/var/run/wicd/wicd.pid
+
+depend() {
+ need dbus
+}
+
+start() {
+ ebegin "Starting wicd daemon"
+ "${WICD_DAEMON}" >/dev/null 2>&1
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping wicd daemon"
+ start-stop-daemon --stop --pidfile "${WICD_PIDFILE}"
+ eend $?
+}