From 0979748c503f452891b5a446ce360f977dd50dc1 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 20 Mar 2006 19:30:02 +0000 Subject: [PATCH] hostap-daemon: moved repeated patches to hostap-daemon/ dir --- .../hostap/hostap-daemon-0.4.4/.mtn2git_empty | 0 packages/hostap/hostap-daemon-0.4.4/defconfig | 66 ------------------- packages/hostap/hostap-daemon-0.4.4/init | 39 ----------- .../hostap-daemon-0.4.4/madwifi-bsd-fix.diff | 12 ---- .../hostap-daemon-0.4.4/makefile-cross.diff | 26 -------- .../hostap-daemon-0.4.4/mtx-1/.mtn2git_empty | 0 .../hostap-daemon-0.4.4/mtx-1/defconfig | 66 ------------------- .../.mtn2git_empty | 0 .../defconfig | 0 .../init | 0 .../madwifi-bsd-fix.diff | 0 .../makefile-cross.diff | 0 .../mtx-1/.mtn2git_empty | 0 .../mtx-1/defconfig | 0 14 files changed, 209 deletions(-) delete mode 100644 packages/hostap/hostap-daemon-0.4.4/.mtn2git_empty delete mode 100644 packages/hostap/hostap-daemon-0.4.4/defconfig delete mode 100644 packages/hostap/hostap-daemon-0.4.4/init delete mode 100644 packages/hostap/hostap-daemon-0.4.4/madwifi-bsd-fix.diff delete mode 100644 packages/hostap/hostap-daemon-0.4.4/makefile-cross.diff delete mode 100644 packages/hostap/hostap-daemon-0.4.4/mtx-1/.mtn2git_empty delete mode 100644 packages/hostap/hostap-daemon-0.4.4/mtx-1/defconfig rename packages/hostap/{hostap-daemon-0.3.7 => hostap-daemon}/.mtn2git_empty (100%) rename packages/hostap/{hostap-daemon-0.3.7 => hostap-daemon}/defconfig (100%) rename packages/hostap/{hostap-daemon-0.3.7 => hostap-daemon}/init (100%) mode change 100755 => 100644 rename packages/hostap/{hostap-daemon-0.3.7 => hostap-daemon}/madwifi-bsd-fix.diff (100%) rename packages/hostap/{hostap-daemon-0.3.7 => hostap-daemon}/makefile-cross.diff (100%) rename packages/hostap/{hostap-daemon-0.3.7 => hostap-daemon}/mtx-1/.mtn2git_empty (100%) rename packages/hostap/{hostap-daemon-0.3.7 => hostap-daemon}/mtx-1/defconfig (100%) diff --git a/packages/hostap/hostap-daemon-0.4.4/.mtn2git_empty b/packages/hostap/hostap-daemon-0.4.4/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hostap/hostap-daemon-0.4.4/defconfig b/packages/hostap/hostap-daemon-0.4.4/defconfig deleted file mode 100644 index d0e22f2586..0000000000 --- a/packages/hostap/hostap-daemon-0.4.4/defconfig +++ /dev/null @@ -1,66 +0,0 @@ -# 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 -CONFIG_DRIVER_WIRED=y - -# Driver interface for madwifi driver -#CONFIG_DRIVER_MADWIFI=y -#CFLAGS += -I../head # change to reflect local setup; directory for madwifi src - -# Driver interface for Prism54 driver -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 -#CONFIG_EAP_SIM=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. -CONFIG_RADIUS_SERVER=y diff --git a/packages/hostap/hostap-daemon-0.4.4/init b/packages/hostap/hostap-daemon-0.4.4/init deleted file mode 100644 index b0736c0baa..0000000000 --- a/packages/hostap/hostap-daemon-0.4.4/init +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -DAEMON=/usr/sbin/hostapd -NAME=httpd -DESC="HOSTAP Daemon" -ARGS="/etc/hostapd.conf" - -test -f $DAEMON || exit 0 - -set -e - -case "$1" in - start) - echo -n "starting $DESC: $NAME... " - start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS - echo "done." - ;; - stop) - echo -n "stopping $DESC: $NAME... " - start-stop-daemon -K -n $NAME - echo "done." - ;; - restart) - echo "restarting $DESC: $NAME... " - $0 stop - $0 start - echo "done." - ;; - reload) - echo -n "reloading $DESC: $NAME... " - killall -HUP $(basename ${DAEMON}) - echo "done." - ;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 - ;; -esac - -exit 0 diff --git a/packages/hostap/hostap-daemon-0.4.4/madwifi-bsd-fix.diff b/packages/hostap/hostap-daemon-0.4.4/madwifi-bsd-fix.diff deleted file mode 100644 index d9dab26a15..0000000000 --- a/packages/hostap/hostap-daemon-0.4.4/madwifi-bsd-fix.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- driver_madwifi.c.orig 2005-03-18 15:12:53.392793216 +0100 -+++ driver_madwifi.c 2005-03-18 15:13:09.246383104 +0100 -@@ -21,7 +21,8 @@ - #include - #include - --#include -+#include -+#include - #include - #include - #include diff --git a/packages/hostap/hostap-daemon-0.4.4/makefile-cross.diff b/packages/hostap/hostap-daemon-0.4.4/makefile-cross.diff deleted file mode 100644 index 25d2ca34bb..0000000000 --- a/packages/hostap/hostap-daemon-0.4.4/makefile-cross.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- Makefile.orig 2005-03-18 14:34:27.274376504 +0100 -+++ Makefile 2005-03-18 14:35:56.609795456 +0100 -@@ -1,7 +1,9 @@ --CC=gcc -+CC?=gcc - DIR_WPA_SUPPLICANT=. - DIR_HOSTAP=. - -+TARGET_PREFIX ?= /usr/local/bin/ -+ - ifndef CFLAGS - CFLAGS = -MMD -O2 -Wall -g - endif -@@ -170,10 +172,10 @@ - fi - - install: all -- for i in $(ALL); do cp $$i /usr/local/bin/$$i; done -+ for i in $(ALL); do cp $$i $(TARGET_PREFIX)/$$i; done - - hostapd: $(OBJS) -- $(CC) -o hostapd $(OBJS) $(LIBS) -+ $(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS) - - driver_conf.c: Makefile .config - rm -f driver_conf.c diff --git a/packages/hostap/hostap-daemon-0.4.4/mtx-1/.mtn2git_empty b/packages/hostap/hostap-daemon-0.4.4/mtx-1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hostap/hostap-daemon-0.4.4/mtx-1/defconfig b/packages/hostap/hostap-daemon-0.4.4/mtx-1/defconfig deleted file mode 100644 index 8c3065c3b9..0000000000 --- a/packages/hostap/hostap-daemon-0.4.4/mtx-1/defconfig +++ /dev/null @@ -1,66 +0,0 @@ -# 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 -CONFIG_DRIVER_WIRED=y - -# Driver interface for madwifi driver -CONFIG_DRIVER_MADWIFI=y -#CFLAGS += -I../head # change to reflect local setup; directory for madwifi src - -# Driver interface for Prism54 driver -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 -#CONFIG_EAP_SIM=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. -CONFIG_RADIUS_SERVER=y diff --git a/packages/hostap/hostap-daemon-0.3.7/.mtn2git_empty b/packages/hostap/hostap-daemon/.mtn2git_empty similarity index 100% rename from packages/hostap/hostap-daemon-0.3.7/.mtn2git_empty rename to packages/hostap/hostap-daemon/.mtn2git_empty diff --git a/packages/hostap/hostap-daemon-0.3.7/defconfig b/packages/hostap/hostap-daemon/defconfig similarity index 100% rename from packages/hostap/hostap-daemon-0.3.7/defconfig rename to packages/hostap/hostap-daemon/defconfig diff --git a/packages/hostap/hostap-daemon-0.3.7/init b/packages/hostap/hostap-daemon/init old mode 100755 new mode 100644 similarity index 100% rename from packages/hostap/hostap-daemon-0.3.7/init rename to packages/hostap/hostap-daemon/init diff --git a/packages/hostap/hostap-daemon-0.3.7/madwifi-bsd-fix.diff b/packages/hostap/hostap-daemon/madwifi-bsd-fix.diff similarity index 100% rename from packages/hostap/hostap-daemon-0.3.7/madwifi-bsd-fix.diff rename to packages/hostap/hostap-daemon/madwifi-bsd-fix.diff diff --git a/packages/hostap/hostap-daemon-0.3.7/makefile-cross.diff b/packages/hostap/hostap-daemon/makefile-cross.diff similarity index 100% rename from packages/hostap/hostap-daemon-0.3.7/makefile-cross.diff rename to packages/hostap/hostap-daemon/makefile-cross.diff diff --git a/packages/hostap/hostap-daemon-0.3.7/mtx-1/.mtn2git_empty b/packages/hostap/hostap-daemon/mtx-1/.mtn2git_empty similarity index 100% rename from packages/hostap/hostap-daemon-0.3.7/mtx-1/.mtn2git_empty rename to packages/hostap/hostap-daemon/mtx-1/.mtn2git_empty diff --git a/packages/hostap/hostap-daemon-0.3.7/mtx-1/defconfig b/packages/hostap/hostap-daemon/mtx-1/defconfig similarity index 100% rename from packages/hostap/hostap-daemon-0.3.7/mtx-1/defconfig rename to packages/hostap/hostap-daemon/mtx-1/defconfig -- 2.39.5