Fix dkimverify verbose option so it works and add documentation, thanks to Uwe Kleine-König for the patch (Debian: #1075791), bump version to 1.1.9

This commit is contained in:
Scott Kitterman
2024-07-05 09:42:26 -04:00
parent 21b9410f4f
commit 2275718e74
5 changed files with 13 additions and 5 deletions
+5 -1
View File
@@ -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
+1 -1
View File
@@ -13,7 +13,7 @@ https://tools.ietf.org/html/rfc6376
# VERSION
This is dkimpy 1.1.8.
This is dkimpy 1.1.9.
# REQUIREMENTS
+4 -1
View File
@@ -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)
+2 -1
View File
@@ -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>.
+1 -1
View File
@@ -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: