From 2275718e74ca2c973e35351f872fa9a90d97c16c Mon Sep 17 00:00:00 2001
From: Scott Kitterman <scott@kitterman.com>
Date: Fri, 5 Jul 2024 09:42:26 -0400
Subject: [PATCH] =?UTF-8?q?Fix=20dkimverify=20verbose=20option=20so=20it?=
 =?UTF-8?q?=20works=20and=20add=20documentation,=20thanks=20to=20Uwe=20Kle?=
 =?UTF-8?q?ine-K=C3=B6nig=20for=20the=20patch=20(Debian:=20#1075791),=20bu?=
 =?UTF-8?q?mp=20version=20to=201.1.9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ChangeLog          | 6 +++++-
 README.md          | 2 +-
 dkim/dkimverify.py | 5 ++++-
 man/dkimverify.1   | 3 ++-
 setup.py           | 2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c298b0f..630c90e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
+UNRELEASED Version 1.1.9
+   - Fix dkimverify verbose option so it works and add documentation, thanks
+     to Uwe Kleine-König for the patch (Debian: #1075791)
+
 2024-07-04 Version 1.1.8
    - Correctly handle verification of signatures without t= (timestamp) and
-     with x= (expiration); both are optional (LP: 2071892)
+     with x= (expiration); both are optional (LP: #2071892)
 
 2024-06-23 Version 1.1.7
    - Fix error in validate_signature_fields which prevented signature
diff --git a/README.md b/README.md
index 030227d..67cec01 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ https://tools.ietf.org/html/rfc6376
 
 # VERSION
 
-This is dkimpy 1.1.8.
+This is dkimpy 1.1.9.
 
 # REQUIREMENTS
 
diff --git a/dkim/dkimverify.py b/dkim/dkimverify.py
index 2ca90d5..c2c0291 100644
--- a/dkim/dkimverify.py
+++ b/dkim/dkimverify.py
@@ -34,15 +34,18 @@ def main():
         epilog="message to be verified follows commands on stdin")
     parser.add_argument('--index', metavar='N', type=int, default=0,
         help='Index of DKIM signature header to verify: default=0')
+    parser.add_argument('-v', '--verbose', default=False, action='store_true',
+        help='Add some debugging output')
     args=parser.parse_args()
     if sys.version_info[0] >= 3:
         # Make sys.stdin a binary stream.
         sys.stdin = sys.stdin.detach()
 
     message = sys.stdin.read()
-    verbose = '-v' in sys.argv
+    verbose = args.verbose
     if verbose:
         import logging
+        logging.basicConfig(level=logging.DEBUG)
         d = dkim.DKIM(message, logger=logging)
     else:
         d = dkim.DKIM(message)
diff --git a/man/dkimverify.1 b/man/dkimverify.1
index 2b13d89..836eb20 100644
--- a/man/dkimverify.1
+++ b/man/dkimverify.1
@@ -142,11 +142,12 @@ code 0 if the signature verifies successfully. Otherwise, it returns with exit
 code 1.
 
 .SH "USAGE"
-usage: dkimverify.py [\-h] [\-\-index N] <message
+usage: dkimverify.py [\-h] [\-\-index N] [\-\-verbose] <message
 
 optional arguments:
   \-h, \-\-help  show this help message and exit
   \-\-index N   Index of DKIM signature header to verify: default=0
+  \-\-verbose   Emit diagnostic output
 
 .SH "AUTHORS"
 This version of \fBdkimverify\fR was written by Greg Hewgill <greg@hewgill.com>.
diff --git a/setup.py b/setup.py
index 23c15be..232360e 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ from setuptools import setup
 import os
 import sys
 
-version = "1.1.8"
+version = "1.1.9"
 
 kw = {}  # Work-around for lack of 'or' requires in setuptools.
 try: