diff --git a/0001-Delete-test-execute_sh.patch b/0001-Delete-test-execute_sh.patch deleted file mode 100644 index 891e3d3fbe4837e15e86f30ddd83d460d588c5f8..0000000000000000000000000000000000000000 --- a/0001-Delete-test-execute_sh.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 -index fccda9a..1675e54 100644 ---- a/m4/gnulib-comp.m4 -+++ b/m4/gnulib-comp.m4 -@@ -2983,7 +2983,6 @@ AC_DEFUN([M4_FILE_LIST], [ - tests/test-execute-child.c - tests/test-execute-main.c - tests/test-execute-script.c -- tests/test-execute.sh - tests/test-explicit_bzero.c - tests/test-fchdir.c - tests/test-fclose.c -diff --git a/tests/Makefile.in b/tests/Makefile.in -index 64ce81c..ae1bfe3 100644 ---- a/tests/Makefile.in -+++ b/tests/Makefile.in -@@ -126,7 +126,6 @@ TESTS = test-accept$(EXEEXT) test-access$(EXEEXT) \ - test-ctype$(EXEEXT) $(am__EXEEXT_3) test-dirent$(EXEEXT) \ - test-dirname$(EXEEXT) test-dup$(EXEEXT) test-dup2$(EXEEXT) \ - test-dynarray$(EXEEXT) test-environ$(EXEEXT) $(am__EXEEXT_4) \ -- test-errno$(EXEEXT) test-execute.sh \ - test-execute-script$(EXEEXT) test-explicit_bzero$(EXEEXT) \ - test-fchdir$(EXEEXT) test-fclose$(EXEEXT) $(am__EXEEXT_5) \ - test-fcntl-h$(EXEEXT) test-fcntl$(EXEEXT) test-fdopen$(EXEEXT) \ -@@ -4388,7 +4387,6 @@ EXTRA_DIST = accept.c w32sock.h test-accept.c signature.h macros.h \ - test-dup.c signature.h macros.h test-dup2.c signature.h \ - macros.h test-dynarray.c macros.h test-environ.c \ - test-errno-c++.cc test-errno-c++2.cc test-errno.c \ -- test-execute.sh test-execute-main.c test-execute-child.c \ - test-execute-script.c executable-script executable-script.sh \ - executable-shell-script macros.h explicit_bzero.c \ - test-explicit_bzero.c signature.h macros.h test-fchdir.c \ -@@ -6970,13 +6968,6 @@ test-errno.log: test-errno$(EXEEXT) - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) --test-execute.sh.log: test-execute.sh -- @p='test-execute.sh'; \ -- b='test-execute.sh'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) - test-execute-script.log: test-execute-script$(EXEEXT) - @p='test-execute-script$(EXEEXT)'; \ - b='test-execute-script'; \ -diff --git a/tests/gnulib.mk b/tests/gnulib.mk -index 2c99ba9..0f8044e 100644 ---- a/tests/gnulib.mk -+++ b/tests/gnulib.mk -@@ -519,7 +519,6 @@ EXTRA_DIST += test-errno.c - - ## begin gnulib module execute-tests - --TESTS += test-execute.sh - check_PROGRAMS += test-execute-main test-execute-child - test_execute_main_LDADD = $(LDADD) @LIBINTL@ $(LIBTHREAD) - # The test-execute-child program must be a real executable, not a libtool -@@ -531,7 +530,6 @@ TESTS += test-execute-script - check_PROGRAMS += test-execute-script - test_execute_script_LDADD = $(LDADD) @LIBINTL@ $(LIBTHREAD) - test_execute_script_CPPFLAGS = $(AM_CPPFLAGS) -DSRCDIR=\"$(srcdir)/\" --EXTRA_DIST += test-execute.sh test-execute-main.c test-execute-child.c test-execute-script.c executable-script executable-script.sh executable-shell-script macros.h - - ## end gnulib module execute-tests - -diff --git a/tests/test-execute.sh b/tests/test-execute.sh -deleted file mode 100755 -index 15c8b47..0000000 ---- a/tests/test-execute.sh -+++ /dev/null -@@ -1,8 +0,0 @@ --#!/bin/sh -- --st=0 --for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 ; do -- ${CHECKER} ./test-execute-main${EXEEXT} ./test-execute-child${EXEEXT} $i \ -- || { echo test-execute.sh: test case $i failed >&2; st=1; } --done --exit $st --- -1.8.3.1 - diff --git a/backport-output-Avoid-tickling-UBSAN-with-memcpy-dest-NULL-0.patch b/backport-output-Avoid-tickling-UBSAN-with-memcpy-dest-NULL-0.patch deleted file mode 100644 index ca054ead254db37c7cc6bb16a78fbd9fa2c30b22..0000000000000000000000000000000000000000 --- a/backport-output-Avoid-tickling-UBSAN-with-memcpy-dest-NULL-0.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a886ea40a29a08954ff80772e267828a1d440cc9 Mon Sep 17 00:00:00 2001 -From: Eric Blake -Date: Fri, 13 Jan 2023 16:27:54 -0600 -Subject: [PATCH] output: Avoid tickling UBSAN with memcpy(dest, NULL, 0) - -Even though all libc handle it sanely (because size 0 says there is -nothing to copy), NULL is not a valid source pointer per a strict -reading of C, so UBSAN flags it: - -+output.c:511:9: runtime error: null pointer passed as argument 2, which is declared to never be null - -* src/output.c (make_room_for): Skip no-op memcpy. -Fixes: https://savannah.gnu.org/support/index.php?110809 -Reported-by: Sam James ---- - src/output.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/output.c b/src/output.c -index 956089b1..6dc8280a 100644 ---- a/src/output.c -+++ b/src/output.c -@@ -508,7 +508,8 @@ make_room_for (int length) - { - char *buffer = output_diversion->u.buffer; - output_diversion->u.buffer = xcharalloc ((size_t) wanted_size); -- memcpy (output_diversion->u.buffer, buffer, output_diversion->used); -+ if (output_diversion->used) -+ memcpy (output_diversion->u.buffer, buffer, output_diversion->used); - free (buffer); - } - --- -2.33.0 - diff --git a/m4-1.4.19.tar.xz b/m4-1.4.19.tar.xz deleted file mode 100644 index 79a99c48ddd37c88a2ab8280db48128890d3fdc5..0000000000000000000000000000000000000000 Binary files a/m4-1.4.19.tar.xz and /dev/null differ diff --git a/m4-1.4.20.tar.xz b/m4-1.4.20.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..d2d22a62194847c754680030163af67d21372f0a Binary files /dev/null and b/m4-1.4.20.tar.xz differ diff --git a/m4.spec b/m4.spec index c8f58b52b49f51a6df4e3a0c7760fed1b7ded263..4223ffae003671318791ce7676940cca04b31766 100644 --- a/m4.spec +++ b/m4.spec @@ -1,14 +1,12 @@ Name: m4 -Version: 1.4.19 -Release: 5 +Version: 1.4.20 +Release: 1 Summary: A GNU implementation of macro processor License: GPL-3.0-or-later URL: https://www.gnu.org/software/m4/ Source0: https://ftp.gnu.org/gnu/m4/%{name}-%{version}.tar.xz -Patch1: 0001-Delete-test-execute_sh.patch -Patch6000: backport-output-Avoid-tickling-UBSAN-with-memcpy-dest-NULL-0.patch -BuildRequires: gcc autoconf automake gettext-devel +BuildRequires: gcc make Provides: bundled(gnulib) %description @@ -27,7 +25,6 @@ doing arithmetic, etc. %ifarch aarch64 CFLAGS="$RPM_OPT_FLAGS -fsigned-char" %endif -autoreconf -ivf %configure %make_build @@ -51,6 +48,9 @@ rm -rf %{buildroot}%{_infodir}/dir %{_infodir}/m4* %changelog +* Sun May 11 2025 Funda Wang - 1.4.20-1 +- update to version 1.4.20 + * Mon Oct 21 2024 Funda Wang - 1.4.19-5 - cleanup spec