* debian/apt.cron.daily:

  - if the timestamp is too far in the future, delete it

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 5c5ca88c79e8d4fb31740638ae350dec203a240d..b40bb2c30613bc08f97c84417cef1b8d9397ed93 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -76,6 +76,13 @@ check_stamp()
     #echo "stampfile: $1"
     #echo "interval=$interval, now=$now, stamp=$stamp, delta=$delta"
 
+    # remove timestamps a day (or more) in the future and force re-check
+    if [ $stamp -gt $(($now+86400)) ]; then
+         echo "WARNING: file $stamp_file has a timestamp in the future: $stamp"
+         rm -f "$stamp_file"
+         return 0
+    fi
+
     if [ $delta -ge $interval ]; then
         return 0
     fi

diff --git a/debian/changelog b/debian/changelog
index fe03eb8e0a33a417e93772575b5c4c9fe291fd0a..7f14502e780acd46dc4ea2584cb427134adb1e29 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ apt (0.7.22) UNRELEASED; urgency=low
 
   [ Michael Vogt ]
   * honor the dpkg hold state in AutoInstOk (closes: #64141)
+  * debian/apt.cron.daily:
+    - if the timestamp is too far in the future, delete it
   
   [ Julian Andres Klode ]
   * apt-pkg/contrib/configuration.cc: Fix a small memory leak in