From 56596baab558912dde326bf332169cabfe0acfea Mon Sep 17 00:00:00 2001
From: Joerg Jaspert <joerg@debian.org>
Date: Fri, 8 Aug 2008 01:06:10 +0200
Subject: [PATCH] Added signing of buildd incoming

---
 ChangeLog                    |  4 ++
 config/debian/cron.unchecked | 86 +++++++++++++++++++++---------------
 2 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9ee80a8c..0c329fc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-08  Joerg Jaspert  <joerg@debian.org>
+
+	* config/debian/cron.unchecked: Added signing of buildd incoming
+
 2008-08-07  Joerg Jaspert  <joerg@debian.org>
 
 	* dak/cruft_report.py (parse_nfu): call utils.warn instead of warn
diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index 92f40cc9..984c448c 100755
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -11,47 +11,61 @@ NOTICE="$lockdir/daily.lock"
 
 if [ -e $NOTICE ]; then exit 0; fi
 
+STAMP=$(date "+%Y%m%d%H%M")
+
 cleanup() {
-  rm -f "$LOCKFILE"
-  if [ ! -z "$LOCKDAILY" ]; then
-	  rm -f "$NOTICE"
-  fi
+    rm -f "$LOCKFILE"
+    if [ ! -z "$LOCKDAILY" ]; then
+	rm -f "$NOTICE"
+    fi
 }
 
 # only run one cron.unchecked
 if lockfile -r3 $LOCKFILE; then
-	trap cleanup 0
-	cd $unchecked
-
-	changes=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs)
-	report=$queuedir/REPORT
-	timestamp=$(date "+%Y-%m-%d %H:%M")
-
-	if [ ! -z "$changes" ]; then
-		echo "$timestamp": "$changes"  >> $report
-		dak process-unchecked -a $changes >> $report
-		echo "--" >> $report
-
-		# sync with debbugs
-		rsync -aq --remove-source-files  $queuedir/bts_version_track/ bugs-sync:/org/bugs.debian.org/versions/queue/ftp-master/
-
-		if lockfile -r3 $NOTICE; then
-			LOCKDAILY="YES"
-			psql projectb -A -t -q -c "SELECT filename FROM queue_build WHERE queue = 0 AND suite = 5 AND in_queue = true AND filename ~ 'd(sc|eb)$'" > $dbdir/dists/unstable_accepted.list
-			cd $overridedir
-			dak make-overrides &>/dev/null
-			rm -f override.sid.all3 override.sid.all3.src
-			for i in main contrib non-free main.debian-installer; do
-				cat override.sid.$i >> override.sid.all3
-				if [ "$i" != "main.debian-installer" ]; then
-					cat override.sid.$i.src >> override.sid.all3.src
-				fi
-			done
-			cd $configdir
-			apt-ftparchive -qq -o APT::FTPArchive::Contents=off generate apt.conf.buildd
-			. $configdir/cron.buildd
+    trap cleanup 0
+    cd $unchecked
+
+    changes=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs)
+    report=$queuedir/REPORT
+    timestamp=$(date "+%Y-%m-%d %H:%M")
+
+    if [ ! -z "$changes" ]; then
+	echo "$timestamp": "$changes"  >> $report
+	dak process-unchecked -a $changes >> $report
+	echo "--" >> $report
+
+	# sync with debbugs
+	rsync -aq --remove-source-files  $queuedir/bts_version_track/ bugs-sync:/org/bugs.debian.org/versions/queue/ftp-master/
+
+	if lockfile -r3 $NOTICE; then
+	    LOCKDAILY="YES"
+	    psql projectb -A -t -q -c "SELECT filename FROM queue_build WHERE queue = 0 AND suite = 5 AND in_queue = true AND filename ~ 'd(sc|eb)$'" > $dbdir/dists/unstable_accepted.list
+	    cd $overridedir
+	    dak make-overrides &>/dev/null
+	    rm -f override.sid.all3 override.sid.all3.src
+	    for i in main contrib non-free main.debian-installer; do
+		cat override.sid.$i >> override.sid.all3
+		if [ "$i" != "main.debian-installer" ]; then
+		    cat override.sid.$i.src >> override.sid.all3.src
 		fi
-	else
-		echo "$timestamp": Nothing to do >> $report
+	    done
+	    cd $configdir
+	    apt-ftparchive -qq -o APT::FTPArchive::Contents=off generate apt.conf.buildd
+
+	    cd  ${incoming}/buildd
+	    rm -f Release.*
+	    apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="Debian" -o APT::FTPArchive::Release::Label="Debian" -o APT::FTPArchive::Release::Description="buildd incoming" -o APT::FTPArchive::Release::Architectures="${archs}" release . > Release
+	    gpg --secret-keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 6070D3A1 --detach-sign -o Release.gpg Release 
+
+	    cd ${incoming}
+	    mkdir -p tree/${STAMP}
+	    cp -al ${incoming}/buildd/. tree/${STAMP}/
+	    ln -sf ${incoming}/builddweb tree/${STAMP}
+	    find ./tree -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf
+
+	    . $configdir/cron.buildd
 	fi
+    else
+		echo "$timestamp": Nothing to do >> $report
+    fi
 fi
-- 
2.39.5