From: Christian Schmidt <maniacikarus@ipfire.org>
Date: Wed, 19 Jan 2011 17:43:16 +0000 (+0100)
Subject: Fixed Avira Update Caching and improved Gentoo Caching.
X-Git-Tag: v2.9-core45~1^2~30
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=8dbba0e4607ad83d26849e87b09ef52a5ec3f70f;hp=73c7eff80ece6765c5c147514a3ce2153f7bf4c8

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 afefcadb05..f6d15ca787 100644
--- 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 40d08d4381..1197905cd3 100644
--- 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 7f44ff76df..4aaa38938c 100644
--- 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);
 	}