marked build as beta3

add some hostapd files

diff --git a/config/menu/EX-wlanap.menu b/config/menu/EX-wlanap.menu
new file mode 100644 (file)
index 0000000..2859cfb
--- /dev/null
+++ b/config/menu/EX-wlanap.menu
@@ -0,0 +1,5 @@
+    $subipfire->{'54.wlanap'} = {'caption' => wlanap,
+                                 'uri' => '/cgi-bin/wlanap.cgi',
+                                 'title' => wlanap,
+                                 'enabled' => 1,
+                                 };

diff --git a/config/rootfiles/packages/hostapd b/config/rootfiles/packages/hostapd
index f0acfa89dbe6a8ceee4d6272cc96f74af8747266..7e238205743a0d0cca424c2e22b6aa36ba716e6e 100644 (file)
--- a/config/rootfiles/packages/hostapd
+++ b/config/rootfiles/packages/hostapd
@@ -1,3 +1,6 @@
+srv/web/ipfire/cgi-bin/wlanap.cgi
+var/ipfire/menu.d/EX-wlanap.menu
+var/ipfire/wlanap/settings
 etc/hostapd.conf
 etc/init.d/hostapd
 usr/bin/hostapd

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 1a1f753628c56e91b4a99d9a8966054a399eea38..404809a4dda9c42342d73e795cfb441cb94f6479 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -1,4 +1,4 @@
-== List of softwares used to build IPFire Version: 2.3-test ==
+== List of softwares used to build IPFire Version: 2.3-beta3 ==
 * Archive-Tar-1.29
 * Archive-Zip-1.16
 * BerkeleyDB-0.27
@@ -132,6 +132,8 @@
 * inetutils-1.4.2
 * ipaddr-1.2
 * ipfireseeder-1.00
+* ipp2p-0.8.2
+* ipp2p-0.8.2-iptables
 * iproute2-2.6.16-060323
 * iptables-1.3.8
 * iptstate-2.1

diff --git a/lfs/hostapd b/lfs/hostapd
index c0bf830ad352388c5559ab89d5bb31fd27b59438..0b3c14199f8f9c0f7cba611ccf90697ef43be991 100644 (file)
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -82,5 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make && make install
        cp -vrf $(DIR_SRC)/config/hostapd/hostapd.conf /etc/hostapd.conf
        install -v -m 644 $(DIR_SRC)/config/backup/includes/hostapd /var/ipfire/backup/addons/includes/hostapd
+       mkdir -p /var/ipfire/wlanap
+       touch /var/ipfire/wlanap/settings
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index a6b1fde99401d8b7f00743515cd6f1dc1d04d8de..d5dc327228eb3f644b0a08b7affe4ec71d909cdb 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.3-test"
+VERSION="2.3-beta3"
 GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir