From c6ee61eab54edf6cc3fbe118d304d72a860e1451 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Tue, 2 Sep 2014 15:50:19 +0200
Subject: Make Proxy-Auto-Detect check for each host

When doing Acquire::http{,s}::Proxy-Auto-Detect, run the auto-detect
command for each host instead of only once. This should make using
"proxy" from libproxy-tools feasible which can then be used for PAC
style or other proxy configurations.

Closes: #759264
---
 methods/https.cc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'methods/https.cc')

diff --git a/methods/https.cc b/methods/https.cc
index e0348ab58..0499af0c5 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -20,6 +20,7 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/proxy.h>
 
 #include <sys/stat.h>
 #include <sys/time.h>
@@ -107,6 +108,9 @@ void HttpsMethod::SetupProxy()  					/*{{{*/
 {
    URI ServerName = Queue->Uri;
 
+   // Determine the proxy setting
+   AutoDetectProxy(ServerName);
+
    // Curl should never read proxy settings from the environment, as
    // we determine which proxy to use.  Do this for consistency among
    // methods and prevent an environment variable overriding a
-- 
cgit v1.2.3


From 3927c6da48c206b6b251661f44680d9883b4f6b4 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Wed, 24 Sep 2014 16:22:05 +0200
Subject: Drop Privileges to "Debian-apt" in most acquire methods

Add a new "Debian-apt" user that owns the /var/lib/apt/lists
and /var/cache/apt/archive directories. The methods
http, https, ftp, gpgv, gzip switch to this user when they
start.

Thanks to Julian and "ioerror" and tors "switch_id()" code.
---
 methods/https.cc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'methods/https.cc')

diff --git a/methods/https.cc b/methods/https.cc
index 0499af0c5..a40f37710 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -443,6 +443,8 @@ int main()
 {
    setlocale(LC_ALL, "");
 
+   DropPrivs();
+
    HttpsMethod Mth;
    curl_global_init(CURL_GLOBAL_SSL) ;
 
-- 
cgit v1.2.3


From 7b18d5592fd5e0bb173e193d1e6693a66065f971 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Wed, 24 Sep 2014 21:49:19 +0200
Subject: methods: Fail if we cannot drop privileges

---
 methods/https.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'methods/https.cc')

diff --git a/methods/https.cc b/methods/https.cc
index a40f37710..a74d2a38b 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -443,11 +443,11 @@ int main()
 {
    setlocale(LC_ALL, "");
 
-   DropPrivs();
-
    HttpsMethod Mth;
    curl_global_init(CURL_GLOBAL_SSL) ;
 
+   Mth.DropPrivsOrDie();
+
    return Mth.Run();
 }
 
-- 
cgit v1.2.3