From 9206877b2e652ff6b88e3d992205270c45600c5c Mon Sep 17 00:00:00 2001 From: Anthony Towns Date: Sat, 12 Jan 2002 16:33:23 +0000 Subject: [PATCH] 2.2r5 and multiple signatures in Release.gpg --- katie.conf | 14 +++++--------- ziyi | 23 +++++++++++++++++------ 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/katie.conf b/katie.conf index 3f2b1061..ece51dd1 100644 --- a/katie.conf +++ b/katie.conf @@ -4,6 +4,7 @@ Dinstall GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg"; SigningKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg"; SigningPubKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; + SigningKeyIds "B8AE9B77 722F1AED"; SendmailCommand "/usr/sbin/sendmail -odq -oi -t"; MyEmailAddress "Debian Installer "; MyAdminAddress "ftpmaster@debian.org"; @@ -133,9 +134,9 @@ Suite sparc ""; }; Announce "debian-changes@lists.debian.org"; - Version "2.2r3"; + Version "2.2r5"; Origin "Debian"; - Description "Debian 2.2r3 Released 16th April 2001"; + Description "Debian 2.2r5 Released 10th January 2002"; CodeName "potato"; OverrideCodeName "potato"; Priority "1"; @@ -158,9 +159,9 @@ Suite }; Announce "debian-changes@lists.debian.org"; CopyChanges "dists/proposed-updates/"; - Version "2.2r4"; + Version "2.2r5"; Origin "Debian"; - Description "Proposed Updates for Debian 2.2r4 - Not Released"; + Description "Proposed Updates for Debian 2.2r5 - Not Released"; CodeName "proposed-updates"; OverrideCodeName "potato"; OverrideSuite "stable"; @@ -443,8 +444,3 @@ Location }; -Catherine { - Options { - Limit 20480; - }; -}; diff --git a/ziyi b/ziyi index b129a888..72c3f428 100755 --- a/ziyi +++ b/ziyi @@ -3,7 +3,7 @@ # Create all the Release files # Copyright (C) 2001 Anthony Towns -# $Id: ziyi,v 1.15 2001-12-18 16:26:12 ajt Exp $ +# $Id: ziyi,v 1.16 2002-01-12 16:33:23 ajt Exp $ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -275,15 +275,26 @@ def main (): out.close() if Cnf.has_key("Dinstall::SigningKeyring"): - dest = Cnf["Dir::RootDir"] + tree + "/Release.gpg" - if os.path.exists(dest): - os.unlink(dest) keyring = "--secret-keyring \"%s\"" % Cnf["Dinstall::SigningKeyring"] if Cnf.has_key("Dinstall::SigningPubKeyring"): keyring = keyring + " --keyring \"%s\"" % Cnf["Dinstall::SigningPubKeyring"] - os.system("gpg %s --no-options --batch --no-tty --armour --detach-sign <%s --output=%s" % (keyring, - Cnf["Dir::RootDir"] + tree + "/Release", dest)) + arguments = "--no-options --batch --no-tty --armour" + if Cnf.has_key("Dinstall::SigningKeyIds"): + signkeyids = string.split(Cnf["Dinstall::SigningKeyIds"]) + else: + signkeyids = [""] + + dest = Cnf["Dir::RootDir"] + tree + "/Release.gpg" + if os.path.exists(dest): + os.unlink(dest) + + for keyid in signkeyids: + if keyid != "": defkeyid = "--default-key %s" % keyid + else: defkeyid = "" + os.system("gpg %s %s %s --detach-sign <%s >>%s" % + (keyring, defkeyid, arguments, + Cnf["Dir::RootDir"] + tree + "/Release", dest)) ####################################################################################### -- 2.39.2