X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=contrib%2Fsignature_checking_optional-doogie.diff;fp=contrib%2Fsignature_checking_optional-doogie.diff;h=6a5bbc6658b2209468302f5ff6fc222b424bfc09;hb=34ad014e5a33ca876e9ebfdf87d3ef881b9889fb;hp=0000000000000000000000000000000000000000;hpb=4de0b2e26a27cc48fa2ac8f4bc28119b253ba34c;p=dak.git

diff --git a/contrib/signature_checking_optional-doogie.diff b/contrib/signature_checking_optional-doogie.diff
new file mode 100644
index 00000000..6a5bbc66
--- /dev/null
+++ b/contrib/signature_checking_optional-doogie.diff
@@ -0,0 +1,22 @@
+Index: katie
+===================================================================
+RCS file: /cvs/dak/dak/katie,v
+retrieving revision 1.28
+diff -u -r1.28 katie
+--- katie	2001/02/06 00:39:44	1.28
++++ katie	2001/02/09 18:14:49
+@@ -102,7 +102,13 @@
+ def check_signature (filename):
+     global reject_message
+ 
+-    (result, output) = commands.getstatusoutput("gpg --emulate-md-encode-bug --batch --no-options --no-default-keyring --always-trust --keyring=%s --keyring=%s < %s >/dev/null" % (Cnf["Dinstall::PGPKeyring"], Cnf["Dinstall::GPGKeyring"], filename))
++    if Cnf.FindB("Dinstall::NoSigCheck"):
++	return 1
++    keyrings = ""
++    for keyring in Cnf.ValueList("Dinstall::Keyrings"):
++	keyrings = keyrings + " --keyring " + keyring;
++
++    (result, output) = commands.getstatusoutput("gpg --emulate-md-encode-bug --batch --no-options --no-default-keyring --always-trust %s < %s >/dev/null" % (keyrings, filename))
+     if (result != 0):
+         reject_message = "Rejected: GPG signature check failed on `%s'.\n%s\n" % (os.path.basename(filename), output)
+         return 0