[packages/make] - rel 2; upstream fix for segfault when /dev/pts not mounted

[arekm]

commit 5baa2bf48b6505085ecbd467100f6679994eb5a7
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Oct 22 09:01:35 2015 +0200

    - rel 2; upstream fix for segfault when /dev/pts not mounted

 make-bug-43434.patch | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 make.spec            |  4 +++-
 2 files changed, 56 insertions(+), 1 deletion(-)
---
diff --git a/make.spec b/make.spec
index a0a81ee..cebf939 100644
--- a/make.spec
+++ b/make.spec
@@ -13,7 +13,7 @@ Summary(tr.UTF-8):	GNU Make
 Summary(uk.UTF-8):	GNU Make
 Name:		make
 Version:	4.1
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL v3+
 Group:		Development/Building
@@ -23,6 +23,7 @@ Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-ma
 # Source1-md5:	ab6da7a1ba3bcf9e86e4e3fdecca61a7
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-getcwd.patch
+Patch2:		%{name}-bug-43434.patch
 URL:		http://www.gnu.org/software/make/
 BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake >= 1:1.11.1
@@ -110,6 +111,7 @@ Plik nagłówkowy interfejsu modułów GNU Make'a.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__gettextize}
diff --git a/make-bug-43434.patch b/make-bug-43434.patch
new file mode 100644
index 0000000..f6be5c9
--- /dev/null
+++ b/make-bug-43434.patch
@@ -0,0 +1,53 @@
+From 292da6f6867b75a5af7ddbb639a1feae022f438f Mon Sep 17 00:00:00 2001
+From: Paul Smith <psmith at gnu.org>
+Date: Mon, 20 Oct 2014 05:54:56 +0000
+Subject: * main.c (main): [SV 43434] Handle NULL returns from ttyname().
+
+---
+diff --git a/main.c b/main.c
+index b2d169c..0cdb8a8 100644
+--- a/main.c
++++ b/main.c
+@@ -1429,13 +1429,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 --git a/makeint.h b/makeint.h
+index 6223936..2009f41 100644
+--- a/makeint.h
++++ b/makeint.h
+@@ -436,10 +436,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
+ 
+ 

+--
+cgit v0.9.0.2
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/make.git/commitdiff/5baa2bf48b6505085ecbd467100f6679994eb5a7