CVS commit: pkgsrc/security/libgpg-error

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Sep 29 18:58:37 UTC 2024

Modified Files:
        pkgsrc/security/libgpg-error: distinfo
        pkgsrc/security/libgpg-error/patches: patch-src_spawn-posix.c

Log Message:
libgpg-error: Avoid nonportable environ global.

Fixes Tiger build, doesn't break Sequoia or NetBSD 10.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/security/libgpg-error/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/security/libgpg-error/patches/patch-src_spawn-posix.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/libgpg-error/distinfo
diff -u pkgsrc/security/libgpg-error/distinfo:1.64 pkgsrc/security/libgpg-error/distinfo:1.65
--- pkgsrc/security/libgpg-error/distinfo:1.64  Wed Jun 26 19:31:56 2024
+++ pkgsrc/security/libgpg-error/distinfo       Sun Sep 29 18:58:37 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2024/06/26 19:31:56 adam Exp $
+$NetBSD: distinfo,v 1.65 2024/09/29 18:58:37 schmonz Exp $
 
 BLAKE2s (libgpg-error-1.50.tar.bz2) = b65de3319e7dc5adb51a1f29d7efe6df9c7f1fbaf32d4bd010f9dca9ce7647cc
 SHA512 (libgpg-error-1.50.tar.bz2) = 96e466d892a50843af6d7c08c0da602518bc6a28836bfc35f0a28cde74d368f57c5c70c65f0f41edb4fc1ca5ebd00f2ece531d8b3eb1bd6db566adbb29bc61ff
@@ -6,6 +6,6 @@ Size (libgpg-error-1.50.tar.bz2) = 10820
 SHA1 (patch-doc_yat2m.c) = c5c497f6bcd110ca8dbd050cb74f3f537f6404a8
 SHA1 (patch-src_argparse.c) = 3e753aac4bce4273887bbb4818ae68a4016fb6d8
 SHA1 (patch-src_estream.c) = 0502a55403062abeab22c83a6d919c57ff1c5d82
-SHA1 (patch-src_spawn-posix.c) = 22908bfd95624e89fba6699a56a14b2ce6cf4435
+SHA1 (patch-src_spawn-posix.c) = ff32dcccbcbf9d67a2cbb31192774b69bf73a148
 SHA1 (patch-src_syscfg_lock-obj-pub.netbsd.h) = 6f00890bc3d821da9b715c00a8f068fa4964df9e
 SHA1 (patch-src_syscfg_lock-obj-pub.netbsdelf.h) = e963c2efe74191e199d4fb694a6d04ffe87594d0

Index: pkgsrc/security/libgpg-error/patches/patch-src_spawn-posix.c
diff -u pkgsrc/security/libgpg-error/patches/patch-src_spawn-posix.c:1.1 pkgsrc/security/libgpg-error/patches/patch-src_spawn-posix.c:1.2
--- pkgsrc/security/libgpg-error/patches/patch-src_spawn-posix.c:1.1    Wed Jun 26 19:31:56 2024
+++ pkgsrc/security/libgpg-error/patches/patch-src_spawn-posix.c        Sun Sep 29 18:58:37 2024
@@ -1,15 +1,30 @@
-$NetBSD: patch-src_spawn-posix.c,v 1.1 2024/06/26 19:31:56 adam Exp $
+$NetBSD: patch-src_spawn-posix.c,v 1.2 2024/09/29 18:58:37 schmonz Exp $
 
-environ must be declared.
+Avoid nonportable environ global.
+Via <https://dev.gnupg.org/T7169#190989>
 
 --- src/spawn-posix.c.orig     2024-06-19 07:33:41.000000000 +0000
 +++ src/spawn-posix.c
-@@ -53,6 +53,8 @@
- #if __linux__
- # include <sys/types.h>
- # include <dirent.h>
-+#else
-+extern char **environ;
- #endif /*__linux__ */
+@@ -341,9 +341,6 @@ my_exec (const char *pgmname, const char
+   /* Close all other files.  */
+   _gpgrt_close_all_fds (3, act->except_fds);
  
- #include "gpgrt-int.h"
+-  if (act->environ)
+-    environ = act->environ;
+-
+   if (act->atfork)
+     act->atfork (act->atfork_arg);
+ 
+@@ -351,7 +348,11 @@ my_exec (const char *pgmname, const char
+   if (pgmname == NULL)
+     return 0;
+ 
+-  execv (pgmname, (char *const *)argv);
++  if (act->environ)
++    execve (pgmname, (char *const *)argv, act->environ);
++  else
++    execv (pgmname, (char *const *)argv);
++
+   /* No way to print anything, as we have may have closed all streams. */
+   _exit (127);
+   return -1;