merged lp:~mvo/apt/hash-order

diff --combined apt-pkg/acquire-item.cc
index 665dd427ef68af3075ed58b899abcd2d1d851dee,a71886a8759dca2c4141e45f7d75c71347872be3..89ca6c670fbebb07c695ae68520d814d6c976c56
--- 1/apt-pkg/acquire-item.cc
--- 2/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@@ -1235,20 -1235,9 +1235,20 @@@ void pkgAcqMetaIndex::Done(string Messa
        }
        else
        {
 +         // FIXME: move this into pkgAcqMetaClearSig::Done on the next
 +         //        ABI break
 +
 +         // if we expect a ClearTextSignature (InRelase), ensure that
 +         // this is what we get and if not fail to queue a 
 +         // Release/Release.gpg, see #346386
 +         if (SigFile == DestFile && !StartsWithGPGClearTextSignature(DestFile))
 +         {
 +            Failed(Message, Cfg);
 +            return;
 +         }
 +
           // There was a signature file, so pass it to gpgv for
           // verification
 -
           if (_config->FindB("Debug::pkgAcquire::Auth", false))
              std::cerr << "Metaindex acquired, queueing gpg verification ("
                        << SigFile << "," << DestFile << ")\n";
@@@ -1741,7 -1730,7 +1741,7 @@@ bool pkgAcqArchive::QueueNext(
        {
         if(stringcasecmp(ForceHash, "sha512") == 0)
            ExpectedHash = HashString("SHA512", Parse.SHA512Hash());
-        if(stringcasecmp(ForceHash, "sha256") == 0)
+        else if(stringcasecmp(ForceHash, "sha256") == 0)
            ExpectedHash = HashString("SHA256", Parse.SHA256Hash());
         else if (stringcasecmp(ForceHash, "sha1") == 0)
            ExpectedHash = HashString("SHA1", Parse.SHA1Hash());

diff --combined debian/changelog
index 36b5bd9d11a915b1e1fe62704af1c45287b5e7be,ef50ea4231569d3b5746fca0c01d78b9a2c4406b..792b120945e3d5e3fe0b048b49c5d25df6eeb724
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,40 -1,11 +1,41 @@@
-  -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 09 Jul 2012 17:36:40 +0200
 +apt (0.9.8~exp1) UNRELEASED; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/contrib/strutl.cc:
 +    - support \n and \r\n line endings in ReadMessages
 +
 +  [ Michael Vogt ]
 +  * lp:~mvo/apt/webserver-simulate-broken-with-fix346386:
 +    - fix invalid InRelease file download checking and add regression
 +      test to server broken files to the buildin test webserver
 +  * stop exporting the accidently exported parsenetrc() symbol
 +  * lp:~mvo/apt/add-glob-function:
 +    -  add Glob() to fileutl.{cc,h}
 +  * lp:~mvo/apt/config-clear:
 +    - support Configuration.Clear() for a clear of the entire 
 +      configuration
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - use tcgetattr() on STDOUT instead of STDIN so that term.log
 +      works for redirected stdin
 +    - print error in log if tcgetattr() fails instead of writing
 +      a empty file
++  * use sha512 when available (LP: #1098752)
 +
++ -- Michael Vogt <mvo@debian.org>  Fri, 01 Mar 2013 12:12:39 +0100
 +
  apt (0.9.7.8) UNRELEASED; urgency=low
  
    [ Manpages translation updates ]
    * Italian (Beatrice Torracca). Closes: #696601
    
 +  [ Programs translation updates ]
 +  * Japanese (Kenshi Muto). Closes: #699783
 +  
    [ Michael Vogt ]
    * fix pkgProblemResolver::Scores, thanks to Paul Wise. 
      Closes: #697577
 +  * [ABI BREAK] apt-pkg/pkgcache.h:
 +    - adjust pkgCache::State::VerPriority enum, to match reality
    * fix missing translated apt.8 manpages, thanks to Helge Kreutzmann
      for the report. Closes: #696923
    * apt-pkg/contrib/progress.cc:
@@@ -55,10 -26,7 +56,10 @@@
        (potentially) used for non deb,dsc content that may contain
        spaces, thanks to Daniel Hartwig and Thomas Bushnell 
        (LP: #1086997)
 -  * use sha512 when available (LP: #1098752)
 +    - quote plus in filenames to work around a bug in the S3 server
 +      (LP: #1003633)
 +  * apt-pkg/indexrecords.cc:
 +    - support '\r' in the Release file
  
   -- Christian Perrier <bubulle@debian.org>  Mon, 24 Dec 2012 07:01:20 +0100