Hello community, here is the log from the commit of package wiggle for openSUSE:Factory checked in at 2018-08-24 17:03:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wiggle (Old) and /work/SRC/openSUSE:Factory/.wiggle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wiggle" Fri Aug 24 17:03:41 2018 rev:20 rq:628878 version:1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/wiggle/wiggle.changes 2016-07-05 09:52:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wiggle.new/wiggle.changes 2018-08-24 17:03:56.294059587 +0200 @@ -1,0 +2,7 @@ +Thu Aug 9 21:39:57 UTC 2018 - [email protected] + +- Update to 1.1: + * Fix endian checks as per austin group definitions of endian.h + * Minor man page fixes + +------------------------------------------------------------------- Old: ---- wiggle-1.0.tar.gz New: ---- wiggle-1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wiggle.spec ++++++ --- /var/tmp/diff_new_pack.ShCunx/_old 2018-08-24 17:03:59.834063787 +0200 +++ /var/tmp/diff_new_pack.ShCunx/_new 2018-08-24 17:03:59.838063791 +0200 @@ -1,7 +1,7 @@ # # spec file for package wiggle # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,14 @@ Name: wiggle -Version: 1.0 +Version: 1.1 Release: 0 Summary: A Tool for Applying Patches with Conflicts -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Text/Utilities -Url: http://neil.brown.name/wiggle/ +URL: http://neil.brown.name/wiggle/ Source0: http://neil.brown.name/wiggle/%{name}-%{version}.tar.gz BuildRequires: ncurses-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Wiggle is a program for applying patches that 'patch' cannot apply due @@ -46,9 +45,9 @@ %make_install %files -%defattr(-,root,root,-) -%doc ANNOUNCE COPYING +%doc ANNOUNCE +%license COPYING %{_bindir}/wiggle -%{_mandir}/man1/wiggle.1%{ext_man} +%{_mandir}/man1/wiggle.1%{?ext_man} %changelog ++++++ wiggle-1.0.tar.gz -> wiggle-1.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wiggle-1.0/Makefile new/wiggle-1.1/Makefile --- old/wiggle-1.0/Makefile 2013-08-23 08:02:27.000000000 +0200 +++ new/wiggle-1.1/Makefile 2017-09-28 14:37:04.000000000 +0200 @@ -3,13 +3,17 @@ #OptDbg=-O3 #OptDbg=-O3 -march=pentium2 OptDbg=-ggdb -CFLAGS=$(OptDbg) -I. -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter +ifndef CWFLAGS +CWFLAGS=-Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter -Wno-missing-field-initializers +endif +CFLAGS=$(OptDbg) -I. $(CWFLAGS) +PREFIX = /usr # STRIP = -s INSTALL = /usr/bin/install -DESTDIR = -BINDIR = /usr/bin -MANDIR = /usr/share/man +DESTDIR = +BINDIR = $(PREFIX)/bin +MANDIR = $(PREFIX)/share/man MAN1DIR = $(MANDIR)/man1 MAN5DIR = $(MANDIR)/man5 LDLIBS = -lncurses @@ -22,8 +26,8 @@ merge2.o vpatch.o :: wiggle.h split.o :: ccan/hash/hash.h config.h -VERSION = $(shell [ -d .git ] && git describe HEAD) -VERS_DATE = $(shell [ -d .git ] && git log -n1 --format=format:%cd --date=short) +VERSION = $(shell [ -d .git ] && git 2> /dev/null describe HEAD) +VERS_DATE = $(shell [ -d .git ] && git 2> /dev/null log -n1 --format=format:%cd --date=short) DVERS = $(if $(VERSION),-DVERSION=\"$(VERSION)\",) DDATE = $(if $(VERS_DATE),-DVERS_DATE=\"$(VERS_DATE)\",) CFLAGS += $(DVERS) $(DDATE) @@ -45,8 +49,9 @@ find . -name core -o -name '*.tmp*' -o -name .tmp -o -name .time | xargs rm -f install : wiggle wiggle.1 - $(INSTALL) -D $(STRIP) -m 755 wiggle $(DESTDIR)$(BINDIR)/wiggle - $(INSTALL) -D -m 644 wiggle.1 $(DESTDIR)$(MAN1DIR)/wiggle.1 + $(INSTALL) -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(MAN1DIR) + $(INSTALL) $(STRIP) -m 755 wiggle $(DESTDIR)$(BINDIR) + $(INSTALL) -m 644 wiggle.1 $(DESTDIR)$(MAN1DIR) version : ReadMe.c wiggle.1 @rm -f version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wiggle-1.0/ReadMe.c new/wiggle-1.1/ReadMe.c --- old/wiggle-1.0/ReadMe.c 2013-08-23 08:02:27.000000000 +0200 +++ new/wiggle-1.1/ReadMe.c 2017-09-28 14:37:04.000000000 +0200 @@ -29,10 +29,10 @@ #include "wiggle.h" #ifndef VERSION -#define VERSION "1.0" +#define VERSION "1.1" #endif #ifndef VERS_DATE -#define VERS_DATE "2013-08-23" +#define VERS_DATE "2017-09-28" #endif char Version[] = "wiggle " VERSION " " VERS_DATE " GPL-2+ http://neil.brown.name/wiggle/\n";; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wiggle-1.0/TODO new/wiggle-1.1/TODO --- old/wiggle-1.0/TODO 2013-08-23 08:02:27.000000000 +0200 +++ new/wiggle-1.1/TODO 2017-09-28 14:37:04.000000000 +0200 @@ -40,7 +40,7 @@ ----------------------------------- p - md.c - wait_event_interruptible - The preceeding tabs aren't noticed as being the same... + The preceding tabs aren't noticed as being the same... ----------------------------------- @@ -236,7 +236,7 @@ ----------------------------------- p - md.c - wait_event_interruptible - The preceeding tabs aren't noticed as being the same... + The preceding tabs aren't noticed as being the same... ----------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wiggle-1.0/ccan/hash/hash.c new/wiggle-1.1/ccan/hash/hash.c --- old/wiggle-1.0/ccan/hash/hash.c 2013-08-23 08:02:27.000000000 +0200 +++ new/wiggle-1.1/ccan/hash/hash.c 2017-09-28 14:37:04.000000000 +0200 @@ -209,10 +209,10 @@ /*------------------------------------------- handle the last 3 uint32_t's */ switch(length) /* all the case statements fall through */ { - case 3 : c+=k[2]; - case 2 : b+=k[1]; + case 3 : c+=k[2]; /* fallthrough */ + case 2 : b+=k[1]; /* fallthrough */ case 1 : a+=k[0]; - final(a,b,c); + final(a,b,c); /* fallthrough */ case 0: /* case 0: nothing left to add */ break; } @@ -397,17 +397,17 @@ /*-------------------------------- last block: affect all 32 bits of (c) */ switch(length) /* all the case statements fall through */ { - case 12: c+=((uint32_t)k[11])<<24; - case 11: c+=((uint32_t)k[10])<<16; - case 10: c+=((uint32_t)k[9])<<8; - case 9 : c+=k[8]; - case 8 : b+=((uint32_t)k[7])<<24; - case 7 : b+=((uint32_t)k[6])<<16; - case 6 : b+=((uint32_t)k[5])<<8; - case 5 : b+=k[4]; - case 4 : a+=((uint32_t)k[3])<<24; - case 3 : a+=((uint32_t)k[2])<<16; - case 2 : a+=((uint32_t)k[1])<<8; + case 12: c+=((uint32_t)k[11])<<24; /* fallthrough */ + case 11: c+=((uint32_t)k[10])<<16; /* fallthrough */ + case 10: c+=((uint32_t)k[9])<<8; /* fallthrough */ + case 9 : c+=k[8]; /* fallthrough */ + case 8 : b+=((uint32_t)k[7])<<24; /* fallthrough */ + case 7 : b+=((uint32_t)k[6])<<16; /* fallthrough */ + case 6 : b+=((uint32_t)k[5])<<8; /* fallthrough */ + case 5 : b+=k[4]; /* fallthrough */ + case 4 : a+=((uint32_t)k[3])<<24; /* fallthrough */ + case 3 : a+=((uint32_t)k[2])<<16; /* fallthrough */ + case 2 : a+=((uint32_t)k[1])<<8; /* fallthrough */ case 1 : a+=k[0]; break; case 0 : return c; @@ -527,17 +527,17 @@ /*-------------------------------- last block: affect all 32 bits of (c) */ switch(length) /* all the case statements fall through */ { - case 12: c+=k[11]; - case 11: c+=((uint32_t)k[10])<<8; - case 10: c+=((uint32_t)k[9])<<16; - case 9 : c+=((uint32_t)k[8])<<24; - case 8 : b+=k[7]; - case 7 : b+=((uint32_t)k[6])<<8; - case 6 : b+=((uint32_t)k[5])<<16; - case 5 : b+=((uint32_t)k[4])<<24; - case 4 : a+=k[3]; - case 3 : a+=((uint32_t)k[2])<<8; - case 2 : a+=((uint32_t)k[1])<<16; + case 12: c+=k[11]; /* fallthrough */ + case 11: c+=((uint32_t)k[10])<<8; /* fallthrough */ + case 10: c+=((uint32_t)k[9])<<16; /* fallthrough */ + case 9 : c+=((uint32_t)k[8])<<24; /* fallthrough */ + case 8 : b+=k[7]; /* fallthrough */ + case 7 : b+=((uint32_t)k[6])<<8; /* fallthrough */ + case 6 : b+=((uint32_t)k[5])<<16; /* fallthrough */ + case 5 : b+=((uint32_t)k[4])<<24; /* fallthrough */ + case 4 : a+=k[3]; /* fallthrough */ + case 3 : a+=((uint32_t)k[2])<<8; /* fallthrough */ + case 2 : a+=((uint32_t)k[1])<<16; /* fallthrough */ case 1 : a+=((uint32_t)k[0])<<24; break; case 0 : return c; @@ -611,9 +611,9 @@ } switch (n) { case 2: - b += (uint32_t)k[1]; + b += (uint32_t)k[1]; /* fallthrough */ case 1: - a += (uint32_t)k[0]; + a += (uint32_t)k[0]; break; case 0: return c; @@ -642,13 +642,13 @@ switch (n) { case 5: - c += (uint32_t)k[4]; + c += (uint32_t)k[4]; /* fallthrough */ case 4: - b += ((uint32_t)k[3] << 16); + b += ((uint32_t)k[3] << 16); /* fallthrough */ case 3: - b += (uint32_t)k[2]; + b += (uint32_t)k[2]; /* fallthrough */ case 2: - a += ((uint32_t)k[1] << 16); + a += ((uint32_t)k[1] << 16); /* fallthrough */ case 1: a += (uint32_t)k[0]; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wiggle-1.0/config.h new/wiggle-1.1/config.h --- old/wiggle-1.0/config.h 2013-08-23 08:02:27.000000000 +0200 +++ new/wiggle-1.1/config.h 2017-09-28 14:37:04.000000000 +0200 @@ -1,17 +1,17 @@ /* Includes and defines for ccan files */ -#if !defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN) +#if !defined(BYTE_ORDER) && !defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN) #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) #include <machine/endian.h> #else #include <endian.h> #endif #endif -#ifdef LITTLE_ENDIAN +#if BYTE_ORDER == LITTLE_ENDIAN #define HAVE_LITTLE_ENDIAN 1 #define HAVE_BIG_ENDIAN 0 -#elif defined(BIG_ENDIAN) +#elif BYTE_ORDER == BIG_ENDIAN #define HAVE_LITTLE_ENDIAN 0 #define HAVE_BIG_ENDIAN 1 #else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wiggle-1.0/merge2.c new/wiggle-1.1/merge2.c --- old/wiggle-1.0/merge2.c 2013-08-23 08:02:27.000000000 +0200 +++ new/wiggle-1.1/merge2.c 2017-09-28 14:37:04.000000000 +0200 @@ -77,7 +77,7 @@ * the change the mode of display - between displaying the merger * and displaying the separate streams. * A 'conflict' can only be displayed as separate stream so when - * one is found, we need to find a preceeding and trailing cut-point + * one is found, we need to find a preceding and trailing cut-point * and enlarge the conflict to that range. * A suitable location is one where all three streams are at a line-end. */ @@ -103,7 +103,7 @@ * * A Changed text may also border a conflict, but it can * only border one conflict (where as an Unchanged can border - * a preceeding and a following conflict). + * a preceding and a following conflict). * The 'new' section of a Changed text appears in the * conflict as does any part of the original before * a newline. @@ -120,7 +120,7 @@ * When in_conflict == 1, the 'lo' and 'hi' fields indicate * how much of the 'a' file is included in the conflict, the rest * being part of the clean result. - * Elements in af from m->a to m->a+m->lo are in the preceeding + * Elements in af from m->a to m->a+m->lo are in the preceding * conflict, from m->a+m->lo to m->a+m->hi are clean, and * m->a+m->hi to m->a+m->al are in the following conflict. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wiggle-1.0/vpatch.c new/wiggle-1.1/vpatch.c --- old/wiggle-1.0/vpatch.c 2013-08-23 08:02:27.000000000 +0200 +++ new/wiggle-1.1/vpatch.c 2017-09-28 14:37:04.000000000 +0200 @@ -1369,44 +1369,46 @@ unsigned int searchlen; } *anchor = NULL; - void free_stuff(void) - { - free(fm.list); - free(fb.list); - free(fa.list); - free(csl1); - free(csl2); - free(ci.merger); - } - void find_line(int ln) - { - pos.p.m = 0; /* merge node */ - pos.p.s = 0; /* stream number */ - pos.p.o = -1; /* offset */ - pos.p.lineno = 1; - pos.state = 0; - memset(&curs, 0, sizeof(curs)); - do - next_mline(&pos, fm, fb, fa, ci.merger, mode); - while (pos.p.lineno < ln && ci.merger[pos.p.m].type != End); - } - void prepare_merge(int ch) - { - /* FIXME check for errors in the stream */ - fm = split_stream(sm, ByWord | ignore_blanks); - fb = split_stream(sb, ByWord | ignore_blanks); - fa = split_stream(sa, ByWord | ignore_blanks); - - if (ch && !just_diff) - csl1 = pdiff(fm, fb, ch); - else - csl1 = diff(fm, fb); - csl2 = diff_patch(fb, fa); - - ci = make_merger(fm, fb, fa, csl1, csl2, 0, 1, 0); - for (i = 0; ci.merger[i].type != End; i++) - ci.merger[i].oldtype = ci.merger[i].type; - } + #define free_stuff(none) \ + do { \ + free(fm.list); \ + free(fb.list); \ + free(fa.list); \ + free(csl1); \ + free(csl2); \ + free(ci.merger); \ + } while(0) + + #define find_line(ln) \ + do { \ + pos.p.m = 0; /* merge node */ \ + pos.p.s = 0; /* stream number */ \ + pos.p.o = -1; /* offset */ \ + pos.p.lineno = 1; \ + pos.state = 0; \ + memset(&curs, 0, sizeof(curs)); \ + do \ + next_mline(&pos, fm, fb, fa, ci.merger, mode); \ + while (pos.p.lineno < ln && ci.merger[pos.p.m].type != End); \ + } while(0) + + #define prepare_merge(ch) \ + do { \ + /* FIXME check for errors in the stream */ \ + fm = split_stream(sm, ByWord | ignore_blanks); \ + fb = split_stream(sb, ByWord | ignore_blanks); \ + fa = split_stream(sa, ByWord | ignore_blanks); \ +\ + if (ch && !just_diff) \ + csl1 = pdiff(fm, fb, ch); \ + else \ + csl1 = diff(fm, fb); \ + csl2 = diff_patch(fb, fa); \ +\ + ci = make_merger(fm, fb, fa, csl1, csl2, 0, 1, 0); \ + for (i = 0; ci.merger[i].type != End; i++) \ + ci.merger[i].oldtype = ci.merger[i].type; \ + } while(0) if (selftest) { intr_kills = 1; @@ -2066,8 +2068,8 @@ do { pos = tpos; row++; next_mline(&tpos, fm, fb, fa, ci.merger, mmode); - } while (!(check_line(pos, fm, fb, fa, ci.merger, mmode) - & CONFLICTED) == 0 + } while ((check_line(pos, fm, fb, fa, ci.merger, mmode) + & CONFLICTED) != 0 && ci.merger[tpos.p.m].type != End); tpos = pos; row--; do { @@ -2350,8 +2352,7 @@ struct plist p = {0}; p.file = origname; - if (replace) - p.outfile = outfile; + p.outfile = replace ? outfile : NULL; if (patch) { p.start = 0; fseek(patch, 0, SEEK_END); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wiggle-1.0/wiggle.1 new/wiggle-1.1/wiggle.1 --- old/wiggle-1.0/wiggle.1 2013-08-23 08:02:27.000000000 +0200 +++ new/wiggle-1.1/wiggle.1 2017-09-28 14:37:04.000000000 +0200 @@ -21,7 +21,7 @@ .\" Author: Neil Brown .\" Email: <[email protected]> .\" -.TH WIGGLE 1 "" v1.0 +.TH WIGGLE 1 "" v1.1 .SH NAME wiggle \- apply rejected patches and perform word-wise diffs .SH SYNOPSIS @@ -157,7 +157,7 @@ The effect of this is that changes in the amount of white space are not treated as significant. .P -To be precise, any white space is combined with the preceeding word +To be precise, any white space is combined with the preceding word or, in the case of leading space on a line, with the following word. However it is not involved in any comparisons of that word. If a patch deletes a word, the attached white space is deleted as well. If a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wiggle-1.0/wiggle.spec new/wiggle-1.1/wiggle.spec --- old/wiggle-1.0/wiggle.spec 2013-08-23 08:02:27.000000000 +0200 +++ new/wiggle-1.1/wiggle.spec 2017-09-28 14:37:04.000000000 +0200 @@ -1,6 +1,6 @@ Summary: A tool for applying patches with conflicts Name: wiggle -Version: 1.0 +Version: 1.1 Release: 1 License: GPL Group: Development/Tools
