From mboxrd@z Thu Jan 1 00:00:00 1970
From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
eacf8dc4b7d028d7fd53707c9db84373a26b8a30
Date: Mon, 21 Jan 2019 22:26:10 +0000
Message-ID: <20190121222611.556E284FDD4@people01.i.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5010131340142342627=="
List-Id: <ipfire-scm.lists.ipfire.org>
--===============5010131340142342627==
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 eacf8dc4b7d028d7fd53707c9db84373a26b8a30 (commit)
via d38e7e256d43069e49c557e947d4b940aae8a566 (commit)
from f6326e4f777519e857d740cc525bb1ae3ea57ee3 (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 eacf8dc4b7d028d7fd53707c9db84373a26b8a30
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Jan 21 21:04:10 2019 +0000
core128: Ship updated xt_geoip_update script
=20
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d38e7e256d43069e49c557e947d4b940aae8a566
Author: Peter M=C3=BCller <peter.mueller(a)link38.eu>
Date: Mon Jan 21 21:40:50 2019 +0100
use HTTPS for downloading GeoIP database files
=20
Signed-off-by: Peter M=C3=BCller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/128/filelists/files | 1 +
src/scripts/xt_geoip_update | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/128/filelists/files b/config/rootfiles/cor=
e/128/filelists/files
index ea80e29c8..0be9432b5 100644
--- a/config/rootfiles/core/128/filelists/files
+++ b/config/rootfiles/core/128/filelists/files
@@ -3,3 +3,4 @@ etc/issue
srv/web/ipfire/cgi-bin/credits.cgi
var/ipfire/langs
etc/sysctl.conf
+usr/local/bin/xt_geoip_update
diff --git a/src/scripts/xt_geoip_update b/src/scripts/xt_geoip_update
index b45c5b343..93884dcf5 100644
--- a/src/scripts/xt_geoip_update
+++ b/src/scripts/xt_geoip_update
@@ -26,7 +26,7 @@ SCRIPT_PATH=3D/usr/local/bin
DEST_PATH=3D/usr/share/xt_geoip
DB_PATH=3D/var/lib/GeoIP
=20
-DL_URL=3Dhttp://geolite.maxmind.com/download/geoip/database
+DL_URL=3Dhttps://geolite.maxmind.com/download/geoip/database
DL_FILE=3DGeoLite2-Country-CSV.zip
=20
eval $(/usr/local/bin/readhash /var/ipfire/proxy/settings)
@@ -40,7 +40,7 @@ function download() {
# Proxy settings.
# Check if a proxy should be used.
if [[ $UPSTREAM_PROXY ]]; then
- PROXYSETTINGS=3D"-e http_proxy=3Dhttp://"
+ PROXYSETTINGS=3D"-e https_proxy=3Dhttp://"
=20
# Check if authentication against the proxy is configured.
if [[ $UPSTREAM_USER && $UPSTREAM_PASSWORD ]]; then
hooks/post-receive
--
IPFire 2.x development tree
--===============5010131340142342627==--