From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 524dae818f1495c7e17bf89f3ebcb7773678ceec Date: Thu, 08 Nov 2018 16:47:35 +0000 Message-ID: <20181108164735.C84761081BB0@git01.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0196808282824658478==" List-Id: --===============0196808282824658478== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 Date: Thu Nov 8 16:46:11 2018 +0000 update accelerator: Do not attempt to cache IPFire updates any more =20 We do not deliver anything via HTTP or FTP any more and therefore nothing can be cached any more. =20 Signed-off-by: Michael Tremer commit 01a3c346dd33fb64ebd969662e80dda2d822a209 Author: Michael Tremer Date: Thu Nov 8 16:45:30 2018 +0000 update accelerator: Cache .msp files for Adobe =20 Signed-off-by: Michael Tremer commit f9e4f4dcdfb3eef752d44e8c578c6658624f47f2 Author: Michael Tremer Date: Thu Nov 8 16:42:37 2018 +0000 Update list of contributors =20 Signed-off-by: Michael Tremer ----------------------------------------------------------------------- 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/cor= e/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 (<>) { =20 =20 if ( - ($source_url =3D~ m@^http://(ar)?download\.adobe\.com/.*\.(exe|msi|bin|= dmg|idx|gz)$@i) || - ($source_url =3D~ m@^http://swupdl\.adobe\.com/updates/.*\.(exe|msi|bin= |dmg|idx|gz|[a-z][a-z]_[A-Z][A-Z])$@i) || + ($source_url =3D~ m@^http://(ar)?download\.adobe\.com/.*\.(exe|ms[ip]|b= in|dmg|idx|gz)$@i) || + ($source_url =3D~ m@^http://swupdl\.adobe\.com/updates/.*\.(exe|ms[ip]|= bin|dmg|idx|gz|[a-z][a-z]_[A-Z][A-Z])$@i) || ($source_url =3D~ m@^http://swupmf\.adobe\.com/manifest/.*\.upd$@i) ) { @@ -193,15 +193,6 @@ while (<>) { $xlrator_url =3D &check_cache($source_url,$hostaddr,$username,"Avira",$mir= ror); } =20 - # ----------------------------------------------------------- - # Section: IPFire Downloads - # ----------------------------------------------------------- - - if ($source_url =3D~ m@^[f|h]t?tp://.*\.(ipfire)$@i) - { - $xlrator_url =3D &check_cache($source_url,$hostaddr,$username,"IPFire",$mi= rror); - } - # ----------------------------------------------------------- # 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=C3=BCller, +Dirk Wagner, Marcel Lorenz, Alf H=C3=B8gemark, Ben Schweikert, @@ -128,7 +128,9 @@ Paul T. Simmons, Robert M=C3=B6ker, Stefan Ernst, Stefan Ferstl, +St=C3=A9phane, Thomas Ebert, +Tim FitzGeorge, Timmothy Wilson, Umberto Parma hooks/post-receive -- IPFire 2.x development tree --===============0196808282824658478==--