Hello community,
here is the log from the commit of package diffstat for openSUSE:Factory
checked in at Fri Dec 4 11:34:33 CET 2009.
--------
--- diffstat/diffstat.changes 2009-08-13 16:46:15.000000000 +0200
+++ /mounts/work_src_done/STABLE/diffstat/diffstat.changes 2009-11-24 18:03:34.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Nov 24 18:07:09 CET 2009 - pgajdos@suse.cz
+
+- updated to 1.51 (see CHANGES)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
diffstat-1.48.diff
diffstat-1.48.tar.bz2
New:
----
diffstat-1.51.diff
diffstat-1.51.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ diffstat.spec ++++++
--- /var/tmp/diff_new_pack.pahHy8/_old 2009-12-04 11:32:47.000000000 +0100
+++ /var/tmp/diff_new_pack.pahHy8/_new 2009-12-04 11:32:47.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package diffstat (Version 1.48)
+# spec file for package diffstat (Version 1.51)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,7 +19,7 @@
Name: diffstat
-Version: 1.48
+Version: 1.51
Release: 1
AutoReqProv: on
Group: Productivity/Text/Utilities
++++++ diffstat-1.48.diff -> diffstat-1.51.diff ++++++
--- diffstat/diffstat-1.48.diff 2009-08-13 16:46:14.000000000 +0200
+++ /mounts/work_src_done/STABLE/diffstat/diffstat-1.51.diff 2009-11-24 18:03:23.000000000 +0100
@@ -1,4 +1,6 @@
---- config_h.in
+Index: config_h.in
+===================================================================
+--- config_h.in.orig
+++ config_h.in
@@ -5,4 +5,10 @@
* config.h -- Kevin Buettner.
@@ -12,9 +14,11 @@
+#define HAVE_STRING_H 0
+#define HAVE_UNISTD_H 0
+#define STDC_HEADERS 0
---- diffstat.c
+Index: diffstat.c
+===================================================================
+--- diffstat.c.orig
+++ diffstat.c
-@@ -217,6 +217,10 @@
+@@ -228,6 +228,10 @@ extern int optind;
#define BZIP2_PATH ""
#endif
@@ -25,9 +29,11 @@
#ifndef COMPRESS_PATH
#define COMPRESS_PATH ""
#endif
---- makefile.in
+Index: makefile.in
+===================================================================
+--- makefile.in.orig
+++ makefile.in
-@@ -8,6 +8,7 @@
+@@ -8,6 +8,7 @@ THIS = diffstat
srcdir = @srcdir@
VPATH = @srcdir@
@@ -35,7 +41,7 @@
CC = @CC@
LINK = $(CC)
INSTALL = @INSTALL@
-@@ -15,7 +16,7 @@
+@@ -15,7 +16,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@
@@ -44,7 +50,7 @@
LIBS = @LIBS@
LDFLAGS = @LDFLAGS@
-@@ -27,8 +28,8 @@
+@@ -27,8 +28,8 @@ DESTDIR = @DESTDIR@
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -55,7 +61,7 @@
#### End of system configuration section. ####
-@@ -68,11 +69,11 @@
+@@ -68,11 +69,11 @@ $(PROG) : diffstat$o
@ECHO_LD@$(LINK) $(LDFLAGS) -o $@ diffstat$o $(LIBS)
install : all installdirs
++++++ diffstat-1.48.tar.bz2 -> diffstat-1.51.tar.bz2 ++++++
++++ 2709 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/CHANGES new/diffstat-1.51/CHANGES
--- old/diffstat-1.48/CHANGES 2009-08-11 23:45:55.000000000 +0200
+++ new/diffstat-1.51/CHANGES 2009-11-08 02:58:29.000000000 +0100
@@ -1,3 +1,35 @@
+07-Nov-2009
+ diffstat 1.51
+
+ correct suffix-check for ".xz" files as command-line parameters rather
+ than as piped input (report by Moritz Barsnick).
+
+06-Oct-2009
+ diffstat 1.50
+
+ build/test fixes for MSYS (MinGW)
+
+ improve configure check for get_unlocked function.
+
+ use $TMPDIR for path of temporary file used in decompression.
+
+ correct else-condition for detecting compression type (patch by Zach
+ Hirsch).
+
+31-Aug-2009
+ diffstat 1.49
+
+ improve lzma support, add support for xz (patch by Eric Blake).
+
+ add special case for no-newline message from some diff's (Ubuntu
+ #269895).
+
+ improve configure check for getopt header.
+
+ add configure special case for HPUX 11 with _XOPEN_SOURCE definition.
+
+ update config.guess, config.sub
+
11-Aug-2009
diffstat 1.48
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/configure.in new/diffstat-1.51/configure.in
--- old/diffstat-1.48/configure.in 2009-08-12 01:17:15.000000000 +0200
+++ new/diffstat-1.51/configure.in 2009-10-07 01:25:48.000000000 +0200
@@ -1,7 +1,7 @@
dnl Process this file with 'autoconf' to produce a 'configure' script
-dnl $Id: configure.in,v 1.17 2009/08/11 23:17:15 tom Exp $
+dnl $Id: configure.in,v 1.20 2009/10/06 23:25:48 tom Exp $
AC_PREREQ(2.13.20020210)
-AC_REVISION($Revision: 1.17 $)
+AC_REVISION($Revision: 1.20 $)
AC_INIT(diffstat.c)
AC_CONFIG_HEADER(config.h:config_h.in)
@@ -28,23 +28,23 @@
AC_CONST
AC_STDC_HEADERS
-AC_HAVE_HEADERS(stdlib.h unistd.h)
AC_HAVE_HEADERS(\
-getopt.h \
malloc.h \
search.h \
string.h \
)
+CF_GETOPT_HEADER
AC_TYPE_SIZE_T
AC_CHECK_FUNCS(\
-getc_unlocked \
mkdtemp \
popen \
tsearch \
)
+CF_STDIO_UNLOCKED(getc_unlocked)
+
CF_DISABLE_LEAKS
### output makefile and config.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/diffstat.c new/diffstat-1.51/diffstat.c
--- old/diffstat-1.48/diffstat.c 2009-08-12 00:24:09.000000000 +0200
+++ new/diffstat-1.51/diffstat.c 2009-11-08 02:59:15.000000000 +0100
@@ -20,7 +20,7 @@
******************************************************************************/
#ifndef NO_IDENT
-static const char *Id = "$Id: diffstat.c,v 1.48 2009/08/11 22:24:09 tom Exp $";
+static const char *Id = "$Id: diffstat.c,v 1.51 2009/11/08 01:59:15 tom Exp $";
#endif
/*
@@ -28,6 +28,17 @@
* Author: T.E.Dickey
* Created: 02 Feb 1992
* Modified:
+ * 07 Nov 2009, correct suffix-check for ".xz" files as
+ * command-line parameters rather than as piped
+ * input (report by Moritz Barsnick).
+ * 06 Oct 2009, fixes to build/run with MSYS or MinGW. use
+ * $TMPDIR for path of temporary file used in
+ * decompression. correct else-condition for
+ * detecting compression type (patch by Zach Hirsch).
+ * 31 Aug 2009, improve lzma support, add support for xz (patch by
+ * Eric Blake). Add special case for no-newline
+ * message from some diff's (Ubuntu #269895).
+ * Improve configure check for getopt().
* 11 Aug 2009, Add logic to check standard input, decompress if
* possible. Add -N option, to truncate long names.
* Add pack/pcat as a compression type.
@@ -147,7 +158,7 @@
#include
#endif
-#ifdef WIN32
+#if defined(WIN32) && !defined(HAVE_CONFIG_H)
#define HAVE_STDLIB_H
#define HAVE_STRING_H
#define HAVE_MALLOC_H
@@ -195,8 +206,8 @@
#ifdef HAVE_GETOPT_H
#include
-#else
-extern int getopt();
+#elif !defined(HAVE_GETOPT_HEADER)
+extern int getopt(int, char *const *, const char *);
extern char *optarg;
extern int optind;
#endif
@@ -237,9 +248,19 @@
#define UNCOMPRESS_PATH ""
#endif
+#ifndef ZCAT_PATH
+#define ZCAT_PATH ""
+#endif
+
/******************************************************************************/
-#ifdef WIN32
+#if defined(__MINGW32__) || defined(WIN32)
+#define MKDIR(name,mode) mkdir(name)
+#else
+#define MKDIR(name,mode) mkdir(name,mode)
+#endif
+
+#if defined(WIN32) && !defined(__MINGW32__)
#define PATHSEP '\\'
#else
#define PATHSEP '/'
@@ -372,7 +393,7 @@
{
struct stat sb;
return (stat(name, &sb) == 0 &&
- S_ISDIR(sb.st_mode));
+ (sb.st_mode & S_IFMT) == S_IFDIR);
}
static void
@@ -726,17 +747,17 @@
for (n = 1; n <= len1 && n <= len2; n++) {
if (data->name[len1 - n] != path[len2 - n]) {
- diff = n;
+ diff = (int) n;
break;
}
if (path[len2 - n] == PATHSEP)
- matched = n;
+ matched = (int) n;
}
if (prefix_opt < 0
&& matched != 0
&& diff)
- path += len2 - matched + 1;
+ path += ((int) len2 - matched + 1);
if (!local)
*freed = delink(data);
@@ -798,7 +819,7 @@
static void
dequote(char *s)
{
- int len = strlen(s);
+ size_t len = strlen(s);
int n;
if (*s == SQUOTE && len > 2 && s[len - 1] == SQUOTE) {
@@ -1113,6 +1134,11 @@
if (new_unify)
--new_unify;
break;
+ case '\\':
+ if (strstr(buffer, "newline") != 0) {
+ break;
+ }
+ /* FALLTHRU */
default:
TRACE(("?? expected more in chunk\n"));
old_unify = new_unify = 0;
@@ -1661,7 +1687,7 @@
plot_scale = 0;
for (p = all_data; p; p = p->link) {
- int len = strlen(p->name);
+ int len = (int) strlen(p->name);
if (ignore_data(p))
continue;
@@ -1829,7 +1855,7 @@
break;
case dcLzma:
verb = GET_PROGRAM(LZCAT_PATH);
- opts = "-S ''";
+ opts = "-dc";
break;
case dcPack:
verb = GET_PROGRAM(PCAT_PATH);
@@ -1865,6 +1891,8 @@
which = dcBzip;
} else if (len > 5 && !strcmp(name + len - 5, ".lzma")) {
which = dcLzma;
+ } else if (len > 3 && !strcmp(name + len - 3, ".xz")) {
+ which = dcLzma;
} else {
which = dcNone;
}
@@ -1883,7 +1911,7 @@
{
char *result = mktemp(path);
if (result != 0) {
- if (mkdir(result, 0700) < 0) {
+ if (MKDIR(result, 0700) < 0) {
result = 0;
}
}
@@ -1893,16 +1921,22 @@
#endif
static char *
-copy_stdin(char *dirpath)
+copy_stdin(char **dirpath)
{
+ char *tmp = getenv("TMPDIR");
char *result = 0;
int ch;
FILE *fp;
- strcpy(dirpath, "/tmp/diffXXXXXX");
- if (MY_MKDTEMP(dirpath) != 0) {
- result = xmalloc(strlen(dirpath) + 10);
- sprintf(result, "%s/stdin", dirpath);
+ if (tmp == 0)
+ tmp = "/tmp/";
+ *dirpath = xmalloc(strlen(tmp) + 12);
+
+ strcpy(*dirpath, tmp);
+ strcat(*dirpath, "/diffXXXXXX");
+ if (MY_MKDTEMP(*dirpath) != 0) {
+ result = xmalloc(strlen(*dirpath) + 10);
+ sprintf(result, "%s/stdin", *dirpath);
if ((fp = fopen(result, "w")) != 0) {
while ((ch = MY_GETC(stdin)) != EOF) {
@@ -2133,7 +2167,7 @@
#ifdef HAVE_POPEN
FILE *fp;
Decompress which = dcEmpty;
- char stdin_dir[256];
+ char *stdin_dir = 0;
char *myfile;
char sniff[8];
int ch;
@@ -2143,11 +2177,11 @@
if ((ch = MY_GETC(stdin)) != EOF) {
which = dcNone;
if (ch == 'B') { /* perhaps bzip2 (poor magic design...) */
- sniff[got++] = ch;
+ sniff[got++] = (char) ch;
while (got < 5) {
if ((ch = MY_GETC(stdin)) == EOF)
break;
- sniff[got++] = ch;
+ sniff[got++] = (char) ch;
}
if (got == 5
&& !strncmp(sniff, "BZh", 3)
@@ -2156,20 +2190,31 @@
which = dcBzip;
}
} else if (ch == ']') { /* perhaps lzma */
- sniff[got++] = ch;
+ sniff[got++] = (char) ch;
while (got < 4) {
if ((ch = MY_GETC(stdin)) == EOF)
break;
- sniff[got++] = ch;
+ sniff[got++] = (char) ch;
}
if (got == 4
&& !memcmp(sniff, "]\0\0\200", 4)) {
which = dcLzma;
}
+ } else if (ch == 0xfd) { /* perhaps xz */
+ sniff[got++] = (char) ch;
+ while (got < 6) {
+ if ((ch = MY_GETC(stdin)) == EOF)
+ break;
+ sniff[got++] = (char) ch;
+ }
+ if (got == 6
+ && !memcmp(sniff, "\3757zXZ\0", 6)) {
+ which = dcLzma;
+ }
} else if (ch == '\037') { /* perhaps compress, etc. */
- sniff[got++] = ch;
+ sniff[got++] = (char) ch;
if ((ch = MY_GETC(stdin)) != EOF) {
- sniff[got++] = ch;
+ sniff[got++] = (char) ch;
switch (ch) {
case 0213:
which = dcGzip;
@@ -2182,6 +2227,8 @@
break;
}
}
+ } else {
+ sniff[got++] = (char) ch;
}
}
/*
@@ -2193,7 +2240,7 @@
}
if (which != dcNone
&& which != dcEmpty
- && (myfile = copy_stdin(stdin_dir)) != 0) {
+ && (myfile = copy_stdin(&stdin_dir)) != 0) {
/* open pipe to decompress temporary file */
command = decompressor(which, myfile);
@@ -2207,7 +2254,7 @@
rmdir(stdin_dir);
} else if (which != dcEmpty)
#endif
- do_file(stdin, "unknown");
+ do_file(stdin, "stdin");
}
summarize();
#if defined(NO_LEAKS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/makefile.wnt new/diffstat-1.51/makefile.wnt
--- old/diffstat-1.48/makefile.wnt 2004-05-03 15:11:24.000000000 +0200
+++ new/diffstat-1.51/makefile.wnt 2009-09-01 02:33:28.000000000 +0200
@@ -1,13 +1,13 @@
#
# makefile for 'diffstat' on WIN32 using Microsoft Visual C++
#
-# $Id: makefile.wnt,v 1.1 2004/05/03 13:11:24 tom Exp $
+# $Id: makefile.wnt,v 1.2 2009/09/01 00:33:28 tom Exp $
#
!include
P = porting
-CFLAGS = $(cvars) $(cdebug) -nologo -G4 -W3 -I. -I$P
+CFLAGS = $(cvars) $(cdebug) -nologo -G4 -W3 -I. -DWIN32 -I$P
LDFLAGS = -nologo -pdb:none
NAME = diffstat
@@ -32,3 +32,4 @@
- del $(NAME).exe
- del /f/s/q *.obj
- del /f/s/q *.bak
+ - del /f/s/q *.pdb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/porting/getopt.c new/diffstat-1.51/porting/getopt.c
--- old/diffstat-1.48/porting/getopt.c 2002-11-22 23:06:46.000000000 +0100
+++ new/diffstat-1.51/porting/getopt.c 2009-09-01 02:41:59.000000000 +0200
@@ -1,6 +1,6 @@
/* ::[[ @(#) getopt.c 1.5 89/03/11 05:40:23 ]]:: */
#ifndef LINT
-static const char Id[] = "$Id: getopt.c,v 1.1 2002/11/22 22:06:46 tom Exp $";
+static const char Id[] = "$Id: getopt.c,v 1.2 2009/09/01 00:41:59 tom Exp $";
#endif
/*
@@ -34,7 +34,7 @@
char *optarg;
int
-getopt(int argc, char **argv, char *opts)
+getopt(int argc, char *const *argv, const char *opts)
{
static int sp = 1;
register int c;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/porting/getopt.h new/diffstat-1.51/porting/getopt.h
--- old/diffstat-1.48/porting/getopt.h 2002-11-22 23:07:02.000000000 +0100
+++ new/diffstat-1.51/porting/getopt.h 2009-09-01 02:34:54.000000000 +0200
@@ -1,4 +1,4 @@
extern char *optarg;
extern int optind, opterr;
-int getopt (int argc, char **argv, const char *options);
+int getopt (int argc, char *const*argv, const char *options);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/testing/case32b.ref new/diffstat-1.51/testing/case32b.ref
--- old/diffstat-1.48/testing/case32b.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.51/testing/case32b.ref 2009-08-31 11:26:31.000000000 +0200
@@ -0,0 +1,2 @@
+ README | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/testing/case32f0.ref new/diffstat-1.51/testing/case32f0.ref
--- old/diffstat-1.48/testing/case32f0.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.51/testing/case32f0.ref 2009-08-31 11:26:31.000000000 +0200
@@ -0,0 +1,2 @@
+ README | 4 2 + 2 - 0 !
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/testing/case32k.ref new/diffstat-1.51/testing/case32k.ref
--- old/diffstat-1.48/testing/case32k.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.51/testing/case32k.ref 2009-08-31 11:26:31.000000000 +0200
@@ -0,0 +1,2 @@
+ README | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/testing/case32p1.ref new/diffstat-1.51/testing/case32p1.ref
--- old/diffstat-1.48/testing/case32p1.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.51/testing/case32p1.ref 2009-08-31 11:26:31.000000000 +0200
@@ -0,0 +1,2 @@
+ README | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/testing/case32p9.ref new/diffstat-1.51/testing/case32p9.ref
--- old/diffstat-1.48/testing/case32p9.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.51/testing/case32p9.ref 2009-08-31 11:26:31.000000000 +0200
@@ -0,0 +1,2 @@
+ README | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/testing/case32.pat new/diffstat-1.51/testing/case32.pat
--- old/diffstat-1.48/testing/case32.pat 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.51/testing/case32.pat 2009-08-31 11:24:46.000000000 +0200
@@ -0,0 +1,13 @@
+--- README 2001-10-10 20:23:46.000000000 -0400
++++ README.new 2009-08-31 05:24:30.000000000 -0400
+@@ -1,7 +1,7 @@
+ $Id: case32.pat,v 1.1 2009/08/31 09:24:46 tom Exp $
+
+-Readme file for DiffStat.
++Readme file for dIFFsTAT.
+
+ This program is a simple filter that reads the output of the 'diff' program,
+ and produces a histogram of the total number of lines that were changed. It is
+-useful for scanning a patch file to see which files were changed.
++useful for scanning a patch file to see which files were changed.
+\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/testing/case32r1.ref new/diffstat-1.51/testing/case32r1.ref
--- old/diffstat-1.48/testing/case32r1.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.51/testing/case32r1.ref 2009-08-31 11:26:31.000000000 +0200
@@ -0,0 +1,2 @@
+ README | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/testing/case32r2.ref new/diffstat-1.51/testing/case32r2.ref
--- old/diffstat-1.48/testing/case32r2.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.51/testing/case32r2.ref 2009-08-31 11:26:31.000000000 +0200
@@ -0,0 +1,2 @@
+ README | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/testing/case32.ref new/diffstat-1.51/testing/case32.ref
--- old/diffstat-1.48/testing/case32.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.51/testing/case32.ref 2009-08-31 11:26:31.000000000 +0200
@@ -0,0 +1,2 @@
+ README | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/testing/case32u.ref new/diffstat-1.51/testing/case32u.ref
--- old/diffstat-1.48/testing/case32u.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.51/testing/case32u.ref 2009-08-31 11:26:31.000000000 +0200
@@ -0,0 +1,2 @@
+ README | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/testing/case33b.ref new/diffstat-1.51/testing/case33b.ref
--- old/diffstat-1.48/testing/case33b.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.51/testing/case33b.ref 2009-08-31 11:26:31.000000000 +0200
@@ -0,0 +1,2 @@
+ README | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/testing/case33f0.ref new/diffstat-1.51/testing/case33f0.ref
--- old/diffstat-1.48/testing/case33f0.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.51/testing/case33f0.ref 2009-08-31 11:26:31.000000000 +0200
@@ -0,0 +1,2 @@
+ README | 4 2 + 2 - 0 !
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/testing/case33k.ref new/diffstat-1.51/testing/case33k.ref
--- old/diffstat-1.48/testing/case33k.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.51/testing/case33k.ref 2009-08-31 11:26:31.000000000 +0200
@@ -0,0 +1,2 @@
+ README | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/testing/case33p1.ref new/diffstat-1.51/testing/case33p1.ref
--- old/diffstat-1.48/testing/case33p1.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.51/testing/case33p1.ref 2009-08-31 11:26:31.000000000 +0200
@@ -0,0 +1,2 @@
+ README | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/testing/case33p9.ref new/diffstat-1.51/testing/case33p9.ref
--- old/diffstat-1.48/testing/case33p9.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.51/testing/case33p9.ref 2009-08-31 11:26:31.000000000 +0200
@@ -0,0 +1,2 @@
+ README | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/testing/case33.pat new/diffstat-1.51/testing/case33.pat
--- old/diffstat-1.48/testing/case33.pat 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.51/testing/case33.pat 2009-08-31 11:24:52.000000000 +0200
@@ -0,0 +1,13 @@
+--- README.new 2009-08-31 05:24:30.000000000 -0400
++++ README 2001-10-10 20:23:46.000000000 -0400
+@@ -1,7 +1,7 @@
+ $Id: case33.pat,v 1.1 2009/08/31 09:24:52 tom Exp $
+
+-Readme file for dIFFsTAT.
++Readme file for DiffStat.
+
+ This program is a simple filter that reads the output of the 'diff' program,
+ and produces a histogram of the total number of lines that were changed. It is
+-useful for scanning a patch file to see which files were changed.
+\ No newline at end of file
++useful for scanning a patch file to see which files were changed.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/testing/case33r1.ref new/diffstat-1.51/testing/case33r1.ref
--- old/diffstat-1.48/testing/case33r1.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.51/testing/case33r1.ref 2009-08-31 11:26:31.000000000 +0200
@@ -0,0 +1,2 @@
+ README | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/testing/case33r2.ref new/diffstat-1.51/testing/case33r2.ref
--- old/diffstat-1.48/testing/case33r2.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.51/testing/case33r2.ref 2009-08-31 11:26:31.000000000 +0200
@@ -0,0 +1,2 @@
+ README | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/testing/case33.ref new/diffstat-1.51/testing/case33.ref
--- old/diffstat-1.48/testing/case33.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.51/testing/case33.ref 2009-08-31 11:26:31.000000000 +0200
@@ -0,0 +1,2 @@
+ README | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/testing/case33u.ref new/diffstat-1.51/testing/case33u.ref
--- old/diffstat-1.48/testing/case33u.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.51/testing/case33u.ref 2009-08-31 11:26:31.000000000 +0200
@@ -0,0 +1,2 @@
+ README | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.48/testing/run_test.sh new/diffstat-1.51/testing/run_test.sh
--- old/diffstat-1.48/testing/run_test.sh 2007-09-05 02:27:57.000000000 +0200
+++ new/diffstat-1.51/testing/run_test.sh 2009-10-06 22:47:01.000000000 +0200
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: run_test.sh,v 1.13 2007/09/05 00:27:57 tom Exp $
+# $Id: run_test.sh,v 1.14 2009/10/06 20:47:01 tom Exp $
# Test-script for DIFFSTAT
# change this for ad hoc testing of compression
@@ -31,14 +31,16 @@
diffstat -e $TEST.err -o $TEST.out $OPTS $DATA
if [ -f $NAME.ref ]
then
- if ( cmp -s $TEST.out $NAME.ref )
+ diff -b $NAME.ref $TEST.out >check.out
+ if test -s check.out
then
+ echo "?? fail: $TEST"
+ ls -l check.out
+ cat check.out
+ else
echo "** ok: $TEST"
rm -f $TEST.out
rm -f $TEST.err
- else
- echo "?? fail: $TEST"
- diff -b $NAME.ref $TEST.out
fi
else
echo "** save: $TEST"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org