/etc/hostapd.conf
+/var/ipfire/wlanap/macfile
/var/ipfire/wlanap/settings
/var/ipfire/wlanap/hostapd.conf
net.ipv4.conf.all.log_martians = 1
kernel.printk = 1 4 1 7
+vm.swappiness=0
our $VERSION = '0.19.1';
-Readonly our $REUSE => 1;
-Readonly our $ONCE => 0;
+Readonly our $REUSE => 0;
+Readonly our $ONCE => 1;
our @EXPORT = qw[ $REUSE $ONCE ];
# - conntype => $type : how the connection to mpd server is handled. it can be
# either $REUSE: reuse the same connection
# or $ONCE: open a new connection per command (default)
-#
+#
sub new {
my ($class, %opts) = @_;
_host => $host,
_port => $port,
_password => $password,
- _conntype => exists $opts{conntype} ? $opts{conntype} : $ONCE,
+ _conntype => exists $opts{conntype} ? $opts{conntype} : $REUSE,
};
bless $self, $class;
#usr/lib/libfuse.la
usr/lib/libfuse.so
usr/lib/libfuse.so.2
-usr/lib/libfuse.so.2.6.3
+usr/lib/libfuse.so.2.7.4
#usr/lib/libulockmgr.a
#usr/lib/libulockmgr.la
usr/lib/libulockmgr.so
bin/ntfs-3g
lib/libntfs-3g.so
-lib/libntfs-3g.so.40
-lib/libntfs-3g.so.40.0.0
+lib/libntfs-3g.so.43
+lib/libntfs-3g.so.43.0.0
sbin/mount.ntfs-3g
usr/bin/ntfs-3g.probe
#usr/include/ntfs-3g
+++ /dev/null
-var/ipfire/langs
-srv/web/ipfire/cgi-bin/qos.cgi
-srv/web/ipfire/cgi-bin/pakfire.cgi
-opt/pakfire/lib/functions.sh
-srv/web/ipfire/cgi-bin/updatexlrator.cgi
-usr/sbin/updxlrator
-var/ipfire/updatexlrator/bin/download
-etc/httpd/conf/vhosts.d/ipfire-interface.conf
+++ /dev/null
-usr/local/bin/wirelessctrl
-srv/web/ipfire/cgi-bin/optionsfw.cgi
-srv/web/ipfire/cgi-bin/gui.cgi
-srv/web/ipfire/cgi-bin/qos.cgi
-srv/web/ipfire/cgi-bin/services.cgi
-#srv/web/ipfire/cgi-bin/graphs.cgi
-var/ipfire/langs
-var/ipfire/graphs.pl
+++ /dev/null
-usr/bin/tunctl
-usr/bin/squidGuard
-var/ipfire/urlfilter/bin/autoupdate.pl
-etc/squid
-usr/lib/squid
-usr/sbin/squid
-bin/ntfs-3g
-#lib/libntfs-3g.so
-#lib/libntfs-3g.so.24
-#lib/libntfs-3g.so.24.0.0
-sbin/mount.ntfs-3g
-usr/bin/php
-usr/lib/apache/libphp5.so
-usr/bin/pear
-usr/bin/peardev
-usr/lib/php/.channels/.alias/pear.txt
-usr/lib/php/.channels/pear.php.net.reg
-usr/lib/php/.registry/pear.reg
-usr/lib/php/data/PEAR/package.dtd
-usr/lib/php/data/PEAR/template.spec
-usr/lib/php/pearcmd.php
-srv/web/ipfire/cgi-bin/proxy.cgi
-usr/sbin/redirect_wrapper
-var/ipfire/langs
+++ /dev/null
-etc/udev/dvb.sh
-etc/udev/rules.d/10-dvb.rules
-srv/web/ipfire/cgi-bin/services.cgi
-srv/web/ipfire/cgi-bin/proxy.cgi
-srv/web/ipfire/cgi-bin/urlfilter.cgi
-srv/web/ipfire/cgi-bin/updatexlrator.cgi
-srv/web/ipfire/cgi-bin/pakfire.cgi
-srv/web/ipfire/cgi-bin/logs.cgi/log.dat
-opt/pakfire/lib/functions.pl
-var/ipfire/langs
-etc/sysconfig/modules
+++ /dev/null
-opt/pakfire/lib/functions.pl
-var/ipfire/urlfilter/bin/prebuild.pl
-srv/web/ipfire/cgi-bin/urlfilter.cgi
-usr/sbin/redirect_wrapper
+++ /dev/null
-var/ipfire/langs
-etc/squid
-usr/lib/squid
-usr/sbin/squid
-srv/web/ipfire/cgi-bin/updatexlrator.cgi
-#srv/web/ipfire/html/images/updxl-src-avg.gif
-usr/sbin/updxlrator
-srv/web/ipfire/html/images/audio-volume-high.png
-srv/web/ipfire/html/images/audio-volume-low.png
-srv/web/ipfire/html/images/audio-x-generic.png
-srv/web/ipfire/html/images/audio-volume-high-red.png
-srv/web/ipfire/html/images/audio-volume-low-red.png
-srv/web/ipfire/html/images/audio-x-generic-red.png
-srv/web/ipfire/html/images/media-flash.png
-srv/web/ipfire/html/images/media-playback-start-all.png
-srv/web/ipfire/html/images/media-repeat.png
-srv/web/ipfire/html/images/media-skip-backward.png
-srv/web/ipfire/html/images/media-floppy.png
-srv/web/ipfire/html/images/media-playback-start.png
-srv/web/ipfire/html/images/media-resume.png
-srv/web/ipfire/html/images/media-skip-forward.png
-srv/web/ipfire/html/images/media-optical.png
-srv/web/ipfire/html/images/media-playback-stop.png
-srv/web/ipfire/html/images/media-shuffle.png
-usr/share/curl/curl-ca-bundle.crt
+++ /dev/null
-srv/web/ipfire/cgi-bin/qos.cgi
-srv/web/ipfire/cgi-bin/pakfire.cgi
-srv/web/ipfire/cgi-bin/ids.cgi
-srv/web/ipfire/cgi-bin/index.cgi
-srv/web/ipfire/cgi-bin/urlfilter.cgi
-srv/web/ipfire/html/redirect.cgi
-var/ipfire/qos/bin/makeqosscripts.pl
-var/ipfire/outgoing/bin/outgoingfw.pl
-etc/sysconfig/rc.local
-etc/rc.d/init.d/networking/red.down/10-ipsec
-etc/rc.d/init.d/networking/red.down/10-ovpn
-etc/rc.d/init.d/networking/red.up/10-multicast
-etc/rc.d/init.d/networking/red.up/30-ddns
-etc/rc.d/init.d/networking/red.up/40-ipac
-etc/rc.d/init.d/networking/red.up/50-ipsec
-etc/rc.d/init.d/networking/red.up/50-ovpn
-etc/rc.d/init.d/networking/red.up/99-pakfire-update
-etc/ppp/options
-usr/local/bin/qosctrl
+++ /dev/null
-usr/lib/libwrap.so
-usr/lib/libwrap.so.0
-usr/lib/libwrap.so.0.7.6
+++ /dev/null
-etc/rc.d/init.d/firewall
-usr/local/bin/makegraphs
-var/ipfire/langs
-var/ipfire/optionsfw/settings
-var/ipfire/menu.d/50-firewall.menu
-srv/web/ipfire/cgi-bin/pakfire.cgi
-srv/web/ipfire/cgi-bin/outgoingfw.cgi
-srv/web/ipfire/cgi-bin/optionsfw.cgi
-srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromip.dat
-srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromport.dat
-srv/web/ipfire/cgi-bin/logs.cgi/log.dat
-srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
-usr/local/bin/qosctrl
-opt/pakfire/lib/functions.sh
+++ /dev/null
-lib/modules/KVER-ipfire/kernel/fs/nfsd/nfsd.ko
-#lib/modules/KVER-ipfire-smp/kernel/fs/nfsd/nfsd.ko
-usr/local/bin/qosctrl
-etc/rc.d/init.d/squid
-var/ipfire/langs
-var/ipfire/graphs.pl
+++ /dev/null
-srv/web/ipfire/cgi-bin/outgoingfw.cgi
-etc/rc.d/init.d/squid
-#bin/ntfs-3g
-#lib/libntfs-3g.so
-#lib/libntfs-3g.so.21
-#lib/libntfs-3g.so.21.0.0
-#sbin/mount.ntfs-3g
+++ /dev/null
-etc/rc.d/rc3.d/S19smartenabler
-etc/rc.d/init.d/smartenabler
-etc/rc.d/init.d/networking/red
-#srv/web/ipfire/cgi-bin/graphs.cgi
-srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
-#srv/web/ipfire/cgi-bin/network.cgi
-srv/web/ipfire/cgi-bin/optionsfw.cgi
-srv/web/ipfire/cgi-bin/proxy.cgi
-usr/local/bin/makegraphs
-usr/local/bin/wirelessctrl
-var/ipfire/graphs.pl
-var/ipfire/menu.d/20-status.menu
-var/ipfire/langs
-lib/modules/KVER-ipfire/kernel/drivers/ieee1394/sbp2.ko
-srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+++ /dev/null
-srv/web/ipfire/cgi-bin/logs.cgi/log.dat
-etc/ntp
-usr/local/bin/wirelessctrl
+++ /dev/null
-sbin/hdparm
-etc/rc.d/init.d/networking/red
-etc/squid
-sbin/capiinit
-usr/bin/capiinfo
-usr/lib/libcapi20.so
-usr/lib/libcapi20.so.3
-usr/lib/libcapi20.so.3.0.4
-usr/lib/squid
-usr/sbin/squid
-var/ipfire/graphs.pl
-usr/local/bin/addonctrl
-srv/web/ipfire/cgi-bin/services.cgi
-srv/web/ipfire/cgi-bin/system.cgi
-var/ipfire/menu.d/20-status.menu
-var/ipfire/langs
-opt/pakfire/lib/functions.pl
--- /dev/null
+usr/bin/sshfs
+#usr/share/man/man1/sshfs.1
+++ /dev/null
-usr/sbin/dnsmasq
+++ /dev/null
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-extract_files
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
\ No newline at end of file
+++ /dev/null
-etc/rc.d/init.d/squid
-etc/ppp/ip-up
-var/ipfire/outgoing/bin/outgoingfw.pl
-var/ipfire/urlfilter/autoupdate/autoupdate.urls
-usr/sbin/redirect_wrapper
-srv/web/ipfire/cgi-bin/index.cgi
-srv/web/ipfire/cgi-bin/backup.cgi
-srv/web/ipfire/cgi-bin/outgoingfw.cgi
-srv/web/ipfire/cgi-bin/urlfilter.cgi
-srv/web/ipfire/cgi-bin/pakfire.cgi
-srv/web/ipfire/cgi-bin/qos.cgi
-srv/web/ipfire/cgi-bin/logs.cgi/log.dat
-var/ipfire/langs
-var/ipfire/header.pl
-usr/share/terminfo/x/xterm-color
-sbin/hdparm
-var/ipfire/backup/include
+++ /dev/null
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-extract_files
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
\ No newline at end of file
+++ /dev/null
-etc/squid
-etc/rc.d/init.d/connectd
-opt/pakfire/lib/functions.sh
-opt/pakfire/lib/functions.pl
-usr/lib/squid/
-usr/sbin/squid
-bin/ntfs-3g
-lib/libntfs-3g.so
-lib/libntfs-3g.so.40
-lib/libntfs-3g.so.40.0.0
-srv/web/ipfire/cgi-bin/qos.cgi
-usr/local/bin/qosd
-var/ipfire/qos/bin
-usr/lib/collectd/
-var/lib/collectd/
-usr/sbin/collectd
-usr/sbin/collectdmon
+++ /dev/null
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-/etc/init.d/squid stop
-/etc/init.d/collectd stop
-extract_files
-/etc/init.d/squid start
-/etc/init.d/collectd start
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-perl /var/ipfire/qos/bin/migrate.pl
-/var/ipfire/updatexlrator/bin/convert
+++ /dev/null
-usr/lib/python2.4/htmlentitydefs.pyc
-usr/lib/python2.4/markupbase.pyc
-etc/ssh/moduli
-etc/ssh/ssh_config
-etc/ssh/sshd_config
-etc/rc.d/init.d/sshd
-usr/bin/scp
-usr/bin/sftp
-usr/bin/slogin
-usr/bin/ssh
-usr/bin/ssh-add
-usr/bin/ssh-agent
-usr/bin/ssh-keygen
-usr/bin/ssh-keyscan
-usr/lib/openssh/sftp-server
-usr/lib/openssh/ssh-keysign
-usr/sbin/sshd
+++ /dev/null
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-extract_files
-#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-rm -f /etc/ssh/ssh_host_rsa_key* && ssh-keygen -qf /etc/ssh/ssh_host_rsa_key -N ''
-rm -f /etc/ssh/ssh_host_key* && ssh-keygen -qf /etc/ssh/ssh_host_key -N '' -t rsa1
-rm -f /etc/ssh/ssh_host_dsa_key* && ssh-keygen -qf /etc/ssh/ssh_host_dsa_key -N '' -t dsa
srv/web/ipfire/cgi-bin/proxy.cgi
+usr/bin/sshfs
+etc/udev/rules.d/99-fuse.rules
+sbin/mount.fuse
+usr/bin/fusermount
+usr/bin/ulockmgr_server
+usr/lib/libfuse.so
+usr/lib/libfuse.so.2
+usr/lib/libfuse.so.2.7.4
+usr/lib/libulockmgr.so
+usr/lib/libulockmgr.so.1
+usr/lib/libulockmgr.so.1.0.1
+bin/ntfs-3g
+lib/libntfs-3g.so
+lib/libntfs-3g.so.43
+lib/libntfs-3g.so.43.0.0
+sbin/mount.ntfs-3g
+usr/bin/ntfs-3g.probe
+usr/lib/libntfs-3g.so
+usr/lib/pkgconfig/libntfs-3g.pc
+usr/lib/libltdl.so
+usr/lib/libltdl.so.3
+usr/lib/libltdl.so.3.1.4
+etc/sysctl.conf
+++ /dev/null
-../../core/15/files
\ No newline at end of file
+++ /dev/null
-../../core/16/files
\ No newline at end of file
+++ /dev/null
-../../core/17/files
\ No newline at end of file
+++ /dev/null
-../../core/18/files
\ No newline at end of file
force 1
stat 0
clamd_local /var/run/clamav/clamd
-timeout 600
+timeout 300
+abort ^.*\.pdf$
+abort ^.*\.js$
abort ^.*\.html$
abort ^.*\.css$
abort ^.*\.xml$
abort ^.*\.xsl$
+abort ^.*\.js$
+abort ^.*\.html$
+abort ^.*\.css$
+abort ^.*\.xml$
+abort ^.*\.xsl$
+abort ^.*\.js$
+abort ^.*\.jsp$
+abort ^.*\.jsp\?.*$
+aborti ^.*servlet.*$
+abort ^.*\.ico$
+aborti ^.*\.gif$
+aborti ^.*\.png$
+aborti ^.*\.jpg$
+aborti ^.*\.swf$
content ^.*application\/.*$
-
+abortcontenti ^.*application\/x-mms-framed.*$
+abortcontenti ^.*application\/x-javascript.*$
* foomatic-3.0-20070813
* freefont-20060126
* freetype-2.1.10
-* fuse-2.6.3
+* fuse-2.7.4
* fwhits
* gawk-3.1.5
* gcc-4.0.3
* gzip-1.3.5
* hddtemp-0.3-beta14
* hdparm-8.9
-* hostapd-0.5.10
+* hostapd-0.5.11
* hplip-2.7.10
* htop-0.8.1
* httpd-2.2.10
* lzo-2.02
* m4-1.4.4
* mISDNuser.git-8e7bf2f11cc108d4b52949c2a26e38df24821b01
-* madwifi-hal-2008-08-15-r3862-20080903-kmod-2.6.25.19
+* madwifi-hal-0.10.5.6-r3879-20081204-kmod-2.6.25.19
* make-3.81
* man-db-2.4.3
* man-pages-2.34
* nfs-utils-1.1.1
* nmap-4.03
* noip_updater_v1.6
-* ntfs-3g-1.5012
+* ntfs-3g-1.5130
* ntp-4.2.2
* ocaml-3.09.2
* oinkmaster-2.0
* squashfs3.4
* squid-2.7.STABLE5
* squidGuard-1.3
-* squidclamav-3.7
+* squidclamav-3.8
+* sshfs-fuse-2.2
* streamripper-1.63.5
* sudo-1.6.8p12
* sysfsutils-1.3.0
* whatmask-1.2
* which-2.16
* wireless_tools.30.pre6
-* wpa_supplicant-0.5.10
+* wpa_supplicant-0.5.11
* xfsprogs-2.9.4
* xvidcore-1.1.0
* zlib-1.2.3
$proxysettings{'ENABLE_FILTER'} = 'off';
$proxysettings{'ENABLE_UPDXLRATOR'} = 'off';
$proxysettings{'ENABLE_CLAMAV'} = 'off';
-$proxysettings{'CHILDREN'} = '5';
+$proxysettings{'CHILDREN'} = '10';
$ncsa_buttontext = $Lang::tr{'advproxy NCSA create user'};
}
if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'} eq $Lang::tr{'advproxy save and restart'}))
-{
- if ($proxysettings{'ENABLE'} !~ /^(on|off)$/ ||
- $proxysettings{'TRANSPARENT'} !~ /^(on|off)$/ ||
- $proxysettings{'ENABLE_BLUE'} !~ /^(on|off)$/ ||
+{
+ if ($proxysettings{'ENABLE'} !~ /^(on|off)$/ ||
+ $proxysettings{'TRANSPARENT'} !~ /^(on|off)$/ ||
+ $proxysettings{'ENABLE_BLUE'} !~ /^(on|off)$/ ||
$proxysettings{'TRANSPARENT_BLUE'} !~ /^(on|off)$/ ) {
$errormessage = $Lang::tr{'invalid input'};
goto ERROR;
- }
+ }
if (!(&General::validport($proxysettings{'PROXY_PORT'})))
{
$errormessage = $Lang::tr{'advproxy errmsg invalid proxy port'};
{
$errormessage = $Lang::tr{'advproxy errmsg mem cache size'};
goto ERROR;
- }
+ }
my @free = `/usr/bin/free`;
$free[1] =~ m/(\d+)/;
$cachemem = int $1 / 2048;
}
}
}
- if ((!($proxysettings{'AUTH_MAX_USERIP'} eq '')) &&
- ((!($proxysettings{'AUTH_MAX_USERIP'} =~ /^\d+/)) || ($proxysettings{'AUTH_MAX_USERIP'} < 1) || ($proxysettings{'AUTH_MAX_USERIP'} > 255)))
+ if ((!($proxysettings{'AUTH_MAX_USERIP'} eq '')) &&
+ ((!($proxysettings{'AUTH_MAX_USERIP'} =~ /^\d+/)) || ($proxysettings{'AUTH_MAX_USERIP'} < 1) || ($proxysettings{'AUTH_MAX_USERIP'} > 255)))
{
$errormessage = $Lang::tr{'advproxy errmsg max userip'};
goto ERROR;
if ( -e "/usr/bin/squidclamav" ) {
print "<td class='base'><b>".$Lang::tr{'advproxy squidclamav'}."</b><br />";
print $Lang::tr{'advproxy enabled'}."<input type='checkbox' name='ENABLE_CLAMAV' ".$checked{'ENABLE_CLAMAV'}{'on'}." /><br />";
- print "+ ".int(sqrt($count) * 8);
+ print "+ ".int(( $count**(1/3)) * 8);
print "</td>";
} else {
print "<td></td>";
}
print "<td class='base'><b>".$Lang::tr{'advproxy url filter'}."</b><br />";
print $Lang::tr{'advproxy enabled'}."<input type='checkbox' name='ENABLE_FILTER' ".$checked{'ENABLE_FILTER'}{'on'}." /><br />";
-print "+ ".int(sqrt($count) * 6);
+print "+ ".int(($count**(1/3)) * 6);
print "</td>";
print "<td class='base'><b>".$Lang::tr{'advproxy update accelerator'}."</b><br />";
print $Lang::tr{'advproxy enabled'}."<input type='checkbox' name='ENABLE_UPDXLRATOR' ".$checked{'ENABLE_UPDXLRATOR'}{'on'}." /><br />";
-print "+ ".int(sqrt($count) * 6);
+print "+ ".int(($count**(1/3)) * 5);
print "</td></tr>";
print <<END
</table>
# -------------------------------------------------------------------
-print <<END
+print <<END
<table width='100%'>
<tr>
<td width='10%'><input type='checkbox' name='THROTTLE_MMEDIA' $checked{'THROTTLE_MMEDIA'}{'on'} /></td>
<td width='15%'> </td>
<td width='10%'> </td>
-</tr>
+</tr>
</table>
<hr size='1'>
<table width='100%'>
{
@temp = split(/\//);
if (
- ($temp[0] ne $netsettings{'GREEN_NETADDRESS'}) && ($temp[1] ne $netsettings{'GREEN_NETMASK'}) &&
+ ($temp[0] ne $netsettings{'GREEN_NETADDRESS'}) && ($temp[1] ne $netsettings{'GREEN_NETMASK'}) &&
($temp[0] ne $netsettings{'BLUE_NETADDRESS'}) && ($temp[1] ne $netsettings{'BLUE_NETMASK'})
)
{
umask 022
pid_filename /var/run/squid.pid
+max_filedescriptors 4096
cache_mem $proxysettings{'CACHE_MEM'} MB
END
print MSNTCONF "allowusers $ntlmdir/msntauth.allowusers\n";
} else {
print MSNTCONF "denyusers $ntlmdir/msntauth.denyusers\n";
- }
+ }
}
close(MSNTCONF);
}
if ($proxysettings{'ENABLE_BROWSER_CHECK'} eq 'on') { print FILE "acl with_allowed_useragents browser $browser_regexp\n\n"; }
- print FILE "acl within_timeframe time ";
+ print FILE "acl within_timeframe time ";
if ($proxysettings{'TIME_MON'} eq 'on') { print FILE "M"; }
if ($proxysettings{'TIME_TUE'} eq 'on') { print FILE "T"; }
if ($proxysettings{'TIME_WED'} eq 'on') { print FILE "W"; }
print FILE "delay_access 2 deny all\n";
}
- print FILE "delay_initial_bucket_level 100\n";
+ print FILE "delay_initial_bucket_level 100\n";
print FILE "\n";
}
if (($proxysettings{'AUTH_METHOD'} eq 'ntlm') && ($proxysettings{'NTLM_ENABLE_INT_AUTH'} eq 'on'))
{
if ($proxysettings{'NTLM_ENABLE_ACL'} eq 'on')
- {
+ {
if (($proxysettings{'NTLM_USER_ACL'} eq 'positive') && (!-z "$ntlmdir/msntauth.allowusers"))
{
print FILE " for_acl_users";
if (($proxysettings{'AUTH_METHOD'} eq 'ntlm') && ($proxysettings{'NTLM_ENABLE_INT_AUTH'} eq 'on'))
{
if ($proxysettings{'NTLM_ENABLE_ACL'} eq 'on')
- {
+ {
if (($proxysettings{'NTLM_USER_ACL'} eq 'positive') && (!-z "$ntlmdir/msntauth.allowusers"))
{
print FILE " for_acl_users";
use strict;
# enable only the following on debugging purpose
-use warnings;
-use CGI::Carp 'fatalsToBrowser';
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
require '/var/ipfire/general-functions.pl';
require '/var/ipfire/lang.pl';
&Header::showhttpheaders();
if ( $cgiparams{'ACTION'} eq "$Lang::tr{'save'}" ){
- $wlanapsettings{'SSID'} = $cgiparams{'SSID'};
- $wlanapsettings{'MACMODE'} = $cgiparams{'MACMODE'};
- $wlanapsettings{'ACCEPT_MACS'}= $cgiparams{'ACCEPT_MACS'};
- $wlanapsettings{'DENY_MACS'} = $cgiparams{'DENY_MACS'};
- $wlanapsettings{'HIDESSID'} = $cgiparams{'HIDESSID'};
- $wlanapsettings{'ENC'} = $cgiparams{'ENC'};
- $wlanapsettings{'CHANNEL'} = $cgiparams{'CHANNEL'};
- $wlanapsettings{'TXPOWER'} = $cgiparams{'TXPOWER'};
-
- $wlanapsettings{'PWD'} = $cgiparams{'PWD'};
- $wlanapsettings{'SYSLOGLEVEL'}= $cgiparams{'SYSLOGLEVEL'};
- $wlanapsettings{'DEBUG'} = $cgiparams{'DEBUG'};
+ $wlanapsettings{'SSID'} = $cgiparams{'SSID'};
+ $wlanapsettings{'MACMODE'} = $cgiparams{'MACMODE'};
+ $wlanapsettings{'MACS'} = $cgiparams{'MACS'};
+ $wlanapsettings{'HIDESSID'} = $cgiparams{'HIDESSID'};
+ $wlanapsettings{'ENC'} = $cgiparams{'ENC'};
+ $wlanapsettings{'CHANNEL'} = $cgiparams{'CHANNEL'};
+ $wlanapsettings{'TXPOWER'} = $cgiparams{'TXPOWER'};
+
+ $wlanapsettings{'PWD'} = $cgiparams{'PWD'};
+ $wlanapsettings{'SYSLOGLEVEL'} = $cgiparams{'SYSLOGLEVEL'};
+ $wlanapsettings{'DEBUG'} = $cgiparams{'DEBUG'};
# verify WPA Passphrase, must be 8 .. 63 characters
if ( (length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}) > 63) ){
<td width='25%' class='base'>Mac Filter: </td><td class='base' width='25%'>
<select name='MACMODE'>
<option value='0' $selected{'MACMODE'}{'0'}>0 (off)</option>
- <option value='1' $selected{'MACMODE'}{'1'}>1 (Deny list)</option>
- <option value='2' $selected{'MACMODE'}{'2'}>2 (Accept list)</option>
+ <option value='1' $selected{'MACMODE'}{'1'}>1 (Accept MACs)</option>
+ <option value='2' $selected{'MACMODE'}{'2'}>2 (Deny MACs)</option>
</select>
-</td><td colspan='2'></td></tr>
-<tr>
- <td colspan='2' class='base'>Mac Accept List (one per line)</td>
- <td colspan='2' class='base'>Mac Deny List (one per line)</td>
-</tr>
-<tr>
- <td colspan='2'><textarea name='ACCEPT_MACS' cols='32' rows='3' wrap='off'>
+</td><td colspan='2'>Mac Adress List (one per line)<br /><textarea name='MACS' cols='20' rows='5' wrap='off'>
END
;
- print `cat /var/ipfire/wlanap/hostapd.accept`;
+ print `cat /var/ipfire/wlanap/macfile`;
print <<END
</textarea></td>
- <td colspan='2'><textarea name='DENY_MACS' cols='32' rows='3' wrap='off'>
-END
-;
- print `cat /var/ipfire/wlanap/hostapd.deny`;
- print <<END
-</textarea></td>
-</tr>
</table>
END
;
END
;
}
- print CONFIGFILE <<END
-########################### mac acl configuration ##############################
-macaddr_acl=$wlanapsettings{'MACMODE'}
-accept_mac_file=/etc/hostapd.accept
-deny_mac_file=/etc/hostapd.deny
-END
-;
close CONFIGFILE;
- open (MACFILE, ">/var/ipfire/wlanap/hostapd.accept");
- print MACFILE <<END
-$wlanapsettings{'ACCEPT_MACS'}
-END
-;
- close MACFILE;
-
- open (MACFILE, ">/var/ipfire/wlanap/hostapd.deny");
+$wlanapsettings{'MACS'} =~ s/\r//gi;
+chomp($wlanapsettings{'MACS'});
+ open (MACFILE, ">/var/ipfire/wlanap/macfile");
print MACFILE <<END
-$wlanapsettings{'DENY_MACS'}
+$wlanapsettings{'MACS'}
END
;
close MACFILE;
include Config
-VER = 2.6.3
+VER = 2.7.4
THISAPP = fuse-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3f4f5d07d12dedc0a3fd23472171fe94
+$(DL_FILE)_MD5 = 4879f06570d2225667534c37fea04213
install : $(TARGET)
include Config
-VER = 0.5.10
+VER = 0.5.11
THISAPP = hostapd-$(VER)
DL_FILE = $(THISAPP).tar.gz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = hostapd
-PAK_VER = 6
+PAK_VER = 8
DEPS = ""
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ed669d96346dfc7d9f9fad079731853f
+$(DL_FILE)_MD5 = d99d3566d5f15dfd24df37fcb2ee80ee
install : $(TARGET)
include Config
-VER = hal-2008-08-15-r3862-20080903
+VER = hal-0.10.5.6-r3879-20081204
THISAPP = madwifi-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3c9726acd5ffa180fa7b274b625a6082
+$(DL_FILE)_MD5 = bc9657269748cd576f258ceda31eb3a7
install : $(TARGET)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mpfire
-PAK_VER = 4
+PAK_VER = 5
DEPS = "mpd mpc alsa libshout libogg libmad libid3tag libvorbis"
include Config
-VER = 1.5012
+VER = 1.5130
THISAPP = ntfs-3g-$(VER)
DL_FILE = $(THISAPP).tgz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 601db52936011902206dfe1be05e4756
+$(DL_FILE)_MD5 = ad3c40bba398d162f97c2936293eae1f
install : $(TARGET)
include Config
-VER = 3.7
+VER = 3.8
THISAPP = squidclamav-$(VER)
DL_FILE = $(THISAPP).tar.gz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = squidclamav
-PAK_VER = 3
+PAK_VER = 4
DEPS = "clamav"
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 95a3f81133edfb6a905f491f994f7d95
+$(DL_FILE)_MD5 = 8e873863ed54ed89b2d8853f281817c2
install : $(TARGET)
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# #
+# This program 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 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# 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)
include Config
-VER = 0.5.10
+VER = 0.5.11
THISAPP = wpa_supplicant-$(VER)
DL_FILE = $(THISAPP).tar.gz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = wpa_supplicant
-PAK_VER = 1
+PAK_VER = 2
###############################################################################
# Top-level Rules
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9e7b99da67c47d81121368c6d580d069
+$(DL_FILE)_MD5 = ad320af63f735531878e592f1ffd9b06
install : $(TARGET)
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
fi
# Create updater package
- ipfiremake updater
+ #ipfiremake updater
mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
ipfirepackages
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
+ fi
- /usr/bin/wlanconfig $INTERFACE destroy > /dev/null
- /usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode ap > /dev/null
+ /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
+ # 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 >/dev/tty12 2>&1 &
+ evaluate_retval
+ fi
+
+ iwpriv $INTERFACE maccmd 3
+ if [ $MACMODE != 0 ]; then
+ FILE="/var/ipfire/wlanap/macfile"
+ exec < $FILE
+ while read LINE
+ do
+ iwpriv $INTERFACE addmac $LINE
+ done
- 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 >/dev/tty12 2>&1 &
- evaluate_retval
+ iwpriv $INTERFACE maccmd $MACMODE
fi
-;;
+ ;;
- stop)
+ 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
--- /dev/null
+#!/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 <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_files
+restore_backup ${NAME}
+start_service --background ${NAME}
--- /dev/null
+#!/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 <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+stop_service ${NAME}
+make_backup ${NAME}
+remove_files
--- /dev/null
+#!/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 <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /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
# 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 <info@ipfire.org>. #
+# Copyright (C) 2008 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
projects / people / pmueller / ipfire-2.x.git / commitdiff
