[pkg-wpa-devel] r863 - in /hostapd/trunk/debian: changelog patches/10_config.dpatch patches/21_madwifi_enable.dpatch patches/30_mac80211_headers.dpatch patches/31_mac80211_enable.dpatch
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Tue Jul 24 13:59:32 UTC 2007
Author: kelmo-guest
Date: Tue Jul 24 13:59:32 2007
New Revision: 863
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=863
Log:
* Rename 21_madwifi_includes.dpatch to 21_madwifi_enable.dpatch.
* Make our new mac80211 header dpatches similar to that of madwifi; keep
upstream include directory tree intact and modify CFLAGS.
* Refresh our build config with upstreams currect defconfig.
* CONFIG_STAKEY is deprecated in favour of CONFIG_PEERKEY.
* Disable CONFIG_DRIVER_DEVICESCAPE for now, it is FTBFS at least for
x86_64.
Modified:
hostapd/trunk/debian/changelog
hostapd/trunk/debian/patches/10_config.dpatch
hostapd/trunk/debian/patches/21_madwifi_enable.dpatch
hostapd/trunk/debian/patches/30_mac80211_headers.dpatch
hostapd/trunk/debian/patches/31_mac80211_enable.dpatch
Modified: hostapd/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/changelog?rev=863&op=diff
==============================================================================
--- hostapd/trunk/debian/changelog (original)
+++ hostapd/trunk/debian/changelog Tue Jul 24 13:59:32 2007
@@ -9,17 +9,23 @@
hook that should be modified, not hostapd's.
* Revert r957, #427724 thinks we should be bridge-utils hook too, but that
is not true, just convenient for that particular reporter.
+ * Rename 21_madwifi_includes.dpatch to 21_madwifi_enable.dpatch.
+ * Make our new mac80211 header dpatches similar to that of madwifi; keep
+ upstream include directory tree intact and modify CFLAGS.
+ * Refresh our build config with upstreams currect defconfig.
+ * CONFIG_STAKEY is deprecated in favour of CONFIG_PEERKEY.
+ * Disable CONFIG_DRIVER_DEVICESCAPE for now, it is FTBFS at least for
+ x86_64.
[ Faidon Liambotis ]
* Include Devicescape/mac80211 driver. Highly experimental at this point.
- (Closes: #429734)
* Update madwifi includes to r2583. This might break old installations, but
will fix setups with 6-month old madwifi. (Closes: #408642)
* Remove upgrade paths from pre-etch versions, we only support incremental
updates. Fix a lintian error in the process.
* Don't ignore "make clean" errors, if they exist; fixes a lintian warning.
- -- Kel Modderman <kel at otaku42.de> Tue, 24 Jul 2007 21:23:14 +1000
+ -- Kel Modderman <kel at otaku42.de> Tue, 24 Jul 2007 23:58:03 +1000
hostapd (1:0.5.7-1) unstable; urgency=low
Modified: hostapd/trunk/debian/patches/10_config.dpatch
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/patches/10_config.dpatch?rev=863&op=diff
==============================================================================
--- hostapd/trunk/debian/patches/10_config.dpatch (original)
+++ hostapd/trunk/debian/patches/10_config.dpatch Tue Jul 24 13:59:32 2007
@@ -5,10 +5,10 @@
## DP: Build time configuration
@DPATCH@
-diff -urNad hostapd-0.5.3/.config /tmp/dpep.o6SueM/hostapd-0.5.3/.config
---- hostapd-0.5.3/.config 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.o6SueM/hostapd-0.5.3/.config 2006-06-09 03:14:31.000000000 +0300
-@@ -0,0 +1,79 @@
+diff -Nrup hostapd-0.5.8.orig/.config hostapd-0.5.8/.config
+--- hostapd-0.5.8.orig/.config 1970-01-01 10:00:00.000000000 +1000
++++ hostapd-0.5.8/.config 2007-07-24 23:33:20.000000000 +1000
+@@ -0,0 +1,93 @@
+# Driver interface for Host AP driver
+CONFIG_DRIVER_HOSTAP=y
+
@@ -23,15 +23,18 @@
+CONFIG_DRIVER_PRISM54=y
+
+# Driver interface for drivers using Devicescape IEEE 802.11 stack
-+# CONFIG_DRIVER_DEVICESCAPE=y
++#CONFIG_DRIVER_DEVICESCAPE=y
++# Currently, driver_devicescape.c build requires some additional parameters
++# to be able to include some of the kernel header files. Following lines can
++# be used to set these (WIRELESS_DEV must point to the root directory of the
++# wireless-dev.git tree).
++#WIRELESS_DEV=/usr/src/wireless-dev
++#CFLAGS += -I$(WIRELESS_DEV)/net/mac80211
+
+# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
+#CONFIG_DRIVER_BSD=y
+#CFLAGS += -I/usr/local/include
+#LIBS += -L/usr/local/lib
-+
-+# Driver interface for test driver
-+CONFIG_DRIVER_TEST=y
+
+# IEEE 802.11F/IAPP
+CONFIG_IAPP=y
@@ -39,8 +42,14 @@
+# WPA2/IEEE 802.11i RSN pre-authentication
+CONFIG_RSN_PREAUTH=y
+
-+# IEEE 802.11i/IEEE 802.11e STAKey negotiation for direct link connection
-+CONFIG_STAKEY=y
++# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
++CONFIG_PEERKEY=y
++
++# IEEE 802.11w (management frame protection)
++# This version is an experimental implementation based on IEEE 802.11w/D1.0
++# draft and is subject to change since the standard has not yet been finalized.
++# Driver support is also needed for IEEE 802.11w.
++#CONFIG_IEEE80211W=y
+
+# Integrated EAP server
+CONFIG_EAP=y
@@ -76,7 +85,12 @@
+CONFIG_EAP_PSK=y
+
+# EAP-SAKE for the integrated EAP server
-+# CONFIG_EAP_SAKE=y
++#CONFIG_EAP_SAKE=y
++
++# EAP-GPSK for the integrated EAP server
++#CONFIG_EAP_GPSK=y
++# Include support for optional SHA256 cipher suite in EAP-GPSK
++#CONFIG_EAP_GPSK_SHA256=y
+
+# PKCS#12 (PFX) support (used to read private key and certificate file from
+# a file that usually has extension .p12 or .pfx)
Modified: hostapd/trunk/debian/patches/21_madwifi_enable.dpatch
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/patches/21_madwifi_enable.dpatch?rev=863&op=diff
==============================================================================
--- hostapd/trunk/debian/patches/21_madwifi_enable.dpatch (original)
+++ hostapd/trunk/debian/patches/21_madwifi_enable.dpatch Tue Jul 24 13:59:32 2007
@@ -5,9 +5,9 @@
## DP: Enable madwifi support & use our madwifi headers
@DPATCH@
-diff -Nrup hostapd.orig/.config hostapd/.config
---- hostapd.orig/.config 2006-08-25 08:05:49.000000000 +1000
-+++ hostapd/.config 2006-08-25 08:06:43.000000000 +1000
+diff -Nrup hostapd-0.5.8.orig/.config hostapd-0.5.8/.config
+--- hostapd-0.5.8.orig/.config 2007-07-24 23:35:07.000000000 +1000
++++ hostapd-0.5.8/.config 2007-07-24 23:35:44.000000000 +1000
@@ -5,8 +5,8 @@ CONFIG_DRIVER_HOSTAP=y
CONFIG_DRIVER_WIRED=y
Modified: hostapd/trunk/debian/patches/30_mac80211_headers.dpatch
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/patches/30_mac80211_headers.dpatch?rev=863&op=diff
==============================================================================
--- hostapd/trunk/debian/patches/30_mac80211_headers.dpatch (original)
+++ hostapd/trunk/debian/patches/30_mac80211_headers.dpatch Tue Jul 24 13:59:32 2007
@@ -5,9 +5,9 @@
## DP: mac80211 headers to build driver_devicescape.c
@DPATCH@
-diff -urNad trunk~/hostapd_ioctl.h trunk/hostapd_ioctl.h
---- trunk~/hostapd_ioctl.h 1970-01-01 02:00:00.000000000 +0200
-+++ trunk/hostapd_ioctl.h 2007-07-22 21:15:32.000000000 +0300
+diff -Nrup hostapd-0.5.8.orig/driver_devicescape/net/mac80211/hostapd_ioctl.h hostapd-0.5.8/driver_devicescape/net/mac80211/hostapd_ioctl.h
+--- hostapd-0.5.8.orig/driver_devicescape/net/mac80211/hostapd_ioctl.h 1970-01-01 10:00:00.000000000 +1000
++++ hostapd-0.5.8/driver_devicescape/net/mac80211/hostapd_ioctl.h 2007-07-24 23:40:12.000000000 +1000
@@ -0,0 +1,335 @@
+/*
+ * Host AP (software wireless LAN access point) user space daemon for
@@ -344,9 +344,9 @@
+};
+
+#endif /* HOSTAPD_IOCTL_H */
-diff -urNad trunk~/ieee80211_common.h trunk/ieee80211_common.h
---- trunk~/ieee80211_common.h 1970-01-01 02:00:00.000000000 +0200
-+++ trunk/ieee80211_common.h 2007-07-22 21:15:32.000000000 +0300
+diff -Nrup hostapd-0.5.8.orig/driver_devicescape/net/mac80211/ieee80211_common.h hostapd-0.5.8/driver_devicescape/net/mac80211/ieee80211_common.h
+--- hostapd-0.5.8.orig/driver_devicescape/net/mac80211/ieee80211_common.h 1970-01-01 10:00:00.000000000 +1000
++++ hostapd-0.5.8/driver_devicescape/net/mac80211/ieee80211_common.h 2007-07-24 23:40:12.000000000 +1000
@@ -0,0 +1,93 @@
+/*
+ * IEEE 802.11 driver (80211.o) -- hostapd interface
Modified: hostapd/trunk/debian/patches/31_mac80211_enable.dpatch
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/patches/31_mac80211_enable.dpatch?rev=863&op=diff
==============================================================================
--- hostapd/trunk/debian/patches/31_mac80211_enable.dpatch (original)
+++ hostapd/trunk/debian/patches/31_mac80211_enable.dpatch Tue Jul 24 13:59:32 2007
@@ -5,29 +5,23 @@
## DP: Enable mac80211/devicescape support and use our headers
@DPATCH@
-diff -urNad trunk~/.config trunk/.config
---- trunk~/.config 2007-07-22 20:57:45.000000000 +0300
-+++ trunk/.config 2007-07-22 20:57:52.000000000 +0300
-@@ -12,7 +12,7 @@
+diff -Nrup hostapd-0.5.8.orig/.config hostapd-0.5.8/.config
+--- hostapd-0.5.8.orig/.config 2007-07-24 23:35:07.000000000 +1000
++++ hostapd-0.5.8/.config 2007-07-24 23:37:36.000000000 +1000
+@@ -12,13 +12,13 @@ CONFIG_DRIVER_WIRED=y
CONFIG_DRIVER_PRISM54=y
# Driver interface for drivers using Devicescape IEEE 802.11 stack
--# CONFIG_DRIVER_DEVICESCAPE=y
+-#CONFIG_DRIVER_DEVICESCAPE=y
+CONFIG_DRIVER_DEVICESCAPE=y
+ # Currently, driver_devicescape.c build requires some additional parameters
+ # to be able to include some of the kernel header files. Following lines can
+ # be used to set these (WIRELESS_DEV must point to the root directory of the
+ # wireless-dev.git tree).
+-#WIRELESS_DEV=/usr/src/wireless-dev
+-#CFLAGS += -I$(WIRELESS_DEV)/net/mac80211
++WIRELESS_DEV=./driver_devicescape
++CFLAGS += -I$(WIRELESS_DEV)/net/mac80211
# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
#CONFIG_DRIVER_BSD=y
-diff -urNad trunk~/driver_devicescape.c trunk/driver_devicescape.c
---- trunk~/driver_devicescape.c 2007-07-22 20:44:17.000000000 +0300
-+++ trunk/driver_devicescape.c 2007-07-22 20:58:09.000000000 +0300
-@@ -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 */,
More information about the Pkg-wpa-devel
mailing list