From 162d4038c842d7df4dbf1f95fe9bd05e0c8580e8 Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Fri, 25 Mar 2011 21:52:21 +0100 Subject: [PATCH] add the new keyrings to the queueds Signed-off-by: Joerg Jaspert --- scripts/debian/buildd-prepare-dir | 2 +- tools/debianqueued-0.9/config | 17 ++++++++++++++++- tools/debianqueued-0.9/config-backports | 17 ++++++++++++++++- tools/debianqueued-0.9/config-security | 17 ++++++++++++++++- tools/debianqueued-0.9/config-upload | 17 ++++++++++++++++- 5 files changed, 65 insertions(+), 5 deletions(-) diff --git a/scripts/debian/buildd-prepare-dir b/scripts/debian/buildd-prepare-dir index f7e48e4a..d8ae9227 100755 --- a/scripts/debian/buildd-prepare-dir +++ b/scripts/debian/buildd-prepare-dir @@ -47,7 +47,7 @@ mkdir -p "${TARGET}/keyrings" for arch in $archs; do if [ -f ${base}/${arch}/keyring.gpg ]; then - cp -al ${base}/${arch}/keyring.gpg ${TARGET}/buildd-keyrings/buildd-${arch}-keyring.gpg + cp -afl ${base}/${arch}/keyring.gpg ${TARGET}/buildd-keyrings/buildd-${arch}-keyring.gpg chmod 0644 ${TARGET}/buildd-keyrings/buildd-${arch}-keyring.gpg fi done diff --git a/tools/debianqueued-0.9/config b/tools/debianqueued-0.9/config index 16c482a0..e4d3caec 100644 --- a/tools/debianqueued-0.9/config +++ b/tools/debianqueued-0.9/config @@ -64,7 +64,22 @@ $statusdelay = 30; # names of the keyring files @keyrings = ( "/srv/keyring.debian.org/keyrings/debian-keyring.gpg", - "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg" ); + "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-alpha-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-amd64-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-armel-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-arm-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-hppa-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-hurd-i386-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-i386-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-ia64-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-kfreebsd-amd64-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-kfreebsd-i386-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-mipsel-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-mips-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-powerpc-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-s390-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-sparc-keyring.gpg"); # our log file $logfile = "$queued_dir/log"; diff --git a/tools/debianqueued-0.9/config-backports b/tools/debianqueued-0.9/config-backports index f04e925d..1c9e0c9a 100644 --- a/tools/debianqueued-0.9/config-backports +++ b/tools/debianqueued-0.9/config-backports @@ -63,7 +63,22 @@ $statusfile = "$incoming/status"; $statusdelay = 30; # names of the keyring files -@keyrings = ( "/srv/backports-master.debian.org/keyrings/keyring.gpg" ); +@keyrings = ( "/srv/backports-master.debian.org/keyrings/keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-alpha-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-amd64-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-armel-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-arm-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-hppa-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-hurd-i386-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-i386-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-ia64-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-kfreebsd-amd64-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-kfreebsd-i386-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-mipsel-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-mips-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-powerpc-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-s390-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-sparc-keyring.gpg"); # our log file $logfile = "$queued_dir/log"; diff --git a/tools/debianqueued-0.9/config-security b/tools/debianqueued-0.9/config-security index fe00f0d4..1806a114 100644 --- a/tools/debianqueued-0.9/config-security +++ b/tools/debianqueued-0.9/config-security @@ -63,7 +63,22 @@ $statusfile = "$incoming/status"; $statusdelay = 30; # names of the keyring files -@keyrings = ( "/srv/keyring.debian.org/keyrings/debian-keyring.gpg" ); +@keyrings = ( "/srv/keyring.debian.org/keyrings/debian-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-alpha-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-amd64-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-armel-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-arm-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-hppa-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-hurd-i386-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-i386-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-ia64-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-kfreebsd-amd64-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-kfreebsd-i386-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-mipsel-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-mips-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-powerpc-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-s390-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-sparc-keyring.gpg"); # our log file $logfile = "$queued_dir/log"; diff --git a/tools/debianqueued-0.9/config-upload b/tools/debianqueued-0.9/config-upload index 77cc90d7..d6071278 100644 --- a/tools/debianqueued-0.9/config-upload +++ b/tools/debianqueued-0.9/config-upload @@ -64,7 +64,22 @@ $statusdelay = 30; # names of the keyring files @keyrings = ( "/srv/keyring.debian.org/keyrings/debian-keyring.gpg", - "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg" ); + "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-alpha-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-amd64-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-armel-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-arm-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-hppa-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-hurd-i386-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-i386-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-ia64-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-kfreebsd-amd64-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-kfreebsd-i386-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-mipsel-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-mips-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-powerpc-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-s390-keyring.gpg", + "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-sparc-keyring.gpg"); # our log file $logfile = "$queued_dir/log"; -- 2.39.2