From dc1d376ae6881c364142899d20ca0053b65039da Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Mon, 20 May 2013 12:59:19 -0300 Subject: devel: add printmimestructure script (from notmuch devel scripts) David Bremner writes: I find this script pretty useful when figuring out who to blame for MIME rendering problems. The notmuch repo will be the new primary home for this script, unless and until a better home turns up. Signed-off-by: Daniel Kahn Gillmor --- printmimestructure | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100755 printmimestructure diff --git a/printmimestructure b/printmimestructure new file mode 100755 index 0000000..34d1293 --- /dev/null +++ b/printmimestructure @@ -0,0 +1,52 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +# Author: Daniel Kahn Gillmor +# License: GPLv3+ + +# This script reads a MIME message from stdin and produces a treelike +# representation on it stdout. + +# Example: +# +# 0 dkg@alice:~$ printmimestructure < 'Maildir/cur/1269025522.M338697P12023.monkey,S=6459,W=6963:2,Sa' +# └┬╴multipart/signed 6546 bytes +# ├─╴text/plain inline 895 bytes +# └─╴application/pgp-signature inline [signature.asc] 836 bytes +# 0 dkg@alice:~$ + + +# If you want to number the parts, i suggest piping the output through +# something like "cat -n" + +import email +import sys + +def test(z, prefix=''): + fname = '' if z.get_filename() is None else ' [' + z.get_filename() + ']' + cset = '' if z.get_charset() is None else ' (' + z.get_charset() + ')' + disp = z.get_params(None, header='Content-Disposition') + if (disp is None): + disposition = '' + else: + disposition = '' + for d in disp: + if d[0] in [ 'attachment', 'inline' ]: + disposition = ' ' + d[0] + if (z.is_multipart()): + print prefix + '┬╴' + z.get_content_type() + cset + disposition + fname, z.as_string().__len__().__str__() + ' bytes' + if prefix.endswith('└'): + prefix = prefix.rpartition('└')[0] + ' ' + if prefix.endswith('├'): + prefix = prefix.rpartition('├')[0] + '│' + parts = z.get_payload() + i = 0 + while (i < parts.__len__()-1): + test(parts[i], prefix + '├') + i += 1 + test(parts[i], prefix + '└') + # FIXME: show epilogue? + else: + print prefix + '─╴'+ z.get_content_type() + cset + disposition + fname, z.get_payload().__len__().__str__(), 'bytes' + +test(email.message_from_file(sys.stdin), '└') -- cgit v1.2.3 From 4aa83c9d18252c44814668cdd4a39b65f8f54234 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Tue, 12 Jun 2018 17:21:08 -0400 Subject: devel: make printmimestructure py3 compatible Make printmimestructure work in python3 as well as python2. Signed-off-by: Daniel Kahn Gillmor --- printmimestructure | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/printmimestructure b/printmimestructure index 34d1293..a5fc83e 100755 --- a/printmimestructure +++ b/printmimestructure @@ -19,6 +19,8 @@ # If you want to number the parts, i suggest piping the output through # something like "cat -n" +from __future__ import print_function + import email import sys @@ -34,7 +36,7 @@ def test(z, prefix=''): if d[0] in [ 'attachment', 'inline' ]: disposition = ' ' + d[0] if (z.is_multipart()): - print prefix + '┬╴' + z.get_content_type() + cset + disposition + fname, z.as_string().__len__().__str__() + ' bytes' + print(prefix + '┬╴' + z.get_content_type() + cset + disposition + fname, z.as_string().__len__().__str__() + ' bytes') if prefix.endswith('└'): prefix = prefix.rpartition('└')[0] + ' ' if prefix.endswith('├'): @@ -47,6 +49,6 @@ def test(z, prefix=''): test(parts[i], prefix + '└') # FIXME: show epilogue? else: - print prefix + '─╴'+ z.get_content_type() + cset + disposition + fname, z.get_payload().__len__().__str__(), 'bytes' + print(prefix + '─╴'+ z.get_content_type() + cset + disposition + fname, z.get_payload().__len__().__str__(), 'bytes') test(email.message_from_file(sys.stdin), '└') -- cgit v1.2.3 From d79249f2b04d3f75b5cd7fbfe2cdcbddd25411f1 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Tue, 12 Jun 2018 17:21:09 -0400 Subject: minor cleanup to printmimestructure make the source slightly easier to read. no functional change. Signed-off-by: Daniel Kahn Gillmor --- printmimestructure | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/printmimestructure b/printmimestructure index a5fc83e..70e0a5c 100755 --- a/printmimestructure +++ b/printmimestructure @@ -24,7 +24,7 @@ from __future__ import print_function import email import sys -def test(z, prefix=''): +def print_part(z, prefix): fname = '' if z.get_filename() is None else ' [' + z.get_filename() + ']' cset = '' if z.get_charset() is None else ' (' + z.get_charset() + ')' disp = z.get_params(None, header='Content-Disposition') @@ -35,8 +35,23 @@ def test(z, prefix=''): for d in disp: if d[0] in [ 'attachment', 'inline' ]: disposition = ' ' + d[0] + if z.is_multipart(): + nbytes = len(z.as_string()) + else: + nbytes = len(z.get_payload()) + + print('{}{}{}{}{} {:d} bytes'.format( + prefix, + z.get_content_type(), + cset, + disposition, + fname, + nbytes, + )) + +def test(z, prefix=''): if (z.is_multipart()): - print(prefix + '┬╴' + z.get_content_type() + cset + disposition + fname, z.as_string().__len__().__str__() + ' bytes') + print_part(z, prefix+'┬╴') if prefix.endswith('└'): prefix = prefix.rpartition('└')[0] + ' ' if prefix.endswith('├'): @@ -49,6 +64,6 @@ def test(z, prefix=''): test(parts[i], prefix + '└') # FIXME: show epilogue? else: - print(prefix + '─╴'+ z.get_content_type() + cset + disposition + fname, z.get_payload().__len__().__str__(), 'bytes') + print_part(z, prefix+'─╴') test(email.message_from_file(sys.stdin), '└') -- cgit v1.2.3 From 37946242391b530d01da277918e4531f3855c875 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Tue, 10 Sep 2019 12:50:58 -0400 Subject: move printmimestructure to python3, dropping py2 compatibility Signed-off-by: Daniel Kahn Gillmor --- printmimestructure | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/printmimestructure b/printmimestructure index 70e0a5c..49e7208 100755 --- a/printmimestructure +++ b/printmimestructure @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # Author: Daniel Kahn Gillmor @@ -15,12 +15,9 @@ # └─╴application/pgp-signature inline [signature.asc] 836 bytes # 0 dkg@alice:~$ - # If you want to number the parts, i suggest piping the output through # something like "cat -n" -from __future__ import print_function - import email import sys -- cgit v1.2.3 From 1de22d43cdbbb964ea51e8d807ea808b174a24a2 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Tue, 10 Sep 2019 12:51:38 -0400 Subject: rename printmimestructure to email-print-mime-structure Signed-off-by: Daniel Kahn Gillmor --- email-print-mime-structure | 66 ++++++++++++++++++++++++++++++++++++++++++++++ printmimestructure | 66 ---------------------------------------------- 2 files changed, 66 insertions(+), 66 deletions(-) create mode 100755 email-print-mime-structure delete mode 100755 printmimestructure diff --git a/email-print-mime-structure b/email-print-mime-structure new file mode 100755 index 0000000..49e7208 --- /dev/null +++ b/email-print-mime-structure @@ -0,0 +1,66 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +# Author: Daniel Kahn Gillmor +# License: GPLv3+ + +# This script reads a MIME message from stdin and produces a treelike +# representation on it stdout. + +# Example: +# +# 0 dkg@alice:~$ printmimestructure < 'Maildir/cur/1269025522.M338697P12023.monkey,S=6459,W=6963:2,Sa' +# └┬╴multipart/signed 6546 bytes +# ├─╴text/plain inline 895 bytes +# └─╴application/pgp-signature inline [signature.asc] 836 bytes +# 0 dkg@alice:~$ + +# If you want to number the parts, i suggest piping the output through +# something like "cat -n" + +import email +import sys + +def print_part(z, prefix): + fname = '' if z.get_filename() is None else ' [' + z.get_filename() + ']' + cset = '' if z.get_charset() is None else ' (' + z.get_charset() + ')' + disp = z.get_params(None, header='Content-Disposition') + if (disp is None): + disposition = '' + else: + disposition = '' + for d in disp: + if d[0] in [ 'attachment', 'inline' ]: + disposition = ' ' + d[0] + if z.is_multipart(): + nbytes = len(z.as_string()) + else: + nbytes = len(z.get_payload()) + + print('{}{}{}{}{} {:d} bytes'.format( + prefix, + z.get_content_type(), + cset, + disposition, + fname, + nbytes, + )) + +def test(z, prefix=''): + if (z.is_multipart()): + print_part(z, prefix+'┬╴') + if prefix.endswith('└'): + prefix = prefix.rpartition('└')[0] + ' ' + if prefix.endswith('├'): + prefix = prefix.rpartition('├')[0] + '│' + parts = z.get_payload() + i = 0 + while (i < parts.__len__()-1): + test(parts[i], prefix + '├') + i += 1 + test(parts[i], prefix + '└') + # FIXME: show epilogue? + else: + print_part(z, prefix+'─╴') + +test(email.message_from_file(sys.stdin), '└') diff --git a/printmimestructure b/printmimestructure deleted file mode 100755 index 49e7208..0000000 --- a/printmimestructure +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Author: Daniel Kahn Gillmor -# License: GPLv3+ - -# This script reads a MIME message from stdin and produces a treelike -# representation on it stdout. - -# Example: -# -# 0 dkg@alice:~$ printmimestructure < 'Maildir/cur/1269025522.M338697P12023.monkey,S=6459,W=6963:2,Sa' -# └┬╴multipart/signed 6546 bytes -# ├─╴text/plain inline 895 bytes -# └─╴application/pgp-signature inline [signature.asc] 836 bytes -# 0 dkg@alice:~$ - -# If you want to number the parts, i suggest piping the output through -# something like "cat -n" - -import email -import sys - -def print_part(z, prefix): - fname = '' if z.get_filename() is None else ' [' + z.get_filename() + ']' - cset = '' if z.get_charset() is None else ' (' + z.get_charset() + ')' - disp = z.get_params(None, header='Content-Disposition') - if (disp is None): - disposition = '' - else: - disposition = '' - for d in disp: - if d[0] in [ 'attachment', 'inline' ]: - disposition = ' ' + d[0] - if z.is_multipart(): - nbytes = len(z.as_string()) - else: - nbytes = len(z.get_payload()) - - print('{}{}{}{}{} {:d} bytes'.format( - prefix, - z.get_content_type(), - cset, - disposition, - fname, - nbytes, - )) - -def test(z, prefix=''): - if (z.is_multipart()): - print_part(z, prefix+'┬╴') - if prefix.endswith('└'): - prefix = prefix.rpartition('└')[0] + ' ' - if prefix.endswith('├'): - prefix = prefix.rpartition('├')[0] + '│' - parts = z.get_payload() - i = 0 - while (i < parts.__len__()-1): - test(parts[i], prefix + '├') - i += 1 - test(parts[i], prefix + '└') - # FIXME: show epilogue? - else: - print_part(z, prefix+'─╴') - -test(email.message_from_file(sys.stdin), '└') -- cgit v1.2.3 From d803d5b2ff13b431d1029f57e7b436fbd6028c89 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Tue, 10 Sep 2019 16:00:53 -0400 Subject: update email-print-mime-structure headers to include licensing Signed-off-by: Daniel Kahn Gillmor --- debian/control | 4 ++++ email-print-mime-structure | 39 +++++++++++++++++++++++++-------------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/debian/control b/debian/control index 8667a6c..6d3a54f 100644 --- a/debian/control +++ b/debian/control @@ -55,3 +55,7 @@ Description: collection of scripts for manipulating e-mail on Debian maildir-import-patch -- import a git patch series into a maildir . notmuch-import-patch -- import a git patch series into notmuch + . + email-print-mime-structure -- tree view of a message's MIME structure + . + email-extract-openpgp-certs -- extract OpenPGP certificates from a message diff --git a/email-print-mime-structure b/email-print-mime-structure index 49e7208..7adeb2b 100755 --- a/email-print-mime-structure +++ b/email-print-mime-structure @@ -1,23 +1,34 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Author: Daniel Kahn Gillmor -# License: GPLv3+ - -# This script reads a MIME message from stdin and produces a treelike -# representation on it stdout. - -# Example: +# Copyright (C) 2019 Daniel Kahn Gillmor +# +# 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 +# the Free Software Foundation, either version 3 of the License, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # -# 0 dkg@alice:~$ printmimestructure < 'Maildir/cur/1269025522.M338697P12023.monkey,S=6459,W=6963:2,Sa' -# └┬╴multipart/signed 6546 bytes -# ├─╴text/plain inline 895 bytes -# └─╴application/pgp-signature inline [signature.asc] 836 bytes -# 0 dkg@alice:~$ +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +''' +This script reads a MIME message from stdin and produces a treelike +representation on it stdout. -# If you want to number the parts, i suggest piping the output through -# something like "cat -n" +Example: +0 dkg@alice:~$ printmimestructure < 'Maildir/cur/1269025522.M338697P12023.monkey,S=6459,W=6963:2,Sa' +└┬╴multipart/signed 6546 bytes + ├─╴text/plain inline 895 bytes + └─╴application/pgp-signature inline [signature.asc] 836 bytes +0 dkg@alice:~$ +If you want to number the parts, i suggest piping the output through +something like "cat -n" +''' import email import sys -- cgit v1.2.3 From fa7f48437abc1bab31a452355a5015d74180ca99 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Tue, 10 Sep 2019 14:44:43 -0400 Subject: add manpage for email-print-mime-structure Signed-off-by: Daniel Kahn Gillmor --- Makefile | 1 + email-print-mime-structure.1.pod | 62 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 email-print-mime-structure.1.pod diff --git a/Makefile b/Makefile index 48cb2fa..a7a9b6d 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ MANPAGES=mdmv.1 mbox2maildir.1 \ notmuch-slurp-debbug.1 notmuch-extract-patch.1 maildir-import-patch.1 \ email-extract-openpgp-certs.1 \ + email-print-mime-structure.1 \ notmuch-import-patch.1 all: $(MANPAGES) diff --git a/email-print-mime-structure.1.pod b/email-print-mime-structure.1.pod new file mode 100644 index 0000000..ab1ec05 --- /dev/null +++ b/email-print-mime-structure.1.pod @@ -0,0 +1,62 @@ +=encoding utf8 + +=head1 NAME + +email-print-mime-structure - display a tree-like view of the MIME structure of an e-mail + +=head1 SYNOPSIS + +B + +=head1 DESCRIPTION + +B reads a MIME message from stdin and +produces a treelike representation to stdout. + +If the user wants the parts numbered, they can feed the output through +something like "cat -n". + + +=head1 OPTIONS + +None. + +=head1 EXAMPLE + +=over 4 + + $ email-print-mime-structure currently does not try to decrypt +encrypted e-mails, so it cannot display the MIME structure that is +inside the message's cryptographic envelope. + +B's output is not stable, and is not +intended to be interpreted by machines, so please do not depend on it +in scripts! + +B displays some data from within the +e-mail, but does not sanitize it before display. Some particularly +cleverly-malformed MIME parameters might be able to induce apparent +formatting changes or emit arbitrary characters to stdout. + +B expects to be run in a UTF-8-friendly +environment. + +=head1 SEE ALSO + +https://tools.ietf.org/html/rfc2045, https://tools.ietf.org/html/rfc2049 + +=head1 AUTHOR + +B and this manpage were written by Daniel +Kahn Gillmor and Jameson Graef Rollins, with suggestions and feedback +from many others in the community that develops the notmuch mail user +agent. It originated in the notmuch source tree. -- cgit v1.2.3 From e45a4c80f1eda37409416c08a4fea39dac05bdbe Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Tue, 10 Sep 2019 15:00:28 -0400 Subject: ship email-print-mime-structure Signed-off-by: Daniel Kahn Gillmor --- debian/mailscripts.install | 1 + debian/mailscripts.manpages | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/mailscripts.install b/debian/mailscripts.install index d6f69f5..99216c1 100644 --- a/debian/mailscripts.install +++ b/debian/mailscripts.install @@ -5,3 +5,4 @@ maildir-import-patch /usr/bin notmuch-import-patch /usr/bin notmuch-extract-patch/notmuch-extract-patch /usr/bin email-extract-openpgp-certs /usr/bin +email-print-mime-structure /usr/bin diff --git a/debian/mailscripts.manpages b/debian/mailscripts.manpages index ab761b2..6d7cb30 100644 --- a/debian/mailscripts.manpages +++ b/debian/mailscripts.manpages @@ -5,3 +5,4 @@ maildir-import-patch.1 notmuch-import-patch.1 notmuch-extract-patch.1 email-extract-openpgp-certs.1 +email-print-mime-structure.1 -- cgit v1.2.3 From 4f7d08f600553d769cba2d0e8da08bd064d1c376 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Tue, 10 Sep 2019 14:59:43 -0400 Subject: generate nroff output in UTF-8. it is 2019! also, email-print-mime-structure's manpage uses UTF-8. groff can handle it just fine these days (assuming a UTF-8 locale, i haven't tested otherwise), so i don't think any debian system where this is installed is going to have a problem with it. We use UTF-8 in lots of different manpages already (see the tables in systemd.unit(5), for example). Signed-off-by: Daniel Kahn Gillmor --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index a7a9b6d..352f6f0 100644 --- a/Makefile +++ b/Makefile @@ -11,5 +11,6 @@ clean: %.1: %.1.pod pod2man --section=1 --date="Debian Project" --center="User Commands" \ + --utf8 \ --name=$(subst .1,,$@) \ $^ $@ -- cgit v1.2.3 From 110bde6523dc36e1be718cd310cd1cc7468ffb62 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 14 Sep 2019 12:15:59 -0700 Subject: changelog Signed-off-by: Sean Whitton --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 379199e..17d6405 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +mailscripts (0.11-1) UNRELEASED; urgency=medium + + * New script: email-prime-mime-structure (Closes: #939993). + Imported from the notmuch project, which never shipped it in releases. + Thanks to Daniel Kahn Gillmor for the patches. + * Generate nroff output in UTF-8. + Thanks to Daniel Kahn Gillmor for the patch. + + -- Sean Whitton Sat, 14 Sep 2019 12:14:49 -0700 + mailscripts (0.10-1) unstable; urgency=medium * New script: email-extract-openpgp-certs(1) (Closes: #932993). -- cgit v1.2.3 From 514fc25b69a6b679a571e40caf0166a27080bd67 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 14 Sep 2019 12:21:08 -0700 Subject: mailscripts.el: update version Signed-off-by: Sean Whitton --- mailscripts.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mailscripts.el b/mailscripts.el index 0198a3c..fde627d 100644 --- a/mailscripts.el +++ b/mailscripts.el @@ -1,7 +1,7 @@ ;;; mailscripts.el --- functions to access tools in the mailscripts package ;; Author: Sean Whitton -;; Version: 0.9 +;; Version: 0.11 ;; Package-Requires: (notmuch) ;; Copyright (C) 2018 Sean Whitton -- cgit v1.2.3 From a19b83c0b433ab75b5d32c3355a87e79693335b1 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Tue, 10 Sep 2019 16:02:35 -0400 Subject: use https:// instead of http:// Signed-off-by: Daniel Kahn Gillmor --- email-extract-openpgp-certs | 2 +- maildir-import-patch | 2 +- mailscripts.el | 2 +- mbox2maildir | 2 +- mdmv | 2 +- notmuch-extract-patch/LICENSE | 8 ++++---- notmuch-extract-patch/notmuch-extract-patch | 2 +- notmuch-import-patch | 2 +- notmuch-slurp-debbug | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/email-extract-openpgp-certs b/email-extract-openpgp-certs index 2a95748..03b7753 100755 --- a/email-extract-openpgp-certs +++ b/email-extract-openpgp-certs @@ -13,7 +13,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . '''Extract all OpenPGP certificates from an e-mail message diff --git a/maildir-import-patch b/maildir-import-patch index a17c6cb..f69a5e6 100755 --- a/maildir-import-patch +++ b/maildir-import-patch @@ -15,7 +15,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . import os import sys diff --git a/mailscripts.el b/mailscripts.el index fde627d..f0002fc 100644 --- a/mailscripts.el +++ b/mailscripts.el @@ -17,7 +17,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see . +;; along with this program. If not, see . ;;; Code: diff --git a/mbox2maildir b/mbox2maildir index 351a37c..e2f8e23 100755 --- a/mbox2maildir +++ b/mbox2maildir @@ -15,7 +15,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # Credits: diff --git a/mdmv b/mdmv index c81e52d..fa1533f 100755 --- a/mdmv +++ b/mdmv @@ -15,7 +15,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . import os import sys diff --git a/notmuch-extract-patch/LICENSE b/notmuch-extract-patch/LICENSE index 94a9ed0..e600086 100644 --- a/notmuch-extract-patch/LICENSE +++ b/notmuch-extract-patch/LICENSE @@ -1,7 +1,7 @@ GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found. GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. @@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see -. +. The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -. +. diff --git a/notmuch-extract-patch/notmuch-extract-patch b/notmuch-extract-patch/notmuch-extract-patch index df87a6c..cfd4464 100755 --- a/notmuch-extract-patch/notmuch-extract-patch +++ b/notmuch-extract-patch/notmuch-extract-patch @@ -15,7 +15,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . import mailbox import sys diff --git a/notmuch-import-patch b/notmuch-import-patch index ea61634..5a8e589 100755 --- a/notmuch-import-patch +++ b/notmuch-import-patch @@ -15,7 +15,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . use strict; use warnings; diff --git a/notmuch-slurp-debbug b/notmuch-slurp-debbug index d424236..ff5a54f 100755 --- a/notmuch-slurp-debbug +++ b/notmuch-slurp-debbug @@ -15,7 +15,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . use strict; use warnings; -- cgit v1.2.3 From 450acb4fe51292bcc346f866d7d402d8b0074120 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 15 Sep 2019 08:10:12 -0700 Subject: changelog Signed-off-by: Sean Whitton --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 17d6405..228371d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ mailscripts (0.11-1) UNRELEASED; urgency=medium Thanks to Daniel Kahn Gillmor for the patches. * Generate nroff output in UTF-8. Thanks to Daniel Kahn Gillmor for the patch. + * Use 'https' instead of 'http' in various places (Closes: #939994). + Thanks to Daniel Kahn Gillmor for the patch. -- Sean Whitton Sat, 14 Sep 2019 12:14:49 -0700 -- cgit v1.2.3 From d7bfd40d219ad8e2974260f92bb46059e858c989 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 15 Sep 2019 08:13:36 -0700 Subject: changelog typo Signed-off-by: Sean Whitton --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 228371d..bba8ba6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ mailscripts (0.11-1) UNRELEASED; urgency=medium - * New script: email-prime-mime-structure (Closes: #939993). + * New script: email-print-mime-structure (Closes: #939993). Imported from the notmuch project, which never shipped it in releases. Thanks to Daniel Kahn Gillmor for the patches. * Generate nroff output in UTF-8. -- cgit v1.2.3 From c3865570be223bc1876d69b3a910c5fae168ebb7 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 15 Sep 2019 08:13:47 -0700 Subject: release 0.11 (0.11-1 to Debian unstable) Signed-off-by: Sean Whitton --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bba8ba6..aa8c371 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mailscripts (0.11-1) UNRELEASED; urgency=medium +mailscripts (0.11-1) unstable; urgency=medium * New script: email-print-mime-structure (Closes: #939993). Imported from the notmuch project, which never shipped it in releases. @@ -8,7 +8,7 @@ mailscripts (0.11-1) UNRELEASED; urgency=medium * Use 'https' instead of 'http' in various places (Closes: #939994). Thanks to Daniel Kahn Gillmor for the patch. - -- Sean Whitton Sat, 14 Sep 2019 12:14:49 -0700 + -- Sean Whitton Sun, 15 Sep 2019 08:13:41 -0700 mailscripts (0.10-1) unstable; urgency=medium -- cgit v1.2.3