Subject: bug#29209: closed (Re: [bug#29209] website patches)

From: [email-masked] (GNU bug Tracking System)
Date: Thu, 09 Nov 2017 15:30:02 +0000

Your bug report

#29209: website patches

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
29209: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=29209
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#29209] website patches
From: [email-masked] (Ludovic Courtès)
To: ng0 <[email-masked]>
Cc: [email-masked]
Date: Thu, 09 Nov 2017 16:29:31 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi,

ng0 <[email-masked]> skribis:

> I've sent this a couple of weeks ago on the guix-devel list,
> but no one seems to have noticed and applied it.

I did not see it.

> Appended patches are for the wip branch.

Pushed, thanks!

Ludo’.

Subject: website patches
From: ng0 <[email-masked]>
To: [email-masked]
Date: Wed, 8 Nov 2017 10:09:51 +0000
List-Id: <debbugs-submit.debbugs.gnu.org>

I've sent this a couple of weeks ago on the guix-devel list,
but no one seems to have noticed and applied it.

Appended patches are for the wip branch.
-- 
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://dist.ng0.infotropique.org/dist/keys/
  WWW: https://ng0.infotropique.org
From d3488dd375cb459f2ed01a294cddfec3f4f605ea Mon Sep 17 00:00:00 2001
From: ng0 <[email-masked]>
Date: Thu, 12 Oct 2017 06:17:43 +0000
Subject: [PATCH 1/6] website: downloads: Change http to https in alpha.gnu.org
 URL.

* website/apps/download/templates/download.scm (download-t): https not http.
---
 website/apps/download/templates/download.scm | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/website/apps/download/templates/download.scm b/website/apps/download/templates/download.scm
index d801a74..c7457d8 100644
--- a/website/apps/download/templates/download.scm
+++ b/website/apps/download/templates/download.scm
@@ -1,6 +1,22 @@
 ;;; GuixSD website --- GNU's advanced distro website
+;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Initially written by sirgazil who waves all
 ;;; copyright interest on this file.
+;;;
+;;; This file is part of GuixSD website.
+;;;
+;;; GuixSD website is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU Affero General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GuixSD website is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU Affero General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU Affero General Public License
+;;; along with GuixSD website.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (apps download templates download)
   #:use-module (apps base templates theme)
@@ -57,8 +73,8 @@
        "Source code for the Guix System Distribution USB installation
        images as well as GNU Guix can be found on the GNU ftp server
        for " (em "alpha") " releases: "
-       (a (@ (href "http://alpha.gnu.org/gnu/guix/"))
-	  "http://alpha.gnu.org/gnu/guix/")
+       (a (@ (href "https://alpha.gnu.org/gnu/guix/"))
+	  "https://alpha.gnu.org/gnu/guix/")
        " (via HTTP) and "
        (a (@ (href "ftp://alpha.gnu.org/gnu/guix/"))
 	  "ftp://alpha.gnu.org/gnu/guix/")
-- 
2.14.2

From 8c7f2078a8f677e25d8021b1f2f9dc24884c9078 Mon Sep 17 00:00:00 2001
From: ng0 <[email-masked]>
Date: Thu, 12 Oct 2017 06:24:26 +0000
Subject: [PATCH 2/6] website: base: Change http to https in some URLs on
 'contribute'.

* website/apps/base/templates/contribute.scm (contribute-t): http -> https.
---
 website/apps/base/templates/contribute.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/website/apps/base/templates/contribute.scm b/website/apps/base/templates/contribute.scm
index dc092c8..7d7fb27 100644
--- a/website/apps/base/templates/contribute.scm
+++ b/website/apps/base/templates/contribute.scm
@@ -37,10 +37,10 @@
        "The Guix System Distribution is a large project developed
        mostly by volunteers from all around the world. You are welcome
        to join us in the "
-       (a (@ (href "http://lists.gnu.org/mailman/listinfo/guix-devel"))
+       (a (@ (href "https://lists.gnu.org/mailman/listinfo/guix-devel"))
 	  "development mailing list")
        " or in the "
-       (a (@ (href "http://webchat.freenode.net/?channels=%23guix"))
+       (a (@ (href "https://webchat.freenode.net/?channels=%23guix"))
 	  "#guix channel")
        " in IRC Freenode. Tell us how would you like to help, and we
        will do our best to guide you. ")
@@ -84,7 +84,7 @@
 	(p
 	 ,(link-more
 	   #:label "Contribute"
-	   #:url "http://lists.gnu.org/mailman/listinfo/guix-devel")))
+	   #:url "https://lists.gnu.org/mailman/listinfo/guix-devel")))

        (div
@@ -104,7 +104,7 @@
 	(p
 	 ,(link-more
 	   #:label "Start writing"
-	   #:url "http://lists.gnu.org/mailman/listinfo/guix-devel")))
+	   #:url "https://lists.gnu.org/mailman/listinfo/guix-devel")))

        (div
@@ -132,7 +132,7 @@
 	(p
 	 ,(link-more
 	   #:label "Send a new package"
-	   #:url "//lists.gnu.org/mailman/listinfo/guix-patches")))
+	   #:url "https://lists.gnu.org/mailman/listinfo/guix-patches")))

        (div
@@ -163,7 +163,7 @@
 	(p
 	 ,(link-more
 	   #:label "Send a patch"
-	   #:url "//lists.gnu.org/mailman/listinfo/guix-patches")))
+	   #:url "https://lists.gnu.org/mailman/listinfo/guix-patches")))

        (div
@@ -179,11 +179,11 @@
 	 (a (@ (href ,(guix-url "donate/")))
 	    "donate hardware or hosting")
 	 " for our "
-	 (a (@ (href "http://hydra.gnu.org")) "build farm") ".  ")
+	 (a (@ (href "https://hydra.gnu.org")) "build farm") ".  ")
 	(p
 	 ,(link-more
 	   #:label "Contribute"
-	   #:url "http://lists.gnu.org/mailman/listinfo/guix-devel")))
+	   #:url "https://lists.gnu.org/mailman/listinfo/guix-devel")))

        (div
@@ -215,7 +215,7 @@
 	 (a (@ (href "http://translationproject.org/domain/guix.html"))
 	    "software")
 	 " and the "
-	 (a (@ (href "http://translationproject.org/domain/guix-packages.html"))
+	 (a (@ (href "https://translationproject.org/domain/guix-packages.html"))
 	    "package descriptions")
 	 " to your language.  See the "
 	 (a (@ (href "https://translationproject.org/html/translators.html"))
-- 
2.14.2

From 3c5f3ada68116cf45afa3faecb6f7d20a7dd0899 Mon Sep 17 00:00:00 2001
From: ng0 <[email-masked]>
Date: Thu, 12 Oct 2017 06:26:47 +0000
Subject: [PATCH 3/6] website: base: Change http to https in 'graphics'.

website/apps/base/templates/graphics.scm (graphics-t): http -> https.
---
 website/apps/base/templates/graphics.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/apps/base/templates/graphics.scm b/website/apps/base/templates/graphics.scm
index 30b73e7..9f7c357 100644
--- a/website/apps/base/templates/graphics.scm
+++ b/website/apps/base/templates/graphics.scm
@@ -52,7 +52,7 @@
        (p
 	"Permission is granted to copy, distribute and/or modify this
         work under the terms of the "
-	(a (@ (href "http://creativecommons.org/licenses/by-sa/4.0/"))
+	(a (@ (href "https://creativecommons.org/licenses/by-sa/4.0/"))
 	   "Creative Commons Attribution-ShareAlike 4.0 International License")
 	"."))
       (p
-- 
2.14.2

From 1df71db7c664a6b83262210596dc3b0162d9c87d Mon Sep 17 00:00:00 2001
From: ng0 <[email-masked]>
Date: Thu, 12 Oct 2017 06:28:45 +0000
Subject: [PATCH 4/6] website: base: Change some http to https.

website/apps/base/templates/donate.scm (donate-t): http -> https.
---
 website/apps/base/templates/donate.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/apps/base/templates/donate.scm b/website/apps/base/templates/donate.scm
index a07b9eb..e8a5d34 100644
--- a/website/apps/base/templates/donate.scm
+++ b/website/apps/base/templates/donate.scm
@@ -34,7 +34,7 @@
 
       (p
        "The "
-       (a (@ (href "http://hydra.gnu.org/jobset/gnu/master"))
+       (a (@ (href "https://hydra.gnu.org/jobset/gnu/master"))
 	  "build farm")
        " of the Guix System Distribution runs on donated hardware and"
        " hosting. As the distribution grows (see the "
@@ -86,7 +86,7 @@
 
       (p
        "The table below summarizes hardware and hosting donations that
-        make the " (a (@ (href "http://hydra.gnu.org")) "build farm")
+        make the " (a (@ (href "https://hydra.gnu.org")) "build farm")
 	" for the Guix System Distribution a reality.")
 
       (div
-- 
2.14.2

From 1fe4391baaa8a1d8ac3a3df361f9129ad67abe79 Mon Sep 17 00:00:00 2001
From: ng0 <[email-masked]>
Date: Thu, 12 Oct 2017 06:30:46 +0000
Subject: [PATCH 5/6] website: base: Change URLs in 'data' from http to https.

* website/apps/base/data.scm: http -> https.
---
 website/apps/base/data.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/website/apps/base/data.scm b/website/apps/base/data.scm
index afeb2a0..2ee3f3e 100644
--- a/website/apps/base/data.scm
+++ b/website/apps/base/data.scm
@@ -49,7 +49,7 @@
 	 "bug database")
       ". If it is not, please report it.")
     #:url "mailto:[email-masked]"
-    #:log "http://debbugs.gnu.org/cgi/pkgreport.cgi?pkg=guix")
+    #:log "https://debbugs.gnu.org/cgi/pkgreport.cgi?pkg=guix")
 
    (contact
     #:name "Development Mailing List"
@@ -57,7 +57,7 @@
     '(p
       "Discussion about the development of GNU Guix and the Guix
       System Distribution (GuixSD). "
-      (a (@ (href "http://lists.gnu.org/archive/html/bug-guix/2013-07/msg00039.html"))
+      (a (@ (href "https://lists.gnu.org/archive/html/bug-guix/2013-07/msg00039.html"))
 	 " Until July 2013")
       ", the bug-Guix mailing list filled that role. ")
     #:url "https://lists.gnu.org/mailman/listinfo/guix-devel"
@@ -69,12 +69,12 @@
     '(p
       "Submission of patches.  Every message sent to this mailing list
       leads to a new entry in our "
-      (a (@ (href "//bugs.gnu.org/guix-patches"))
+      (a (@ (href "https://bugs.gnu.org/guix-patches"))
 	 "patch tracking tool")
       ".  See "
-      (a (@ (href "//debbugs.gnu.org/Advanced.html")) "this page")
+      (a (@ (href "https://debbugs.gnu.org/Advanced.html")) "this page")
       " for more information on how to use it.  "
-      (a (@ (href "//lists.gnu.org/archive/html/guix-devel/2017-02/msg00627.html"))
+      (a (@ (href "https://lists.gnu.org/archive/html/guix-devel/2017-02/msg00627.html"))
 	 "Until February 2017")
       ", the guix-devel mailing list filled that role.")
     #:url "https://lists.gnu.org/mailman/listinfo/guix-patches"
@@ -128,14 +128,14 @@
     #:description
     '(p "Workgroup for fully free GNU/Linux distributions.")
     #:url "https://lists.nongnu.org/mailman/listinfo/gnu-linux-libre"
-    #:log "http://lists.nongnu.org/archive/html/gnu-linux-libre/")
+    #:log "https://lists.nongnu.org/archive/html/gnu-linux-libre/")
 
    (contact
     #:name "GNU Info Mailing List"
     #:description
     '(p "GNU software announcements.")
     #:url "https://lists.gnu.org/mailman/listinfo/info-gnu"
-    #:log "http://lists.gnu.org/archive/html/info-gnu/")))
+    #:log "https://lists.gnu.org/archive/html/info-gnu/")))

-- 
2.14.2

From cdfc996049df01e83dcd29f97af0347df2619722 Mon Sep 17 00:00:00 2001
From: ng0 <[email-masked]>
Date: Thu, 12 Oct 2017 06:33:39 +0000
Subject: [PATCH 6/6] website: Change http to https in URLs.

* website/apps/base/data.scm: http -> https.
* website/apps/base/templates/contribute.scm: likewise.
* website/apps/packages/templates/components.scm: likewise.
* website/apps/packages/templates/detailed-index.scm: likewise.
---
 website/apps/base/data.scm                         | 2 +-
 website/apps/base/templates/contribute.scm         | 2 +-
 website/apps/packages/templates/components.scm     | 2 +-
 website/apps/packages/templates/detailed-index.scm | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/apps/base/data.scm b/website/apps/base/data.scm
index 2ee3f3e..6294e3a 100644
--- a/website/apps/base/data.scm
+++ b/website/apps/base/data.scm
@@ -121,7 +121,7 @@
     #:description
     '(p "Discussion about the development of the broader GNU system.")
     #:url "https://lists.gnu.org/mailman/listinfo/gnu-system-discuss"
-    #:log "http://lists.gnu.org/archive/html/gnu-system-discuss/")
+    #:log "https://lists.gnu.org/archive/html/gnu-system-discuss/")
 
    (contact
     #:name "GNU/Linux Libre Mailing List"
diff --git a/website/apps/base/templates/contribute.scm b/website/apps/base/templates/contribute.scm
index 7d7fb27..3cf26b7 100644
--- a/website/apps/base/templates/contribute.scm
+++ b/website/apps/base/templates/contribute.scm
@@ -212,7 +212,7 @@
 	(h3 (@ (id "translation")) "Translation")
 	(p
 	 "You can help translate the "
-	 (a (@ (href "http://translationproject.org/domain/guix.html"))
+	 (a (@ (href "https://translationproject.org/domain/guix.html"))
 	    "software")
 	 " and the "
 	 (a (@ (href "https://translationproject.org/domain/guix-packages.html"))
diff --git a/website/apps/packages/templates/components.scm b/website/apps/packages/templates/components.scm
index bd1b3fb..4db8c4d 100644
--- a/website/apps/packages/templates/components.scm
+++ b/website/apps/packages/templates/components.scm
@@ -207,7 +207,7 @@
      If the list of supported systems of the package is empty, return
      the string 'None'. Otherwise, return a list of links to systems
      builds in hydra."
-  (let ((build-url "http://hydra.gnu.org/job/gnu/master/")
+  (let ((build-url "https://hydra.gnu.org/job/gnu/master/")
 	(package-id (string-append (package-name package)
 				   "-"
 				   (package-version package)))
diff --git a/website/apps/packages/templates/detailed-index.scm b/website/apps/packages/templates/detailed-index.scm
index 0ac234b..7dc6d7c 100644
--- a/website/apps/packages/templates/detailed-index.scm
+++ b/website/apps/packages/templates/detailed-index.scm
@@ -45,10 +45,10 @@
 	 (@ (class "limit-width centered-block"))
 	 "GNU Guix provides " ,(number* (length packages))
 	 " packages transparently "
-	 (a (@ (href "http://hydra.gnu.org/jobset/gnu/master#tabs-status"))
+	 (a (@ (href "https://hydra.gnu.org/jobset/gnu/master#tabs-status"))
 	    "available as pre-built binaries")
 	 ". These pages provide a complete list of the packages.  Our "
-	 (a (@ (href "http://hydra.gnu.org/jobset/gnu/master"))
+	 (a (@ (href "https://hydra.gnu.org/jobset/gnu/master"))
 	    "continuous integration system")
 	 " shows their current build status "
 	 "(updated " ,(date->string (current-date) "~B ~e, ~Y") ").")
-- 
2.14.2