[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 524dae818f1495c7e17bf89f3ebcb7773678ceec

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 524dae818f1495c7e17bf89f3ebcb7773678ceec

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 4407 bytes --]

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, next has been updated
       via  524dae818f1495c7e17bf89f3ebcb7773678ceec (commit)
       via  01a3c346dd33fb64ebd969662e80dda2d822a209 (commit)
       via  f9e4f4dcdfb3eef752d44e8c578c6658624f47f2 (commit)
      from  492b0b7c18face3ad3ad50ad554bd527fd4ef745 (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 524dae818f1495c7e17bf89f3ebcb7773678ceec
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Nov 8 16:46:11 2018 +0000

    update accelerator: Do not attempt to cache IPFire updates any more
    
    We do not deliver anything via HTTP or FTP any more and therefore
    nothing can be cached any more.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 01a3c346dd33fb64ebd969662e80dda2d822a209
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Nov 8 16:45:30 2018 +0000

    update accelerator: Cache .msp files for Adobe
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit f9e4f4dcdfb3eef752d44e8c578c6658624f47f2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Nov 8 16:42:37 2018 +0000

    Update list of contributors
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/125/filelists/files |  1 +
 config/updxlrator/updxlrator              | 13 ++-----------
 html/cgi-bin/credits.cgi                  |  4 +++-
 3 files changed, 6 insertions(+), 12 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/125/filelists/files b/config/rootfiles/core/125/filelists/files
index 889365e1d..2ab27e55e 100644
--- a/config/rootfiles/core/125/filelists/files
+++ b/config/rootfiles/core/125/filelists/files
@@ -10,6 +10,7 @@ srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/media.cgi
 srv/web/ipfire/cgi-bin/pakfire.cgi
 usr/sbin/firewall-policy
+usr/sbin/updxlrator
 usr/local/bin/backupiso
 usr/local/bin/makegraphs
 var/ipfire/backup/bin/backup.pl
diff --git a/config/updxlrator/updxlrator b/config/updxlrator/updxlrator
index ff23b3a95..cdc7eeb50 100644
--- a/config/updxlrator/updxlrator
+++ b/config/updxlrator/updxlrator
@@ -97,8 +97,8 @@ while (<>) {
 
 
 	if (
-	    ($source_url =~ m@^http://(ar)?download\.adobe\.com/.*\.(exe|msi|bin|dmg|idx|gz)$@i) ||
-	    ($source_url =~ m@^http://swupdl\.adobe\.com/updates/.*\.(exe|msi|bin|dmg|idx|gz|[a-z][a-z]_[A-Z][A-Z])$@i) ||
+	    ($source_url =~ m@^http://(ar)?download\.adobe\.com/.*\.(exe|ms[ip]|bin|dmg|idx|gz)$@i) ||
+	    ($source_url =~ m@^http://swupdl\.adobe\.com/updates/.*\.(exe|ms[ip]|bin|dmg|idx|gz|[a-z][a-z]_[A-Z][A-Z])$@i) ||
 	    ($source_url =~ m@^http://swupmf\.adobe\.com/manifest/.*\.upd$@i)
 	   )
 	{
@@ -193,15 +193,6 @@ while (<>) {
 		$xlrator_url = &check_cache($source_url,$hostaddr,$username,"Avira",$mirror);
 	}
 
-	# -----------------------------------------------------------
-	# Section: IPFire Downloads
-	# -----------------------------------------------------------
-
-	if ($source_url =~ m@^[f|h]t?tp://.*\.(ipfire)$@i)
-	{
-		$xlrator_url = &check_cache($source_url,$hostaddr,$username,"IPFire",$mirror);
-	}
-
 	# -----------------------------------------------------------
 	# Section: AVG Downloads
 	# -----------------------------------------------------------
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 2b5d73f1d..1b231121e 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -69,8 +69,8 @@ Stefan Schantl,
 Jan Paul Tuecking,
 Jonatan Schlag,
 Erik Kapfer,
-Dirk Wagner,
 Peter Müller,
+Dirk Wagner,
 Marcel Lorenz,
 Alf Høgemark,
 Ben Schweikert,
@@ -128,7 +128,9 @@ Paul T. Simmons,
 Robert Möker,
 Stefan Ernst,
 Stefan Ferstl,
+Stéphane,
 Thomas Ebert,
+Tim FitzGeorge,
 Timmothy Wilson,
 Umberto Parma
 	<!-- END -->


hooks/post-receive
--
IPFire 2.x development tree