From unknown Fri Sep 12 16:03:33 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#79382 <79382@debbugs.gnu.org> To: bug#79382 <79382@debbugs.gnu.org> Subject: Status: patch needed after gnulib changed Reply-To: bug#79382 <79382@debbugs.gnu.org> Date: Fri, 12 Sep 2025 23:03:33 +0000 retitle 79382 patch needed after gnulib changed reassign 79382 diffutils submitter 79382 Bruno Haible severity 79382 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 03 18:54:11 2025 Received: (at submit) by debbugs.gnu.org; 3 Sep 2025 22:54:11 +0000 Received: from localhost ([127.0.0.1]:43223 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1utwMk-00066u-U3 for submit@debbugs.gnu.org; Wed, 03 Sep 2025 18:54:11 -0400 Received: from lists.gnu.org ([2001:470:142::17]:55994) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1utwMi-00066M-3B for submit@debbugs.gnu.org; Wed, 03 Sep 2025 18:54:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1utwMZ-00067n-Jj for bug-diffutils@gnu.org; Wed, 03 Sep 2025 18:53:59 -0400 Received: from mo4-p00-ob.smtp.rzone.de ([85.215.255.21]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1utwMV-0002vz-PK for bug-diffutils@gnu.org; Wed, 03 Sep 2025 18:53:59 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1756940031; cv=none; d=strato.com; s=strato-dkim-0002; b=MIoJNIsAFUrilalf3OGzHYpn9BfM2hlnYwD4OxBhjO4sBCRk7I696J1rwf/EBUOa5l N7QWuK0AZYtVXPnuJtBxDYByuNqfhJD0BWVSgEdzF201lq95ajnr6hMUwigAse0qxs1K jX8a6xeCLzP77i0vdyY1Ruifrs//5dDz5bBQTZ/O/R7Z16O1lC14TyJ+Ef8WBx1c2N2Z sZ5FqVINqMkKFAYHEcSmkF2+fj1ARcWeaP5Cq2jPFgnS2YbHlKheu5Zaj1aWZ+siwD/l zol0UtO+dFMqDa4c2PwHzGvQNWp/gNKUBhUx+s9dAGo7wVrGZdhh0mx6NS14y449CPj3 FCyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1756940031; s=strato-dkim-0002; d=strato.com; h=Message-ID:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=ewqOggNe3/wPqWbP8/mVM3b1eBGP+lDaU1H+lCg3Hdg=; b=EEQSydnENXBmD828gqhLMpjEojVa63JE9pCub6JZMD2Xim/1qOTHZqX/OMdTSMmy44 4CWo/utnhWXhVO7psDWOzTMEG1G1BvUnlWQsUDo6lXhTeLBBPLoPfAynljHcUVCCS4BZ 9K/IYq/mkIVZlvvZKzWqX+Jnalqua8EVVLYQS04DBYDNLDONr9ReN2uKZJvchYVH0BtY puOoysOqh0G4I0EDAv+yMJUwnck5ajFtaBEsFx2JRWl+zzPPzLSd6VdwLqFhQr77v/4m 0qk0ajbXG8yq35WbRa6+sn12OkwEk5i1/RvdjHsUDZ5r4BEftt3nW3lI3v8fw6vUFQfm OO0Q== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1756940031; s=strato-dkim-0002; d=clisp.org; h=Message-ID:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=ewqOggNe3/wPqWbP8/mVM3b1eBGP+lDaU1H+lCg3Hdg=; b=orx0gyTsGjhrvPDMlRPWQAt2VAE8O3QjiKdSeCDyYqolMmhc5G3+VJUDqYRk3QXcEQ XRAldrzYiGUTQdXwyy5XqJHmBPavp1PjvV8WWlpbe+iAW5v7PKhl8MW53f+DBvZqGSlh L4pHVx5+laygKphx/DO19TjTB1vY2aJubarGDcZk/TS3Namy6ScWBSshy6YZdW+YjH9X J+uEDTK7LPpj7vhTumwUUjCEh87w/CtrdSMZTeMmoZYoUz6jMKdl2DV6594vV5zztPpT ZS3iEHcyoh9y5xIGgS46vd7a5TcNGIfnkjXEf5pQyuOQrnO2LcxctJk1ASMSIb+lPVPH sCxg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1756940031; s=strato-dkim-0003; d=clisp.org; h=Message-ID:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=ewqOggNe3/wPqWbP8/mVM3b1eBGP+lDaU1H+lCg3Hdg=; b=R91ttUZGQM33Vhj+OHZPVdEvdvTZNprH87miqjZ2VdEvJV1/uEBub9GrRefG3IHuun FmNW0vIxvF8PgLq+tdBg== X-RZG-AUTH: ":Ln4Re0+Ic/6oZXR1YgKryK8brlshOcZlLnY4jECd2hdUURIbZgL8PX2QiTuZ3cdB8X/nqmqeF235XbG12RLCPP5dgnTWurU6" Received: from nimes.localnet by smtp.strato.de (RZmta 52.1.2 AUTH) with ESMTPSA id N9ae63183Mrp4dm (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Thu, 4 Sep 2025 00:53:51 +0200 (CEST) From: Bruno Haible To: bug-diffutils@gnu.org Subject: patch needed after gnulib changed Date: Thu, 04 Sep 2025 00:53:51 +0200 Message-ID: <295198556.K07Qtm5XNL@nimes> Organization: GNU MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart6129363.ufzOXCrVFQ" Content-Transfer-Encoding: 7Bit Received-SPF: none client-ip=85.215.255.21; envelope-from=bruno@clisp.org; helo=mo4-p00-ob.smtp.rzone.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --nextPart6129363.ufzOXCrVFQ Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Hi, There was a change today in gnulib, that requires a small change in packages that use gnulib-tool --with-tests with --makefile-name. GNU diffutils is one such package. Currently, './bootstrap' fails like this: ... autoreconf: running: automake --add-missing --copy --force-missing gnulib-tests/gnulib.mk:47: error: AM_CFLAGS must be set with '=' before using '+=' gnulib-tests/Makefile.am:1: 'gnulib-tests/gnulib.mk' included from here autoreconf: error: automake failed with exit status: 1 ./bootstrap: autoreconf failed The attached proposed patch fixes it. --nextPart6129363.ufzOXCrVFQ Content-Disposition: attachment; filename="0001-build-Update-after-gnulib-changed.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="x-UTF_8J"; name="0001-build-Update-after-gnulib-changed.patch" >From c59e71fcd55299fb5487df7dbfe4eec6d5080835 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 4 Sep 2025 00:51:24 +0200 Subject: [PATCH] build: Update after gnulib changed * gnulib-tests/Makefile.am: Initialize AM_CFLAGS. --- gnulib-tests/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnulib-tests/Makefile.am b/gnulib-tests/Makefile.am index 6635f70..f68911f 100644 --- a/gnulib-tests/Makefile.am +++ b/gnulib-tests/Makefile.am @@ -1 +1,3 @@ +AM_CFLAGS = + include gnulib.mk -- 2.50.1 --nextPart6129363.ufzOXCrVFQ-- From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 05 18:55:36 2025 Received: (at 79382-done) by debbugs.gnu.org; 5 Sep 2025 22:55:37 +0000 Received: from localhost ([127.0.0.1]:58381 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uufLD-0008US-Vv for submit@debbugs.gnu.org; Fri, 05 Sep 2025 18:55:36 -0400 Received: from mail.cs.ucla.edu ([131.179.128.66]:33488) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uufL6-0008Tn-Gt for 79382-done@debbugs.gnu.org; Fri, 05 Sep 2025 18:55:30 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.cs.ucla.edu (Postfix) with ESMTP id 526703C2E8B42; Fri, 5 Sep 2025 15:55:20 -0700 (PDT) Received: from mail.cs.ucla.edu ([127.0.0.1]) by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10032) with ESMTP id 6f25ib4XEDFi; Fri, 5 Sep 2025 15:55:20 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by mail.cs.ucla.edu (Postfix) with ESMTP id 2562D3C330C19; Fri, 5 Sep 2025 15:55:20 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.cs.ucla.edu 2562D3C330C19 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.ucla.edu; s=9D0B346E-2AEB-11ED-9476-E14B719DCE6C; t=1757112920; bh=ouzXflIncP+yujYiQMirQbUWJ52G2j24nt2HdZyCUBY=; h=Message-ID:Date:MIME-Version:To:From; b=cxVXwWZ3JqFUcpGhRi0jAraIs8IYGp8puW/jg7NVxlPKMlS7qbH9LvnP2w5isRmWM ZkhlOzCCT2twb5Jar8Y4aHrrzPTldeu3dl5w7LMJ9b+POiYwRwbmwVMbkhis4WKbJf MFcSHDYHy82+c4EiBjMRD4HBHOngxTApVEub7npAg6XaS+gaFMeGKguo4dDQp2dUfm f52bB3ZO/Sdfnl+uk1Qx25DOk1nNvEGjapZRWBo9+G3Qk1cypBlDt3JcJykTJFQ3H3 0rn7uai8rg5O2Smtei6e9H3XePFbuE7jXa4DyiHo7g3wq2WCDb+NlaS8UYVRk0hLQm 6Kx4DerwtuSJQ== X-Virus-Scanned: amavis at mail.cs.ucla.edu Received: from mail.cs.ucla.edu ([127.0.0.1]) by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10026) with ESMTP id Dx4f4tERKY3b; Fri, 5 Sep 2025 15:55:20 -0700 (PDT) Received: from penguin.cs.ucla.edu (47-154-18-19.fdr01.snmn.ca.ip.frontiernet.net [47.154.18.19]) by mail.cs.ucla.edu (Postfix) with ESMTPSA id 038833C2E8B42; Fri, 5 Sep 2025 15:55:20 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------CzojQXzCjZ80WUP9EaawwT0W" Message-ID: <60ebc9ca-00e9-48cf-9645-774f0a50a204@cs.ucla.edu> Date: Fri, 5 Sep 2025 15:55:19 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [bug-diffutils] bug#79382: patch needed after gnulib changed To: Bruno Haible References: <295198556.K07Qtm5XNL@nimes> Content-Language: en-US From: Paul Eggert Organization: UCLA Computer Science Department In-Reply-To: <295198556.K07Qtm5XNL@nimes> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 79382-done Cc: 79382-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------CzojQXzCjZ80WUP9EaawwT0W Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Thanks, I installed that and am marking this bug report as done. I used the opportunity to sync GNU diff with current Gnulib, causing a few minor changes to Gnulib. I also installed the attached patch, to work around more the places where Gnulib drags in some multithreading and/or locale code that GNU diff (which is single-threaded and not that picky about locales) doesn't need. Not sure if these suggest any Gnulib changes. --------------CzojQXzCjZ80WUP9EaawwT0W Content-Type: text/x-patch; charset=UTF-8; name="0001-maint-reduce-Gnulib-module-usage.patch" Content-Disposition: attachment; filename="0001-maint-reduce-Gnulib-module-usage.patch" Content-Transfer-Encoding: base64 RnJvbSBlMTI0NTQxMTQ4ZDM4Y2Q4YjdmOTYyYWNlYjcyZmI0NGU3Y2MwYWFiIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBGcmksIDUgU2VwIDIwMjUgMDk6NTY6MTMgLTA3MDAKU3ViamVjdDogW1BBVENI XSBtYWludDogcmVkdWNlIEdudWxpYiBtb2R1bGUgdXNhZ2UKTUlNRS1WZXJzaW9uOiAxLjAK Q29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFyc2V0PVVURi04CkNvbnRlbnQtVHJhbnNm ZXItRW5jb2Rpbmc6IDhiaXQKClJlY2VudGlzaCBjaGFuZ2VzIHRvIEdudWxpYiBoYXZlIHB1 bGxlZCBpbiBtb3JlIGRlcGVuZGVuY2llcwpvbiBtdWx0aXRocmVhZGluZywgbG9ja2luZywg YW5kIHdoYXRub3QuICBSZXZhbXAgdG8gcmVtb3ZlCnRoZXNlIHVud2FudGVkIGRlcGVuZGVu Y2llcy4KKiBib290c3RyYXAuY29uZjogQWxzbyBhdm9pZCBoYXJkLWxvY2FsZSwgbG9jYWxj aGFyc2V0LApsb2NhbGVuYW1lLXVuc2FmZSwgbG9jYWxlbmFtZS11bnNhZmUtbGltaXRlZC4K U3RvcCBhdm9pZGluZyBsb2NhbGVuYW1lLgooYXZvaWRlZF9nbnVsaWJfdGVzdHMpOiBOZXcg dmFyLiAgQXZvaWQgdGhlc2UgdGVzdHMgdG9vLgooZ251bGliLW1vZHVsZXMpOiBSZW1vdmUg aGFyZC1sb2NhbGUsIG5zdHJmdGltZS4KQWRkIG5zdHJmdGltZS1saW1pdGVkLgoqIGNvbmZp Z3VyZS5hYyAoZ2xfY3ZfZnVuY19tYnJ0b3djX0NfbG9jYWxlX3NhbnNfRUlMU0VRKQooZ2xf Y3ZfZnVuY19tYnJ0b2MzMl9DX2xvY2FsZV9zYW5zX0VJTFNFUSk6Ck5ldyB2YXJzLCBzbyB0 aGF0IHdlIGRvIG5vdCB3b3JyeSBhYm91dCBtdWx0aWJ5dGUgQyBsb2NhbGVzLgooZ2xfVEhS RUFETElCX0RFRkFVTFRfTk8pOiBOZXcgbWFjcm8uCk5vdCBzdXJlIGhvdyBtdWNoIGl0IGhl bHBzLCBidXQgaXQgY2Fu4oCZdCBodXJ0LgooU1VQUE9SVF9OT05fR1JFR19DQUxFTkRBUlNf SU5fU1RSRlRJTUUpOiBOZXcgbWFjcm8uCiogc3JjL2NtcC5jOiBEbyBub3QgaW5jbHVkZSBo YXJkLWxvY2FsZS5oLgooaGFyZF9sb2NhbGVfTENfTUVTU0FHRVMpOiBBc3N1bWUgdGhhdCBM Q19NRVNTQUdFUyBpcyBoYXJkCmlmIGFuZCBvbmx5IGlmICIoQykiIGdldHMgdHJhbnNsYXRl ZC4gIFRoaXMgZHJhZ3MgaW4gZmV3ZXIKZGVwZW5kZW5jaWVzIHRoYW4gY2FsbGluZyBoYXJk X2xvY2FsZS4KKiBzcmMvZGlmZi5jOiBJbmNsdWRlIHN0cmZ0aW1lLmggaW5zdGVhZCBvZiBo YXJkLWxvY2FsZS5oLgooaGFyZF9sb2NhbGVfTENfVElNRSk6IE5ldyBmdW5jdGlvbiwgdGhh dCB1c2VzIG5zdHJmdGltZQp0byBpbmZlciB3aGV0aGVyIHRoZSB0aW1lIGxvY2FsZSBpcyBo YXJkLgoobWFpbik6IFVzZSBpdCBpbnN0ZWFkIG9mIGhhcmRfbG9jYWxlLgoKbWFpbnQ6IGRl ZmF1bHQgR251bGliIHRvIG5vIG11bHRpdGhyZWFkaW5nCgoqIGNvbmZpZ3VyZS5hYzogRGVm aW5lIGdsX1RIUkVBRExJQl9ERUZBVUxUX05PCnNvIHRoYXQgR251bGliIGRlZmF1bHRzIHRv IG5vIG11bHRpdGhyZWFkaW5nLgotLS0KIGJvb3RzdHJhcC5jb25mIHwgMjYgKysrKysrKysr KysrKysrKysrKysrKystLS0KIGNvbmZpZ3VyZS5hYyAgIHwgMTQgKysrKysrKysrKysrKysK IHNyYy9jbXAuYyAgICAgIHwgIDQgKystLQogc3JjL2RpZmYuYyAgICAgfCAxOSArKysrKysr KysrKysrKysrKy0tCiA0IGZpbGVzIGNoYW5nZWQsIDU2IGluc2VydGlvbnMoKyksIDcgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYm9vdHN0cmFwLmNvbmYgYi9ib290c3RyYXAuY29u ZgppbmRleCA3M2NjMTYwLi40MjdhNWY3IDEwMDY0NAotLS0gYS9ib290c3RyYXAuY29uZgor KysgYi9ib290c3RyYXAuY29uZgpAQCAtMTYsMTIgKzE2LDMyIEBACiAjIGFsb25nIHdpdGgg dGhpcyBwcm9ncmFtLiAgSWYgbm90LCBzZWUgPGh0dHA6Ly93d3cuZ251Lm9yZy9saWNlbnNl cy8+LgogCiBhdm9pZGVkX2dudWxpYl9tb2R1bGVzPScKLSAgLS1hdm9pZD1sb2NhbGVuYW1l CisgIC0tYXZvaWQ9aGFyZC1sb2NhbGUKKyAgLS1hdm9pZD1sb2NhbGNoYXJzZXQKKyAgLS1h dm9pZD1sb2NhbGVuYW1lLXVuc2FmZQorICAtLWF2b2lkPWxvY2FsZW5hbWUtdW5zYWZlLWxp bWl0ZWQKICAgLS1hdm9pZD1sb2NrLXRlc3RzCiAgIC0tYXZvaWQ9bWJ1aXRlcgogICAtLWF2 b2lkPW1idWl0ZXJmCiAgIC0tYXZvaWQ9c2V0bG9jYWxlCiAnCisjIFRoZXNlIHRlc3RzIGRl cGVuZCBvbiBsb2NhbGNoYXJzZXQsIHdoaWNoIHdlIGF2b2lkLgorYXZvaWRlZF9nbnVsaWJf dGVzdHM9JworICAtLWF2b2lkPWMzMndpZHRoLXRlc3RzCisgIC0tYXZvaWQ9cXVvdGVhcmct c2ltcGxlLXRlc3RzCisgIC0tYXZvaWQ9cmVnZXgtdGVzdHMKKyAgLS1hdm9pZD13Y3dpZHRo LXRlc3RzCisnCisjIFRoZXNlIHRlc3Qgd2hldGhlciBhbGwgYnl0ZXMgYXJlIHZhbGlkIGlu IHRoZSBDIGxvY2FsZSwKKyMgd2hpY2ggd2UgZG9uJ3QgY2FyZSBhYm91dC4KK2F2b2lkZWRf Z251bGliX3Rlc3RzPSRhdm9pZGVkX2dudWxpYl90ZXN0cycKKyAgLS1hdm9pZD1idG9jMzIt dGVzdHMKKyAgLS1hdm9pZD1idG93Yy10ZXN0cworICAtLWF2b2lkPW1icnRvYzMyLXRlc3Rz CisgIC0tYXZvaWQ9bWJydG93Yy10ZXN0cworICAtLWF2b2lkPW1ic3J0b2MzMnMtdGVzdHMK KyAgLS1hdm9pZD1tYnNydG93Y3MtdGVzdHMKKycKIAogIyBnbnVsaWIgbW9kdWxlcyB1c2Vk IGJ5IHRoaXMgcGFja2FnZS4KIGdudWxpYl9tb2R1bGVzPScKQEAgLTY2LDcgKzg2LDYgQEAg Z251LW1ha2UKIGdudS13ZWItZG9jLXVwZGF0ZQogZ251bWFrZWZpbGUKIGdudXBsb2FkCi1o YXJkLWxvY2FsZQogaWFsbG9jCiBpZHgKIGludHByb3BzCkBAIC04MSw3ICsxMDAsNyBAQCBt ZW1wY3B5CiBtaW5tYXgKIG1rc3RlbXAKIG1rdGltZQotbnN0cmZ0aW1lCituc3RyZnRpbWUt bGltaXRlZAogbnVsbHB0cgogb3BlbmF0CiBwY2xvc2UKQEAgLTE0OSw2ICsxNjgsNyBAQCBn bnVsaWJfdG9vbF9vcHRpb25fZXh0cmFzPSItLXRlc3RzLWJhc2U9Z251bGliLXRlc3RzCiAg LS1zeW1saW5rCiAgLS1tYWtlZmlsZS1uYW1lPWdudWxpYi5tawogICRhdm9pZGVkX2dudWxp Yl9tb2R1bGVzCisgJGF2b2lkZWRfZ251bGliX3Rlc3RzCiAiCiAKICMgQnVpbGQgcHJlcmVx dWlzaXRlcwpkaWZmIC0tZ2l0IGEvY29uZmlndXJlLmFjIGIvY29uZmlndXJlLmFjCmluZGV4 IDc2NDAxMjQuLmFlYzc0Y2UgMTAwNjQ0Ci0tLSBhL2NvbmZpZ3VyZS5hYworKysgYi9jb25m aWd1cmUuYWMKQEAgLTM3LDYgKzM3LDE4IEBAIEFDX1BST0dfQVdLCiBBQ19QUk9HX0NDCiBB TV9NSVNTSU5HX1BST0coW0hFTFAyTUFOXSwgW2hlbHAybWFuXSkKIEFDX1BST0dfUkFOTElC CisKKyMgRG8gbm90IHdvcnJ5IGFib3V0IG11bHRpYnl0ZSBDIGxvY2FsZXMuCisjIFRoaXMg cmVtb3ZlcyBkZXBlbmRlbmNpZXMgb24gaGFyZC1sb2NhbGUgZXRjLgorZ2xfY3ZfZnVuY19t YnJ0b3djX0NfbG9jYWxlX3NhbnNfRUlMU0VRPSJndWVzc2luZyB5ZXMiCitnbF9jdl9mdW5j X21icnRvYzMyX0NfbG9jYWxlX3NhbnNfRUlMU0VRPSJndWVzc2luZyB5ZXMiCisKKyMgRGVm YXVsdCBHbnVsaWIgY29uZmlndXJhdGlvbiB0byBubyBtdWx0aXRocmVhZGluZywKKyMgc2lu Y2UgZGlmZnV0aWxzIGlzIHNpbmdsZS10aHJlYWRlZC4KKyMgQWx0aG91Z2ggdGhlIGJ1aWxk ZXIgY2FuIG92ZXJyaWRlIHRoaXMgd2l0aCB0aGUgLS1lbmFibGUtdGhyZWFkcyBvcHRpb24K KyMgb2YgJ2NvbmZpZ3VyZScsIGRpZmZ1dGlscyBkb2VzIG5vdCBzdXBwb3J0IHRoYXQgb24g YWxsIHBsYXRmb3Jtcy4KK200X2RlZmluZShbZ2xfVEhSRUFETElCX0RFRkFVTFRfTk9dKQor CiBnbF9FQVJMWQogZ2xfVVNFX1NZU1RFTV9FWFRFTlNJT05TCiBnbF9JTklUCkBAIC02MSw2 ICs3Myw4IEBAIEFDX0RFRklORShbR05VTElCX01CUlRPQzMyX1JFR1VMQVJdLCBbMV0sCiAK IEFDX0RFRklORShbUkVRVUlSRV9HTlVJU0hfU1RSRlRJTUVfQU1fUE1dLCBbMF0sCiAgIFtE byBub3Qgd29ycnkgYWJvdXQgR05VIHN0cmZ0aW1lIGJlaGF2aW9yIGZvciBBTSBhbmQgUE0g aW5kaWNhdG9ycy5dKQorQUNfREVGSU5FKFtTVVBQT1JUX05PTl9HUkVHX0NBTEVOREFSU19J Tl9TVFJGVElNRV0sIFtmYWxzZV0sCisgIFtEbyBub3Qgd29ycnkgYWJvdXQgR05VIHN0cmZ0 aW1lIGJlaGF2aW9yIGZvciBub24tR3JlZ29yaWFuIGNhbGVuZGFycy5dKQogCiBBQ19DX0lO TElORQogCmRpZmYgLS1naXQgYS9zcmMvY21wLmMgYi9zcmMvY21wLmMKaW5kZXggMjQ4Mjcw OC4uMGM0YzgwYyAxMDA2NDQKLS0tIGEvc3JjL2NtcC5jCisrKyBiL3NyYy9jbXAuYwpAQCAt MjgsNyArMjgsNiBAQAogI2luY2x1ZGUgPGV4aXRmYWlsLmg+CiAjaW5jbHVkZSA8ZmlsZS10 eXBlLmg+CiAjaW5jbHVkZSA8Z2V0b3B0Lmg+Ci0jaW5jbHVkZSA8aGFyZC1sb2NhbGUuaD4K ICNpbmNsdWRlIDxwcm9nbmFtZS5oPgogI2luY2x1ZGUgPHF1b3RlLmg+CiAjaW5jbHVkZSA8 dW5sb2NrZWQtaW8uaD4KQEAgLTUwLDcgKzQ5LDggQEAgc3RhdGljIGJvb2wKIGhhcmRfbG9j YWxlX0xDX01FU1NBR0VTICh2b2lkKQogewogI2lmIGRlZmluZWQgTENfTUVTU0FHRVMgJiYg RU5BQkxFX05MUwotICByZXR1cm4gaGFyZF9sb2NhbGUgKExDX01FU1NBR0VTKTsKKyAgc3Rh dGljIGNoYXIgY29uc3QgY29weXJpZ2h0X3N0cmluZ1tdID0gIihDKSI7CisgIHJldHVybiBn ZXR0ZXh0IChjb3B5cmlnaHRfc3RyaW5nKSAhPSBjb3B5cmlnaHRfc3RyaW5nOwogI2Vsc2UK ICAgcmV0dXJuIGZhbHNlOwogI2VuZGlmCmRpZmYgLS1naXQgYS9zcmMvZGlmZi5jIGIvc3Jj L2RpZmYuYwppbmRleCAyNDFlMTdjLi44ZmQyZTFhIDEwMDY0NAotLS0gYS9zcmMvZGlmZi5j CisrKyBiL3NyYy9kaWZmLmMKQEAgLTM1LDcgKzM1LDcgQEAKICNpbmNsdWRlIDxmaWxlbmFt ZWNhdC5oPgogI2luY2x1ZGUgPGZubWF0Y2guaD4KICNpbmNsdWRlIDxnZXRvcHQuaD4KLSNp bmNsdWRlIDxoYXJkLWxvY2FsZS5oPgorI2luY2x1ZGUgPHN0cmZ0aW1lLmg+CiAjaW5jbHVk ZSA8cHJvZ25hbWUuaD4KICNpbmNsdWRlIDxxdW90ZS5oPgogI2luY2x1ZGUgPHNoLXF1b3Rl Lmg+CkBAIC0yOTMsNiArMjkzLDIxIEBAIGV4Y2x1ZGVfb3B0aW9ucyAodm9pZCkKIHsKICAg cmV0dXJuIEVYQ0xVREVfV0lMRENBUkRTIHwgKGlnbm9yZV9maWxlX25hbWVfY2FzZSA/IEZO TV9DQVNFRk9MRCA6IDApOwogfQorCisvKiBSZXR1cm4gdHJ1ZSBpZiBpbiBhIGhhcmQgTENf VElNRSBsb2NhbGUuICAqLworc3RhdGljIGJvb2wKK2hhcmRfbG9jYWxlX0xDX1RJTUUgKHZv aWQpCit7CisgIC8qIFVzZSB0aGUgaGV1cmlzdGljIHRoYXQgJWMgaGFzIGl0cyB1c3VhbCBQ T1NJWCBtZWFuaW5nLgorICAgICBUaGlzIGlzIGdvb2QgZW5vdWdoIGluIHByYWN0aWNlLiAg Ki8KKyAgc3RhdGljIHN0cnVjdCB0bSBjb25zdCB0bQorICAgID0geyAudG1feWVhciA9IDE5 NzAgLSAxOTAwLCAudG1fbW9uID0gMCwgLnRtX21kYXkgPSAxLAorCS50bV9ob3VyID0gMjMs IC50bV9taW4gPSA1OSwgLnRtX3NlYyA9IDU5IH07CisgIHN0YXRpYyBjaGFyIGNvbnN0IGV4 cGVjdGVkW10gPSAiVGh1IEphbiAgMSAyMzo1OTo1OSAxOTcwIjsKKyAgY2hhciBidWZbc2l6 ZW9mIGV4cGVjdGVkXTsKKyAgcmV0dXJuIChuc3RyZnRpbWUgKGJ1Ziwgc2l6ZW9mIGJ1Ziwg IiVjIiwgJnRtLCAwLCAwKSA9PSBzaXplb2YgYnVmIC0gMQorCSAgJiYgbWVtY21wIChidWYs IGV4cGVjdGVkLCBzaXplb2YgYnVmKSA9PSAwKTsKK30KIAwKIGludAogbWFpbiAoaW50IGFy Z2MsIGNoYXIgKiphcmd2KQpAQCAtNzQ3LDcgKzc2Miw3IEBAIG1haW4gKGludCBhcmdjLCBj aGFyICoqYXJndikKICAgICAgICAgc3BlY2lmeV9zdHlsZSAoT1VUUFVUX05PUk1BTCk7CiAg ICAgfQogCi0gIGlmIChvdXRwdXRfc3R5bGUgIT0gT1VUUFVUX0NPTlRFWFQgfHwgaGFyZF9s b2NhbGUgKExDX1RJTUUpKQorICBpZiAob3V0cHV0X3N0eWxlICE9IE9VVFBVVF9DT05URVhU IHx8IGhhcmRfbG9jYWxlX0xDX1RJTUUgKCkpCiAgICAgewogI2lmIGRlZmluZWQgU1RBVF9U SU1FU1BFQyB8fCBkZWZpbmVkIFNUQVRfVElNRVNQRUNfTlMKICAgICAgIHRpbWVfZm9ybWF0 ID0gIiVZLSVtLSVkICVIOiVNOiVTLiVOICV6IjsKLS0gCjIuNDguMQoK --------------CzojQXzCjZ80WUP9EaawwT0W-- From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 07 18:01:17 2025 Received: (at submit) by debbugs.gnu.org; 7 Sep 2025 22:01:17 +0000 Received: from localhost ([127.0.0.1]:46625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uvNRk-0005tG-Ga for submit@debbugs.gnu.org; Sun, 07 Sep 2025 18:01:16 -0400 Received: from lists.gnu.org ([2001:470:142::17]:35008) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uvNRe-0005sN-76 for submit@debbugs.gnu.org; Sun, 07 Sep 2025 18:01:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uvNRS-0002Jv-R7 for bug-diffutils@gnu.org; Sun, 07 Sep 2025 18:00:58 -0400 Received: from mo4-p00-ob.smtp.rzone.de ([81.169.146.219]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uvNR6-0000IK-En for bug-diffutils@gnu.org; Sun, 07 Sep 2025 18:00:49 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1757282421; cv=none; d=strato.com; s=strato-dkim-0002; b=pI2DSZSGPMgPHMXAK73Hcm8HYxgfu2ubajt9KLurlKAhNrLwBmvqwHjx2+ENh2o6h+ j0uCrhFsC9G9d5wCchQoMA1N5vJnXImHZdiH6ayiNZnJKdqSrYXJoPTCF5m0L5J6KdQz HIg7yZw+fB4BMEi/YExYzIpuMNdtVFSnIdLCW8t8FJ2nK1Cv9iTMamowcI6b7Ukb4fJy 3NhFwFu4K61v1E4svU/pcPKE7gF891ew4O507cOxxngHW3k+ztHbMXECvhNjpqGO7952 rfgqz6/WJGhB4gRT0tUasyHuGpcNJyDREv6DeYst5xv3UMfvpdo3wqZpR4uwCI1o0FHI Pnlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1757282421; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=Q/pZ4dEBCAEj3UR3Iox4ZUyKBV8LaCRAyMN9Qji9+1k=; b=LmFUENtoWHUiENH2zG4W915vcOBbZbp+q+qj+T/PaNjFMCWMIqoyYRoafX2EQUphOG geJVb/tEmq4ACcGDVne/DGRQm+jFU8hiTRpVS8uHziPjwwshzCntdryT4bO2OYxBFCtG BGNXDZLz6UN9I0BIa56/Oq9FPAjTGzCfv1w5rk3BbHWF+RIsiFcONAUUYiAyA51k4+Nk PZ+OJePuPWRaG2fEkd/QDii8vhW0tyZlk/8uEFof3zeKOkxs5iUaQJZQjZK/61VLFx+L 96gT3O6spPY40kgYAypUxidrNPieOuo+c5F66xD+G/O/h0+BQWFiCd3CV/dN4/wjn8d+ Trgg== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1757282421; s=strato-dkim-0002; d=clisp.org; h=References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=Q/pZ4dEBCAEj3UR3Iox4ZUyKBV8LaCRAyMN9Qji9+1k=; b=krMSRl+U//Rtm8EphqmJLSWiwUs1B0oRLIE1GFDfRBIp+DJIgHkgmw67X/OL4HIGtT 77N1mKPaaYvO2ljX9nNa0HarfYQnO6MoVtaLGPMWpe46AH0UQEnJr7L5q1ADLj1JWbvn aOWbaFMUlW1MwM7kJBUoo+qX9Hgd4MIgE0dpiPkdYcmln7cBUGrxFLB1VdPfI4XtXMsD kzbcVgcyKJwgjgPfqDqBOltcwUncmtkxJprt3TSrXR4PhiihUqA1X4eT76n29Fucjn7r Ix/gxn1hSCKy4pTs3JwzywQjf0tNZHj5v3ORh6EggEbOv9lMqE+EQdE/g7z7nRED1XdK XUIg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1757282421; s=strato-dkim-0003; d=clisp.org; h=References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=Q/pZ4dEBCAEj3UR3Iox4ZUyKBV8LaCRAyMN9Qji9+1k=; b=Owlvej+8mDxiPvQkEN/qY9aTOHQKPRlRawTHrJEDrmr6xn5aYxiiy0kNWQUxOzFxbC F8n/+C+7mAjVnEk1AyAQ== X-RZG-AUTH: ":Ln4Re0+Ic/6oZXR1YgKryK8brlshOcZlLnY4jECd2hdUURIbZgL8PX2QiTuZ3cdB8X/nqj+fFD2Lqx+gldyd2E/UGafZHFE+" Received: from nimes.localnet by smtp.strato.de (RZmta 52.1.2 AUTH) with ESMTPSA id N9ae63187M0LHHV (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 8 Sep 2025 00:00:21 +0200 (CEST) From: Bruno Haible To: Paul Eggert Subject: Re: commit e124541148d38cd8b7f962aceb72fb44e7cc0aab Date: Mon, 08 Sep 2025 00:00:21 +0200 Message-ID: <9547799.fEOZUYNNci@nimes> Organization: GNU In-Reply-To: <60ebc9ca-00e9-48cf-9645-774f0a50a204@cs.ucla.edu> References: <295198556.K07Qtm5XNL@nimes> <60ebc9ca-00e9-48cf-9645-774f0a50a204@cs.ucla.edu> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Received-SPF: none client-ip=81.169.146.219; envelope-from=bruno@clisp.org; helo=mo4-p00-ob.smtp.rzone.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: submit Cc: bug-diffutils@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Paul Eggert wrote on 2025-09-05: > I also installed the attached patch, to work around more the places > where Gnulib drags in some multithreading and/or locale code that GNU > diff (which is single-threaded and not that picky about locales) doesn't > need. Not sure if these suggest any Gnulib changes. The changes in configure.ac regarding mbrtowc and mbrtoc32 are specific to diffutils, I would say. I'm not even sure what you mean by "Do not worry about multibyte C locales." : glibc and many other platform have a "C.UTF-8" locale, which behaves like the "C" locale regarding i18n, but is multibyte. The changes in configure.ac regarding 'threadlib' are a customization possibility that is already provided by Gnulib. The two functions hard_locale_LC_MESSAGES and hard_locale_LC_TIME look like heuristics to me; I wouldn't bet that they are correct in all situations. So, I don't see worthwile Gnulib changes in these areas. The change in configure.ac finally +AC_DEFINE([SUPPORT_NON_GREG_CALENDARS_IN_STRFTIME], [false], + [Do not worry about GNU strftime behavior for non-Gregorian calendars.]) breaks "make distcheck": make[1]: Entering directory '/home/runner/work/ci-check/ci-check/diffutils' make my-distcheck make[2]: Entering directory '/home/runner/work/ci-check/ci-check/diffutils' make syntax-check make[3]: Entering directory '/home/runner/work/ci-check/ci-check/diffutils' GFDL_version /usr/bin/grep: .gitmodules: No such file or directory 0.01 GFDL_version GPL_version /usr/bin/grep: .gitmodules: No such file or directory 0.01 GPL_version Wundef_boolean ./lib/config.h:2334:#define SUPPORT_NON_GREG_CALENDARS_IN_STRFTIME false maint.mk: Use 0 or 1 for macro values make[3]: *** [maint.mk:1458: sc_Wundef_boolean] Error 1 make[3]: Leaving directory '/home/runner/work/ci-check/ci-check/diffutils' make[2]: *** [dist-check.mk:148: my-distcheck] Error 2 make[2]: Leaving directory '/home/runner/work/ci-check/ci-check/diffutils' make[1]: *** [Makefile:2879: distcheck-hook] Error 2 make[1]: Leaving directory '/home/runner/work/ci-check/ci-check/diffutils' make: *** [Makefile:2662: distcheck] Error 1 Either SUPPORT_NON_GREG_CALENDARS_IN_STRFTIME needs to be defined to 0, not false. Or the syntax check sc_Wundef_boolean needs to be tweaked. Bruno From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 07 20:01:18 2025 Received: (at submit) by debbugs.gnu.org; 8 Sep 2025 00:01:18 +0000 Received: from localhost ([127.0.0.1]:47174 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uvPJr-0004UC-MS for submit@debbugs.gnu.org; Sun, 07 Sep 2025 20:01:17 -0400 Received: from lists.gnu.org ([2001:470:142::17]:37294) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uvPJa-0004PT-Vi for submit@debbugs.gnu.org; Sun, 07 Sep 2025 20:01:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uvPJT-0001Gc-5S for bug-diffutils@gnu.org; Sun, 07 Sep 2025 20:00:51 -0400 Received: from mail.cs.ucla.edu ([131.179.128.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uvPJK-0003Kh-Jw for bug-diffutils@gnu.org; Sun, 07 Sep 2025 20:00:50 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.cs.ucla.edu (Postfix) with ESMTP id 828403C306913; Sun, 7 Sep 2025 17:00:33 -0700 (PDT) Received: from mail.cs.ucla.edu ([127.0.0.1]) by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10032) with ESMTP id t-1y3UhF5yta; Sun, 7 Sep 2025 17:00:33 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by mail.cs.ucla.edu (Postfix) with ESMTP id 50CE83C330C24; Sun, 7 Sep 2025 17:00:33 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.cs.ucla.edu 50CE83C330C24 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.ucla.edu; s=9D0B346E-2AEB-11ED-9476-E14B719DCE6C; t=1757289633; bh=AxdFIeiQpWgVGK8Y2h5PycujLhqc3ZpC/e3hl9FRWNo=; h=Message-ID:Date:MIME-Version:To:From; b=CK5CwgeYNlQP2UdVmrhAsvXL8GxU1DqfAeALPoeTZTp3Q/rW7TbxmmMM+oFROEoe+ yzjhU+Y0FE1aR17ouEOGAqghqyeuf+CFF2CYLm+RhxwSAYfxZX0H9NJkZf/oCjC5v9 azs4+16uGu7NRiZUkIZXLAsIN+mpfZkp7N4L6qnKnOyEwZqTN8aejguwfGV17IgY3y CMRXsMIC2/aMdgDf3B0CJzNiirEHtlJTYuDku1wlTfCAAEMTnSWKw1bzIUzn1mXVBE XsCCytHeKbw4BhUBVYyOA0GbqP6E3K0faHRdEzuo4UrPmm+BiJrqUpvvIjUtOLzccU FlhKKz1oE+Q4Q== X-Virus-Scanned: amavis at mail.cs.ucla.edu Received: from mail.cs.ucla.edu ([127.0.0.1]) by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10026) with ESMTP id aaHLRCEL6Kvc; Sun, 7 Sep 2025 17:00:33 -0700 (PDT) Received: from penguin.cs.ucla.edu (47-154-18-19.fdr01.snmn.ca.ip.frontiernet.net [47.154.18.19]) by mail.cs.ucla.edu (Postfix) with ESMTPSA id 2931F3C306913; Sun, 7 Sep 2025 17:00:33 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------yx9EfrhjSTUF0zE8MmS7nXzh" Message-ID: Date: Sun, 7 Sep 2025 17:00:31 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: commit e124541148d38cd8b7f962aceb72fb44e7cc0aab To: Bruno Haible References: <295198556.K07Qtm5XNL@nimes> <60ebc9ca-00e9-48cf-9645-774f0a50a204@cs.ucla.edu> <9547799.fEOZUYNNci@nimes> Content-Language: en-US From: Paul Eggert Organization: UCLA Computer Science Department In-Reply-To: <9547799.fEOZUYNNci@nimes> Received-SPF: pass client-ip=131.179.128.66; envelope-from=eggert@cs.ucla.edu; helo=mail.cs.ucla.edu X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: bug-diffutils@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) This is a multi-part message in MIME format. --------------yx9EfrhjSTUF0zE8MmS7nXzh Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2025-09-07 15:00, Bruno Haible wrote: > I'm not even sure what you > mean by "Do not worry about multibyte C locales." I meant to not worry about platforms where the "C" (not "C.utf8") locale is multibyte. I don't know of how diffutils would misbehave in such locales (other than not be strictly POSIX-conforming in unusual cases where native tools aren't either), so I wanted Gnulib to not worry about the possibility. > The two functions hard_locale_LC_MESSAGES and hard_locale_LC_TIME > look like heuristics to me; I wouldn't bet that they are correct > in all situations. For what it's worth, GNU Emacs has used a similar heuristic for a decade (see emacs/src/emacs.c's using_utf8) without reported trouble. Admittedly this part of Emacs is not the mainline as Emacs normally uses its own UTF-8 decoder, but I think it unlikely that the mentioned functions will misbehave in practice (and if they do, surely can fix them without needing support for multithreading and locks). To some extent everything in this area is a heuristic, even Gnulib's hard_locale which is what diffutils formerly used. If the heuristic works in practice, that's good enough. > +AC_DEFINE([SUPPORT_NON_GREG_CALENDARS_IN_STRFTIME], [false], > + [Do not worry about GNU strftime behavior for non-Gregorian calendars.]) > Either SUPPORT_NON_GREG_CALENDARS_IN_STRFTIME needs to be defined to 0, > not false. Or the syntax check sc_Wundef_boolean needs to be tweaked. Thanks for mentioning that. lib/strftime.c's comment suggests 'false', which is why I defined it to 'false'. These days it should be OK to use 'true' and 'false' due to C23 and the near-ubiquitous use of the 'bool' module, so I installed the attached. --------------yx9EfrhjSTUF0zE8MmS7nXzh Content-Type: text/x-patch; charset=UTF-8; name="0001-maint-allow-false-true-in-C-macros.patch" Content-Disposition: attachment; filename="0001-maint-allow-false-true-in-C-macros.patch" Content-Transfer-Encoding: base64 RnJvbSAzZDA0MWY4M2M2MDI0MGRiNzgyNjYzOTA4ZGEyMTlmYzExNDQ5MTVmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBTdW4sIDcgU2VwIDIwMjUgMTY6MzQ6NDMgLTA3MDAKU3ViamVjdDogW1BBVENI XSBtYWludDogYWxsb3cgZmFsc2UvdHJ1ZSBpbiBDIG1hY3JvcwpNSU1FLVZlcnNpb246IDEu MApDb250ZW50LVR5cGU6IHRleHQvcGxhaW47IGNoYXJzZXQ9VVRGLTgKQ29udGVudC1UcmFu c2Zlci1FbmNvZGluZzogOGJpdAoKKiB0b3AvbWFpbnQubWsgKHNjX1d1bmRlZl9ib29sZWFu KTogQWxsb3cgZmFsc2UgYW5kIHRydWUgaW4gQwptYWNybyBkZWZpbmllbnMuICBDMjMgcmVx dWlyZXMgc3VwcG9ydCBmb3IgZmFsc2UgYW5kIHRydWUsIGFuZCB0aGUK4oCYYm9vbOKAmSBt b2R1bGUgbWFrZXMgaXQgZWFzeSB0byBzdXBwb3J0IHRoaXMgaW4gb2xkZXIgY29tcGlsZXJz LgotLS0KIENoYW5nZUxvZyAgICB8IDcgKysrKysrKwogdG9wL21haW50Lm1rIHwgNyArKysr Ky0tCiAyIGZpbGVzIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmluZGV4IDJmZjkwZWY4Yjcu LjBjMTMyODE2ZjQgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxMCBAQAorMjAyNS0wOS0wNyAgUGF1bCBFZ2dlcnQgIDxlZ2dlcnRAY3MudWNs YS5lZHU+CisKKwltYWludDogYWxsb3cgZmFsc2UvdHJ1ZSBpbiBDIG1hY3JvcworCSogdG9w L21haW50Lm1rIChzY19XdW5kZWZfYm9vbGVhbik6IEFsbG93IGZhbHNlIGFuZCB0cnVlIGlu IEMKKwltYWNybyBkZWZpbmllbnMuICBDMjMgcmVxdWlyZXMgc3VwcG9ydCBmb3IgZmFsc2Ug YW5kIHRydWUsIGFuZCB0aGUKKwnigJhib29s4oCZIG1vZHVsZSBtYWtlcyBpdCBlYXN5IHRv IHN1cHBvcnQgdGhpcyBpbiBvbGRlciBjb21waWxlcnMuCisKIDIwMjUtMDktMDcgIEJydW5v IEhhaWJsZSAgPGJydW5vQGNsaXNwLm9yZz4KIAogCWJvb3RzdHJhcDogSW1wcm92ZSBlZmZp Y2llbmN5IG9mICJnaXQgY2xvbmUiLgpkaWZmIC0tZ2l0IGEvdG9wL21haW50Lm1rIGIvdG9w L21haW50Lm1rCmluZGV4IGUwM2U4ODdjYmEuLjFhNjUxMWI0ZjggMTAwNjQ0Ci0tLSBhL3Rv cC9tYWludC5taworKysgYi90b3AvbWFpbnQubWsKQEAgLTE0NTQsMTAgKzE0NTQsMTMgQEAg c2NfcHJvaGliaXRfcmV2ZXJzZWRfY29tcGFyZV9mYWlsdXJlOgogIyBUaGF0IHdvdWxkIGJl IGZsYWdnZWQgYnkgdXNpbmcgLVd1bmRlZiwgaG93ZXZlciBnbnVsaWIgY3VycmVudGx5CiAj IHRlc3RzIG1hbnkgdW5kZWZpbmVkIG1hY3JvcywgYW5kIHNvIHdlIGNhbid0IGVuYWJsZSB0 aGF0IG9wdGlvbi4KICMgU28gYXQgbGVhc3QgcHJlY2x1ZGUgY29tbW9uIGJvb2xlYW4gc3Ry aW5ncyBhcyBtYWNybyB2YWx1ZXMuCisjIEFsdGhvdWdoIHRoaXMgcnVsZSBmb3JtZXJseSBh bHNvIGNvbXBsYWluZWQgYWJvdXQgJ3RydWUnIGFuZCAnZmFsc2UnLAorIyB0aGF0IGNvbXBs YWludCBpcyBub3cgaW5jb3JyZWN0IGdpdmVuIHRoYXQgQzIzIGhhcyBibGVzc2VkIHRoaXMg cHJhY3RpY2UKKyMgYW5kIHRoZSAnYm9vbCcgbW9kdWxlIHN1cHBvcnRzIGl0Lgogc2NfV3Vu ZGVmX2Jvb2xlYW46Ci0JQHByb2hpYml0PSdeI2RlZmluZS4qKHllc3xub3x0cnVlfGZhbHNl KSQkJwkJCVwKKwlAcHJvaGliaXQ9J14jZGVmaW5lLiooeWVzfG5vKSQkJwkJCQlcCiAJaW5f ZmlsZXM9JyQoQ09ORklHX0lOQ0xVREUpJwkJCQkJXAotCWhhbHQ9J1VzZSAwIG9yIDEgZm9y IG1hY3JvIHZhbHVlcycJCQkJXAorCWhhbHQ9J1VzZSAwLzEgb3IgZmFsc2UvdHJ1ZSBmb3Ig bWFjcm8gdmFsdWVzJwkJCVwKIAkgICQoX3NjX3NlYXJjaF9yZWdleHApCiAKICMgRXZlbiBp ZiB5b3UgdXNlIHBhdGhtYXguaCB0byBndWFyYW50ZWUgdGhhdCBQQVRIX01BWCBpcyBkZWZp bmVkLCBpdCBtaWdodAotLSAKMi40OC4xCgo= --------------yx9EfrhjSTUF0zE8MmS7nXzh-- From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 08 03:14:33 2025 Received: (at submit) by debbugs.gnu.org; 8 Sep 2025 07:14:33 +0000 Received: from localhost ([127.0.0.1]:48880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uvW5B-0003d1-2K for submit@debbugs.gnu.org; Mon, 08 Sep 2025 03:14:33 -0400 Received: from lists.gnu.org ([2001:470:142::17]:38972) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uvW56-0003cU-Ci for submit@debbugs.gnu.org; Mon, 08 Sep 2025 03:14:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uvW4i-000745-IV for bug-diffutils@gnu.org; Mon, 08 Sep 2025 03:14:07 -0400 Received: from mo4-p00-ob.smtp.rzone.de ([85.215.255.20]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uvW4U-0007Ug-VJ for bug-diffutils@gnu.org; Mon, 08 Sep 2025 03:14:03 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1757315618; cv=none; d=strato.com; s=strato-dkim-0002; b=pNzGdP0ZYUIReciFG8ffa4RpfsY18vJO/9TuJFGb/9DcDJCe6nWi9XmDk5xgHfbGWB yS3fDKv3+2ZD4O1prEhPVvh995wEEkc3UPTpCO0O9fQM809XvJF3lDz6gqKu/dMQrVuT rcX3pSGbXhEL+UFj7mHmwSO519hsnpSH+R5hfW7DjWSzsMX9WihKBN6KhRKMmHzE170b QxJ1h4xvv/i85bLM2aHL8ImxCZMtlZVxxNNZBLVR2qeKMh2fC1NJm0n3jhFYxJo0fGk9 6qe0TO7CfxtsvPmgzg94RXWKujptVGMFBz6GnW1vm9oo8Bo0Ml/Wte+3V1Ww0il+BZhX DKJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1757315618; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=GMczyVjUhCMMXr+NJdnKZQltnw4WA6/2mzksMbAdRek=; b=TSwBJ9xaO2N9fF8hsH/BdHMEkAJsGXye7ft5lv5ZBANBK/7QHzDsI9ESSWySYgnTki i68y7aNQ/x0oVO5gYpilhH/WzlV81evqUJPMkaYOBkVf0khw60PcUdK+ohf/h+8nG2oo LVX/L2d0841YhqJ9hQfovU0GgHUDLqexyRm5v/lxyJhwTgHFJn8MUNXo6bJZjn0mhu2+ 7YGiwRBGZi8WrFcDk4IUeVBmHSFHaqcuvIXCziVyT06SXgVa3JZ1+uN8YPBCoUS/H/j0 BqmVUsopfcTSc/toavJLYljB+6BoUIO5HijxJxaWu4YaAgotn8wHphoKkFQD13fexGL9 4nSg== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1757315618; s=strato-dkim-0002; d=clisp.org; h=References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=GMczyVjUhCMMXr+NJdnKZQltnw4WA6/2mzksMbAdRek=; b=WHMzj27F01AaPe8J4W4NVAztHUbUvIu2Xy3X8Vbyn1K0VWhmITqsmuQnyDWylRh30I ahNdSWDKdZTCd0m7G44H4GrFou/hI6DC5un9604WuauLdcKcxQg/0KePALNvCnMV20Q2 AFDWPX1JnEoVBp5cX04NKNJDtCraxWwr4suTpkoqPEcEM/J7vabmDr8lQU1BlEorJpTC JLVCnf1R1CKxX039BS8QVlt/abUsjDFGW+FZLjGwFO1MeqB0ixs4NXdVqCE5tf2/XjcM V6c2Oc+0w+OhmQ5KaSCOjvqDTgkM1D5qXxihQotbcnJTtjoW1qk+lfg/jD8JFCOpNnu8 6s3g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1757315618; s=strato-dkim-0003; d=clisp.org; h=References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=GMczyVjUhCMMXr+NJdnKZQltnw4WA6/2mzksMbAdRek=; b=uKGrPze3PilJpLTYgdhDTwn0dTRr1hgbnq/rcfD0JtXHZBuhIt7jPa0viKVzgaQRMl 0LCj+VZqu72n/nKMSyBg== X-RZG-AUTH: ":Ln4Re0+Ic/6oZXR1YgKryK8brlshOcZlLnY4jECd2hdUURIbZgL8PX2QiTuZ3cdB8X/nqj+fFD2Lqx+gldyd2E/UGafZHFE+" Received: from nimes.localnet by smtp.strato.de (RZmta 52.1.2 AUTH) with ESMTPSA id N9ae631887DcIHg (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 8 Sep 2025 09:13:38 +0200 (CEST) From: Bruno Haible To: Paul Eggert Subject: Re: commit e124541148d38cd8b7f962aceb72fb44e7cc0aab Date: Mon, 08 Sep 2025 09:13:38 +0200 Message-ID: <25497791.gAkjkU2xAW@nimes> Organization: GNU In-Reply-To: References: <295198556.K07Qtm5XNL@nimes> <9547799.fEOZUYNNci@nimes> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" Received-SPF: none client-ip=85.215.255.20; envelope-from=bruno@clisp.org; helo=mo4-p00-ob.smtp.rzone.de X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: submit Cc: bug-diffutils@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Paul Eggert wrote: > > I'm not even sure what you > > mean by "Do not worry about multibyte C locales." >=20 > I meant to not worry about platforms where the "C" (not "C.utf8") locale= =20 > is multibyte. I don't know of how diffutils would misbehave in such=20 > locales (other than not be strictly POSIX-conforming in unusual cases=20 > where native tools aren't either), so I wanted Gnulib to not worry about= =20 > the possibility. This possibility actually occurs on Android =E2=89=A5 5.0. Comments in gnul= ib/tests/ say: On Android =E2=89=A5 5.0, the default locale is the "C.UTF-8" locale, = not the "C" locale. Furthermore, when you attempt to set the "C" or "POSIX" locale via setlocale(), what you get is a "C" locale with UTF-8 encodi= ng, that is, effectively the "C.UTF-8" locale. > > The two functions hard_locale_LC_MESSAGES and hard_locale_LC_TIME > > look like heuristics to me; I wouldn't bet that they are correct > > in all situations. >=20 > For what it's worth, GNU Emacs has used a similar heuristic for a decade= =20 > (see emacs/src/emacs.c's using_utf8) without reported trouble. =46or the LC_CTYPE locale category, the code you refer to w.r.t. Emacs and = that you recently added in Gnulib (modules quotearg, propername-lite) looks safe, because there are only finitely many locale encodings (and none will be added in the future, hopefully). But for LC_MESSAGES and LC_TIME, there are some assumptions: * hard_locale_LC_MESSAGES assumes that - diffutils.pot contains the strings from lib/version-etc.c (which are now actually in gnulib.pot), - the translator will not translate "(C)" by "(C)", - the user does not use LANGUAGE with a precedence list. * hard_locale_LC_TIME assumes that no locale, not even the en_US locale, uses the same internal format string for "%c" as the C locale. Bruno From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 09 13:36:27 2025 Received: (at submit) by debbugs.gnu.org; 9 Sep 2025 17:36:27 +0000 Received: from localhost ([127.0.0.1]:60480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uw2GV-0006bi-NX for submit@debbugs.gnu.org; Tue, 09 Sep 2025 13:36:27 -0400 Received: from lists.gnu.org ([2001:470:142::17]:46708) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uw2GO-0006aJ-GG for submit@debbugs.gnu.org; Tue, 09 Sep 2025 13:36:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uw2GH-0005x0-Ta for bug-diffutils@gnu.org; Tue, 09 Sep 2025 13:36:10 -0400 Received: from mail.cs.ucla.edu ([131.179.128.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uw2G4-0005GY-4p for bug-diffutils@gnu.org; Tue, 09 Sep 2025 13:36:09 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.cs.ucla.edu (Postfix) with ESMTP id 3B64E3C0149EB; Tue, 9 Sep 2025 10:35:51 -0700 (PDT) Received: from mail.cs.ucla.edu ([127.0.0.1]) by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10032) with ESMTP id xnbfbJPuS9Nh; Tue, 9 Sep 2025 10:35:51 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by mail.cs.ucla.edu (Postfix) with ESMTP id 10C3B3C2BE54C; Tue, 9 Sep 2025 10:35:51 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.cs.ucla.edu 10C3B3C2BE54C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.ucla.edu; s=9D0B346E-2AEB-11ED-9476-E14B719DCE6C; t=1757439351; bh=PDC1Qhyqg3FGEwO1g/OnwcYH6t/kc2tOGOzz+cu6NI4=; h=Message-ID:Date:MIME-Version:From:To; b=IBkgaxeR5kAiELpttFzsxJkPVJx2tjcIn7sNQA/5BVkum8OgE7XYrSmcNBFI+8FDO 5h6Ju1rKf0iCi3OB1/OAjLB+l5gyyIYssRKkDh+3XuqZPew+kp+dYV227TtGPyyztm hnnPq4xW8zQXA+elMbi0suprMewACWfV3GlGzaqFS1eJJP68TGQQd7cCB8lUGXH1Wv LN82RiMCHqtwv+PpR/TIF51WMB6OQYW5Rxjwqs3WXCo+8SqNml9D5UjZ/VvEsWcBLJ +Y6+a44zIiOxK1pfNvZDW3AufFoyzbvF8eSLyQLDO4D87EjlS+aUKWYOKyn/q4PBjm jJZpjiAk45qTQ== X-Virus-Scanned: amavis at mail.cs.ucla.edu Received: from mail.cs.ucla.edu ([127.0.0.1]) by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10026) with ESMTP id BG8XtnqkYb2s; Tue, 9 Sep 2025 10:35:50 -0700 (PDT) Received: from penguin.cs.ucla.edu (47-154-17-226.fdr01.snmn.ca.ip.frontiernet.net [47.154.17.226]) by mail.cs.ucla.edu (Postfix) with ESMTPSA id D85723C0149EB; Tue, 9 Sep 2025 10:35:50 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------tg2QqYnZMnUWEQTwx7M6n8b9" Message-ID: Date: Tue, 9 Sep 2025 10:35:49 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Paul Eggert Subject: Re: commit e124541148d38cd8b7f962aceb72fb44e7cc0aab To: Bruno Haible References: <295198556.K07Qtm5XNL@nimes> <9547799.fEOZUYNNci@nimes> <25497791.gAkjkU2xAW@nimes> Content-Language: en-US Organization: UCLA Computer Science Department In-Reply-To: <25497791.gAkjkU2xAW@nimes> Received-SPF: pass client-ip=131.179.128.66; envelope-from=eggert@cs.ucla.edu; helo=mail.cs.ucla.edu X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: bug-diffutils@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) This is a multi-part message in MIME format. --------------tg2QqYnZMnUWEQTwx7M6n8b9 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable On 2025-09-08 00:13, Bruno Haible wrote: > Paul Eggert wrote: >> I meant to not worry about platforms where the "C" (not "C.utf8") loca= le >> is multibyte. I don't know of how diffutils would misbehave in such >> locales (other than not be strictly POSIX-conforming in unusual cases >> where native tools aren't either), so I wanted Gnulib to not worry abo= ut >> the possibility. >=20 > This possibility actually occurs on Android =E2=89=A5 5.0. Yes, and if it causes a real problem in diffutils we should fix that as=20 it comes up. I don't offhand know why it'd be a real problem. > * hard_locale_LC_TIME assumes that no locale, not even the en_US loca= le, > uses the same internal format string for "%c" as the C locale. The assumption is a bit different: it's merely that only in the POSIX=20 locale does "%c" produce that output for that particular date. Even if=20 the other locale uses the same internal format string "%a %b %e %T %Y",=20 in a non-English locale if it's quite likely they won't match POSIX's=20 English-language abbreviations. I don't know of any platform where hard_locale_LC_TIME incorrectly=20 returns false. However, even if it does, diffutils' behavior will still=20 be OK: it'll conform to POSIX and users will surely understand the=20 output. And if a user complains about this extremely minor glitch I=20 assume we can fix that as it comes up. > - the translator will not translate "(C)" by "(C)", > - the user does not use LANGUAGE with a precedence list. Not quite following, but it's OK if in unusual cases the program outputs=20 "(C)" when "=C2=A9" would be better, so long as in ordinary cases "=C2=A9= " is=20 output when it works, and so long as "=C2=A9" is not output when it would= =20 display as gibberish. > * hard_locale_LC_MESSAGES assumes that > - diffutils.pot contains the strings from lib/version-etc.c > (which are now actually in gnulib.pot), Yes, that's a problem, and thanks for mentioning it. It stems from quite=20 a comedy of errors: (a) diffutils' en translation is not installed. (b) cmp looks in the wrong catalog for the "(C)" message. (c) The gnulib.pot/gnulib.mo mechanism is not yet working widely even=20 for packages other than diffutils. On current Fedora 42 if I run this=20 shell command: LC_ALL=3Den_US.utf8 cat --version although I see "Torbj=C3=B6rn" in UTF-8 as desired, I also see "Copyright= (C)=20 2025" which is wrong: it should be "Copyright =C2=A9 2025". Worse, I see = the=20 exact same English message when I run this shell command: LC_ALL=3Dfr_FR.utf8 cat --version This is because even though=20 /usr/share/locale/fr/LC_MESSAGES/coreutils.mo is installed, there is no=20 file /usr/share/locale/fr/LC_MESSAGES/gnulib.mo, and Fedora does not=20 supply a gnulib.mo file in any package that I can see. I reported this=20 newish bug to Fedora yesterday=20 . (d) In response to that Fedora bug report, Luk=C3=A1=C5=A1 Zaoral set in = motion a=20 fix. But he asked, "Since gnulib is meant to be bundled, how do you deal=20 with the situation when the messages in the sources of the bundled gnulib and gnulib-i10n differ? Do you have some upstream policy to make=20 sure that they don't diverge?" Do we have an answer for that? I'm not=20 sure myself. (e) Even if Fedora started installing a gnulib.mo file, diffutils "make=20 install" does not install such a file, so a standalone build of=20 diffutils with './configure --prefix' would not work since it does not=20 install gnulib.mo. Given all this configuration mess, for now I took the following=20 conservative approach in Diffutils. (0) Update diffutils to use need-formatstring-macros when calling=20 AM_GNU_GETTEXT. I discovered this issue while looking into the other=20 problems. Perhaps need-formatstring-macros should be the only behavior=20 nowadays? It hardly seems worth the hassle about worrying about older=20 gettext versions. (1) Change cmp's hard_locale_LC_MESSAGES to test via setlocale, not via=20 gettext. setlocale should work fine if ENABLE_NLS is nonzero in Diffutils= . (2) Remove diffutils' po/en.po file. It is an unused revenant. (3) Stick with the longstanding approach of having the Diffutils message=20 catalog translate all messages, including those taken from Gnulib. This=20 has worked for decades, translators are used to it, and the Gnulib part=20 of the catalog hardly ever changes. (4) Modify Gnulib to let Diffutils override the textdomain that Gnulib=20 uses. Done via Gnulib commit=20 . (5) Use this new Gnulib feature in Diffutils. I installed the attached patches to Diffutils to do this. An alternative to (4) and (5) would be to let config.h specify the "_"=20 macro, and have Gnulib define this macro only if it is not already=20 defined. This would make for slightly smaller executables. However, it=20 would be brittler and more intrusive. Or perhaps you can think of a=20 better way to do what is wanted in (3). --------------tg2QqYnZMnUWEQTwx7M6n8b9 Content-Type: text/x-patch; charset=UTF-8; name="0001-maint-use-need-formatstring-macros.patch" Content-Disposition: attachment; filename="0001-maint-use-need-formatstring-macros.patch" Content-Transfer-Encoding: base64 RnJvbSBjZjU2NDg4NjlhOTgwMjBjY2U2Mzc1NWI3NjBkYTM1NGFkMTY2NzY1IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBUdWUsIDkgU2VwIDIwMjUgMDk6MTI6MTEgLTA3MDAKU3ViamVjdDogW1BBVENI IDEvNV0gbWFpbnQ6IHVzZSBuZWVkLWZvcm1hdHN0cmluZy1tYWNyb3MKCiogY29uZmlndXJl LmFjOiBQYXNzIG5lZWQtZm9ybWF0c3RyaW5nLW1hY3Jvcywgbm90IG1lcmVseQpuZWVkLW5n ZXR0ZXh0LCB0byBBTV9HTlVfR0VUVEVYVC4gIFRoaXMgaXMgbW9zdGx5IGZvciBzaG93LCBh cwpkaWZmdXRpbHMgaGFzIHVzZWQgZm9ybWF0IHN0cmluZyBtYWNyb3MgZm9yIHllYXJzIGFu ZCBzaW5jZSBub2JvZHkKdXNlcyBhbmNpZW50IGdldHRleHQgYW55IG1vcmUgbm9ib2R5IGhh cyBub3RpY2VkIGEgcHJvYmxlbS4KLS0tCiBjb25maWd1cmUuYWMgfCAyICstCiAxIGZpbGUg Y2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9j b25maWd1cmUuYWMgYi9jb25maWd1cmUuYWMKaW5kZXggYWVjNzRjZS4uMjNhYTYxNSAxMDA2 NDQKLS0tIGEvY29uZmlndXJlLmFjCisrKyBiL2NvbmZpZ3VyZS5hYwpAQCAtMjEyLDcgKzIx Miw3IEBAIHRlc3QgLWYgJHNyY2Rpci8udGFyYmFsbC12ZXJzaW9uIFwKICAgJiYgU1JDX1ZF UlNJT05fQz0gXAogICB8fCBTUkNfVkVSU0lPTl9DPS4uL3NyYy92ZXJzaW9uLmMKIAotQU1f R05VX0dFVFRFWFQoW2V4dGVybmFsXSwgW25lZWQtbmdldHRleHRdKQorQU1fR05VX0dFVFRF WFQoW2V4dGVybmFsXSwgW25lZWQtZm9ybWF0c3RyaW5nLW1hY3Jvc10pCiBBTV9HTlVfR0VU VEVYVF9WRVJTSU9OKFswLjE5LjJdKQogWEdFVFRFWFQ9IkFXSz0nJEFXSycgXCQoU0hFTEwp IFwkKHRvcF9zcmNkaXIpL2V4Z2V0dGV4dCAkWEdFVFRFWFQiCiAKLS0gCjIuNDguMQoK --------------tg2QqYnZMnUWEQTwx7M6n8b9 Content-Type: text/x-patch; charset=UTF-8; name="0002-cmp-improve-LC_MESSAGES-test.patch" Content-Disposition: attachment; filename="0002-cmp-improve-LC_MESSAGES-test.patch" Content-Transfer-Encoding: base64 RnJvbSBkYzZkYzkxNDdmOWE1Y2U4NzUxNGQwZDAzNWU0NGFiNTE1ODczMDE5IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBUdWUsIDkgU2VwIDIwMjUgMDk6MTY6MTYgLTA3MDAKU3ViamVjdDogW1BBVENI IDIvNV0gY21wOiBpbXByb3ZlIExDX01FU1NBR0VTIHRlc3QKCiogc3JjL2NtcC5jIChoYXJk X2xvY2FsZV9MQ19NRVNTQUdFUyk6IFVzZSBzZXRsb2NhbGUsIG5vdCBnZXR0ZXh0LAp0byBk ZWNpZGUgd2hldGhlciB0aGUgbWVzc2FnZXMgbWlnaHQgbm90IGJlIHRob3NlIG9mIHRoZSBD IG9yClBPU0lYIGxvY2FsZS4gIFRoaXMgaXMgYSBtb3JlIHJlbGlhYmxlIHdheSB0byB0ZXN0 IHdoZXRoZXIKdGhlIGxvY2FsZSBpcyBzb21ldGhpbmcgbGlrZSBlbl9VUy51dGY4LCBhIGxv Y2FsZSB0aGF0IGRvZXMKbm90IGhhdmUgYSB0cmFuc2xhdGlvbiBjYXRhbG9nIGJ1dCBpcyBu b3QgdGhlIEMgbG9jYWxlLgotLS0KIHNyYy9jbXAuYyB8IDkgKysrKysrLS0tCiAxIGZpbGUg Y2hhbmdlZCwgNiBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L3NyYy9jbXAuYyBiL3NyYy9jbXAuYwppbmRleCAwYzRjODBjLi5iN2JiMjA0IDEwMDY0NAot LS0gYS9zcmMvY21wLmMKKysrIGIvc3JjL2NtcC5jCkBAIC00NSwxMiArNDUsMTUgQEAgc3Rh dGljIGNoYXIgY29uc3QgUFJPR1JBTV9OQU1FW10gPSAiY21wIjsKICAgcHJvcGVyX25hbWVf bGl0ZSAoIlRvcmJqb3JuIEdyYW5sdW5kIiwgIlRvcmJqXDMwM1wyNjZybiBHcmFubHVuZCIp LCBcCiAgIF8oIkRhdmlkIE1hY0tlbnppZSIpCiAKKy8qIFJldHVybiB0cnVlIGlmIHRoZSBs b2NhbGUncyBtZXNzYWdlcyBtaWdodCBub3QgYmUgdGhvc2Ugb2YgQyBvciBQT1NJWC4gICov CiBzdGF0aWMgYm9vbAogaGFyZF9sb2NhbGVfTENfTUVTU0FHRVMgKHZvaWQpCiB7Ci0jaWYg ZGVmaW5lZCBMQ19NRVNTQUdFUyAmJiBFTkFCTEVfTkxTCi0gIHN0YXRpYyBjaGFyIGNvbnN0 IGNvcHlyaWdodF9zdHJpbmdbXSA9ICIoQykiOwotICByZXR1cm4gZ2V0dGV4dCAoY29weXJp Z2h0X3N0cmluZykgIT0gY29weXJpZ2h0X3N0cmluZzsKKyNpZiBFTkFCTEVfTkxTCisgIC8q IEdOVSBkaWZmIGRlZmluZXMgRU5BQkxFX05MUyBvbmx5IGlmIGdldHRleHQgaXMgcHJlaW5z dGFsbGVkLCBhbmQKKyAgICAgb24gdGhlc2UgcGxhdGZvcm1zIHNldGxvY2FsZSAoTENfTUVT U0FHRVMsIG51bGxwdHIpIG5ldmVyIHJldHVybnMgbnVsbHB0cgorICAgICBhbmQgYWx3YXlz IHJldHVybnMgIkMiIHdoZW4gaW4gdGhlIEMgb3IgUE9TSVggbG9jYWxlcy4gICovCisgIHJl dHVybiAhU1RSRVEgKHNldGxvY2FsZSAoTENfTUVTU0FHRVMsIG51bGxwdHIpLCAiQyIpOwog I2Vsc2UKICAgcmV0dXJuIGZhbHNlOwogI2VuZGlmCi0tIAoyLjQ4LjEKCg== --------------tg2QqYnZMnUWEQTwx7M6n8b9 Content-Type: text/x-patch; charset=UTF-8; name="0003-maint-remove-po-en.po.patch" Content-Disposition: attachment; filename="0003-maint-remove-po-en.po.patch" Content-Transfer-Encoding: base64 RnJvbSAwOTZhM2IyOWI1MzU4NDdmN2RjZjBkZmJjNzA1MDFiMWUyZGM0Y2UyIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBUdWUsIDkgU2VwIDIwMjUgMDk6MjI6MjEgLTA3MDAKU3ViamVjdDogW1BBVENI IDMvNV0gbWFpbnQ6IHJlbW92ZSBwby9lbi5wbwpNSU1FLVZlcnNpb246IDEuMApDb250ZW50 LVR5cGU6IHRleHQvcGxhaW47IGNoYXJzZXQ9VVRGLTgKQ29udGVudC1UcmFuc2Zlci1FbmNv ZGluZzogOGJpdAoKKiBwby9lbi5wbzogUmVtb3ZlLiAgSXQgd2FzbuKAmXQgYmVpbmcgdXNl ZCwgYW5kIHdl4oCZcmUgbm93IGRvaW5nIGl0cwppbnRlbnQgaW4gYSBsZXNzLWhhc3NseSB3 YXkuCi0tLQogcG8vZW4ucG8gfCAzMCAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCAzMCBkZWxldGlvbnMoLSkKIGRlbGV0ZSBtb2RlIDEwMDY0NCBw by9lbi5wbwoKZGlmZiAtLWdpdCBhL3BvL2VuLnBvIGIvcG8vZW4ucG8KZGVsZXRlZCBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDRmYmM3MWMuLjAwMDAwMDAKLS0tIGEvcG8vZW4ucG8KKysr IC9kZXYvbnVsbApAQCAtMSwzMCArMCwwIEBACi0jIEVuZ2xpc2ggbWVzc2FnZXMgZm9yIEdO VSBkaWZmdXRpbHMKLSMgQ29weXJpZ2h0IDE5OTgsIDIwMDEtMjAwMywgMjAwOS0yMDEzLCAy MDE1LTIwMjUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLAotIyBJbmMuCi0jIFBhdWwgRWdn ZXJ0IDxlZ2dlcnRAdHdpbnN1bi5jb20+LCAxOTk4Ci0jCi1tc2dpZCAiIgotbXNnc3RyICIi Ci0iUHJvamVjdC1JZC1WZXJzaW9uOiBHTlUgZGlmZnV0aWxzIDMuMlxuIgotIlBPVC1DcmVh dGlvbi1EYXRlOiAyMDAyLTA2LTE2IDIzOjQ0LTA3MDBcbiIKLSJQTy1SZXZpc2lvbi1EYXRl OiAyMDEyLTAxLTI1IDIzOjExLTA3MDBcbiIKLSJMYXN0LVRyYW5zbGF0b3I6IFBhdWwgRWdn ZXJ0IDxlZ2dlcnRAY3MudWNsYS5lZHU+XG4iCi0iTGFuZ3VhZ2UtVGVhbTogRW5nbGlzaCA8 ZW5AdHJhbnNsYXRlLmZyZWVmcmllbmRzLm9yZz5cbiIKLSJNSU1FLVZlcnNpb246IDEuMFxu IgotIkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD1VVEYtOFxuIgotIkNvbnRl bnQtVHJhbnNmZXItRW5jb2Rpbmc6IDhiaXRcbiIKLQotIy4gVFJBTlNMQVRPUlM6IFBsZWFz ZSB0cmFuc2xhdGUgIihDKSIgdG8gdGhlIEMtaW4tYS1jaXJjbGUgc3ltYm9sCi0jLiAoVSsw MEE5LCBDT1BZUklHSFQgU0lHTikgaWYgcG9zc2libGUsIGFzIHRoaXMgaGFzIHNvbWUgbWlu b3IKLSMuIHRlY2huaWNhbCBhZHZhbnRhZ2VzIGluIGludGVybmF0aW9uYWwgY29weXJpZ2h0 IGxhdy4gIElmIHRoZQotIy4gY29weXJpZ2h0IHN5bWJvbCBpcyBub3QgYXZhaWxhYmxlLCBw bGVhc2UgbGVhdmUgaXQgYXMgIihDKSIuCi0jOiBsaWIvdmVyc2lvbi1ldGMuYzo1MAotbXNn aWQgIihDKSIKLW1zZ3N0ciAiwqkiCi0KLSMuIFRSQU5TTEFUT1JTOiBQbGVhc2UgdHJhbnNs YXRlIHRoZSBzZWNvbmQgIm8iIGluICJUb3Jiam9ybiBHcmFubHVuZCIKLSMuIHRvIGFuIG8t d2l0aC11bWxhdXQgKFUrMDBGNiwgTEFUSU4gU01BTEwgTEVUVEVSIE8gV0lUSCBESUFFUkVT SVMpCi0jLiBpZiBwb3NzaWJsZS4KLSM6IHNyYy9jbXAuYzo0NwotbXNnaWQgIldyaXR0ZW4g YnkgVG9yYmpvcm4gR3Jhbmx1bmQgYW5kIERhdmlkIE1hY0tlbnppZS4iCi1tc2dzdHIgIldy aXR0ZW4gYnkgVG9yYmrDtnJuIEdyYW5sdW5kIGFuZCBEYXZpZCBNYWNLZW56aWUuIgotLSAK Mi40OC4xCgo= --------------tg2QqYnZMnUWEQTwx7M6n8b9 Content-Type: text/x-patch; charset=UTF-8; name="0004-build-update-gnulib-submodule-to-latest.patch" Content-Disposition: attachment; filename="0004-build-update-gnulib-submodule-to-latest.patch" Content-Transfer-Encoding: base64 RnJvbSAzY2NmY2Q4Y2Q3N2I4MTllZTZhNDc2NzBiMzkxNTM0NTFkYTI4NDRlIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBUdWUsIDkgU2VwIDIwMjUgMTA6MDA6MDAgLTA3MDAKU3ViamVjdDogW1BBVENI IDQvNV0gYnVpbGQ6IHVwZGF0ZSBnbnVsaWIgc3VibW9kdWxlIHRvIGxhdGVzdAoKLS0tCiBn bnVsaWIgfCAyICstCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRp b24oLSkKCmRpZmYgLS1naXQgYS9nbnVsaWIgYi9nbnVsaWIKaW5kZXggNjJlNTFmOS4uMmIy YmNkYiAxNjAwMDAKLS0tIGEvZ251bGliCisrKyBiL2dudWxpYgpAQCAtMSArMSBAQAotU3Vi cHJvamVjdCBjb21taXQgNjJlNTFmOTE0OTlhNzg0NGE5ZGU5ZWU3NTUzYTc5YTkzYzgwY2Uz NworU3VicHJvamVjdCBjb21taXQgMmIyYmNkYmMzYmYzZGUyODM4YTRiNTA1MWUzMjM2NmU5 YTk0ZjFlMwotLSAKMi40OC4xCgo= --------------tg2QqYnZMnUWEQTwx7M6n8b9 Content-Type: text/x-patch; charset=UTF-8; name="0005-maint-use-our-textdomain-for-Gnulib.patch" Content-Disposition: attachment; filename="0005-maint-use-our-textdomain-for-Gnulib.patch" Content-Transfer-Encoding: base64 RnJvbSA2YjljNzI2MDc2ODNiY2Q3M2Q0YzU4MzJjZjllOTRhZTk3OTU3MmYwIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBUdWUsIDkgU2VwIDIwMjUgMTA6MDM6MjcgLTA3MDAKU3ViamVjdDogW1BBVENI IDUvNV0gbWFpbnQ6IHVzZSBvdXIgdGV4dGRvbWFpbiBmb3IgR251bGliCk1JTUUtVmVyc2lv bjogMS4wCkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD1VVEYtOApDb250ZW50 LVRyYW5zZmVyLUVuY29kaW5nOiA4Yml0CgpTdXBwb3J0IGRpZmZ1dGlsc+KAmSB0cmFkaXRp b25hbCB3YXkgb2YgZ2V0dGluZyB0cmFuc2xhdGlvbnMsCmJ5IHRlbGxpbmcgR251bGliIHRv IHVzZSBkaWZmdXRpbHPigJkgbWVzc2FnZSBjYXRhbG9nLgoqIGNvbmZpZ3VyZS5hYyAoR05V TElCX1RFWFRfRE9NQUlOKTogTmV3IG1hY3JvLgoqIHNyYy9jbXAuYywgc3JjL2RpZmYuYywg c3JjL2RpZmYzLmMsIHNyYy9zZGlmZi5jIChtYWluKToKRG9u4oCZdCBjYWxsIGJpbmR0ZXh0 ZG9tYWluICgiZ251bGliIiwgR05VTElCX0xPQ0FMRURJUikKYXMgdGhlIGV4aXN0aW5nIGJp bmR0ZXh0ZG9tYWluIChQQUNLQUdFLCBMT0NBTEVESVIpIGNhbGwgc3VmZmljZXMuCi0tLQog Y29uZmlndXJlLmFjIHwgNCArKysrCiBzcmMvY21wLmMgICAgfCAxIC0KIHNyYy9kaWZmLmMg ICB8IDEgLQogc3JjL2RpZmYzLmMgIHwgMSAtCiBzcmMvc2RpZmYuYyAgfCAxIC0KIDUgZmls ZXMgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2NvbmZpZ3VyZS5hYyBiL2NvbmZpZ3VyZS5hYwppbmRleCAyM2FhNjE1Li4xOWJjNWVm IDEwMDY0NAotLS0gYS9jb25maWd1cmUuYWMKKysrIGIvY29uZmlndXJlLmFjCkBAIC03Niw2 ICs3NiwxMCBAQCBBQ19ERUZJTkUoW1JFUVVJUkVfR05VSVNIX1NUUkZUSU1FX0FNX1BNXSwg WzBdLAogQUNfREVGSU5FKFtTVVBQT1JUX05PTl9HUkVHX0NBTEVOREFSU19JTl9TVFJGVElN RV0sIFtmYWxzZV0sCiAgIFtEbyBub3Qgd29ycnkgYWJvdXQgR05VIHN0cmZ0aW1lIGJlaGF2 aW9yIGZvciBub24tR3JlZ29yaWFuIGNhbGVuZGFycy5dKQogCisjIERpZmZ1dGlscyB0cmFu c2xhdGVzIEdudWxpYidzIG1zZ2lkcyB0b28uCitBQ19ERUZJTkUoW0dOVUxJQl9URVhUX0RP TUFJTl0sIFtQQUNLQUdFXSwKKyAgW1RleHRkb21haW4gdG8gdXNlIHdoZW4gdHJhbnNsYXRp bmcgR251bGliJ3MgbXNnaWRzLl0pCisKIEFDX0NfSU5MSU5FCiAKIEFDX0NIRUNLX01FTUJF UlMoW3N0cnVjdCBzdGF0LnN0X3JkZXZdKQpkaWZmIC0tZ2l0IGEvc3JjL2NtcC5jIGIvc3Jj L2NtcC5jCmluZGV4IGI3YmIyMDQuLjg0ZDBlOGYgMTAwNjQ0Ci0tLSBhL3NyYy9jbXAuYwor KysgYi9zcmMvY21wLmMKQEAgLTIxMSw3ICsyMTEsNiBAQCBtYWluIChpbnQgYXJnYywgY2hh ciAqKmFyZ3YpCiAgIHNldF9wcm9ncmFtX25hbWUgKGFyZ3ZbMF0pOwogICBzZXRsb2NhbGUg KExDX0FMTCwgIiIpOwogICBiaW5kdGV4dGRvbWFpbiAoUEFDS0FHRSwgTE9DQUxFRElSKTsK LSAgYmluZHRleHRkb21haW4gKCJnbnVsaWIiLCBHTlVMSUJfTE9DQUxFRElSKTsKICAgdGV4 dGRvbWFpbiAoUEFDS0FHRSk7CiAgIGNfc3RhY2tfYWN0aW9uIChudWxscHRyKTsKICAgeHN0 ZG9wZW4gKCk7CmRpZmYgLS1naXQgYS9zcmMvZGlmZi5jIGIvc3JjL2RpZmYuYwppbmRleCA4 ZmQyZTFhLi43NzVmOGZjIDEwMDY0NAotLS0gYS9zcmMvZGlmZi5jCisrKyBiL3NyYy9kaWZm LmMKQEAgLTMxOCw3ICszMTgsNiBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAg IHNldF9wcm9ncmFtX25hbWUgKGFyZ3ZbMF0pOwogICBzZXRsb2NhbGUgKExDX0FMTCwgIiIp OwogICBiaW5kdGV4dGRvbWFpbiAoUEFDS0FHRSwgTE9DQUxFRElSKTsKLSAgYmluZHRleHRk b21haW4gKCJnbnVsaWIiLCBHTlVMSUJfTE9DQUxFRElSKTsKICAgdGV4dGRvbWFpbiAoUEFD S0FHRSk7CiAgIGNfc3RhY2tfYWN0aW9uIChudWxscHRyKTsKICAgZnVuY3Rpb25fcmVnZXhw X2xpc3QuYnVmID0gJmZ1bmN0aW9uX3JlZ2V4cDsKZGlmZiAtLWdpdCBhL3NyYy9kaWZmMy5j IGIvc3JjL2RpZmYzLmMKaW5kZXggN2FjMDQ2YS4uODJmMzIzNyAxMDA2NDQKLS0tIGEvc3Jj L2RpZmYzLmMKKysrIGIvc3JjL2RpZmYzLmMKQEAgLTIzMyw3ICsyMzMsNiBAQCBtYWluIChp bnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgIHNldF9wcm9ncmFtX25hbWUgKGFyZ3ZbMF0pOwog ICBzZXRsb2NhbGUgKExDX0FMTCwgIiIpOwogICBiaW5kdGV4dGRvbWFpbiAoUEFDS0FHRSwg TE9DQUxFRElSKTsKLSAgYmluZHRleHRkb21haW4gKCJnbnVsaWIiLCBHTlVMSUJfTE9DQUxF RElSKTsKICAgdGV4dGRvbWFpbiAoUEFDS0FHRSk7CiAgIGNfc3RhY2tfYWN0aW9uIChudWxs cHRyKTsKICAgeHN0ZG9wZW4gKCk7CmRpZmYgLS1naXQgYS9zcmMvc2RpZmYuYyBiL3NyYy9z ZGlmZi5jCmluZGV4IGE3NDM1MTcuLmEyMWIwODEgMTAwNjQ0Ci0tLSBhL3NyYy9zZGlmZi5j CisrKyBiL3NyYy9zZGlmZi5jCkBAIC00NDksNyArNDQ5LDYgQEAgbWFpbiAoaW50IGFyZ2Ms IGNoYXIgKmFyZ3ZbXSkKICAgc2V0X3Byb2dyYW1fbmFtZSAoYXJndlswXSk7CiAgIHNldGxv Y2FsZSAoTENfQUxMLCAiIik7CiAgIGJpbmR0ZXh0ZG9tYWluIChQQUNLQUdFLCBMT0NBTEVE SVIpOwotICBiaW5kdGV4dGRvbWFpbiAoImdudWxpYiIsIEdOVUxJQl9MT0NBTEVESVIpOwog ICB0ZXh0ZG9tYWluIChQQUNLQUdFKTsKICAgY19zdGFja19hY3Rpb24gKGNsZWFudXApOwog ICB4c3Rkb3BlbiAoKTsKLS0gCjIuNDguMQoK --------------tg2QqYnZMnUWEQTwx7M6n8b9--