Patchwork Prefer https: for GNU and FSF URLs

login
register
mail settings
Submitter Paul Eggert
Date Sept. 7, 2019, 10:06 a.m.
Message ID <712eae41-cc8d-fe80-da06-249c9a2b7cff@cs.ucla.edu>
Download mbox | patch
Permalink /patch/34440/
State New
Headers show

Comments

Paul Eggert - Sept. 7, 2019, 10:06 a.m.
On 9/22/17 4:47 AM, Joseph Myers wrote:

> This command looks like it would modify some generated files, rather than
> modifying their sources and regenerating.

Thanks for mentioning that. I finally got around to fixing the issues you 
mentioned, and installed the adjusted patch into the glibc master. As the patch 
is 5.6 MB I won't attach it here.

I ran into a problem, though: the remote on sourceware.org refused to patch 
three of the files, giving messages like this:

# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines

or like this:

# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line 
does not end in newline

I'm attaching a patch for the three files that the remote refused to fix. I 
assume that to install this patch I would need to fix the pre-commit hooks on 
the sourceware.org side, but I don't see how to go about this in 
<https://sourceware.org/glibc/wiki/GlibcGit#Git_Server_Maintenance>; am I 
looking in the wrong place?
Joseph Myers - Sept. 9, 2019, 4:27 p.m.
On Sat, 7 Sep 2019, Paul Eggert wrote:

> On 9/22/17 4:47 AM, Joseph Myers wrote:
> 
> > This command looks like it would modify some generated files, rather than
> > modifying their sources and regenerating.
> 
> Thanks for mentioning that. I finally got around to fixing the issues you
> mentioned, and installed the adjusted patch into the glibc master. As the
> patch is 5.6 MB I won't attach it here.

It looks like this is missing regeneration of locale/programs/charmap-kw.h 
to reflect the use of https in charmap-kw.gperf.

Patch

From fd91cced29fa417347318a2816426e3168f6ea72 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 7 Sep 2019 02:54:48 -0700
Subject: [PATCH] Fix three GNU license URLs.

---
 sysdeps/powerpc/powerpc64/ppc-mcount.S          | 2 +-
 sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S | 2 +-
 sysdeps/unix/sysv/linux/s390/s390-64/syscall.S  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sysdeps/powerpc/powerpc64/ppc-mcount.S b/sysdeps/powerpc/powerpc64/ppc-mcount.S
index fb301a77be..bcf0b035d1 100644
--- a/sysdeps/powerpc/powerpc64/ppc-mcount.S
+++ b/sysdeps/powerpc/powerpc64/ppc-mcount.S
@@ -14,7 +14,7 @@ 
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
 /* We don't need to save the parameter-passing registers as gcc takes
diff --git a/sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S b/sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
index 17f5f26391..fda80c2f0f 100644
--- a/sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
+++ b/sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
@@ -16,7 +16,7 @@ 
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
 
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/syscall.S b/sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
index b51aa2fc50..ca8b1afdc8 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
@@ -14,7 +14,7 @@ 
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
 
-- 
2.21.0