Hello community, here is the log from the commit of package mbuffer for openSUSE:Factory checked in at 2015-12-09 19:50:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mbuffer (Old) and /work/SRC/openSUSE:Factory/.mbuffer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mbuffer" Changes: -------- --- /work/SRC/openSUSE:Factory/mbuffer/mbuffer.changes 2015-01-29 09:56:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mbuffer.new/mbuffer.changes 2015-12-09 22:24:46.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Dec 1 16:26:25 UTC 2015 - [email protected] + +- Update to version 2015100 : + * fix: SegV when argument to -v is missing + * fix: potential infinite loop on output error +- Changes from version 20150412 : + * fix: watchdog cannot do its job if it is cleaned up to early + * fix: clear sa_flags and sa_mask before use, although ignored +- Changes from version 20141227 : + * added option --pid to print PID of current process + * updated usage to include option -W + * man page formatting fixes + * configure updates + * support compiling on systems that do not define PATH_MAX + +------------------------------------------------------------------- Old: ---- mbuffer-20141227.tgz New: ---- mbuffer-20151002.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mbuffer.spec ++++++ --- /var/tmp/diff_new_pack.anA2og/_old 2015-12-09 22:24:47.000000000 +0100 +++ /var/tmp/diff_new_pack.anA2og/_new 2015-12-09 22:24:47.000000000 +0100 @@ -18,7 +18,7 @@ Name: mbuffer -Version: 20141227 +Version: 20151002 Release: 0 Summary: Replacement for "buffer" with many more Features License: GPL-3.0+ @@ -59,6 +59,6 @@ %defattr(-,root,root) %doc AUTHORS ChangeLog LICENSE NEWS README %{_bindir}/mbuffer -%doc %{_mandir}/man1/mbuffer.1* +%{_mandir}/man1/mbuffer.1* %changelog ++++++ mbuffer-20141227.tgz -> mbuffer-20151002.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mbuffer-20141227/.hg_archival.txt new/mbuffer-20151002/.hg_archival.txt --- old/mbuffer-20141227/.hg_archival.txt 2014-12-27 20:10:06.000000000 +0100 +++ new/mbuffer-20151002/.hg_archival.txt 2015-10-02 13:12:11.000000000 +0200 @@ -1,5 +1,5 @@ repo: 6e3b485d74645931e2408ed1f57e659029b5639a -node: 5804411962c0a986c14d1898168ed27b210e0a0c +node: 5e77ab28b8d8395d358201624446dd942823e672 branch: default -latesttag: R20141227 +latesttag: R20151002 latesttagdistance: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mbuffer-20141227/.hgtags new/mbuffer-20151002/.hgtags --- old/mbuffer-20141227/.hgtags 2014-12-27 20:10:06.000000000 +0100 +++ new/mbuffer-20151002/.hgtags 2015-10-02 13:12:11.000000000 +0200 @@ -85,3 +85,5 @@ d93542af23e7750fc8e50c502f84ae7c62ec7856 R20140126 3f18779d5fda082e6093e69de8c9c4098c67823d R20140310 08bdb2cb811b3ea374cd18a777761da445cea8d7 R20141227 +7661efeffec5b38f46e57f26ba5f1e918bdb400d R20150412 +45bcbc3fc7939717ee45b6a2f2e85d99cf8246f8 R20151002 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mbuffer-20141227/ChangeLog new/mbuffer-20151002/ChangeLog --- old/mbuffer-20141227/ChangeLog 2014-12-27 20:10:06.000000000 +0100 +++ new/mbuffer-20151002/ChangeLog 2015-10-02 13:12:11.000000000 +0200 @@ -1,3 +1,11 @@ +20151002: +- fix: SegV when argument to -v is missing +- fix: potential infinite loop on output error + +20150412: +- fix: watchdog cannot do its job if it is cleaned up to early +- fix: clear sa_flags and sa_mask before use, although ignored + 20141227: - added option --pid to print PID of current process - updated usage to include option -W diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mbuffer-20141227/configure new/mbuffer-20151002/configure --- old/mbuffer-20141227/configure 2014-12-27 20:10:06.000000000 +0100 +++ new/mbuffer-20151002/configure 2015-10-02 13:12:11.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for mbuffer 20141227. +# Generated by GNU Autoconf 2.69 for mbuffer 20151002. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='mbuffer' PACKAGE_TARNAME='mbuffer' -PACKAGE_VERSION='20141227' -PACKAGE_STRING='mbuffer 20141227' +PACKAGE_VERSION='20151002' +PACKAGE_STRING='mbuffer 20151002' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1247,7 +1247,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures mbuffer 20141227 to adapt to many kinds of systems. +\`configure' configures mbuffer 20151002 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1313,7 +1313,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mbuffer 20141227:";; + short | recursive ) echo "Configuration of mbuffer 20151002:";; esac cat <<\_ACEOF @@ -1402,7 +1402,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mbuffer configure 20141227 +mbuffer configure 20151002 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1878,7 +1878,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mbuffer $as_me 20141227, which was +It was created by mbuffer $as_me 20151002, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -6320,7 +6320,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mbuffer $as_me 20141227, which was +This file was extended by mbuffer $as_me 20151002, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6382,7 +6382,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -mbuffer config.status 20141227 +mbuffer config.status 20151002 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mbuffer-20141227/configure.in new/mbuffer-20151002/configure.in --- old/mbuffer-20141227/configure.in 2014-12-27 20:10:06.000000000 +0100 +++ new/mbuffer-20151002/configure.in 2015-10-02 13:12:11.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([mbuffer],[20141227]) +AC_INIT([mbuffer],[20151002]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_SRCDIR([mbuffer.c]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mbuffer-20141227/mbuffer.c new/mbuffer-20151002/mbuffer.c --- old/mbuffer-20141227/mbuffer.c 2014-12-27 20:10:06.000000000 +0100 +++ new/mbuffer-20151002/mbuffer.c 2015-10-02 13:12:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2014, Thomas Maier-Komor + * Copyright (C) 2000-2015, Thomas Maier-Komor * * This is the source code of mbuffer. * @@ -126,7 +126,7 @@ char *Prefix; int - In = -1; + In = -1, WatchdogRaised = 0; size_t PrefixLen = 0; @@ -355,10 +355,12 @@ sleep(Timeout); if ((ni == Numin) && (Finish == -1)) { errormsg("watchdog timeout: input stalled; sending SIGINT\n"); + WatchdogRaised = 1; kill(getpid(),SIGINT); } if (no == Numout) { errormsg("watchdog timeout: output stalled; sending SIGINT\n"); + WatchdogRaised = 1; kill(getpid(),SIGINT); } ni = Numin; @@ -1293,7 +1295,8 @@ haderror = 1; continue; } - } else if (-1 == num) { + } + if (-1 == num) { dest->result = strerror(errno); errormsg("outputThread: error writing to %s at offset 0x%llx: %s\n",dest->arg,(long long)Blocksize*Numout+blocksize-rest,strerror(errno)); MainOutOK = 0; @@ -1351,7 +1354,7 @@ { (void) fprintf(stderr, "mbuffer version "PACKAGE_VERSION"\n"\ - "Copyright 2001-2014 - T. Maier-Komor\n"\ + "Copyright 2001-2015 - T. Maier-Komor\n"\ "License: GPLv3 - see file LICENSE\n"\ "This program comes with ABSOLUTELY NO WARRANTY!!!\n" "Donations via PayPal to [email protected] are welcome and support this work!\n" @@ -1704,7 +1707,11 @@ assert(dfstr); while (!feof(dfstr)) { char key[64],valuestr[64]; - fscanf(dfstr,"%255[^\n]\n",line); + int n = fscanf(dfstr,"%255[^\n]\n",line); + if (n != 1) { + errormsg("error parsing defaults file\n"); + break; + } char *pound = strchr(line,'#'); unsigned long long value; int a; @@ -1866,10 +1873,14 @@ const char *arg = argv[c]; if ((arg[0] == '-') && (arg[1] == 'v')) { long verb; - if (arg[2]) + if (arg[2]) { verb = strtol(arg+2,0,0); - else - verb = strtol(argv[++c],0,0); + } else if (++c < argc) { + verb = strtol(argv[c],0,0); + } else { + fatal("missing argument to option -v\n"); + break; + } if ((verb == 0) && (errno == EINVAL)) errormsg("invalid argument to option -v: \"%s\"\n",argv[c]); else @@ -2344,6 +2355,8 @@ debugmsg("checking if we have a controlling terminal...\n"); sig.sa_handler = SIG_IGN; + sigemptyset(&sig.sa_mask); + sig.sa_flags = 0; err = sigaction(SIGTTIN,&sig,0); assert(err == 0); fl = fcntl(STDERR_FILENO,F_GETFL); @@ -2476,10 +2489,6 @@ assert(err == 1); } } - if (Timeout) { - err = pthread_cancel(Watchdog); - assert(err == 0); - } if (Dest) { dest_t *d = Dest; int ret;
