mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-27 03:07:43 +02:00
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
This commit is contained in:
Michael Tremer
@@ -1,3 +1,4 @@
|
||||
/etc/hostapd.conf
|
||||
/var/ipfire/wlanap/macfile
|
||||
/var/ipfire/wlanap/settings
|
||||
/var/ipfire/wlanap/hostapd.conf
|
||||
|
||||
@@ -22,3 +22,4 @@ net.ipv4.conf.all.accept_source_route = 0
|
||||
net.ipv4.conf.all.log_martians = 1
|
||||
|
||||
kernel.printk = 1 4 1 7
|
||||
vm.swappiness=0
|
||||
|
||||
@@ -30,8 +30,8 @@ __PACKAGE__->mk_accessors(
|
||||
|
||||
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 ];
|
||||
|
||||
@@ -50,7 +50,7 @@ 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) = @_;
|
||||
|
||||
@@ -66,7 +66,7 @@ sub new {
|
||||
_host => $host,
|
||||
_port => $port,
|
||||
_password => $password,
|
||||
_conntype => exists $opts{conntype} ? $opts{conntype} : $ONCE,
|
||||
_conntype => exists $opts{conntype} ? $opts{conntype} : $REUSE,
|
||||
};
|
||||
bless $self, $class;
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ usr/bin/ulockmgr_server
|
||||
#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
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
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
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
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
|
||||
@@ -1,8 +0,0 @@
|
||||
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
|
||||
@@ -1,24 +0,0 @@
|
||||
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
|
||||
@@ -1,11 +0,0 @@
|
||||
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
|
||||
@@ -1,4 +0,0 @@
|
||||
opt/pakfire/lib/functions.pl
|
||||
var/ipfire/urlfilter/bin/prebuild.pl
|
||||
srv/web/ipfire/cgi-bin/urlfilter.cgi
|
||||
usr/sbin/redirect_wrapper
|
||||
@@ -1,25 +0,0 @@
|
||||
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
|
||||
@@ -1,19 +0,0 @@
|
||||
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
|
||||
@@ -1,3 +0,0 @@
|
||||
usr/lib/libwrap.so
|
||||
usr/lib/libwrap.so.0
|
||||
usr/lib/libwrap.so.0.7.6
|
||||
@@ -1,14 +0,0 @@
|
||||
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
|
||||
@@ -1,6 +0,0 @@
|
||||
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
|
||||
@@ -1,7 +0,0 @@
|
||||
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
|
||||
@@ -1,15 +0,0 @@
|
||||
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
|
||||
@@ -1,3 +0,0 @@
|
||||
srv/web/ipfire/cgi-bin/logs.cgi/log.dat
|
||||
etc/ntp
|
||||
usr/local/bin/wirelessctrl
|
||||
@@ -1,17 +0,0 @@
|
||||
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
|
||||
2
config/rootfiles/common/sshfs
Normal file
2
config/rootfiles/common/sshfs
Normal file
@@ -0,0 +1,2 @@
|
||||
usr/bin/sshfs
|
||||
#usr/share/man/man1/sshfs.1
|
||||
@@ -1 +0,0 @@
|
||||
usr/sbin/dnsmasq
|
||||
@@ -1 +0,0 @@
|
||||
DEPS=""
|
||||
@@ -1,5 +0,0 @@
|
||||
#!/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"
|
||||
@@ -1,17 +0,0 @@
|
||||
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
|
||||
@@ -1 +0,0 @@
|
||||
DEPS=""
|
||||
@@ -1,5 +0,0 @@
|
||||
#!/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"
|
||||
@@ -1,17 +0,0 @@
|
||||
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
|
||||
@@ -1 +0,0 @@
|
||||
DEPS=""
|
||||
@@ -1,11 +0,0 @@
|
||||
#!/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
|
||||
@@ -1,17 +0,0 @@
|
||||
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
|
||||
@@ -1 +0,0 @@
|
||||
DEPS=""
|
||||
@@ -1,8 +0,0 @@
|
||||
#!/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
|
||||
@@ -1 +1,24 @@
|
||||
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
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
../../core/15/files
|
||||
@@ -1 +0,0 @@
|
||||
../../core/16/files
|
||||
@@ -1 +0,0 @@
|
||||
../../core/17/files
|
||||
@@ -1 +0,0 @@
|
||||
../../core/18/files
|
||||
@@ -5,10 +5,27 @@ debug 0
|
||||
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.*$
|
||||
|
||||
Reference in New Issue
Block a user