merge with lp:~mvo/apt/debian-sid with the bugfix release 0.7.23.1 in it.

.bzr-builddeb/default.conf.orig

@@ -1,2 +0,0 @@
-[BUILDDEB]
-native = true

apt-pkg/acquire-item.cc

@@ -596,21 +596,21 @@ void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)	/*{{{*/
       if(Desc.URI.substr(nameLen) != *t)
 	 continue;
 
-      // we want to try it with the next extension
+      // we want to try it with the next extension (and make sure to 
+      // not skip over the end)
       t++;
+      if (t == types.end())
+	 break;
 
-      if (t != types.end())
-      {
-	 Desc.URI = Desc.URI.substr(0, nameLen) + *t;
-
-	 new pkgAcqIndex(Owner, RealURI, Desc.Description, Desc.ShortDesc,
-			 ExpectedHash, string(".").append(*t));
-
-	 Status = StatDone;
-	 Complete = false;
-	 Dequeue();
-	 return;
-      }
+      // queue new download
+      Desc.URI = Desc.URI.substr(0, nameLen) + *t;
+      new pkgAcqIndex(Owner, RealURI, Desc.Description, Desc.ShortDesc,
+      ExpectedHash, string(".").append(*t));
+      
+      Status = StatDone;
+      Complete = false;
+      Dequeue();
+      return;
    }
 
    // on decompression failure, remove bad versions in partial/

apt-pkg/pkgcache.cc

@@ -275,13 +275,13 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const
       return NeedsUnpack;
    
    if (Pkg->CurrentState == pkgCache::State::UnPacked ||
-       Pkg->CurrentState == pkgCache::State::HalfConfigured ||
-      //we don't need to care for triggers awaiting packages
-      //dpkg will deal with them automatically when the 
-      //trigger pending action is run (those packages are usually
-      //in half-configured or triggers-pending state)
+       Pkg->CurrentState == pkgCache::State::HalfConfigured)
+      // we leave triggers alone complettely. dpkg deals with
+      // them in a hard-to-predict manner and if they get 
+      // resolved by dpkg before apt run dpkg --configure on 
+      // the TriggersPending package dpkg returns a error
       //Pkg->CurrentState == pkgCache::State::TriggersAwaited
-       Pkg->CurrentState == pkgCache::State::TriggersPending)
+      //Pkg->CurrentState == pkgCache::State::TriggersPending)
       return NeedsConfigure;
    
    if (Pkg->CurrentState == pkgCache::State::HalfInstalled ||

configure.in

@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.7.22.3")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.23.1")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

debian/changelog

@@ -21,6 +21,19 @@ apt (0.7.24) UNRELEASED; urgency=low
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 28 Aug 2009 09:40:08 +0200
 
+apt (0.7.23.1) UNRELEASED; urgency=low
+
+  [ Michael Vogt ]
+  * apt-pkg/pkgcache.cc:
+    - do not set internel "needs-configure" state for packages in 
+      triggers-pending state. dpkg will deal with the trigger and
+      it if does it before we trigger it, dpkg will error out
+      (LP: #414631)
+  * apt-pkg/acquire-item.cc:
+    - do not segfault on invalid items (closes: #544080)
+
+ -- Michael Vogt <mvo@debian.org>  Fri, 28 Aug 2009 18:53:20 +0200
+
 apt (0.7.23) unstable; urgency=low
 
   [ Eugene V. Lyubimkin ]
@@ -30,7 +43,7 @@ apt (0.7.23) unstable; urgency=low
       and '{http,ftp}_proxy' environment variables are used only if options
       mentioned above are not specified.
       (Closes: #445985, #157759, #320184, #365880, #479617)
-
+  
   [ David Kalnischkies ]
   * cmdline/apt-get.cc:
     - add APT::Get::HideAutoRemove=small to display only a short line