Version in base suite: 2.10.65+deb10u2 Version in overlay suite: 2.10.65+deb10u3 Base version: debian-edu-config_2.10.65+deb10u3 Target version: debian-edu-config_2.10.65+deb10u4 Base file: /srv/ftp-master.debian.org/ftp/pool/main/d/debian-edu-config/debian-edu-config_2.10.65+deb10u3.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/d/debian-edu-config/debian-edu-config_2.10.65+deb10u4.dsc debian/changelog | 7 +++++++ share/debian-edu-config/tools/update-proxy-from-wpad | 2 +- share/debian-edu-config/tools/wpad-extract | 9 +++++++-- testsuite/webcache | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff -Nru debian-edu-config-2.10.65+deb10u3/debian/changelog debian-edu-config-2.10.65+deb10u4/debian/changelog --- debian-edu-config-2.10.65+deb10u3/debian/changelog 2019-12-16 15:29:19.000000000 +0000 +++ debian-edu-config-2.10.65+deb10u4/debian/changelog 2020-01-30 16:23:38.000000000 +0000 @@ -1,3 +1,10 @@ +debian-edu-config (2.10.65+deb10u4) buster; urgency=medium + + [ Dominik George ] + * Keep proxy settings on client if wpad is unreachable (Closes: #941001). + + -- Mike Gabriel Thu, 30 Jan 2020 17:23:38 +0100 + debian-edu-config (2.10.65+deb10u3) buster-security; urgency=high * Security fix for CVE-2019-3467 diff -Nru debian-edu-config-2.10.65+deb10u3/share/debian-edu-config/tools/update-proxy-from-wpad debian-edu-config-2.10.65+deb10u4/share/debian-edu-config/tools/update-proxy-from-wpad --- debian-edu-config-2.10.65+deb10u3/share/debian-edu-config/tools/update-proxy-from-wpad 2018-06-12 12:24:05.000000000 +0000 +++ debian-edu-config-2.10.65+deb10u4/share/debian-edu-config/tools/update-proxy-from-wpad 2020-01-30 16:23:38.000000000 +0000 @@ -83,7 +83,7 @@ # proxy. http_proxy= -eval `/usr/share/debian-edu-config/tools/wpad-extract` +. /usr/share/debian-edu-config/tools/wpad-extract >/dev/null || exit 1 ftp_proxy=$http_proxy https_proxy=$http_proxy diff -Nru debian-edu-config-2.10.65+deb10u3/share/debian-edu-config/tools/wpad-extract debian-edu-config-2.10.65+deb10u4/share/debian-edu-config/tools/wpad-extract --- debian-edu-config-2.10.65+deb10u3/share/debian-edu-config/tools/wpad-extract 2018-11-13 11:00:55.000000000 +0000 +++ debian-edu-config-2.10.65+deb10u4/share/debian-edu-config/tools/wpad-extract 2020-01-30 16:23:38.000000000 +0000 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # Detect proxy URL via WPAD # @@ -11,5 +11,10 @@ # DNS if the skolelinux machines are not connected to the Internet. proxy_url=$(curl -s http://wpad/wpad.dat | pactester -p - \ -u http://130.89.148.14 | awk '{print $2}' | cut -d';' -f1) -echo http_proxy=http://$proxy_url +if [ "$proxy_url" ]; then + http_proxy=http://$proxy_url + echo http_proxy=$http_proxy +else + return 1 +fi diff -Nru debian-edu-config-2.10.65+deb10u3/testsuite/webcache debian-edu-config-2.10.65+deb10u4/testsuite/webcache --- debian-edu-config-2.10.65+deb10u3/testsuite/webcache 2019-02-23 16:12:47.000000000 +0000 +++ debian-edu-config-2.10.65+deb10u4/testsuite/webcache 2020-01-30 16:23:38.000000000 +0000 @@ -69,7 +69,7 @@ # Subshell to avoid leaking http_proxy and ftp_proxy variables to # the rest of this script ( - eval `/usr/share/debian-edu-config/tools/wpad-extract` + . /usr/share/debian-edu-config/tools/wpad-extract >/dev/null if [ "$http_proxy" ] ; then echo "success: $0: WPAD file '$url' includes HTTP proxy info." else