Accepting request 41288 from Base:System

Copy from Base:System/hostapd based on submit request 41288 from user dirkmueller

OBS-URL: https://build.opensuse.org/request/show/41288
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hostapd?expand=0&rev=7

hostapd.dif

@@ -1,116 +1,54 @@
-Index: hostapd-0.5.7/.config
-================================================================================
---- hostapd-0.5.8/.config
-+++ hostapd-0.5.8/.config
-@@ -0,0 +1,80 @@
-+# Example hostapd build time configuration
-+#
-+# This file lists the configuration options that are used when building the
-+# hostapd binary. All lines starting with # are ignored. Configuration option
-+# lines must be commented out complete, if they are not to be included, i.e.,
-+# just setting VARIABLE=n is not disabling that variable.
-+#
-+# This file is included in Makefile, so variables like CFLAGS and LIBS can also
-+# be modified from here. In most cass, these lines should use += in order not
-+# to override previous values of the variables.
-+
-+# Driver interface for Host AP driver
-+CONFIG_DRIVER_HOSTAP=y
-+
-+# Driver interface for wired authenticator
+--- defconfig.orig	2010-06-09 01:28:31.000000000 +0200
++++ defconfig	2010-06-09 01:34:34.000000000 +0200
+@@ -13,17 +13,17 @@
+ CONFIG_DRIVER_HOSTAP=y
+ 
+ # Driver interface for wired authenticator
+-#CONFIG_DRIVER_WIRED=y
 +CONFIG_DRIVER_WIRED=y
-+
-+# Driver interface for madwifi driver
-+MADWIFI_SOURCE=$(shell echo /usr/include/madwifi*)
-+MADWIFI_AVAIL=$(shell test -x ${MADWIFI_SOURCE} && echo y)
-+ifeq ($(MADWIFI_AVAIL),y)
-+CFLAGS += -I$(shell echo /usr/include/madwifi*)
-+CONFIG_DRIVER_MADWIFI=y
-+endif
-+
-+# Driver interface for Prism54 driver
+ 
+ # Driver interface for madwifi driver
+ #CONFIG_DRIVER_MADWIFI=y
+ #CFLAGS += -I../../madwifi # change to the madwifi source directory
+ 
+ # Driver interface for Prism54 driver
+-#CONFIG_DRIVER_PRISM54=y
 +CONFIG_DRIVER_PRISM54=y
-+
-+# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
-+#CONFIG_DRIVER_BSD=y
-+#CFLAGS += -I/usr/local/include
-+#LIBS += -L/usr/local/lib
-+
-+# IEEE 802.11F/IAPP
-+CONFIG_IAPP=y
-+
-+# WPA2/IEEE 802.11i RSN pre-authentication
-+CONFIG_RSN_PREAUTH=y
-+
-+# Integrated EAP authenticator
-+CONFIG_EAP=y
-+
-+# EAP-MD5 for the integrated EAP authenticator
-+CONFIG_EAP_MD5=y
-+
-+# EAP-TLS for the integrated EAP authenticator
-+CONFIG_EAP_TLS=y
-+
-+# EAP-MSCHAPv2 for the integrated EAP authenticator
-+CONFIG_EAP_MSCHAPV2=y
-+
-+# EAP-PEAP for the integrated EAP authenticator
-+CONFIG_EAP_PEAP=y
-+
-+# EAP-GTC for the integrated EAP authenticator
-+CONFIG_EAP_GTC=y
-+
-+# EAP-TTLS for the integrated EAP authenticator
-+CONFIG_EAP_TTLS=y
-+
-+# EAP-SIM for the integrated EAP authenticator
+ 
+ # Driver interface for drivers using the nl80211 kernel interface
+-#CONFIG_DRIVER_NL80211=y
++CONFIG_DRIVER_NL80211=y
+ # driver_nl80211.c requires a rather new libnl (version 1.1) which may not be
+ # shipped with your distribution yet. If that is the case, you need to build
+ # newer libnl version and point the hostapd build to use it.
+@@ -76,7 +76,7 @@
+ CONFIG_EAP_TTLS=y
+ 
+ # EAP-SIM for the integrated EAP server
+-#CONFIG_EAP_SIM=y
 +CONFIG_EAP_SIM=y
-+
-+# EAP-PAX for the integrated EAP server
+ 
+ # EAP-AKA for the integrated EAP server
+ #CONFIG_EAP_AKA=y
+@@ -86,10 +86,10 @@
+ #CONFIG_EAP_AKA_PRIME=y
+ 
+ # EAP-PAX for the integrated EAP server
+-#CONFIG_EAP_PAX=y
 +CONFIG_EAP_PAX=y
-+
-+# EAP-PSK for the integrated EAP server
+ 
+ # EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK)
+-#CONFIG_EAP_PSK=y
 +CONFIG_EAP_PSK=y
-+
-+# PKCS#12 (PFX) support (used to read private key and certificate file from
-+# a file that usually has extension .p12 or .pfx)
-+CONFIG_PKCS12=y
-+
-+# RADIUS authentication server. This provides access to the integrated EAP
-+# authenticator from external hosts using RADIUS.
+ 
+ # EAP-SAKE for the integrated EAP server
+ #CONFIG_EAP_SAKE=y
+@@ -123,7 +123,7 @@
+ 
+ # RADIUS authentication server. This provides access to the integrated EAP
+ # server from external hosts using RADIUS.
+-#CONFIG_RADIUS_SERVER=y
 +CONFIG_RADIUS_SERVER=y
-+
-+# Build IPv6 support for RADIUS operations
-+CONFIG_IPV6=y
-+
---- hostapd-0.5.8/Makefile
-+++ hostapd-0.5.8/Makefile
-@@ -18,6 +18,8 @@
  
- -include .config
- 
-+BINDIR ?= /usr/local/bin
-+
- ifndef CONFIG_OS
- ifdef CONFIG_NATIVE_WINDOWS
- CONFIG_OS=win32
-@@ -333,7 +335,8 @@
- 	fi
- 
- install: all
--	for i in $(ALL); do cp $$i /usr/local/bin/$$i; done
-+	mkdir -p $(INSTROOT)$(BINDIR)
-+	for i in $(ALL); do install -m755 $$i $(INSTROOT)$(BINDIR)/$$i; done
- 
- hostapd: $(OBJS)
- 	$(CC) -o hostapd $(OBJS) $(LIBS)
---- hostapd-0.5.8/driver_madwifi.c
-+++ hostapd-0.5.8/driver_madwifi.c
-@@ -19,6 +19,7 @@
- #include <sys/ioctl.h>
- 
- #include <include/compat.h>
-+#include <net80211/_ieee80211.h>
- #include <net80211/ieee80211.h>
- #ifdef WME_NUM_AC
- /* Assume this is built against BSD branch of madwifi driver. */
+ # Build IPv6 support for RADIUS operations
+ CONFIG_IPV6=y