Do not call into gettext which may not be async-signal-safe in between fork

and exec.  Fixes crashes on OSX when LC_ALL is unset.

Bump PKGREVISION.

3 files changed, 47 insertions, 2 deletions

diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile
index b8465ef0e2e..2e82bc0140d 100644
--- a/archivers/gtar-base/Makefile
+++ b/archivers/gtar-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2014/10/09 13:44:32 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2015/01/26 12:30:30 jperkin Exp $
 #
 # Please run 'make files/gtar.1' when updating version of this package
 # to regenerate the man page. converters/help2man is needed.
@@ -6,6 +6,7 @@
 .include "../../archivers/gtar/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/tar/gtar-base/}
+PKGREVISION=	1
 COMMENT=	The GNU tape archiver with remote magnetic tape support
 LICENSE=	gnu-gpl-v3
 
diff --git a/archivers/gtar-base/distinfo b/archivers/gtar-base/distinfo
index 4a15a197dac..df930a41250 100644
--- a/archivers/gtar-base/distinfo
+++ b/archivers/gtar-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2014/08/21 20:44:16 wiz Exp $
+$NetBSD: distinfo,v 1.37 2015/01/26 12:30:30 jperkin Exp $
 
 SHA1 (tar-1.28.tar.bz2) = 668ea52014ef7e70afc4ff7324410ee32f2970ef
 RMD160 (tar-1.28.tar.bz2) = a2edf2a854fa9a7bc7383638038a7465ae8bba51
@@ -8,3 +8,4 @@ SHA1 (patch-configure) = 9d3b26ab03c8a0a30c3dbfbdeadae4d14b7fd8dc
 SHA1 (patch-gnu_readlinkat.c) = b1ddbf5159db92df9186354f27db5c9cb93b9afa
 SHA1 (patch-lib_xattr-at.c) = c69631c118558c0c056feb5b55188b2b4c92cc19
 SHA1 (patch-src_Makefile.in) = 2e6c93b00f4c291a68884663968625e784103c3b
+SHA1 (patch-src_system.c) = 59f74fa831de8fc6cdd64808660d2ec2d76bcf90
diff --git a/archivers/gtar-base/patches/patch-src_system.c b/archivers/gtar-base/patches/patch-src_system.c
new file mode 100644
index 00000000000..cbd39f7fa56
--- /dev/null
+++ b/archivers/gtar-base/patches/patch-src_system.c
@@ -0,0 +1,43 @@
+$NetBSD: patch-src_system.c,v 1.1 2015/01/26 12:30:30 jperkin Exp $
+
+Do not call into gettext which may not be async-signal-safe in between fork
+and exec.  Fixes crashes on OSX when LC_ALL is unset.
+
+--- src/system.c.orig	2014-02-25 22:26:02.000000000 +0000
++++ src/system.c
+@@ -344,7 +344,7 @@ sys_child_open_for_compress (void)
+ 
+   /* The new born child tar is here!  */
+ 
+-  set_program_name (_("tar (child)"));
++  set_program_name (N_("tar (child)"));
+   signal (SIGPIPE, SIG_DFL);
+ 
+   xdup2 (parent_pipe[PREAD], STDIN_FILENO);
+@@ -389,7 +389,7 @@ sys_child_open_for_compress (void)
+     {
+       /* The newborn grandchild tar is here!  Launch the compressor.  */
+ 
+-      set_program_name (_("tar (grandchild)"));
++      set_program_name (N_("tar (grandchild)"));
+ 
+       xdup2 (child_pipe[PWRITE], STDOUT_FILENO);
+       xclose (child_pipe[PREAD]);
+@@ -523,7 +523,7 @@ sys_child_open_for_uncompress (void)
+ 
+   /* The newborn child tar is here!  */
+ 
+-  set_program_name (_("tar (child)"));
++  set_program_name (N_("tar (child)"));
+   signal (SIGPIPE, SIG_DFL);
+ 
+   xdup2 (parent_pipe[PWRITE], STDOUT_FILENO);
+@@ -558,7 +558,7 @@ sys_child_open_for_uncompress (void)
+     {
+       /* The newborn grandchild tar is here!  Launch the uncompressor.  */
+ 
+-      set_program_name (_("tar (grandchild)"));
++      set_program_name (N_("tar (grandchild)"));
+ 
+       xdup2 (child_pipe[PREAD], STDIN_FILENO);
+       xclose (child_pipe[PWRITE]);