summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/hostapd/doinst.sh19
-rw-r--r--network/hostapd/hostapd.SlackBuild6
-rw-r--r--network/hostapd/hostapd.info6
3 files changed, 19 insertions, 12 deletions
diff --git a/network/hostapd/doinst.sh b/network/hostapd/doinst.sh
index 16bfa3f184..868d8d6a43 100644
--- a/network/hostapd/doinst.sh
+++ b/network/hostapd/doinst.sh
@@ -11,12 +11,17 @@ 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
+preserve_perms() {
+ NEW="$1"
+ OLD="$(dirname $NEW)/$(basename $NEW .new)"
+ if [ -e $OLD ]; then
+ cp -a $OLD ${NEW}.incoming
+ cat $NEW > ${NEW}.incoming
+ mv ${NEW}.incoming $NEW
+ fi
+ config $NEW
+}
+
+preserve_perms etc/rc.d/rc.hostapd.new
-config etc/rc.d/rc.hostapd.new
diff --git a/network/hostapd/hostapd.SlackBuild b/network/hostapd/hostapd.SlackBuild
index 9ba7e6573f..0b2ba1ddd0 100644
--- a/network/hostapd/hostapd.SlackBuild
+++ b/network/hostapd/hostapd.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for hostapd
# Copyright 2008-2013 Murat D. Kadirov <banderols@gmail.com>
-# Copyright 2014 LukenShiro, Italy
+# Copyright 2014-2015 LukenShiro, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,10 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Fixed doinst.sh by Mario Preksavec <mario@slackware.hr>
+
PRGNAM=hostapd
-VERSION=${VERSION:-2.3}
+VERSION=${VERSION:-2.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/hostapd/hostapd.info b/network/hostapd/hostapd.info
index 9115cc19fa..2b4194ed2d 100644
--- a/network/hostapd/hostapd.info
+++ b/network/hostapd/hostapd.info
@@ -1,8 +1,8 @@
PRGNAM="hostapd"
-VERSION="2.3"
+VERSION="2.4"
HOMEPAGE="http://w1.fi/hostapd/"
-DOWNLOAD="http://w1.fi/releases/hostapd-2.3.tar.gz"
-MD5SUM="40b89c61036add0c2dd1fc10767d3b5f"
+DOWNLOAD="http://w1.fi/releases/hostapd-2.4.tar.gz"
+MD5SUM="04578f3f2c3eb1bec1adf30473813912"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""