Sync with apt--main--0--patch-78

Patches applied:

 * apt@packages.debian.org/apt--main--0--patch-77
   Merge apt--mvo--0

 * apt@packages.debian.org/apt--main--0--patch-78
   Update changelog

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-14
   * changelog entry for 0.6.34ubuntu1 added, MinAge default is 2 days now

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-15
   * merged with matts tree

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-16
   * changelog updated

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-17
   * whitespace change to add incomplete log for last patch

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-18
   * honor "Acquire::gpgv::Options" in apt-cdrom too

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-19
   * corrected a incorrect use of string().c_str() (thanks to mdz!)

diff --combined apt-pkg/acquire-item.cc
index 3df9f24073094b8d3a2a6837c85518a536d33662,b2f896627f23e44433c4214c1ab562e4b32efa68..12dc811a66b53e9c7da328f3491d84c7432a2b7e
--- 1/apt-pkg/acquire-item.cc
--- 2/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@@ -307,35 -307,6 +307,35 @@@ void pkgAcqIndex::Done(string Message,u
     Mode = decompProg;
  }
  
 +// AcqIndexTrans::pkgAcqIndexTrans - Constructor                      /*{{{*/
 +// ---------------------------------------------------------------------
 +/* The Translation file is added to the queue */
 +pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire *Owner,
 +                          string URI,string URIDesc,string ShortDesc) :
 +                      pkgAcqIndex(Owner, URI, URIDesc, ShortDesc, "", "")
 +{
 +}
 +
 +                                                                      /*}}}*/
 +// AcqIndexTrans::Failed - Silence failure messages for missing files /*{{{*/
 +// ---------------------------------------------------------------------
 +/* */
 +void pkgAcqIndexTrans::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
 +{
 +   if (Cnf->LocalOnly == true || 
 +       StringToBool(LookupTag(Message,"Transient-Failure"),false) == false)
 +   {      
 +      // Ignore this
 +      Status = StatDone;
 +      Complete = false;
 +      Dequeue();
 +      return;
 +   }
 +   
 +   Item::Failed(Message,Cnf);
 +}
 +                                                                      /*}}}*/
 +
  pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
                             string URI,string URIDesc,string ShortDesc,
                             string MetaIndexURI, string MetaIndexURIDesc,
@@@ -369,6 -340,12 +369,12 @@@
        // File was already in place.  It needs to be re-verified
        // because Release might have changed, so Move it into partial
        Rename(Final,DestFile);
+       // unlink the file and do not try to use I-M-S and Last-Modified
+       // if the users proxy is broken
+       if(_config->FindB("Acquire::BrokenProxy", false) == true) {
+        std::cerr << "forcing re-get of the signature file as requested" << std::endl;
+        unlink(DestFile.c_str());
+       }
     }
  
     QueueURI(Desc);

diff --combined debian/changelog
index 100125392d0f5a01f9f2456c72fb7fafe817ad97,a6886490cd7d1ef6c1c1c51799488d03d13a99e1..4cdeee956255dcc96354de7a3d37a87e198f586d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,15 +1,23 @@@
- apt (0.6.35os1) unstable; urgency=low
++apt (0.6.36os1) unstable; urgency=low
 +
 +   * Resync with apt--main--0--patch-71.
 +     [ This include the DDTP support for testing propose, report bugs
 +     directly to me ]
 +
-  -- Otavio Salvador <otavio@debian.org>  Wed, 23 Mar 2005 17:19:28 -0300
++ -- Otavio Salvador <otavio@debian.org>  Thu,  7 Apr 2005 21:16:46 -0300
++
+ apt (0.6.36) unstable; urgency=low
+ 
+   * Merge apt--mvo--0:
+     - apt-pkg/acquire-item.cc:
+       added "Acquire::BrokenProxy" that will force apt to always 
+       re-get the Release.gpg file (for broken proxies)
+     - debian/apt.cron.daily:
+       MinAge is defaulting to 2 days now to prevent over-aggresive removal 
+     - apt-pkg/cdrom.cc:
+       honor "Acquire::gpgv::Options" when verifying the signature (Ubuntu #8496)
+  
+  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 31 Mar 2005 20:37:11 +0200
  
  apt (0.6.35) hoary; urgency=low