head 1.4; access; symbols pkgsrc-2017Q2:1.3.0.8 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.6 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.4 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.2 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.2.0.34 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.32 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.30 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.28 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.26 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.24 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.22 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.20 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.18 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.16 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.14 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.12 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.10 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.8 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.6 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.4 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.2 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.1.0.26 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.24 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.22 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.20 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.18 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.16 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.14 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.12 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.10 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.8 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.6 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.4 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.2 pkgsrc-2009Q1-base:1.1; locks; strict; comment @# @; 1.4 date 2017.09.08.09.42.34; author adam; state dead; branches; next 1.3; commitid JSiyGXefLr8snn6A; 1.3 date 2016.08.09.13.35.28; author mef; state Exp; branches; next 1.2; commitid wtB1d0YpA4M8mDhz; 1.2 date 2012.04.07.16.30.05; author schwarz; state Exp; branches; next 1.1; 1.1 date 2009.03.10.14.06.06; author apb; state Exp; branches; next ; desc @@ 1.4 log @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. @ text @$NetBSD: patch-ab,v 1.3 2016/08/09 13:35:28 mef 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 @@@@ -56,8 +56,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) { @ 1.3 log @Updated devel/diffutils to 3.4 ------------------------------ * Noteworthy changes in release 3.4 (2016-08-08) [stable] ** New features diff accepts two new options --color and --palette to generate and configure colored output. --color takes an optional argument specifying when to colorize a line: --color=always, --color=auto, --color=never. --palette is used to configure which colors are used. ** Bug fixes When binary files differ, diff now exits with status 1 as POSIX requires. Formerly it exited with status 2. Unless the --ignore-file-name-case option is used, diff now considers file names to be equal only if they are byte-for-byte equivalent. This fixes a bug where diff in an English locale might consider two Asian file names to be the same merely because they contain no English characters. diff -B no longer generates incorrect output if the two inputs each end with a one-byte incomplete line. diff --brief no longer reports a difference for unusual identical files. For example, when comparing a file like /proc/cmdline (for which the linux kernel reports st_size of 0 even though it is not an empty file) to a copy of that file's contents residing on a "normal" file system: $ f=/proc/cmdline; cp $f k; diff --brief $f k Files /proc/cmdline and k differ ** Performance changes diff's default algorithm has been adjusted to output higher-quality results at somewhat greater computational cost, as CPUs have gotten faster since the algorithm was last tweaked in diffutils-2.6 (1993). (pkgsrc changes) - Add comments on patches, picking from (old) cvs log @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2012/04/07 16:30:05 schwarz Exp $ @ 1.2 log @updated devel/diffutils to 3.2 @ text @d1 6 a6 1 $NetBSD$ @ 1.1 log @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.) Bump PKGREVISION to 4. @ text @d3 13 a15 14 --- src/context.c.orig 2002-02-28 06:22:42.000000000 +0200 +++ src/context.c @@@@ -61,9 +61,9 @@@@ print_context_label (char const *mark, int nsec = TIMESPEC_NS (inf->stat.st_mtim); if (! (tm && nstrftime (buf, sizeof buf, time_format, tm, 0, nsec))) { - long sec = inf->stat.st_mtime; + long long sec = inf->stat.st_mtime; /* should really be time_t */ verify (info_preserved, sizeof inf->stat.st_mtime <= sizeof sec); - sprintf (buf, "%ld.%.9d", sec, nsec); + sprintf (buf, "%lld.%.9d", sec, nsec); } fprintf (outfile, "%s %s\t%s\n", mark, inf->name, buf); } @