merged patches from david (many thanks)

diff --cc apt-pkg/init.h
index f892e7ff458a426b36dddea7a7c85cae6a712593,b1ed5922b0bfc1a74bd95642be9e5e0a3a6feb46..f0757f644c9d3bb83d772ff7306338fc27f2b2c9
--- 1/apt-pkg/init.h
--- 2/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@@ -21,9 -21,9 +21,7 @@@
  // reverse-dependencies of libapt-pkg against the new SONAME.
  // Non-ABI-Breaks should only increase RELEASE number.
  // See also buildlib/libversion.mak
--// FIXME: this needs to be changed to "4" (without quotes) on the next
--//        ABI break
- #define APT_PKG_MAJOR libc6.9-6-4
+ #define APT_PKG_MAJOR 4
  #define APT_PKG_MINOR 8
  #define APT_PKG_RELEASE 0
      

diff --cc methods/https.cc
index 86d7f3a6ba6542ed894292fbfc668789690f4949,ad21ef0d3ba62313f1e24f6bc99682470f329d48..5d8e63f47db3c2c265126ab4e3e119fc247b5df9
--- 1/methods/https.cc
--- 2/methods/https.cc
+++ b/methods/https.cc
@@@ -57,54 -57,38 +57,41 @@@ HttpsMethod::progress_callback(void *cl
     return 0;
  }
  
- void HttpsMethod::SetupProxy()
 -void HttpsMethod::SetupProxy() {                                      /*{{{*/
 -      URI ServerName = Queue->Uri;
 -
 -      // Determine the proxy setting - try https first, fallback to http and use env at last
 -      string UseProxy = _config->Find("Acquire::https::Proxy::" + ServerName.Host,
 -                              _config->Find("Acquire::http::Proxy::" + ServerName.Host).c_str());
 -
 -      if (UseProxy.empty() == true)
 -              UseProxy = _config->Find("Acquire::https::Proxy", _config->Find("Acquire::http::Proxy").c_str());
 -
 -      // User want to use NO proxy, so nothing to setup
 -      if (UseProxy == "DIRECT")
 -              return;
 -
 -      if (UseProxy.empty() == false) {
 -              // Parse no_proxy, a comma (,) separated list of domains we don't want to use
 -              // a proxy for so we stop right here if it is in the list
 -              if (getenv("no_proxy") != 0 && CheckDomainList(ServerName.Host,getenv("no_proxy")) == true)
 -                      return;
 -      } else {
 -              const char* result = getenv("http_proxy");
 -              UseProxy = result == NULL ? "" : result;
 -      }
 -
 -      // Determine what host and port to use based on the proxy settings
 -      if (UseProxy.empty() == false) {
 -              Proxy = UseProxy;
 -              if (Proxy.Port != 1)
 -                      curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port);
 -              curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str());
 -      }
++void HttpsMethod::SetupProxy()                                        /*{{{*/
 +{
 +   URI ServerName = Queue->Uri;
 +
-    // Determine the proxy setting
-    string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host);
-    if (!SpecificProxy.empty())
-    {
-          if (SpecificProxy == "DIRECT")
-                  Proxy = "";
-          else
-                  Proxy = SpecificProxy;
-    }
-    else
-    {
-          string DefProxy = _config->Find("Acquire::http::Proxy");
-          if (!DefProxy.empty())
-          {
-                  Proxy = DefProxy;
-          }
-          else
-          {
-                  char* result = getenv("http_proxy");
-                  Proxy = result ? result : "";
-          }
-    }
-    
-    // Parse no_proxy, a , separated list of domains
-    if (getenv("no_proxy") != 0)
++   // Determine the proxy setting - try https first, fallback to http and use env at last
++   string UseProxy = _config->Find("Acquire::https::Proxy::" + ServerName.Host,
++                                 _config->Find("Acquire::http::Proxy::" + ServerName.Host).c_str());
++
++   if (UseProxy.empty() == true)
++      UseProxy = _config->Find("Acquire::https::Proxy", _config->Find("Acquire::http::Proxy").c_str());
++
++   // User want to use NO proxy, so nothing to setup
++   if (UseProxy == "DIRECT")
++      return;
++
++   if (UseProxy.empty() == false) 
 +   {
-       if (CheckDomainList(ServerName.Host,getenv("no_proxy")) == true)
-        Proxy = "";
++      // Parse no_proxy, a comma (,) separated list of domains we don't want to use
++      // a proxy for so we stop right here if it is in the list
++      if (getenv("no_proxy") != 0 && CheckDomainList(ServerName.Host,getenv("no_proxy")) == true)
++       return;
++   } else {
++      const char* result = getenv("http_proxy");
++      UseProxy = result == NULL ? "" : result;
 +   }
-    
++
 +   // Determine what host and port to use based on the proxy settings
-    string Host;   
-    if (Proxy.empty() == true || Proxy.Host.empty() == true)
-    {
-    }
-    else
++   if (UseProxy.empty() == false) 
 +   {
-       if (Proxy.Port != 0)
++      Proxy = UseProxy;
++      if (Proxy.Port != 1)
 +       curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port);
 +      curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str());
 +   }
- }
- 
- 
+ }                                                                     /*}}}*/
  // HttpsMethod::Fetch - Fetch an item                                 /*{{{*/
  // ---------------------------------------------------------------------
  /* This adds an item to the pipeline. We keep the pipeline at a fixed