releasing version 0.8.11.2

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

diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc
index 77fe03d45b051c61bfcaca41bb546d78d2ceac00..10e154ad2305b33c1887bace3777d846d61604b5 100644 (file)
--- a/apt-pkg/indexrecords.cc
+++ b/apt-pkg/indexrecords.cc
@@ -7,8 +7,11 @@
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>

+#include <apt-pkg/configuration.h>

 #include <apti18n.h>
 #include <sys/stat.h>
 #include <apti18n.h>
 #include <sys/stat.h>

+#include <clocale>
+

                                                                        /*}}}*/
 string indexRecords::GetDist() const
 {
                                                                        /*}}}*/
 string indexRecords::GetDist() const
 {


@@ -26,30 +29,43 @@ string indexRecords::GetExpectedDist() const
    return this->ExpectedDist;
 }
 
    return this->ExpectedDist;
 }
 

+time_t indexRecords::GetValidUntil() const
+{
+   return this->ValidUntil;
+}
+

 const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey)
 {
    return Entries[MetaKey];
 }
 
 const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey)
 {
    return Entries[MetaKey];
 }
 

+bool indexRecords::Exists(string const &MetaKey) const
+{
+   return Entries.count(MetaKey) == 1;
+}
+

 bool indexRecords::Load(const string Filename)                         /*{{{*/
 {
    FileFd Fd(Filename, FileFd::ReadOnly);
    pkgTagFile TagFile(&Fd, Fd.Size() + 256); // XXX
    if (_error->PendingError() == true)
    {
 bool indexRecords::Load(const string Filename)                         /*{{{*/
 {
    FileFd Fd(Filename, FileFd::ReadOnly);
    pkgTagFile TagFile(&Fd, Fd.Size() + 256); // XXX
    if (_error->PendingError() == true)
    {

-      ErrorText = _(("Unable to parse Release file " + Filename).c_str());
+      strprintf(ErrorText, _("Unable to parse Release file %s"),Filename.c_str());

       return false;
    }
 
    pkgTagSection Section;
       return false;
    }
 
    pkgTagSection Section;

-   if (TagFile.Step(Section) == false)
-   {
-      ErrorText = _(("No sections in Release file " + Filename).c_str());
-      return false;
-   }
-

    const char *Start, *End;
    const char *Start, *End;

-   Section.Get (Start, End, 0);
+   // 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);

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


@@ -78,11 +94,42 @@ bool indexRecords::Load(const string Filename)                              /*{{{*/
 
    if(HashString::SupportedHashes()[i] == NULL)
    {
 
    if(HashString::SupportedHashes()[i] == NULL)
    {

-      ErrorText = _(("No Hash entry in Release file " + Filename).c_str());
+      strprintf(ErrorText, _("No Hash entry in Release file %s"), Filename.c_str());

       return false;
       return false;

-   }  
+   }
+
+   string Label = Section.FindS("Label");
+   string StrDate = Section.FindS("Date");
+   string StrValidUntil = Section.FindS("Valid-Until");
+
+   // if we have a Valid-Until header in the Release file, use it as default
+   if (StrValidUntil.empty() == false)
+   {
+      if(RFC1123StrToTime(StrValidUntil.c_str(), ValidUntil) == false)
+      {
+        strprintf(ErrorText, _("Invalid 'Valid-Until' entry in Release file %s"), Filename.c_str());
+        return false;
+      }
+   }
+   // get the user settings for this archive and use what expires earlier
+   int MaxAge = _config->FindI("Acquire::Max-ValidTime", 0);
+   if (Label.empty() == true)
+      MaxAge = _config->FindI(string("Acquire::Max-ValidTime::" + Label).c_str(), MaxAge);
+
+   if(MaxAge == 0) // No user settings, use the one from the Release file
+      return true;
+
+   time_t date;
+   if (RFC1123StrToTime(StrDate.c_str(), date) == false)
+   {
+      strprintf(ErrorText, _("Invalid 'Date' entry in Release file %s"), Filename.c_str());
+      return false;
+   }
+   date += 24*60*60*MaxAge;
+
+   if (ValidUntil == 0 || ValidUntil > date)
+      ValidUntil = date;

 
 

-   string Strdate = Section.FindS("Date"); // FIXME: verify this somehow?

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -160,6 +207,6 @@ indexRecords::indexRecords()
 }
 
 indexRecords::indexRecords(const string ExpectedDist) :
 }
 
 indexRecords::indexRecords(const string ExpectedDist) :

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

 {
 }
 {
 }