From e1430400bf012ab7e29b00c78796a14ce9f97107 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sat, 29 May 2010 12:04:51 +0200
Subject: * apt-pkg/indexrecords.{cc,h}:   - add a constant Exists check for
 MetaKeys * apt-pkg/acquire-item.cc:   - do not try PDiff if it is not listed
 in the Meta file

---
 apt-pkg/indexrecords.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'apt-pkg/indexrecords.h')

diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h
index 468d2bd0f..2e3103b70 100644
--- a/apt-pkg/indexrecords.h
+++ b/apt-pkg/indexrecords.h
@@ -34,6 +34,8 @@ class indexRecords
 
    // Lookup function
    virtual const checkSum *Lookup(const string MetaKey);
+   /** \brief tests if a checksum for this file is available */
+   bool Exists(string const &MetaKey) const;
    std::vector<std::string> MetaKeys();
 
    virtual bool Load(string Filename);
-- 
cgit v1.2.3


From 1ddb859611d2e0f3d9ea12085001810f689e8c99 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 8 Jun 2010 19:27:49 +0200
Subject: * apt-pkg/indexrecords.cc:   - backport forgotten Valid-Until patch
 from the obsolete experimental     branch to prevent replay attacks better,
 thanks to Thomas Viehmann     for the initial patch! (Closes: #499897)

---
 apt-pkg/indexrecords.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'apt-pkg/indexrecords.h')

diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h
index 468d2bd0f..500cf23c4 100644
--- a/apt-pkg/indexrecords.h
+++ b/apt-pkg/indexrecords.h
@@ -12,6 +12,7 @@
 
 #include <map>
 #include <vector>
+#include <ctime>
 
 class indexRecords
 {
@@ -25,6 +26,8 @@ class indexRecords
    string Dist;
    string Suite;
    string ExpectedDist;
+   time_t ValidUntil;
+
    std::map<string,checkSum *> Entries;
 
    public:
@@ -38,6 +41,7 @@ class indexRecords
 
    virtual bool Load(string Filename);
    string GetDist() const;
+   time_t GetValidUntil() const;
    virtual bool CheckDist(const string MaybeDist) const;
    string GetExpectedDist() const;
    virtual ~indexRecords(){};
-- 
cgit v1.2.3