summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--extra/wicd/.footprint15
-rw-r--r--extra/wicd/.md5sum3
-rw-r--r--extra/wicd/Pkgfile18
-rw-r--r--extra/wicd/wicd37
-rw-r--r--extra/wicd/wicd.desktop2
5 files changed, 5 insertions, 70 deletions
diff --git a/extra/wicd/.footprint b/extra/wicd/.footprint
index 79c67e2dc..1d44eadf2 100644
--- a/extra/wicd/.footprint
+++ b/extra/wicd/.footprint
@@ -2,21 +2,6 @@ drwxr-xr-x root/root etc/
drwxr-xr-x root/root etc/dbus-1/
drwxr-xr-x root/root etc/dbus-1/system.d/
-rw-r--r-- root/root etc/dbus-1/system.d/wicd.conf
-drwxr-xr-x root/root etc/rc.d/
-drwxr-xr-x root/root etc/rc.d/init.d/
--rwxr-xr-x root/root etc/rc.d/init.d/wicd
-drwxr-xr-x root/root etc/rc.d/rc0.d/
-lrwxrwxrwx root/root etc/rc.d/rc0.d/K80wicd -> ../init.d/wicd
-drwxr-xr-x root/root etc/rc.d/rc1.d/
-lrwxrwxrwx root/root etc/rc.d/rc1.d/K80wicd -> ../init.d/wicd
-drwxr-xr-x root/root etc/rc.d/rc3.d/
-lrwxrwxrwx root/root etc/rc.d/rc3.d/S20wicd -> ../init.d/wicd
-drwxr-xr-x root/root etc/rc.d/rc4.d/
-lrwxrwxrwx root/root etc/rc.d/rc4.d/S20wicd -> ../init.d/wicd
-drwxr-xr-x root/root etc/rc.d/rc5.d/
-lrwxrwxrwx root/root etc/rc.d/rc5.d/S20wicd -> ../init.d/wicd
-drwxr-xr-x root/root etc/rc.d/rc6.d/
-lrwxrwxrwx root/root etc/rc.d/rc6.d/K80wicd -> ../init.d/wicd
drwxr-xr-x root/root etc/wicd/
-rw-r--r-- root/root etc/wicd/dhclient.conf.template.default
drwxr-xr-x root/root etc/wicd/encryption/
diff --git a/extra/wicd/.md5sum b/extra/wicd/.md5sum
index 66ed5c5de..543ade4e2 100644
--- a/extra/wicd/.md5sum
+++ b/extra/wicd/.md5sum
@@ -1,5 +1,4 @@
-2a018ca53cff16c4fb1a2af06c9bff66 wicd
003d2e67240989db55934553437ba32a wicd-1.7.0.tar.gz
b8edd56cf084347b0ae6dc0e02d1b747 wicd-locale.patch
-c7970cd3f368523018633e3f3f584c84 wicd.desktop
+190bac25d634be162bb4b848d806ef8a wicd.desktop
97736bc03057542e4184fe1bd33cbd20 wicd_in_usr.patch
diff --git a/extra/wicd/Pkgfile b/extra/wicd/Pkgfile
index 846dc407f..567563a1b 100644
--- a/extra/wicd/Pkgfile
+++ b/extra/wicd/Pkgfile
@@ -2,13 +2,13 @@
# URL: http://wicd.sourceforge.net/
# Maintainer: NuTyX core team
# Packager: thierryn1 at hispeed dot ch
-# Depends on: pygtk, wpa_supplicant, ethtool, dbus-python, wireless_tools
+# Depends on: urwid, pygtk, wpa_supplicant, ethtool, dbus-python, wireless_tools, dhcpcd
name=wicd
version=1.7.0
-release=4
+release=5
source=(http://downloads.sourceforge.net/$name/wicd-$version.tar.gz \
- wicd wicd_in_usr.patch wicd-locale.patch wicd.desktop )
+ wicd_in_usr.patch wicd-locale.patch wicd.desktop )
build() {
cd $name-$version
@@ -25,17 +25,5 @@ build() {
done
rm -rf $PKG/usr/share/autostart
chmod 755 $PKG/usr/share/wicd/daemon/wicd-daemon.py
- #Install the daemon service
-
- mkdir -v -p $PKG/etc/rc.d/init.d
- mkdir -v -p $PKG/etc/rc.d/rc{0,1,3,4,5,6}.d
- install -D -m 755 $SRC/wicd $PKG/etc/rc.d/init.d/wicd
-
- ln -svf ../init.d/wicd $PKG/etc/rc.d/rc3.d/S20wicd
- ln -svf ../init.d/wicd $PKG/etc/rc.d/rc5.d/S20wicd
- ln -svf ../init.d/wicd $PKG/etc/rc.d/rc4.d/S20wicd
- ln -svf ../init.d/wicd $PKG/etc/rc.d/rc0.d/K80wicd
- ln -svf ../init.d/wicd $PKG/etc/rc.d/rc1.d/K80wicd
- ln -svf ../init.d/wicd $PKG/etc/rc.d/rc6.d/K80wicd
chown -R 0:0 $PKG/
}
diff --git a/extra/wicd/wicd b/extra/wicd/wicd
deleted file mode 100644
index 49f204b03..000000000
--- a/extra/wicd/wicd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# Begin $rc_base/init.d/wicd
-
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by thierryn1@hispeed.ch
-
-. /etc/sysconfig/rc
-. $rc_functions
-
-case "$1" in
- start)
- boot_mesg "Starting the wicd Daemon..."
- loadproc /usr/share/wicd/daemon/wicd-daemon.py
- ;;
-
- stop)
- boot_mesg "Stopping the wicd Daemon..."
- killproc /usr/share/wicd/daemon/wicd-daemon.py
- ;;
-
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
-
- status)
- statusproc /usr/share/wicd/daemon/wicd-daemon.py
- ;;
-
- *)
- echo "Usage: $0 {start|stop|restart|status}"
- exit 1
- ;;
-esac
-
-# End $rc_base/init.d/wicd
diff --git a/extra/wicd/wicd.desktop b/extra/wicd/wicd.desktop
index dd4cfb6b8..210d713ee 100644
--- a/extra/wicd/wicd.desktop
+++ b/extra/wicd/wicd.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Categories=Application;Network;Internet;
Encoding=UTF-8
-Exec=wicd-client
+Exec=wicd-client --no-tray
GenericName=Network Manager
GenericName[fr]=Gestionnaire de réseaux
Icon=wicd-gtk