merge with current debian apt/sid

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

diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc
index 24ed02ba569040d0c287976850df136311112262..ba5b7c84620d72a3ae86d2d9297ad0f5a240ff06 100644 (file)
--- a/apt-pkg/indexrecords.cc
+++ b/apt-pkg/indexrecords.cc
@@ -39,6 +39,11 @@ 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);
@@ -50,14 +55,17 @@ bool indexRecords::Load(const string Filename)                              /*{{{*/
    }
 
    pkgTagSection Section;
-   if (TagFile.Step(Section) == false)
-   {
-      strprintf(ErrorText, _("No sections in Release file %s"), Filename.c_str());
-      return false;
-   }
-
    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");
@@ -88,33 +96,49 @@ bool indexRecords::Load(const string Filename)                              /*{{{*/
    {
       strprintf(ErrorText, _("No Hash entry in Release file %s"), Filename.c_str());
       return false;
-   }  
+   }
 
    string Label = Section.FindS("Label");
-   string StrDate = Section.FindS("Date"); 
+   string StrDate = Section.FindS("Date");
    string StrValidUntil = Section.FindS("Valid-Until");
 
-   // if we have a Valid-Until header, use it
-   if (!StrValidUntil.empty())
+   // if we have a Valid-Until header in the Release file, use it as default
+   if (StrValidUntil.empty() == false)
    {
-      // set ValidUntil based on the information in the Release file
-      if(!StrToTime(StrValidUntil, ValidUntil))
+      if(RFC1123StrToTime(StrValidUntil.c_str(), ValidUntil) == false)
       {
-        ErrorText = _(("Invalid 'Valid-Until' entry in Release file " + Filename).c_str());
+        strprintf(ErrorText, _("Invalid 'Valid-Until' entry in Release file %s"), Filename.c_str());
         return false;
       }
-   } else {
-      // if we don't have a valid-until string, check if we have a default
-      if (!Label.empty())
-      {
-        int MaxAge = _config->FindI(string("apt::acquire::max-default-age::"+Label).c_str(),0);
-        if(MaxAge > 0 && !StrToTime(StrDate, ValidUntil))
-        {
-           ErrorText = _(("Invalid 'Date' entry in Release file " + Filename).c_str());
-           return false;
-        }
-        ValidUntil += 24*60*60*MaxAge;      
-      }
+   }
+   // 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);
+   int MinAge = _config->FindI("Acquire::Min-ValidTime", 0);
+   if (Label.empty() == false)
+      MinAge = _config->FindI(string("Acquire::Min-ValidTime::" + Label).c_str(), MinAge);
+
+   if(MaxAge == 0 &&
+      (MinAge == 0 || ValidUntil == 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;
+   }
+
+   if (MinAge != 0 && ValidUntil != 0) {
+      time_t const min_date = date + MinAge;
+      if (ValidUntil < min_date)
+        ValidUntil = min_date;
+   }
+   if (MaxAge != 0) {
+      time_t const max_date = date + MaxAge;
+      if (ValidUntil == 0 || ValidUntil > max_date)
+        ValidUntil = max_date;
    }
 
    return true;