Update m4-version to 1.4.21 from 1.4.19

buildenv

@@ -1,10 +1,10 @@
 # bump: m4-version /M4_VERSION="(.*)"/ https://ftp.gnu.org/gnu/m4/|re:/m4-([\d.]+).tar.gz/$1/|semver:*
-M4_VERSION="1.4.19"
+M4_VERSION="1.4.21"
 
 export ZOPEN_BUILD_LINE="STABLE"
 
 export ZOPEN_STABLE_URL="https://ftp.gnu.org/gnu/m4/m4-${M4_VERSION}.tar.gz"
-export ZOPEN_STABLE_DEPS="curl gzip make m4"
+export ZOPEN_STABLE_DEPS="make texinfo coreutils"
 export ZOPEN_DEV_URL="git://git.savannah.gnu.org/m4.git"
 export ZOPEN_DEV_DEPS="check_clang git make m4 help2man perl texinfo xz autoconf automake gettext rsync patch gzip tar gperf sed grep libtool autoconf zoslib"
 export ZOPEN_DEV_BRANCH="branch-1.4"

stable-patches/PR2/README.md → stable-patches/README.md

@@ -8,10 +8,3 @@ builtin.c.patch
   going to be written to later as binary - this seems the lesser of two evils but needs to be
   investigated.
 
-canonicalize-lgpl.c.patch 
-- on z/OS, the __stat macro is defined and this causes a collision with the __stat macro
-  used in this file. The fix is to use a different macro name that doesn't collide, so __gplstat
-  was chosen.
-
-configure.patch
-- there is a typo in the argument definition of 'int main' - argv type is `char**` not `char*`

stable-patches/builtin.c.patch

@@ -0,0 +1,36 @@
+diff --git a/src/builtin.c b/src/builtin.c
+index 514e11b..827768d 100644
+--- a/src/builtin.c
++++ b/src/builtin.c
+@@ -30,6 +30,7 @@
+ #include "regex.h"
+ #include "spawn-pipe.h"
+ #include "wait-process.h"
++#include <zos.h>
+
+ #define ARG(i) (argc > (i) ? TOKEN_DATA_TEXT (argv[i]) : "")
+ #define ARGLEN(i) (argc > (i) ? TOKEN_DATA_LEN (argv[i]) : 0)
+@@ -1068,6 +1069,11 @@ m4_esyscmd (struct obstack *obs, int argc, token_data **argv)
+       close (fd);
+       return;
+     }
++#ifdef __MVS__
++ #if (__CHARSET_LIB == 1)
++   __chgfdccsid(fileno(pin), 819);
++ #endif
++#endif
+   while (1)
+     {
+       size_t avail = obstack_room (obs);
+@@ -1473,6 +1479,11 @@ mkstemp_helper (struct obstack *obs, const char *me, const char *pattern,
+     }
+   else
+     {
++#ifdef __MVS__
++ #if (__CHARSET_LIB == 1)
++   __chgfdccsid(fd, 819);
++ #endif
++#endif
+       close (fd);
+       /* Remove NUL, then finish quote.  */
+       obstack_blank_fast (obs, -1);