[debian-edu-commits] debian-edu/ 02/02: Fix automatic proxy configuration.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-config.

commit 04de6f7d9004446df054612f713bb5eb0c6da94c
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Sep 21 00:11:52 2014 +0200

    Fix automatic proxy configuration.
    
     * Add dependency on libproxy1-plugin-networkmanager,
       libproxy1-plugin-mozjs and libproxy1-plugin-kconfig to improve how
       libproxy behaves.  Restructure dependency list to make future
       changes easier to spot in the diff.
     * Add hack to  wpad-extract using KDE kioslaverc settings as global settings
       to be able to extract proxy setup from http://wpad/wpad.dat.
---
 debian/changelog                           |  6 +++++
 debian/control                             | 38 +++++++++++++++++++++++++++++-
 share/debian-edu-config/tools/wpad-extract |  8 +++++--
 3 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3367e5d..85eb861 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,12 @@ debian-edu-config (1.803) UNRELEASED; urgency=high
   [ Petter Reinholdtsen ]
   * Adjust debian-edu-pxeinstall to sort the preseeding values, to get
     predictable ordering and avoid bogus changes reported by etckeeper.
+  * Add dependency on libproxy1-plugin-networkmanager,
+    libproxy1-plugin-mozjs and libproxy1-plugin-kconfig to improve how
+    libproxy behaves.  Restructure dependency list to make future
+    changes easier to spot in the diff.
+  * Add hack to  wpad-extract using KDE kioslaverc settings as global settings
+    to be able to extract proxy setup from http://wpad/wpad.dat.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 18 Sep 2014 11:29:19 +0200
 
diff --git a/debian/control b/debian/control
index 08f2459..37b287e 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,43 @@ Vcs-Git: git://anonscm.debian.org/debian-edu/debian-edu-config.git
 Package: debian-edu-config
 Architecture: all
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, debconf-utils, cfengine2, libconfig-inifiles-perl, mime-support, libnet-ldap-perl, ng-utils, host, desktop-profiles, lsb-base, lsb-release, ssl-cert, openssl, libfilesys-df-perl, libtext-unaccent-perl, libhtml-fromtext-perl, libio-socket-ssl-perl, discover, tftp | tftp-hpa, debian-edu-artwork, education-tasks (>= 0.853), net-tools, patch, base-files (>= 5.3), python, python-notify, libterm-readkey-perl, fping, ldap-utils, libnet-netmask-perl, smbldap-tools (>= 0 [...]
+Depends: ${misc:Depends}
+ , debconf-utils
+ , cfengine2
+ , libconfig-inifiles-perl
+ , mime-support
+ , libnet-ldap-perl
+ , ng-utils
+ , host
+ , desktop-profiles
+ , lsb-base
+ , lsb-release
+ , ssl-cert
+ , openssl
+ , libfilesys-df-perl
+ , libtext-unaccent-perl
+ , libhtml-fromtext-perl
+ , libio-socket-ssl-perl
+ , discover
+ , tftp | tftp-hpa
+ , debian-edu-artwork
+ , education-tasks (>= 0.853)
+ , net-tools
+ , patch
+ , base-files (>= 5.3)
+ , python
+ , python-notify
+ , libterm-readkey-perl
+ , fping
+ , ldap-utils
+ , libnet-netmask-perl
+ , smbldap-tools (>= 0.9.7-1)
+ , lockfile-progs
+ , libproxy-tools
+ , libproxy1-plugin-networkmanager
+ , libproxy1-plugin-mozjs
+ , libproxy1-plugin-kconfig
+ , uuid
 Recommends: resolvconf, ddccontrol | xresprobe, syslinux, memtest86+, libnotify-bin, lsof, binutils
 Suggests: atftpd | tftpd-hpa
 Breaks: nslcd (<< 0.7.7), dhcp3-client (<< 4.1.1-P1-9), dhcp3-server (<< 4.1.1-P1-9), slapd (<< 2.4.23-5), debian-edu-install (<< 1.521~svn74617)
diff --git a/share/debian-edu-config/tools/wpad-extract b/share/debian-edu-config/tools/wpad-extract
index 6cc1973..f7c23b8 100755
--- a/share/debian-edu-config/tools/wpad-extract
+++ b/share/debian-edu-config/tools/wpad-extract
@@ -11,7 +11,12 @@
 # script. This version uses libproxy-tools to retrieve the
 # proxy URL and thus is much shorter then its predecessor.
 
-proxy_url=$(echo http://www.debian.org | proxy 2>/dev/null | cut -d" " -f1)
+# Trick the KDE4 config backend to use the settings there to load the
+# WPAD setting.  See also bug #644373.
+
+proxy_url=$(KDE_FULL_SESSION=foo \
+   KDEDIRS=/usr/share/debian-edu/networked-kde3 \
+   proxy http://www.debian.org 2>/dev/null | cut -d" " -f1)
 
 # make sure direct:// urls do not make it through to the system config
 case "$proxy_url" in
@@ -19,4 +24,3 @@ case "$proxy_url" in
 	echo http_proxy=$proxy_url
 	;;
 esac
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git