From 3a1093255d09dcb68346336054cfa305c5eaa727 Mon Sep 17 00:00:00 2001 From: Maniacikarus Date: Sun, 7 Dec 2008 13:45:01 +0100 Subject: [PATCH 01/14] Upgraded Squidclamav to current stable, modified config --- config/squidclamav/squidclamav.conf | 21 +++++++++++++++++++-- lfs/squidclamav | 6 +++--- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/config/squidclamav/squidclamav.conf b/config/squidclamav/squidclamav.conf index 43a0a6f5d..8e153bd0c 100644 --- a/config/squidclamav/squidclamav.conf +++ b/config/squidclamav/squidclamav.conf @@ -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.*$ diff --git a/lfs/squidclamav b/lfs/squidclamav index e753ca0ab..3ac00c87e 100644 --- a/lfs/squidclamav +++ b/lfs/squidclamav @@ -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) From d9c3841597a04af440227fe0e834e79c212f34fb Mon Sep 17 00:00:00 2001 From: Maniacikarus Date: Sun, 7 Dec 2008 13:52:33 +0100 Subject: [PATCH 02/14] Cleaned up old core files --- config/rootfiles/{core/15/files => common/oldcore15} | 0 config/rootfiles/{core/16/files => common/oldcore16} | 0 config/rootfiles/{core/17/files => common/oldcore17} | 0 config/rootfiles/{core/18/files => common/oldcore18} | 0 config/rootfiles/core/15/meta | 1 - config/rootfiles/core/15/update.sh | 5 ----- config/rootfiles/core/16/meta | 1 - config/rootfiles/core/16/update.sh | 5 ----- config/rootfiles/core/17/meta | 1 - config/rootfiles/core/17/update.sh | 11 ----------- config/rootfiles/core/18/meta | 1 - config/rootfiles/core/18/update.sh | 8 -------- 12 files changed, 33 deletions(-) rename config/rootfiles/{core/15/files => common/oldcore15} (100%) rename config/rootfiles/{core/16/files => common/oldcore16} (100%) rename config/rootfiles/{core/17/files => common/oldcore17} (100%) rename config/rootfiles/{core/18/files => common/oldcore18} (100%) delete mode 100644 config/rootfiles/core/15/meta delete mode 100644 config/rootfiles/core/15/update.sh delete mode 100644 config/rootfiles/core/16/meta delete mode 100644 config/rootfiles/core/16/update.sh delete mode 100644 config/rootfiles/core/17/meta delete mode 100644 config/rootfiles/core/17/update.sh delete mode 100644 config/rootfiles/core/18/meta delete mode 100644 config/rootfiles/core/18/update.sh diff --git a/config/rootfiles/core/15/files b/config/rootfiles/common/oldcore15 similarity index 100% rename from config/rootfiles/core/15/files rename to config/rootfiles/common/oldcore15 diff --git a/config/rootfiles/core/16/files b/config/rootfiles/common/oldcore16 similarity index 100% rename from config/rootfiles/core/16/files rename to config/rootfiles/common/oldcore16 diff --git a/config/rootfiles/core/17/files b/config/rootfiles/common/oldcore17 similarity index 100% rename from config/rootfiles/core/17/files rename to config/rootfiles/common/oldcore17 diff --git a/config/rootfiles/core/18/files b/config/rootfiles/common/oldcore18 similarity index 100% rename from config/rootfiles/core/18/files rename to config/rootfiles/common/oldcore18 diff --git a/config/rootfiles/core/15/meta b/config/rootfiles/core/15/meta deleted file mode 100644 index d547fa86f..000000000 --- a/config/rootfiles/core/15/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/15/update.sh b/config/rootfiles/core/15/update.sh deleted file mode 100644 index 36c690b55..000000000 --- a/config/rootfiles/core/15/update.sh +++ /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/16/meta b/config/rootfiles/core/16/meta deleted file mode 100644 index d547fa86f..000000000 --- a/config/rootfiles/core/16/meta +++ /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 index 36c690b55..000000000 --- a/config/rootfiles/core/16/update.sh +++ /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/meta b/config/rootfiles/core/17/meta deleted file mode 100644 index d547fa86f..000000000 --- a/config/rootfiles/core/17/meta +++ /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 index 8729dcdf6..000000000 --- a/config/rootfiles/core/17/update.sh +++ /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/meta b/config/rootfiles/core/18/meta deleted file mode 100644 index d547fa86f..000000000 --- a/config/rootfiles/core/18/meta +++ /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 index e91c6c181..000000000 --- a/config/rootfiles/core/18/update.sh +++ /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 From e0e0a555cd89e8a8aff9dc756af382cf13b36e35 Mon Sep 17 00:00:00 2001 From: Maniacikarus Date: Sun, 7 Dec 2008 14:10:10 +0100 Subject: [PATCH 03/14] Get rid of these old corefiles and dependency conflicts, 2.1 is branched --- config/rootfiles/common/oldcore1 | 8 -------- config/rootfiles/common/oldcore10 | 8 -------- config/rootfiles/common/oldcore11 | 24 ---------------------- config/rootfiles/common/oldcore12 | 11 ---------- config/rootfiles/common/oldcore13 | 4 ---- config/rootfiles/common/oldcore14 | 25 ----------------------- config/rootfiles/common/oldcore15 | 1 - config/rootfiles/common/oldcore16 | 17 --------------- config/rootfiles/common/oldcore17 | 17 --------------- config/rootfiles/common/oldcore18 | 17 --------------- config/rootfiles/common/oldcore2 | 19 ----------------- config/rootfiles/common/oldcore3 | 3 --- config/rootfiles/common/oldcore4 | 14 ------------- config/rootfiles/common/oldcore5 | 6 ------ config/rootfiles/common/oldcore6 | 7 ------- config/rootfiles/common/oldcore7 | 15 -------------- config/rootfiles/common/oldcore8 | 3 --- config/rootfiles/common/oldcore9 | 17 --------------- config/rootfiles/updater/filelists/core15 | 1 - config/rootfiles/updater/filelists/core16 | 1 - config/rootfiles/updater/filelists/core17 | 1 - config/rootfiles/updater/filelists/core18 | 1 - 22 files changed, 220 deletions(-) delete mode 100644 config/rootfiles/common/oldcore1 delete mode 100644 config/rootfiles/common/oldcore10 delete mode 100644 config/rootfiles/common/oldcore11 delete mode 100644 config/rootfiles/common/oldcore12 delete mode 100644 config/rootfiles/common/oldcore13 delete mode 100644 config/rootfiles/common/oldcore14 delete mode 100644 config/rootfiles/common/oldcore15 delete mode 100644 config/rootfiles/common/oldcore16 delete mode 100644 config/rootfiles/common/oldcore17 delete mode 100644 config/rootfiles/common/oldcore18 delete mode 100644 config/rootfiles/common/oldcore2 delete mode 100644 config/rootfiles/common/oldcore3 delete mode 100644 config/rootfiles/common/oldcore4 delete mode 100644 config/rootfiles/common/oldcore5 delete mode 100644 config/rootfiles/common/oldcore6 delete mode 100644 config/rootfiles/common/oldcore7 delete mode 100644 config/rootfiles/common/oldcore8 delete mode 100644 config/rootfiles/common/oldcore9 delete mode 120000 config/rootfiles/updater/filelists/core15 delete mode 120000 config/rootfiles/updater/filelists/core16 delete mode 120000 config/rootfiles/updater/filelists/core17 delete mode 120000 config/rootfiles/updater/filelists/core18 diff --git a/config/rootfiles/common/oldcore1 b/config/rootfiles/common/oldcore1 deleted file mode 100644 index 9f88ed2d9..000000000 --- a/config/rootfiles/common/oldcore1 +++ /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 index 5c841e1dc..000000000 --- a/config/rootfiles/common/oldcore10 +++ /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 index ad4222119..000000000 --- a/config/rootfiles/common/oldcore11 +++ /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 index ef20f11e0..000000000 --- a/config/rootfiles/common/oldcore12 +++ /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 index 0cdd0be7a..000000000 --- a/config/rootfiles/common/oldcore13 +++ /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 index 84d71eb3c..000000000 --- a/config/rootfiles/common/oldcore14 +++ /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/oldcore15 b/config/rootfiles/common/oldcore15 deleted file mode 100644 index 52198eb0f..000000000 --- a/config/rootfiles/common/oldcore15 +++ /dev/null @@ -1 +0,0 @@ -usr/sbin/dnsmasq diff --git a/config/rootfiles/common/oldcore16 b/config/rootfiles/common/oldcore16 deleted file mode 100644 index 0fc2a8f3c..000000000 --- a/config/rootfiles/common/oldcore16 +++ /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/common/oldcore17 b/config/rootfiles/common/oldcore17 deleted file mode 100644 index 6e9946c6d..000000000 --- a/config/rootfiles/common/oldcore17 +++ /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/common/oldcore18 b/config/rootfiles/common/oldcore18 deleted file mode 100644 index 42a72d2a2..000000000 --- a/config/rootfiles/common/oldcore18 +++ /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/common/oldcore2 b/config/rootfiles/common/oldcore2 deleted file mode 100644 index d32d11235..000000000 --- a/config/rootfiles/common/oldcore2 +++ /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 index 2f94b69ef..000000000 --- a/config/rootfiles/common/oldcore3 +++ /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 index dd9e12f23..000000000 --- a/config/rootfiles/common/oldcore4 +++ /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 index b25e41c3f..000000000 --- a/config/rootfiles/common/oldcore5 +++ /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 index 71302132c..000000000 --- a/config/rootfiles/common/oldcore6 +++ /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 index dbf9785d9..000000000 --- a/config/rootfiles/common/oldcore7 +++ /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 index eda575727..000000000 --- a/config/rootfiles/common/oldcore8 +++ /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 index aca00455c..000000000 --- a/config/rootfiles/common/oldcore9 +++ /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/updater/filelists/core15 b/config/rootfiles/updater/filelists/core15 deleted file mode 120000 index a9c209737..000000000 --- a/config/rootfiles/updater/filelists/core15 +++ /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 index 1900ca042..000000000 --- a/config/rootfiles/updater/filelists/core16 +++ /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 index 2c45f3757..000000000 --- a/config/rootfiles/updater/filelists/core17 +++ /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 index 81a794094..000000000 --- a/config/rootfiles/updater/filelists/core18 +++ /dev/null @@ -1 +0,0 @@ -../../core/18/files \ No newline at end of file From 28c9dec6b4c7c96a8a6fe8cd6cb4ebc09c3d18d3 Mon Sep 17 00:00:00 2001 From: Maniacikarus Date: Sun, 7 Dec 2008 14:10:54 +0100 Subject: [PATCH 04/14] Proxy CGI new algo to calc redirectors added filedescriptor option --- html/cgi-bin/proxy.cgi | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index d41d0af4f..1a4453a77 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -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 "".$Lang::tr{'advproxy squidclamav'}."
"; print $Lang::tr{'advproxy enabled'}."
"; - print "+ ".int(sqrt($count) * 8); + print "+ ".int(( $count**(1/3)) * 8); print ""; } else { print ""; } print "".$Lang::tr{'advproxy url filter'}."
"; print $Lang::tr{'advproxy enabled'}."
"; -print "+ ".int(sqrt($count) * 6); +print "+ ".int(($count**(1/3)) * 6); print ""; print "".$Lang::tr{'advproxy update accelerator'}."
"; print $Lang::tr{'advproxy enabled'}."
"; -print "+ ".int(sqrt($count) * 6); +print "+ ".int(($count**(1/3)) * 5); print ""; print < @@ -1324,7 +1324,7 @@ END # ------------------------------------------------------------------- -print < @@ -1513,7 +1513,7 @@ print <     - +
@@ -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 4096 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"; From 22b270adb429d20d194678cffcfa08c9ca536bf0 Mon Sep 17 00:00:00 2001 From: Maniacikarus Date: Sun, 7 Dec 2008 14:11:55 +0100 Subject: [PATCH 05/14] Upgraded fuse to current stable --- config/rootfiles/common/fuse | 2 +- lfs/fuse | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/common/fuse b/config/rootfiles/common/fuse index fde457c72..153d40833 100644 --- a/config/rootfiles/common/fuse +++ b/config/rootfiles/common/fuse @@ -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 diff --git a/lfs/fuse b/lfs/fuse index b7cbd7c04..9669b24bc 100644 --- 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) From ac3e3c54d7bae0e357e7ee70d12b0ab469c7cb9c Mon Sep 17 00:00:00 2001 From: Maniacikarus Date: Sun, 7 Dec 2008 14:12:28 +0100 Subject: [PATCH 06/14] Upgraded ntfs-3g to current stable --- config/rootfiles/common/ntfs-3g | 4 ++-- lfs/ntfs-3g | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/ntfs-3g b/config/rootfiles/common/ntfs-3g index 8b4448a72..db6a4ff05 100644 --- a/config/rootfiles/common/ntfs-3g +++ b/config/rootfiles/common/ntfs-3g @@ -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/lfs/ntfs-3g b/lfs/ntfs-3g index 8c1d67eb6..b09b03859 100644 --- a/lfs/ntfs-3g +++ b/lfs/ntfs-3g @@ -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) From 18163ef231a0e78d604c178b789e1fedde636771 Mon Sep 17 00:00:00 2001 From: Maniacikarus Date: Sun, 7 Dec 2008 14:13:04 +0100 Subject: [PATCH 07/14] Added sshfs to supported fuse filesystems --- config/rootfiles/common/sshfs | 2 + lfs/sshfs | 80 +++++++++++++++++++++++++++++++++++ make.sh | 3 +- 3 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 config/rootfiles/common/sshfs create mode 100644 lfs/sshfs diff --git a/config/rootfiles/common/sshfs b/config/rootfiles/common/sshfs new file mode 100644 index 000000000..2cafa3e24 --- /dev/null +++ b/config/rootfiles/common/sshfs @@ -0,0 +1,2 @@ +usr/bin/sshfs +#usr/share/man/man1/sshfs.1 diff --git a/lfs/sshfs b/lfs/sshfs new file mode 100644 index 000000000..3b5417634 --- /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 . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.2 + +THISAPP = sshfs-fuse-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 26e9206eb5169e87e6f95f54bc005a4f + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 2c5a11150..60eaf87bb 100755 --- a/make.sh +++ b/make.sh @@ -584,6 +584,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 +669,7 @@ buildpackages() { fi # Create updater package - ipfiremake updater + #ipfiremake updater mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1 ipfirepackages From d1cc2e3fd1b459ed42495a54c027e95705fc6169 Mon Sep 17 00:00:00 2001 From: Maniacikarus Date: Sun, 7 Dec 2008 14:13:25 +0100 Subject: [PATCH 08/14] Integrated recent changes to core24 --- config/rootfiles/core/24/files | 19 +++++++++++++++++++ doc/packages-list.txt | 7 ++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/core/24/files b/config/rootfiles/core/24/files index b2a3b13e5..2c0eb3729 100644 --- a/config/rootfiles/core/24/files +++ b/config/rootfiles/core/24/files @@ -1 +1,20 @@ 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 diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 69c9d179d..8aa45d3f5 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -102,7 +102,7 @@ * 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 @@ -217,7 +217,7 @@ * 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 @@ -270,7 +270,8 @@ * 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 From 832eec2359d04a3f51d78cda8577d713a6ff4bc9 Mon Sep 17 00:00:00 2001 From: Maniacikarus Date: Sun, 7 Dec 2008 18:49:27 +0100 Subject: [PATCH 09/14] Change system behaviour to less swapping --- config/etc/sysctl.conf | 1 + config/rootfiles/core/24/files | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf index bcf90e86f..f88ec5f7a 100644 --- a/config/etc/sysctl.conf +++ b/config/etc/sysctl.conf @@ -22,3 +22,4 @@ net.ipv4.conf.all.accept_source_route = 0 net.ipv4.conf.all.log_martians = 1 kernel.printk = 1 4 1 7 +vm.swappiness=0 diff --git a/config/rootfiles/core/24/files b/config/rootfiles/core/24/files index 2c0eb3729..827898d9d 100644 --- a/config/rootfiles/core/24/files +++ b/config/rootfiles/core/24/files @@ -18,3 +18,7 @@ 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 From fcd6dd6c4c814e495aafaae0b25c9eaa8a849331 Mon Sep 17 00:00:00 2001 From: Maniacikarus Date: Sun, 7 Dec 2008 18:53:19 +0100 Subject: [PATCH 10/14] Added fetchmail pak routines to backup before upgrading --- src/paks/fetchmail/install.sh | 27 +++++++++++++++++++++++++++ src/paks/fetchmail/uninstall.sh | 27 +++++++++++++++++++++++++++ src/paks/fetchmail/update.sh | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 src/paks/fetchmail/install.sh create mode 100644 src/paks/fetchmail/uninstall.sh create mode 100644 src/paks/fetchmail/update.sh diff --git a/src/paks/fetchmail/install.sh b/src/paks/fetchmail/install.sh new file mode 100644 index 000000000..31c5fecae --- /dev/null +++ b/src/paks/fetchmail/install.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} +start_service --background ${NAME} diff --git a/src/paks/fetchmail/uninstall.sh b/src/paks/fetchmail/uninstall.sh new file mode 100644 index 000000000..a7b8a5370 --- /dev/null +++ b/src/paks/fetchmail/uninstall.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +make_backup ${NAME} +remove_files diff --git a/src/paks/fetchmail/update.sh b/src/paks/fetchmail/update.sh new file mode 100644 index 000000000..cb88e3478 --- /dev/null +++ b/src/paks/fetchmail/update.sh @@ -0,0 +1,32 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2008 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +#Create a backupinclude if it not exist +if [ ! -e "/var/ipfire/backup/addons/includes/fetchmail" ]; then + echo "/root/.fetchmailrc" > /var/ipfire/backup/addons/includes/fetchmail +fi + +./uninstall.sh +./install.sh From 3e460753abe3d593d7ae623072875053a5afa06e Mon Sep 17 00:00:00 2001 From: Maniacikarus Date: Sun, 7 Dec 2008 20:02:42 +0100 Subject: [PATCH 11/14] Fixed amount of local connections be reusing mpd-mpc connections --- config/mpfire/perl/Audio/MPD.pm | 8 ++++---- lfs/mpfire | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/mpfire/perl/Audio/MPD.pm b/config/mpfire/perl/Audio/MPD.pm index e1c00db44..0bfbc485e 100644 --- a/config/mpfire/perl/Audio/MPD.pm +++ b/config/mpfire/perl/Audio/MPD.pm @@ -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; diff --git a/lfs/mpfire b/lfs/mpfire index 171f04ae6..c61c77fab 100644 --- a/lfs/mpfire +++ b/lfs/mpfire @@ -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" From df07848550ee64bbbf04b5d8354a215150ef1749 Mon Sep 17 00:00:00 2001 From: Maniacikarus Date: Sun, 7 Dec 2008 20:03:16 +0100 Subject: [PATCH 12/14] Upgraded wireless stack to current stables --- doc/packages-list.txt | 6 +++--- lfs/hostapd | 6 +++--- lfs/madwifi | 4 ++-- lfs/wpa_supplicant | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 8aa45d3f5..12546dd1c 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -123,7 +123,7 @@ * 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 @@ -185,7 +185,7 @@ * 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 @@ -309,7 +309,7 @@ * 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 diff --git a/lfs/hostapd b/lfs/hostapd index 4b930b97c..59b0f8ca2 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -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 = 7 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ed669d96346dfc7d9f9fad079731853f +$(DL_FILE)_MD5 = d99d3566d5f15dfd24df37fcb2ee80ee install : $(TARGET) diff --git a/lfs/madwifi b/lfs/madwifi index 25cdffc80..086454b90 100644 --- a/lfs/madwifi +++ b/lfs/madwifi @@ -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) diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant index 1ba5e29d6..80225ef9a 100644 --- a/lfs/wpa_supplicant +++ b/lfs/wpa_supplicant @@ -24,7 +24,7 @@ include Config -VER = 0.5.10 +VER = 0.5.11 THISAPP = wpa_supplicant-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = wpa_supplicant -PAK_VER = 1 +PAK_VER = 2 ############################################################################### # Top-level Rules @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9e7b99da67c47d81121368c6d580d069 +$(DL_FILE)_MD5 = ad320af63f735531878e592f1ffd9b06 install : $(TARGET) From dfdcd345753f18050a6b88367d3efec05c0e9c92 Mon Sep 17 00:00:00 2001 From: Maniacikarus Date: Sun, 7 Dec 2008 20:47:39 +0100 Subject: [PATCH 13/14] Fixed hostap backup routine --- config/backup/includes/hostapd | 2 ++ src/paks/hostapd/update.sh | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/backup/includes/hostapd b/config/backup/includes/hostapd index e63e5d8c3..ea326f249 100644 --- a/config/backup/includes/hostapd +++ b/config/backup/includes/hostapd @@ -1,3 +1,5 @@ /etc/hostapd.conf +/etc/hostapd.accept +/etc/hostapd.deny /var/ipfire/wlanap/settings /var/ipfire/wlanap/hostapd.conf diff --git a/src/paks/hostapd/update.sh b/src/paks/hostapd/update.sh index 89c40d0d7..108cfa1f3 100644 --- a/src/paks/hostapd/update.sh +++ b/src/paks/hostapd/update.sh @@ -17,10 +17,12 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007 IPFire-Team . # +# Copyright (C) 2008 IPFire-Team . # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +echo "/etc/hostapd.accept" >> /var/ipfire/backup/addons/includes/hostapd +echo "/etc/hostapd.deny" >> /var/ipfire/backup/addons/includes/hostapd ./uninstall.sh ./install.sh From 8aa49c1548d9661a86f3e9cced694f0ccbdf6d11 Mon Sep 17 00:00:00 2001 From: Maniacikarus Date: Mon, 8 Dec 2008 20:58:31 +0100 Subject: [PATCH 14/14] Fixed hostapd bug --- config/backup/includes/hostapd | 3 +- html/cgi-bin/wlanap.cgi | 66 ++++++++----------------- lfs/hostapd | 2 +- src/initscripts/init.d/hostapd | 90 +++++++++++++++++++--------------- src/paks/hostapd/update.sh | 2 - 5 files changed, 73 insertions(+), 90 deletions(-) diff --git a/config/backup/includes/hostapd b/config/backup/includes/hostapd index ea326f249..0e9b9fb7d 100644 --- a/config/backup/includes/hostapd +++ b/config/backup/includes/hostapd @@ -1,5 +1,4 @@ /etc/hostapd.conf -/etc/hostapd.accept -/etc/hostapd.deny +/var/ipfire/wlanap/macfile /var/ipfire/wlanap/settings /var/ipfire/wlanap/hostapd.conf diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index 7a9c6fe06..3a57e160f 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -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{'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'}; + $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/ ){ - - - - - - - -
Mac Filter:  -
Mac Accept List (one per line)Mac Deny List (one per line)
END ; @@ -440,25 +426,13 @@ wpa_pairwise=CCMP TKIP END ; } - print CONFIGFILE </var/ipfire/wlanap/hostapd.accept"); +$wlanapsettings{'MACS'} =~ s/\r//gi; +chomp($wlanapsettings{'MACS'}); + open (MACFILE, ">/var/ipfire/wlanap/macfile"); print MACFILE </var/ipfire/wlanap/hostapd.deny"); - print MACFILE < /dev/null - fi - - /usr/bin/wlanconfig $INTERFACE destroy > /dev/null - /usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode ap > /dev/null - - # Set other cards to master mode - #/usr/sbin/iwconfig blue0 mode master fi - + + /usr/bin/wlanconfig $INTERFACE destroy > /dev/null + /usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode ap > /dev/null + + # Set other cards to master mode + #/usr/sbin/iwconfig blue0 mode master + fi + if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then - boot_mesg "Error! Can't set wlan master mode" - echo_failure; - exit 1; + boot_mesg "Error! Can't set wlan master mode" + echo_failure; + exit 1; else - # enable wlan module of collectd - sed -i -e "s|#LoadPlugin wireless|LoadPlugin wireless|g" /etc/collectd.conf + # enable wlan module of collectd + sed -i -e "s|#LoadPlugin wireless|LoadPlugin wireless|g" /etc/collectd.conf - boot_mesg "Starting hostapd... " - /usr/sbin/iwconfig $INTERFACE channel $CHANNEL - /usr/sbin/iwconfig $INTERFACE txpower $TXPOWER - /usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf /dev/tty12 2>&1 & - evaluate_retval + boot_mesg "Starting hostapd... " + /usr/sbin/iwconfig $INTERFACE channel $CHANNEL + /usr/sbin/iwconfig $INTERFACE txpower $TXPOWER + /usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf /dev/tty12 2>&1 & + evaluate_retval fi -;; - stop) + iwpriv $INTERFACE maccmd 3 + if [ $MACMODE != 0 ]; then + FILE="/var/ipfire/wlanap/macfile" + exec < $FILE + while read LINE + do + iwpriv $INTERFACE addmac $LINE + done + + iwpriv $INTERFACE maccmd $MACMODE + fi + ;; + + stop) boot_mesg "Stopping hostapd..." - killproc /usr/bin/hostapd - evaluate_retval - ;; + killproc /usr/bin/hostapd + evaluate_retval + ;; - restart) - ${0} stop - sleep 1 - ${0} start - ;; + restart) + ${0} stop + sleep 1 + ${0} start + ;; - status) - statusproc /usr/bin/hostapd - ;; + status) + statusproc /usr/bin/hostapd + ;; - *) - echo "Usage: ${0} {start|stop|restart|status}" - exit 1 - ;; + *) + echo "Usage: ${0} {start|stop|restart|status}" + exit 1 + ;; esac diff --git a/src/paks/hostapd/update.sh b/src/paks/hostapd/update.sh index 108cfa1f3..f81b04116 100644 --- a/src/paks/hostapd/update.sh +++ b/src/paks/hostapd/update.sh @@ -22,7 +22,5 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh -echo "/etc/hostapd.accept" >> /var/ipfire/backup/addons/includes/hostapd -echo "/etc/hostapd.deny" >> /var/ipfire/backup/addons/includes/hostapd ./uninstall.sh ./install.sh