Fix up paths, take adventage of data path

data/dbus/wicd.conf

@@ -0,0 +1,47 @@
+<!-- /etc/dbus-1/system.d/wicd.conf -->
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+        <policy user="root">
+                <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"/>
+        </policy>
+
+        <policy context="default">
+                <deny own="org.wicd.daemon"/>
+        </policy>
+
+	<!-- This Unix group will have permission to use Wicd's gui -->
+        <policy group="users">
+                <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 "users"
+            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"/>
+        </policy>
+
+</busconfig>

data/dbus_service/org.wicd.daemon.service

@@ -0,0 +1,11 @@
+# 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

data/encryption/active

@@ -0,0 +1,16 @@
+wpa
+wpa-peap
+wpa-psk
+wpa-psk-hex
+wpa2-leap
+wpa2-peap
+wep-hex
+wep-passphrase
+wep-shared
+leap
+ttls
+eap
+peap
+peap-tkip
+eap-tls
+psu

data/encryption/active_wired

@@ -0,0 +1 @@
+wired_8021x

data/encryption/eap

@@ -0,0 +1,21 @@
+name = EAP-FAST
+author = Adam Blackburn
+version = 2
+require username *Username password *Password 
+optional pac_file *Path_To_PAC_File
+protected password *Password
+-----
+ctrl_interface=/var/run/wpa_supplicant
+network={
+	ssid="$_ESSID"
+	scan_ssid=$_SCAN
+	proto=RSN WPA
+	pairwise=CCMP TKIP
+	group=CCMP TKIP
+	key_mgmt=WPA-EAP
+	eap=FAST
+	identity="$_USERNAME"
+	password="$_PASSWORD"
+	phase1="fast_provisioning=1"
+	pac_file="$_PAC_FILE"
+}

data/encryption/eap-tls

@@ -0,0 +1,20 @@
+name = EAP-TLS
+author = Dan O'Reilly
+version = 1
+require identity *Identity private_key *Private_Key private_key_passwd *Private_Key_Password
+optional ca_cert *Path_to_CA_Cert client_cert *Path_to_Client_Cert
+protected identity *Identity private_key *Private_Key private_key_passwd *Private_Key_Password
+-----
+ctrl_interface=/var/run/wpa_supplicant
+network={
+   ssid="$_ESSID"
+   key_mgmt=WPA-EAP
+   pairwise=TKIP
+   group=TKIP
+   eap=TLS
+   identity="$_IDENTITY"
+   ca_cert="$_CA_CERT"
+   client_cert="$_CLIENT_CERT"
+   private_key="$_PRIVATE_KEY"
+   private_key_passwd="$_PRIVATE_KEY_PASSWD"
+}

data/encryption/leap

@@ -0,0 +1,15 @@
+name = LEAP with WEP
+author = Adam Blackburn
+version = 1
+require username *Username password *Password
+protected password *Password
+-----
+ctrl_interface=/var/run/wpa_supplicant
+network={
+	ssid="$_ESSID"
+	scan_ssid=$_SCAN
+	eap=LEAP
+	key_mgmt=IEEE8021X
+	identity="$_USERNAME"
+	password="$_PASSWORD"
+}

data/encryption/peap

@@ -0,0 +1,16 @@
+name = PEAP with GTC
+author = Adam Blackburn
+version = 2
+require identity *Identity password *Password
+protected password *Password
+-----
+ctrl_interface=/var/run/wpa_supplicant
+network={
+	ssid="$_ESSID"
+	proto=RSN
+	key_mgmt=WPA-EAP
+	pairwise=CCMP
+	eap=PEAP
+	identity="$_IDENTITY"
+	password="$_PASSWORD"
+}

data/encryption/peap-tkip

@@ -0,0 +1,22 @@
+name = WPA1-PEAP with TKIP/MSCHAPV2
+author = Fralaltro
+version = 1
+require identity *Identity password *Password 
+optional ca_cert *Path_to_CA_Cert
+protected password *Password 
+-----
+ctrl_interface=/var/run/wpa_supplicant
+network={
+        ssid="$_ESSID"
+        scan_ssid=$_SCAN
+        proto=WPA
+        key_mgmt=WPA-EAP
+        pairwise=TKIP
+        group=TKIP
+        eap=PEAP
+        identity="$_IDENTITY"
+        password="$_PASSWORD"
+        ca_cert="$_CA_CERT"
+        phase1="peaplabel=0"
+        phase2="auth=MSCHAPV2"
+}

data/encryption/psu

@@ -0,0 +1,15 @@
+name = PSU (IEEE 802.1x + PEAP + MSCHAPV2)
+author = Alexander Anisimov
+version = 1
+require identity *Identity password *Password
+protected password *Password
+-----
+ctrl_interface=/var/run/wpa_supplicant
+network={
+    ssid="$_ESSID"
+    key_mgmt=IEEE8021X
+    eap=PEAP
+    phase2="auth=MSCHAPV2"
+    identity="$_IDENTITY"
+    password="$_PASSWORD"
+}

data/encryption/ttls

@@ -0,0 +1,16 @@
+name = TTLS with WEP
+author = Adam Blackburn
+version = 1
+require identity *Identity password *Password auth *Authentication
+protected password *Password
+-----
+ctrl_interface=/var/run/wpa_supplicant
+network={
+	ssid="$_ESSID"
+	scan_ssid=$_SCAN
+	eap=TTLS
+	key_mgmt=IEEE8021X
+	identity="$_IDENTITY"
+	password="$_PASSWORD"
+	phase2="auth=$_AUTH"
+}

data/encryption/wep-hex

@@ -0,0 +1,16 @@
+name = WEP (Hex [0-9/A-F])
+author = Adam Blackburn
+version = 2
+require key *Key
+optional key_index *Key_Index
+protected key *Key
+-----
+ctrl_interface=/var/run/wpa_supplicant
+network={
+       ssid="$_ESSID"
+       scan_ssid=$_SCAN
+       key_mgmt=NONE
+       wep_key$_KEY_INDEX=$_KEY
+       wep_tx_keyidx=$_KEY_INDEX
+       priority=5
+}

data/encryption/wep-passphrase

@@ -0,0 +1,16 @@
+name = WEP (Passphrase)
+author = Adam Blackburn
+version = 2
+require passphrase *Passphrase
+optional key_index *Key_Index
+protected passphrase *Passphrase
+-----
+ctrl_interface=/var/run/wpa_supplicant
+network={
+       ssid="$_ESSID"
+       scan_ssid=$_SCAN
+       key_mgmt=NONE
+       wep_key$_KEY_INDEX="$_PASSPHRASE"
+       wep_tx_keyidx=$_KEY_INDEX
+       priority=5
+}

data/encryption/wep-shared

@@ -0,0 +1,17 @@
+name = WEP Shared/Restricted
+author = Dan O'Reilly
+version = 2
+require key *Key
+optional key_index *Key_Index
+protected key *Key
+-----
+ctrl_interface=/var/run/wpa_supplicant
+network={
+       ssid="$_ESSID"
+       scan_ssid=$_SCAN
+       key_mgmt=NONE
+       auth_alg=SHARED
+       wep_key$_KEY_INDEX=$_KEY
+       wep_tx_keyidx=$_KEY_INDEX
+       priority=5
+}

data/encryption/wired_8021x

@@ -0,0 +1,17 @@
+name = IEEE 802.1x with MSCHAPV2
+author = Joe MacMahon
+version = 1
+require identity *Identity password *Password
+protected password *Password
+-----
+ctrl_interface=/var/run/wpa_supplicant
+eapol_version=1
+fast_reauth=0
+network={
+       key_mgmt=IEEE8021X
+       eap=PEAP
+       phase1="peaplabel=1"
+       phase2="auth=MSCHAPV2"
+       identity="$_IDENTITY"
+       password="$_PASSWORD"
+}

data/encryption/wpa

@@ -0,0 +1,16 @@
+name = WPA 1/2 (Hex [0-9/A-F])
+author = Adam Blackburn
+version = 1
+require key *Key
+protected key *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=$_PSK
+}

data/encryption/wpa-peap

@@ -0,0 +1,17 @@
+name = WPA1-PEAP with CCMP/MSCHAPV2
+author = atiketemola
+version = 1
+require identity *Username domain *Domain password *Password
+protected password *Password
+-----
+ctrl_interface=/var/run/wpa_supplicant
+network={
+    ssid="$_ESSID"
+    proto=WPA
+    key_mgmt=WPA-EAP
+    pairwise=CCMP
+    eap=PEAP
+    identity="$_DOMAIN\$_IDENTITY"
+    password="$_PASSWORD"
+    phase2="auth=MSCHAPv2"
+}

data/encryption/wpa-psk

@@ -0,0 +1,16 @@
+name = WPA 1/2 (Passphrase)
+author = Adam Blackburn
+version = 1
+require apsk *Preshared_Key
+protected 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"
+}

data/encryption/wpa-psk-hex

@@ -0,0 +1,16 @@
+name = WPA 1/2 (Preshared Hex Key)
+author = Thomas Kahle
+version = 1
+require apsk *Preshared_Key
+protected 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
+}

data/encryption/wpa2-leap

@@ -0,0 +1,19 @@
+name = WPA2-LEAP
+author = atiketemola
+version = 1
+require username *Username password *Password
+protected password *Password
+-----
+ctrl_interface=/var/run/wpa_supplicant
+network={
+    ssid="$_ESSID"
+    scan_ssid=$_SCAN
+    auth_alg=LEAP
+    key_mgmt=WPA-EAP
+    proto=WPA2
+    pairwise=CCMP TKIP
+    group=CCMP TKIP
+    eap=LEAP
+    identity="$_USERNAME"
+    password="$_PASSWORD"
+}

data/encryption/wpa2-peap

@@ -0,0 +1,17 @@
+name = WPA2-PEAP with CCMP/MSCHAPV2
+author = atiketemola
+version = 1
+require identity *Username domain *Domain password *Password
+protected password *Password
+-----
+ctrl_interface=/var/run/wpa_supplicant
+network={
+    ssid="$_ESSID"
+    proto=RSN
+    key_mgmt=WPA-EAP
+    pairwise=CCMP
+    eap=PEAP
+    identity="$_DOMAIN\$_IDENTITY"
+    password="$_PASSWORD"
+    phase2="auth=MSCHAPv2"
+}

data/etc/dhclient.conf.template.default

@@ -0,0 +1,22 @@
+# If you're reading this, you're probably reading either:
+#  /etc/wicd/dhclient.conf.template.default
+# or
+#  /etc/wicd/dhclient.conf.template
+# or
+#  a generated dhclient configuration in /var/run
+# (these files could be in different locations, as determined by your
+# packager or system administrator, but those are the default pathes)
+#
+# Here's what you need to know:
+#  The .default file is copied by wicd to dhclient.conf.template if
+#  dhclient.conf.template does not exist. If dhclient.conf.template
+#  does exist, the .default file is not used. This is to allow
+#  upgrades of the package without destroying user changes.
+#
+#  In other words, if you want to change the generated dhclient
+#  configuration, you need to change dhclient.conf.template,
+#  NOT dhclient.conf.template.default
+
+# wicd will replace the following line with the appropriate
+# "send host-name" command, based on what the user chose
+# <WICDHOSTNAME>

data/logrotate/wicd.logrotate

@@ -0,0 +1,6 @@
+/var/log/wicd/wicd.log {
+    missingok
+    notifempty
+    size 30k
+    create 0600 root
+}

data/systemd/wicd.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=Wicd a wireless and wired network manager for Linux
+After=syslog.target
+Wants=network.target
+Before=network.target
+
+[Service]
+Type=dbus
+BusName=org.wicd.daemon
+ExecStart=/usr/sbin/wicd --no-daemon
+
+[Install]
+WantedBy=multi-user.target
+Alias=dbus-org.wicd.daemon.service