move more http -> https

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.

diff --git a/AUTHORS b/AUTHORS
index 6d0f2de8ce45c79d77c951753de0332a8aba9106..5fe5006f58ce99916e94361346e1e19593605397 100644 (file)
--- 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
 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
 
 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 69f9df7e0ada594ce2a3e9010b87da0251389bad..056e9facf2fe5090fa8ac8cbf24ad291a435ac4d 100644 (file)
--- 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.
 
        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
        ------
 
        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).
 
        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
 ----------------------
 
 Building Documentation
 ----------------------

diff --git a/NEWS b/NEWS
index db17ce59907a32dc6e8dd54ada2d5427f6fe2ff7..cca1cafced74b2b2340bfe80c67f4a06ef66f1bb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1605,7 +1605,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:
 
   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.
 
   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 2a000655e93f84c8d458d702e13a0f682a45cf45..e60008693e017bec1b4eb49c84be3898e26fcf2a 100644 (file)
--- a/bindings/python/docs/COPYING
+++ b/bindings/python/docs/COPYING
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
                     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.
 
  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 5107a96ea2f4c32769bcca760072300a50113ea4..5b901c4ec4d82e18ed3a406a8dd7915e34668422 100644 (file)
--- 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.
 
 
 # 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 b177b14130f0a966ccec5b1453affbf92ad577c7..1a6bf295a8b3241867120ea493b8323e195da3fc 100755 (executable)
--- 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)"
     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
     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
     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
        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 1207a4aa107cb874c34076d0921a2958d201de9a..98d2d2e3fc7483e4fbf8b7c09e9970aecf018da2 100644 (file)
--- 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.
 
     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
 
 .. _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>",
       "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": [
       {
     },
     "views": [
       {

diff --git a/devel/nmbug/notmuch-report b/devel/nmbug/notmuch-report
index a9c2a6ec5bf4267f6a16c9ab030409c6bad3c3e3..5789c5f442c351e545f353318360f213130ba221 100755 (executable)
--- 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(
     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:
     )
 
 if args.list_views:

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 43debb260610d724a6100d74d7cf983c54ffd149..a0a58373aa675a330dc57c04f94bcde622a0f53e 100644 (file)
--- 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
 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/")
     ("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 35eaf3c60f3f43f72c0cae818a77bc09a5e260dd..6525fb24469239b1a3c31f9e0a721045f5409480 100644 (file)
--- 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
  * 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>
  */
  *
  * Author: David Bremner <david@tethera.net>
  */

diff --git a/lib/string-map.c b/lib/string-map.c
index 5aac8bcc8a8996b36050287183ca3e0893fe922e..ad818207f5d4a91450336a99af2518ffcd2b8bc3 100644 (file)
--- 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
  * 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>
  */
  *
  * Author: David Bremner <david@tethera.net>
  */

diff --git a/notmuch-reindex.c b/notmuch-reindex.c
index 5d702510ae2965d36325222274c46aae6ba3aa67..d8589120cae94ed4fa4efa1c3cfdda9520d5697d 100644 (file)
--- 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
  * 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>
  */
  *
  * Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
  */

diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh
index ba08167f33eab4c5e475828235eaca7b73df323f..9bf68b480591ece6825991a47096642cbbffbb81 100755 (executable)
--- a/test/T310-emacs.sh
+++ b/test/T310-emacs.sh
@@ -866,7 +866,7 @@ id:bought
 bought
 inbox,stashtest
 ${gen_msg_filename}
 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
 https://marc.info/?i=bought
 https://mid.mail-archive.com/bought
 EOF