Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 20 Dec 2008 12:53:47 +0000 (13:53 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 20 Dec 2008 12:53:47 +0000 (13:53 +0100)
73 files changed:
config/backup/includes/hostapd
config/etc/sysctl.conf
config/guardian/guardian.conf
config/mpfire/perl/Audio/MPD.pm
config/rootfiles/common/fuse
config/rootfiles/common/ntfs-3g
config/rootfiles/common/oldcore1 [deleted file]
config/rootfiles/common/oldcore10 [deleted file]
config/rootfiles/common/oldcore11 [deleted file]
config/rootfiles/common/oldcore12 [deleted file]
config/rootfiles/common/oldcore13 [deleted file]
config/rootfiles/common/oldcore14 [deleted file]
config/rootfiles/common/oldcore2 [deleted file]
config/rootfiles/common/oldcore3 [deleted file]
config/rootfiles/common/oldcore4 [deleted file]
config/rootfiles/common/oldcore5 [deleted file]
config/rootfiles/common/oldcore6 [deleted file]
config/rootfiles/common/oldcore7 [deleted file]
config/rootfiles/common/oldcore8 [deleted file]
config/rootfiles/common/oldcore9 [deleted file]
config/rootfiles/common/pptp [new file with mode: 0644]
config/rootfiles/common/sshfs [new file with mode: 0644]
config/rootfiles/core/15/files [deleted file]
config/rootfiles/core/16/files [deleted file]
config/rootfiles/core/16/meta [deleted file]
config/rootfiles/core/16/update.sh [deleted file]
config/rootfiles/core/17/files [deleted file]
config/rootfiles/core/17/meta [deleted file]
config/rootfiles/core/17/update.sh [deleted file]
config/rootfiles/core/18/files [deleted file]
config/rootfiles/core/18/meta [deleted file]
config/rootfiles/core/18/update.sh [deleted file]
config/rootfiles/core/24/files
config/rootfiles/core/25/files [new file with mode: 0644]
config/rootfiles/core/25/meta [moved from config/rootfiles/core/15/meta with 100% similarity]
config/rootfiles/core/25/update.sh [moved from config/rootfiles/core/15/update.sh with 62% similarity]
config/rootfiles/packages/ipfireseeder
config/rootfiles/packages/samba
config/rootfiles/packages/splix
config/rootfiles/updater/filelists/core15 [deleted symlink]
config/rootfiles/updater/filelists/core16 [deleted symlink]
config/rootfiles/updater/filelists/core17 [deleted symlink]
config/rootfiles/updater/filelists/core18 [deleted symlink]
config/squidclamav/squidclamav.conf
config/updxlrator/updxlrator
doc/packages-list.txt
html/cgi-bin/ids.cgi
html/cgi-bin/proxy.cgi
html/cgi-bin/wlanap.cgi
html/html/include/jquery-1.2.6.min.js [new file with mode: 0644]
html/html/themes/ipfire/include/functions.pl
lfs/fuse
lfs/guardian
lfs/hostapd
lfs/ipfireseeder
lfs/madwifi
lfs/mpfire
lfs/ntfs-3g
lfs/pptp [new file with mode: 0644]
lfs/samba
lfs/splix
lfs/squid
lfs/squidclamav
lfs/sshfs [new file with mode: 0644]
lfs/wpa_supplicant
make.sh
src/initscripts/init.d/hostapd
src/initscripts/init.d/ipfireseeder
src/paks/fetchmail/install.sh [new file with mode: 0644]
src/paks/fetchmail/uninstall.sh [new file with mode: 0644]
src/paks/fetchmail/update.sh [new file with mode: 0644]
src/paks/hostapd/update.sh
src/paks/ipfireseeder/uninstall.sh

index e63e5d8..0e9b9fb 100644 (file)
@@ -1,3 +1,4 @@
 /etc/hostapd.conf
+/var/ipfire/wlanap/macfile
 /var/ipfire/wlanap/settings
 /var/ipfire/wlanap/hostapd.conf
index bcf90e8..f88ec5f 100644 (file)
@@ -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
index 9181496..b1aa2e8 100644 (file)
@@ -21,12 +21,12 @@ LogFile         /var/log/guardian/guardian.log
 AlertFile       /var/log/snort/alert
 
 # The list of ip addresses to ignore
-IgnoreFile      /var/ipfire/guardian.ignore
+IgnoreFile      /var/ipfire/guardian/guardian.ignore
 
 # This is a list of IP addresses on the current host, in case there is more
 # than one. If this file doesn't exist, then it will assume you want to run
 # with the default setup (machine's ip address, and broadcast/network). 
-TargetFile      /var/ipfire/guardian.target
+TargetFile      /var/ipfire/guardian/guardian.target
 
 # The time in seconds to keep a host blocked. If undefined, it defaults to 
 # 99999999, which basicly disables the feature. 
index e1c00db..0bfbc48 100644 (file)
@@ -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;
 
index fde457c..153d408 100644 (file)
@@ -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
index 8b4448a..db6a4ff 100644 (file)
@@ -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
diff --git a/config/rootfiles/common/oldcore1 b/config/rootfiles/common/oldcore1
deleted file mode 100644 (file)
index 9f88ed2..0000000
+++ /dev/null
@@ -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
diff --git a/config/rootfiles/common/oldcore10 b/config/rootfiles/common/oldcore10
deleted file mode 100644 (file)
index 5c841e1..0000000
+++ /dev/null
@@ -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
diff --git a/config/rootfiles/common/oldcore11 b/config/rootfiles/common/oldcore11
deleted file mode 100644 (file)
index ad42221..0000000
+++ /dev/null
@@ -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
diff --git a/config/rootfiles/common/oldcore12 b/config/rootfiles/common/oldcore12
deleted file mode 100644 (file)
index ef20f11..0000000
+++ /dev/null
@@ -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
diff --git a/config/rootfiles/common/oldcore13 b/config/rootfiles/common/oldcore13
deleted file mode 100644 (file)
index 0cdd0be..0000000
+++ /dev/null
@@ -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
diff --git a/config/rootfiles/common/oldcore14 b/config/rootfiles/common/oldcore14
deleted file mode 100644 (file)
index 84d71eb..0000000
+++ /dev/null
@@ -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
diff --git a/config/rootfiles/common/oldcore2 b/config/rootfiles/common/oldcore2
deleted file mode 100644 (file)
index d32d112..0000000
+++ /dev/null
@@ -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
diff --git a/config/rootfiles/common/oldcore3 b/config/rootfiles/common/oldcore3
deleted file mode 100644 (file)
index 2f94b69..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/libwrap.so
-usr/lib/libwrap.so.0
-usr/lib/libwrap.so.0.7.6
diff --git a/config/rootfiles/common/oldcore4 b/config/rootfiles/common/oldcore4
deleted file mode 100644 (file)
index dd9e12f..0000000
+++ /dev/null
@@ -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
diff --git a/config/rootfiles/common/oldcore5 b/config/rootfiles/common/oldcore5
deleted file mode 100644 (file)
index b25e41c..0000000
+++ /dev/null
@@ -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
diff --git a/config/rootfiles/common/oldcore6 b/config/rootfiles/common/oldcore6
deleted file mode 100644 (file)
index 7130213..0000000
+++ /dev/null
@@ -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
diff --git a/config/rootfiles/common/oldcore7 b/config/rootfiles/common/oldcore7
deleted file mode 100644 (file)
index dbf9785..0000000
+++ /dev/null
@@ -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
diff --git a/config/rootfiles/common/oldcore8 b/config/rootfiles/common/oldcore8
deleted file mode 100644 (file)
index eda5757..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-srv/web/ipfire/cgi-bin/logs.cgi/log.dat
-etc/ntp
-usr/local/bin/wirelessctrl
diff --git a/config/rootfiles/common/oldcore9 b/config/rootfiles/common/oldcore9
deleted file mode 100644 (file)
index aca0045..0000000
+++ /dev/null
@@ -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
diff --git a/config/rootfiles/common/pptp b/config/rootfiles/common/pptp
new file mode 100644 (file)
index 0000000..58773b0
--- /dev/null
@@ -0,0 +1,5 @@
+#etc/ppp/options.pptp
+usr/sbin/pptp
+#usr/sbin/pptpsetup
+#usr/share/man/man8/pptp.8
+#usr/share/man/man8/pptpsetup.8
diff --git a/config/rootfiles/common/sshfs b/config/rootfiles/common/sshfs
new file mode 100644 (file)
index 0000000..2cafa3e
--- /dev/null
@@ -0,0 +1,2 @@
+usr/bin/sshfs
+#usr/share/man/man1/sshfs.1
diff --git a/config/rootfiles/core/15/files b/config/rootfiles/core/15/files
deleted file mode 100644 (file)
index 52198eb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-usr/sbin/dnsmasq
diff --git a/config/rootfiles/core/16/files b/config/rootfiles/core/16/files
deleted file mode 100644 (file)
index 0fc2a8f..0000000
+++ /dev/null
@@ -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
diff --git a/config/rootfiles/core/16/meta b/config/rootfiles/core/16/meta
deleted file mode 100644 (file)
index d547fa8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/16/update.sh b/config/rootfiles/core/16/update.sh
deleted file mode 100644 (file)
index 36c690b..0000000
+++ /dev/null
@@ -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"
\ No newline at end of file
diff --git a/config/rootfiles/core/17/files b/config/rootfiles/core/17/files
deleted file mode 100644 (file)
index 6e9946c..0000000
+++ /dev/null
@@ -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
diff --git a/config/rootfiles/core/17/meta b/config/rootfiles/core/17/meta
deleted file mode 100644 (file)
index d547fa8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/17/update.sh b/config/rootfiles/core/17/update.sh
deleted file mode 100644 (file)
index 8729dcd..0000000
+++ /dev/null
@@ -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
diff --git a/config/rootfiles/core/18/files b/config/rootfiles/core/18/files
deleted file mode 100644 (file)
index 42a72d2..0000000
+++ /dev/null
@@ -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
diff --git a/config/rootfiles/core/18/meta b/config/rootfiles/core/18/meta
deleted file mode 100644 (file)
index d547fa8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/18/update.sh b/config/rootfiles/core/18/update.sh
deleted file mode 100644 (file)
index e91c6c1..0000000
+++ /dev/null
@@ -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
index b2a3b13..827898d 100644 (file)
@@ -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
diff --git a/config/rootfiles/core/25/files b/config/rootfiles/core/25/files
new file mode 100644 (file)
index 0000000..076a4d0
--- /dev/null
@@ -0,0 +1 @@
+srv/web/ipfire/cgi-bin/ids.cgi
similarity index 62%
rename from config/rootfiles/core/15/update.sh
rename to config/rootfiles/core/25/update.sh
index 36c690b..8a87d9c 100644 (file)
@@ -2,4 +2,4 @@
 . /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
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
index 55ee61d..c0745ca 100644 (file)
@@ -1,4 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
-var/ipfire/seeder
+#var/ipfire/seeder
 var/ipfire/seeder/ipfire-2.3.i586-full.iso.torrent
-var/log/seeder
+#var/log/seeder
+var/log/seeder/info
index 265a12e..c8a0718 100644 (file)
@@ -1,15 +1,14 @@
-etc/rc.d/init.d/samba
-etc/rc.d/init.d/winbind
-srv/web/ipfire/cgi-bin/samba.cgi
-srv/web/ipfire/cgi-bin/sambahlp.cgi
-var/ipfire/menu.d/EX-samba.menu
-usr/local/bin/sambactrl
 lib/libnss_winbind.so
 lib/libnss_winbind.so.2
 lib/libnss_wins.so
 lib/libnss_wins.so.2
 usr/bin/eventlogadm
 usr/bin/findsmb
+usr/bin/ldbadd
+usr/bin/ldbdel
+usr/bin/ldbedit
+usr/bin/ldbmodify
+usr/bin/ldbsearch
 usr/bin/net
 usr/bin/nmblookup
 usr/bin/ntlm_auth
@@ -32,33 +31,42 @@ usr/bin/tdbtool
 usr/bin/testparm
 usr/bin/wbinfo
 #usr/include/libsmbclient.h
+#usr/include/netapi.h
+#usr/include/smb_share_modes.h
+#usr/include/talloc.h
+#usr/include/tdb.h
+#usr/include/wbclient.h
+usr/lib/libsmbclient.so
+usr/lib/libsmbclient.so.0
 usr/lib/libtalloc.so
 usr/lib/libtalloc.so.1
 usr/lib/libtdb.so
 usr/lib/libtdb.so.1
-usr/lib/libsmbclient.so
-usr/lib/libsmbclient.so.0
 usr/lib/libwbclient.so
 usr/lib/libwbclient.so.0
-usr/lib/samba/libsmbclient.so.0
-usr/lib/samba/libtalloc.so.1
-usr/lib/samba/libtdb.so.1
-usr/lib/samba/libwbclient.so.0
 #usr/lib/samba
 #usr/lib/samba/auth
 usr/lib/samba/auth/script.so
 #usr/lib/samba/charset
 usr/lib/samba/charset/CP437.so
 usr/lib/samba/charset/CP850.so
+usr/lib/samba/idmap
+usr/lib/samba/libnetapi.so
+usr/lib/samba/libnetapi.so.0
 usr/lib/samba/libsmbclient.so
+usr/lib/samba/libsmbclient.so.0
 usr/lib/samba/libsmbsharemodes.so
+usr/lib/samba/libsmbsharemodes.so.0
+usr/lib/samba/libtalloc.so
+usr/lib/samba/libtalloc.so.1
+usr/lib/samba/libtdb.so
+usr/lib/samba/libtdb.so.1
+usr/lib/samba/libwbclient.so
+usr/lib/samba/libwbclient.so.0
 usr/lib/samba/lowcase.dat
-#usr/lib/samba/nl.msg
 usr/lib/samba/nss_info
 usr/lib/samba/pdb
-#usr/lib/samba/pl.msg
 usr/lib/samba/rpc
-#usr/lib/samba/tr.msg
 usr/lib/samba/upcase.dat
 usr/lib/samba/valid.dat
 #usr/lib/samba/vfs
@@ -68,19 +76,30 @@ usr/lib/samba/vfs/default_quota.so
 usr/lib/samba/vfs/expand_msdfs.so
 usr/lib/samba/vfs/extd_audit.so
 usr/lib/samba/vfs/fake_perms.so
+usr/lib/samba/vfs/fileid.so
 usr/lib/samba/vfs/full_audit.so
 usr/lib/samba/vfs/netatalk.so
 usr/lib/samba/vfs/readahead.so
 usr/lib/samba/vfs/readonly.so
 usr/lib/samba/vfs/recycle.so
 usr/lib/samba/vfs/shadow_copy.so
+usr/lib/samba/vfs/shadow_copy2.so
+usr/lib/samba/vfs/smb_traffic_analyzer.so
+usr/lib/samba/vfs/streams_depot.so
+usr/lib/samba/vfs/streams_xattr.so
+usr/lib/samba/vfs/syncops.so
+usr/lib/samba/vfs/xattr_tdb.so
 usr/sbin/mount.cifs
 usr/sbin/nmbd
 usr/sbin/smbd
-#usr/sbin/swat
 usr/sbin/umount.cifs
 usr/sbin/winbindd
 #usr/share/man/man1/findsmb.1
+#usr/share/man/man1/ldbadd.1
+#usr/share/man/man1/ldbdel.1
+#usr/share/man/man1/ldbedit.1
+#usr/share/man/man1/ldbmodify.1
+#usr/share/man/man1/ldbsearch.1
 #usr/share/man/man1/log2pcap.1
 #usr/share/man/man1/nmblookup.1
 #usr/share/man/man1/ntlm_auth.1
@@ -104,6 +123,7 @@ usr/sbin/winbindd
 #usr/share/man/man7/libsmbclient.7
 #usr/share/man/man7/pam_winbind.7
 #usr/share/man/man7/samba.7
+#usr/share/man/man8/cifs.upcall.8
 #usr/share/man/man8/eventlogadm.8
 #usr/share/man/man8/idmap_ad.8
 #usr/share/man/man8/idmap_ldap.8
@@ -115,11 +135,8 @@ usr/sbin/winbindd
 #usr/share/man/man8/nmbd.8
 #usr/share/man/man8/pdbedit.8
 #usr/share/man/man8/smbd.8
-#usr/share/man/man8/smbmnt.8
-#usr/share/man/man8/smbmount.8
 #usr/share/man/man8/smbpasswd.8
 #usr/share/man/man8/smbspool.8
-#usr/share/man/man8/smbumount.8
 #usr/share/man/man8/swat.8
 #usr/share/man/man8/tdbbackup.8
 #usr/share/man/man8/tdbdump.8
@@ -142,324 +159,11 @@ usr/sbin/winbindd
 #usr/share/man/man8/vfs_readonly.8
 #usr/share/man/man8/vfs_recycle.8
 #usr/share/man/man8/vfs_shadow_copy.8
+#usr/share/man/man8/vfs_smb_traffic_analyzer.8
+#usr/share/man/man8/vfs_streams_depot.8
+#usr/share/man/man8/vfs_streams_xattr.8
 #usr/share/man/man8/vfs_xattr_tdb.8
 #usr/share/man/man8/winbindd.8
-#usr/share/samba
-#usr/share/samba/swat
-#usr/share/samba/swat/help
-#usr/share/samba/swat/help/Samba3-ByExample
-#usr/share/samba/swat/help/Samba3-ByExample/2000users.html
-#usr/share/samba/swat/help/Samba3-ByExample/Big500users.html
-#usr/share/samba/swat/help/Samba3-ByExample/DMSMig.html
-#usr/share/samba/swat/help/Samba3-ByExample/DomApps.html
-#usr/share/samba/swat/help/Samba3-ByExample/ExNetworks.html
-#usr/share/samba/swat/help/Samba3-ByExample/HA.html
-#usr/share/samba/swat/help/Samba3-ByExample/RefSection.html
-#usr/share/samba/swat/help/Samba3-ByExample/apa.html
-#usr/share/samba/swat/help/Samba3-ByExample/appendix.html
-#usr/share/samba/swat/help/Samba3-ByExample/ch14.html
-#usr/share/samba/swat/help/Samba3-ByExample/go01.html
-#usr/share/samba/swat/help/Samba3-ByExample/happy.html
-#usr/share/samba/swat/help/Samba3-ByExample/images
-#usr/share/samba/swat/help/Samba3-ByExample/images/AccountingNetwork.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/Charity-Network.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/HostAnnouncment.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/NullConnect.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/UNIX-Samba-and-LDAP.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/UserConnect.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/UserMgrNT4.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture2.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/WindowsXP-NullConnection.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/WindowsXP-UserConnection.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/XP-screen001.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/acct2net.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/ch7-fail-overLDAP.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/ch7-singleLDAP.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/ch8-migration.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/chap4-net.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/chap5-net.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/chap6-net.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/chap7-idresol.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net-Ar.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net2-Br.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/chap9-ADSDC.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/chap9-SambaDC.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/imc-usermanager2.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/lam-config.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/lam-group-members.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/lam-groups.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/lam-hosts.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/lam-login.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/lam-users.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/openmag.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/wxpp001.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/wxpp004.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/wxpp006.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/wxpp007.png
-#usr/share/samba/swat/help/Samba3-ByExample/images/wxpp008.png
-#usr/share/samba/swat/help/Samba3-ByExample/index.html
-#usr/share/samba/swat/help/Samba3-ByExample/ix01.html
-#usr/share/samba/swat/help/Samba3-ByExample/kerberos.html
-#usr/share/samba/swat/help/Samba3-ByExample/ntmigration.html
-#usr/share/samba/swat/help/Samba3-ByExample/nw4migration.html
-#usr/share/samba/swat/help/Samba3-ByExample/pr01.html
-#usr/share/samba/swat/help/Samba3-ByExample/pr02.html
-#usr/share/samba/swat/help/Samba3-ByExample/pr03.html
-#usr/share/samba/swat/help/Samba3-ByExample/preface.html
-#usr/share/samba/swat/help/Samba3-ByExample/primer.html
-#usr/share/samba/swat/help/Samba3-ByExample/secure.html
-#usr/share/samba/swat/help/Samba3-ByExample/simple.html
-#usr/share/samba/swat/help/Samba3-ByExample/small.html
-#usr/share/samba/swat/help/Samba3-ByExample/unixclients.html
-#usr/share/samba/swat/help/Samba3-ByExample/upgrades.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide
-#usr/share/samba/swat/help/Samba3-Developers-Guide/CodingSuggestions.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/Packaging.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/architecture.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/contributing.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/debug.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/devprinting.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/index.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/internals.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/modules.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/ntdomain.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/parsing.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/pr01.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/pt01.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/pt02.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/pt03.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/pt04.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/pt05.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/pwencrypt.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/rpc-plugin.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/tracing.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/unix-smb.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/vfs.html
-#usr/share/samba/swat/help/Samba3-Developers-Guide/wins.html
-#usr/share/samba/swat/help/Samba3-HOWTO
-#usr/share/samba/swat/help/Samba3-HOWTO/AccessControls.html
-#usr/share/samba/swat/help/Samba3-HOWTO/AdvancedNetworkManagement.html
-#usr/share/samba/swat/help/Samba3-HOWTO/Appendix.html
-#usr/share/samba/swat/help/Samba3-HOWTO/Backup.html
-#usr/share/samba/swat/help/Samba3-HOWTO/CUPS-printing.html
-#usr/share/samba/swat/help/Samba3-HOWTO/ChangeNotes.html
-#usr/share/samba/swat/help/Samba3-HOWTO/ClientConfig.html
-#usr/share/samba/swat/help/Samba3-HOWTO/DNSDHCP.html
-#usr/share/samba/swat/help/Samba3-HOWTO/FastStart.html
-#usr/share/samba/swat/help/Samba3-HOWTO/InterdomainTrusts.html
-#usr/share/samba/swat/help/Samba3-HOWTO/IntroSMB.html
-#usr/share/samba/swat/help/Samba3-HOWTO/NT4Migration.html
-#usr/share/samba/swat/help/Samba3-HOWTO/NetCommand.html
-#usr/share/samba/swat/help/Samba3-HOWTO/NetworkBrowsing.html
-#usr/share/samba/swat/help/Samba3-HOWTO/Other-Clients.html
-#usr/share/samba/swat/help/Samba3-HOWTO/PolicyMgmt.html
-#usr/share/samba/swat/help/Samba3-HOWTO/Portability.html
-#usr/share/samba/swat/help/Samba3-HOWTO/ProfileMgmt.html
-#usr/share/samba/swat/help/Samba3-HOWTO/SWAT.html
-#usr/share/samba/swat/help/Samba3-HOWTO/SambaHA.html
-#usr/share/samba/swat/help/Samba3-HOWTO/ServerType.html
-#usr/share/samba/swat/help/Samba3-HOWTO/StandAloneServer.html
-#usr/share/samba/swat/help/Samba3-HOWTO/TOSHpreface.html
-#usr/share/samba/swat/help/Samba3-HOWTO/VFS.html
-#usr/share/samba/swat/help/Samba3-HOWTO/apa.html
-#usr/share/samba/swat/help/Samba3-HOWTO/bugreport.html
-#usr/share/samba/swat/help/Samba3-HOWTO/cfgsmarts.html
-#usr/share/samba/swat/help/Samba3-HOWTO/ch-ldap-tls.html
-#usr/share/samba/swat/help/Samba3-HOWTO/ch47.html
-#usr/share/samba/swat/help/Samba3-HOWTO/classicalprinting.html
-#usr/share/samba/swat/help/Samba3-HOWTO/compiling.html
-#usr/share/samba/swat/help/Samba3-HOWTO/diagnosis.html
-#usr/share/samba/swat/help/Samba3-HOWTO/domain-member.html
-#usr/share/samba/swat/help/Samba3-HOWTO/go01.html
-#usr/share/samba/swat/help/Samba3-HOWTO/groupmapping.html
-#usr/share/samba/swat/help/Samba3-HOWTO/idmapper.html
-#usr/share/samba/swat/help/Samba3-HOWTO/images
-#usr/share/samba/swat/help/Samba3-HOWTO/images/10small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/11small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/12small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/13small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/14small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/1small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/2small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/3small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/4small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/5small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/6small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/7small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/8small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/9small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WME001.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WME002.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WME003.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WME005.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WME009.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WME010.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WME013.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WME014.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP002.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP003.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP005.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP009.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP014.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/a_small.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/access1.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/browsing1.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/cups1.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/cups2.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/domain.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/ethereal1.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/ethereal2.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-gid2sid.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2gid.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2uid.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-store-gid2sid.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-uid2sid.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/idmap_winbind_no_loop.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/pdftoepsonusb.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/pdftosocket.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/trusts1.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp001.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp002.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp003.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp004.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp005.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp001.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp004.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp006.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp007.png
-#usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp008.png
-#usr/share/samba/swat/help/Samba3-HOWTO/index.html
-#usr/share/samba/swat/help/Samba3-HOWTO/install.html
-#usr/share/samba/swat/help/Samba3-HOWTO/integrate-ms-networks.html
-#usr/share/samba/swat/help/Samba3-HOWTO/introduction.html
-#usr/share/samba/swat/help/Samba3-HOWTO/ix01.html
-#usr/share/samba/swat/help/Samba3-HOWTO/largefile.html
-#usr/share/samba/swat/help/Samba3-HOWTO/locking.html
-#usr/share/samba/swat/help/Samba3-HOWTO/migration.html
-#usr/share/samba/swat/help/Samba3-HOWTO/msdfs.html
-#usr/share/samba/swat/help/Samba3-HOWTO/optional.html
-#usr/share/samba/swat/help/Samba3-HOWTO/pam.html
-#usr/share/samba/swat/help/Samba3-HOWTO/passdb.html
-#usr/share/samba/swat/help/Samba3-HOWTO/pr01.html
-#usr/share/samba/swat/help/Samba3-HOWTO/pr02.html
-#usr/share/samba/swat/help/Samba3-HOWTO/pr03.html
-#usr/share/samba/swat/help/Samba3-HOWTO/problems.html
-#usr/share/samba/swat/help/Samba3-HOWTO/rights.html
-#usr/share/samba/swat/help/Samba3-HOWTO/samba-bdc.html
-#usr/share/samba/swat/help/Samba3-HOWTO/samba-pdc.html
-#usr/share/samba/swat/help/Samba3-HOWTO/securing-samba.html
-#usr/share/samba/swat/help/Samba3-HOWTO/speed.html
-#usr/share/samba/swat/help/Samba3-HOWTO/troubleshooting.html
-#usr/share/samba/swat/help/Samba3-HOWTO/type.html
-#usr/share/samba/swat/help/Samba3-HOWTO/unicode.html
-#usr/share/samba/swat/help/Samba3-HOWTO/upgrading-to-3.0.html
-#usr/share/samba/swat/help/Samba3-HOWTO/winbind.html
-#usr/share/samba/swat/help/manpages
-#usr/share/samba/swat/help/manpages/eventlogadm.8.html
-#usr/share/samba/swat/help/manpages/findsmb.1.html
-#usr/share/samba/swat/help/manpages/idmap_ad.8.html
-#usr/share/samba/swat/help/manpages/idmap_ldap.8.html
-#usr/share/samba/swat/help/manpages/idmap_nss.8.html
-#usr/share/samba/swat/help/manpages/idmap_rid.8.html
-#usr/share/samba/swat/help/manpages/idmap_tdb.8.html
-#usr/share/samba/swat/help/manpages/index.html
-#usr/share/samba/swat/help/manpages/libsmbclient.7.html
-#usr/share/samba/swat/help/manpages/lmhosts.5.html
-#usr/share/samba/swat/help/manpages/log2pcap.1.html
-#usr/share/samba/swat/help/manpages/mount.cifs.8.html
-#usr/share/samba/swat/help/manpages/net.8.html
-#usr/share/samba/swat/help/manpages/nmbd.8.html
-#usr/share/samba/swat/help/manpages/nmblookup.1.html
-#usr/share/samba/swat/help/manpages/ntlm_auth.1.html
-#usr/share/samba/swat/help/manpages/pam_winbind.7.html
-#usr/share/samba/swat/help/manpages/pdbedit.8.html
-#usr/share/samba/swat/help/manpages/profiles.1.html
-#usr/share/samba/swat/help/manpages/rpcclient.1.html
-#usr/share/samba/swat/help/manpages/samba.7.html
-#usr/share/samba/swat/help/manpages/smb.conf.5.html
-#usr/share/samba/swat/help/manpages/smbcacls.1.html
-#usr/share/samba/swat/help/manpages/smbclient.1.html
-#usr/share/samba/swat/help/manpages/smbcontrol.1.html
-#usr/share/samba/swat/help/manpages/smbcquotas.1.html
-#usr/share/samba/swat/help/manpages/smbd.8.html
-#usr/share/samba/swat/help/manpages/smbget.1.html
-#usr/share/samba/swat/help/manpages/smbgetrc.5.html
-#usr/share/samba/swat/help/manpages/smbmnt.8.html
-#usr/share/samba/swat/help/manpages/smbmount.8.html
-#usr/share/samba/swat/help/manpages/smbpasswd.5.html
-#usr/share/samba/swat/help/manpages/smbpasswd.8.html
-#usr/share/samba/swat/help/manpages/smbspool.8.html
-#usr/share/samba/swat/help/manpages/smbstatus.1.html
-#usr/share/samba/swat/help/manpages/smbtar.1.html
-#usr/share/samba/swat/help/manpages/smbtree.1.html
-#usr/share/samba/swat/help/manpages/smbumount.8.html
-#usr/share/samba/swat/help/manpages/swat.8.html
-#usr/share/samba/swat/help/manpages/tdbbackup.8.html
-#usr/share/samba/swat/help/manpages/tdbdump.8.html
-#usr/share/samba/swat/help/manpages/tdbtool.8.html
-#usr/share/samba/swat/help/manpages/testparm.1.html
-#usr/share/samba/swat/help/manpages/umount.cifs.8.html
-#usr/share/samba/swat/help/manpages/vfs_audit.8.html
-#usr/share/samba/swat/help/manpages/vfs_cacheprime.8.html
-#usr/share/samba/swat/help/manpages/vfs_cap.8.html
-#usr/share/samba/swat/help/manpages/vfs_catia.8.html
-#usr/share/samba/swat/help/manpages/vfs_commit.8.html
-#usr/share/samba/swat/help/manpages/vfs_default_quota.8.html
-#usr/share/samba/swat/help/manpages/vfs_extd_audit.8.html
-#usr/share/samba/swat/help/manpages/vfs_fake_perms.8.html
-#usr/share/samba/swat/help/manpages/vfs_full_audit.8.html
-#usr/share/samba/swat/help/manpages/vfs_gpfs.8.html
-#usr/share/samba/swat/help/manpages/vfs_netatalk.8.html
-#usr/share/samba/swat/help/manpages/vfs_notify_fam.8.html
-#usr/share/samba/swat/help/manpages/vfs_prealloc.8.html
-#usr/share/samba/swat/help/manpages/vfs_readahead.8.html
-#usr/share/samba/swat/help/manpages/vfs_readonly.8.html
-#usr/share/samba/swat/help/manpages/vfs_recycle.8.html
-#usr/share/samba/swat/help/manpages/vfs_shadow_copy.8.html
-#usr/share/samba/swat/help/manpages/vfs_xattr_tdb.8.html
-#usr/share/samba/swat/help/manpages/vfstest.1.html
-#usr/share/samba/swat/help/manpages/wbinfo.1.html
-#usr/share/samba/swat/help/manpages/winbindd.8.html
-#usr/share/samba/swat/help/welcome-no-samba-doc.html
-#usr/share/samba/swat/help/welcome.html
-#usr/share/samba/swat/images
-#usr/share/samba/swat/images/globals.gif
-#usr/share/samba/swat/images/home.gif
-#usr/share/samba/swat/images/passwd.gif
-#usr/share/samba/swat/images/printers.gif
-#usr/share/samba/swat/images/samba.gif
-#usr/share/samba/swat/images/shares.gif
-#usr/share/samba/swat/images/status.gif
-#usr/share/samba/swat/images/viewconfig.gif
-#usr/share/samba/swat/images/wizard.gif
-#usr/share/samba/swat/include
-#usr/share/samba/swat/include/footer.html
-#usr/share/samba/swat/include/header.html
-#usr/share/samba/swat/js
-#usr/share/samba/swat/lang
-#usr/share/samba/swat/lang/ja
-#usr/share/samba/swat/lang/ja/help
-#usr/share/samba/swat/lang/ja/help/welcome.html
-#usr/share/samba/swat/lang/ja/images
-#usr/share/samba/swat/lang/ja/include
-#usr/share/samba/swat/lang/ja/js
-#usr/share/samba/swat/lang/tr
-#usr/share/samba/swat/lang/tr/help
-#usr/share/samba/swat/lang/tr/help/welcome.html
-#usr/share/samba/swat/lang/tr/images
-#usr/share/samba/swat/lang/tr/images/globals.gif
-#usr/share/samba/swat/lang/tr/images/home.gif
-#usr/share/samba/swat/lang/tr/images/passwd.gif
-#usr/share/samba/swat/lang/tr/images/printers.gif
-#usr/share/samba/swat/lang/tr/images/samba.gif
-#usr/share/samba/swat/lang/tr/images/shares.gif
-#usr/share/samba/swat/lang/tr/images/status.gif
-#usr/share/samba/swat/lang/tr/images/viewconfig.gif
-#usr/share/samba/swat/lang/tr/include
-#usr/share/samba/swat/lang/tr/js
 var/ipfire/backup/addons/includes/samba
 #var/ipfire/samba
 var/ipfire/samba/default.global
@@ -479,33 +183,9 @@ var/ipfire/samba/smb.conf
 var/ipfire/samba/smb.conf.default
 var/lib/samba
 var/log/samba
-usr/bin/ldbadd
-usr/bin/ldbdel
-usr/bin/ldbedit
-usr/bin/ldbmodify
-usr/bin/ldbsearch
-#usr/include/netapi.h
-#usr/include/smb_share_modes.h
-#usr/include/talloc.h
-#usr/include/tdb.h
-#usr/include/wbclient.h
-usr/lib/samba/idmap
-usr/lib/samba/libnetapi.so
-usr/lib/samba/libnetapi.so.0
-usr/lib/samba/libsmbsharemodes.so.0
-usr/lib/samba/libtalloc.so
-usr/lib/samba/libtdb.so
-usr/lib/samba/libwbclient.so
-usr/lib/samba/vfs/fileid.so
-usr/lib/samba/vfs/shadow_copy2.so
-usr/lib/samba/vfs/streams_xattr.so
-usr/lib/samba/vfs/syncops.so
-usr/lib/samba/vfs/xattr_tdb.so
-#usr/share/man/man1/ldbadd.1
-#usr/share/man/man1/ldbdel.1
-#usr/share/man/man1/ldbedit.1
-#usr/share/man/man1/ldbmodify.1
-#usr/share/man/man1/ldbsearch.1
-#usr/share/man/man8/cifs.upcall.8
-#usr/share/man/man8/vfs_streams_depot.8
-#usr/share/man/man8/vfs_streams_xattr.8
+etc/rc.d/init.d/samba
+etc/rc.d/init.d/winbind
+srv/web/ipfire/cgi-bin/samba.cgi
+srv/web/ipfire/cgi-bin/sambahlp.cgi
+var/ipfire/menu.d/EX-samba.menu
+usr/local/bin/sambactrl
index 9de3fb0..f9c7579 100644 (file)
-usr/lib/cups/filter/rastertospl2
+usr/lib/cups/filter/pstoqpdl
+usr/lib/cups/filter/rastertoqpdl
 usr/share/cups/model/dell
 usr/share/cups/model/dell/1100.ppd
-usr/share/cups/model/dell/1100de.ppd
 usr/share/cups/model/dell/1100fr.ppd
-usr/share/cups/model/dell/1100it.ppd
 usr/share/cups/model/dell/1110.ppd
-usr/share/cups/model/dell/1110de.ppd
 usr/share/cups/model/dell/1110fr.ppd
-usr/share/cups/model/dell/1110it.ppd
 usr/share/cups/model/samsung
 usr/share/cups/model/samsung/clp200.ppd
-usr/share/cups/model/samsung/clp200de.ppd
 usr/share/cups/model/samsung/clp200fr.ppd
-usr/share/cups/model/samsung/clp200it.ppd
 usr/share/cups/model/samsung/clp300.ppd
-usr/share/cups/model/samsung/clp300de.ppd
 usr/share/cups/model/samsung/clp300fr.ppd
-usr/share/cups/model/samsung/clp300it.ppd
 usr/share/cups/model/samsung/clp500.ppd
-usr/share/cups/model/samsung/clp500de.ppd
 usr/share/cups/model/samsung/clp500fr.ppd
-usr/share/cups/model/samsung/clp500it.ppd
 usr/share/cups/model/samsung/clp510.ppd
-usr/share/cups/model/samsung/clp510de.ppd
 usr/share/cups/model/samsung/clp510fr.ppd
-usr/share/cups/model/samsung/clp510it.ppd
+usr/share/cups/model/samsung/clp550.ppd
+usr/share/cups/model/samsung/clp550fr.ppd
 usr/share/cups/model/samsung/clp600.ppd
-usr/share/cups/model/samsung/clp600de.ppd
 usr/share/cups/model/samsung/clp600fr.ppd
-usr/share/cups/model/samsung/clp600it.ppd
 usr/share/cups/model/samsung/clp610.ppd
-usr/share/cups/model/samsung/clp610de.ppd
 usr/share/cups/model/samsung/clp610fr.ppd
-usr/share/cups/model/samsung/clp610it.ppd
 usr/share/cups/model/samsung/clx216x.ppd
-usr/share/cups/model/samsung/clx216xde.ppd
 usr/share/cups/model/samsung/clx216xfr.ppd
-usr/share/cups/model/samsung/clx216xit.ppd
 usr/share/cups/model/samsung/clx2170.ppd
-usr/share/cups/model/samsung/clx2170de.ppd
 usr/share/cups/model/samsung/clx2170fr.ppd
-usr/share/cups/model/samsung/clx2170it.ppd
 usr/share/cups/model/samsung/clx3160.ppd
-usr/share/cups/model/samsung/clx3160de.ppd
 usr/share/cups/model/samsung/clx3160fr.ppd
-usr/share/cups/model/samsung/clx3160it.ppd
 usr/share/cups/model/samsung/ml1510.ppd
-usr/share/cups/model/samsung/ml1510de.ppd
 usr/share/cups/model/samsung/ml1510fr.ppd
-usr/share/cups/model/samsung/ml1510it.ppd
 usr/share/cups/model/samsung/ml1520.ppd
-usr/share/cups/model/samsung/ml1520de.ppd
 usr/share/cups/model/samsung/ml1520fr.ppd
-usr/share/cups/model/samsung/ml1520it.ppd
 usr/share/cups/model/samsung/ml1610.ppd
-usr/share/cups/model/samsung/ml1610de.ppd
 usr/share/cups/model/samsung/ml1610fr.ppd
-usr/share/cups/model/samsung/ml1610it.ppd
 usr/share/cups/model/samsung/ml1630.ppd
-usr/share/cups/model/samsung/ml1630de.ppd
 usr/share/cups/model/samsung/ml1630fr.ppd
-usr/share/cups/model/samsung/ml1630it.ppd
 usr/share/cups/model/samsung/ml1710.ppd
-usr/share/cups/model/samsung/ml1710de.ppd
 usr/share/cups/model/samsung/ml1710fr.ppd
-usr/share/cups/model/samsung/ml1710it.ppd
 usr/share/cups/model/samsung/ml1740.ppd
-usr/share/cups/model/samsung/ml1740de.ppd
 usr/share/cups/model/samsung/ml1740fr.ppd
-usr/share/cups/model/samsung/ml1740it.ppd
 usr/share/cups/model/samsung/ml1750.ppd
-usr/share/cups/model/samsung/ml1750de.ppd
 usr/share/cups/model/samsung/ml1750fr.ppd
-usr/share/cups/model/samsung/ml1750it.ppd
 usr/share/cups/model/samsung/ml2010.ppd
-usr/share/cups/model/samsung/ml2010de.ppd
 usr/share/cups/model/samsung/ml2010fr.ppd
-usr/share/cups/model/samsung/ml2010it.ppd
 usr/share/cups/model/samsung/ml2150.ppd
-usr/share/cups/model/samsung/ml2150de.ppd
 usr/share/cups/model/samsung/ml2150fr.ppd
-usr/share/cups/model/samsung/ml2150it.ppd
 usr/share/cups/model/samsung/ml2250.ppd
-usr/share/cups/model/samsung/ml2250de.ppd
 usr/share/cups/model/samsung/ml2250fr.ppd
-usr/share/cups/model/samsung/ml2250it.ppd
+usr/share/cups/model/samsung/ml2251.ppd
+usr/share/cups/model/samsung/ml2251fr.ppd
 usr/share/cups/model/samsung/ml2510.ppd
-usr/share/cups/model/samsung/ml2510de.ppd
 usr/share/cups/model/samsung/ml2510fr.ppd
-usr/share/cups/model/samsung/ml2510it.ppd
 usr/share/cups/model/samsung/ml2550.ppd
-usr/share/cups/model/samsung/ml2550de.ppd
 usr/share/cups/model/samsung/ml2550fr.ppd
-usr/share/cups/model/samsung/ml2550it.ppd
 usr/share/cups/model/samsung/ml3050.ppd
-usr/share/cups/model/samsung/ml3050de.ppd
 usr/share/cups/model/samsung/ml3050fr.ppd
-usr/share/cups/model/samsung/ml3050it.ppd
 usr/share/cups/model/samsung/ml3560.ppd
-usr/share/cups/model/samsung/ml3560de.ppd
 usr/share/cups/model/samsung/ml3560fr.ppd
-usr/share/cups/model/samsung/ml3560it.ppd
 usr/share/cups/model/xerox
 usr/share/cups/model/xerox/ph3115.ppd
-usr/share/cups/model/xerox/ph3115de.ppd
 usr/share/cups/model/xerox/ph3115fr.ppd
-usr/share/cups/model/xerox/ph3115it.ppd
 usr/share/cups/model/xerox/ph3116.ppd
-usr/share/cups/model/xerox/ph3116de.ppd
 usr/share/cups/model/xerox/ph3116fr.ppd
-usr/share/cups/model/xerox/ph3116it.ppd
 usr/share/cups/model/xerox/ph3117.ppd
-usr/share/cups/model/xerox/ph3117de.ppd
 usr/share/cups/model/xerox/ph3117fr.ppd
-usr/share/cups/model/xerox/ph3117it.ppd
 usr/share/cups/model/xerox/ph3120.ppd
-usr/share/cups/model/xerox/ph3120de.ppd
 usr/share/cups/model/xerox/ph3120fr.ppd
-usr/share/cups/model/xerox/ph3120it.ppd
 usr/share/cups/model/xerox/ph3121.ppd
-usr/share/cups/model/xerox/ph3121de.ppd
 usr/share/cups/model/xerox/ph3121fr.ppd
-usr/share/cups/model/xerox/ph3121it.ppd
 usr/share/cups/model/xerox/ph3122.ppd
-usr/share/cups/model/xerox/ph3122de.ppd
 usr/share/cups/model/xerox/ph3122fr.ppd
-usr/share/cups/model/xerox/ph3122it.ppd
 usr/share/cups/model/xerox/ph3130.ppd
-usr/share/cups/model/xerox/ph3130de.ppd
 usr/share/cups/model/xerox/ph3130fr.ppd
-usr/share/cups/model/xerox/ph3130it.ppd
 usr/share/cups/model/xerox/ph3150.ppd
-usr/share/cups/model/xerox/ph3150de.ppd
 usr/share/cups/model/xerox/ph3150fr.ppd
-usr/share/cups/model/xerox/ph3150it.ppd
+usr/share/cups/model/xerox/ph3160.ppd
+usr/share/cups/model/xerox/ph3160fr.ppd
 usr/share/cups/model/xerox/ph3420.ppd
-usr/share/cups/model/xerox/ph3420de.ppd
 usr/share/cups/model/xerox/ph3420fr.ppd
-usr/share/cups/model/xerox/ph3420it.ppd
 usr/share/cups/model/xerox/ph3425.ppd
-usr/share/cups/model/xerox/ph3425de.ppd
 usr/share/cups/model/xerox/ph3425fr.ppd
-usr/share/cups/model/xerox/ph3425it.ppd
 usr/share/cups/model/xerox/ph5500.ppd
-usr/share/cups/model/xerox/ph5500de.ppd
 usr/share/cups/model/xerox/ph5500fr.ppd
-usr/share/cups/model/xerox/ph5500it.ppd
 usr/share/cups/model/xerox/ph6100.ppd
-usr/share/cups/model/xerox/ph6100de.ppd
 usr/share/cups/model/xerox/ph6100fr.ppd
-usr/share/cups/model/xerox/ph6100it.ppd
 usr/share/cups/model/xerox/ph6110.ppd
-usr/share/cups/model/xerox/ph6110de.ppd
 usr/share/cups/model/xerox/ph6110fr.ppd
-usr/share/cups/model/xerox/ph6110it.ppd
diff --git a/config/rootfiles/updater/filelists/core15 b/config/rootfiles/updater/filelists/core15
deleted file mode 120000 (symlink)
index a9c2097..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../core/15/files
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/core16 b/config/rootfiles/updater/filelists/core16
deleted file mode 120000 (symlink)
index 1900ca0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../core/16/files
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/core17 b/config/rootfiles/updater/filelists/core17
deleted file mode 120000 (symlink)
index 2c45f37..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../core/17/files
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/core18 b/config/rootfiles/updater/filelists/core18
deleted file mode 120000 (symlink)
index 81a7940..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../core/18/files
\ No newline at end of file
index 43a0a6f..8e153bd 100644 (file)
@@ -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.*$
index 4d5d4ec..cc4caa8 100644 (file)
@@ -360,7 +360,6 @@ sub check_cache
                &debuglog("File exists in cache and is up to date");
                &debuglog("Retrieving file from cache ($updsource)");
                &setcachestatus("$updcachedir/$vendorid/$uuid/access.log",time);
-               system("chown nobody.squid $vendorid/$uuid/access.log");
                $cacheurl="http://$netsettings{'GREEN_ADDRESS'}:$http_port/updatecache/$vendorid/$uuid/$updfile";
        }
                else
index f6d478a..061af41 100644 (file)
 * 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
 * rssdler-0.4.0a
 * rsync-3.0.4
 * rtorrent-0.7.9
-* samba-3.2.5
+* samba-3.2.6
 * sane-1.0.19
 * screen-4.0.3
 * sdparm-1.01
 * 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
index 362e7b3..111aea6 100644 (file)
@@ -528,7 +528,12 @@ print <<END
 <tr><td align='left' width='40%'>$Lang::tr{'guardian timelimit'}</td><td align='left'><input type='text' name='TIMELIMIT' value='$snortsettings{'GUARDIAN_TIMELIMIT'}' size="30" /></td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'guardian logfile'}</td><td align='left'><input type='text' name='LOGFILE' value='$snortsettings{'GUARDIAN_LOGFILE'}' size="30" /></td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'guardian alertfile'}</td><td align='left'><input type='text' name='ALERTFILE' value='$snortsettings{'GUARDIAN_ALERTFILE'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'guardian ignorefile'}</td><td align='left'><textarea name='IGNOREFILE_CONTENT' cols='32' rows='6' wrap='off'></textarea></td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'guardian ignorefile'}</td><td align='left'><textarea name='IGNOREFILE_CONTENT' cols='32' rows='6' wrap='off'>
+END
+;
+       print `cat /var/ipfire/guardian/guardian.ignore`;
+print <<END
+</textarea></td></tr>
 <tr><td align='center' colspan='2'><input type='hidden' name='ACTION2' value='guardian' /><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td></tr>
 </table>
 </form>
index d41d0af..cc55a2e 100644 (file)
@@ -272,7 +272,7 @@ $proxysettings{'IDENT_USER_ACL'} = 'positive';
 $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'};
 
@@ -332,14 +332,14 @@ if ($proxysettings{'ACTION'} eq $Lang::tr{'edit'})
 }
 
 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'};
@@ -359,7 +359,7 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
        {
                $errormessage = $Lang::tr{'advproxy errmsg mem cache size'};
                goto ERROR;
-       }               
+       }
        my @free = `/usr/bin/free`;
        $free[1] =~ m/(\d+)/;
        $cachemem = int $1 / 2048;
@@ -434,8 +434,8 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
                                }
                        }
                }
-               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;
@@ -970,18 +970,18 @@ if ( $count < 1 ){$count = 1;}
 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>
@@ -1324,7 +1324,7 @@ END
 
 # -------------------------------------------------------------------
 
-print <<END 
+print <<END
 
 <table width='100%'>
 <tr>
@@ -1513,7 +1513,7 @@ print <<END
        <td width='10%'><input type='checkbox' name='THROTTLE_MMEDIA' $checked{'THROTTLE_MMEDIA'}{'on'} /></td>
        <td width='15%'>&nbsp;</td>
        <td width='10%'>&nbsp;</td>
-</tr>  
+</tr>
 </table>
 <hr size='1'>
 <table width='100%'>
@@ -2913,7 +2913,7 @@ END
                        {
                                @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'})
                                        )
                                {
@@ -3031,6 +3031,7 @@ cache_effective_group squid
 umask 022
 
 pid_filename /var/run/squid.pid
+max_filedescriptors 1024
 
 cache_mem $proxysettings{'CACHE_MEM'} MB
 END
@@ -3184,7 +3185,7 @@ END
                                                print MSNTCONF "allowusers $ntlmdir/msntauth.allowusers\n";
                                        } else {
                                                print MSNTCONF "denyusers $ntlmdir/msntauth.denyusers\n";
-                                       } 
+                                       }
                                }
                                close(MSNTCONF);
                        }
@@ -3268,7 +3269,7 @@ END
 
        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"; }
@@ -3500,7 +3501,7 @@ if ($delaypools) {
                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";
 }
 
@@ -3606,7 +3607,7 @@ END
                        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";
@@ -3651,7 +3652,7 @@ END
                        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";
index 7a9c6fe..3a57e16 100644 (file)
@@ -25,8 +25,8 @@
 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';
@@ -88,18 +88,17 @@ $cgiparams{'DEBUG'} = '4';
 &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) ){
@@ -330,28 +329,15 @@ if ( $wlanapsettings{'INTERFACE'} =~ /green0/ ){
 <td width='25%' class='base'>Mac Filter:&nbsp;</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
 ;
@@ -440,25 +426,13 @@ wpa_pairwise=CCMP TKIP
 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;
diff --git a/html/html/include/jquery-1.2.6.min.js b/html/html/include/jquery-1.2.6.min.js
new file mode 100644 (file)
index 0000000..82b98e1
--- /dev/null
@@ -0,0 +1,32 @@
+/*
+ * jQuery 1.2.6 - New Wave Javascript
+ *
+ * Copyright (c) 2008 John Resig (jquery.com)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $
+ * $Rev: 5685 $
+ */
+(function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else
+return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.6",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:function(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this.domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else
+return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else
+selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i<max;i++){var option=options[i];if(option.selected){value=jQuery.browser.msie&&!option.attributes.value.specified?option.text:option.value;if(one)return value;values.push(value);}}return values;}else
+return(this[0].value||"").replace(/\r/g,"");}return undefined;}if(value.constructor==Number)value+='';return this.each(function(){if(this.nodeType!=1)return;if(value.constructor==Array&&/radio|checkbox/.test(this.type))this.checked=(jQuery.inArray(this.value,value)>=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else
+this.value=value;});},html:function(value){return value==undefined?(this[0]?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else
+return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script"))scripts=scripts.add(elem);else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuery.fn;function evalScript(i,elem){if(elem.src)jQuery.ajax({url:elem.src,async:false,dataType:"script"});else
+jQuery.globalEval(elem.text||elem.textContent||elem.innerHTML||"");if(elem.parentNode)elem.parentNode.removeChild(elem);}function now(){return+new Date;}jQuery.extend=jQuery.fn.extend=function(){var target=arguments[0]||{},i=1,length=arguments.length,deep=false,options;if(target.constructor==Boolean){deep=target;target=arguments[1]||{};i=2;}if(typeof target!="object"&&typeof target!="function")target={};if(length==i){target=this;--i;}for(;i<length;i++)if((options=arguments[i])!=null)for(var name in options){var src=target[name],copy=options[name];if(target===copy)continue;if(deep&&copy&&typeof copy=="object"&&!copy.nodeType)target[name]=jQuery.extend(deep,src||(copy.length!=null?[]:{}),copy);else if(copy!==undefined)target[name]=copy;}return target;};var expando="jQuery"+now(),uuid=0,windowData={},exclude=/z-?index|font-?weight|opacity|zoom|line-?height/i,defaultView=document.defaultView||{};jQuery.extend({noConflict:function(deep){window.$=_$;if(deep)window.jQuery=_jQuery;return jQuery;},isFunction:function(fn){return!!fn&&typeof fn!="string"&&!fn.nodeName&&fn.constructor!=Array&&/^[\s[]?function/.test(fn+"");},isXMLDoc:function(elem){return elem.documentElement&&!elem.body||elem.tagName&&elem.ownerDocument&&!elem.ownerDocument.body;},globalEval:function(data){data=jQuery.trim(data);if(data){var head=document.getElementsByTagName("head")[0]||document.documentElement,script=document.createElement("script");script.type="text/javascript";if(jQuery.browser.msie)script.text=data;else
+script.appendChild(document.createTextNode(data));head.insertBefore(script,head.firstChild);head.removeChild(script);}},nodeName:function(elem,name){return elem.nodeName&&elem.nodeName.toUpperCase()==name.toUpperCase();},cache:{},data:function(elem,name,data){elem=elem==window?windowData:elem;var id=elem[expando];if(!id)id=elem[expando]=++uuid;if(name&&!jQuery.cache[id])jQuery.cache[id]={};if(data!==undefined)jQuery.cache[id][name]=data;return name?jQuery.cache[id][name]:id;},removeData:function(elem,name){elem=elem==window?windowData:elem;var id=elem[expando];if(name){if(jQuery.cache[id]){delete jQuery.cache[id][name];name="";for(name in jQuery.cache[id])break;if(!name)jQuery.removeData(elem);}}else{try{delete elem[expando];}catch(e){if(elem.removeAttribute)elem.removeAttribute(expando);}delete jQuery.cache[id];}},each:function(object,callback,args){var name,i=0,length=object.length;if(args){if(length==undefined){for(name in object)if(callback.apply(object[name],args)===false)break;}else
+for(;i<length;)if(callback.apply(object[i++],args)===false)break;}else{if(length==undefined){for(name in object)if(callback.call(object[name],name,object[name])===false)break;}else
+for(var value=object[0];i<length&&callback.call(value,i,value)!==false;value=object[++i]){}}return object;},prop:function(elem,value,type,i,name){if(jQuery.isFunction(value))value=value.call(elem,i);return value&&value.constructor==Number&&type=="curCSS"&&!exclude.test(name)?value+"px":value;},className:{add:function(elem,classNames){jQuery.each((classNames||"").split(/\s+/),function(i,className){if(elem.nodeType==1&&!jQuery.className.has(elem.className,className))elem.className+=(elem.className?" ":"")+className;});},remove:function(elem,classNames){if(elem.nodeType==1)elem.className=classNames!=undefined?jQuery.grep(elem.className.split(/\s+/),function(className){return!jQuery.className.has(classNames,className);}).join(" "):"";},has:function(elem,className){return jQuery.inArray(className,(elem.className||elem).toString().split(/\s+/))>-1;}},swap:function(elem,options,callback){var old={};for(var name in options){old[name]=elem.style[name];elem.style[name]=options[name];}callback.call(elem);for(var name in options)elem.style[name]=old[name];},css:function(elem,name,force){if(name=="width"||name=="height"){var val,props={position:"absolute",visibility:"hidden",display:"block"},which=name=="width"?["Left","Right"]:["Top","Bottom"];function getWH(){val=name=="width"?elem.offsetWidth:elem.offsetHeight;var padding=0,border=0;jQuery.each(which,function(){padding+=parseFloat(jQuery.curCSS(elem,"padding"+this,true))||0;border+=parseFloat(jQuery.curCSS(elem,"border"+this+"Width",true))||0;});val-=Math.round(padding+border);}if(jQuery(elem).is(":visible"))getWH();else
+jQuery.swap(elem,props,getWH);return Math.max(0,val);}return jQuery.curCSS(elem,name,force);},curCSS:function(elem,name,force){var ret,style=elem.style;function color(elem){if(!jQuery.browser.safari)return false;var ret=defaultView.getComputedStyle(elem,null);return!ret||ret.getPropertyValue("color")=="";}if(name=="opacity"&&jQuery.browser.msie){ret=jQuery.attr(style,"opacity");return ret==""?"1":ret;}if(jQuery.browser.opera&&name=="display"){var save=style.outline;style.outline="0 solid black";style.outline=save;}if(name.match(/float/i))name=styleFloat;if(!force&&style&&style[name])ret=style[name];else if(defaultView.getComputedStyle){if(name.match(/float/i))name="float";name=name.replace(/([A-Z])/g,"-$1").toLowerCase();var computedStyle=defaultView.getComputedStyle(elem,null);if(computedStyle&&!color(elem))ret=computedStyle.getPropertyValue(name);else{var swap=[],stack=[],a=elem,i=0;for(;a&&color(a);a=a.parentNode)stack.unshift(a);for(;i<stack.length;i++)if(color(stack[i])){swap[i]=stack[i].style.display;stack[i].style.display="block";}ret=name=="display"&&swap[stack.length-1]!=null?"none":(computedStyle&&computedStyle.getPropertyValue(name))||"";for(i=0;i<swap.length;i++)if(swap[i]!=null)stack[i].style.display=swap[i];}if(name=="opacity"&&ret=="")ret="1";}else if(elem.currentStyle){var camelCase=name.replace(/\-(\w)/g,function(all,letter){return letter.toUpperCase();});ret=elem.currentStyle[name]||elem.currentStyle[camelCase];if(!/^\d+(px)?$/i.test(ret)&&/^\d/.test(ret)){var left=style.left,rsLeft=elem.runtimeStyle.left;elem.runtimeStyle.left=elem.currentStyle.left;style.left=ret||0;ret=style.pixelLeft+"px";style.left=left;elem.runtimeStyle.left=rsLeft;}}return ret;},clean:function(elems,context){var ret=[];context=context||document;if(typeof context.createElement=='undefined')context=context.ownerDocument||context[0]&&context[0].ownerDocument||document;jQuery.each(elems,function(i,elem){if(!elem)return;if(elem.constructor==Number)elem+='';if(typeof elem=="string"){elem=elem.replace(/(<(\w+)[^>]*?)\/>/g,function(all,front,tag){return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?all:front+"></"+tag+">";});var tags=jQuery.trim(elem).toLowerCase(),div=context.createElement("div");var wrap=!tags.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!tags.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||tags.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!tags.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!tags.indexOf("<td")||!tags.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!tags.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||jQuery.browser.msie&&[1,"div<div>","</div>"]||[0,"",""];div.innerHTML=wrap[1]+elem+wrap[2];while(wrap[0]--)div=div.lastChild;if(jQuery.browser.msie){var tbody=!tags.indexOf("<table")&&tags.indexOf("<tbody")<0?div.firstChild&&div.firstChild.childNodes:wrap[1]=="<table>"&&tags.indexOf("<tbody")<0?div.childNodes:[];for(var j=tbody.length-1;j>=0;--j)if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length)tbody[j].parentNode.removeChild(tbody[j]);if(/^\s/.test(elem))div.insertBefore(context.createTextNode(elem.match(/^\s*/)[0]),div.firstChild);}elem=jQuery.makeArray(div.childNodes);}if(elem.length===0&&(!jQuery.nodeName(elem,"form")&&!jQuery.nodeName(elem,"select")))return;if(elem[0]==undefined||jQuery.nodeName(elem,"form")||elem.options)ret.push(elem);else
+ret=jQuery.merge(ret,elem);});return ret;},attr:function(elem,name,value){if(!elem||elem.nodeType==3||elem.nodeType==8)return undefined;var notxml=!jQuery.isXMLDoc(elem),set=value!==undefined,msie=jQuery.browser.msie;name=notxml&&jQuery.props[name]||name;if(elem.tagName){var special=/href|src|style/.test(name);if(name=="selected"&&jQuery.browser.safari)elem.parentNode.selectedIndex;if(name in elem&&notxml&&!special){if(set){if(name=="type"&&jQuery.nodeName(elem,"input")&&elem.parentNode)throw"type property can't be changed";elem[name]=value;}if(jQuery.nodeName(elem,"form")&&elem.getAttributeNode(name))return elem.getAttributeNode(name).nodeValue;return elem[name];}if(msie&&notxml&&name=="style")return jQuery.attr(elem.style,"cssText",value);if(set)elem.setAttribute(name,""+value);var attr=msie&&notxml&&special?elem.getAttribute(name,2):elem.getAttribute(name);return attr===null?undefined:attr;}if(msie&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set)elem[name]=value;return elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var ret=[];if(array!=null){var i=array.length;if(i==null||array.split||array.setInterval||array.call)ret[0]=array;else
+while(i)ret[--i]=array[i];}return ret;},inArray:function(elem,array){for(var i=0,length=array.length;i<length;i++)if(array[i]===elem)return i;return-1;},merge:function(first,second){var i=0,elem,pos=first.length;if(jQuery.browser.msie){while(elem=second[i++])if(elem.nodeType!=8)first[pos++]=elem;}else
+while(elem=second[i++])first[pos++]=elem;return first;},unique:function(array){var ret=[],done={};try{for(var i=0,length=array.length;i<length;i++){var id=jQuery.data(array[i]);if(!done[id]){done[id]=true;ret.push(array[i]);}}}catch(e){ret=array;}return ret;},grep:function(elems,callback,inv){var ret=[];for(var i=0,length=elems.length;i<length;i++)if(!inv!=!callback(elems[i],i))ret.push(elems[i]);return ret;},map:function(elems,callback){var ret=[];for(var i=0,length=elems.length;i<length;i++){var value=callback(elems[i],i);if(value!=null)ret[ret.length]=value;}return ret.concat.apply([],ret);}});var userAgent=navigator.userAgent.toLowerCase();jQuery.browser={version:(userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[])[1],safari:/webkit/.test(userAgent),opera:/opera/.test(userAgent),msie:/msie/.test(userAgent)&&!/opera/.test(userAgent),mozilla:/mozilla/.test(userAgent)&&!/(compatible|webkit)/.test(userAgent)};var styleFloat=jQuery.browser.msie?"styleFloat":"cssFloat";jQuery.extend({boxModel:!jQuery.browser.msie||document.compatMode=="CSS1Compat",props:{"for":"htmlFor","class":"className","float":styleFloat,cssFloat:styleFloat,styleFloat:styleFloat,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing"}});jQuery.each({parent:function(elem){return elem.parentNode;},parents:function(elem){return jQuery.dir(elem,"parentNode");},next:function(elem){return jQuery.nth(elem,2,"nextSibling");},prev:function(elem){return jQuery.nth(elem,2,"previousSibling");},nextAll:function(elem){return jQuery.dir(elem,"nextSibling");},prevAll:function(elem){return jQuery.dir(elem,"previousSibling");},siblings:function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},children:function(elem){return jQuery.sibling(elem.firstChild);},contents:function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}},function(name,fn){jQuery.fn[name]=function(selector){var ret=jQuery.map(this,fn);if(selector&&typeof selector=="string")ret=jQuery.multiFilter(selector,ret);return this.pushStack(jQuery.unique(ret));};});jQuery.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(name,original){jQuery.fn[name]=function(){var args=arguments;return this.each(function(){for(var i=0,length=args.length;i<length;i++)jQuery(args[i])[original](this);});};});jQuery.each({removeAttr:function(name){jQuery.attr(this,name,"");if(this.nodeType==1)this.removeAttribute(name);},addClass:function(classNames){jQuery.className.add(this,classNames);},removeClass:function(classNames){jQuery.className.remove(this,classNames);},toggleClass:function(classNames){jQuery.className[jQuery.className.has(this,classNames)?"remove":"add"](this,classNames);},remove:function(selector){if(!selector||jQuery.filter(selector,[this]).r.length){jQuery("*",this).add(this).each(function(){jQuery.event.remove(this);jQuery.removeData(this);});if(this.parentNode)this.parentNode.removeChild(this);}},empty:function(){jQuery(">*",this).remove();while(this.firstChild)this.removeChild(this.firstChild);}},function(name,fn){jQuery.fn[name]=function(){return this.each(fn,arguments);};});jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn[type]=function(size){return this[0]==window?jQuery.browser.opera&&document.body["client"+name]||jQuery.browser.safari&&window["inner"+name]||document.compatMode=="CSS1Compat"&&document.documentElement["client"+name]||document.body["client"+name]:this[0]==document?Math.max(Math.max(document.body["scroll"+name],document.documentElement["scroll"+name]),Math.max(document.body["offset"+name],document.documentElement["offset"+name])):size==undefined?(this.length?jQuery.css(this[0],type):null):this.css(type,size.constructor==String?size:size+"px");};});function num(elem,prop){return elem[0]&&parseInt(jQuery.curCSS(elem[0],prop,true),10)||0;}var chars=jQuery.browser.safari&&parseInt(jQuery.browser.version)<417?"(?:[\\w*_-]|\\\\.)":"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",quickChild=new RegExp("^>\\s*("+chars+"+)"),quickID=new RegExp("^("+chars+"+)(#)("+chars+"+)"),quickClass=new RegExp("^([#.]?)("+chars+"*)");jQuery.extend({expr:{"":function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},"#":function(a,i,m){return a.getAttribute("id")==m[2];},":":{lt:function(a,i,m){return i<m[3]-0;},gt:function(a,i,m){return i>m[3]-0;},nth:function(a,i,m){return m[3]-0==i;},eq:function(a,i,m){return m[3]-0==i;},first:function(a,i){return i==0;},last:function(a,i,m,r){return i==r.length-1;},even:function(a,i){return i%2==0;},odd:function(a,i){return i%2;},"first-child":function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},"last-child":function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},"only-child":function(a){return!jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},parent:function(a){return a.firstChild;},empty:function(a){return!a.firstChild;},contains:function(a,i,m){return(a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},visible:function(a){return"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},hidden:function(a){return"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},enabled:function(a){return!a.disabled;},disabled:function(a){return a.disabled;},checked:function(a){return a.checked;},selected:function(a){return a.selected||jQuery.attr(a,"selected");},text:function(a){return"text"==a.type;},radio:function(a){return"radio"==a.type;},checkbox:function(a){return"checkbox"==a.type;},file:function(a){return"file"==a.type;},password:function(a){return"password"==a.type;},submit:function(a){return"submit"==a.type;},image:function(a){return"image"==a.type;},reset:function(a){return"reset"==a.type;},button:function(a){return"button"==a.type||jQuery.nodeName(a,"button");},input:function(a){return/input|select|textarea|button/i.test(a.nodeName);},has:function(a,i,m){return jQuery.find(m[3],a).length;},header:function(a){return/h\d/i.test(a.nodeName);},animated:function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}}},parse:[/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,new RegExp("^([:.#]*)("+chars+"+)")],multiFilter:function(expr,elems,not){var old,cur=[];while(expr&&expr!=old){old=expr;var f=jQuery.filter(expr,elems,not);expr=f.t.replace(/^\s*,\s*/,"");cur=not?elems=f.r:jQuery.merge(cur,f.r);}return cur;},find:function(t,context){if(typeof t!="string")return[t];if(context&&context.nodeType!=1&&context.nodeType!=9)return[];context=context||document;var ret=[context],done=[],last,nodeName;while(t&&last!=t){var r=[];last=t;t=jQuery.trim(t);var foundToken=false,re=quickChild,m=re.exec(t);if(m){nodeName=m[1].toUpperCase();for(var i=0;ret[i];i++)for(var c=ret[i].firstChild;c;c=c.nextSibling)if(c.nodeType==1&&(nodeName=="*"||c.nodeName.toUpperCase()==nodeName))r.push(c);ret=r;t=t.replace(re,"");if(t.indexOf(" ")==0)continue;foundToken=true;}else{re=/^([>+~])\s*(\w*)/i;if((m=re.exec(t))!=null){r=[];var merge={};nodeName=m[2].toUpperCase();m=m[1];for(var j=0,rl=ret.length;j<rl;j++){var n=m=="~"||m=="+"?ret[j].nextSibling:ret[j].firstChild;for(;n;n=n.nextSibling)if(n.nodeType==1){var id=jQuery.data(n);if(m=="~"&&merge[id])break;if(!nodeName||n.nodeName.toUpperCase()==nodeName){if(m=="~")merge[id]=true;r.push(n);}if(m=="+")break;}}ret=r;t=jQuery.trim(t.replace(re,""));foundToken=true;}}if(t&&!foundToken){if(!t.indexOf(",")){if(context==ret[0])ret.shift();done=jQuery.merge(done,ret);r=ret=[context];t=" "+t.substr(1,t.length);}else{var re2=quickID;var m=re2.exec(t);if(m){m=[0,m[2],m[3],m[1]];}else{re2=quickClass;m=re2.exec(t);}m[2]=m[2].replace(/\\/g,"");var elem=ret[ret.length-1];if(m[1]=="#"&&elem&&elem.getElementById&&!jQuery.isXMLDoc(elem)){var oid=elem.getElementById(m[2]);if((jQuery.browser.msie||jQuery.browser.opera)&&oid&&typeof oid.id=="string"&&oid.id!=m[2])oid=jQuery('[@id="'+m[2]+'"]',elem)[0];ret=r=oid&&(!m[3]||jQuery.nodeName(oid,m[3]))?[oid]:[];}else{for(var i=0;ret[i];i++){var tag=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];if(tag=="*"&&ret[i].nodeName.toLowerCase()=="object")tag="param";r=jQuery.merge(r,ret[i].getElementsByTagName(tag));}if(m[1]==".")r=jQuery.classFilter(r,m[2]);if(m[1]=="#"){var tmp=[];for(var i=0;r[i];i++)if(r[i].getAttribute("id")==m[2]){tmp=[r[i]];break;}r=tmp;}ret=r;}t=t.replace(re2,"");}}if(t){var val=jQuery.filter(t,r);ret=r=val.r;t=jQuery.trim(val.t);}}if(t)ret=[];if(ret&&context==ret[0])ret.shift();done=jQuery.merge(done,ret);return done;},classFilter:function(r,m,not){m=" "+m+" ";var tmp=[];for(var i=0;r[i];i++){var pass=(" "+r[i].className+" ").indexOf(m)>=0;if(!not&&pass||not&&!pass)tmp.push(r[i]);}return tmp;},filter:function(t,r,not){var last;while(t&&t!=last){last=t;var p=jQuery.parse,m;for(var i=0;p[i];i++){m=p[i].exec(t);if(m){t=t.substring(m[0].length);m[2]=m[2].replace(/\\/g,"");break;}}if(!m)break;if(m[1]==":"&&m[2]=="not")r=isSimple.test(m[3])?jQuery.filter(m[3],r,true).r:jQuery(r).not(m[3]);else if(m[1]==".")r=jQuery.classFilter(r,m[2],not);else if(m[1]=="["){var tmp=[],type=m[3];for(var i=0,rl=r.length;i<rl;i++){var a=r[i],z=a[jQuery.props[m[2]]||m[2]];if(z==null||/href|src|selected/.test(m[2]))z=jQuery.attr(a,m[2])||'';if((type==""&&!!z||type=="="&&z==m[5]||type=="!="&&z!=m[5]||type=="^="&&z&&!z.indexOf(m[5])||type=="$="&&z.substr(z.length-m[5].length)==m[5]||(type=="*="||type=="~=")&&z.indexOf(m[5])>=0)^not)tmp.push(a);}r=tmp;}else if(m[1]==":"&&m[2]=="nth-child"){var merge={},tmp=[],test=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(m[3]=="even"&&"2n"||m[3]=="odd"&&"2n+1"||!/\D/.test(m[3])&&"0n+"+m[3]||m[3]),first=(test[1]+(test[2]||1))-0,last=test[3]-0;for(var i=0,rl=r.length;i<rl;i++){var node=r[i],parentNode=node.parentNode,id=jQuery.data(parentNode);if(!merge[id]){var c=1;for(var n=parentNode.firstChild;n;n=n.nextSibling)if(n.nodeType==1)n.nodeIndex=c++;merge[id]=true;}var add=false;if(first==0){if(node.nodeIndex==last)add=true;}else if((node.nodeIndex-last)%first==0&&(node.nodeIndex-last)/first>=0)add=true;if(add^not)tmp.push(node);}r=tmp;}else{var fn=jQuery.expr[m[1]];if(typeof fn=="object")fn=fn[m[2]];if(typeof fn=="string")fn=eval("false||function(a,i){return "+fn+";}");r=jQuery.grep(r,function(elem,i){return fn(elem,i,m,r);},not);}}return{r:r,t:t};},dir:function(elem,dir){var matched=[],cur=elem[dir];while(cur&&cur!=document){if(cur.nodeType==1)matched.push(cur);cur=cur[dir];}return matched;},nth:function(cur,result,dir,elem){result=result||1;var num=0;for(;cur;cur=cur[dir])if(cur.nodeType==1&&++num==result)break;return cur;},sibling:function(n,elem){var r=[];for(;n;n=n.nextSibling){if(n.nodeType==1&&n!=elem)r.push(n);}return r;}});jQuery.event={add:function(elem,types,handler,data){if(elem.nodeType==3||elem.nodeType==8)return;if(jQuery.browser.msie&&elem.setInterval)elem=window;if(!handler.guid)handler.guid=this.guid++;if(data!=undefined){var fn=handler;handler=this.proxy(fn,function(){return fn.apply(this,arguments);});handler.data=data;}var events=jQuery.data(elem,"events")||jQuery.data(elem,"events",{}),handle=jQuery.data(elem,"handle")||jQuery.data(elem,"handle",function(){if(typeof jQuery!="undefined"&&!jQuery.event.triggered)return jQuery.event.handle.apply(arguments.callee.elem,arguments);});handle.elem=elem;jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];handler.type=parts[1];var handlers=events[type];if(!handlers){handlers=events[type]={};if(!jQuery.event.special[type]||jQuery.event.special[type].setup.call(elem)===false){if(elem.addEventListener)elem.addEventListener(type,handle,false);else if(elem.attachEvent)elem.attachEvent("on"+type,handle);}}handlers[handler.guid]=handler;jQuery.event.global[type]=true;});elem=null;},guid:1,global:{},remove:function(elem,types,handler){if(elem.nodeType==3||elem.nodeType==8)return;var events=jQuery.data(elem,"events"),ret,index;if(events){if(types==undefined||(typeof types=="string"&&types.charAt(0)=="."))for(var type in events)this.remove(elem,type+(types||""));else{if(types.type){handler=types.handler;types=types.type;}jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];if(events[type]){if(handler)delete events[type][handler.guid];else
+for(handler in events[type])if(!parts[1]||events[type][handler].type==parts[1])delete events[type][handler];for(ret in events[type])break;if(!ret){if(!jQuery.event.special[type]||jQuery.event.special[type].teardown.call(elem)===false){if(elem.removeEventListener)elem.removeEventListener(type,jQuery.data(elem,"handle"),false);else if(elem.detachEvent)elem.detachEvent("on"+type,jQuery.data(elem,"handle"));}ret=null;delete events[type];}}});}for(ret in events)break;if(!ret){var handle=jQuery.data(elem,"handle");if(handle)handle.elem=null;jQuery.removeData(elem,"events");jQuery.removeData(elem,"handle");}}},trigger:function(type,data,elem,donative,extra){data=jQuery.makeArray(data);if(type.indexOf("!")>=0){type=type.slice(0,-1);var exclusive=true;}if(!elem){if(this.global[type])jQuery("*").add([window,document]).trigger(type,data);}else{if(elem.nodeType==3||elem.nodeType==8)return undefined;var val,ret,fn=jQuery.isFunction(elem[type]||null),event=!data[0]||!data[0].preventDefault;if(event){data.unshift({type:type,target:elem,preventDefault:function(){},stopPropagation:function(){},timeStamp:now()});data[0][expando]=true;}data[0].type=type;if(exclusive)data[0].exclusive=true;var handle=jQuery.data(elem,"handle");if(handle)val=handle.apply(elem,data);if((!fn||(jQuery.nodeName(elem,'a')&&type=="click"))&&elem["on"+type]&&elem["on"+type].apply(elem,data)===false)val=false;if(event)data.shift();if(extra&&jQuery.isFunction(extra)){ret=extra.apply(elem,val==null?data:data.concat(val));if(ret!==undefined)val=ret;}if(fn&&donative!==false&&val!==false&&!(jQuery.nodeName(elem,'a')&&type=="click")){this.triggered=true;try{elem[type]();}catch(e){}}this.triggered=false;}return val;},handle:function(event){var val,ret,namespace,all,handlers;event=arguments[0]=jQuery.event.fix(event||window.event);namespace=event.type.split(".");event.type=namespace[0];namespace=namespace[1];all=!namespace&&!event.exclusive;handlers=(jQuery.data(this,"events")||{})[event.type];for(var j in handlers){var handler=handlers[j];if(all||handler.type==namespace){event.handler=handler;event.data=handler.data;ret=handler.apply(this,arguments);if(val!==false)val=ret;if(ret===false){event.preventDefault();event.stopPropagation();}}}return val;},fix:function(event){if(event[expando]==true)return event;var originalEvent=event;event={originalEvent:originalEvent};var props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");for(var i=props.length;i;i--)event[props[i]]=originalEvent[props[i]];event[expando]=true;event.preventDefault=function(){if(originalEvent.preventDefault)originalEvent.preventDefault();originalEvent.returnValue=false;};event.stopPropagation=function(){if(originalEvent.stopPropagation)originalEvent.stopPropagation();originalEvent.cancelBubble=true;};event.timeStamp=event.timeStamp||now();if(!event.target)event.target=event.srcElement||document;if(event.target.nodeType==3)event.target=event.target.parentNode;if(!event.relatedTarget&&event.fromElement)event.relatedTarget=event.fromElement==event.target?event.toElement:event.fromElement;if(event.pageX==null&&event.clientX!=null){var doc=document.documentElement,body=document.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc.clientTop||0);}if(!event.which&&((event.charCode||event.charCode===0)?event.charCode:event.keyCode))event.which=event.charCode||event.keyCode;if(!event.metaKey&&event.ctrlKey)event.metaKey=event.ctrlKey;if(!event.which&&event.button)event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)));return event;},proxy:function(fn,proxy){proxy.guid=fn.guid=fn.guid||proxy.guid||this.guid++;return proxy;},special:{ready:{setup:function(){bindReady();return;},teardown:function(){return;}},mouseenter:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseover",jQuery.event.special.mouseenter.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseover",jQuery.event.special.mouseenter.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseenter";return jQuery.event.handle.apply(this,arguments);}},mouseleave:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseout",jQuery.event.special.mouseleave.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseout",jQuery.event.special.mouseleave.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseleave";return jQuery.event.handle.apply(this,arguments);}}}};jQuery.fn.extend({bind:function(type,data,fn){return type=="unload"?this.one(type,data,fn):this.each(function(){jQuery.event.add(this,type,fn||data,fn&&data);});},one:function(type,data,fn){var one=jQuery.event.proxy(fn||data,function(event){jQuery(this).unbind(event,one);return(fn||data).apply(this,arguments);});return this.each(function(){jQuery.event.add(this,type,one,fn&&data);});},unbind:function(type,fn){return this.each(function(){jQuery.event.remove(this,type,fn);});},trigger:function(type,data,fn){return this.each(function(){jQuery.event.trigger(type,data,this,true,fn);});},triggerHandler:function(type,data,fn){return this[0]&&jQuery.event.trigger(type,data,this[0],false,fn);},toggle:function(fn){var args=arguments,i=1;while(i<args.length)jQuery.event.proxy(fn,args[i++]);return this.click(jQuery.event.proxy(fn,function(event){this.lastToggle=(this.lastToggle||0)%i;event.preventDefault();return args[this.lastToggle++].apply(this,arguments)||false;}));},hover:function(fnOver,fnOut){return this.bind('mouseenter',fnOver).bind('mouseleave',fnOut);},ready:function(fn){bindReady();if(jQuery.isReady)fn.call(document,jQuery);else
+jQuery.readyList.push(function(){return fn.call(this,jQuery);});return this;}});jQuery.extend({isReady:false,readyList:[],ready:function(){if(!jQuery.isReady){jQuery.isReady=true;if(jQuery.readyList){jQuery.each(jQuery.readyList,function(){this.call(document);});jQuery.readyList=null;}jQuery(document).triggerHandler("ready");}}});var readyBound=false;function bindReady(){if(readyBound)return;readyBound=true;if(document.addEventListener&&!jQuery.browser.opera)document.addEventListener("DOMContentLoaded",jQuery.ready,false);if(jQuery.browser.msie&&window==top)(function(){if(jQuery.isReady)return;try{document.documentElement.doScroll("left");}catch(error){setTimeout(arguments.callee,0);return;}jQuery.ready();})();if(jQuery.browser.opera)document.addEventListener("DOMContentLoaded",function(){if(jQuery.isReady)return;for(var i=0;i<document.styleSheets.length;i++)if(document.styleSheets[i].disabled){setTimeout(arguments.callee,0);return;}jQuery.ready();},false);if(jQuery.browser.safari){var numStyles;(function(){if(jQuery.isReady)return;if(document.readyState!="loaded"&&document.readyState!="complete"){setTimeout(arguments.callee,0);return;}if(numStyles===undefined)numStyles=jQuery("style, link[rel=stylesheet]").length;if(document.styleSheets.length!=numStyles){setTimeout(arguments.callee,0);return;}jQuery.ready();})();}jQuery.event.add(window,"load",jQuery.ready);}jQuery.each(("blur,focus,load,resize,scroll,unload,click,dblclick,"+"mousedown,mouseup,mousemove,mouseover,mouseout,change,select,"+"submit,keydown,keypress,keyup,error").split(","),function(i,name){jQuery.fn[name]=function(fn){return fn?this.bind(name,fn):this.trigger(name);};});var withinElement=function(event,elem){var parent=event.relatedTarget;while(parent&&parent!=elem)try{parent=parent.parentNode;}catch(error){parent=elem;}return parent==elem;};jQuery(window).bind("unload",function(){jQuery("*").add(document).unbind();});jQuery.fn.extend({_load:jQuery.fn.load,load:function(url,params,callback){if(typeof url!='string')return this._load(url);var off=url.indexOf(" ");if(off>=0){var selector=url.slice(off,url.length);url=url.slice(0,off);}callback=callback||function(){};var type="GET";if(params)if(jQuery.isFunction(params)){callback=params;params=null;}else{params=jQuery.param(params);type="POST";}var self=this;jQuery.ajax({url:url,type:type,dataType:"html",data:params,complete:function(res,status){if(status=="success"||status=="notmodified")self.html(selector?jQuery("<div/>").append(res.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(selector):res.responseText);self.each(callback,[res.responseText,status,res]);}});return this;},serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){return jQuery.nodeName(this,"form")?jQuery.makeArray(this.elements):this;}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type));}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:val.constructor==Array?jQuery.map(val,function(val,i){return{name:elem.name,value:val};}):{name:elem.name,value:val};}).get();}});jQuery.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(i,o){jQuery.fn[o]=function(f){return this.bind(o,f);};});var jsc=now();jQuery.extend({get:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data=null;}return jQuery.ajax({type:"GET",url:url,data:data,success:callback,dataType:type});},getScript:function(url,callback){return jQuery.get(url,null,callback,"script");},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},post:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data={};}return jQuery.ajax({type:"POST",url:url,data:data,success:callback,dataType:type});},ajaxSetup:function(settings){jQuery.extend(jQuery.ajaxSettings,settings);},ajaxSettings:{url:location.href,global:true,type:"GET",timeout:0,contentType:"application/x-www-form-urlencoded",processData:true,async:true,data:null,username:null,password:null,accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(s){s=jQuery.extend(true,s,jQuery.extend(true,{},jQuery.ajaxSettings,s));var jsonp,jsre=/=\?(&|$)/g,status,data,type=s.type.toUpperCase();if(s.data&&s.processData&&typeof s.data!="string")s.data=jQuery.param(s.data);if(s.dataType=="jsonp"){if(type=="GET"){if(!s.url.match(jsre))s.url+=(s.url.match(/\?/)?"&":"?")+(s.jsonp||"callback")+"=?";}else if(!s.data||!s.data.match(jsre))s.data=(s.data?s.data+"&":"")+(s.jsonp||"callback")+"=?";s.dataType="json";}if(s.dataType=="json"&&(s.data&&s.data.match(jsre)||s.url.match(jsre))){jsonp="jsonp"+jsc++;if(s.data)s.data=(s.data+"").replace(jsre,"="+jsonp+"$1");s.url=s.url.replace(jsre,"="+jsonp+"$1");s.dataType="script";window[jsonp]=function(tmp){data=tmp;success();complete();window[jsonp]=undefined;try{delete window[jsonp];}catch(e){}if(head)head.removeChild(script);};}if(s.dataType=="script"&&s.cache==null)s.cache=false;if(s.cache===false&&type=="GET"){var ts=now();var ret=s.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+ts+"$2");s.url=ret+((ret==s.url)?(s.url.match(/\?/)?"&":"?")+"_="+ts:"");}if(s.data&&type=="GET"){s.url+=(s.url.match(/\?/)?"&":"?")+s.data;s.data=null;}if(s.global&&!jQuery.active++)jQuery.event.trigger("ajaxStart");var remote=/^(?:\w+:)?\/\/([^\/?#]+)/;if(s.dataType=="script"&&type=="GET"&&remote.test(s.url)&&remote.exec(s.url)[1]!=location.host){var head=document.getElementsByTagName("head")[0];var script=document.createElement("script");script.src=s.url;if(s.scriptCharset)script.charset=s.scriptCharset;if(!jsonp){var done=false;script.onload=script.onreadystatechange=function(){if(!done&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){done=true;success();complete();head.removeChild(script);}};}head.appendChild(script);return undefined;}var requestDone=false;var xhr=window.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest();if(s.username)xhr.open(type,s.url,s.async,s.username,s.password);else
+xhr.open(type,s.url,s.async);try{if(s.data)xhr.setRequestHeader("Content-Type",s.contentType);if(s.ifModified)xhr.setRequestHeader("If-Modified-Since",jQuery.lastModified[s.url]||"Thu, 01 Jan 1970 00:00:00 GMT");xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");xhr.setRequestHeader("Accept",s.dataType&&s.accepts[s.dataType]?s.accepts[s.dataType]+", */*":s.accepts._default);}catch(e){}if(s.beforeSend&&s.beforeSend(xhr,s)===false){s.global&&jQuery.active--;xhr.abort();return false;}if(s.global)jQuery.event.trigger("ajaxSend",[xhr,s]);var onreadystatechange=function(isTimeout){if(!requestDone&&xhr&&(xhr.readyState==4||isTimeout=="timeout")){requestDone=true;if(ival){clearInterval(ival);ival=null;}status=isTimeout=="timeout"&&"timeout"||!jQuery.httpSuccess(xhr)&&"error"||s.ifModified&&jQuery.httpNotModified(xhr,s.url)&&"notmodified"||"success";if(status=="success"){try{data=jQuery.httpData(xhr,s.dataType,s.dataFilter);}catch(e){status="parsererror";}}if(status=="success"){var modRes;try{modRes=xhr.getResponseHeader("Last-Modified");}catch(e){}if(s.ifModified&&modRes)jQuery.lastModified[s.url]=modRes;if(!jsonp)success();}else
+jQuery.handleError(s,xhr,status);complete();if(s.async)xhr=null;}};if(s.async){var ival=setInterval(onreadystatechange,13);if(s.timeout>0)setTimeout(function(){if(xhr){xhr.abort();if(!requestDone)onreadystatechange("timeout");}},s.timeout);}try{xhr.send(s.data);}catch(e){jQuery.handleError(s,xhr,null,e);}if(!s.async)onreadystatechange();function success(){if(s.success)s.success(data,status);if(s.global)jQuery.event.trigger("ajaxSuccess",[xhr,s]);}function complete(){if(s.complete)s.complete(xhr,status);if(s.global)jQuery.event.trigger("ajaxComplete",[xhr,s]);if(s.global&&!--jQuery.active)jQuery.event.trigger("ajaxStop");}return xhr;},handleError:function(s,xhr,status,e){if(s.error)s.error(xhr,status,e);if(s.global)jQuery.event.trigger("ajaxError",[xhr,s,e]);},active:0,httpSuccess:function(xhr){try{return!xhr.status&&location.protocol=="file:"||(xhr.status>=200&&xhr.status<300)||xhr.status==304||xhr.status==1223||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpNotModified:function(xhr,url){try{var xhrRes=xhr.getResponseHeader("Last-Modified");return xhr.status==304||xhrRes==jQuery.lastModified[url]||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpData:function(xhr,type,filter){var ct=xhr.getResponseHeader("content-type"),xml=type=="xml"||!type&&ct&&ct.indexOf("xml")>=0,data=xml?xhr.responseXML:xhr.responseText;if(xml&&data.documentElement.tagName=="parsererror")throw"parsererror";if(filter)data=filter(data,type);if(type=="script")jQuery.globalEval(data);if(type=="json")data=eval("("+data+")");return data;},param:function(a){var s=[];if(a.constructor==Array||a.jquery)jQuery.each(a,function(){s.push(encodeURIComponent(this.name)+"="+encodeURIComponent(this.value));});else
+for(var j in a)if(a[j]&&a[j].constructor==Array)jQuery.each(a[j],function(){s.push(encodeURIComponent(j)+"="+encodeURIComponent(this));});else
+s.push(encodeURIComponent(j)+"="+encodeURIComponent(jQuery.isFunction(a[j])?a[j]():a[j]));return s.join("&").replace(/%20/g,"+");}});jQuery.fn.extend({show:function(speed,callback){return speed?this.animate({height:"show",width:"show",opacity:"show"},speed,callback):this.filter(":hidden").each(function(){this.style.display=this.oldblock||"";if(jQuery.css(this,"display")=="none"){var elem=jQuery("<"+this.tagName+" />").appendTo("body");this.style.display=elem.css("display");if(this.style.display=="none")this.style.display="block";elem.remove();}}).end();},hide:function(speed,callback){return speed?this.animate({height:"hide",width:"hide",opacity:"hide"},speed,callback):this.filter(":visible").each(function(){this.oldblock=this.oldblock||jQuery.css(this,"display");this.style.display="none";}).end();},_toggle:jQuery.fn.toggle,toggle:function(fn,fn2){return jQuery.isFunction(fn)&&jQuery.isFunction(fn2)?this._toggle.apply(this,arguments):fn?this.animate({height:"toggle",width:"toggle",opacity:"toggle"},fn,fn2):this.each(function(){jQuery(this)[jQuery(this).is(":hidden")?"show":"hide"]();});},slideDown:function(speed,callback){return this.animate({height:"show"},speed,callback);},slideUp:function(speed,callback){return this.animate({height:"hide"},speed,callback);},slideToggle:function(speed,callback){return this.animate({height:"toggle"},speed,callback);},fadeIn:function(speed,callback){return this.animate({opacity:"show"},speed,callback);},fadeOut:function(speed,callback){return this.animate({opacity:"hide"},speed,callback);},fadeTo:function(speed,to,callback){return this.animate({opacity:to},speed,callback);},animate:function(prop,speed,easing,callback){var optall=jQuery.speed(speed,easing,callback);return this[optall.queue===false?"each":"queue"](function(){if(this.nodeType!=1)return false;var opt=jQuery.extend({},optall),p,hidden=jQuery(this).is(":hidden"),self=this;for(p in prop){if(prop[p]=="hide"&&hidden||prop[p]=="show"&&!hidden)return opt.complete.call(this);if(p=="height"||p=="width"){opt.display=jQuery.css(this,"display");opt.overflow=this.style.overflow;}}if(opt.overflow!=null)this.style.overflow="hidden";opt.curAnim=jQuery.extend({},prop);jQuery.each(prop,function(name,val){var e=new jQuery.fx(self,opt,name);if(/toggle|show|hide/.test(val))e[val=="toggle"?hidden?"show":"hide":val](prop);else{var parts=val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),start=e.cur(true)||0;if(parts){var end=parseFloat(parts[2]),unit=parts[3]||"px";if(unit!="px"){self.style[name]=(end||1)+unit;start=((end||1)/e.cur(true))*start;self.style[name]=start+unit;}if(parts[1])end=((parts[1]=="-="?-1:1)*end)+start;e.custom(start,end,unit);}else
+e.custom(start,val,"");}});return true;});},queue:function(type,fn){if(jQuery.isFunction(type)||(type&&type.constructor==Array)){fn=type;type="fx";}if(!type||(typeof type=="string"&&!fn))return queue(this[0],type);return this.each(function(){if(fn.constructor==Array)queue(this,type,fn);else{queue(this,type).push(fn);if(queue(this,type).length==1)fn.call(this);}});},stop:function(clearQueue,gotoEnd){var timers=jQuery.timers;if(clearQueue)this.queue([]);this.each(function(){for(var i=timers.length-1;i>=0;i--)if(timers[i].elem==this){if(gotoEnd)timers[i](true);timers.splice(i,1);}});if(!gotoEnd)this.dequeue();return this;}});var queue=function(elem,type,array){if(elem){type=type||"fx";var q=jQuery.data(elem,type+"queue");if(!q||array)q=jQuery.data(elem,type+"queue",jQuery.makeArray(array));}return q;};jQuery.fn.dequeue=function(type){type=type||"fx";return this.each(function(){var q=queue(this,type);q.shift();if(q.length)q[0].call(this);});};jQuery.extend({speed:function(speed,easing,fn){var opt=speed&&speed.constructor==Object?speed:{complete:fn||!fn&&easing||jQuery.isFunction(speed)&&speed,duration:speed,easing:fn&&easing||easing&&easing.constructor!=Function&&easing};opt.duration=(opt.duration&&opt.duration.constructor==Number?opt.duration:jQuery.fx.speeds[opt.duration])||jQuery.fx.speeds.def;opt.old=opt.complete;opt.complete=function(){if(opt.queue!==false)jQuery(this).dequeue();if(jQuery.isFunction(opt.old))opt.old.call(this);};return opt;},easing:{linear:function(p,n,firstNum,diff){return firstNum+diff*p;},swing:function(p,n,firstNum,diff){return((-Math.cos(p*Math.PI)/2)+0.5)*diff+firstNum;}},timers:[],timerId:null,fx:function(elem,options,prop){this.options=options;this.elem=elem;this.prop=prop;if(!options.orig)options.orig={};}});jQuery.fx.prototype={update:function(){if(this.options.step)this.options.step.call(this.elem,this.now,this);(jQuery.fx.step[this.prop]||jQuery.fx.step._default)(this);if(this.prop=="height"||this.prop=="width")this.elem.style.display="block";},cur:function(force){if(this.elem[this.prop]!=null&&this.elem.style[this.prop]==null)return this.elem[this.prop];var r=parseFloat(jQuery.css(this.elem,this.prop,force));return r&&r>-10000?r:parseFloat(jQuery.curCSS(this.elem,this.prop))||0;},custom:function(from,to,unit){this.startTime=now();this.start=from;this.end=to;this.unit=unit||this.unit||"px";this.now=this.start;this.pos=this.state=0;this.update();var self=this;function t(gotoEnd){return self.step(gotoEnd);}t.elem=this.elem;jQuery.timers.push(t);if(jQuery.timerId==null){jQuery.timerId=setInterval(function(){var timers=jQuery.timers;for(var i=0;i<timers.length;i++)if(!timers[i]())timers.splice(i--,1);if(!timers.length){clearInterval(jQuery.timerId);jQuery.timerId=null;}},13);}},show:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.show=true;this.custom(0,this.cur());if(this.prop=="width"||this.prop=="height")this.elem.style[this.prop]="1px";jQuery(this.elem).show();},hide:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0);},step:function(gotoEnd){var t=now();if(gotoEnd||t>this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var done=true;for(var i in this.options.curAnim)if(this.options.curAnim[i]!==true)done=false;if(done){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(jQuery.css(this.elem,"display")=="none")this.elem.style.display="block";}if(this.options.hide)this.elem.style.display="none";if(this.options.hide||this.options.show)for(var p in this.options.curAnim)jQuery.attr(this.elem.style,p,this.options.orig[p]);}if(done)this.options.complete.call(this.elem);return false;}else{var n=t-this.startTime;this.state=n/this.options.duration;this.pos=jQuery.easing[this.options.easing||(jQuery.easing.swing?"swing":"linear")](this.state,n,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update();}return true;}};jQuery.extend(jQuery.fx,{speeds:{slow:600,fast:200,def:400},step:{scrollLeft:function(fx){fx.elem.scrollLeft=fx.now;},scrollTop:function(fx){fx.elem.scrollTop=fx.now;},opacity:function(fx){jQuery.attr(fx.elem.style,"opacity",fx.now);},_default:function(fx){fx.elem.style[fx.prop]=fx.now+fx.unit;}}});jQuery.fn.offset=function(){var left=0,top=0,elem=this[0],results;if(elem)with(jQuery.browser){var parent=elem.parentNode,offsetChild=elem,offsetParent=elem.offsetParent,doc=elem.ownerDocument,safari2=safari&&parseInt(version)<522&&!/adobeair/i.test(userAgent),css=jQuery.curCSS,fixed=css(elem,"position")=="fixed";if(elem.getBoundingClientRect){var box=elem.getBoundingClientRect();add(box.left+Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),box.top+Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));add(-doc.documentElement.clientLeft,-doc.documentElement.clientTop);}else{add(elem.offsetLeft,elem.offsetTop);while(offsetParent){add(offsetParent.offsetLeft,offsetParent.offsetTop);if(mozilla&&!/^t(able|d|h)$/i.test(offsetParent.tagName)||safari&&!safari2)border(offsetParent);if(!fixed&&css(offsetParent,"position")=="fixed")fixed=true;offsetChild=/^body$/i.test(offsetParent.tagName)?offsetChild:offsetParent;offsetParent=offsetParent.offsetParent;}while(parent&&parent.tagName&&!/^body|html$/i.test(parent.tagName)){if(!/^inline|table.*$/i.test(css(parent,"display")))add(-parent.scrollLeft,-parent.scrollTop);if(mozilla&&css(parent,"overflow")!="visible")border(parent);parent=parent.parentNode;}if((safari2&&(fixed||css(offsetChild,"position")=="absolute"))||(mozilla&&css(offsetChild,"position")!="absolute"))add(-doc.body.offsetLeft,-doc.body.offsetTop);if(fixed)add(Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));}results={top:top,left:left};}function border(elem){add(jQuery.curCSS(elem,"borderLeftWidth",true),jQuery.curCSS(elem,"borderTopWidth",true));}function add(l,t){left+=parseInt(l,10)||0;top+=parseInt(t,10)||0;}return results;};jQuery.fn.extend({position:function(){var left=0,top=0,results;if(this[0]){var offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=/^body|html$/i.test(offsetParent[0].tagName)?{top:0,left:0}:offsetParent.offset();offset.top-=num(this,'marginTop');offset.left-=num(this,'marginLeft');parentOffset.top+=num(offsetParent,'borderTopWidth');parentOffset.left+=num(offsetParent,'borderLeftWidth');results={top:offset.top-parentOffset.top,left:offset.left-parentOffset.left};}return results;},offsetParent:function(){var offsetParent=this[0].offsetParent;while(offsetParent&&(!/^body|html$/i.test(offsetParent.tagName)&&jQuery.css(offsetParent,'position')=='static'))offsetParent=offsetParent.offsetParent;return jQuery(offsetParent);}});jQuery.each(['Left','Top'],function(i,name){var method='scroll'+name;jQuery.fn[method]=function(val){if(!this[0])return;return val!=undefined?this.each(function(){this==window||this==document?window.scrollTo(!i?val:jQuery(window).scrollLeft(),i?val:jQuery(window).scrollTop()):this[method]=val;}):this[0]==window||this[0]==document?self[i?'pageYOffset':'pageXOffset']||jQuery.boxModel&&document.documentElement[method]||document.body[method]:this[0][method];};});jQuery.each(["Height","Width"],function(i,name){var tl=i?"Left":"Top",br=i?"Right":"Bottom";jQuery.fn["inner"+name]=function(){return this[name.toLowerCase()]()+num(this,"padding"+tl)+num(this,"padding"+br);};jQuery.fn["outer"+name]=function(margin){return this["inner"+name]()+num(this,"border"+tl+"Width")+num(this,"border"+br+"Width")+(margin?num(this,"margin"+tl)+num(this,"margin"+br):0);};});})();
\ No newline at end of file
index f3c0fa6..9af7380 100644 (file)
@@ -179,61 +179,48 @@ END
 ;
 if ($settings{'SPEED'} ne 'off') {
 print <<END
-                <script type="text/javascript" language="javascript">
-                 
-                    var http_request = false;
-                 
-                    function LoadInetInfo(url) {
-                 
-                        http_request = false;
-                 
-                        if (window.XMLHttpRequest) { // Mozilla, Safari,...
-                            http_request = new XMLHttpRequest();
-                            if (http_request.overrideMimeType) {
-                                http_request.overrideMimeType('text/xml');
-                                // zu dieser Zeile siehe weiter unten
-                            }
-                        } else if (window.ActiveXObject) { // IE
-                            try {
-                                http_request = new ActiveXObject("Msxml2.XMLHTTP");
-                            } catch (e) {
-                                try {
-                                    http_request = new ActiveXObject("Microsoft.XMLHTTP");
-                                } catch (e) {}
-                            }
+    <script type="text/javascript" src="/include/jquery-1.2.6.min.js"></script>
+    <script type="text/javascript">
+        var t_current;
+        var t_last;
+        var rxb_current;
+        var rxb_last;
+        var txb_current;
+        var txb_last;
+       function refreshInetInfo() {
+               \$.ajax({
+                       url: '/cgi-bin/speed.cgi',
+                        success: function(xml){
+                        t_current = new Date();
+                        var t_diff = t_current - t_last;
+                        t_last = t_current;
+
+                        rxb_current = \$("rxb",xml).text();
+                        var rxb_diff = rxb_current - rxb_last;
+                        rxb_last = rxb_current;
+
+                        var rx_kbs = rxb_diff/t_diff;
+                        rx_kbs = Math.round(rx_kbs*10)/10;
+
+                        txb_current = \$("txb",xml).text();
+                        var txb_diff = txb_current - txb_last;
+                        txb_last = txb_current;
+
+                        var tx_kbs = txb_diff/t_diff;
+                        tx_kbs = Math.round(tx_kbs*10)/10;
+
+                        \$("#rx_kbs").text(rx_kbs + ' kb/s');
+                        \$("#tx_kbs").text(tx_kbs + ' kb/s');
                         }
-                 
-                        if (!http_request) {
-                            alert('Ende :( Kann keine XMLHTTP-Instanz erzeugen');
-                            return false;
-                        }
-                        http_request.onreadystatechange = DisplayInetInfo;
-                        http_request.open('GET', url, true);
-                        http_request.send(null);
-                 
-                    }
-                 
-                    function DisplayInetInfo() {
-                        if (http_request.readyState == 4) {
-                             var xmldoc = http_request.responseXML;
-                             var root1_node = xmldoc.getElementsByTagName('rx_kbs').item(0);
-                             var root2_node = xmldoc.getElementsByTagName('tx_kbs').item(0);
-                             var root3_node = xmldoc.getElementsByTagName('rxb').item(0);
-                             var root4_node = xmldoc.getElementsByTagName('txb').item(0);
-                
-                             document.forms['speed'].txkb.value  = root1_node.firstChild.data;
-                             document.forms['speed'].rxkb.value  = root2_node.firstChild.data;
-                
-                                        // document.getElementsByTagName("input")[0].style.color = "#00FF00";
-                                        url    = "/cgi-bin/speed.cgi?rxb_last=" + root3_node.firstChild.data + "&txb_last=" + root4_node.firstChild.data;
-                
-                              window.setTimeout("LoadInetInfo(url)", 3000);
-                        }
-                 
-                    }
-                </script>
+               });
+                window.setTimeout("refreshInetInfo()", 3000);
+       }
+       \$(document).ready(function(){
+               refreshInetInfo();
+       });
+    </script>
   </head>
-  <body onLoad="LoadInetInfo('/cgi-bin/speed.cgi')">
+  <body>
 END
 ;
 }
@@ -375,10 +362,9 @@ END
 if ($settings{'SPEED'} ne 'off') {
 print <<END                        
                         <br />
-                        <form name='speed'>
-                                <b>$Lang::tr{'bandwidth usage'}:</b> $Lang::tr{'incoming'}:<input type="text" name="rxkb" size="5" value="0 kb/s" style="font-size: 12px; font-family: Arial, Helvetica;text-align: center;color:green; border: none; padding: 0; background-color: #FFFFFF;vertical-align: middle" />
-                                $Lang::tr{'outgoing'}: <input type="text" name="txkb" size="5" value="0 kb/s" style="font-size: 12px; font-family: Arial, Helvetica;text-align: center;color:red; border: none; padding: 0; background-color: #FFFFFF;vertical-align: middle"/>
-                        </form>
+                                <b>$Lang::tr{'bandwidth usage'}:</b>
+                               $Lang::tr{'incoming'}: <span id="rx_kbs"></span>
+                                $Lang::tr{'outgoing'}: <span id="tx_kbs"></span>
 END
 ;
 }
index b7cbd7c..9669b24 100644 (file)
--- a/lfs/fuse
+++ b/lfs/fuse
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.6.3
+VER        = 2.7.4
 
 THISAPP    = fuse-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3f4f5d07d12dedc0a3fd23472171fe94
+$(DL_FILE)_MD5 = 4879f06570d2225667534c37fea04213
 
 install : $(TARGET)
 
index c464ba7..f3118f6 100644 (file)
@@ -30,7 +30,7 @@ THISAPP    = guardian-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = guardian
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
index 4b930b9..cd0f1a3 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.5.10
+VER        = 0.5.11
 
 THISAPP    = hostapd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 6
+PAK_VER    = 8
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ed669d96346dfc7d9f9fad079731853f
+$(DL_FILE)_MD5 = d99d3566d5f15dfd24df37fcb2ee80ee
 
 install : $(TARGET)
 
index 8e5ba4e..98ed134 100644 (file)
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipfireseeder
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = "rtorrent"
 
@@ -78,4 +78,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        -mkdir -p /var/log/seeder /var/ipfire/seeder
        cp -vf $(DIR_DL)/$(DL_FILE) /var/ipfire/seeder
+       echo "Folder for IPFireseeder data" > /var/log/seeder/info
        @$(POSTBUILD)
index 25cdffc..086454b 100644 (file)
@@ -24,7 +24,7 @@
 
 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
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3c9726acd5ffa180fa7b274b625a6082
+$(DL_FILE)_MD5 = bc9657269748cd576f258ceda31eb3a7
 
 install : $(TARGET)
 
index 171f04a..c61c77f 100644 (file)
@@ -30,7 +30,7 @@ THISAPP    = mpfire-$(VER)
 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"
 
index 8c1d67e..b09b038 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.5012
+VER        = 1.5130
 
 THISAPP    = ntfs-3g-$(VER)
 DL_FILE    = $(THISAPP).tgz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 601db52936011902206dfe1be05e4756
+$(DL_FILE)_MD5 = ad3c40bba398d162f97c2936293eae1f
 
 install : $(TARGET)
 
diff --git a/lfs/pptp b/lfs/pptp
new file mode 100644 (file)
index 0000000..e3237c3
--- /dev/null
+++ b/lfs/pptp
@@ -0,0 +1,76 @@
+###############################################################################
+#                                                                             #
+# 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        = 1.7.2
+
+THISAPP    = pptp-$(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 = 4c3d19286a37459a632c7128c92a9857
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# 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) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
index 71df43f..36edee2 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.2.5
+VER        = 3.2.6
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 10
+PAK_VER    = 11
 
 DEPS       = "cups cyrus-sasl"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0f7539e09803ae60a2912e70adf1c747
+$(DL_FILE)_MD5 = 0cd27c7afbb8211616eea4010f32271c
 
 install : $(TARGET)
 
index 815c6e8..e45872d 100644 (file)
--- a/lfs/splix
+++ b/lfs/splix
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.1.1
+VER        = 2.0.0-rc2
 
 THISAPP    = splix-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = splix
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = "cups"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 13af25dd72aae68b39eaf557d62957a5
+$(DL_FILE)_MD5 = 4381ccf9a38b08012dbdc3c0f28414fd
 
 install : $(TARGET)
 
index 80e14f0..8128eb7 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -86,6 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
           --enable-ntlm-auth-helpers="SMB" \
           --enable-useragent-log \
           --enable-referer-log \
+          --with-maxfd=1024 \
           --with-pthreads --with-dl
 
        cd $(DIR_APP) && make $(MAKETUNING)
index e753ca0..3ac00c8 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.7
+VER        = 3.8
 
 THISAPP    = squidclamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = squidclamav
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = "clamav"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 95a3f81133edfb6a905f491f994f7d95
+$(DL_FILE)_MD5 = 8e873863ed54ed89b2d8853f281817c2
 
 install : $(TARGET)
 
diff --git a/lfs/sshfs b/lfs/sshfs
new file mode 100644 (file)
index 0000000..3b54176
--- /dev/null
+++ b/lfs/sshfs
@@ -0,0 +1,80 @@
+###############################################################################
+#                                                                             #
+# 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)
index 1ba5e29..80225ef 100644 (file)
@@ -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 2c5a111..d1eecd0 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -334,6 +334,7 @@ buildipfire() {
   ipfiremake libpcap
   ipfiremake ppp
   ipfiremake rp-pppoe
+  ipfiremake pptp
   ipfiremake unzip
   ipfiremake linux
   ipfiremake atl2
@@ -584,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
@@ -668,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
index bb0da48..8200c2d 100644 (file)
@@ -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
+               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
index d13aa9e..def3292 100644 (file)
@@ -20,12 +20,14 @@ case "${1}" in
        start)
                boot_mesg "Starting IPFire Seeder..."
                cd /var/log/seeder
-               loadproc screen -dmS seeder /usr/bin/rtorrent -o port_range=35700-35700 \
+               # loadproc 
+               screen -dmS seeder /usr/bin/rtorrent -o port_range=35700-35700 \
                        -o download_rate=180 -o upload_rate=15 \
                        -o min_peers=10 -o max_peers=30 \
                        -o min_peers_seed=1 -o max_peers_seed=5 \
                        -o max_uploads=3 \
-                       /var/ipfire/seeder/*.torrent
+                       /var/ipfire/seeder/*.torrent &
+               evaluate_retval
                if ! grep -q "35700:35700" /var/ipfire/xtaccess/config ; then
                        echo "tcp,0.0.0.0/0,35700:35700,on,0.0.0.0,IPFireSeeder" >> /var/ipfire/xtaccess/config
                        /usr/local/bin/setxtaccess
diff --git a/src/paks/fetchmail/install.sh b/src/paks/fetchmail/install.sh
new file mode 100644 (file)
index 0000000..31c5fec
--- /dev/null
@@ -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 <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /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 (file)
index 0000000..a7b8a53
--- /dev/null
@@ -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 <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /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 (file)
index 0000000..cb88e34
--- /dev/null
@@ -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 <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
index 89c40d0..f81b041 100644 (file)
@@ -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 <info@ipfire.org>.                        #
+# Copyright (C) 2008 IPFire-Team <info@ipfire.org>.                        #
 #                                                                          #
 ############################################################################
 #
index d92c24d..973a2f9 100644 (file)
 #
 . /opt/pakfire/lib/functions.sh
 stop_service ${NAME}
+
+#prevent erasing the downloaded data at uninstall/update
+cat /opt/pakfire/db/rootfiles/ipfireseeder | \
+    grep -v "var/ipfire/seeder" | \
+    grep -v "var/log/seeder" > /opt/pakfire/db/rootfiles/ipfireseeder.tmp
+mv /opt/pakfire/db/rootfiles/ipfireseeder.tmp \
+    /opt/pakfire/db/rootfiles/ipfireseeder
+
 remove_files