Skip to content

Commit 9e70e1c

Browse files
committed
Add Distribution
1 parent 1633d59 commit 9e70e1c

File tree

812 files changed

+69981
-10147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

812 files changed

+69981
-10147
lines changed

ChangeLog

Lines changed: 224 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,229 @@
1+
2015-06-22 Greg Nietsky <gregory@distrotech.co.za>
2+
3+
Merge git://git.savannah.gnu.org/diffutils into distrotech-diffutils
4+
5+
2015-01-02 Jim Meyering <meyering@fb.com>
6+
7+
maint: update copyright year ranges to include 2015; update gnulib
8+
9+
2014-12-13 KO Myung-Hun <komh@chollian.net>
10+
11+
diff: skip test if seek is not possible on OS/2 kLIBC
12+
This fixes the problem that 'diff - file' and 'cat file | diff - file'
13+
fail due to a seek failure with a message 'diff.exe: -: Invalid seek',
14+
because seek does not work on stdin and a pipe on OS/2 kLIBC.
15+
16+
* src/io.c (sip): Set skip_test to true if seek is not possible on
17+
OS/2 kLIBC.
18+
19+
2014-12-09 Jim Meyering <meyering@fb.com>
20+
21+
gnulib: update to latest
22+
23+
2014-12-09 KO Myung-Hun <komh78@gmail.com>
24+
25+
build: double-quote use of $PATH
26+
* man/Makefile.am (dist_man1_MANS): On OS/2, PATH_SEPARATOR is ';',
27+
but unquoted, that is interpreted as the shell's statement
28+
terminator. Quote it.
29+
30+
2014-10-28 Paul Eggert <eggert@cs.ucla.edu>
31+
32+
diff: fix integer overflow problem with --tabsize
33+
Reported by Tobias Stoeckmann in: http://bugs.gnu.org/18857
34+
* src/diff.c (main): Don't overflow if INTMAX_MAX / 2 < tabsize.
35+
* tests/bignum: New file, to test for this bug.
36+
* tests/Makefile.am (TESTS): Add it.
37+
38+
2014-09-04 Paul Eggert <eggert@cs.ucla.edu>
39+
40+
doc: mention diff -B fix in NEWS
41+
42+
diff: fix bug with diff -B and incomplete lines
43+
Reported by Navin Kabra via Eric Blake in:
44+
http://bugs.gnu.org/18402
45+
* src/util.c (analyze_hunk): Don't mishandle incomplete
46+
lines at end of file.
47+
* tests/no-newline-at-eof: Test for the bug.
48+
49+
diff: fix performance bug with prefix computation
50+
* src/io.c (find_identical_ends): Fix performance bug:
51+
the test for when the prefix was needed messed up by
52+
the 2002-02-28 integer-overflow fixes, causing performance to be
53+
worse than it needed to be.
54+
55+
2014-08-23 Jim Meyering <meyering@fb.com>
56+
57+
gnulib: update to latest, as well as bootstrap
58+
59+
maint: update copyright year range in texinfo documentation
60+
* doc/diffutils.texi: Update copyright.
61+
62+
2014-04-15 Jim Meyering <meyering@fb.com>
63+
64+
maint: update bug-reporting address
65+
* README: Change bug-gnu-utils@... to bug-diffutils@gnu.org.
66+
* doc/diffutils.texi: Likewise.
67+
Reported by Jamie Landeg Jones.
68+
69+
2014-03-26 Paul Eggert <eggert@penguin.cs.ucla.edu>
70+
71+
diff: fix two "..." typos in --help output
72+
* src/diff.c (option_help_msgid): Remove two "..." typos (Bug#17102).
73+
74+
2014-03-26 Paul Eggert <eggert@cs.ucla.edu>
75+
76+
doc: improve documentation about reading and stdin
77+
See Bug#17075.
78+
* doc/diffutils.texi (Comparison): Say that files need not be read.
79+
(Invoking diff): Remove confusing remark about 'diff - -'.
80+
It's not that useful, and it's not portable anyway.
81+
82+
2014-02-25 Paul Eggert <eggert@cs.ucla.edu>
83+
84+
diff, sdiff: minor integer overflow fixes
85+
* src/context.c (find_hunk):
86+
Simplify, now that 2 * context + 1 cannot overflow.
87+
* src/diff.c (main):
88+
* src/sdiff.c (interact):
89+
Don't rely on undefined behavior on signed integer overflow.
90+
* src/diff.c (main): Don't let contexts exceed CONTEXT_MAX.
91+
* src/system.h (CONTEXT_MAX): New macro.
92+
93+
diff: fix bug with -I and overlapping hunks
94+
Problem reported by Vincent Lefevre in <http://bugs.gnu.org/16864>.
95+
* src/context.c (find_hunk): Threshold is CONTEXT only if
96+
the second change is ignorable.
97+
* tests/ignore-matching-lines: New test.
98+
* tests/Makefile.am (TESTS): Add it.
99+
100+
2014-02-24 Paul Eggert <eggert@cs.ucla.edu>
101+
102+
diff: remove TOO_EXPENSIVE heuristic
103+
Problem reported by Vincent Lefevre in <http://bugs.gnu.org/16848>.
104+
The simplest solution is to remove the TOO_EXPENSIVE heuristic
105+
that I added to GNU diff in 1993. Although appropriate for
106+
circa-1993 hardware, these days the heuristic seems to be more
107+
trouble than it's worth.
108+
* NEWS: Document this.
109+
* doc/diffutils.texi (Overview): Modernize citations.
110+
Remove mention of TOO_EXPENSIVE heuristic.
111+
* src/analyze.c (diff_2_files): Adjust to TOO_EXPENSIVE-related
112+
API changes in gnulib's diffseq module.
113+
114+
build: update gnulib submodule to latest
115+
116+
2014-02-01 Paul Eggert <eggert@cs.ucla.edu>
117+
118+
diff: exit with status 1, not 2, when binary files differ
119+
Problem reported by Vincent Lefevre in <http://bugs.gnu.org/16608>.
120+
* NEWS:
121+
* doc/diffutils.texi (Binary, Invoking diff): Document this.
122+
* src/analyze.c (briefly_report): Return void, not int.
123+
All uses changed. Do not futz with exit status. Simplify.
124+
* tests/binary: Adjust to match new behavior.
125+
126+
2013-09-26 Paul Eggert <eggert@cs.ucla.edu>
127+
128+
build: omit -Wsuggest-attribute=pure for lib
129+
* configure.ac (WARN_CFLAGS): Omit -Wsuggest-attribute=pure
130+
when compiling the lib subdirectory. Reported for Fedora 19
131+
by Eric Blake in <http://bugs.gnu.org/15463>.
132+
133+
2013-08-23 Paul Eggert <eggert@cs.ucla.edu>
134+
135+
cmp, diff, sdiff: tune by using rawmemchr
136+
On my platform (AMD Phenom II X4 910e, Fedora 17 x86-64), this sped up
137+
'cmp -n 8GiB /dev/full /dev/zero' by a factor of 3.8, and
138+
'cmp -sn 8GiB /dev/full /dev/zero' by a factor of 1.8.
139+
* bootstrap.conf (gnulib_modules): Add rawmemchr.
140+
* src/cmp.c (cmp): Optimize the common case where buffers are the same,
141+
by using count_newlines rather than block_compare_and_count.
142+
(block_compare_and_count): Remove.
143+
(count_newlines): New function.
144+
* src/cmp.c (count_newlines):
145+
* src/io.c (prepare_text):
146+
* src/sdiff.c (lf_copy, lf_skip, lf_snarf):
147+
Use rawmemchr instead of memchr, for speed.
148+
149+
2013-08-13 Paul Eggert <eggert@cs.ucla.edu>
150+
151+
cmp: tune 'cmp a b' for GCC x86
152+
Performance problem reported by David Balažic in:
153+
http://lists.gnu.org/archive/html/bug-diffutils/2013-08/msg00013.html
154+
* src/system.h (word): Make it size_t, not uintmax_t.
155+
This sped up plain cmp 90% on my tests (GCC 4.8.1, x86).
156+
157+
2013-07-07 Paul Eggert <eggert@cs.ucla.edu>
158+
159+
build: update gnulib submodule to latest
160+
161+
2013-06-11 Greg Nietsky <gregory@distrotech.co.za>
162+
163+
Distrotech diffutils 3.3
164+
165+
2013-05-06 Stefano Lattarini <stefano.lattarini@gmail.com>
166+
167+
build: enable 'subdir-objects' automake option
168+
The future major Automake version (2.0, ETA at least one year from now)
169+
might enable that option unconditionally, so better get prepared in due
170+
time.
171+
172+
* configure.ac (AM_INIT_AUTOMAKE): Adjust.
173+
(AM_PROG_CC_C_O): New, required by Automake up to 1.13.x when the
174+
'subdir-objects' is in use.
175+
176+
2013-04-29 Paul Eggert <eggert@cs.ucla.edu>
177+
178+
build: update gnulib submodule to latest
179+
180+
2013-04-03 Paul Eggert <eggert@cs.ucla.edu>
181+
182+
diff: fix bug with Asian file names
183+
Problem reported by Errembault Philippe in:
184+
http://lists.gnu.org/archive/html/bug-diffutils/2013-03/msg00012.html
185+
* NEWS: Document this.
186+
* src/dir.c (compare_names): Fall back on file_name_cmp if
187+
compare_collated returns 0, unless ignoring file name case.
188+
(diff_dirs): Don't bother with the O(N**2) stuff unless ignoring
189+
file name case.
190+
* tests/Makefile.am (TESTS): Add strcoll-0-names.
191+
* tests/strcoll-0-names: New file.
192+
193+
diff: remove unnecessary decl
194+
* src/dir.c (compare_names_for_qsort): Remove declaration.
195+
Not needed now that we assume C89.
196+
197+
diff: tune compare_names_for_qsort
198+
* src/dir.c (compare_collated): New function.
199+
(compare_names): Use it.
200+
(compare_names_for_qsort): Use it. This is a bit more efficient
201+
as it can avoid a double invocation of file_name_cmp when
202+
file_name_cmp returns zero.
203+
204+
2013-03-30 Jim Meyering <meyering@fb.com>
205+
206+
doc: mention new option, --no-dereference in 3.3's NEWS
207+
* NEWS (New feeatures): Update 3.3's news to mention --no-dereference.
208+
Reported by Denis Excoffier.
209+
* Makefile.am (old_NEWS_hash): Update, since this modifies old, and
210+
normally-immutable NEWS.
211+
212+
2013-03-26 Paul Eggert <eggert@cs.ucla.edu>
213+
214+
tests: port to Solaris 10 /bin/sh
215+
* tests/Makefile.am (TESTS_ENVIRONMENT):
216+
Use "FOO=val; export FOO" rather than "export FOO=val",
217+
as the latter form doesn't work with Solaris /bin/sh.
218+
Problem found when trying to run "make check" on Solaris 10.
219+
1220
2013-03-24 Jim Meyering <meyering@fb.com>
2221

222+
maint: post-release administrivia
223+
* NEWS: Add header line for next release.
224+
* .prev-version: Record previous version.
225+
* cfg.mk (old_NEWS_hash): Auto-update.
226+
3227
version 3.3
4228
* NEWS: Record release date.
5229

GNUmakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# It is necessary if you want to build targets usually of interest
66
# only to the maintainer.
77

8-
# Copyright (C) 2001, 2003, 2006-2013 Free Software Foundation, Inc.
8+
# Copyright (C) 2001, 2003, 2006-2015 Free Software Foundation, Inc.
99

1010
# This program is free software: you can redistribute it and/or modify
1111
# it under the terms of the GNU General Public License as published by

INSTALL

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Installation Instructions
22
*************************
33

4-
Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
4+
Copyright (C) 1994-1996, 1999-2002, 2004-2014 Free Software Foundation,
55
Inc.
66

77
Copying and distribution of this file, with or without modification,
@@ -12,8 +12,8 @@ without warranty of any kind.
1212
Basic Installation
1313
==================
1414

15-
Briefly, the shell commands `./configure; make; make install' should
16-
configure, build, and install this package. The following
15+
Briefly, the shell command `./configure && make && make install'
16+
should configure, build, and install this package. The following
1717
more-detailed instructions are generic; see the `README' file for
1818
instructions specific to this package. Some packages provide this
1919
`INSTALL' file but do not implement all of the features documented

0 commit comments

Comments
 (0)