Tue May 31 06:53:13 2016 UTC ()
back out recent gmake 4.2 update due to mozilla products fallout
ok wiz@
(tnn)
diff -r1.96 -r1.97 pkgsrc/devel/gmake/Makefile
diff -r1.27 -r1.28 pkgsrc/devel/gmake/distinfo
diff -r0 -r1.3 pkgsrc/devel/gmake/patches/patch-main.c
diff -r0 -r1.3 pkgsrc/devel/gmake/patches/patch-makeint.h
--- pkgsrc/devel/gmake/Makefile 2016/05/27 08:13:22 1.96
+++ pkgsrc/devel/gmake/Makefile 2016/05/31 06:53:13 1.97
| @@ -1,17 +1,18 @@ | | | @@ -1,17 +1,18 @@ |
| 1 | # $NetBSD: Makefile,v 1.96 2016/05/27 08:13:22 khorben Exp $ | | 1 | # $NetBSD: Makefile,v 1.97 2016/05/31 06:53:13 tnn Exp $ |
| 2 | | | 2 | |
| 3 | DISTNAME= make-4.2 | | 3 | DISTNAME= make-4.1 |
| 4 | PKGNAME= g${DISTNAME} | | 4 | PKGNAME= g${DISTNAME} |
| | | 5 | PKGREVISION= 2 |
| 5 | CATEGORIES= devel | | 6 | CATEGORIES= devel |
| 6 | MASTER_SITES= ${MASTER_SITE_GNU:=make/} | | 7 | MASTER_SITES= ${MASTER_SITE_GNU:=make/} |
| 7 | EXTRACT_SUFX= .tar.bz2 | | 8 | EXTRACT_SUFX= .tar.bz2 |
| 8 | | | 9 | |
| 9 | MAINTAINER= pkgsrc-users@NetBSD.org | | 10 | MAINTAINER= pkgsrc-users@NetBSD.org |
| 10 | HOMEPAGE= http://www.gnu.org/software/make/make.html | | 11 | HOMEPAGE= http://www.gnu.org/software/make/make.html |
| 11 | COMMENT= GNU version of 'make' utility | | 12 | COMMENT= GNU version of 'make' utility |
| 12 | LICENSE= gnu-gpl-v3 | | 13 | LICENSE= gnu-gpl-v3 |
| 13 | | | 14 | |
| 14 | USE_FEATURES= snprintf | | 15 | USE_FEATURES= snprintf |
| 15 | | | 16 | |
| 16 | GNU_CONFIGURE= yes | | 17 | GNU_CONFIGURE= yes |
| 17 | TEXINFO_REQD+= 4.0 | | 18 | TEXINFO_REQD+= 4.0 |
--- pkgsrc/devel/gmake/distinfo 2016/05/23 16:50:58 1.27
+++ pkgsrc/devel/gmake/distinfo 2016/05/31 06:53:13 1.28
| @@ -1,8 +1,10 @@ | | | @@ -1,8 +1,10 @@ |
| 1 | $NetBSD: distinfo,v 1.27 2016/05/23 16:50:58 wiz Exp $ | | 1 | $NetBSD: distinfo,v 1.28 2016/05/31 06:53:13 tnn Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (make-4.2.tar.bz2) = d78b84a219b4c16593544f541dff7eb765ce3d74 | | 3 | SHA1 (make-4.1.tar.bz2) = 0d701882fd6fd61a9652cb8d866ad7fc7de54d58 |
| 4 | RMD160 (make-4.2.tar.bz2) = 606bc7508a2b7313d0dafb18a1992c4d12782dc7 | | 4 | RMD160 (make-4.1.tar.bz2) = 0f322d6c28867ea817f7d02c57e635c8ef556909 |
| 5 | SHA512 (make-4.2.tar.bz2) = 2e8668a130dadc9885a67d80032bf5554c6456741153f3224a4f0eb17ac268b22f062f9e4d66aedda4d1c926494c0b493fe5e941fb5d28ead6adbdf2f09d9128 | | 5 | SHA512 (make-4.1.tar.bz2) = 3fcaf06660b7a5019937b81ee69fe54cdfe0a24d66286fc5cc6a34fa996d76dfe6fd5bc49ee59b727ae2b24ddca261ada0fdb5873ba2b38dcc63647ad3cdb193 |
| 6 | Size (make-4.2.tar.bz2) = 1400539 bytes | | 6 | Size (make-4.1.tar.bz2) = 1327342 bytes |
| 7 | SHA1 (patch-af) = 8ff060ecba9d664044eabd98741253881d8c9bbe | | 7 | SHA1 (patch-af) = 8ff060ecba9d664044eabd98741253881d8c9bbe |
| | | 8 | SHA1 (patch-main.c) = 6674cc95ce702c06b8214963bcb43bde3919be4f |
| | | 9 | SHA1 (patch-makeint.h) = edfb71f3b41bf3bc4c66d948e3001b5502add6c3 |
| 8 | SHA1 (patch-pa) = 2c0168db7afec3da98b30392290e5b9464ea7b5e | | 10 | SHA1 (patch-pa) = 2c0168db7afec3da98b30392290e5b9464ea7b5e |
$NetBSD: patch-main.c,v 1.3 2016/05/31 06:53:13 tnn 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. */
$NetBSD: patch-makeint.h,v 1.3 2016/05/31 06:53:13 tnn 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