Fixed Avira Update Caching and improved Gentoo Caching.

diff --git a/config/rootfiles/core/45/filelists/files b/config/rootfiles/core/45/filelists/files
index afefcadb0516e8ec9c672c9f5b34b6e949a28483..f6d15ca787a8518bfb95c0cc1181f32b299d80c4 100644 (file)
--- a/config/rootfiles/core/45/filelists/files
+++ b/config/rootfiles/core/45/filelists/files
@@ -5,3 +5,4 @@ srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/pppsetup.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
+usr/sbin/updxlrator

diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh
index 40d08d4381853b09e813c5734780ac0212754715..1197905cd362845ff3b318e7d883e0a3999e754b 100644 (file)
--- a/config/rootfiles/core/45/update.sh
+++ b/config/rootfiles/core/45/update.sh
@@ -26,6 +26,8 @@
 
 #
 #Stop services
+echo Stopping Proxy
+/etc/init.d/squid stop 2>/dev/null
 
 #
 #Extract files
@@ -33,6 +35,8 @@ extract_files
 
 #
 #Start services
+echo Starting Proxy
+/etc/init.d/squid start 2>/dev/null
 
 #
 #Update Language cache

diff --git a/config/updxlrator/updxlrator b/config/updxlrator/updxlrator
index 7f44ff76df2d2a5f226cf92a232734c67260e265..4aaa38938c5473a40ce481822e9c46229a1c3cd7 100644 (file)
--- a/config/updxlrator/updxlrator
+++ b/config/updxlrator/updxlrator
@@ -101,7 +101,10 @@ while (<>) {
        #  Section: Linux Downloads
        # -----------------------------------------------------------
 
-       if ($source_url =~ m@^[h|f]t?tp://[^?]+\.(deb|rpm)$@i)
+       if (
+               ($source_url =~ m@^[h|f]t?tp://[^?]+\.(deb|rpm)$@i) ||
+               ($source_url =~ m@^[h|f]t?tp://[^?]+/distfiles/[^?]+\.(tar\.gz|tar\.bz2|tgz|zip|patch\.bz2|gz|docx|patch|pdf|exe)$@i)
+       )
        {
                $xlrator_url = &check_cache($source_url,$hostaddr,$username,"Linux",$mirror);
        }
@@ -157,7 +160,11 @@ while (<>) {
        # Section: Avira Downloads
        # -----------------------------------------------------------
 
-       if ($source_url =~ m@^http://dl[0-9]\.avgate\.net/.*\.(htm|html|gz)$@i)
+       if (
+               ($source_url =~ m@^http://dl[0-9]\.avgate\.net/.*\.(htm|html|gz)$@i) ||
+               ($source_url =~ m@^http://80.190.130.19[4-5]/update/.*\.(htm|html|gz)$@i) ||
+               ($source_url =~ m@^http://62.146.64.14[6-7]/update/.*\.(htm|html|gz)$@i)
+       )
        {
                $xlrator_url = &check_cache($source_url,$hostaddr,$username,"Avira",$mirror);
        }