END
;
@@ -440,25 +426,13 @@ wpa_pairwise=CCMP TKIP
END
;
}
- print CONFIGFILE </var/ipfire/wlanap/hostapd.accept");
+$wlanapsettings{'MACS'} =~ s/\r//gi;
+chomp($wlanapsettings{'MACS'});
+ open (MACFILE, ">/var/ipfire/wlanap/macfile");
print MACFILE </var/ipfire/wlanap/hostapd.deny");
- print MACFILE <. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 2.2
+
+THISAPP = sshfs-fuse-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 26e9206eb5169e87e6f95f54bc005a4f
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant
index 1ba5e29d6..80225ef9a 100644
--- a/lfs/wpa_supplicant
+++ b/lfs/wpa_supplicant
@@ -24,7 +24,7 @@
include Config
-VER = 0.5.10
+VER = 0.5.11
THISAPP = wpa_supplicant-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = wpa_supplicant
-PAK_VER = 1
+PAK_VER = 2
###############################################################################
# Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9e7b99da67c47d81121368c6d580d069
+$(DL_FILE)_MD5 = ad320af63f735531878e592f1ffd9b06
install : $(TARGET)
diff --git a/make.sh b/make.sh
index f9ae0180f..d1eecd0ca 100755
--- a/make.sh
+++ b/make.sh
@@ -585,6 +585,7 @@ buildipfire() {
ipfiremake cryptsetup
ipfiremake splix
ipfiremake streamripper
+ ipfiremake sshfs
echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -669,7 +670,7 @@ buildpackages() {
fi
# Create updater package
- ipfiremake updater
+ #ipfiremake updater
mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
ipfirepackages
diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd
index bb0da480b..8200c2d35 100644
--- a/src/initscripts/init.d/hostapd
+++ b/src/initscripts/init.d/hostapd
@@ -8,59 +8,71 @@ INTERFACE="blue0"
eval $(/usr/local/bin/readhash /var/ipfire/wlanap/settings)
case "${1}" in
- start)
+ start)
mkdir -p /var/run/hostapd
if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
- boot_mesg "Setting wlan $INTERFACE to Master mode... "
+ boot_mesg "Setting wlan $INTERFACE to Master mode... "
- # Set Atheros Cards to master mode
- if [ -d /proc/net/madwifi/ath0/ ]; then
+ # Set Atheros Cards to master mode
+ if [ -d /proc/net/madwifi/ath0/ ]; then
/usr/bin/wlanconfig ath0 destroy > /dev/null
- fi
-
- /usr/bin/wlanconfig $INTERFACE destroy > /dev/null
- /usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode ap > /dev/null
-
- # Set other cards to master mode
- #/usr/sbin/iwconfig blue0 mode master
fi
-
+
+ /usr/bin/wlanconfig $INTERFACE destroy > /dev/null
+ /usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode ap > /dev/null
+
+ # Set other cards to master mode
+ #/usr/sbin/iwconfig blue0 mode master
+ fi
+
if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
- boot_mesg "Error! Can't set wlan master mode"
- echo_failure;
- exit 1;
+ boot_mesg "Error! Can't set wlan master mode"
+ echo_failure;
+ exit 1;
else
- # enable wlan module of collectd
- sed -i -e "s|#LoadPlugin wireless|LoadPlugin wireless|g" /etc/collectd.conf
+ # enable wlan module of collectd
+ sed -i -e "s|#LoadPlugin wireless|LoadPlugin wireless|g" /etc/collectd.conf
- boot_mesg "Starting hostapd... "
- /usr/sbin/iwconfig $INTERFACE channel $CHANNEL
- /usr/sbin/iwconfig $INTERFACE txpower $TXPOWER
- /usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf /dev/tty12 2>&1 &
- evaluate_retval
+ boot_mesg "Starting hostapd... "
+ /usr/sbin/iwconfig $INTERFACE channel $CHANNEL
+ /usr/sbin/iwconfig $INTERFACE txpower $TXPOWER
+ /usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf /dev/tty12 2>&1 &
+ evaluate_retval
fi
-;;
- stop)
+ iwpriv $INTERFACE maccmd 3
+ if [ $MACMODE != 0 ]; then
+ FILE="/var/ipfire/wlanap/macfile"
+ exec < $FILE
+ while read LINE
+ do
+ iwpriv $INTERFACE addmac $LINE
+ done
+
+ iwpriv $INTERFACE maccmd $MACMODE
+ fi
+ ;;
+
+ stop)
boot_mesg "Stopping hostapd..."
- killproc /usr/bin/hostapd
- evaluate_retval
- ;;
+ killproc /usr/bin/hostapd
+ evaluate_retval
+ ;;
- restart)
- ${0} stop
- sleep 1
- ${0} start
- ;;
+ restart)
+ ${0} stop
+ sleep 1
+ ${0} start
+ ;;
- status)
- statusproc /usr/bin/hostapd
- ;;
+ status)
+ statusproc /usr/bin/hostapd
+ ;;
- *)
- echo "Usage: ${0} {start|stop|restart|status}"
- exit 1
- ;;
+ *)
+ echo "Usage: ${0} {start|stop|restart|status}"
+ exit 1
+ ;;
esac
diff --git a/src/paks/fetchmail/install.sh b/src/paks/fetchmail/install.sh
new file mode 100644
index 000000000..31c5fecae
--- /dev/null
+++ b/src/paks/fetchmail/install.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team . #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_files
+restore_backup ${NAME}
+start_service --background ${NAME}
diff --git a/src/paks/fetchmail/uninstall.sh b/src/paks/fetchmail/uninstall.sh
new file mode 100644
index 000000000..a7b8a5370
--- /dev/null
+++ b/src/paks/fetchmail/uninstall.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team . #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+stop_service ${NAME}
+make_backup ${NAME}
+remove_files
diff --git a/src/paks/fetchmail/update.sh b/src/paks/fetchmail/update.sh
new file mode 100644
index 000000000..cb88e3478
--- /dev/null
+++ b/src/paks/fetchmail/update.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2008 IPFire-Team . #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+
+#Create a backupinclude if it not exist
+if [ ! -e "/var/ipfire/backup/addons/includes/fetchmail" ]; then
+ echo "/root/.fetchmailrc" > /var/ipfire/backup/addons/includes/fetchmail
+fi
+
+./uninstall.sh
+./install.sh
diff --git a/src/paks/hostapd/update.sh b/src/paks/hostapd/update.sh
index 89c40d0d7..f81b04116 100644
--- a/src/paks/hostapd/update.sh
+++ b/src/paks/hostapd/update.sh
@@ -17,7 +17,7 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team . #
+# Copyright (C) 2008 IPFire-Team . #
# #
############################################################################
#