[pkgsrc/trunk]: pkgsrc/devel/gmake Appy upstream git commit 292da6f6867b75a5a...

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d61643f93b89
branches:  trunk
changeset: 641467:d61643f93b89
user:      obache <obache%pkgsrc.org@localhost>
date:      Sun Nov 09 03:22:57 2014 +0000

description:
Appy upstream git commit 292da6f6867b75a5af7ddbb639a1feae022f438f
to resolve upstrem bug#43434, make 4.1 without /dev/pts mounted segfaults.

Bump PKGREVISION.

diffstat:

 devel/gmake/Makefile                |   3 ++-
 devel/gmake/distinfo                |   4 +++-
 devel/gmake/patches/patch-main.c    |  30 ++++++++++++++++++++++++++++++
 devel/gmake/patches/patch-makeint.h |  19 +++++++++++++++++++
 4 files changed, 54 insertions(+), 2 deletions(-)

diffs (84 lines):

diff -r 0b07e8e753c0 -r d61643f93b89 devel/gmake/Makefile
--- a/devel/gmake/Makefile      Sun Nov 09 02:46:44 2014 +0000
+++ b/devel/gmake/Makefile      Sun Nov 09 03:22:57 2014 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.90 2014/10/12 14:58:27 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2014/11/09 03:22:57 obache Exp $
 
 DISTNAME=      make-4.1
 PKGNAME=       g${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=make/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 0b07e8e753c0 -r d61643f93b89 devel/gmake/distinfo
--- a/devel/gmake/distinfo      Sun Nov 09 02:46:44 2014 +0000
+++ b/devel/gmake/distinfo      Sun Nov 09 03:22:57 2014 +0000
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.24 2014/10/12 14:58:27 wiz Exp $
+$NetBSD: distinfo,v 1.25 2014/11/09 03:22:57 obache Exp $
 
 SHA1 (make-4.1.tar.bz2) = 0d701882fd6fd61a9652cb8d866ad7fc7de54d58
 RMD160 (make-4.1.tar.bz2) = 0f322d6c28867ea817f7d02c57e635c8ef556909
 Size (make-4.1.tar.bz2) = 1327342 bytes
 SHA1 (patch-af) = 8ff060ecba9d664044eabd98741253881d8c9bbe
+SHA1 (patch-main.c) = 6674cc95ce702c06b8214963bcb43bde3919be4f
+SHA1 (patch-makeint.h) = edfb71f3b41bf3bc4c66d948e3001b5502add6c3
 SHA1 (patch-pa) = 2c0168db7afec3da98b30392290e5b9464ea7b5e
diff -r 0b07e8e753c0 -r d61643f93b89 devel/gmake/patches/patch-main.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/gmake/patches/patch-main.c  Sun Nov 09 03:22:57 2014 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-main.c,v 1.1 2014/11/09 03:22:57 obache Exp $
+
+* [SV 43434] Handle NULL returns from ttyname().
+
+--- main.c.orig        2014-10-05 16:24:51.000000000 +0000
++++ main.c
+@@ -1401,13 +1401,18 @@ main (int argc, char **argv, char **envp
+ #ifdef HAVE_ISATTY
+     if (isatty (fileno (stdout)))
+       if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMOUT")))
+-        define_variable_cname ("MAKE_TERMOUT", TTYNAME (fileno (stdout)),
+-                               o_default, 0)->export = v_export;
+-
++        {
++          const char *tty = TTYNAME (fileno (stdout));
++          define_variable_cname ("MAKE_TERMOUT", tty ? tty : DEFAULT_TTYNAME,
++                                 o_default, 0)->export = v_export;
++        }
+     if (isatty (fileno (stderr)))
+       if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMERR")))
+-        define_variable_cname ("MAKE_TERMERR", TTYNAME (fileno (stderr)),
+-                               o_default, 0)->export = v_export;
++        {
++          const char *tty = TTYNAME (fileno (stderr));
++          define_variable_cname ("MAKE_TERMERR", tty ? tty : DEFAULT_TTYNAME,
++                                 o_default, 0)->export = v_export;
++        }
+ #endif
+ 
+   /* Reset in case the switches changed our minds.  */
diff -r 0b07e8e753c0 -r d61643f93b89 devel/gmake/patches/patch-makeint.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/gmake/patches/patch-makeint.h       Sun Nov 09 03:22:57 2014 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-makeint.h,v 1.1 2014/11/09 03:22:57 obache Exp $
+
+* [SV 43434] Handle NULL returns from ttyname().
+
+--- makeint.h.orig     2014-10-05 16:24:51.000000000 +0000
++++ makeint.h
+@@ -424,10 +424,11 @@ extern struct rlimit stack_limit;
+ /* The number of bytes needed to represent the largest integer as a string.  */
+ #define INTSTR_LENGTH         CSTRLEN ("18446744073709551616")
+ 
++#define DEFAULT_TTYNAME "true"
+ #ifdef HAVE_TTYNAME
+ # define TTYNAME(_f) ttyname (_f)
+ #else
+-# define TTYNAME(_f) "true"
++# define TTYNAME(_f) DEFAULT_TTYNAME
+ #endif
+ 
+