CVS commit: pkgsrc/devel/scmcvs

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Aug 18 21:41:19 UTC 2017

Modified Files:
        pkgsrc/devel/scmcvs: distinfo
        pkgsrc/devel/scmcvs/patches: patch-lib_vasnprintf.c

Log Message:
Fix crash on macOS 10.13 (Darwin 7).


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/scmcvs/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/scmcvs/patches/patch-lib_vasnprintf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/scmcvs/distinfo
diff -u pkgsrc/devel/scmcvs/distinfo:1.17 pkgsrc/devel/scmcvs/distinfo:1.18
--- pkgsrc/devel/scmcvs/distinfo:1.17   Fri May 12 05:13:43 2017
+++ pkgsrc/devel/scmcvs/distinfo        Fri Aug 18 21:41:19 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2017/05/12 05:13:43 maya Exp $
+$NetBSD: distinfo,v 1.18 2017/08/18 21:41:19 adam Exp $
 
 SHA1 (cvs-1.12.13.tar.bz2) = 93a8dacc6ff0e723a130835713235863f1f5ada9
 RMD160 (cvs-1.12.13.tar.bz2) = ba3048e3e2d99ae78f6a759889b615acf65dd487
@@ -27,7 +27,7 @@ SHA1 (patch-az) = 9dfd460ae6617f1492e0e6
 SHA1 (patch-ba) = 7153e12e5da86effd4285e147f9f534011982e07
 SHA1 (patch-bb) = 09a607426b672f44c1882b82812e6ca81efdcf8e
 SHA1 (patch-lib_mktime.c) = 526a0e24c6399d527ae6a463ea91e993f9f7e920
-SHA1 (patch-lib_vasnprintf.c) = 6b078c16de6256e33fb86340fe39d663af1b0888
+SHA1 (patch-lib_vasnprintf.c) = fbba4d923d3c61ebcf79e82779919dc1f8a570c0
 SHA1 (patch-m4_fpending.m4) = 6b7c96d8f092e179d2cfdf036bcbfd3855292e0f
 SHA1 (patch-src_error.c) = 60aba581be95aebbb6fb16c888fd384d855fe56e
 SHA1 (patch-src_ignore.c) = 90ac25311c83bb5713b83b9cfb6b2c03790ee787

Index: pkgsrc/devel/scmcvs/patches/patch-lib_vasnprintf.c
diff -u pkgsrc/devel/scmcvs/patches/patch-lib_vasnprintf.c:1.1 pkgsrc/devel/scmcvs/patches/patch-lib_vasnprintf.c:1.2
--- pkgsrc/devel/scmcvs/patches/patch-lib_vasnprintf.c:1.1      Sun Apr 12 07:43:42 2015
+++ pkgsrc/devel/scmcvs/patches/patch-lib_vasnprintf.c  Fri Aug 18 21:41:19 2017
@@ -1,16 +1,19 @@
-$NetBSD: patch-lib_vasnprintf.c,v 1.1 2015/04/12 07:43:42 dsainty Exp $
+$NetBSD: patch-lib_vasnprintf.c,v 1.2 2017/08/18 21:41:19 adam Exp $
 
 Avoid CVS crashing on systems using _FORTIFY_SOURCE by default.
-
 http://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/vasnprintf.c?id=913c09becd9df89dbd9b9f386e7f35c240d5efe8
 
---- lib/vasnprintf.c.orig      2005-05-24 05:44:33.000000000 +1200
-+++ lib/vasnprintf.c   2015-04-12 18:56:46.352971555 +1200
-@@ -558,9 +558,21 @@
+Fix crash on macOS 10.13 (Darwin 7).
+http://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/vasnprintf.c?id=7df04f9b8a0adb1575ca0555775ec10860143cbf
+
+--- lib/vasnprintf.c.orig      2005-05-23 17:44:33.000000000 +0000
++++ lib/vasnprintf.c
+@@ -558,9 +558,29 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *l
                  }
                *p = dp->conversion;
  #if USE_SNPRINTF
-+# if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))
++# if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3) \
++      || (defined __APPLE__ && defined __MACH__))
                p[1] = '%';
                p[2] = 'n';
                p[3] = '\0';
@@ -23,6 +26,13 @@ http://git.savannah.gnu.org/cgit/gnulib.
 +                 in format strings in writable memory may crash the program
 +                 (if compiled with _FORTIFY_SOURCE=2), so we should avoid it
 +                 in this situation.  */
++              /* On Mac OS X 10.3 or newer, we know that snprintf's return
++                 value conforms to ISO C 99: the tests gl_SNPRINTF_RETVAL_C99
++                 and gl_SNPRINTF_TRUNCATION_C99 pass.
++                 Therefore we can avoid using %n in this situation.
++                 On Mac OS X 10.13 or newer, the use of %n in format strings
++                 in writable memory by default crashes the program, so we
++                 should avoid it in this situation.  */
 +              p[1] = '\0';
 +# endif
  #else