Merge branch 'master' into security

* master:
  dak.conf
  unchecked
  Create tracefile according to new format

diff --git a/ChangeLog b/ChangeLog
index 2c3036feaeafe00aca11e99f07803c2d674a7b7b..a2e9ed6eeb0d5d2b754c119ccd0679a0db9fa998 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-11-11  Joerg Jaspert  <joerg@debian.org>
+
+       * config/debian/dak.conf: good bye oldstable/o-p-u
+
+2008-11-10  Joerg Jaspert  <joerg@debian.org>
+
+       * config/debian/cron.unchecked: how about us ignoring bugs.d.o
+       down? It's not like it is time critical or something to transfer
+       this stuff, it doesn't hurt to have it there a bit later...
+
+2008-11-08  Joerg Jaspert  <joerg@debian.org>
+
+       * config/debian/cron.hourly: Create new tracefile format.
+
 2008-11-05  Joerg Jaspert  <joerg@debian.org>
 
        * dak/new_security_install.py (_do_Approve): This sudo call

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index ce1d43e621c5f11acc8e3291600beaf72b1f7b3c..2377fef26e91058087f0fc2418028073a62e8b0c 100755 (executable)
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -8,6 +8,8 @@ export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 date -u > $ftpdir/project/trace/ftp-master.debian.org
+echo "Using dak v1" >> $ftpdir/project/trace/ftp-master.debian.org
+echo "Running on host: $(hostname -f)" >> $ftpdir/project/trace/ftp-master.debian.org
 dak import-users-from-passwd
 dak queue-report -n > $webdir/new.html
 dak show-deferred > ${webdir}/deferred.html

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index 406636ef65b0e0504e0c92bfdcae143c4420208c..41b664016126c642d12d7bb159d038e9f99f5516 100755 (executable)
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -35,7 +35,14 @@ if lockfile -r3 $LOCKFILE; then
        echo "--" >> $report
 
        # sync with debbugs
-       rsync -aq --remove-source-files  $queuedir/bts_version_track/ bugs-sync:/org/bugs.debian.org/versions/queue/ftp-master/
+    rsync -aq -e "ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30" --remove-source-files  $queuedir/bts_version_track/ bugs-sync:/org/bugs.debian.org/versions/queue/ftp-master/ 2>/dev/null && touch $lockdir/synced_bts_version || true
+
+       NOW=$(date +%s)
+       TSTAMP=$(stat -c %Y $lockdir/synced_bts_version)
+       DIFF=$(( NOW - TSTAMP ))
+       if [ $DIFF -ge 259200 ]; then
+               echo "Kids, you tried your best and you failed miserably. The lesson is, never try. (Homer Simpson)"
+       fi
 
        if lockfile -r3 $NOTICE; then
            LOCKDAILY="YES"

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index fc251f8bb50303472a87f8c62c298b7a3fd13d71..77f5c918f11fd3a0a108e5032721fa8e2981461d 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -234,105 +234,6 @@ Check-Overrides
 
 Suite
 {
-  Oldstable
-  {
-       Components
-       {
-         main;
-         contrib;
-         non-free;
-       };
-       Architectures
-       {
-         source;
-         all;
-         alpha;
-         arm;
-         hppa;
-         i386;
-         ia64;
-         m68k;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
-       Announce "debian-changes@lists.debian.org";
-       Version "3.1r8";
-       Origin "Debian";
-       Description "Debian 3.1r8 Released 12 April 2008";
-       CodeName "sarge";
-       OverrideCodeName "sarge";
-       Priority "2";
-       Untouchable "1";
-        ChangeLogBase "dists/oldstable/";
-       UdebComponents
-       {
-         main;
-       };
-  };
-
-  Oldstable-Proposed-Updates
-  {
-       Components
-       {
-         main;
-         contrib;
-         non-free;
-       };
-       Architectures
-       {
-         source;
-         all;
-         alpha;
-         arm;
-         hppa;
-         i386;
-         ia64;
-         m68k;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
-       Announce "debian-changes@lists.debian.org";
-       CopyChanges "dists/oldstable-proposed-updates/";
-       CopyDotDak "/srv/ftp.debian.org/queue/oldstable-proposed-updates/";
-       CommentsDir "/srv/ftp.debian.org/queue/o-p-u-new/COMMENTS/";
-       Version "3.1-updates";
-       Origin "Debian";
-       Description "Debian 3.1 Proposed Updates - Not Released";
-       CodeName "sarge-proposed-updates";
-       OverrideCodeName "sarge";
-       OverrideSuite "oldstable";
-       Untouchable "1";
-       Priority "2";
-       VersionChecks
-       {
-         MustBeNewerThan
-         {
-           Oldstable;
-         };
-         MustBeOlderThan
-         {
-           Stable;
-           Testing;
-           Unstable;
-           Experimental;
-         };
-         Enhances
-          {
-           Oldstable;
-         };
-       };
-       UdebComponents
-       {
-         main;
-       };
-  };
-
   Stable
   {
        Components
@@ -365,7 +266,7 @@ Suite
        OverrideCodeName "etch";
        Priority "5";
        Untouchable "1";
-        ChangeLogBase "dists/stable/";
+       ChangeLogBase "dists/stable/";
        UdebComponents
        {
          main;
@@ -556,7 +457,6 @@ Suite
        };
   };
 
-
   Unstable
   {
        Components