Hello,

I can only merge this into next right now. Core Update 127 is already closed, built and distributed on the mirrors.

Please *review* the patches that are being submitted on the list to spot these things earlier. This is why we are doing this process and this is not only supposed to be my public inbox.

Also, this patch doesn’t apply.

Best,
-Michael

> On 20 Jan 2019, at 16:40, Peter Müller <peter.mueller(a)link38.eu> wrote:
> 
> Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
> ---
> src/scripts/xt_geoip_update | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> 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=/usr/local/bin
> DEST_PATH=/usr/share/xt_geoip
> DB_PATH=/var/lib/GeoIP
> 
> -DL_URL=http://geolite.maxmind.com/download/geoip/database
> +DL_URL=https://geolite.maxmind.com/download/geoip/database
> DL_FILE=GeoLite2-Country-CSV.zip
> 
> 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="-e http_proxy=http://"
> +		PROXYSETTINGS="-e https_proxy=http://"
> 
> 		# Check if authentication against the proxy is configured.
> 		if [[ $UPSTREAM_USER && $UPSTREAM_PASSWORD ]]; then
> -- 
> 2.16.4