Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-pkg / indexrecords.cc

diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc
index e37a78cfb1fcbec16b38cc6ec4d2856fa3e047aa..e97ea0ac9dfafb3c5f6048fabc0889a6b178cc57 100644 (file)
--- a/apt-pkg/indexrecords.cc
+++ b/apt-pkg/indexrecords.cc
@@ -14,36 +14,51 @@
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/gpgv.h>
 
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/gpgv.h>
 

-#include <sys/stat.h>
+#include <stdlib.h>
+#include <time.h>

 #include <clocale>
 #include <clocale>

+#include <map>
+#include <string>
+#include <utility>
+#include <vector>

 
 #include <apti18n.h>
                                                                        /*}}}*/
 
 using std::string;
 
 
 #include <apti18n.h>
                                                                        /*}}}*/
 
 using std::string;
 

-string indexRecords::GetDist() const
+APT_PURE string indexRecords::GetDist() const

 {
    return this->Dist;
 }
 
 {
    return this->Dist;
 }
 

-bool indexRecords::CheckDist(const string MaybeDist) const
+APT_PURE string indexRecords::GetSuite() const
+{
+   return this->Suite;
+}
+
+APT_PURE bool indexRecords::GetSupportsAcquireByHash() const
+{
+   return this->SupportsAcquireByHash;
+}
+
+APT_PURE bool indexRecords::CheckDist(const string MaybeDist) const

 {
    return (this->Dist == MaybeDist
           || this->Suite == MaybeDist);
 }
 
 {
    return (this->Dist == MaybeDist
           || this->Suite == MaybeDist);
 }
 

-string indexRecords::GetExpectedDist() const
+APT_PURE string indexRecords::GetExpectedDist() const

 {
    return this->ExpectedDist;
 }
 
 {
    return this->ExpectedDist;
 }
 

-time_t indexRecords::GetValidUntil() const
+APT_PURE time_t indexRecords::GetValidUntil() const

 {
    return this->ValidUntil;
 }
 
 {
    return this->ValidUntil;
 }
 

-const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey)
+APT_PURE indexRecords::checkSum *indexRecords::Lookup(const string MetaKey)

 {
    std::map<std::string, indexRecords::checkSum* >::const_iterator sum = Entries.find(MetaKey);
    if (sum == Entries.end())
 {
    std::map<std::string, indexRecords::checkSum* >::const_iterator sum = Entries.find(MetaKey);
    if (sum == Entries.end())


@@ -51,7 +66,7 @@ const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey)
    return sum->second;
 }
 
    return sum->second;
 }
 

-bool indexRecords::Exists(string const &MetaKey) const
+APT_PURE bool indexRecords::Exists(string const &MetaKey) const

 {
    return Entries.count(MetaKey) == 1;
 }
 {
    return Entries.count(MetaKey) == 1;
 }


@@ -62,7 +77,7 @@ bool indexRecords::Load(const string Filename)                                /*{{{*/
    if (OpenMaybeClearSignedFile(Filename, Fd) == false)
       return false;
 
    if (OpenMaybeClearSignedFile(Filename, Fd) == false)
       return false;
 

-   pkgTagFile TagFile(&Fd, Fd.Size() + 256); // XXX
+   pkgTagFile TagFile(&Fd, Fd.Size());

    if (_error->PendingError() == true)
    {
       strprintf(ErrorText, _("Unable to parse Release file %s"),Filename.c_str());
    if (_error->PendingError() == true)
    {
       strprintf(ErrorText, _("Unable to parse Release file %s"),Filename.c_str());


@@ -71,22 +86,19 @@ bool indexRecords::Load(const string Filename)                              /*{{{*/
 
    pkgTagSection Section;
    const char *Start, *End;
 
    pkgTagSection Section;
    const char *Start, *End;

-   // Skip over sections beginning with ----- as this is an idicator for clearsigns
-   do {
-      if (TagFile.Step(Section) == false)
-      {
-        strprintf(ErrorText, _("No sections in Release file %s"), Filename.c_str());
-        return false;
-      }
-
-      Section.Get (Start, End, 0);
-   } while (End - Start > 5 && strncmp(Start, "-----", 5) == 0);
+   if (TagFile.Step(Section) == false)
+   {
+      strprintf(ErrorText, _("No sections in Release file %s"), Filename.c_str());
+      return false;
+   }
+   // FIXME: find better tag name
+   SupportsAcquireByHash = Section.FindB("Acquire-By-Hash", false);

 
    Suite = Section.FindS("Suite");
    Dist = Section.FindS("Codename");
 
 
    Suite = Section.FindS("Suite");
    Dist = Section.FindS("Codename");
 

-   int i;
-   for (i=0;HashString::SupportedHashes()[i] != NULL; i++)
+   bool FoundHashSum = false;
+   for (int i=0;HashString::SupportedHashes()[i] != NULL; i++)

    {
       if (!Section.Find(HashString::SupportedHashes()[i], Start, End))
         continue;
    {
       if (!Section.Find(HashString::SupportedHashes()[i], Start, End))
         continue;


@@ -98,16 +110,28 @@ bool indexRecords::Load(const string Filename)                             /*{{{*/
       {
         if (!parseSumData(Start, End, Name, Hash, Size))
            return false;
       {
         if (!parseSumData(Start, End, Name, Hash, Size))
            return false;

-        indexRecords::checkSum *Sum = new indexRecords::checkSum;
-        Sum->MetaKeyFilename = Name;
-        Sum->Hash = HashString(HashString::SupportedHashes()[i],Hash);
-        Sum->Size = Size;
-        Entries[Name] = Sum;
+
+         if (Entries.find(Name) == Entries.end())
+         {
+            indexRecords::checkSum *Sum = new indexRecords::checkSum;
+            Sum->MetaKeyFilename = Name;
+            Sum->Size = Size;
+#if __GNUC__ >= 4
+       #pragma GCC diagnostic push
+       #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+            Sum->Hash = HashString(HashString::SupportedHashes()[i],Hash);
+#if __GNUC__ >= 4
+       #pragma GCC diagnostic pop
+#endif
+            Entries[Name] = Sum;
+         }
+         Entries[Name]->Hashes.push_back(HashString(HashString::SupportedHashes()[i],Hash));
+         FoundHashSum = true;

       }
       }

-      break;

    }
 
    }
 

-   if(HashString::SupportedHashes()[i] == NULL)
+   if(FoundHashSum == false)

    {
       strprintf(ErrorText, _("No Hash entry in Release file %s"), Filename.c_str());
       return false;
    {
       strprintf(ErrorText, _("No Hash entry in Release file %s"), Filename.c_str());
       return false;


@@ -129,10 +153,10 @@ bool indexRecords::Load(const string Filename)                            /*{{{*/
    // get the user settings for this archive and use what expires earlier
    int MaxAge = _config->FindI("Acquire::Max-ValidTime", 0);
    if (Label.empty() == false)
    // get the user settings for this archive and use what expires earlier
    int MaxAge = _config->FindI("Acquire::Max-ValidTime", 0);
    if (Label.empty() == false)

-      MaxAge = _config->FindI(string("Acquire::Max-ValidTime::" + Label).c_str(), MaxAge);
+      MaxAge = _config->FindI(("Acquire::Max-ValidTime::" + Label).c_str(), MaxAge);

    int MinAge = _config->FindI("Acquire::Min-ValidTime", 0);
    if (Label.empty() == false)
    int MinAge = _config->FindI("Acquire::Min-ValidTime", 0);
    if (Label.empty() == false)

-      MinAge = _config->FindI(string("Acquire::Min-ValidTime::" + Label).c_str(), MinAge);
+      MinAge = _config->FindI(("Acquire::Min-ValidTime::" + Label).c_str(), MinAge);

 
    if(MaxAge == 0 &&
       (MinAge == 0 || ValidUntil == 0)) // No user settings, use the one from the Release file
 
    if(MaxAge == 0 &&
       (MinAge == 0 || ValidUntil == 0)) // No user settings, use the one from the Release file


@@ -234,6 +258,6 @@ indexRecords::indexRecords()
 }
 
 indexRecords::indexRecords(const string ExpectedDist) :
 }
 
 indexRecords::indexRecords(const string ExpectedDist) :

-   ExpectedDist(ExpectedDist), ValidUntil(0)
+   ExpectedDist(ExpectedDist), ValidUntil(0), SupportsAcquireByHash(false)

 {
 }
 {
 }