Print warning for unauthenticated repositories

[apt.git] / apt-pkg / acquire-item.h

diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 6e204813a7b927772912d8d2be103f6f59270d9d..15b56606945c32a2a92e0abe2d468de81987ca2a 100644 (file)
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -47,6 +47,7 @@ class indexRecords;
 class pkgRecords;
 class pkgSourceList;
 class IndexTarget;
 class pkgRecords;
 class pkgSourceList;
 class IndexTarget;

+class pkgAcqMetaBase;

 
 /** \brief Represents the process by which a pkgAcquire object should  {{{
  *  retrieve a file or a collection of files.
 
 /** \brief Represents the process by which a pkgAcquire object should  {{{
  *  retrieve a file or a collection of files.


@@ -62,6 +63,8 @@ class IndexTarget;
  */
 class pkgAcquire::Item : public WeakPointable
 {  
  */
 class pkgAcquire::Item : public WeakPointable
 {  

+   void *d;
+

    protected:
    
    /** \brief The acquire object with which this item is associated. */
    protected:
    
    /** \brief The acquire object with which this item is associated. */


@@ -87,7 +90,7 @@ class pkgAcquire::Item : public WeakPointable
     *  \param To The new name of \a From.  If \a To exists it will be
     *  overwritten.
     */
     *  \param To The new name of \a From.  If \a To exists it will be
     *  overwritten.
     */

-   void Rename(std::string From,std::string To);
+   bool Rename(std::string From,std::string To);

 
    public:
 
 
    public:
 


@@ -116,7 +119,7 @@ class pkgAcquire::Item : public WeakPointable
        /** \brief The item was could not be downloaded because of 
        *  a transient network error (e.g. network down)
        */
        /** \brief The item was could not be downloaded because of 
        *  a transient network error (e.g. network down)
        */

-       StatTransientNetworkError
+       StatTransientNetworkError,

      } Status;
 
    /** \brief Contains a textual description of the error encountered
      } Status;
 
    /** \brief Contains a textual description of the error encountered


@@ -168,6 +171,9 @@ class pkgAcquire::Item : public WeakPointable
     */
    unsigned int QueueCounter;
 
     */
    unsigned int QueueCounter;
 

+   /** \brief TransactionManager */
+   pkgAcqMetaBase *TransactionManager;
+

    /** \brief The number of additional fetch items that are expected
     *  once this item is done.
     *
    /** \brief The number of additional fetch items that are expected
     *  once this item is done.
     *


@@ -183,6 +189,9 @@ class pkgAcquire::Item : public WeakPointable
     */
    std::string DestFile;
 
     */
    std::string DestFile;
 

+   /** \brief storge name until a transaction is finished */
+   std::string PartialFile;
+

    /** \brief Invoked by the acquire worker when the object couldn't
     *  be fetched.
     *
    /** \brief Invoked by the acquire worker when the object couldn't
     *  be fetched.
     *


@@ -289,7 +298,9 @@ class pkgAcquire::Item : public WeakPointable
     *  \param Owner The new owner of this item.
     *  \param ExpectedHashes of the file represented by this item
     */
     *  \param Owner The new owner of this item.
     *  \param ExpectedHashes of the file represented by this item
     */

-   Item(pkgAcquire *Owner, HashStringList const &ExpectedHashes);
+   Item(pkgAcquire *Owner,
+        HashStringList const &ExpectedHashes=HashStringList(),
+        pkgAcqMetaBase *TransactionManager=NULL);

 
    /** \brief Remove this item from its owner's queue by invoking
     *  pkgAcquire::Remove.
 
    /** \brief Remove this item from its owner's queue by invoking
     *  pkgAcquire::Remove.


@@ -329,62 +340,206 @@ struct DiffInfo {
    unsigned long size;
 };
                                                                        /*}}}*/
    unsigned long size;
 };
                                                                        /*}}}*/

-/** \brief An item that is responsible for fetching a SubIndex         {{{
- *
- *  The MetaIndex file includes only records for important indexes
- *  and records for these SubIndex files so these can carry records
- *  for addition files like PDiffs and Translations
- */
-class pkgAcqSubIndex : public pkgAcquire::Item
+                                                                       /*}}}*/
+
+class pkgAcqMetaBase  : public pkgAcquire::Item

 {
 {

+   void *d;
+

  protected:
  protected:

-   /** \brief If \b true, debugging information will be written to std::clog. */
-   bool Debug;
+   std::vector<Item*> Transaction;

 
  public:
 
  public:

-   // Specialized action members
-   virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
-   virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes,
-                    pkgAcquire::MethodConfig *Cnf);
-   virtual std::string DescURI() const {return Desc.URI;};
-   virtual std::string Custom600Headers() const;
-   virtual bool ParseIndex(std::string const &IndexFile);
+   // transaction code
+   void Add(Item *I);
+   void AbortTransaction();
+   bool TransactionHasError() APT_PURE;
+   void CommitTransaction();
+
+   // helper for the signature warning
+   bool GenerateAuthWarning(const std::string &RealURI,
+                            const std::string &Message);
+
+
+   pkgAcqMetaBase(pkgAcquire *Owner,
+                  HashStringList const &ExpectedHashes=HashStringList(),
+                  pkgAcqMetaBase *TransactionManager=NULL)
+      : Item(Owner, ExpectedHashes, TransactionManager) {};
+};
+

 
 

-   /** \brief Create a new pkgAcqSubIndex.
+/** \brief An item that is responsible for downloading the meta-index  {{{
+ *  file (i.e., Release) itself and verifying its signature.
+ *
+ *  Once the download and verification are complete, the downloads of
+ *  the individual index files are queued up using pkgAcqDiffIndex.
+ *  If the meta-index file had a valid signature, the expected hashsums
+ *  of the index files will be the md5sums listed in the meta-index;
+ *  otherwise, the expected hashsums will be "" (causing the
+ *  authentication of the index files to be bypassed).
+ */
+class pkgAcqMetaIndex : public pkgAcqMetaBase
+{
+   void *d;
+
+   protected:
+   /** \brief The URI that is actually being downloaded; never
+    *  modified by pkgAcqMetaIndex.
+    */
+   std::string RealURI;
+
+   /** \brief The file in which the signature for this index was stored.

     *
     *

-    *  \param Owner The Acquire object that owns this item.
+    *  If empty, the signature and the md5sums of the individual
+    *  indices will not be checked.
+    */
+   std::string SigFile;
+
+   /** \brief The index files to download. */
+   const std::vector<IndexTarget*>* IndexTargets;
+
+   /** \brief The parser for the meta-index file. */
+   indexRecords* MetaIndexParser;
+
+   /** \brief If \b true, the index's signature is currently being verified.
+    */
+   bool AuthPass;
+   // required to deal gracefully with problems caused by incorrect ims hits
+   bool IMSHit; 
+
+   /** \brief Check that the release file is a release file for the
+    *  correct distribution.

     *
     *

-    *  \param URI The URI of the list file to download.
+    *  \return \b true if no fatal errors were encountered.
+    */
+   bool VerifyVendor(std::string Message);
+
+   /** \brief Called when a file is finished being retrieved.

     *
     *

-    *  \param URIDesc A long description of the list file to download.
+    *  If the file was not downloaded to DestFile, a copy process is
+    *  set up to copy it to DestFile; otherwise, Complete is set to \b
+    *  true and the file is moved to its final location.

     *
     *

-    *  \param ShortDesc A short description of the list file to download.
+    *  \param Message The message block received from the fetch
+    *  subprocess.
+    */
+   void RetrievalDone(std::string Message);
+
+   /** \brief Called when authentication succeeded.

     *
     *

-    *  \param ExpectedHashes The list file's hashsums which are expected.
+    *  Sanity-checks the authenticated file, queues up the individual
+    *  index files for download, and saves the signature in the lists
+    *  directory next to the authenticated list file.
+    *
+    *  \param Message The message block received from the fetch
+    *  subprocess.
+    */
+   void AuthDone(std::string Message);
+
+   /** \brief Starts downloading the individual index files.
+    *
+    *  \param verify If \b true, only indices whose expected hashsum
+    *  can be determined from the meta-index will be downloaded, and
+    *  the hashsums of indices will be checked (reporting
+    *  #StatAuthError if there is a mismatch).  If verify is \b false,
+    *  no hashsum checking will be performed.

     */
     */

-   pkgAcqSubIndex(pkgAcquire *Owner, std::string const &URI,std::string const &URIDesc,
-                  std::string const &ShortDesc, HashStringList const &ExpectedHashes);
+   void QueueIndexes(bool verify);
+
+   /** \brief The URI of the meta-index file for the detached signature */
+   std::string MetaIndexSigURI;
+
+   /** \brief A "URI-style" description of the meta-index file */
+   std::string MetaIndexSigURIDesc;
+
+   /** \brief A brief description of the meta-index file */
+   std::string MetaIndexSigShortDesc;
+
+   /** \brief delayed constructor */
+   void Init(std::string URIDesc, std::string ShortDesc);
+   
+   public:
+   
+   // Specialized action members
+   virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+   virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes,
+                    pkgAcquire::MethodConfig *Cnf);
+   virtual std::string Custom600Headers() const;
+   virtual std::string DescURI() const {return RealURI; };
+   virtual void Finished();
+
+   /** \brief Create a new pkgAcqMetaIndex. */
+   pkgAcqMetaIndex(pkgAcquire *Owner,
+                   pkgAcqMetaBase *TransactionManager,
+                  std::string URI,std::string URIDesc, std::string ShortDesc,
+                   std::string MetaIndexSigURI, std::string MetaIndexSigURIDesc, std::string MetaIndexSigShortDesc,
+                  const std::vector<IndexTarget*>* IndexTargets,
+                  indexRecords* MetaIndexParser);
+};
+                                                                       /*}}}*/
+/** \brief An item repsonsible for downloading clearsigned metaindexes {{{*/
+class pkgAcqMetaClearSig : public pkgAcqMetaIndex
+{
+   void *d;
+
+   /** \brief The URI of the meta-index file for the detached signature */
+   std::string MetaIndexURI;
+
+   /** \brief A "URI-style" description of the meta-index file */
+   std::string MetaIndexURIDesc;
+
+   /** \brief A brief description of the meta-index file */
+   std::string MetaIndexShortDesc;
+
+   /** \brief The URI of the detached meta-signature file if the clearsigned one failed. */
+   std::string MetaSigURI;
+
+   /** \brief A "URI-style" description of the meta-signature file */
+   std::string MetaSigURIDesc;
+
+   /** \brief A brief description of the meta-signature file */
+   std::string MetaSigShortDesc;
+
+public:
+   virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+   virtual std::string Custom600Headers() const;
+   virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes,
+                    pkgAcquire::MethodConfig *Cnf);
+
+   /** \brief Create a new pkgAcqMetaClearSig. */
+   pkgAcqMetaClearSig(pkgAcquire *Owner,
+               std::string const &URI, std::string const &URIDesc, std::string const &ShortDesc,
+               std::string const &MetaIndexURI, std::string const &MetaIndexURIDesc, std::string const &MetaIndexShortDesc,
+               std::string const &MetaSigURI, std::string const &MetaSigURIDesc, std::string const &MetaSigShortDesc,
+               const std::vector<IndexTarget*>* IndexTargets,
+               indexRecords* MetaIndexParser);
+   virtual ~pkgAcqMetaClearSig();

 };
                                                                        /*}}}*/
 
 };
                                                                        /*}}}*/
 

+

 /** \brief Common base class for all classes that deal with fetching   {{{
            indexes
  */
 class pkgAcqBaseIndex : public pkgAcquire::Item
 {
 /** \brief Common base class for all classes that deal with fetching   {{{
            indexes
  */
 class pkgAcqBaseIndex : public pkgAcquire::Item
 {

+   void *d;
+

  protected:
    /** \brief Pointer to the IndexTarget data
     */
    const struct IndexTarget * Target;
    indexRecords *MetaIndexParser;
  protected:
    /** \brief Pointer to the IndexTarget data
     */
    const struct IndexTarget * Target;
    indexRecords *MetaIndexParser;

+   /** \brief The MetaIndex Key */
+   std::string MetaKey;

 
    pkgAcqBaseIndex(pkgAcquire *Owner,
 
    pkgAcqBaseIndex(pkgAcquire *Owner,

+                   pkgAcqMetaBase *TransactionManager,

                    struct IndexTarget const * const Target,
                    HashStringList const &ExpectedHashes,
                    indexRecords *MetaIndexParser)
                    struct IndexTarget const * const Target,
                    HashStringList const &ExpectedHashes,
                    indexRecords *MetaIndexParser)

-      : Item(Owner, ExpectedHashes), Target(Target), 
+      : Item(Owner, ExpectedHashes, TransactionManager), Target(Target), 

         MetaIndexParser(MetaIndexParser) {};
         MetaIndexParser(MetaIndexParser) {};

-

 };
                                                                        /*}}}*/
 /** \brief An item that is responsible for fetching an index file of   {{{
 };
                                                                        /*}}}*/
 /** \brief An item that is responsible for fetching an index file of   {{{


@@ -398,6 +553,8 @@ class pkgAcqBaseIndex : public pkgAcquire::Item
  */
 class pkgAcqDiffIndex : public pkgAcqBaseIndex
 {
  */
 class pkgAcqDiffIndex : public pkgAcqBaseIndex
 {

+   void *d;
+

  protected:
    /** \brief If \b true, debugging information will be written to std::clog. */
    bool Debug;
  protected:
    /** \brief If \b true, debugging information will be written to std::clog. */
    bool Debug;


@@ -417,6 +574,10 @@ class pkgAcqDiffIndex : public pkgAcqBaseIndex
     */
    std::string Description;
 
     */
    std::string Description;
 

+   /** \brief If the copy step of the packages file is done
+    */
+   bool PackagesFileReadyInPartial;
+

  public:
    // Specialized action members
    virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
  public:
    // Specialized action members
    virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);


@@ -451,6 +612,7 @@ class pkgAcqDiffIndex : public pkgAcqBaseIndex
     *  \param ExpectedHashes The list file's hashsums which are expected.
     */
    pkgAcqDiffIndex(pkgAcquire *Owner,
     *  \param ExpectedHashes The list file's hashsums which are expected.
     */
    pkgAcqDiffIndex(pkgAcquire *Owner,

+                   pkgAcqMetaBase *TransactionManager,

                    struct IndexTarget const * const Target,
                    HashStringList const &ExpectedHashes,
                    indexRecords *MetaIndexParser);
                    struct IndexTarget const * const Target,
                    HashStringList const &ExpectedHashes,
                    indexRecords *MetaIndexParser);


@@ -469,6 +631,8 @@ class pkgAcqDiffIndex : public pkgAcqBaseIndex
  */
 class pkgAcqIndexMergeDiffs : public pkgAcqBaseIndex
 {
  */
 class pkgAcqIndexMergeDiffs : public pkgAcqBaseIndex
 {

+   void *d;
+

    protected:
 
    /** \brief If \b true, debugging output will be written to
    protected:
 
    /** \brief If \b true, debugging output will be written to


@@ -539,6 +703,7 @@ class pkgAcqIndexMergeDiffs : public pkgAcqBaseIndex
     *  check if it was the last one to complete the download step
     */
    pkgAcqIndexMergeDiffs(pkgAcquire *Owner,
     *  check if it was the last one to complete the download step
     */
    pkgAcqIndexMergeDiffs(pkgAcquire *Owner,

+                         pkgAcqMetaBase *TransactionManager,

                          struct IndexTarget const * const Target,
                          HashStringList const &ExpectedHash,
                          indexRecords *MetaIndexParser,
                          struct IndexTarget const * const Target,
                          HashStringList const &ExpectedHash,
                          indexRecords *MetaIndexParser,


@@ -559,6 +724,8 @@ class pkgAcqIndexMergeDiffs : public pkgAcqBaseIndex
  */
 class pkgAcqIndexDiffs : public pkgAcqBaseIndex
 {
  */
 class pkgAcqIndexDiffs : public pkgAcqBaseIndex
 {

+   void *d;
+

    private:
 
    /** \brief Queue up the next diff download.
    private:
 
    /** \brief Queue up the next diff download.


@@ -640,7 +807,7 @@ class pkgAcqIndexDiffs : public pkgAcqBaseIndex
 
    virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes,
                     pkgAcquire::MethodConfig *Cnf);
 
    virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes,
                     pkgAcquire::MethodConfig *Cnf);

-   virtual std::string DescURI() const {return RealURI + "Index";};
+   virtual std::string DescURI() const {return RealURI + "IndexDiffs";};

 
    /** \brief Create an index diff item.
     *
 
    /** \brief Create an index diff item.
     *


@@ -667,6 +834,7 @@ class pkgAcqIndexDiffs : public pkgAcqBaseIndex
     *  that depends on it.
     */
    pkgAcqIndexDiffs(pkgAcquire *Owner,
     *  that depends on it.
     */
    pkgAcqIndexDiffs(pkgAcquire *Owner,

+                    pkgAcqMetaBase *TransactionManager,

                     struct IndexTarget const * const Target,
                     HashStringList const &ExpectedHash,
                     indexRecords *MetaIndexParser,
                     struct IndexTarget const * const Target,
                     HashStringList const &ExpectedHash,
                     indexRecords *MetaIndexParser,


@@ -683,6 +851,8 @@ class pkgAcqIndexDiffs : public pkgAcqBaseIndex
  */
 class pkgAcqIndex : public pkgAcqBaseIndex
 {
  */
 class pkgAcqIndex : public pkgAcqBaseIndex
 {

+   void *d;
+

    protected:
 
    /** \brief If \b true, the index file has been decompressed. */
    protected:
 
    /** \brief If \b true, the index file has been decompressed. */


@@ -693,16 +863,6 @@ class pkgAcqIndex : public pkgAcqBaseIndex
     */
    bool Erase;
 
     */
    bool Erase;
 

-   /** \brief Verify for correctness by checking if a "Package"
-    *         tag is found in the index. This can be set to
-    *         false for optional index targets
-    *       
-    */
-   // FIXME: instead of a bool it should use a verify string that will
-   //        then be used in the pkgAcqIndex::Done method to ensure that
-   //        the downloaded file contains the expected tag
-   bool Verify;
-

    /** \brief The object that is actually being fetched (minus any
     *  compression-related extensions).
     */
    /** \brief The object that is actually being fetched (minus any
     *  compression-related extensions).
     */


@@ -713,6 +873,20 @@ class pkgAcqIndex : public pkgAcqBaseIndex
     */
    std::string CompressionExtension;
 
     */
    std::string CompressionExtension;
 

+
+   /** \brief Do the changes needed to fetch via AptByHash (if needed) */
+   void InitByHashIfNeeded(const std::string MetaKey);
+
+   /** \brief Auto select the right compression to use */
+   void AutoSelectCompression();
+
+   /** \brief Get the full pathname of the final file for the current URI
+    */
+   std::string GetFinalFilename() const;
+
+   /** \brief Schedule file for verification after a IMS hit */
+   void ReverifyAfterIMS();
+

    public:
    
    // Specialized action members
    public:
    
    // Specialized action members


@@ -742,12 +916,12 @@ class pkgAcqIndex : public pkgAcqBaseIndex
     *  fallback is ".gz" or none.
     */
    pkgAcqIndex(pkgAcquire *Owner,std::string URI,std::string URIDesc,
     *  fallback is ".gz" or none.
     */
    pkgAcqIndex(pkgAcquire *Owner,std::string URI,std::string URIDesc,

-              std::string ShortDesc, HashStringList const &ExpectedHashes,
-              std::string compressExt="");
-   pkgAcqIndex(pkgAcquire *Owner,
+              std::string ShortDesc, HashStringList const &ExpectedHashes);
+   pkgAcqIndex(pkgAcquire *Owner, pkgAcqMetaBase *TransactionManager,

                IndexTarget const * const Target,
                HashStringList const &ExpectedHash,
                indexRecords *MetaIndexParser);
                IndexTarget const * const Target,
                HashStringList const &ExpectedHash,
                indexRecords *MetaIndexParser);

+               

    void Init(std::string const &URI, std::string const &URIDesc,
              std::string const &ShortDesc);
 };
    void Init(std::string const &URI, std::string const &URIDesc,
              std::string const &ShortDesc);
 };


@@ -761,6 +935,8 @@ class pkgAcqIndex : public pkgAcqBaseIndex
  */
 class pkgAcqIndexTrans : public pkgAcqIndex
 {
  */
 class pkgAcqIndexTrans : public pkgAcqIndex
 {

+   void *d;
+

    public:
   
    virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
    public:
   
    virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);


@@ -777,15 +953,21 @@ class pkgAcqIndexTrans : public pkgAcqIndex
     *
     *  \param ShortDesc A brief description of this index file.
     */
     *
     *  \param ShortDesc A brief description of this index file.
     */

-   pkgAcqIndexTrans(pkgAcquire *Owner,std::string URI,std::string URIDesc,
+   pkgAcqIndexTrans(pkgAcquire *Owner,
+                    std::string URI,std::string URIDesc,

                    std::string ShortDesc);
                    std::string ShortDesc);

-   pkgAcqIndexTrans(pkgAcquire *Owner, IndexTarget const * const Target,
-                   HashStringList const &ExpectedHashes, indexRecords *MetaIndexParser);
+   pkgAcqIndexTrans(pkgAcquire *Owner,
+                    pkgAcqMetaBase *TransactionManager,
+                    IndexTarget const * const Target,
+                    HashStringList const &ExpectedHashes,
+                    indexRecords *MetaIndexParser);

 };
                                                                        /*}}}*/
 /** \brief Information about an index file. */                         /*{{{*/
 class IndexTarget
 {
 };
                                                                        /*}}}*/
 /** \brief Information about an index file. */                         /*{{{*/
 class IndexTarget
 {

+   void *d;
+

  public:
    /** \brief A URI from which the index file can be downloaded. */
    std::string URI;
  public:
    /** \brief A URI from which the index file can be downloaded. */
    std::string URI;


@@ -804,35 +986,18 @@ class IndexTarget
    virtual bool IsOptional() const {
       return false;
    }
    virtual bool IsOptional() const {
       return false;
    }

-   virtual bool IsSubIndex() const {
-      return false;
-   }

 };
                                                                        /*}}}*/
 /** \brief Information about an optional index file. */                        /*{{{*/
 class OptionalIndexTarget : public IndexTarget
 {
 };
                                                                        /*}}}*/
 /** \brief Information about an optional index file. */                        /*{{{*/
 class OptionalIndexTarget : public IndexTarget
 {

+   void *d;
+

    virtual bool IsOptional() const {
       return true;
    }
 };
                                                                        /*}}}*/
    virtual bool IsOptional() const {
       return true;
    }
 };
                                                                        /*}}}*/

-/** \brief Information about an subindex index file. */                        /*{{{*/
-class SubIndexTarget : public IndexTarget
-{
-   virtual bool IsSubIndex() const {
-      return true;
-   }
-};
-                                                                       /*}}}*/
-/** \brief Information about an subindex index file. */                        /*{{{*/
-class OptionalSubIndexTarget : public OptionalIndexTarget
-{
-   virtual bool IsSubIndex() const {
-      return true;
-   }
-};
-                                                                       /*}}}*/

 
 /** \brief An acquire item that downloads the detached signature       {{{
  *  of a meta-index (Release) file, then queues up the release
 
 /** \brief An acquire item that downloads the detached signature       {{{
  *  of a meta-index (Release) file, then queues up the release


@@ -842,8 +1007,10 @@ class OptionalSubIndexTarget : public OptionalIndexTarget
  *
  *  \sa pkgAcqMetaIndex
  */
  *
  *  \sa pkgAcqMetaIndex
  */

-class pkgAcqMetaSig : public pkgAcquire::Item
+class pkgAcqMetaSig : public pkgAcqMetaBase

 {
 {

+   void *d;
+

    protected:
    /** \brief The last good signature file */
    std::string LastGoodSig;
    protected:
    /** \brief The last good signature file */
    std::string LastGoodSig;


@@ -854,22 +1021,12 @@ class pkgAcqMetaSig : public pkgAcquire::Item
     */
    std::string RealURI;
 
     */
    std::string RealURI;
 

-   /** \brief The URI of the meta-index file to be fetched after the signature. */
-   std::string MetaIndexURI;
-
-   /** \brief A "URI-style" description of the meta-index file to be
-    *  fetched after the signature.
-    */
-   std::string MetaIndexURIDesc;
-
-   /** \brief A brief description of the meta-index file to be fetched
-    *  after the signature.
-    */
-   std::string MetaIndexShortDesc;
-

    /** \brief A package-system-specific parser for the meta-index file. */
    indexRecords* MetaIndexParser;
 
    /** \brief A package-system-specific parser for the meta-index file. */
    indexRecords* MetaIndexParser;
 

+   /** \brief The file we need to verify */
+   std::string MetaIndexFile;
+

    /** \brief The index files which should be looked up in the meta-index
     *  and then downloaded.
     *
    /** \brief The index files which should be looked up in the meta-index
     *  and then downloaded.
     *


@@ -877,6 +1034,12 @@ class pkgAcqMetaSig : public pkgAcquire::Item
     */
    const std::vector<IndexTarget*>* IndexTargets;
 
     */
    const std::vector<IndexTarget*>* IndexTargets;
 

+   /** \brief If we are in fetching or download state */
+   bool AuthPass;
+
+   /** \brief Was this file already on disk */
+   bool IMSHit;
+

    public:
    
    // Specialized action members
    public:
    
    // Specialized action members


@@ -887,141 +1050,15 @@ class pkgAcqMetaSig : public pkgAcquire::Item
    virtual std::string DescURI() const {return RealURI; };
 
    /** \brief Create a new pkgAcqMetaSig. */
    virtual std::string DescURI() const {return RealURI; };
 
    /** \brief Create a new pkgAcqMetaSig. */

-   pkgAcqMetaSig(pkgAcquire *Owner,std::string URI,std::string URIDesc, std::string ShortDesc,
-                std::string MetaIndexURI, std::string MetaIndexURIDesc, std::string MetaIndexShortDesc,
+   pkgAcqMetaSig(pkgAcquire *Owner,
+                 pkgAcqMetaBase *TransactionManager,
+                 std::string URI,std::string URIDesc, std::string ShortDesc,
+                 std::string MetaIndexFile,

                 const std::vector<IndexTarget*>* IndexTargets,
                 indexRecords* MetaIndexParser);
    virtual ~pkgAcqMetaSig();
 };
                                                                        /*}}}*/
                 const std::vector<IndexTarget*>* IndexTargets,
                 indexRecords* MetaIndexParser);
    virtual ~pkgAcqMetaSig();
 };
                                                                        /*}}}*/

-/** \brief An item that is responsible for downloading the meta-index  {{{
- *  file (i.e., Release) itself and verifying its signature.
- *
- *  Once the download and verification are complete, the downloads of
- *  the individual index files are queued up using pkgAcqDiffIndex.
- *  If the meta-index file had a valid signature, the expected hashsums
- *  of the index files will be the md5sums listed in the meta-index;
- *  otherwise, the expected hashsums will be "" (causing the
- *  authentication of the index files to be bypassed).
- */
-class pkgAcqMetaIndex : public pkgAcquire::Item
-{
-   protected:
-   /** \brief The URI that is actually being downloaded; never
-    *  modified by pkgAcqMetaIndex.
-    */
-   std::string RealURI;
-
-   /** \brief The file in which the signature for this index was stored.
-    *
-    *  If empty, the signature and the md5sums of the individual
-    *  indices will not be checked.
-    */
-   std::string SigFile;
-
-   /** \brief The index files to download. */
-   const std::vector<IndexTarget*>* IndexTargets;
-
-   /** \brief The parser for the meta-index file. */
-   indexRecords* MetaIndexParser;
-
-   /** \brief If \b true, the index's signature is currently being verified.
-    */
-   bool AuthPass;
-   // required to deal gracefully with problems caused by incorrect ims hits
-   bool IMSHit; 
-
-   /** \brief Check that the release file is a release file for the
-    *  correct distribution.
-    *
-    *  \return \b true if no fatal errors were encountered.
-    */
-   bool VerifyVendor(std::string Message);
-
-   /** \brief Called when a file is finished being retrieved.
-    *
-    *  If the file was not downloaded to DestFile, a copy process is
-    *  set up to copy it to DestFile; otherwise, Complete is set to \b
-    *  true and the file is moved to its final location.
-    *
-    *  \param Message The message block received from the fetch
-    *  subprocess.
-    */
-   void RetrievalDone(std::string Message);
-
-   /** \brief Called when authentication succeeded.
-    *
-    *  Sanity-checks the authenticated file, queues up the individual
-    *  index files for download, and saves the signature in the lists
-    *  directory next to the authenticated list file.
-    *
-    *  \param Message The message block received from the fetch
-    *  subprocess.
-    */
-   void AuthDone(std::string Message);
-
-   /** \brief Starts downloading the individual index files.
-    *
-    *  \param verify If \b true, only indices whose expected hashsum
-    *  can be determined from the meta-index will be downloaded, and
-    *  the hashsums of indices will be checked (reporting
-    *  #StatAuthError if there is a mismatch).  If verify is \b false,
-    *  no hashsum checking will be performed.
-    */
-   void QueueIndexes(bool verify);
-   
-   public:
-   
-   // Specialized action members
-   virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
-   virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes,
-                    pkgAcquire::MethodConfig *Cnf);
-   virtual std::string Custom600Headers() const;
-   virtual std::string DescURI() const {return RealURI; };
-
-   /** \brief Create a new pkgAcqMetaIndex. */
-   pkgAcqMetaIndex(pkgAcquire *Owner,
-                  std::string URI,std::string URIDesc, std::string ShortDesc,
-                  std::string SigFile,
-                  const std::vector<IndexTarget*>* IndexTargets,
-                  indexRecords* MetaIndexParser);
-};
-                                                                       /*}}}*/
-/** \brief An item repsonsible for downloading clearsigned metaindexes {{{*/
-class pkgAcqMetaClearSig : public pkgAcqMetaIndex
-{
-   /** \brief The URI of the meta-index file for the detached signature */
-   std::string MetaIndexURI;
-
-   /** \brief A "URI-style" description of the meta-index file */
-   std::string MetaIndexURIDesc;
-
-   /** \brief A brief description of the meta-index file */
-   std::string MetaIndexShortDesc;
-
-   /** \brief The URI of the detached meta-signature file if the clearsigned one failed. */
-   std::string MetaSigURI;
-
-   /** \brief A "URI-style" description of the meta-signature file */
-   std::string MetaSigURIDesc;
-
-   /** \brief A brief description of the meta-signature file */
-   std::string MetaSigShortDesc;
-
-public:
-   void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
-   virtual std::string Custom600Headers() const;
-
-   /** \brief Create a new pkgAcqMetaClearSig. */
-   pkgAcqMetaClearSig(pkgAcquire *Owner,
-               std::string const &URI, std::string const &URIDesc, std::string const &ShortDesc,
-               std::string const &MetaIndexURI, std::string const &MetaIndexURIDesc, std::string const &MetaIndexShortDesc,
-               std::string const &MetaSigURI, std::string const &MetaSigURIDesc, std::string const &MetaSigShortDesc,
-               const std::vector<IndexTarget*>* IndexTargets,
-               indexRecords* MetaIndexParser);
-   virtual ~pkgAcqMetaClearSig();
-};
-                                                                       /*}}}*/

 /** \brief An item that is responsible for fetching a package file.    {{{
  *
  *  If the package file already exists in the cache, nothing will be
 /** \brief An item that is responsible for fetching a package file.    {{{
  *
  *  If the package file already exists in the cache, nothing will be


@@ -1029,6 +1066,8 @@ public:
  */
 class pkgAcqArchive : public pkgAcquire::Item
 {
  */
 class pkgAcqArchive : public pkgAcquire::Item
 {

+   void *d;
+

    protected:
    /** \brief The package version being fetched. */
    pkgCache::VerIterator Version;
    protected:
    /** \brief The package version being fetched. */
    pkgCache::VerIterator Version;


@@ -1107,6 +1146,8 @@ class pkgAcqArchive : public pkgAcquire::Item
  */
 class pkgAcqFile : public pkgAcquire::Item
 {
  */
 class pkgAcqFile : public pkgAcquire::Item
 {

+   void *d;
+

    /** \brief How many times to retry the download, set from
     *  Acquire::Retries.
     */
    /** \brief How many times to retry the download, set from
     *  Acquire::Retries.
     */