From: Joerg Jaspert <joerg@debian.org>
Date: Thu, 13 Nov 2008 06:59:00 +0000 (+0100)
Subject: Merge branch 'master' into security
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=006cbdd7669733c100b5ff59352c15591b11ff0f;hp=25e143f4083d446ab4009560d7e119a22a23596c;p=dak.git

Merge branch 'master' into security

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

diff --git a/ChangeLog b/ChangeLog
index 2c3036fe..a2e9ed6e 100644
--- 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 ce1d43e6..2377fef2 100755
--- 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 406636ef..41b66401 100755
--- 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 fc251f8b..77f5c918 100644
--- 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