<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Aptos;
panose-1:2 11 0 4 2 2 2 2 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
font-size:11.0pt;
font-family:"Aptos",sans-serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:#467886;
text-decoration:underline;}
p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
{mso-style-priority:34;
margin-top:0cm;
margin-right:0cm;
margin-bottom:0cm;
margin-left:36.0pt;
font-size:11.0pt;
font-family:"Aptos",sans-serif;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:11.0pt;
mso-ligatures:none;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;}
div.WordSection1
{page:WordSection1;}
/* List Definitions */
@list l0
{mso-list-id:135144693;
mso-list-template-ids:-304451152;}
@list l0:level1
{mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
@list l0:level2
{mso-level-tab-stop:72.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
@list l0:level3
{mso-level-tab-stop:108.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
@list l0:level4
{mso-level-tab-stop:144.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
@list l0:level5
{mso-level-tab-stop:180.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
@list l0:level6
{mso-level-tab-stop:216.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
@list l0:level7
{mso-level-tab-stop:252.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
@list l0:level8
{mso-level-tab-stop:288.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
@list l0:level9
{mso-level-tab-stop:324.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
@list l1
{mso-list-id:524946994;
mso-list-template-ids:-1937580290;}
@list l2
{mso-list-id:1573853019;
mso-list-type:hybrid;
mso-list-template-ids:578336906 134807567 134807577 134807579 134807567 134807577 134807579 134807567 134807577 134807579;}
@list l2:level1
{mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;}
@list l2:level2
{mso-level-number-format:alpha-lower;
mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;}
@list l2:level3
{mso-level-number-format:roman-lower;
mso-level-tab-stop:none;
mso-level-number-position:right;
text-indent:-9.0pt;}
@list l2:level4
{mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;}
@list l2:level5
{mso-level-number-format:alpha-lower;
mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;}
@list l2:level6
{mso-level-number-format:roman-lower;
mso-level-tab-stop:none;
mso-level-number-position:right;
text-indent:-9.0pt;}
@list l2:level7
{mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;}
@list l2:level8
{mso-level-number-format:alpha-lower;
mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;}
@list l2:level9
{mso-level-number-format:roman-lower;
mso-level-tab-stop:none;
mso-level-number-position:right;
text-indent:-9.0pt;}
ol
{margin-bottom:0cm;}
ul
{margin-bottom:0cm;}
--></style>
</head>
<body lang="EN-IN" link="#467886" vlink="#96607D" style="word-wrap:break-word">
<div class="WordSection1">
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">Hi,<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">Please review the updated patch with comments from Werner, Jacob and Todd fixed.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">*Renamed environ variable to avoid conflict with environ defined in z/os stdlib header<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">Regards<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">Sachin<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">---<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">Signed-off-by: Sachin T
<a href="mailto:sachin.t@ibm.com">sachin.t@ibm.com</a><o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">---<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">src/Makefile.am | 2 +-<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">src/spawn-posix.c | 8 ++++----<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">2 files changed, 5 insertions(+), 5 deletions(-)<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">diff --git a/src/Makefile.am b/src/Makefile.am<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">index e56bb23..7e874cf 100644<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">--- a/src/Makefile.am<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">+++ b/src/Makefile.am<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">@@ -275,7 +275,7 @@ errnos-sym.h: Makefile mkstrtable.awk errnos.in<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">mkheader$(EXEEXT_FOR_BUILD): mkheader.c Makefile<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"> $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">- $(CPPFLAGS_FOR_BUILD) -g -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">+ $(CPPFLAGS_FOR_BUILD) -g -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c $(LIBS)<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">parts_of_gpg_error_h = \<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"> gpg-error.h.in \<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">diff --git a/src/spawn-posix.c b/src/spawn-posix.c<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">index ac19761..0ffc71e 100644<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">--- a/src/spawn-posix.c<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">+++ b/src/spawn-posix.c<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">@@ -63,7 +63,7 @@<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">struct gpgrt_spawn_actions {<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"> int fd[3];<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"> const int *except_fds;<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">- char **environ;<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">+ char **environ_p;<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"> const char *const *envchange;<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"> void (*atfork) (void *);<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"> void *atfork_arg;<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">@@ -414,8 +414,8 @@ my_exec (const char *pgmname, const char *argv[], gpgrt_spawn_actions_t act)<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"> if (pgmname == NULL)<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"> return 0;<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">- if (act->environ)<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">- execve (pgmname, (char *const *)argv, act->environ);<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">+ if (act->environ_p)<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">+ execve (pgmname, (char *const *)argv, act->environ_p);<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"> else<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"> execv (pgmname, (char *const *)argv);<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">@@ -516,7 +516,7 @@ void<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">_gpgrt_spawn_actions_set_environ (gpgrt_spawn_actions_t act,<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"> char **environ_for_child)<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">{<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">- act->environ = environ_for_child;<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">+ act->environ_p = environ_for_child;<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">}<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">void<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">--<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">2.39.5 (Apple Git-154)<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<div id="mail-editor-reference-message-container">
<div>
<div>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal" style="margin-bottom:12.0pt"><b><span style="font-size:12.0pt;color:black">From:
</span></b><span style="font-size:12.0pt;color:black">Sachin T <sachin.t@ibm.com><br>
<b>Date: </b>Tuesday, 10 June 2025 at 8:45</span><span style="font-size:12.0pt;font-family:"Arial",sans-serif;color:black"> </span><span style="font-size:12.0pt;color:black">PM<br>
<b>To: </b>gnupg-devel@gnupg.org <gnupg-devel@gnupg.org><br>
<b>Cc: </b>Sachin T <sachin.t@ibm.com><br>
<b>Subject: </b>[PATCH libgpg-error] Add support for IBM z/OS<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal">Hi,<o:p></o:p></p>
<p class="MsoNormal"> <o:p></o:p></p>
<p class="MsoNormal">Please review patch required for IBM z/OS platform.<o:p></o:p></p>
<p class="MsoNormal"> <o:p></o:p></p>
<ol style="margin-top:0cm" start="1" type="1">
<li class="MsoListParagraph" style="margin-left:0cm;mso-list:l0 level1 lfo3">mkheader target depends on “zoslib”(specific to z/OS platform) which is passed via LIBS</li><li class="MsoListParagraph" style="margin-left:0cm;mso-list:l0 level1 lfo3">Uses AF_UNIX instead of AF_LOCAL in socketpair().</li><li class="MsoListParagraph" style="margin-left:0cm;mso-list:l0 level1 lfo3">On z/OS, environ is defined as a macro in <stdlib.h>, so it is temporarily redefined around the header inclusion to avoid conflicts.</li></ol>
<p class="MsoNormal"> <o:p></o:p></p>
<p class="MsoNormal">Regards<o:p></o:p></p>
<p class="MsoNormal">Sachin<o:p></o:p></p>
<p class="MsoNormal"> <o:p></o:p></p>
<p class="MsoNormal">---<br>
<br>
From cbea5636c31668ae238d899dfa6d1f4682704f83 Mon Sep 17 00:00:00 2001<o:p></o:p></p>
<p class="MsoNormal">From: Sachin T <a href="mailto:sachin.t@ibm.com">sachin.t@ibm.com</a><o:p></o:p></p>
<p class="MsoNormal">Date: Tue, 10 Jun 2025 20:14:04 +0530<o:p></o:p></p>
<p class="MsoNormal">Subject: [PATCH] Add patches for IBM z/OS<o:p></o:p></p>
<p class="MsoNormal"> <o:p></o:p></p>
<p class="MsoNormal">Signed-off-by: Sachin T <a href="mailto:sachin.t@ibm.com">sachin.t@ibm.com</a><o:p></o:p></p>
<p class="MsoNormal">---<o:p></o:p></p>
<p class="MsoNormal">src/Makefile.am | 2 +-<o:p></o:p></p>
<p class="MsoNormal">src/spawn-posix.c | 13 +++++++++++++<o:p></o:p></p>
<p class="MsoNormal">2 files changed, 14 insertions(+), 1 deletion(-)<o:p></o:p></p>
<p class="MsoNormal"> <o:p></o:p></p>
<p class="MsoNormal">diff --git a/src/Makefile.am b/src/Makefile.am<o:p></o:p></p>
<p class="MsoNormal">index e56bb23..7e874cf 100644<o:p></o:p></p>
<p class="MsoNormal">--- a/src/Makefile.am<o:p></o:p></p>
<p class="MsoNormal">+++ b/src/Makefile.am<o:p></o:p></p>
<p class="MsoNormal">@@ -275,7 +275,7 @@ errnos-sym.h: Makefile mkstrtable.awk errnos.in<o:p></o:p></p>
<p class="MsoNormal"> <o:p></o:p></p>
<p class="MsoNormal">mkheader$(EXEEXT_FOR_BUILD): mkheader.c Makefile<o:p></o:p></p>
<p class="MsoNormal"> $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \<o:p></o:p></p>
<p class="MsoNormal">- $(CPPFLAGS_FOR_BUILD) -g -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c<o:p></o:p></p>
<p class="MsoNormal">+ $(CPPFLAGS_FOR_BUILD) -g -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c $(LIBS)<o:p></o:p></p>
<p class="MsoNormal"> <o:p></o:p></p>
<p class="MsoNormal">parts_of_gpg_error_h = \<o:p></o:p></p>
<p class="MsoNormal"> gpg-error.h.in \<o:p></o:p></p>
<p class="MsoNormal">diff --git a/src/spawn-posix.c b/src/spawn-posix.c<o:p></o:p></p>
<p class="MsoNormal">index ac19761..2666862 100644<o:p></o:p></p>
<p class="MsoNormal">--- a/src/spawn-posix.c<o:p></o:p></p>
<p class="MsoNormal">+++ b/src/spawn-posix.c<o:p></o:p></p>
<p class="MsoNormal">@@ -27,8 +27,17 @@<o:p></o:p></p>
<p class="MsoNormal">#error This code is only used on POSIX<o:p></o:p></p>
<p class="MsoNormal">#endif<o:p></o:p></p>
<p class="MsoNormal"> <o:p></o:p></p>
<p class="MsoNormal">+#if defined(__MVS__)<o:p></o:p></p>
<p class="MsoNormal">+#define environ environ_replace<o:p></o:p></p>
<p class="MsoNormal">+#endif<o:p></o:p></p>
<p class="MsoNormal">+<o:p></o:p></p>
<p class="MsoNormal">#include <stdio.h><o:p></o:p></p>
<p class="MsoNormal">#include <stdlib.h><o:p></o:p></p>
<p class="MsoNormal">+<o:p></o:p></p>
<p class="MsoNormal">+#if defined(__MVS__)<o:p></o:p></p>
<p class="MsoNormal">+#undef environ<o:p></o:p></p>
<p class="MsoNormal">+#endif<o:p></o:p></p>
<p class="MsoNormal">+<o:p></o:p></p>
<p class="MsoNormal">#include <stdint.h><o:p></o:p></p>
<p class="MsoNormal">#include <string.h><o:p></o:p></p>
<p class="MsoNormal">#include <errno.h><o:p></o:p></p>
<p class="MsoNormal">@@ -330,7 +339,11 @@ do_create_socketpair (int filedes[2])<o:p></o:p></p>
<p class="MsoNormal"> gpg_error_t err = 0;<o:p></o:p></p>
<p class="MsoNormal"> <o:p></o:p></p>
<p class="MsoNormal"> _gpgrt_pre_syscall ();<o:p></o:p></p>
<p class="MsoNormal">+#if defined(__MVS__)<o:p></o:p></p>
<p class="MsoNormal">+ if (socketpair (AF_UNIX, SOCK_STREAM, 0, filedes) == -1)<o:p></o:p></p>
<p class="MsoNormal">+#else<o:p></o:p></p>
<p class="MsoNormal"> if (socketpair (AF_LOCAL, SOCK_STREAM, 0, filedes) == -1)<o:p></o:p></p>
<p class="MsoNormal">+#endif<o:p></o:p></p>
<p class="MsoNormal"> {<o:p></o:p></p>
<p class="MsoNormal"> err = _gpg_err_code_from_syserror ();<o:p></o:p></p>
<p class="MsoNormal"> filedes[0] = filedes[1] = -1;<o:p></o:p></p>
<p class="MsoNormal">--<o:p></o:p></p>
<p class="MsoNormal">2.39.5 (Apple Git-154)<o:p></o:p></p>
</div>
</div>
</div>
</div>
</div>
</body>
</html>