summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/hostapd/README6
-rw-r--r--network/hostapd/doinst.sh11
-rw-r--r--network/hostapd/hostapd.SlackBuild35
-rw-r--r--network/hostapd/hostapd.info6
-rw-r--r--network/hostapd/rc.hostapd42
-rw-r--r--network/hostapd/slack-desc2
6 files changed, 87 insertions, 15 deletions
diff --git a/network/hostapd/README b/network/hostapd/README
index 2493444bd7..0bcf02f7fa 100644
--- a/network/hostapd/README
+++ b/network/hostapd/README
@@ -6,6 +6,6 @@ Authenticators, RADIUS client, EAP server, and RADIUS authentication server.
The current version supports Linux (Host AP, madwifi, Prism54 drivers) and
FreeBSD (net80211).
-This is tested (by the submitter) with the madwifi driver, but it should also
-work with some other chipsets. If you plan to use the madwifi driver, then
-uncomment the madwifi section in the provided config file.
+This is tested with the madwifi driver, but it should also work with some
+other chipsets. If you plan to use the madwifi driver, then uncomment the
+madwifi section in the provided config file.
diff --git a/network/hostapd/doinst.sh b/network/hostapd/doinst.sh
index 1c9c32c1c8..16bfa3f184 100644
--- a/network/hostapd/doinst.sh
+++ b/network/hostapd/doinst.sh
@@ -1,5 +1,3 @@
-#!/bin/sh
-
config() {
NEW="$1"
OLD="$(dirname $NEW)/$(basename $NEW .new)"
@@ -13,3 +11,12 @@ config() {
# Otherwise, we leave the .new copy for the admin to consider...
}
+# Keep same perms on rc.hostapd.new:
+if [ -e etc/rc.d/rc.hostapd ]; then
+ cp -a etc/rc.d/rc.hostapd etc/rc.d/rc.hostapd.new.incoming
+ cat etc/rc.d/rc.hostapd.new > etc/rc.d/rc.hostapd.new.incoming
+ mv etc/rc.d/rc.hostapd.new.incoming etc/rc.d/rc.hostapd.new
+fi
+
+config etc/rc.d/rc.hostapd.new
+
diff --git a/network/hostapd/hostapd.SlackBuild b/network/hostapd/hostapd.SlackBuild
index 0f3c3e8ad9..ead85dfad1 100644
--- a/network/hostapd/hostapd.SlackBuild
+++ b/network/hostapd/hostapd.SlackBuild
@@ -3,9 +3,26 @@
# Slackware build script for hostapd
# Written by Murat D. Kadirov <banderols@gmail.com>
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=hostapd
-VERSION=${VERSION:-0.5.10}
+VERSION=${VERSION:-0.5.11}
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -38,15 +55,18 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-cp $CWD/config $TMP/$PRGNAM-$VERSION/.config
+cat $CWD/config > .config
-make
+CFLAGS+="$SLKCFLAGS" make
mkdir -p \
$PKG/usr/sbin/ \
- $PKG/etc/hostapd/ \
+ $PKG/etc/hostapd \
$PKG/usr/man/man1 \
$PKG/usr/man/man8/
+
+install -D -m 0755 $CWD/rc.hostapd $PKG/etc/rc.d/rc.hostapd.new
+
DOINST_TMP=$(mktemp) # temporary holding place
for i in \
hlr_auc_gw.milenage_db hostapd.accept hostapd.conf \
@@ -54,6 +74,7 @@ for i in \
hostapd.sim_db hostapd.wpa_psk madwifi.conf wired.conf ;
do
cat $i > $PKG/etc/hostapd/$i.new ;
+ chmod 0600 $PKG/etc/hostapd/$i.new ;
echo "config etc/hostapd/$i.new" >> $DOINST_TMP
done
@@ -62,8 +83,10 @@ gzip -9c hostapd_cli.1 > $PKG/usr/man/man1/hostapd_cli.1.gz
cp hostapd hostapd_cli $PKG/usr/sbin/
( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+ xargs strip --strip-unneeded 2> /dev/null || true
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+ xargs strip --strip-unneeded 2> /dev/null
)
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/network/hostapd/hostapd.info b/network/hostapd/hostapd.info
index 2cdf3479f3..38745b4cda 100644
--- a/network/hostapd/hostapd.info
+++ b/network/hostapd/hostapd.info
@@ -1,8 +1,8 @@
PRGNAM="hostapd"
-VERSION="0.5.10"
+VERSION="0.5.11"
HOMEPAGE="http://hostap.epitest.fi/hostapd/"
-DOWNLOAD="http://hostap.epitest.fi/releases/hostapd-0.5.10.tar.gz"
-MD5SUM="ed669d96346dfc7d9f9fad079731853f"
+DOWNLOAD="http://hostap.epitest.fi/releases/hostapd-0.5.11.tar.gz"
+MD5SUM="d99d3566d5f15dfd24df37fcb2ee80ee"
MAINTAINER="Murat D. Kadirov"
EMAIL="banderols@gmail.com"
APPROVED="rworkman"
diff --git a/network/hostapd/rc.hostapd b/network/hostapd/rc.hostapd
new file mode 100644
index 0000000000..c034284b8a
--- /dev/null
+++ b/network/hostapd/rc.hostapd
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# Start/stop/restart the hostapd (IEEE 802.11 Wireless AP) server:
+
+hostapd_start() {
+ if test -r /var/run/hostapd.pid && ps $(cat /var/run/hostapd.pid) >& /dev/null; then
+ echo "HOSTAPD already running!"
+ else
+ CMD="/usr/sbin/hostapd -B -P /var/run/hostapd.pid /etc/hostapd/hostapd.conf"
+ echo "Starting HOSTAPD: $CMD"
+ $CMD
+ fi
+}
+
+hostapd_stop() {
+ if [ -r /var/run/hostapd.pid ]; then
+ echo -n "Stopping HOSTAPD ..."
+ kill -INT $(cat /var/run/hostapd.pid)
+ echo " done."
+ fi
+}
+
+hostapd_restart() {
+ hostapd_stop
+ sleep 3
+ hostapd_start
+}
+
+case "$1" in
+'start')
+ hostapd_start
+ ;;
+'stop')
+ hostapd_stop
+ ;;
+'restart')
+ hostapd_restart
+ ;;
+*)
+ echo "usage $0 start|stop|restart"
+esac
+
diff --git a/network/hostapd/slack-desc b/network/hostapd/slack-desc
index 8df1313cd4..6007b43948 100644
--- a/network/hostapd/slack-desc
+++ b/network/hostapd/slack-desc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-hostapd: hostapd (Authenticator)
+hostapd: hostapd (Wifi Authenticator)
hostapd:
hostapd: hostapd is a user space daemon for access point and authentication
hostapd: servers. It implements IEEE 802.11 access point management,