--- /dev/null
+Return-Path: <dkg@fifthhorseman.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 6D2A76DE02A6\r
+ for <notmuch@notmuchmail.org>; Thu, 2 Jun 2016 09:26:45 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.021\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.021 tagged_above=-999 required=5\r
+ tests=[AWL=-0.021] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id o4x3ELjrgIxu for <notmuch@notmuchmail.org>;\r
+ Thu, 2 Jun 2016 09:26:31 -0700 (PDT)\r
+Received: from che.mayfirst.org (che.mayfirst.org [162.247.75.118])\r
+ by arlo.cworth.org (Postfix) with ESMTP id C4DD06DE0231\r
+ for <notmuch@notmuchmail.org>; Thu, 2 Jun 2016 09:26:15 -0700 (PDT)\r
+Received: from fifthhorseman.net (unknown [38.109.115.130])\r
+ by che.mayfirst.org (Postfix) with ESMTPSA id 6928CF999\r
+ for <notmuch@notmuchmail.org>; Thu, 2 Jun 2016 12:26:15 -0400 (EDT)\r
+Received: by fifthhorseman.net (Postfix, from userid 1000)\r
+ id E79B920492; Thu, 2 Jun 2016 12:26:14 -0400 (EDT)\r
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH 5/5] Use https instead of http where possible\r
+Date: Thu, 2 Jun 2016 12:26:14 -0400\r
+Message-Id: <1464884774-22961-5-git-send-email-dkg@fifthhorseman.net>\r
+X-Mailer: git-send-email 2.8.1\r
+In-Reply-To: <1464884774-22961-1-git-send-email-dkg@fifthhorseman.net>\r
+References: <1464884774-22961-1-git-send-email-dkg@fifthhorseman.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 02 Jun 2016 16:26:45 -0000\r
+\r
+Many of the external links found in the notmuch source can be resolved\r
+using https instead of http. This changeset addresses as many as i\r
+could find, without touching the e-mail corpus or expected outputs\r
+found in tests.\r
+---\r
+ COPYING | 2 +-\r
+ COPYING-GPL-3 | 8 ++++----\r
+ INSTALL | 4 ++--\r
+ Makefile.local | 4 ++--\r
+ README | 2 +-\r
+ README.rst | 6 +++---\r
+ bindings/go/README | 2 +-\r
+ bindings/go/src/notmuch/notmuch.go | 2 +-\r
+ bindings/python/README | 2 +-\r
+ bindings/python/docs/COPYING | 6 +++---\r
+ bindings/python/docs/source/index.rst | 2 +-\r
+ bindings/python/notmuch/__init__.py | 2 +-\r
+ bindings/python/notmuch/compat.py | 2 +-\r
+ bindings/python/notmuch/database.py | 2 +-\r
+ bindings/python/notmuch/directory.py | 2 +-\r
+ bindings/python/notmuch/errors.py | 2 +-\r
+ bindings/python/notmuch/filenames.py | 2 +-\r
+ bindings/python/notmuch/globals.py | 2 +-\r
+ bindings/python/notmuch/message.py | 2 +-\r
+ bindings/python/notmuch/messages.py | 2 +-\r
+ bindings/python/notmuch/query.py | 2 +-\r
+ bindings/python/notmuch/tag.py | 2 +-\r
+ bindings/python/notmuch/thread.py | 2 +-\r
+ bindings/python/notmuch/threads.py | 2 +-\r
+ bindings/python/setup.py | 10 +++++-----\r
+ bindings/ruby/database.c | 2 +-\r
+ bindings/ruby/defs.h | 2 +-\r
+ bindings/ruby/directory.c | 2 +-\r
+ bindings/ruby/filenames.c | 2 +-\r
+ bindings/ruby/init.c | 2 +-\r
+ bindings/ruby/message.c | 2 +-\r
+ bindings/ruby/messages.c | 2 +-\r
+ bindings/ruby/query.c | 2 +-\r
+ bindings/ruby/status.c | 2 +-\r
+ bindings/ruby/tags.c | 2 +-\r
+ bindings/ruby/thread.c | 2 +-\r
+ bindings/ruby/threads.c | 2 +-\r
+ compat/compat.h | 2 +-\r
+ compat/function-attributes.h | 2 +-\r
+ completion/notmuch-completion.bash | 2 +-\r
+ configure | 4 ++--\r
+ contrib/notmuch-mutt/README | 6 +++---\r
+ contrib/notmuch-mutt/notmuch-mutt | 2 +-\r
+ contrib/notmuch-vim/plugin/notmuch.vim | 4 ++--\r
+ crypto.c | 2 +-\r
+ debian/control | 4 ++--\r
+ debugger.c | 2 +-\r
+ devel/man-to-mdwn.pl | 2 +-\r
+ devel/nmbug/doc/man5/notmuch-report.json.5.rst | 2 +-\r
+ devel/nmbug/nmbug | 8 ++++----\r
+ devel/nmbug/notmuch-report | 2 +-\r
+ devel/nmbug/notmuch-report.json | 2 +-\r
+ devel/try-emacs-mua | 2 +-\r
+ doc/doxygen.cfg | 2 +-\r
+ doc/man1/notmuch.rst | 4 ++--\r
+ emacs/coolj.el | 2 +-\r
+ emacs/make-deps.el | 2 +-\r
+ emacs/notmuch-address.el | 2 +-\r
+ emacs/notmuch-company.el | 2 +-\r
+ emacs/notmuch-crypto.el | 2 +-\r
+ emacs/notmuch-hello.el | 4 ++--\r
+ emacs/notmuch-jump.el | 2 +-\r
+ emacs/notmuch-lib.el | 2 +-\r
+ emacs/notmuch-message.el | 2 +-\r
+ emacs/notmuch-mua.el | 6 +++---\r
+ emacs/notmuch-parser.el | 2 +-\r
+ emacs/notmuch-print.el | 2 +-\r
+ emacs/notmuch-query.el | 2 +-\r
+ emacs/notmuch-show.el | 8 ++++----\r
+ emacs/notmuch-tag.el | 2 +-\r
+ emacs/notmuch-tree.el | 2 +-\r
+ emacs/notmuch-version.el.tmpl | 2 +-\r
+ emacs/notmuch-wash.el | 2 +-\r
+ emacs/notmuch.el | 6 +++---\r
+ hooks.c | 2 +-\r
+ lib/built-with.c | 2 +-\r
+ lib/config.cc | 2 +-\r
+ lib/database-private.h | 2 +-\r
+ lib/database.cc | 4 ++--\r
+ lib/directory.cc | 2 +-\r
+ lib/filenames.c | 2 +-\r
+ lib/gen-version-script.sh | 2 +-\r
+ lib/index.cc | 2 +-\r
+ lib/message-file.c | 2 +-\r
+ lib/message.cc | 2 +-\r
+ lib/messages.c | 2 +-\r
+ lib/notmuch-private.h | 2 +-\r
+ lib/notmuch.h | 4 ++--\r
+ lib/parse-time-vrp.cc | 2 +-\r
+ lib/parse-time-vrp.h | 2 +-\r
+ lib/query-fp.cc | 2 +-\r
+ lib/query-fp.h | 2 +-\r
+ lib/query.cc | 2 +-\r
+ lib/sha1.c | 2 +-\r
+ lib/string-list.c | 2 +-\r
+ lib/tags.c | 2 +-\r
+ lib/thread.cc | 2 +-\r
+ mime-node.c | 2 +-\r
+ notmuch-client.h | 2 +-\r
+ notmuch-compact.c | 2 +-\r
+ notmuch-config.c | 4 ++--\r
+ notmuch-count.c | 2 +-\r
+ notmuch-dump.c | 2 +-\r
+ notmuch-emacs-mua | 2 +-\r
+ notmuch-insert.c | 2 +-\r
+ notmuch-new.c | 2 +-\r
+ notmuch-reply.c | 2 +-\r
+ notmuch-restore.c | 2 +-\r
+ notmuch-search.c | 2 +-\r
+ notmuch-setup.c | 2 +-\r
+ notmuch-show.c | 2 +-\r
+ notmuch-tag.c | 2 +-\r
+ notmuch-time.c | 2 +-\r
+ notmuch.c | 4 ++--\r
+ packaging/fedora/notmuch.spec | 4 ++--\r
+ parse-time-string/parse-time-string.c | 2 +-\r
+ parse-time-string/parse-time-string.h | 2 +-\r
+ performance-test/Makefile.local | 4 ++--\r
+ performance-test/README | 2 +-\r
+ query-string.c | 2 +-\r
+ sprinter-sexp.c | 2 +-\r
+ test/T310-emacs.sh | 4 ++--\r
+ test/T360-symbol-hiding.sh | 2 +-\r
+ test/database-test.c | 2 +-\r
+ test/parse-time.c | 2 +-\r
+ test/random-corpus.c | 2 +-\r
+ test/smtp-dummy.c | 2 +-\r
+ test/test-databases/Makefile.local | 2 +-\r
+ test/test-lib-common.sh | 2 +-\r
+ test/test-lib.el | 2 +-\r
+ test/test-lib.sh | 2 +-\r
+ util/error_util.c | 2 +-\r
+ util/error_util.h | 2 +-\r
+ util/hex-escape.c | 2 +-\r
+ util/string-util.c | 2 +-\r
+ util/xutil.c | 2 +-\r
+ util/xutil.h | 2 +-\r
+ util/zlib-extra.c | 2 +-\r
+ 138 files changed, 175 insertions(+), 175 deletions(-)\r
+\r
+diff --git a/COPYING b/COPYING\r
+index 6dea693..0006a66 100644\r
+--- a/COPYING\r
++++ b/COPYING\r
+@@ -12,4 +12,4 @@ General Public License for more details.\r
+ \r
+ You should have received a copy of the GNU General Public License\r
+ along with this program, (in the COPYING-GPL-3 file in this\r
+-directory). If not, see http://www.gnu.org/licenses/ \r
++directory). If not, see https://www.gnu.org/licenses/ \r
+diff --git a/COPYING-GPL-3 b/COPYING-GPL-3\r
+index 4432540..4c49354 100644\r
+--- a/COPYING-GPL-3\r
++++ b/COPYING-GPL-3\r
+@@ -2,7 +2,7 @@\r
+ GNU GENERAL PUBLIC LICENSE\r
+ Version 3, 29 June 2007\r
+ \r
+- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>\r
++ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>\r
+ Everyone is permitted to copy and distribute verbatim copies\r
+ of this license document, but changing it is not allowed.\r
+ \r
+@@ -646,7 +646,7 @@ the "copyright" line and a pointer to where the full notice is found.\r
+ GNU General Public License for more details.\r
+ \r
+ You should have received a copy of the GNU General Public License\r
+- along with this program. If not, see <http://www.gnu.org/licenses/>.\r
++ along with this program. If not, see <https://www.gnu.org/licenses/>.\r
+ \r
+ Also add information on how to contact you by electronic and paper mail.\r
+ \r
+@@ -665,12 +665,12 @@ might be different; for a GUI interface, you would use an "about box".\r
+ You should also get your employer (if you work as a programmer) or school,\r
+ if any, to sign a "copyright disclaimer" for the program, if necessary.\r
+ For more information on this, and how to apply and follow the GNU GPL, see\r
+-<http://www.gnu.org/licenses/>.\r
++<https://www.gnu.org/licenses/>.\r
+ \r
+ The GNU General Public License does not permit incorporating your program\r
+ into proprietary programs. If your program is a subroutine library, you\r
+ may consider it more useful to permit linking proprietary applications with\r
+ the library. If this is what you want to do, use the GNU Lesser General\r
+ Public License instead of this License. But first, please read\r
+-<http://www.gnu.org/philosophy/why-not-lgpl.html>.\r
++<https://www.gnu.org/philosophy/why-not-lgpl.html>.\r
+ \r
+diff --git a/INSTALL b/INSTALL\r
+index b1b9cd5..6099ed0 100644\r
+--- a/INSTALL\r
++++ b/INSTALL\r
+@@ -30,7 +30,7 @@ Talloc, and zlib which are each described below:\r
+ It provides all the real machinery of indexing and searching,\r
+ (including the very nice parsing of the query string).\r
+ \r
+- Xapian is available from http://xapian.org\r
++ Xapian is available from https://xapian.org\r
+ \r
+ Note: Notmuch will work best with Xapian 1.0.18 (or later) or\r
+ Xapian 1.1.4 (or later). Previous versions of Xapian (whether\r
+@@ -58,7 +58,7 @@ Talloc, and zlib which are each described below:\r
+ made development of Notmuch much easier and much less prone to\r
+ memory leaks.\r
+ \r
+- Talloc is available from http://talloc.samba.org/\r
++ Talloc is available from https://talloc.samba.org/\r
+ \r
+ zlib\r
+ ----\r
+diff --git a/Makefile.local b/Makefile.local\r
+index 066ecf2..cf16185 100644\r
+--- a/Makefile.local\r
++++ b/Makefile.local\r
+@@ -35,7 +35,7 @@ DEB_TAG=debian/$(UPSTREAM_TAG)-1\r
+ \r
+ RELEASE_HOST=notmuchmail.org\r
+ RELEASE_DIR=/srv/notmuchmail.org/www/releases\r
+-RELEASE_URL=http://notmuchmail.org/releases\r
++RELEASE_URL=https://notmuchmail.org/releases\r
+ TAR_FILE=$(PACKAGE)-$(VERSION).tar.gz\r
+ DEB_TAR_FILE=$(PACKAGE)_$(VERSION).orig.tar.gz\r
+ SHA1_FILE=$(TAR_FILE).sha1\r
+@@ -191,7 +191,7 @@ release-message:\r
+ @echo "the Xapian library to provide fast, full-text search with a convenient"\r
+ @echo "search syntax."\r
+ @echo ""\r
+- @echo "For more about notmuch, see http://notmuchmail.org"\r
++ @echo "For more about notmuch, see https://notmuchmail.org"\r
+ \r
+ # This is a chain of dependencies rather than a simple list simply to\r
+ # avoid the messages getting interleaved in the case of a parallel\r
+diff --git a/README b/README\r
+index d92fcfd..0aa9a08 100644\r
+--- a/README\r
++++ b/README\r
+@@ -58,7 +58,7 @@ Contacting users and developers\r
+ -------------------------------\r
+ The website for Notmuch is:\r
+ \r
+- http://notmuchmail.org\r
++ https://notmuchmail.org\r
+ \r
+ The mailing list address for the notmuch community is:\r
+ \r
+diff --git a/README.rst b/README.rst\r
+index 7417ddc..7ff3198 100644\r
+--- a/README.rst\r
++++ b/README.rst\r
+@@ -1,11 +1,11 @@\r
+-If you're reading this on http://github.com/notmuch/notmuch, this is a\r
++If you're reading this on https://github.com/notmuch/notmuch, this is a\r
+ read-only mirror of the notmuch project.\r
+ \r
+-For more information about the project, see http://notmuchmail.org.\r
++For more information about the project, see https://notmuchmail.org.\r
+ \r
+ Please don't send us pull requests on github. If you have a feature\r
+ branch that you want us to look at, use ``git send-email`` to send it\r
+ to notmuch@notmuchmail.org.\r
+ \r
+ For more information about contributing to the project, see\r
+-http://notmuchmail.org/contributing/.\r
++https://notmuchmail.org/contributing/.\r
+diff --git a/bindings/go/README b/bindings/go/README\r
+index 18a54b6..1825ae0 100644\r
+--- a/bindings/go/README\r
++++ b/bindings/go/README\r
+@@ -13,4 +13,4 @@ todo\r
+ \r
+ - improve notmuch-addrlookup regexp\r
+ \r
+-[1] http://notmuchmail.org/\r
+\ No newline at end of file\r
++[1] https://notmuchmail.org/\r
+diff --git a/bindings/go/src/notmuch/notmuch.go b/bindings/go/src/notmuch/notmuch.go\r
+index 0fff1ab..4d8c2ce 100644\r
+--- a/bindings/go/src/notmuch/notmuch.go\r
++++ b/bindings/go/src/notmuch/notmuch.go\r
+@@ -351,7 +351,7 @@ func (self *Database) GetAllTags() *Tags {\r
+ * completely in the future, but it's likely to be a specialized\r
+ * version of the general Xapian query syntax:\r
+ *\r
+- * http://xapian.org/docs/queryparser.html\r
++ * https://xapian.org/docs/queryparser.html\r
+ *\r
+ * As a special case, passing either a length-zero string, (that is ""),\r
+ * or a string consisting of a single asterisk (that is "*"), will\r
+diff --git a/bindings/python/README b/bindings/python/README\r
+index 695b5bd..fe7a218 100644\r
+--- a/bindings/python/README\r
++++ b/bindings/python/README\r
+@@ -2,7 +2,7 @@ notmuch -- The python interface to notmuch\r
+ ==========================================\r
+ \r
+ This module makes the functionality of the notmuch library\r
+-(`http://notmuchmail.org`_) available to python. Successful import of\r
++(`https://notmuchmail.org`_) available to python. Successful import of\r
+ this modul depends on a libnotmuch.so|dll being available on the\r
+ user's system.\r
+ \r
+diff --git a/bindings/python/docs/COPYING b/bindings/python/docs/COPYING\r
+index 94a9ed0..2a00065 100644\r
+--- a/bindings/python/docs/COPYING\r
++++ b/bindings/python/docs/COPYING\r
+@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.\r
+ GNU General Public License for more details.\r
+ \r
+ You should have received a copy of the GNU General Public License\r
+- along with this program. If not, see <http://www.gnu.org/licenses/>.\r
++ along with this program. If not, see <https://www.gnu.org/licenses/>.\r
+ \r
+ Also add information on how to contact you by electronic and paper mail.\r
+ \r
+@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".\r
+ You should also get your employer (if you work as a programmer) or school,\r
+ if any, to sign a "copyright disclaimer" for the program, if necessary.\r
+ For more information on this, and how to apply and follow the GNU GPL, see\r
+-<http://www.gnu.org/licenses/>.\r
++<https://www.gnu.org/licenses/>.\r
+ \r
+ The GNU General Public License does not permit incorporating your program\r
+ into proprietary programs. If your program is a subroutine library, you\r
+ may consider it more useful to permit linking proprietary applications with\r
+ the library. If this is what you want to do, use the GNU Lesser General\r
+ Public License instead of this License. But first, please read\r
+-<http://www.gnu.org/philosophy/why-not-lgpl.html>.\r
++<https://www.gnu.org/philosophy/why-not-lgpl.html>.\r
+diff --git a/bindings/python/docs/source/index.rst b/bindings/python/docs/source/index.rst\r
+index 1cece5f..bef7e60 100644\r
+--- a/bindings/python/docs/source/index.rst\r
++++ b/bindings/python/docs/source/index.rst\r
+@@ -4,7 +4,7 @@ Welcome to :mod:`notmuch`'s documentation\r
+ .. currentmodule:: notmuch\r
+ \r
+ The :mod:`notmuch` module provides an interface to the `notmuch\r
+-<http://notmuchmail.org>`_ functionality, directly interfacing to a\r
++<https://notmuchmail.org>`_ functionality, directly interfacing to a\r
+ shared notmuch library. Within :mod:`notmuch`, the classes\r
+ :class:`Database`, :class:`Query` provide most of the core\r
+ functionality, returning :class:`Threads`, :class:`Messages` and\r
+diff --git a/bindings/python/notmuch/__init__.py b/bindings/python/notmuch/__init__.py\r
+index 29416a5..cf627ff 100644\r
+--- a/bindings/python/notmuch/__init__.py\r
++++ b/bindings/python/notmuch/__init__.py\r
+@@ -47,7 +47,7 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\r
+ for more details.\r
+ \r
+ You should have received a copy of the GNU General Public License\r
+-along with notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++along with notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ \r
+ Copyright 2010-2011 Sebastian Spaeth <Sebastian@SSpaeth.de>\r
+ """\r
+diff --git a/bindings/python/notmuch/compat.py b/bindings/python/notmuch/compat.py\r
+index daa268c..c931329 100644\r
+--- a/bindings/python/notmuch/compat.py\r
++++ b/bindings/python/notmuch/compat.py\r
+@@ -16,7 +16,7 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\r
+ for more details.\r
+ \r
+ You should have received a copy of the GNU General Public License\r
+-along with notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++along with notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ \r
+ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>\r
+ Copyright 2012 Justus Winter <4winter@informatik.uni-hamburg.de>\r
+diff --git a/bindings/python/notmuch/database.py b/bindings/python/notmuch/database.py\r
+index f304533..67fb1c4 100644\r
+--- a/bindings/python/notmuch/database.py\r
++++ b/bindings/python/notmuch/database.py\r
+@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\r
+ for more details.\r
+ \r
+ You should have received a copy of the GNU General Public License\r
+-along with notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++along with notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ \r
+ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>\r
+ """\r
+diff --git a/bindings/python/notmuch/directory.py b/bindings/python/notmuch/directory.py\r
+index 3b0a525..7f86b1a 100644\r
+--- a/bindings/python/notmuch/directory.py\r
++++ b/bindings/python/notmuch/directory.py\r
+@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\r
+ for more details.\r
+ \r
+ You should have received a copy of the GNU General Public License\r
+-along with notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++along with notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ \r
+ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>\r
+ """\r
+diff --git a/bindings/python/notmuch/errors.py b/bindings/python/notmuch/errors.py\r
+index abca51d..b7684ef 100644\r
+--- a/bindings/python/notmuch/errors.py\r
++++ b/bindings/python/notmuch/errors.py\r
+@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\r
+ for more details.\r
+ \r
+ You should have received a copy of the GNU General Public License\r
+-along with notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++along with notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ \r
+ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>\r
+ """\r
+diff --git a/bindings/python/notmuch/filenames.py b/bindings/python/notmuch/filenames.py\r
+index f8f383e..29f4fdf 100644\r
+--- a/bindings/python/notmuch/filenames.py\r
++++ b/bindings/python/notmuch/filenames.py\r
+@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\r
+ for more details.\r
+ \r
+ You should have received a copy of the GNU General Public License\r
+-along with notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++along with notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ \r
+ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>\r
+ """\r
+diff --git a/bindings/python/notmuch/globals.py b/bindings/python/notmuch/globals.py\r
+index 6872a29..b1eec2c 100644\r
+--- a/bindings/python/notmuch/globals.py\r
++++ b/bindings/python/notmuch/globals.py\r
+@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\r
+ for more details.\r
+ \r
+ You should have received a copy of the GNU General Public License\r
+-along with notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++along with notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ \r
+ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>\r
+ """\r
+diff --git a/bindings/python/notmuch/message.py b/bindings/python/notmuch/message.py\r
+index d1c1b58..bf80900 100644\r
+--- a/bindings/python/notmuch/message.py\r
++++ b/bindings/python/notmuch/message.py\r
+@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\r
+ for more details.\r
+ \r
+ You should have received a copy of the GNU General Public License\r
+-along with notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++along with notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ \r
+ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>\r
+ Jesse Rosenthal <jrosenthal@jhu.edu>\r
+diff --git a/bindings/python/notmuch/messages.py b/bindings/python/notmuch/messages.py\r
+index 76100ff..e17f150 100644\r
+--- a/bindings/python/notmuch/messages.py\r
++++ b/bindings/python/notmuch/messages.py\r
+@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\r
+ for more details.\r
+ \r
+ You should have received a copy of the GNU General Public License\r
+-along with notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++along with notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ \r
+ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>\r
+ Jesse Rosenthal <jrosenthal@jhu.edu>\r
+diff --git a/bindings/python/notmuch/query.py b/bindings/python/notmuch/query.py\r
+index 4327007..a0f4f64 100644\r
+--- a/bindings/python/notmuch/query.py\r
++++ b/bindings/python/notmuch/query.py\r
+@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\r
+ for more details.\r
+ \r
+ You should have received a copy of the GNU General Public License\r
+-along with notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++along with notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ \r
+ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>\r
+ """\r
+diff --git a/bindings/python/notmuch/tag.py b/bindings/python/notmuch/tag.py\r
+index 1d52345..3b4a56a 100644\r
+--- a/bindings/python/notmuch/tag.py\r
++++ b/bindings/python/notmuch/tag.py\r
+@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\r
+ for more details.\r
+ \r
+ You should have received a copy of the GNU General Public License\r
+-along with notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++along with notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ \r
+ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>\r
+ """\r
+diff --git a/bindings/python/notmuch/thread.py b/bindings/python/notmuch/thread.py\r
+index 0454dbd..cc151f7 100644\r
+--- a/bindings/python/notmuch/thread.py\r
++++ b/bindings/python/notmuch/thread.py\r
+@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\r
+ for more details.\r
+ \r
+ You should have received a copy of the GNU General Public License\r
+-along with notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++along with notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ \r
+ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>\r
+ """\r
+diff --git a/bindings/python/notmuch/threads.py b/bindings/python/notmuch/threads.py\r
+index a550523..86f1f2c 100644\r
+--- a/bindings/python/notmuch/threads.py\r
++++ b/bindings/python/notmuch/threads.py\r
+@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\r
+ for more details.\r
+ \r
+ You should have received a copy of the GNU General Public License\r
+-along with notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++along with notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ \r
+ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>\r
+ """\r
+diff --git a/bindings/python/setup.py b/bindings/python/setup.py\r
+index ba95d95..d986f0c 100644\r
+--- a/bindings/python/setup.py\r
++++ b/bindings/python/setup.py\r
+@@ -14,7 +14,7 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\r
+ for more details.\r
+ \r
+ You should have received a copy of the GNU General Public License\r
+-along with notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++along with notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ \r
+ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>\r
+ """\r
+@@ -34,15 +34,15 @@ setup(name='notmuch',\r
+ description='Python binding of the notmuch mail search and indexing library.',\r
+ author='Sebastian Spaeth',\r
+ author_email='Sebastian@SSpaeth.de',\r
+- url='http://notmuchmail.org/',\r
+- download_url='http://notmuchmail.org/releases/notmuch-%s.tar.gz' % __VERSION__,\r
++ url='https://notmuchmail.org/',\r
++ download_url='https://notmuchmail.org/releases/notmuch-%s.tar.gz' % __VERSION__,\r
+ packages=['notmuch'],\r
+ keywords=['library', 'email'],\r
+ long_description='''Overview\r
+ ========\r
+ \r
+ The notmuch module provides an interface to the `notmuch\r
+-<http://notmuchmail.org>`_ functionality, directly interfacing with a\r
++<https://notmuchmail.org>`_ functionality, directly interfacing with a\r
+ shared notmuch library. Notmuch provides a maildatabase that allows\r
+ for extremely quick searching and filtering of your email according to\r
+ various criteria.\r
+@@ -66,5 +66,5 @@ python >= 2.5. It will not work on earlier python versions.\r
+ 'Topic :: Software Development :: Libraries'\r
+ ],\r
+ platforms='',\r
+- license='http://www.gnu.org/licenses/gpl-3.0.txt',\r
++ license='https://www.gnu.org/licenses/gpl-3.0.txt',\r
+ )\r
+diff --git a/bindings/ruby/database.c b/bindings/ruby/database.c\r
+index 6deda57..12e6bab 100644\r
+--- a/bindings/ruby/database.c\r
++++ b/bindings/ruby/database.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Ali Polatel <alip@exherbo.org>\r
+ */\r
+diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h\r
+index 167250e..48544ca 100644\r
+--- a/bindings/ruby/defs.h\r
++++ b/bindings/ruby/defs.h\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Ali Polatel <alip@exherbo.org>\r
+ */\r
+diff --git a/bindings/ruby/directory.c b/bindings/ruby/directory.c\r
+index 303523c..0f37b39 100644\r
+--- a/bindings/ruby/directory.c\r
++++ b/bindings/ruby/directory.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Ali Polatel <alip@exherbo.org>\r
+ */\r
+diff --git a/bindings/ruby/filenames.c b/bindings/ruby/filenames.c\r
+index e278590..656c58e 100644\r
+--- a/bindings/ruby/filenames.c\r
++++ b/bindings/ruby/filenames.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Ali Polatel <alip@exherbo.org>\r
+ */\r
+diff --git a/bindings/ruby/init.c b/bindings/ruby/init.c\r
+index 865d6bf..5556b43 100644\r
+--- a/bindings/ruby/init.c\r
++++ b/bindings/ruby/init.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Ali Polatel <alip@exherbo.org>\r
+ */\r
+diff --git a/bindings/ruby/message.c b/bindings/ruby/message.c\r
+index 4ff6097..c55cf6e 100644\r
+--- a/bindings/ruby/message.c\r
++++ b/bindings/ruby/message.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Ali Polatel <alip@exherbo.org>\r
+ */\r
+diff --git a/bindings/ruby/messages.c b/bindings/ruby/messages.c\r
+index 443a30c..a337fee 100644\r
+--- a/bindings/ruby/messages.c\r
++++ b/bindings/ruby/messages.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Ali Polatel <alip@exherbo.org>\r
+ */\r
+diff --git a/bindings/ruby/query.c b/bindings/ruby/query.c\r
+index 8cbc73f..ce66926 100644\r
+--- a/bindings/ruby/query.c\r
++++ b/bindings/ruby/query.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Ali Polatel <alip@exherbo.org>\r
+ */\r
+diff --git a/bindings/ruby/status.c b/bindings/ruby/status.c\r
+index b11fb9f..a0f8863 100644\r
+--- a/bindings/ruby/status.c\r
++++ b/bindings/ruby/status.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Ali Polatel <alip@exherbo.org>\r
+ */\r
+diff --git a/bindings/ruby/tags.c b/bindings/ruby/tags.c\r
+index e8226ad..db8b4cf 100644\r
+--- a/bindings/ruby/tags.c\r
++++ b/bindings/ruby/tags.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Ali Polatel <alip@exherbo.org>\r
+ */\r
+diff --git a/bindings/ruby/thread.c b/bindings/ruby/thread.c\r
+index 56616d9..9b29598 100644\r
+--- a/bindings/ruby/thread.c\r
++++ b/bindings/ruby/thread.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Ali Polatel <alip@exherbo.org>\r
+ */\r
+diff --git a/bindings/ruby/threads.c b/bindings/ruby/threads.c\r
+index 3e1fbf5..ed403a8 100644\r
+--- a/bindings/ruby/threads.c\r
++++ b/bindings/ruby/threads.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Ali Polatel <alip@exherbo.org>\r
+ */\r
+diff --git a/compat/compat.h b/compat/compat.h\r
+index 634d505..88bc4df 100644\r
+--- a/compat/compat.h\r
++++ b/compat/compat.h\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/compat/function-attributes.h b/compat/function-attributes.h\r
+index 8450a17..1945b5b 100644\r
+--- a/compat/function-attributes.h\r
++++ b/compat/function-attributes.h\r
+@@ -14,7 +14,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ */\r
+ \r
+ #ifndef FUNCTION_ATTRIBUTES_H\r
+diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash\r
+index 29cdf43..78047b5 100644\r
+--- a/completion/notmuch-completion.bash\r
++++ b/completion/notmuch-completion.bash\r
+@@ -16,7 +16,7 @@\r
+ # GNU General Public License for more details.\r
+ #\r
+ # You should have received a copy of the GNU General Public License\r
+-# along with this program. If not, see http://www.gnu.org/licenses/ .\r
++# along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ #\r
+ # Author: Jani Nikula <jani@nikula.org>\r
+ #\r
+diff --git a/configure b/configure\r
+index ce1d698..49fa5b9 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -643,7 +643,7 @@ EOF\r
+ fi\r
+ if [ $have_xapian -eq 0 ]; then\r
+ echo " Xapian library (including development files such as headers)"\r
+- echo " http://xapian.org/"\r
++ echo " https://xapian.org/"\r
+ fi\r
+ if [ $have_zlib -eq 0 ]; then\r
+ echo " zlib library (>= version 1.2.5.2, including development files such as headers)"\r
+@@ -663,7 +663,7 @@ EOF\r
+ fi\r
+ if [ $have_talloc -eq 0 ]; then\r
+ echo " The talloc library (including development files such as headers)"\r
+- echo " http://talloc.samba.org/"\r
++ echo " https://talloc.samba.org/"\r
+ echo\r
+ fi\r
+ cat <<EOF\r
+diff --git a/contrib/notmuch-mutt/README b/contrib/notmuch-mutt/README\r
+index 9c3379e..26996c4 100644\r
+--- a/contrib/notmuch-mutt/README\r
++++ b/contrib/notmuch-mutt/README\r
+@@ -24,8 +24,8 @@ for a --output=symlinks flag to notmuch.\r
+ \r
+ \r
+ [1]: http://www.mutt.org/\r
+-[2]: http://notmuchmail.org/\r
+-[3]: http://upsilon.cc/~zack/blog/posts/2011/01/how_to_use_Notmuch_with_Mutt/\r
++[2]: https://notmuchmail.org/\r
++[3]: https://upsilon.cc/~zack/blog/posts/2011/01/how_to_use_Notmuch_with_Mutt/\r
+ \r
+ \r
+ Requirements\r
+@@ -57,5 +57,5 @@ notmuch-mutt is copyright (C) 2011-2012 Stefano Zacchiroli <zack@upsilon.cc>.\r
+ \r
+ notmuch-mutt is released under the terms of the GNU General Public License\r
+ (GPL), version 3 or above. A copy of the license is available online at\r
+-<http://www.gnu.org/licenses/>.\r
++<https://www.gnu.org/licenses/>.\r
+ \r
+diff --git a/contrib/notmuch-mutt/notmuch-mutt b/contrib/notmuch-mutt/notmuch-mutt\r
+index 97fb2d8..0e46a8c 100755\r
+--- a/contrib/notmuch-mutt/notmuch-mutt\r
++++ b/contrib/notmuch-mutt/notmuch-mutt\r
+@@ -91,7 +91,7 @@ sub get_message_id() {\r
+ $mid = $1;\r
+ } else { # Message-ID header not found, synthesize a message id\r
+ # based on SHA1, as notmuch would do. See:\r
+- # http://git.notmuchmail.org/git/notmuch/blob/HEAD:/lib/sha1.c\r
++ # https://git.notmuchmail.org/git/notmuch/blob/HEAD:/lib/sha1.c\r
+ my $sha = Digest::SHA->new(1);\r
+ $sha->add($_) foreach(@headers);\r
+ $sha->addfile(\*STDIN);\r
+diff --git a/contrib/notmuch-vim/plugin/notmuch.vim b/contrib/notmuch-vim/plugin/notmuch.vim\r
+index 8f27fb9..eaa984b 100644\r
+--- a/contrib/notmuch-vim/plugin/notmuch.vim\r
++++ b/contrib/notmuch-vim/plugin/notmuch.vim\r
+@@ -15,7 +15,7 @@\r
+ " General Public License for more details.\r
+ "\r
+ " You should have received a copy of the GNU General Public License\r
+-" along with Notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++" along with Notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ "\r
+ " Authors: Bart Trojanowski <bart@jukie.net>\r
+ " Contributors: Felipe Contreras <felipe.contreras@gmail.com>,\r
+@@ -1198,7 +1198,7 @@ function! s:NM_shell_escape(word)\r
+ endfunction\r
+ \r
+ " this function was taken from git.vim, then fixed up\r
+-" http://github.com/motemen/git-vim\r
++" https://github.com/motemen/git-vim\r
+ function! s:NM_shell_split(cmd)\r
+ let l:split_cmd = []\r
+ let cmd = a:cmd\r
+diff --git a/crypto.c b/crypto.c\r
+index 3dabc97..3e8ce7c 100644\r
+--- a/crypto.c\r
++++ b/crypto.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Authors: Jameson Rollins <jrollins@finestructure.net>\r
+ */\r
+diff --git a/debian/control b/debian/control\r
+index a46e391..d846119 100644\r
+--- a/debian/control\r
++++ b/debian/control\r
+@@ -26,9 +26,9 @@ Build-Depends:\r
+ gpgsm <!nocheck>,\r
+ bash-completion (>=1.9.0~)\r
+ Standards-Version: 3.9.6\r
+-Homepage: http://notmuchmail.org/\r
++Homepage: https://notmuchmail.org/\r
+ Vcs-Git: git://notmuchmail.org/git/notmuch\r
+-Vcs-Browser: http://git.notmuchmail.org/git/notmuch\r
++Vcs-Browser: https://git.notmuchmail.org/git/notmuch\r
+ \r
+ Package: notmuch\r
+ Architecture: any\r
+diff --git a/debugger.c b/debugger.c\r
+index e8b9378..0fa0fb6 100644\r
+--- a/debugger.c\r
++++ b/debugger.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Chris Wilson <chris@chris-wilson.co.uk>\r
+ */\r
+diff --git a/devel/man-to-mdwn.pl b/devel/man-to-mdwn.pl\r
+index ea284d0..f9d31b7 100755\r
+--- a/devel/man-to-mdwn.pl\r
++++ b/devel/man-to-mdwn.pl\r
+@@ -200,6 +200,6 @@ foreach (sort srt values %fhash)\r
+ print <<'EOF';\r
+ \r
+ The manual pages are licensed under\r
+-[the GNU General Public License](http://www.gnu.org/licenses/gpl.txt),\r
++[the GNU General Public License](https://www.gnu.org/licenses/gpl.txt),\r
+ either version 3.0 or at your option any later version.\r
+ EOF\r
+diff --git a/devel/nmbug/doc/man5/notmuch-report.json.5.rst b/devel/nmbug/doc/man5/notmuch-report.json.5.rst\r
+index 4b5f84a..1207a4a 100644\r
+--- a/devel/nmbug/doc/man5/notmuch-report.json.5.rst\r
++++ b/devel/nmbug/doc/man5/notmuch-report.json.5.rst\r
+@@ -92,7 +92,7 @@ EXAMPLE\r
+ {\r
+ "meta": {\r
+ "title": "Notmuch Patches",\r
+- "blurb": "For more information see <a href=\"http://notmuchmail.org/nmbug\">nmbug</a>",\r
++ "blurb": "For more information see <a href=\"https://notmuchmail.org/nmbug\">nmbug</a>",\r
+ "header": "<html><head></head><body><h1>{title}</h1><p>{blurb}</p><h2>Views</h2>",\r
+ "footer": "<hr><p>Generated: {datetime}</p></html>",\r
+ "message-url": "http://mid.gmane.org/{message-id}"\r
+diff --git a/devel/nmbug/nmbug b/devel/nmbug/nmbug\r
+index e406395..1dd5f14 100755\r
+--- a/devel/nmbug/nmbug\r
++++ b/devel/nmbug/nmbug\r
+@@ -14,7 +14,7 @@\r
+ # GNU General Public License for more details.\r
+ #\r
+ # You should have received a copy of the GNU General Public License\r
+-# along with this program. If not, see http://www.gnu.org/licenses/ .\r
++# along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ \r
+ """\r
+ Manage notmuch tags with Git\r
+@@ -119,9 +119,9 @@ def _xapian_quote(string):\r
+ Xapian uses double-quotes for quoting strings. You can escape\r
+ internal quotes by repeating them [1,2,3].\r
+ \r
+- [1]: http://trac.xapian.org/ticket/128#comment:2\r
+- [2]: http://trac.xapian.org/ticket/128#comment:17\r
+- [3]: http://trac.xapian.org/changeset/13823/svn\r
++ [1]: https://trac.xapian.org/ticket/128#comment:2\r
++ [2]: https://trac.xapian.org/ticket/128#comment:17\r
++ [3]: https://trac.xapian.org/changeset/13823/svn\r
+ """\r
+ return '"{0}"'.format(string.replace('"', '""'))\r
+ \r
+diff --git a/devel/nmbug/notmuch-report b/devel/nmbug/notmuch-report\r
+index 87390c1..a9c2a6e 100755\r
+--- a/devel/nmbug/notmuch-report\r
++++ b/devel/nmbug/notmuch-report\r
+@@ -17,7 +17,7 @@\r
+ # GNU General Public License for more details.\r
+ #\r
+ # You should have received a copy of the GNU General Public License\r
+-# along with this program. If not, see http://www.gnu.org/licenses/ .\r
++# along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ \r
+ """Generate text and/or HTML for one or more notmuch searches.\r
+ \r
+diff --git a/devel/nmbug/notmuch-report.json b/devel/nmbug/notmuch-report.json\r
+index 48b6f19..c5b35b1 100644\r
+--- a/devel/nmbug/notmuch-report.json\r
++++ b/devel/nmbug/notmuch-report.json\r
+@@ -1,7 +1,7 @@\r
+ {\r
+ "meta": {\r
+ "title": "Notmuch Patches",\r
+- "blurb": "For more information see <a href=\"http://notmuchmail.org/nmbug\">nmbug</a>"\r
++ "blurb": "For more information see <a href=\"https://notmuchmail.org/nmbug\">nmbug</a>"\r
+ },\r
+ \r
+ "views": [\r
+diff --git a/devel/try-emacs-mua b/devel/try-emacs-mua\r
+index b0a62c2..041f621 100755\r
+--- a/devel/try-emacs-mua\r
++++ b/devel/try-emacs-mua\r
+@@ -7,7 +7,7 @@\r
+ ;;\r
+ ;; Authors: Tomi Ollila <tomi.ollila@iki.fi>\r
+ ;;\r
+-;; http://www.emacswiki.org/emacs/EmacsScripts was a useful starting point...\r
++;; https://www.emacswiki.org/emacs/EmacsScripts was a useful starting point...\r
+ ;;\r
+ ;; Licence: GPLv3+\r
+ ;;\r
+diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg\r
+index c033f34..2ca15d4 100644\r
+--- a/doc/doxygen.cfg\r
++++ b/doc/doxygen.cfg\r
+@@ -177,7 +177,7 @@ FORMULA_FONTSIZE = 10\r
+ FORMULA_TRANSPARENT = YES\r
+ USE_MATHJAX = NO\r
+ MATHJAX_FORMAT = HTML-CSS\r
+-MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest\r
++MATHJAX_RELPATH = https://cdn.mathjax.org/mathjax/latest\r
+ MATHJAX_EXTENSIONS =\r
+ MATHJAX_CODEFILE =\r
+ SEARCHENGINE = YES\r
+diff --git a/doc/man1/notmuch.rst b/doc/man1/notmuch.rst\r
+index 3acfbdb..edd04ef 100644\r
+--- a/doc/man1/notmuch.rst\r
++++ b/doc/man1/notmuch.rst\r
+@@ -29,7 +29,7 @@ While the command-line program ``notmuch`` provides powerful\r
+ functionality, it does not provide the most convenient interface for\r
+ that functionality. More sophisticated interfaces are expected to be\r
+ built on top of either the command-line interface, or more likely, on\r
+-top of the notmuch library interface. See http://notmuchmail.org for\r
++top of the notmuch library interface. See https://notmuchmail.org for\r
+ more about alternate interfaces to notmuch. The emacs-based interface to\r
+ notmuch (available under **emacs/** in the Notmuch source distribution)\r
+ is probably the most widely used at this time.\r
+@@ -144,7 +144,7 @@ SEE ALSO\r
+ **notmuch-search-terms(7)**, **notmuch-show(1)**, **notmuch-tag(1)**,\r
+ **notmuch-address(1)**\r
+ \r
+-The notmuch website: **http://notmuchmail.org**\r
++The notmuch website: **https://notmuchmail.org**\r
+ \r
+ CONTACT\r
+ =======\r
+diff --git a/emacs/coolj.el b/emacs/coolj.el\r
+index 7755060..350d537 100644\r
+--- a/emacs/coolj.el\r
++++ b/emacs/coolj.el\r
+@@ -21,7 +21,7 @@\r
+ ;; GNU General Public License for more details.\r
+ \r
+ ;; You should have received a copy of the GNU General Public License\r
+-;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.\r
++;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.\r
+ \r
+ ;;; Commentary:\r
+ \r
+diff --git a/emacs/make-deps.el b/emacs/make-deps.el\r
+index 24c1a45..5b6db69 100644\r
+--- a/emacs/make-deps.el\r
++++ b/emacs/make-deps.el\r
+@@ -15,7 +15,7 @@\r
+ ;; General Public License for more details.\r
+ ;;\r
+ ;; You should have received a copy of the GNU General Public License\r
+-;; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++;; along with Notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ ;;\r
+ ;; Authors: Austin Clements <aclements@csail.mit.edu>\r
+ \r
+diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el\r
+index 8b79d34..d372fba 100644\r
+--- a/emacs/notmuch-address.el\r
++++ b/emacs/notmuch-address.el\r
+@@ -15,7 +15,7 @@\r
+ ;; General Public License for more details.\r
+ ;;\r
+ ;; You should have received a copy of the GNU General Public License\r
+-;; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++;; along with Notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ ;;\r
+ ;; Authors: David Edmondson <dme@dme.org>\r
+ \r
+diff --git a/emacs/notmuch-company.el b/emacs/notmuch-company.el\r
+index b881d6d..0619c7e 100644\r
+--- a/emacs/notmuch-company.el\r
++++ b/emacs/notmuch-company.el\r
+@@ -16,7 +16,7 @@\r
+ ;; GNU General Public License for more details.\r
+ \r
+ ;; You should have received a copy of the GNU General Public License\r
+-;; along with this program. If not, see <http://www.gnu.org/licenses/>.\r
++;; along with this program. If not, see <https://www.gnu.org/licenses/>.\r
+ \r
+ ;;; Commentary:\r
+ \r
+diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el\r
+index 004463c..e376aa8 100644\r
+--- a/emacs/notmuch-crypto.el\r
++++ b/emacs/notmuch-crypto.el\r
+@@ -15,7 +15,7 @@\r
+ ;; General Public License for more details.\r
+ ;;\r
+ ;; You should have received a copy of the GNU General Public License\r
+-;; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++;; along with Notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ ;;\r
+ ;; Authors: Jameson Rollins <jrollins@finestructure.net>\r
+ \r
+diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el\r
+index 9495c1a..75ccf57 100644\r
+--- a/emacs/notmuch-hello.el\r
++++ b/emacs/notmuch-hello.el\r
+@@ -15,7 +15,7 @@\r
+ ;; General Public License for more details.\r
+ ;;\r
+ ;; You should have received a copy of the GNU General Public License\r
+-;; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++;; along with Notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ ;;\r
+ ;; Authors: David Edmondson <dme@dme.org>\r
+ \r
+@@ -265,7 +265,7 @@ International Bureau of Weights and Measures."\r
+ :group 'notmuch-hello\r
+ :group 'notmuch-hooks)\r
+ \r
+-(defvar notmuch-hello-url "http://notmuchmail.org"\r
++(defvar notmuch-hello-url "https://notmuchmail.org"\r
+ "The `notmuch' web site.")\r
+ \r
+ (defvar notmuch-hello-custom-section-options\r
+diff --git a/emacs/notmuch-jump.el b/emacs/notmuch-jump.el\r
+index fd770f1..963253c 100644\r
+--- a/emacs/notmuch-jump.el\r
++++ b/emacs/notmuch-jump.el\r
+@@ -15,7 +15,7 @@\r
+ ;; General Public License for more details.\r
+ ;;\r
+ ;; You should have received a copy of the GNU General Public License\r
+-;; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++;; along with Notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ ;;\r
+ ;; Authors: Austin Clements <aclements@csail.mit.edu>\r
+ ;; David Edmondson <dme@dme.org>\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index f05ded6..1781af4 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -15,7 +15,7 @@\r
+ ;; General Public License for more details.\r
+ ;;\r
+ ;; You should have received a copy of the GNU General Public License\r
+-;; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++;; along with Notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ ;;\r
+ ;; Authors: Carl Worth <cworth@cworth.org>\r
+ \r
+diff --git a/emacs/notmuch-message.el b/emacs/notmuch-message.el\r
+index d437b85..55e4cfe 100644\r
+--- a/emacs/notmuch-message.el\r
++++ b/emacs/notmuch-message.el\r
+@@ -15,7 +15,7 @@\r
+ ;; General Public License for more details.\r
+ ;;\r
+ ;; You should have received a copy of the GNU General Public License\r
+-;; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++;; along with Notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ ;;\r
+ ;; Authors: Jesse Rosenthal <jrosenthal@jhu.edu>\r
+ \r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 399e138..1ca8056 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -15,7 +15,7 @@\r
+ ;; General Public License for more details.\r
+ ;;\r
+ ;; You should have received a copy of the GNU General Public License\r
+-;; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++;; along with Notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ ;;\r
+ ;; Authors: David Edmondson <dme@dme.org>\r
+ \r
+@@ -142,7 +142,7 @@ mutiple parts get a header."\r
+ (let ((notmuch-version (if (string= notmuch-emacs-version "unknown")\r
+ (notmuch-cli-version)\r
+ notmuch-emacs-version)))\r
+- (concat "Notmuch/" notmuch-version " (http://notmuchmail.org)")))\r
++ (concat "Notmuch/" notmuch-version " (https://notmuchmail.org)")))\r
+ \r
+ (defun notmuch-mua-user-agent-emacs ()\r
+ "Generate a `User-Agent:' string suitable for notmuch."\r
+@@ -334,7 +334,7 @@ modified. This function is notmuch addaptation of\r
+ ;; C-h f compose-mail says that headers should be specified as\r
+ ;; (string . value); however all the rest of message expects\r
+ ;; headers to be symbols, not strings (eg message-header-format-alist).\r
+- ;; http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00337.html\r
++ ;; https://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00337.html\r
+ ;; We need to convert any string input, eg from rmail-start-mail.\r
+ (dolist (h other-headers other-headers)\r
+ (if (stringp (car h)) (setcar h (intern (capitalize (car h))))))))\r
+diff --git a/emacs/notmuch-parser.el b/emacs/notmuch-parser.el\r
+index 620ca89..bb0379c 100644\r
+--- a/emacs/notmuch-parser.el\r
++++ b/emacs/notmuch-parser.el\r
+@@ -15,7 +15,7 @@\r
+ ;; General Public License for more details.\r
+ ;;\r
+ ;; You should have received a copy of the GNU General Public License\r
+-;; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++;; along with Notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ ;;\r
+ ;; Authors: Austin Clements <aclements@csail.mit.edu>\r
+ \r
+diff --git a/emacs/notmuch-print.el b/emacs/notmuch-print.el\r
+index 480a0cf..bca759f 100644\r
+--- a/emacs/notmuch-print.el\r
++++ b/emacs/notmuch-print.el\r
+@@ -15,7 +15,7 @@\r
+ ;; General Public License for more details.\r
+ ;;\r
+ ;; You should have received a copy of the GNU General Public License\r
+-;; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++;; along with Notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ ;;\r
+ ;; Authors: David Edmondson <dme@dme.org>\r
+ \r
+diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el\r
+index 8587d88..436ad16 100644\r
+--- a/emacs/notmuch-query.el\r
++++ b/emacs/notmuch-query.el\r
+@@ -15,7 +15,7 @@\r
+ ;; General Public License for more details.\r
+ ;;\r
+ ;; You should have received a copy of the GNU General Public License\r
+-;; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++;; along with Notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ ;;\r
+ ;; Authors: David Bremner <david@tethera.net>\r
+ \r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index f33096c..fea39fa 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -16,7 +16,7 @@\r
+ ;; General Public License for more details.\r
+ ;;\r
+ ;; You should have received a copy of the GNU General Public License\r
+-;; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++;; along with Notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ ;;\r
+ ;; Authors: Carl Worth <cworth@cworth.org>\r
+ ;; David Edmondson <dme@dme.org>\r
+@@ -182,9 +182,9 @@ each attachment handler is logged in buffers with names beginning\r
+ \r
+ (defcustom notmuch-show-stash-mlarchive-link-alist\r
+ '(("Gmane" . "http://mid.gmane.org/")\r
+- ("MARC" . "http://marc.info/?i=")\r
+- ("Mail Archive, The" . "http://mid.mail-archive.com/")\r
+- ("LKML" . "http://lkml.kernel.org/r/")\r
++ ("MARC" . "https://marc.info/?i=")\r
++ ("Mail Archive, The" . "https://mid.mail-archive.com/")\r
++ ("LKML" . "https://lkml.kernel.org/r/")\r
+ ;; FIXME: can these services be searched by `Message-Id' ?\r
+ ;; ("MarkMail" . "http://markmail.org/")\r
+ ;; ("Nabble" . "http://nabble.com/")\r
+diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el\r
+index 98064a3..a3f0c52 100644\r
+--- a/emacs/notmuch-tag.el\r
++++ b/emacs/notmuch-tag.el\r
+@@ -16,7 +16,7 @@\r
+ ;; General Public License for more details.\r
+ ;;\r
+ ;; You should have received a copy of the GNU General Public License\r
+-;; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++;; along with Notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ ;;\r
+ ;; Authors: Carl Worth <cworth@cworth.org>\r
+ ;; Damien Cassou <damien.cassou@gmail.com>\r
+diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el\r
+index 4f9ca2d..5231319 100644\r
+--- a/emacs/notmuch-tree.el\r
++++ b/emacs/notmuch-tree.el\r
+@@ -17,7 +17,7 @@\r
+ ;; General Public License for more details.\r
+ ;;\r
+ ;; You should have received a copy of the GNU General Public License\r
+-;; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++;; along with Notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ ;;\r
+ ;; Authors: David Edmondson <dme@dme.org>\r
+ ;; Mark Walters <markwalters1009@gmail.com>\r
+diff --git a/emacs/notmuch-version.el.tmpl b/emacs/notmuch-version.el.tmpl\r
+index 88cc01c..abf52f1 100644\r
+--- a/emacs/notmuch-version.el.tmpl\r
++++ b/emacs/notmuch-version.el.tmpl\r
+@@ -16,7 +16,7 @@\r
+ ;; General Public License for more details.\r
+ ;;\r
+ ;; You should have received a copy of the GNU General Public License\r
+-;; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++;; along with Notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ \r
+ ;;; Code:\r
+ \r
+diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el\r
+index 065af16..57e6dfa 100644\r
+--- a/emacs/notmuch-wash.el\r
++++ b/emacs/notmuch-wash.el\r
+@@ -16,7 +16,7 @@\r
+ ;; General Public License for more details.\r
+ ;;\r
+ ;; You should have received a copy of the GNU General Public License\r
+-;; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++;; along with Notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ ;;\r
+ ;; Authors: Carl Worth <cworth@cworth.org>\r
+ ;; David Edmondson <dme@dme.org>\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index a8a4c8e..8acdef3 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -15,7 +15,7 @@\r
+ ;; General Public License for more details.\r
+ ;;\r
+ ;; You should have received a copy of the GNU General Public License\r
+-;; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++;; along with Notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ ;;\r
+ ;; Authors: Carl Worth <cworth@cworth.org>\r
+ ;; Homepage: https://notmuchmail.org/\r
+@@ -26,7 +26,7 @@\r
+ ;;\r
+ ;; You will first need to have the notmuch program installed and have a\r
+ ;; notmuch database built in order to use this. See\r
+-;; http://notmuchmail.org for details.\r
++;; https://notmuchmail.org for details.\r
+ ;;\r
+ ;; To install this software, copy it to a directory that is on the\r
+ ;; `load-path' variable within emacs (a good candidate is\r
+@@ -48,7 +48,7 @@\r
+ ;;\r
+ ;; Have fun, and let us know if you have any comment, questions, or\r
+ ;; kudos: Notmuch list <notmuch@notmuchmail.org> (subscription is not\r
+-;; required, but is available from http://notmuchmail.org).\r
++;; required, but is available from https://notmuchmail.org).\r
+ \r
+ ;;; Code:\r
+ \r
+diff --git a/hooks.c b/hooks.c\r
+index 662629a..7348d32 100644\r
+--- a/hooks.c\r
++++ b/hooks.c\r
+@@ -15,7 +15,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Jani Nikula <jani@nikula.org>\r
+ */\r
+diff --git a/lib/built-with.c b/lib/built-with.c\r
+index 7ea1d7f..635ed3b 100644\r
+--- a/lib/built-with.c\r
++++ b/lib/built-with.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: David Bremner <david@tethera.net>\r
+ */\r
+diff --git a/lib/config.cc b/lib/config.cc\r
+index e05e50f..0703b9b 100644\r
+--- a/lib/config.cc\r
++++ b/lib/config.cc\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: David Bremner <david@tethera.net>\r
+ */\r
+diff --git a/lib/database-private.h b/lib/database-private.h\r
+index 1a78b60..ca71a92 100644\r
+--- a/lib/database-private.h\r
++++ b/lib/database-private.h\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index 9630000..f37cc62 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+@@ -217,7 +217,7 @@ typedef struct {\r
+ \r
+ /* With these prefix values we follow the conventions published here:\r
+ *\r
+- * http://xapian.org/docs/omega/termprefixes.html\r
++ * https://xapian.org/docs/omega/termprefixes.html\r
+ *\r
+ * as much as makes sense. Note that I took some liberty in matching\r
+ * the reserved prefix values to notmuch concepts, (for example, 'G'\r
+diff --git a/lib/directory.cc b/lib/directory.cc\r
+index 78637b3..a19f777 100644\r
+--- a/lib/directory.cc\r
++++ b/lib/directory.cc\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/lib/filenames.c b/lib/filenames.c\r
+index 4f7c0d8..63e737d 100644\r
+--- a/lib/filenames.c\r
++++ b/lib/filenames.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/lib/gen-version-script.sh b/lib/gen-version-script.sh\r
+index 8477001..5f99272 100644\r
+--- a/lib/gen-version-script.sh\r
++++ b/lib/gen-version-script.sh\r
+@@ -2,7 +2,7 @@ set -eu\r
+ \r
+ # we go through a bit of work to get the unmangled names of the\r
+ # typeinfo symbols because of\r
+-# http://sourceware.org/bugzilla/show_bug.cgi?id=10326\r
++# https://sourceware.org/bugzilla/show_bug.cgi?id=10326\r
+ \r
+ if [ $# -lt 2 ]; then\r
+ echo Usage: $0 header obj1 obj2 obj3\r
+diff --git a/lib/index.cc b/lib/index.cc\r
+index f166aef..98e4a5d 100644\r
+--- a/lib/index.cc\r
++++ b/lib/index.cc\r
+@@ -12,7 +12,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/lib/message-file.c b/lib/message-file.c\r
+index ee30520..db18b16 100644\r
+--- a/lib/message-file.c\r
++++ b/lib/message-file.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/lib/message.cc b/lib/message.cc\r
+index 6839305..551bd3b 100644\r
+--- a/lib/message.cc\r
++++ b/lib/message.cc\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/lib/messages.c b/lib/messages.c\r
+index 0eee569..b5363bb 100644\r
+--- a/lib/messages.c\r
++++ b/lib/messages.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h\r
+index 9280797..5691240 100644\r
+--- a/lib/notmuch-private.h\r
++++ b/lib/notmuch-private.h\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/lib/notmuch.h b/lib/notmuch.h\r
+index bd977c3..29713ae 100644\r
+--- a/lib/notmuch.h\r
++++ b/lib/notmuch.h\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+@@ -693,7 +693,7 @@ notmuch_database_get_all_tags (notmuch_database_t *db);\r
+ * completely in the future, but it's likely to be a specialized\r
+ * version of the general Xapian query syntax:\r
+ *\r
+- * http://xapian.org/docs/queryparser.html\r
++ * https://xapian.org/docs/queryparser.html\r
+ *\r
+ * As a special case, passing either a length-zero string, (that is ""),\r
+ * or a string consisting of a single asterisk (that is "*"), will\r
+diff --git a/lib/parse-time-vrp.cc b/lib/parse-time-vrp.cc\r
+index b15b77c..dd69149 100644\r
+--- a/lib/parse-time-vrp.cc\r
++++ b/lib/parse-time-vrp.cc\r
+@@ -15,7 +15,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Jani Nikula <jani@nikula.org>\r
+ */\r
+diff --git a/lib/parse-time-vrp.h b/lib/parse-time-vrp.h\r
+index 3bd12bf..c024dba 100644\r
+--- a/lib/parse-time-vrp.h\r
++++ b/lib/parse-time-vrp.h\r
+@@ -15,7 +15,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Jani Nikula <jani@nikula.org>\r
+ */\r
+diff --git a/lib/query-fp.cc b/lib/query-fp.cc\r
+index 4ffcb1e..c39f591 100644\r
+--- a/lib/query-fp.cc\r
++++ b/lib/query-fp.cc\r
+@@ -15,7 +15,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: David Bremner <david@tethera.net>\r
+ */\r
+diff --git a/lib/query-fp.h b/lib/query-fp.h\r
+index 67f8705..d6e4b31 100644\r
+--- a/lib/query-fp.h\r
++++ b/lib/query-fp.h\r
+@@ -15,7 +15,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: David Bremner <david@tethera.net>\r
+ */\r
+diff --git a/lib/query.cc b/lib/query.cc\r
+index 0875b0e..167661c 100644\r
+--- a/lib/query.cc\r
++++ b/lib/query.cc\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/lib/sha1.c b/lib/sha1.c\r
+index 94060d5..1aeb0b6 100644\r
+--- a/lib/sha1.c\r
++++ b/lib/sha1.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/lib/string-list.c b/lib/string-list.c\r
+index da72746..43ebe49 100644\r
+--- a/lib/string-list.c\r
++++ b/lib/string-list.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ * Austin Clements <aclements@csail.mit.edu>\r
+diff --git a/lib/tags.c b/lib/tags.c\r
+index b7e5602..c7d3f66 100644\r
+--- a/lib/tags.c\r
++++ b/lib/tags.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/lib/thread.cc b/lib/thread.cc\r
+index 0c937d7..84ee529 100644\r
+--- a/lib/thread.cc\r
++++ b/lib/thread.cc\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/mime-node.c b/mime-node.c\r
+index e96e663..c9b8233 100644\r
+--- a/mime-node.c\r
++++ b/mime-node.c\r
+@@ -14,7 +14,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Authors: Carl Worth <cworth@cworth.org>\r
+ * Keith Packard <keithp@keithp.com>\r
+diff --git a/notmuch-client.h b/notmuch-client.h\r
+index c130b93..ebc092b 100644\r
+--- a/notmuch-client.h\r
++++ b/notmuch-client.h\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/notmuch-compact.c b/notmuch-compact.c\r
+index 9373721..855545d 100644\r
+--- a/notmuch-compact.c\r
++++ b/notmuch-compact.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Ben Gamari <bgamari.foss@gmail.com>\r
+ */\r
+diff --git a/notmuch-config.c b/notmuch-config.c\r
+index c618f2c..de9a8a4 100644\r
+--- a/notmuch-config.c\r
++++ b/notmuch-config.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+@@ -27,7 +27,7 @@\r
+ static const char toplevel_config_comment[] =\r
+ " .notmuch-config - Configuration file for the notmuch mail system\n"\r
+ "\n"\r
+- " For more information about notmuch, see http://notmuchmail.org";\r
++ " For more information about notmuch, see https://notmuchmail.org";\r
+ \r
+ static const char database_config_comment[] =\r
+ " Database configuration\n"\r
+diff --git a/notmuch-count.c b/notmuch-count.c\r
+index 0b6e6f5..35a2aa7 100644\r
+--- a/notmuch-count.c\r
++++ b/notmuch-count.c\r
+@@ -14,7 +14,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Keith Packard <keithp@keithp.com>\r
+ */\r
+diff --git a/notmuch-dump.c b/notmuch-dump.c\r
+index 8e79511..cae1db8 100644\r
+--- a/notmuch-dump.c\r
++++ b/notmuch-dump.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua\r
+index 4404cd7..02d7fd7 100755\r
+--- a/notmuch-emacs-mua\r
++++ b/notmuch-emacs-mua\r
+@@ -15,7 +15,7 @@\r
+ # GNU General Public License for more details.\r
+ #\r
+ # You should have received a copy of the GNU General Public License\r
+-# along with this program. If not, see http://www.gnu.org/licenses/ .\r
++# along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ #\r
+ # Authors: Jani Nikula <jani@nikula.org>\r
+ #\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index 5205c17..131f09e 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -16,7 +16,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Peter Wang <novalazy@gmail.com>\r
+ */\r
+diff --git a/notmuch-new.c b/notmuch-new.c\r
+index 8d1545e..799fec2 100644\r
+--- a/notmuch-new.c\r
++++ b/notmuch-new.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+index 457e54a..4951373 100644\r
+--- a/notmuch-reply.c\r
++++ b/notmuch-reply.c\r
+@@ -14,7 +14,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Authors: Carl Worth <cworth@cworth.org>\r
+ * Keith Packard <keithp@keithp.com>\r
+diff --git a/notmuch-restore.c b/notmuch-restore.c\r
+index 8ad67b5..371237c 100644\r
+--- a/notmuch-restore.c\r
++++ b/notmuch-restore.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/notmuch-search.c b/notmuch-search.c\r
+index 6d08c25..8c65d5a 100644\r
+--- a/notmuch-search.c\r
++++ b/notmuch-search.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/notmuch-setup.c b/notmuch-setup.c\r
+index 9aaf928..9a66810 100644\r
+--- a/notmuch-setup.c\r
++++ b/notmuch-setup.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 3d5033d..22fa655 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/notmuch-tag.c b/notmuch-tag.c\r
+index 0d15328..18d78dd 100644\r
+--- a/notmuch-tag.c\r
++++ b/notmuch-tag.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/notmuch-time.c b/notmuch-time.c\r
+index e250c3d..2734b36 100644\r
+--- a/notmuch-time.c\r
++++ b/notmuch-time.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/notmuch.c b/notmuch.c\r
+index ce6c575..38b73c1 100644\r
+--- a/notmuch.c\r
++++ b/notmuch.c\r
+@@ -14,7 +14,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Authors: Carl Worth <cworth@cworth.org>\r
+ * Keith Packard <keithp@keithp.com>\r
+@@ -354,7 +354,7 @@ notmuch_command (notmuch_config_t *config,\r
+ "You can also use \"notmuch show\" with any of the thread IDs resulting\n"\r
+ "from a search. Finally, you may want to explore using a more sophisticated\n"\r
+ "interface to notmuch such as the emacs interface implemented in notmuch.el\n"\r
+- "or any other interface described at http://notmuchmail.org\n\n"\r
++ "or any other interface described at https://notmuchmail.org\n\n"\r
+ "And don't forget to run \"notmuch new\" whenever new mail arrives.\n\n"\r
+ "Have fun, and may your inbox never have much mail.\n\n",\r
+ notmuch_config_get_user_name (config),\r
+diff --git a/packaging/fedora/notmuch.spec b/packaging/fedora/notmuch.spec\r
+index 79994c9..5146edd 100644\r
+--- a/packaging/fedora/notmuch.spec\r
++++ b/packaging/fedora/notmuch.spec\r
+@@ -21,9 +21,9 @@ Summary: Thread-based email index, search and tagging\r
+ \r
+ Group: Applications/Internet\r
+ License: GPLv3+\r
+-URL: http://notmuchmail.org/\r
++URL: https://notmuchmail.org/\r
+ \r
+-Source0: http://notmuchmail.org/releases/notmuch-%{version}.tar.gz\r
++Source0: https://notmuchmail.org/releases/notmuch-%{version}.tar.gz\r
+ \r
+ BuildRequires: xapian-core-devel gmime-devel libtalloc-devel\r
+ BuildRequires: zlib-devel emacs-el emacs-nox python ruby ruby-devel perl\r
+diff --git a/parse-time-string/parse-time-string.c b/parse-time-string/parse-time-string.c\r
+index 1cef47d..48ec5b0 100644\r
+--- a/parse-time-string/parse-time-string.c\r
++++ b/parse-time-string/parse-time-string.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see <http://www.gnu.org/licenses/>.\r
++ * along with this program. If not, see <https://www.gnu.org/licenses/>.\r
+ *\r
+ * Author: Jani Nikula <jani@nikula.org>\r
+ */\r
+diff --git a/parse-time-string/parse-time-string.h b/parse-time-string/parse-time-string.h\r
+index bfa4ee3..2063bca 100644\r
+--- a/parse-time-string/parse-time-string.h\r
++++ b/parse-time-string/parse-time-string.h\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see <http://www.gnu.org/licenses/>.\r
++ * along with this program. If not, see <https://www.gnu.org/licenses/>.\r
+ *\r
+ * Author: Jani Nikula <jani@nikula.org>\r
+ */\r
+diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local\r
+index 3469aa3..9dc260e 100644\r
+--- a/performance-test/Makefile.local\r
++++ b/performance-test/Makefile.local\r
+@@ -10,7 +10,7 @@ MEMORY_TEST_SCRIPT := ${dir}/notmuch-memory-test\r
+ CORPUS_NAME := notmuch-email-corpus-$(PERFTEST_VERSION).tar.xz\r
+ TXZFILE := ${dir}/download/${CORPUS_NAME}\r
+ SIGFILE := ${TXZFILE}.asc\r
+-DEFAULT_URL := http://notmuchmail.org/releases/${CORPUS_NAME}\r
++DEFAULT_URL := https://notmuchmail.org/releases/${CORPUS_NAME}\r
+ \r
+ perf-test: time-test memory-test\r
+ \r
+@@ -32,7 +32,7 @@ setup-perf-test: $(TXZFILE)\r
+ $(TXZFILE):\r
+ @printf "\nPlease download ${TXZFILE} using:\n\n"\r
+ @printf "\t%% make download-corpus\n\n"\r
+- @echo or see http://notmuchmail.org/corpus for download locations\r
++ @echo or see https://notmuchmail.org/corpus for download locations\r
+ @echo\r
+ @false\r
+ \r
+diff --git a/performance-test/README b/performance-test/README\r
+index 996724c..fbc6102 100644\r
+--- a/performance-test/README\r
++++ b/performance-test/README\r
+@@ -37,7 +37,7 @@ To fetch the actual corpus it should work to run\r
+ \r
+ In case that fails or is too slow, check\r
+ \r
+- http://notmuchmail.org/corpus\r
++ https://notmuchmail.org/corpus\r
+ \r
+ for a list of mirrors.\r
+ \r
+diff --git a/query-string.c b/query-string.c\r
+index 6536512..cc8b27d 100644\r
+--- a/query-string.c\r
++++ b/query-string.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/sprinter-sexp.c b/sprinter-sexp.c\r
+index 0aa51e8..08783e1 100644\r
+--- a/sprinter-sexp.c\r
++++ b/sprinter-sexp.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Peter Feigl <peter.feigl@gmx.at>\r
+ */\r
+diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh\r
+index daa0256..65c1728 100755\r
+--- a/test/T310-emacs.sh\r
++++ b/test/T310-emacs.sh\r
+@@ -760,8 +760,8 @@ bought\r
+ inbox,stashtest\r
+ ${gen_msg_filename}\r
+ http://mid.gmane.org/bought\r
+-http://marc.info/?i=bought\r
+-http://mid.mail-archive.com/bought\r
++https://marc.info/?i=bought\r
++https://mid.mail-archive.com/bought\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh\r
+index 3f18ec1..e681d5b 100755\r
+--- a/test/T360-symbol-hiding.sh\r
++++ b/test/T360-symbol-hiding.sh\r
+@@ -5,7 +5,7 @@\r
+ \r
+ # This test tests whether hiding Xapian::Error symbols in libnotmuch\r
+ # also hides them for other users of libxapian. This is motivated by\r
+-# the discussion in http://gcc.gnu.org/wiki/Visibility'\r
++# the discussion in https://gcc.gnu.org/wiki/Visibility'\r
+ \r
+ test_description='exception symbol hiding'\r
+ \r
+diff --git a/test/database-test.c b/test/database-test.c\r
+index b8c3a67..42f6655 100644\r
+--- a/test/database-test.c\r
++++ b/test/database-test.c\r
+@@ -15,7 +15,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: David Bremner <david@tethera.net>\r
+ */\r
+diff --git a/test/parse-time.c b/test/parse-time.c\r
+index 901a4dd..694761c 100644\r
+--- a/test/parse-time.c\r
++++ b/test/parse-time.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see <http://www.gnu.org/licenses/>.\r
++ * along with this program. If not, see <https://www.gnu.org/licenses/>.\r
+ *\r
+ * Author: Jani Nikula <jani@nikula.org>\r
+ */\r
+diff --git a/test/random-corpus.c b/test/random-corpus.c\r
+index d74271d..aca694a 100644\r
+--- a/test/random-corpus.c\r
++++ b/test/random-corpus.c\r
+@@ -19,7 +19,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: David Bremner <david@tethera.net>\r
+ */\r
+diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c\r
+index bb13668..a629927 100644\r
+--- a/test/smtp-dummy.c\r
++++ b/test/smtp-dummy.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Authors: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/test/test-databases/Makefile.local b/test/test-databases/Makefile.local\r
+index ff333a1..dcc8863 100644\r
+--- a/test/test-databases/Makefile.local\r
++++ b/test/test-databases/Makefile.local\r
+@@ -1,6 +1,6 @@\r
+ # -*- makefile -*-\r
+ \r
+-TEST_DATABASE_MIRROR=http://notmuchmail.org/releases/test-databases\r
++TEST_DATABASE_MIRROR=https://notmuchmail.org/releases/test-databases\r
+ \r
+ dir := test/test-databases\r
+ \r
+diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh\r
+index ba4a8e1..fe92cdd 100644\r
+--- a/test/test-lib-common.sh\r
++++ b/test/test-lib-common.sh\r
+@@ -13,7 +13,7 @@\r
+ # GNU General Public License for more details.\r
+ #\r
+ # You should have received a copy of the GNU General Public License\r
+-# along with this program. If not, see http://www.gnu.org/licenses/ .\r
++# along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ \r
+ # This file contains common code to be used by both the regular\r
+ # (correctness) tests and the performance tests.\r
+diff --git a/test/test-lib.el b/test/test-lib.el\r
+index 596a705..496626f 100644\r
+--- a/test/test-lib.el\r
++++ b/test/test-lib.el\r
+@@ -16,7 +16,7 @@\r
+ ;; General Public License for more details.\r
+ ;;\r
+ ;; You should have received a copy of the GNU General Public License\r
+-;; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.\r
++;; along with Notmuch. If not, see <https://www.gnu.org/licenses/>.\r
+ ;;\r
+ ;; Authors: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+ \r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index 201d0eb..29ec008 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -13,7 +13,7 @@\r
+ # GNU General Public License for more details.\r
+ #\r
+ # You should have received a copy of the GNU General Public License\r
+-# along with this program. If not, see http://www.gnu.org/licenses/ .\r
++# along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ \r
+ if [ ${BASH_VERSINFO[0]} -lt 4 ]; then\r
+ echo "Error: The notmuch test suite requires a bash version >= 4.0"\r
+diff --git a/util/error_util.c b/util/error_util.c\r
+index d6e60fc..778bbd5 100644\r
+--- a/util/error_util.c\r
++++ b/util/error_util.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/util/error_util.h b/util/error_util.h\r
+index 17c8727..4bb338a 100644\r
+--- a/util/error_util.h\r
++++ b/util/error_util.h\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/util/hex-escape.c b/util/hex-escape.c\r
+index b4a2a02..8883ff9 100644\r
+--- a/util/hex-escape.c\r
++++ b/util/hex-escape.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: David Bremner <david@tethera.net>\r
+ */\r
+diff --git a/util/string-util.c b/util/string-util.c\r
+index 92af937..1812530 100644\r
+--- a/util/string-util.c\r
++++ b/util/string-util.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Jani Nikula <jani@nikula.org>\r
+ */\r
+diff --git a/util/xutil.c b/util/xutil.c\r
+index ac496da..f211eaa 100644\r
+--- a/util/xutil.c\r
++++ b/util/xutil.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/util/xutil.h b/util/xutil.h\r
+index b84e0e2..4829f33 100644\r
+--- a/util/xutil.h\r
++++ b/util/xutil.h\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: Carl Worth <cworth@cworth.org>\r
+ */\r
+diff --git a/util/zlib-extra.c b/util/zlib-extra.c\r
+index 2e70445..2b2cd8f 100644\r
+--- a/util/zlib-extra.c\r
++++ b/util/zlib-extra.c\r
+@@ -13,7 +13,7 @@\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+- * along with this program. If not, see http://www.gnu.org/licenses/ .\r
++ * along with this program. If not, see https://www.gnu.org/licenses/ .\r
+ *\r
+ * Author: David Bremner <david@tethera.net>\r
+ */\r
+-- \r
+2.8.1\r
+\r
projects / notmuch-archives.git / commitdiff