sed-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

FYI: I've just pushed a handful of maint patches


From: Jim Meyering
Subject: FYI: I've just pushed a handful of maint patches
Date: Sat, 24 Jun 2023 17:34:37 -0700

Here they are:
[ One syntax-check failure remains, but it's likely just an invalid assumption. 
]

>From a9e25136f95f28d795b2d16b272680daeb1b5c0a Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@fb.com>
Date: Sat, 27 May 2023 18:00:04 -0700
Subject: [PATCH 1/6] build: modernize bootstrap prerequsite tools
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Following Pádraig Brady's example from coreutils, ...
* bootstrap.conf: Add an explicit requirement on m4.
Add an explicit requirement on texi2pdf -- often packaged separately
rather than with makeinfo -- its absence would otherwise induce a
failure late in the build process.
Replace the rsync dependency with wget,
which gnulib changed to in 2018.
Also, add an xz requirement and a version for autopoint.
---
 bootstrap.conf | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index 4f42f1a..c6c8318 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -85,14 +85,17 @@ gnulib_tool_option_extras="--tests-base=gnulib-tests 
--with-tests --symlink\
 buildreq="\
 autoconf   2.64
 automake   1.11.2
-autopoint  -
+autopoint  0.19.2
 gettext    0.19.2
 git        1.4.4
 gzip       -
+m4         -
 makeinfo   6.1
 perl       5.5
-rsync      -
 tar        -
+texi2pdf   6.1
+wget       -
+xz         -
 "

 bootstrap_post_import_hook ()
-- 
2.41.0.191.g6ff334181c


>From e6d60177ac9881e76496dbf9cd60d6ac280510eb Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@meta.com>
Date: Sat, 10 Jun 2023 16:20:49 -0700
Subject: [PATCH 2/6] build: update gnulib to latest

---
 gnulib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnulib b/gnulib
index 522aea1..5ec3136 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 522aea1093a598246346b3e1c426505c344fe19a
+Subproject commit 5ec3136235d7a0d5db77a474c40e35edd47b6dd7
-- 
2.41.0.191.g6ff334181c


>From 26cf2ade2ecb3c26f74fab943fdcde8106a7127f Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@meta.com>
Date: Sat, 10 Jun 2023 18:15:34 -0700
Subject: [PATCH 3/6] sed: also print target file name upon rename failure

* sed/utils.c (ck_rename): When diagnosting rename failure,
also mention the target file name.
* testsuite/in-place-suffix-backup.sh: Adjust test expectations
to match.
Reported by Sebastian Carlos in https://bugs.gnu.org/63833
---
 sed/utils.c                         | 2 +-
 testsuite/in-place-suffix-backup.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sed/utils.c b/sed/utils.c
index ecd1d71..641518a 100644
--- a/sed/utils.c
+++ b/sed/utils.c
@@ -410,7 +410,7 @@ ck_rename (const char *from, const char *to)
   if (rd != -1)
     return;

-  panic (_("cannot rename %s: %s"), from, strerror (errno));
+  panic (_("cannot rename %s to %s: %s"), from, to, strerror (errno));
 }


diff --git a/testsuite/in-place-suffix-backup.sh 
b/testsuite/in-place-suffix-backup.sh
index 0ba4ce2..f8fc952 100644
--- a/testsuite/in-place-suffix-backup.sh
+++ b/testsuite/in-place-suffix-backup.sh
@@ -29,7 +29,7 @@ printf "1\nz\n" >> exp-z || framework_failure_
 # TODO: misleading error: the problem is the target filename of rename(2),
 #       not the source filename.
 cat <<\EOF >exp-err-rename || framework_failure_
-sed: cannot rename ./e: No such file or directory
+sed: cannot rename ./e to ./e./e./e: No such file or directory
 EOF


-- 
2.41.0.191.g6ff334181c


>From f4ac1e793131479e8c4026fc0b7133cc73798ade Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@meta.com>
Date: Mon, 12 Jun 2023 08:29:31 -0700
Subject: [PATCH 4/6] maint: long_lines vs bootstrap: avoid syntax-check
 failure

* cfg.mk (exclude_file_name_regexp--sc_long_lines):
Exempt generated bootstrap from line-length check.
---
 cfg.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cfg.mk b/cfg.mk
index 9d7dce4..99e66a1 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -330,7 +330,8 @@ exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \
   ^testsuite/(bkslashes.good|(noeolw?|empty|zero-anchor)\.(2?good|inp))$$

 # Exempt test-related files from our 80-column limitation, for now.
-exclude_file_name_regexp--sc_long_lines = (^testsuite/|/help2man$$)
+exclude_file_name_regexp--sc_long_lines = \
+  (^testsuite/|/help2man$$|^bootstrap$$)

 # Exempt test-related files from space-before-parens requirements.
 exclude_file_name_regexp--sc_space_before_open_paren = ^testsuite/
-- 
2.41.0.191.g6ff334181c


>From cdf182c16e384640a7bbde529bfca637503f427f Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@meta.com>
Date: Sat, 10 Jun 2023 18:17:15 -0700
Subject: [PATCH 5/6] maint: THANKS duplicates: avoid new syntax-check failure

* THANKS.in: Remove Bruno Haible's name. Now that he's authored
a commit, we must not list his name in this template.
---
 THANKS.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/THANKS.in b/THANKS.in
index c366c15..8b03506 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -15,7 +15,6 @@ Alan Modra                          
alan@spri.levels.unisa.edu.au
 Andreas Schwab                      schwab@issan.informatik.uni-dortmund.de
 Andrew Herbert                      andrew@werple.apana.org.au
 Arnold Robbins                      arnold@skeeve.com
-Bruno Haible                        haible@ilog.fr
 Chip Salzenberg                     chip@fin.uucp
 Chris Weber                         weber@bucknell.edu
 Corinna Vinschen                    vinschen@redhat.com
-- 
2.41.0.191.g6ff334181c


>From 923ddd024fb091befcfa9a6c323e1dd8869c5e2e Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@meta.com>
Date: Mon, 12 Jun 2023 08:35:26 -0700
Subject: [PATCH 6/6] maint: old-NEWS modified: avoid syntax-check failure

* cfg.mk (old_NEWS_hash): Update to reflect the January quoting
change that modified old NEWS items.
---
 cfg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cfg.mk b/cfg.mk
index 99e66a1..05b1ef0 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -72,7 +72,7 @@ export VERBOSE = yes
 # 836832 6e
 export XZ_OPT = -6e

-old_NEWS_hash = 31db53b519338cc4b1527a682e88493f
+old_NEWS_hash = b7391a776a50090561bfd41cb2fdb3a1

 # Many m4 macros names once began with 'jm_'.
 # Make sure that none are inadvertently reintroduced.
-- 
2.41.0.191.g6ff334181c


reply via email to

[Prev in Thread] Current Thread [Next in Thread]