This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via 8dbba0e4607ad83d26849e87b09ef52a5ec3f70f (commit) from 73c7eff80ece6765c5c147514a3ce2153f7bf4c8 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 8dbba0e4607ad83d26849e87b09ef52a5ec3f70f Author: Christian Schmidt maniacikarus@ipfire.org Date: Wed Jan 19 18:43:16 2011 +0100
Fixed Avira Update Caching and improved Gentoo Caching.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/45/filelists/files | 1 + config/rootfiles/core/45/update.sh | 4 ++++ config/updxlrator/updxlrator | 11 +++++++++-- 3 files changed, 14 insertions(+), 2 deletions(-)
Difference in files: diff --git a/config/rootfiles/core/45/filelists/files b/config/rootfiles/core/45/filelists/files index afefcad..f6d15ca 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 40d08d4..1197905 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 7f44ff7..4aaa389 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%5B0-9%5D%5C.avgate%5C.net/.*%5C.(htm%7Chtml%7Cgz)$@i) + if ( + ($source_url =~ m@^http://dl%5B0-9%5D%5C.avgate%5C.net/.*%5C.(htm%7Chtml%7Cgz)$@i) || + ($source_url =~ m@^http://80.190.130.19%5B4-5%5D/update/.*%5C.(htm%7Chtml%7Cgz)$@i) || + ($source_url =~ m@^http://62.146.64.14%5B6-7%5D/update/.*%5C.(htm%7Chtml%7Cgz)$@i) + ) { $xlrator_url = &check_cache($source_url,$hostaddr,$username,"Avira",$mirror); }
hooks/post-receive -- IPFire 2.x development tree