CVS commit: pkgsrc/devel/diffutils

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Sep  8 09:42:34 UTC 2017

Modified Files:
        pkgsrc/devel/diffutils: Makefile distinfo
Added Files:
        pkgsrc/devel/diffutils/patches: patch-src_Makefile.in
            patch-src_context.c
Removed Files:
        pkgsrc/devel/diffutils/patches: patch-aa patch-ab

Log Message:
release 3.6:

** New features

  When one file is a prefix of the other, cmp now appends the shorter
  file's size to the EOF diagnostic.

** Bug fixes

  Using an invalid regular expression with --ignore-matching-lines=RE (-I)
  no longer causes stack overflow.  Before, with an invocation like the
  following, diff would diagnose the error, but would still proceed to
  blow the stack: diff -Ia -I\\ <(echo) <(echo b)
  [bug introduced in 2.9]

  diff no longer mishandles line numbers exceeding 2**31 on Mingw-w64.

  the ---presume-output-tty (ostensibly test-only) option would cause
  diff --color to read an uninitialized variable
  [bug introduced in 3.4]

** Performance changes

  diff's default algorithm has been tweaked to deal better with larger
  files, reversing some of the changes made in diffutils-3.4.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/devel/diffutils/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/diffutils/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/devel/diffutils/patches/patch-aa \
    pkgsrc/devel/diffutils/patches/patch-ab
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/diffutils/patches/patch-src_Makefile.in \
    pkgsrc/devel/diffutils/patches/patch-src_context.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/diffutils/Makefile
diff -u pkgsrc/devel/diffutils/Makefile:1.37 pkgsrc/devel/diffutils/Makefile:1.38
--- pkgsrc/devel/diffutils/Makefile:1.37        Wed Jan  4 14:04:30 2017
+++ pkgsrc/devel/diffutils/Makefile     Fri Sep  8 09:42:34 2017
@@ -1,25 +1,22 @@
-# $NetBSD: Makefile,v 1.37 2017/01/04 14:04:30 mef Exp $
-#
+# $NetBSD: Makefile,v 1.38 2017/09/08 09:42:34 adam Exp $
 
-DISTNAME=              diffutils-3.5
-CATEGORIES=            devel
-MASTER_SITES=          ${MASTER_SITE_GNU:=diffutils/}
-EXTRACT_SUFX=          .tar.xz
-
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://www.gnu.org/software/diffutils/diffutils.html
-COMMENT=               GNU diff utilities - find the differences between files
-LICENSE=               gnu-gpl-v2
-
-GNU_CONFIGURE=         YES
-INFO_FILES=            YES # PLIST
+DISTNAME=      diffutils-3.6
+CATEGORIES=    devel
+MASTER_SITES=  ${MASTER_SITE_GNU:=diffutils/}
+EXTRACT_SUFX=  .tar.xz
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://www.gnu.org/software/diffutils/diffutils.html
+COMMENT=       GNU diff utilities - find the differences between files
+LICENSE=       gnu-gpl-v2
 
+AUTO_MKDIRS=           yes
+INFO_FILES=            yes
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --program-prefix=g
 CONFIGURE_ENV+=                gt_cv_func_gnugettext1_libintl=yes
 CONFIGURE_ENV.SunOS+=  ac_cv_sys_xsi_stack_overflow_heuristic=no
 
-AUTO_MKDIRS=           yes
-
 SUBST_CLASSES+=                diff
 SUBST_STAGE.diff=      pre-configure
 SUBST_FILES.diff=      src/Makefile.in

Index: pkgsrc/devel/diffutils/distinfo
diff -u pkgsrc/devel/diffutils/distinfo:1.14 pkgsrc/devel/diffutils/distinfo:1.15
--- pkgsrc/devel/diffutils/distinfo:1.14        Wed Jan  4 14:04:30 2017
+++ pkgsrc/devel/diffutils/distinfo     Fri Sep  8 09:42:34 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2017/01/04 14:04:30 mef Exp $
+$NetBSD: distinfo,v 1.15 2017/09/08 09:42:34 adam Exp $
 
-SHA1 (diffutils-3.5.tar.xz) = 1169cce8eaaf7290dc087d65db7ed75de0dceb93
-RMD160 (diffutils-3.5.tar.xz) = 879119efa7579737e82edf392889ad9459299bcf
-SHA512 (diffutils-3.5.tar.xz) = 758229637e3703215adf66c5df04126ae594424abaf2cad8f1fa482bd9759e90838c943ef56e0129beb1396f5932ed9337c8396679da3de32e49bb43d423fd6b
-Size (diffutils-3.5.tar.xz) = 1360996 bytes
-SHA1 (patch-aa) = 8eb95b462bc59130fca771d9273c6ae0c784520e
-SHA1 (patch-ab) = 9a332a371114d79587286fec9d42d96ecea699b1
+SHA1 (diffutils-3.6.tar.xz) = 1287a553868b808ebfff3790a5cdc6fdf7cb2886
+RMD160 (diffutils-3.6.tar.xz) = 28159a202787e8f4e132de81c269b7a816da34c0
+SHA512 (diffutils-3.6.tar.xz) = 3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1
+Size (diffutils-3.6.tar.xz) = 1398296 bytes
 SHA1 (patch-po_Makefile.in.in) = 64ffbae9c85a026e89ad18320ba766db9c4e2bbd
+SHA1 (patch-src_Makefile.in) = ff0b47a8356a3feb585f0c650b1cd79cb4a6f090
+SHA1 (patch-src_context.c) = 26e3baebecfc188853acbef3321a45d4f760246e

Added files:

Index: pkgsrc/devel/diffutils/patches/patch-src_Makefile.in
diff -u /dev/null pkgsrc/devel/diffutils/patches/patch-src_Makefile.in:1.1
--- /dev/null   Fri Sep  8 09:42:34 2017
+++ pkgsrc/devel/diffutils/patches/patch-src_Makefile.in        Fri Sep  8 09:42:34 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2017/09/08 09:42:34 adam Exp $
+
+Let to exactly point to own diff program.
+Fixes PR 39941.
+
+--- src/Makefile.in.orig       2017-05-21 20:24:50.000000000 +0000
++++ src/Makefile.in
+@@ -1302,7 +1302,7 @@ noinst_HEADERS = \
+   system.h
+ 
+ MOSTLYCLEANFILES = paths.h paths.ht
+-gdiff = `echo diff|sed '$(transform)'`
++gdiff = "%DEFAULT_DIFF_PROGRAM%"
+ BUILT_SOURCES = paths.h version.c version.h
+ noinst_LIBRARIES = libver.a
+ nodist_libver_a_SOURCES = version.c version.h
Index: pkgsrc/devel/diffutils/patches/patch-src_context.c
diff -u /dev/null pkgsrc/devel/diffutils/patches/patch-src_context.c:1.1
--- /dev/null   Fri Sep  8 09:42:34 2017
+++ pkgsrc/devel/diffutils/patches/patch-src_context.c  Fri Sep  8 09:42:34 2017
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_context.c,v 1.1 2017/09/08 09:42:34 adam Exp $
+
+date: 2009-03-10 23:06:06 +0900;  author: apb;  state: Exp;
+Fix a build failure on platforms where time_t is larger than long, by
+using long long instead.  (Not using time_t, because there's no easy and
+portable printf format for time_t.)
+
+--- src/context.c.orig 2012-04-07 01:25:21.000000000 +0200
++++ src/context.c      2012-04-07 01:27:52.000000000 +0200
+@@ -57,8 +57,8 @@
+         if (LONG_MIN <= TYPE_MINIMUM (time_t)
+             && TYPE_MAXIMUM (time_t) <= LONG_MAX)
+           {
+-            long int sec = inf->stat.st_mtime;
+-            sprintf (buf, "%ld.%.9d", sec, nsec);
++            long long int sec = inf->stat.st_mtime; /* should really be time_t */
++            sprintf (buf, "%lld.%.9d", sec, nsec);
+           }
+         else if (TYPE_MAXIMUM (time_t) <= INTMAX_MAX)
+           {