From: Michael Tremer Date: Fri, 8 Mar 2013 15:37:08 +0000 (+0100) Subject: Merge remote-tracking branch 'jiweigert/updxlrtr_sources' into core68 X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=8999627f8abfc83172728c2e3d0f3cfbe1f1f1c4;hp=f4435fd9a53b3300ff540d81f881a3cca4709290 Merge remote-tracking branch 'jiweigert/updxlrtr_sources' into core68 --- diff --git a/config/updxlrator/updxlrator b/config/updxlrator/updxlrator index d72677cee..cdfce26d8 100644 --- a/config/updxlrator/updxlrator +++ b/config/updxlrator/updxlrator @@ -155,13 +155,29 @@ while (<>) { # Section: Avast Downloads # ----------------------------------------------------------- - if ($source_url =~ m@^http://download[\d]+\.avast\.com/.*\.(exe|vpu)$@i) + if ($source_url =~ m@^http://(ion|download)[\d]+\.avast\.com/.*\.(exe|vpu|vpx)$@i) { $xlrator_url = &check_cache($source_url,$hostaddr,$username,"Avast",$mirror); } + # ----------------------------------------------------------- + # Section: Mozilla Downloads + # ----------------------------------------------------------- + + if ($source_url=~ m@^http://.*\.mozilla\.net/.*\.((complete|partial)\.mar|exe)$@i) + { + $xlrator_url = &check_cache($source_url,$hostaddr,$username,"Mozilla",$unique); + } + + # ----------------------------------------------------------- + # Section: Mcafee # ----------------------------------------------------------- + if ($source_url =~ m@^http://update\.nai\.com/.*\.(mcs|z|gem|dat|zip)$@i) + { + $xlrator_url = &check_cache($source_url,$hostaddr,$username,"mcafee",$mirror); + } + # ----------------------------------------------------------- # Section: Avira Downloads # -----------------------------------------------------------