From patchwork Mon Sep 9 21:18:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Eggert X-Patchwork-Id: 34461 Received: (qmail 82082 invoked by alias); 9 Sep 2019 21:18:18 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 82074 invoked by uid 89); 9 Sep 2019 21:18:18 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_PASS autolearn=ham version=3.3.1 spammy=HX-Spam-Relays-External:sk:zimbra., H*RU:sk:zimbra., HX-HELO:sk:zimbra. X-HELO: zimbra.cs.ucla.edu Subject: Re: [PATCH] Prefer https: for GNU and FSF URLs To: Joseph Myers Cc: GNU C Library References: <18cce39e-4a5a-27d8-a1ca-5ec45973088e@cs.ucla.edu> <712eae41-cc8d-fe80-da06-249c9a2b7cff@cs.ucla.edu> From: Paul Eggert Openpgp: preference=signencrypt Message-ID: <6454b256-3d6a-f8a9-3cc0-f18b89d040fb@cs.ucla.edu> Date: Mon, 9 Sep 2019 14:18:01 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: On 9/9/19 9:27 AM, Joseph Myers wrote: > It looks like this is missing regeneration of locale/programs/charmap-kw.h > to reflect the use of https in charmap-kw.gperf. Thanks for spotting that. I rebuilt that file as follows: cd locale rm ../../glibc/locale/programs/charmap-kw.h \ ../../glibc/locale/programs/locfile-kw.h make objdir=$(cd .. && pwd) -C ../../glibc/locale \ programs/charmap-kw.h \ programs/locfile-kw.h The locfile-kw.h rebuild was needed because gperf 3.1 changed its API. I tweaked the localedef internals accordingly, and installed the first attached patch. In looking for similar glitches I noticed a few "http:"s in 'configure' that can be fixed by adding a URL to AC_INIT. So I installed the second attached patch to do that. From 9975ad0298c9e772d8d98634ae36ad9aee210b59 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 9 Sep 2019 14:10:23 -0700 Subject: [PATCH 2/2] Fix http: URL in 'configure' * configure.ac: Add URL to AC_INIT so that it generates an https: URL instead of an http: URL. * configure: Regenerate. --- ChangeLog | 5 +++++ configure | 6 +++--- configure.ac | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 307ae5874f..00658e6835 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2019-09-09 Paul Eggert + Fix http: URL in 'configure' + * configure.ac: Add URL to AC_INIT so that it generates an + https: URL instead of an http: URL. + * configure: Regenerate. + Regenerate charmap-kw.h, locfile-kw.h This propagates the recent http->https URL changes. Since I used gperf 3.1 to regenerate, this is also a minor diff --git a/configure b/configure index 618c9836fc..2f44b66656 100755 --- a/configure +++ b/configure @@ -582,7 +582,7 @@ PACKAGE_TARNAME='glibc' PACKAGE_VERSION='(see version.h)' PACKAGE_STRING='GNU C Library (see version.h)' PACKAGE_BUGREPORT='https://sourceware.org/bugzilla/' -PACKAGE_URL='http://www.gnu.org/software/glibc/' +PACKAGE_URL='https://www.gnu.org/software/glibc/' ac_unique_file="include/features.h" enable_option_checking=no @@ -1505,7 +1505,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to . -GNU C Library home page: . +GNU C Library home page: . General help using GNU software: . _ACEOF ac_status=$? @@ -7473,7 +7473,7 @@ Configuration commands: $config_commands Report bugs to . -GNU C Library home page: . +GNU C Library home page: . General help using GNU software: ." _ACEOF diff --git a/configure.ac b/configure.ac index b7a22afb86..e69c88c543 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ dnl Process this file with autoconf to produce a configure script. dnl Note we do not use AC_PREREQ here! See aclocal.m4 for what we use instead. -AC_INIT([GNU C Library], [(see version.h)], [https://sourceware.org/bugzilla/], [glibc]) +AC_INIT([GNU C Library], [(see version.h)], [https://sourceware.org/bugzilla/], + [glibc], [https://www.gnu.org/software/glibc/]) AC_CONFIG_SRCDIR([include/features.h]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([scripts]) -- 2.21.0