Correct URLs that have crept into the notmuch codebase with http:// when https:// is possible. As part of this conversion, this changeset also indicates the current preferred upstream URLs for both gmime and sup. the new URLs are https-enabled, the old ones are not. This also fixes T310-emacs.sh, thanks to Bremner for catching it. --- AUTHORS | 2 +- INSTALL | 4 ++-- NEWS | 2 +- bindings/python/docs/COPYING | 2 +- bindings/python/docs/source/conf.py | 2 +- configure | 6 +++--- devel/nmbug/doc/man5/notmuch-report.json.5.rst | 6 +++--- devel/nmbug/notmuch-report | 2 +- emacs/notmuch-show.el | 2 +- lib/message-property.cc | 2 +- lib/string-map.c | 2 +- notmuch-reindex.c | 2 +- test/T310-emacs.sh | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/AUTHORS b/AUTHORS index 6d0f2de8..5fe5006f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -3,7 +3,7 @@ But there's really not much that he's done. There's been a lot of standing on shoulders here: William Morgan deserves credit for providing the primary inspiration -for Notmuch with his program Sup (http://sup.rubyforge.org/). +for Notmuch with his program Sup (https://sup-heliotrope.github.io/). Some people have contributed code that has made it into Notmuch without their specific knowledge (but with their full permission diff --git a/INSTALL b/INSTALL index 69f9df7e..056e9fac 100644 --- a/INSTALL +++ b/INSTALL @@ -46,7 +46,7 @@ Talloc, and zlib which are each described below: Without GMime, Notmuch would not be able to extract and index the actual text from email message encoded as BASE64, etc. - GMime is available from http://spruce.sourceforge.net/gmime/ + GMime is available from https://github.com/jstedfast/gmime Talloc ------ @@ -70,7 +70,7 @@ Talloc, and zlib which are each described below: Notmuch needs the transparent write feature of zlib introduced in version 1.2.5.2 (Dec. 2011). - zlib is available from http://zlib.net + zlib is available from https://zlib.net Building Documentation ---------------------- diff --git a/NEWS b/NEWS index fff8a08c..2b8d7bc8 100644 --- a/NEWS +++ b/NEWS @@ -1588,7 +1588,7 @@ uses `@{upstream}` instead of `FETCH_HEAD` to track upstream changes. 2. Remove your `NMBGIT` repository (e.g. `mv .nmbug .nmbug.bak`). 3. Use the new `clone` command to create a fresh clone: - nmbug clone http://nmbug.tethera.net/git/nmbug-tags.git + nmbug clone https://nmbug.notmuchmail.org/git/nmbug-tags.git 4. If you had local commits in step 1, add a remote for that repository and fetch them into the new repository. diff --git a/bindings/python/docs/COPYING b/bindings/python/docs/COPYING index 2a000655..e6000869 100644 --- a/bindings/python/docs/COPYING +++ b/bindings/python/docs/COPYING @@ -1,7 +1,7 @@ GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/bindings/python/docs/source/conf.py b/bindings/python/docs/source/conf.py index 5107a96e..5b901c4e 100644 --- a/bindings/python/docs/source/conf.py +++ b/bindings/python/docs/source/conf.py @@ -215,4 +215,4 @@ latex_documents = [ # Example configuration for intersphinx: refer to the Python standard library. -intersphinx_mapping = {'http://docs.python.org/': None} +intersphinx_mapping = {'https://docs.python.org/': None} diff --git a/configure b/configure index b177b141..1a6bf295 100755 --- a/configure +++ b/configure @@ -734,18 +734,18 @@ EOF fi if [ $have_zlib -eq 0 ]; then echo " zlib library (>= version 1.2.5.2, including development files such as headers)" - echo " http://zlib.net/" + echo " https://zlib.net/" echo fi if [ $have_gmime -eq 0 ]; then echo " GMime 2.6 library >= $GMIME_MINVER" echo " (including development files such as headers)" - echo " http://spruce.sourceforge.net/gmime/" + echo " https://github.com/jstedfast/gmime/" echo fi if [ $have_glib -eq 0 ]; then echo " Glib library >= 2.22 (including development files such as headers)" - echo " http://ftp.gnome.org/pub/gnome/sources/glib/" + echo " https://ftp.gnome.org/pub/gnome/sources/glib/" echo fi if [ $have_talloc -eq 0 ]; then diff --git a/devel/nmbug/doc/man5/notmuch-report.json.5.rst b/devel/nmbug/doc/man5/notmuch-report.json.5.rst index 1207a4aa..98d2d2e3 100644 --- a/devel/nmbug/doc/man5/notmuch-report.json.5.rst +++ b/devel/nmbug/doc/man5/notmuch-report.json.5.rst @@ -79,8 +79,8 @@ views An array of strings, which will be joined with 'and' to form the view query. -.. _Gmane: http://gmane.org/ -.. _JSON: http://json.org/ +.. _Gmane: https://gmane.org/ +.. _JSON: https://json.org/ .. _Python format string: https://docs.python.org/3/library/string.html#formatstrings .. _quoted: https://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote @@ -95,7 +95,7 @@ EXAMPLE "blurb": "For more information see <a href=\"https://notmuchmail.org/nmbug\">nmbug</a>", "header": "<html><head></head><body><h1>{title}</h1><p>{blurb}</p><h2>Views</h2>", "footer": "<hr><p>Generated: {datetime}</p></html>", - "message-url": "http://mid.gmane.org/{message-id}" + "message-url": "https://mid.gmane.org/{message-id}" }, "views": [ { diff --git a/devel/nmbug/notmuch-report b/devel/nmbug/notmuch-report index a9c2a6ec..5789c5f4 100755 --- a/devel/nmbug/notmuch-report +++ b/devel/nmbug/notmuch-report @@ -415,7 +415,7 @@ _PAGES['html'] = HtmlPage( header=header_template.format(**context), footer=footer_template.format(**context), message_url_template=config['meta'].get( - 'message-url', 'http://mid.gmane.org/{message-id}'), + 'message-url', 'https://mid.gmane.org/{message-id}'), ) if args.list_views: diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index 43debb26..a0a58373 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -183,7 +183,7 @@ each attachment handler is logged in buffers with names beginning 24.3 to work.") (defcustom notmuch-show-stash-mlarchive-link-alist - '(("Gmane" . "http://mid.gmane.org/") + '(("Gmane" . "https://mid.gmane.org/") ("MARC" . "https://marc.info/?i=") ("Mail Archive, The" . "https://mid.mail-archive.com/") ("LKML" . "https://lkml.kernel.org/r/") diff --git a/lib/message-property.cc b/lib/message-property.cc index 35eaf3c6..6525fb24 100644 --- a/lib/message-property.cc +++ b/lib/message-property.cc @@ -16,7 +16,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 http://www.gnu.org/licenses/ . + * along with this program. If not, see https://www.gnu.org/licenses/ . * * Author: David Bremner <david@tethera.net> */ diff --git a/lib/string-map.c b/lib/string-map.c index 5aac8bcc..ad818207 100644 --- a/lib/string-map.c +++ b/lib/string-map.c @@ -14,7 +14,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 http://www.gnu.org/licenses/ . + * along with this program. If not, see https://www.gnu.org/licenses/ . * * Author: David Bremner <david@tethera.net> */ diff --git a/notmuch-reindex.c b/notmuch-reindex.c index 5d702510..d8589120 100644 --- a/notmuch-reindex.c +++ b/notmuch-reindex.c @@ -13,7 +13,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 http://www.gnu.org/licenses/ . + * along with this program. If not, see https://www.gnu.org/licenses/ . * * Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net> */ diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh index ba08167f..9bf68b48 100755 --- a/test/T310-emacs.sh +++ b/test/T310-emacs.sh @@ -866,7 +866,7 @@ id:bought bought inbox,stashtest ${gen_msg_filename} -http://mid.gmane.org/bought +https://mid.gmane.org/bought https://marc.info/?i=bought https://mid.mail-archive.com/bought EOF -- 2.17.0 _______________________________________________ notmuch mailing list notmuch@notmuchmail.org https://notmuchmail.org/mailman/listinfo/notmuch