Update of /cvsroot/leaf/src/bering-uclibc4/source/hostapd
In directory 
sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18760/source/hostapd

Added Files:
        .config buildtool.cfg buildtool.mk hostapd-0.5.11.tar.gz 
        hostapd-makefile.patch hostapd.default hostapd.init 
        hostapd_conf_etc.patch 
Log Message:
Fix/update of upnpd & hostapd


--- NEW FILE: hostapd-makefile.patch ---
diff -urN hostapd-0.3.7.orig/Makefile hostapd-0.3.7/Makefile
--- hostapd-0.3.7.orig/Makefile 2005-02-12 17:12:56.000000000 +0100
+++ hostapd-0.3.7/Makefile      2005-02-13 10:55:33.000000000 +0100
@@ -8,7 +8,7 @@
 
 # define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to
 # a file (undefine it, if you want to save in binary size)
-CFLAGS += -DHOSTAPD_DUMP_STATE
+#CFLAGS += -DHOSTAPD_DUMP_STATE
 
 # Include directories for CVS version
 CFLAGS += -I. -I$(DIR_HOSTAP) -I../utils -I$(DIR_WPA_SUPPLICANT)

--- NEW FILE: hostapd.default ---
# Defaults for hostapd initscript

# Uncomment the following line to run hostapd on startup
# WARNING! Depending on your configuration,
#          you may lose access via your wireless interface.
#
#RUN_DAEMON="yes"

# Additional daemon options
#       -d   show more debug messages (-dd for even more)
#       -K   include key data in debug messages
#       -t   include timestamps in some debug messages
#
#DAEMON_OPTS="-dd"

--- NEW FILE: .config ---
# 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 drivers using Devicescape IEEE 802.11 stack
#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)/include
#CFLAGS += -I$(WIRELESS_DEV)/net/d80211
#CFLAGS += -D_LINUX_TYPES_H

# 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

# 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

# EAP-MD5 for the integrated EAP server
CONFIG_EAP_MD5=y

# EAP-TLS for the integrated EAP server
CONFIG_EAP_TLS=y

# EAP-MSCHAPv2 for the integrated EAP server
CONFIG_EAP_MSCHAPV2=y

# EAP-PEAP for the integrated EAP server
CONFIG_EAP_PEAP=y

# EAP-GTC for the integrated EAP server
CONFIG_EAP_GTC=y

# EAP-TTLS for the integrated EAP server
CONFIG_EAP_TTLS=y

# EAP-SIM for the integrated EAP server
CONFIG_EAP_SIM=y

# EAP-AKA for the integrated EAP server
CONFIG_EAP_AKA=y

# EAP-PAX for the integrated EAP server
CONFIG_EAP_PAX=y

# EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK)
CONFIG_EAP_PSK=y

# EAP-SAKE for the integrated EAP server
#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)
CONFIG_PKCS12=y

# RADIUS authentication server. This provides access to the integrated EAP
# server from external hosts using RADIUS.
CONFIG_RADIUS_SERVER=y

# Build IPv6 support for RADIUS operations
CONFIG_IPV6=y

--- NEW FILE: hostapd.init ---
#!/bin/sh

RCDLINKS="2,S20 3,S20 4,S20 5,S20 0,K20 1,K20 6,K20"

PATH=/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/hostapd
NAME=hostapd
DESC="advanced IEEE 802.11 management"
PIDFILE=/var/run/hostapd.pid
DAEMON_CONF=/etc/hostapd/hostapd.conf

test -x $DAEMON || exit 0

if [ -s /etc/default/hostapd ] ; then
        . /etc/default/hostapd
fi

DAEMON_OPTS="-B -P $PIDFILE $DAEMON_OPTS $DAEMON_CONF"

case "$1" in
  start)
        echo -n "Starting $DESC: "
        if [ "$RUN_DAEMON" != "yes" ]; then
                echo "disabled via /etc/default/hostapd"
                exit 0
        fi
        echo -n "$NAME"
        start-stop-daemon --start --oknodo --quiet \
                --exec $DAEMON --pidfile $PIDFILE -- $DAEMON_OPTS > /dev/null
        echo "."
        ;;
  stop)
        echo -n "Stopping $DESC: "
        echo -n "$NAME"
        start-stop-daemon --stop --oknodo --quiet \
                --exec $DAEMON --pidfile $PIDFILE
        echo "."
        ;;
  reload)
        echo -n "Reloading $DESC: "
        echo -n "$NAME"
        start-stop-daemon --stop --signal 1 \
                --exec $DAEMON --pidfile $PIDFILE
        echo "."
        ;;
  restart|force-reload)
        $0 stop
        sleep 8
        $0 start
        ;;
  *)
        N=/etc/init.d/$NAME
        echo "Usage: $N {start|stop|restart|force-reload}" >&2
        exit 1
        ;;
esac

exit 0

--- NEW FILE: hostapd-0.5.11.tar.gz ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: buildtool.mk ---
#############################################################
#
# Hostap daemon 
#
#############################################################

include $(MASTERMAKEFILE)


HOSTAPD_DIR:=hostapd-0.5.11
HOSTAPD_TARGET_DIR:=$(BT_BUILD_DIR)/hostapd


$(HOSTAPD_DIR)/.source:
        zcat $(HOSTAPD_SOURCE) | tar -xvf -
        cat $(HOSTAPD_PATCH1) | patch -d $(HOSTAPD_DIR) -p1
        cat $(HOSTAPD_PATCH2) | patch -d $(HOSTAPD_DIR) -p1
        touch $(HOSTAPD_DIR)/.source

$(HOSTAPD_DIR)/.build: $(HOSTAPD_DIR)/.source
        -mkdir -p $(HOSTAPD_TARGET_DIR)/usr/bin
        -mkdir -p $(HOSTAPD_TARGET_DIR)/usr/sbin
        -mkdir -p $(HOSTAPD_TARGET_DIR)/etc/hostapd
        -mkdir -p $(HOSTAPD_TARGET_DIR)/etc/default
        -mkdir -p $(HOSTAPD_TARGET_DIR)/etc/init.d
        cp -a .config $(HOSTAPD_DIR)/
        ( cd $(HOSTAPD_DIR) ; export CFLAGS="$(BT_COPT_FLAGS) -MMD -Wall -g 
-I$(BT_STAGING_DIR)/usr/include" ; \
        export LIBS=-L$(BT_STAGING_DIR)/usr/lib ; make CC=$(TARGET_CC) ) ;
        -$(BT_STRIP) $(BT_STRIP_BINOPTS) $(HOSTAPD_DIR)/hostapd
        -$(BT_STRIP) $(BT_STRIP_BINOPTS) $(HOSTAPD_DIR)/hostapd_cli
        cp $(HOSTAPD_DIR)/hostapd $(HOSTAPD_TARGET_DIR)/usr/sbin/
        cp $(HOSTAPD_DIR)/hostapd_cli $(HOSTAPD_TARGET_DIR)/usr/bin/
        cp $(HOSTAPD_DIR)/hostapd.deny $(HOSTAPD_TARGET_DIR)/etc/hostapd/deny
        cp $(HOSTAPD_DIR)/hostapd.accept 
$(HOSTAPD_TARGET_DIR)/etc/hostapd/accept
        cp $(HOSTAPD_DIR)/hostapd.conf $(HOSTAPD_TARGET_DIR)/etc/hostapd/
        cp hostapd.default $(HOSTAPD_TARGET_DIR)/etc/default/hostapd
        cp hostapd.init $(HOSTAPD_TARGET_DIR)/etc/init.d/hostapd
        cp -a $(HOSTAPD_TARGET_DIR)/* $(BT_STAGING_DIR)
        touch $(HOSTAPD_DIR)/.build

 
source: $(HOSTAPD_DIR)/.source

build: $(HOSTAPD_DIR)/.build 
        
clean:
        make -C $(HOSTAPD_DIR) clean
        rm $(HOSTAPD_DIR)/.build
        rm -rf $(HOSTAPD_TARGET_DIR)

srcclean:
        rm -rf $(HOSTAPD_DIR)

--- NEW FILE: buildtool.cfg ---
<File buildtool.mk>
        Server = cvs4-sourceforge
        Directory = hostapd
        revision = HEAD 
</File>

<File hostapd-0.5.11.tar.gz>
        Server = cvs4-sourceforge
        Directory = hostapd
        revision = HEAD
        EnvName = HOSTAPD_SOURCE
</File>

<File hostapd-makefile.patch>
        Server = cvs4-sourceforge
        Directory = hostapd
        revision = HEAD
        EnvName = HOSTAPD_PATCH1
</File>

<File hostapd_conf_etc.patch>
        Server = cvs4-sourceforge
        Directory = hostapd
        revision = HEAD
        EnvName = HOSTAPD_PATCH2
</File>

<File .config>
        Server = cvs4-sourceforge
        Directory = hostapd
        revision = HEAD
</File>

<File hostapd.init>
        Server = cvs4-sourceforge
        Directory = hostapd
        revision = HEAD 
</File>

<File hostapd.default>
        Server = cvs4-sourceforge
        Directory = hostapd
        revision = HEAD 
</File>

<Package>
        <hostapd>
                Version = 0.5.11
                Revision = 1
                
                Help <<EOF
                Host AP user space daemon for extended IEEE 802.11 management
                Homepage: http://hostap.epitest.fi
                Requires: libssl.lrp, libcrpto.lrp
                LEAF Package by __PACKAGER__, __BUILDDATE__
                EOF

                <Permissions>
                        Files = 644
                        Directories = 755
                </Permissions>
                
                <Owner>
                        Files = root:root
                        Directories = root:root
                </Owner>
                <Contents>
                        <File>
                                Filename        = usr/sbin/hostapd
                                Source          = usr/sbin/hostapd
                                Type            = binary
                                Permissions     = 755
                        </File>
                        <File>
                                Filename        = usr/bin/hostapd_cli
                                Source          = usr/bin/hostapd_cli
                                Type            = binary
                                Permissions     = 755
                        </File>
                        <File>
                                Filename        = etc/init.d/hostapd
                                Source          = etc/init.d/hostapd
                                Type            = binary
                                Permissions     = 755
                        </File>
                        <File>
                                Filename        = etc/default/hostapd
                                Source          = etc/default/hostapd
                                Description     = hostap daemon default file
                                Type            = conf
                                Type            = local
                                Type            = binary
                                Permissions     = 644
                        </File>
                        <File>
                                Filename        = etc/hostapd/hostapd.conf
                                Source          = etc/hostapd/hostapd.conf
                                Description     = hostap daemon conf file
                                Type            = conf
                                Type            = binary
                                Permissions     = 600
                        </File>
                        <File>
                                Filename        = etc/hostapd/accept
                                Source          = etc/hostapd/accept
                                Description     = MAC accept list
                                Type            = conf
                                Type            = binary
                                Permissions     = 644
                        </File>
                        <File>
                                Filename        = etc/hostapd/deny
                                Source          = etc/hostapd/deny
                                Description     = MAC deny list
                                Type            = conf
                                Type            = binary
                                Permissions     = 644
                        </File>
                        <File>
                                Filename        = etc/hostapd
                                Type            = directory
                                Type            = local
                        </File>
                        <File>
                                Filename        = var/run/hostapd
                                Type            = directory
                        </File>
                </Contents>
        </hostapd>
</Package>

--- NEW FILE: hostapd_conf_etc.patch ---
diff -urN hostapd-0.5.7.orig/hostapd.conf hostapd-0.5.7/hostapd.conf
--- hostapd-0.5.7.orig/hostapd.conf     2006-12-31 17:25:55.000000000 +0100
+++ hostapd-0.5.7/hostapd.conf  2007-01-03 23:35:58.000000000 +0100
@@ -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
@@ -539,7 +539,7 @@
 # multiple BSSIDs or SSIDs. Each line in this text file is defining a new
 # interface and the line must include VLAN ID and interface name separated by
 # white space (space or tab).
-#vlan_file=/etc/hostapd.vlan
+#vlan_file=/etc/hostapd/vlan
 
 # Interface where 802.1q tagged packets should appear when a RADIUS server is
 # used to determine which VLAN a station is on.  hostapd creates a bridge for
@@ -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.


------------------------------------------------------------------------------

_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits

Reply via email to