Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-download-file

Conflicts:
	cmdline/apt-helper.cc
	test/integration/framework
	test/integration/test-apt-https-no-redirect

diff --cc cmdline/apt-helper.cc
index 4a24b01d9dd085baa201461707f80863660355b3,c1c8b2178b3643da226ba8e547f2e76d51bcd728..e3652d1eeae7f97557f314a5246ff32f4f142e2f
--- 1/cmdline/apt-helper.cc
--- 2/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@@ -55,14 -52,6 +55,15 @@@ bool DoDownloadFile(CommandLine &CmdL
        _error->Error(_("Download Failed"));
        return false;
     }
- 
 +   if(hash.empty() == false)
++   {
 +      if(hash.VerifyFile(targetfile) == false)
 +      {
 +         _error->Error(_("HashSum Failed"));
 +         Rename(targetfile, targetfile+".failed");
 +         return false;
 +      }
++   }
     return true;
  }
  

diff --cc test/integration/test-apt-https-no-redirect
index 106d4bced9bea9029e278589b062f050d016e766,0408c68327165aeca92dc6ad4065995511fd6c6f..99419d1cc36714a045274fa0858621058bd06ace
--- 1/test/integration/test-apt-https-no-redirect
--- 2/test/integration/test-apt-https-no-redirect
+++ b/test/integration/test-apt-https-no-redirect
@@@ -12,27 -12,13 +12,14 @@@ setupaptarchive --no-updat
  
  changetohttpswebserver  -o 'aptwebserver::redirect::replace::/redirectme/=http://localhost:8080/'
  
 +DOWNLOG='download-testfile.log'
  msgtest 'normal http download works'
 -downloadfile 'http://localhost:8080/pool/apt_1.0/changelog' changelog2 >/dev/null 2>/dev/null && msgpass || msgfail
 +downloadfile 'http://localhost:8080/pool/apt_1.0/changelog' changelog2 > "$DOWNLOG" && msgpass || msgfail
  
  msgtest 'normal https download works'
 -downloadfile 'https://localhost:4433/pool/apt_1.0/changelog' changelog >/dev/null 2>/dev/null && msgpass || msgfail
 +downloadfile 'https://localhost:4433/pool/apt_1.0/changelog' changelog > "$DOWNLOG" && msgpass || msgfail
  
  msgtest 'redirecting https to http does not work'
- if ! downloadfile 'https://localhost:4433/redirectme/pool/apt_1.0/changelog' changelog3 > "$DOWNLOG"; then
-     msgpass
- else
-     cat >&2 "$DOWNLOG"
-     msgfail
- fi
-     
- msgtest 'https methods given proper error on redirect attempt'
- if grep -q 'Protocol http not supported or disabled in libcurl' "$DOWNLOG"; then
-     msgpass
- else
-     cat >&2 "$DOWNLOG"
-     msgfail
- fi
+ downloadfile 'https://localhost:4433/redirectme/pool/apt_1.0/changelog' changelog3 2>&1 | grep "Protocol http not supported or disabled in libcurl" > /dev/null && msgpass || msgfail