[packages/make] - updated to 4.2.1 - removed obsolete getcwd,bug-43434 patches

[qboosh]

commit 8e65b10d811c997307d5db1db410bcf061ed59fe
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jun 18 08:57:47 2016 +0200

    - updated to 4.2.1
    - removed obsolete getcwd,bug-43434 patches

 make-bug-43434.patch | 53 ----------------------------------------------------
 make-getcwd.patch    | 15 ---------------
 make.spec            | 10 +++-------
 3 files changed, 3 insertions(+), 75 deletions(-)
---
diff --git a/make.spec b/make.spec
index cebf939..f005350 100644
--- a/make.spec
+++ b/make.spec
@@ -12,18 +12,16 @@ Summary(ru.UTF-8):	GNU Make
 Summary(tr.UTF-8):	GNU Make
 Summary(uk.UTF-8):	GNU Make
 Name:		make
-Version:	4.1
-Release:	2
+Version:	4.2.1
+Release:	1
 Epoch:		1
 License:	GPL v3+
 Group:		Development/Building
 Source0:	http://ftp.gnu.org/gnu/make/%{name}-%{version}.tar.bz2
-# Source0-md5:	57a7a224a822f94789a587ccbcedff69
+# Source0-md5:	15b012617e7c44c0ed482721629577ac
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # 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,8 +108,6 @@ Plik nagłówkowy interfejsu modułów GNU Make'a.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__gettextize}
diff --git a/make-bug-43434.patch b/make-bug-43434.patch
deleted file mode 100644
index f6be5c9..0000000
--- a/make-bug-43434.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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
diff --git a/make-getcwd.patch b/make-getcwd.patch
deleted file mode 100644
index 0ddc65a..0000000
--- a/make-getcwd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- make-4.0/makeint.h.orig	2013-10-09 05:22:40.000000000 +0100
-+++ make-4.0/makeint.h	2013-10-24 12:33:43.894410273 +0100
-@@ -527,11 +527,7 @@
- 
- #endif  /* Not GNU C library or POSIX.  */
- 
--#ifdef  HAVE_GETCWD
--# if !defined(VMS) && !defined(__DECC)
--char *getcwd ();
--# endif
--#else
-+#ifndef  HAVE_GETCWD
- char *getwd ();
- # define getcwd(buf, len)       getwd (buf)
- #endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/make.git/commitdiff/8e65b10d811c997307d5db1db410bcf061ed59fe