[pkg-wpa-devel] r855 - in /hostapd/trunk: debian/changelog debian/patches/00list driver_devicescape.c hostapd.conf

[paravoid at users.alioth.debian.org]

Author: paravoid
Date: Sun Jul 22 18:02:29 2007
New Revision: 855

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=855
Log:
* Include Devicescape/mac80211 driver. Highly experimental at this point.
  (Closes: #429734)

Modified:
    hostapd/trunk/debian/changelog
    hostapd/trunk/debian/patches/00list
    hostapd/trunk/driver_devicescape.c
    hostapd/trunk/hostapd.conf

Modified: hostapd/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/changelog?rev=855&op=diff
==============================================================================
--- hostapd/trunk/debian/changelog (original)
+++ hostapd/trunk/debian/changelog Sun Jul 22 18:02:29 2007
@@ -1,8 +1,13 @@
 hostapd (1:0.5.8-1) UNRELEASED; urgency=low
 
+  [ Kel Modderman ]
   * (NOT RELEASED YET) New upstream release
 
- -- Kel Modderman <kel at otaku42.de>  Fri, 01 Jun 2007 21:04:44 +1000
+  [ Faidon Liambotis ]
+  * Include Devicescape/mac80211 driver. Highly experimental at this point.
+    (Closes: #429734)
+
+ -- Faidon Liambotis <paravoid at debian.org>  Sun, 22 Jul 2007 20:59:29 +0300
 
 hostapd (1:0.5.7-1) unstable; urgency=low
 

Modified: hostapd/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/patches/00list?rev=855&op=diff
==============================================================================
--- hostapd/trunk/debian/patches/00list (original)
+++ hostapd/trunk/debian/patches/00list Sun Jul 22 18:02:29 2007
@@ -2,3 +2,5 @@
 12_conf_etc_hostapd
 20_madwifi_headers
 21_madwifi_includes
+30_mac80211_headers
+31_mac80211_enable

Modified: hostapd/trunk/driver_devicescape.c
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/driver_devicescape.c?rev=855&op=diff
==============================================================================
--- hostapd/trunk/driver_devicescape.c (original)
+++ hostapd/trunk/driver_devicescape.c Sun Jul 22 18:02:29 2007
@@ -37,8 +37,8 @@
 #include "ieee802_11.h"
 #include "sta_info.h"
 #include "hw_features.h"
-#include <hostapd_ioctl.h>
-#include <ieee80211_common.h>
+#include "hostapd_ioctl.h"
+#include "ieee80211_common.h"
 /* from net/mac80211.h */
 enum {
 	MODE_IEEE80211A = 0 /* IEEE 802.11a */,

Modified: hostapd/trunk/hostapd.conf
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/hostapd.conf?rev=855&op=diff
==============================================================================
--- hostapd/trunk/hostapd.conf (original)
+++ hostapd/trunk/hostapd.conf Sun Jul 22 18:02:29 2007
@@ -169,8 +169,8 @@
 # Accept/deny lists are read from separate files (containing list of
 # MAC addresses, one per line). Use absolute path name to make sure that the
 # files can be read on SIGHUP configuration reloads.
-#accept_mac_file=/etc/hostapd.accept
-#deny_mac_file=/etc/hostapd.deny
+#accept_mac_file=/etc/hostapd/accept
+#deny_mac_file=/etc/hostapd/deny
 
 # IEEE 802.11 specifies two authentication algorithms. hostapd can be
 # configured to allow both of these or only one. Open system authentication
@@ -428,20 +428,20 @@
 eap_server=0
 
 # Path for EAP server user database
-#eap_user_file=/etc/hostapd.eap_user
+#eap_user_file=/etc/hostapd/eap_user
 
 # CA certificate (PEM or DER file) for EAP-TLS/PEAP/TTLS
-#ca_cert=/etc/hostapd.ca.pem
+#ca_cert=/etc/hostapd/ca.pem
 
 # Server certificate (PEM or DER file) for EAP-TLS/PEAP/TTLS
-#server_cert=/etc/hostapd.server.pem
+#server_cert=/etc/hostapd/server.pem
 
 # Private key matching with the server certificate for EAP-TLS/PEAP/TTLS
 # This may point to the same file as server_cert if both certificate and key
 # are included in a single file. PKCS#12 (PFX) file (.p12/.pfx) can also be
 # used by commenting out server_cert and specifying the PFX file as the
 # private_key.
-#private_key=/etc/hostapd.server.prv
+#private_key=/etc/hostapd/server.prv
 
 # Passphrase for private key
 #private_key_passwd=secret passphrase
@@ -557,7 +557,7 @@
 
 # File name of the RADIUS clients configuration for the RADIUS server. If this
 # commented out, RADIUS server is disabled.
-#radius_server_clients=/etc/hostapd.radius_clients
+#radius_server_clients=/etc/hostapd/radius_clients
 
 # The UDP port number for the RADIUS authentication server
 #radius_server_auth_port=1812
@@ -593,7 +593,7 @@
 # of (PSK,MAC address) pairs. This allows more than one PSK to be configured.
 # Use absolute path name to make sure that the files can be read on SIGHUP
 # configuration reloads.
-#wpa_psk_file=/etc/hostapd.wpa_psk
+#wpa_psk_file=/etc/hostapd/wpa_psk
 
 # Set of accepted key management algorithms (WPA-PSK, WPA-EAP, or both). The
 # entries are separated with a space.