Hello community, here is the log from the commit of package diffstat for openSUSE:Factory checked in at 2013-10-30 15:25:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/diffstat (Old) and /work/SRC/openSUSE:Factory/.diffstat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diffstat" Changes: -------- --- /work/SRC/openSUSE:Factory/diffstat/diffstat.changes 2013-04-24 10:19:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.diffstat.new/diffstat.changes 2013-10-30 15:25:37.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Oct 30 06:35:31 UTC 2013 - [email protected] + +- updated to 1.58: + + add COPYING file (request by Dagobert Michelsen). + + improved portability for cross-compiling, by supplying missing + getopt function as well as improving checks for popen/pclose + prototypes. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ diffstat.spec ++++++ --- /var/tmp/diff_new_pack.gxV4xQ/_old 2013-10-30 15:25:38.000000000 +0100 +++ /var/tmp/diff_new_pack.gxV4xQ/_new 2013-10-30 15:25:38.000000000 +0100 @@ -17,7 +17,7 @@ Name: diffstat -Version: 1.57 +Version: 1.58 Release: 0 Url: http://dickey.his.com/diffstat/diffstat.html Summary: Utility That Provides Statistics Based on the Output of diff @@ -48,7 +48,7 @@ %files %defattr(-,root,root) -%doc README CHANGES +%doc README CHANGES COPYING %{_bindir}/diffstat %doc %{_mandir}/man1/diffstat.1* ++++++ diffstat.tar.gz ++++++ ++++ 1972 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.57/CHANGES new/diffstat-1.58/CHANGES --- old/diffstat-1.57/CHANGES 2013-04-16 02:51:32.000000000 +0200 +++ new/diffstat-1.58/CHANGES 2013-10-29 00:48:13.000000000 +0100 @@ -1,4 +1,12 @@ --- $Id: CHANGES,v 1.84 2013/04/16 00:51:32 tom Exp $ +-- $Id: CHANGES,v 1.86 2013/10/28 23:48:13 tom Exp $ + +2013/10/28 (diffstat 1.58) + + add COPYING file (request by Dagobert Michelsen). + + improved portability for cross-compiling, by supplying missing + getopt function as well as improving checks for popen/pclose + prototypes. + + updated configure macros, e.g., for MingW and MSYS fixes. + + update config.guess, config.sub 2013/04/15 (diffstat 1.57) + improve treatment of binary files in ambiguous message introduced in 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.57/COPYING new/diffstat-1.58/COPYING --- old/diffstat-1.57/COPYING 1970-01-01 01:00:00.000000000 +0100 +++ new/diffstat-1.58/COPYING 2013-10-29 00:45:51.000000000 +0100 @@ -0,0 +1,18 @@ +Copyright 1994-2012,2013 by Thomas E. Dickey +All Rights Reserved. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided +that the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of the above listed copyright holder(s) +not be used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE +FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 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.57/COPYING.asc new/diffstat-1.58/COPYING.asc --- old/diffstat-1.57/COPYING.asc 1970-01-01 01:00:00.000000000 +0100 +++ new/diffstat-1.58/COPYING.asc 2013-10-29 00:48:41.000000000 +0100 @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.10 (GNU/Linux) +Comment: See http://invisible-island.net/public/public.html for info + +iEYEABECAAYFAlJu99MACgkQcCNT4Pfkjts35wCfcOB1pZVbBZRPIdiZ/gUBjaSC +YoUAnRYyeDWyUlRXBgms56fEEchZT/P5 +=DxT+ +-----END PGP SIGNATURE----- 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.57/configure.in new/diffstat-1.58/configure.in --- old/diffstat-1.57/configure.in 2013-02-10 16:35:51.000000000 +0100 +++ new/diffstat-1.58/configure.in 2013-10-29 00:14:45.000000000 +0100 @@ -1,7 +1,7 @@ dnl Process this file with 'autoconf' to produce a 'configure' script -dnl $Id: configure.in,v 1.24 2013/02/10 15:35:51 tom Exp $ +dnl $Id: configure.in,v 1.26 2013/10/28 23:14:45 tom Exp $ AC_PREREQ(2.52.20011201) -AC_REVISION($Revision: 1.24 $) +AC_REVISION($Revision: 1.26 $) AC_INIT(diffstat.c) AC_CONFIG_HEADER(config.h:config_h.in) @@ -35,16 +35,17 @@ search.h \ string.h \ ) -CF_GETOPT_HEADER AC_TYPE_SIZE_T AC_CHECK_FUNCS(\ mkdtemp \ -popen \ tsearch \ ) +CF_FUNC_GETOPT(getopt,\$(srcdir)/porting) +CF_FUNC_POPEN(popen,\$(srcdir)/porting) + CF_STDIO_UNLOCKED(getc_unlocked) CF_DISABLE_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.57/diffstat.c new/diffstat-1.58/diffstat.c --- old/diffstat-1.57/diffstat.c 2013-04-16 02:29:29.000000000 +0200 +++ new/diffstat-1.58/diffstat.c 2013-10-29 00:02:45.000000000 +0100 @@ -20,7 +20,7 @@ ******************************************************************************/ #ifndef NO_IDENT -static const char *Id = "$Id: diffstat.c,v 1.57 2013/04/16 00:29:29 tom Exp $"; +static const char *Id = "$Id: diffstat.c,v 1.58 2013/10/28 23:02:45 tom Exp $"; #endif /* @@ -28,6 +28,7 @@ * Author: T.E.Dickey * Created: 02 Feb 1992 * Modified: + * 28 Oct 2013, portability improvements for MinGW. * 15 Apr 2013, modify to accommodate output of "diff -q", which * tells only if the files are different. Work * around the equivalent ambiguous message introduced @@ -242,6 +243,11 @@ #include <sys/types.h> #include <sys/stat.h> +#if defined(HAVE_POPEN) && !defined(HAVE_POPEN_PROTOTYPE) +extern FILE *popen(const char *, const char *); +extern int pclose(FILE *); +#endif + #if !defined(EXIT_SUCCESS) #define EXIT_SUCCESS 0 #define EXIT_FAILURE 1 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.57/makefile.in new/diffstat-1.58/makefile.in --- old/diffstat-1.57/makefile.in 2013-02-10 16:53:33.000000000 +0100 +++ new/diffstat-1.58/makefile.in 2013-10-29 00:07:47.000000000 +0100 @@ -1,4 +1,4 @@ -# $Id: makefile.in,v 1.30 2013/02/10 15:53:33 tom Exp $ +# $Id: makefile.in,v 1.31 2013/10/28 23:07:47 tom Exp $ # Makefile-template for 'diffstat' THIS = diffstat @@ -35,6 +35,8 @@ o = .@OBJEXT@ x = @EXEEXT@ +EXTRA_OBJS = @EXTRA_OBJS@ + BINDIR = $(DESTDIR)$(bindir) MANDIR = $(DESTDIR)$(mandir) @@ -72,8 +74,8 @@ all : $(PROG) -$(PROG) : diffstat$o - @ECHO_LD@$(LINK) $(LDFLAGS) -o $@ diffstat$o $(LIBS) +$(PROG) : diffstat$o $(EXTRA_OBJS) + @ECHO_LD@$(LINK) $(LDFLAGS) -o $@ diffstat$o $(EXTRA_OBJS) $(LIBS) install : all installdirs $(INSTALL_PROGRAM) $(PROG) $(BINDIR)/$(PROG) @@ -143,3 +145,6 @@ $(THIS).o : config.h $(SRC) : + +getopt.o : $(srcdir)/porting/getopt.c + $(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/porting/getopt.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.57/package/debian/changelog new/diffstat-1.58/package/debian/changelog --- old/diffstat-1.57/package/debian/changelog 2013-04-16 02:48:40.000000000 +0200 +++ new/diffstat-1.58/package/debian/changelog 2013-10-28 22:40:54.000000000 +0100 @@ -1,3 +1,9 @@ +diffstat (1.58) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <[email protected]> Mon, 28 Oct 2013 17:40:54 -0400 + diffstat (1.57) unstable; urgency=low * fix for diff 2.8.4 "Binary" message 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.57/package/debian/copyright new/diffstat-1.58/package/debian/copyright --- old/diffstat-1.57/package/debian/copyright 2010-07-16 01:41:09.000000000 +0200 +++ new/diffstat-1.58/package/debian/copyright 2013-10-28 22:42:22.000000000 +0100 @@ -1,7 +1,7 @@ Upstream source http://invisible-island.net/diffstat/diffstat.html /****************************************************************************** - * Copyright 1994-2009,2010 by Thomas E. Dickey * + * Copyright 1994-2012,2013 by Thomas E. Dickey * * All Rights Reserved. * * * * Permission to use, copy, modify, and distribute this software and its * @@ -25,7 +25,7 @@ Files: aclocal.m4 Licence: other-BSD -Copyright: 2003-2009,2010 by Thomas E. Dickey +Copyright: 2003-2012,2013 by Thomas E. Dickey Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including @@ -86,7 +86,7 @@ shared with many OS's install programs. Files: debian/* -Copyright: 2010 Thomas E. Dickey +Copyright: 2010-2012,2013 Thomas E. Dickey Licence: other-BSD Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, 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.57/package/diffstat.spec new/diffstat-1.58/package/diffstat.spec --- old/diffstat-1.57/package/diffstat.spec 2013-04-16 02:48:40.000000000 +0200 +++ new/diffstat-1.58/package/diffstat.spec 2013-10-28 22:40:08.000000000 +0100 @@ -1,7 +1,7 @@ Summary: diffstat - make histogram from diff-output %define AppProgram diffstat -%define AppVersion 1.57 -# $XTermId: diffstat.spec,v 1.6 2013/04/16 00:48:40 tom Exp $ +%define AppVersion 1.58 +# $XTermId: diffstat.spec,v 1.7 2013/10/28 21:40:08 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: 1 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.57/porting/getopt.c new/diffstat-1.58/porting/getopt.c --- old/diffstat-1.57/porting/getopt.c 2009-09-01 02:41:59.000000000 +0200 +++ new/diffstat-1.58/porting/getopt.c 2013-10-26 00:08:08.000000000 +0200 @@ -1,7 +1,12 @@ +/* $Id: getopt.c,v 4.2 2013/10/25 22:08:08 tom Exp $ */ + /* ::[[ @(#) getopt.c 1.5 89/03/11 05:40:23 ]]:: */ + +/* #ifndef LINT -static const char Id[] = "$Id: getopt.c,v 1.2 2009/09/01 00:41:59 tom Exp $"; +static char sccsid[]="::[[ @(#) getopt.c 1.5 89/03/11 05:40:23 ]]::"; #endif +*/ /* * Here's something you've all been waiting for: the AT&T public domain @@ -25,55 +30,56 @@ #include <stdio.h> #include <string.h> +#include <getopt.h> #define ERR(szz,czz) if(opterr){fprintf(stderr,"%s%s%c\n",argv[0],szz,czz);} -int opterr = 1; -int optind = 1; -int optopt; -char *optarg; +int opterr = 1; +int optind = 1; +int optopt; +char *optarg; int -getopt(int argc, char *const *argv, const char *opts) +getopt(int argc, char **argv, const char *opts) { - static int sp = 1; - register int c; - register char *cp; - - if (sp == 1) { - if (optind >= argc || - argv[optind][0] != '-' || argv[optind][1] == '\0') - return (EOF); - else if (strcmp(argv[optind], "--") == 0) { - optind++; - return (EOF); - } - } - optopt = c = argv[optind][sp]; - if (c == ':' || (cp = strchr(opts, c)) == NULL) { - ERR(": illegal option -- ", c); - if (argv[optind][++sp] == '\0') { - optind++; - sp = 1; - } - return ('?'); - } - if (*++cp == ':') { - if (argv[optind][sp + 1] != '\0') - optarg = &argv[optind++][sp + 1]; - else if (++optind >= argc) { - ERR(": option requires an argument -- ", c); - sp = 1; - return ('?'); - } else - optarg = argv[optind++]; - sp = 1; - } else { - if (argv[optind][++sp] == '\0') { - sp = 1; - optind++; - } - optarg = NULL; - } - return (c); + static int sp = 1; + register int c; + register char *cp; + + if(sp == 1) { + if(optind >= argc || + argv[optind][0] != '-' || argv[optind][1] == '\0') + return(EOF); + else if(strcmp(argv[optind], "--") == 0) { + optind++; + return(EOF); + } + } + optopt = (c = argv[optind][sp]); + if(c == ':' || (cp=strchr(opts, c)) == NULL) { + ERR(": illegal option -- ", c); + if(argv[optind][++sp] == '\0') { + optind++; + sp = 1; + } + return('?'); + } + if(*++cp == ':') { + if(argv[optind][sp+1] != '\0') + optarg = &argv[optind++][sp+1]; + else if(++optind >= argc) { + ERR(": option requires an argument -- ", c); + sp = 1; + return('?'); + } else + optarg = argv[optind++]; + sp = 1; + } else { + if(argv[optind][++sp] == '\0') { + sp = 1; + optind++; + } + optarg = NULL; + } + return(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.57/porting/getopt.h new/diffstat-1.58/porting/getopt.h --- old/diffstat-1.57/porting/getopt.h 2009-09-01 02:34:54.000000000 +0200 +++ new/diffstat-1.58/porting/getopt.h 2013-10-26 00:08:17.000000000 +0200 @@ -1,4 +1,10 @@ +/* $Id: getopt.h,v 4.3 2013/10/25 22:08:17 tom Exp $ */ + +#ifndef OLD_GETOPT_H +#define OLD_GETOPT_H 1 + extern char *optarg; extern int optind, opterr; +extern int getopt (int argc, char **argv, const char *options); -int getopt (int argc, char *const*argv, const char *options); +#endif /* OLD_GETOPT_H */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
