Merge remote-tracking branch 'mvo/feature/expected-size' into debian/experimental

diff --combined apt-pkg/acquire-method.cc
index 8533e319fceb8f10600b3358b5cf6c1afdf43f50,c78e95e58959fdfeed64ad25c45c45ea90652ae9..cfa93e95c01c474534a6f02515d7300f907563a7
--- 1/apt-pkg/acquire-method.cc
--- 2/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@@ -127,7 -127,7 +127,7 @@@ void pkgAcqMethod::Fail(string Err,boo
  /* */
  void pkgAcqMethod::DropPrivsOrDie()
  {
 -   if (!DropPrivs()) {
 +   if (!DropPrivileges()) {
        Fail(false);
        exit(112);      /* call the european emergency number */
     }
@@@ -375,6 -375,8 +375,8 @@@ int pkgAcqMethod::Run(bool Single
               if (hash.empty() == false)
                  Tmp->ExpectedHashes.push_back(HashString(*t, hash));
            }
+             char *End;
+             Tmp->MaximumSize = strtoll(LookupTag(Message, "Maximum-Size", "0").c_str(), &End, 10);
            Tmp->Next = 0;
            
            // Append it to the list