Hello community, here is the log from the commit of package logwarn for openSUSE:Factory checked in at 2014-01-13 10:55:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/logwarn (Old) and /work/SRC/openSUSE:Factory/.logwarn.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "logwarn" Changes: -------- --- /work/SRC/openSUSE:Factory/logwarn/logwarn.changes 2013-01-29 10:49:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.logwarn.new/logwarn.changes 2014-01-13 10:55:19.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Jan 12 19:22:17 UTC 2014 - arc...@dellroad.org + +- Upgrade to version 1.0.11 + + Added `-l' flag (contributed by Tobias Galitzien) + + Added `-c' flag for case-insensitive matching (issue #19) + + Added `-N' flag to limit messages processed (issue #17) + +------------------------------------------------------------------- Old: ---- logwarn-1.0.10.tar.gz New: ---- logwarn-1.0.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ logwarn.spec ++++++ --- /var/tmp/diff_new_pack.UwYhMp/_old 2014-01-13 10:55:20.000000000 +0100 +++ /var/tmp/diff_new_pack.UwYhMp/_new 2014-01-13 10:55:20.000000000 +0100 @@ -1,34 +1,33 @@ # -# Logwarn - Utility for finding interesting messages in log files +# spec file for package logwarn # +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (C) 2010-2011 Archie L. Cobbs. All rights reserved. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# $Id: logwarn.spec.in 54 2011-05-23 15:49:17Z archie.cobbs $ +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: logwarn -Version: 1.0.10 -Release: 1 -License: Apache-2.0 +Version: 1.0.11 +Release: 0 Summary: Utility for finding interesting messages in log files +License: Apache-2.0 Group: System/Monitoring Source: %{name}-%{version}.tar.gz -URL: http://%{name}.googlecode.com/ -BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: make +Url: http://%{name}.googlecode.com/ +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc +BuildRequires: make BuildRequires: nagios-rpm-macros %description @@ -74,7 +73,7 @@ Group: System/Monitoring Requires: bash Requires: logwarn >= %{version} -Buildarch: noarch +BuildArch: noarch %description nagios-plugin %{name} searches for interesting messages in log files, where ``interest- ++++++ logwarn-1.0.10.tar.gz -> logwarn-1.0.11.tar.gz ++++++ ++++ 3246 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/logwarn-1.0.10/CHANGES new/logwarn-1.0.11/CHANGES --- old/logwarn-1.0.10/CHANGES 2012-11-25 23:32:07.000000000 +0100 +++ new/logwarn-1.0.11/CHANGES 2014-01-12 20:18:29.000000000 +0100 @@ -1,4 +1,10 @@ +Version 1.0.11 (r115) Released January 12, 2014 + + - Added `-l' flag (contributed by Tobias Galitzien) + - Added `-c' flag for case-insensitive matching (issue #19) + - Added `-N' flag to limit messages processed (issue #17) + Version 1.0.10 (r104) Released November 25, 2012 - Added `-M' and `-L' command line flags @@ -59,4 +65,4 @@ - Initial release -$Id: CHANGES 104 2012-11-25 22:32:05Z archie.cobbs $ +$Id: CHANGES 115 2014-01-12 19:18:28Z archie.cobbs $ 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/logwarn-1.0.10/INSTALL new/logwarn-1.0.11/INSTALL --- old/logwarn-1.0.10/INSTALL 2010-12-29 20:12:40.000000000 +0100 +++ new/logwarn-1.0.11/INSTALL 2013-05-13 17:16:13.000000000 +0200 @@ -5,10 +5,11 @@ 2. make 3. sudo make install -Please see +If you want to build an RPM, a spec file you can use is included. +For more information on how to build RPM's, see: - http://code.google.com/p/logwarn + https://www.google.com/search?q=how+to+build+rpm -for more information. +See http://code.google.com/p/logwarn for more information about logwarn. -$Id: INSTALL 2 2010-12-29 19:12:40Z archie.cobbs $ +$Id: INSTALL 110 2013-05-13 15:16:13Z archie.cobbs $ 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/logwarn-1.0.10/configure.ac new/logwarn-1.0.11/configure.ac --- old/logwarn-1.0.10/configure.ac 2012-11-21 23:11:50.000000000 +0100 +++ new/logwarn-1.0.11/configure.ac 2012-11-25 23:36:31.000000000 +0100 @@ -18,7 +18,7 @@ # $Id$ # -AC_INIT([logwarn Utility for finding interesting messages in log files], [1.0.10], [http://code.google.com/p/logwarn/], [logwarn]) +AC_INIT([logwarn Utility for finding interesting messages in log files], [1.0.11], [http://code.google.com/p/logwarn/], [logwarn]) AC_CONFIG_AUX_DIR(scripts) AM_INIT_AUTOMAKE dnl AM_MAINTAINER_MODE 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/logwarn-1.0.10/logwarn.1.in new/logwarn-1.0.11/logwarn.1.in --- old/logwarn-1.0.10/logwarn.1.in 2012-11-21 00:03:13.000000000 +0100 +++ new/logwarn-1.0.11/logwarn.1.in 2013-12-30 16:43:06.000000000 +0100 @@ -27,12 +27,13 @@ .Sh SYNOPSIS .Nm logwarn .Bk -words -.Op Fl ahnpqvz +.Op Fl achlnpqvz .Op Fl d Ar dir | Fl f Ar file .Op Fl m Ar firstpat .Op Fl r Ar sufpat .Op Fl L Ar maxlines -.Op Fl M Ar maxerrors +.Op Fl M Ar maxprint +.Op Fl N Ar maxerrors .Ar logfile .Ar [!]pattern ... .Ek @@ -109,6 +110,12 @@ exists but the state file does not. Normally this is not what you want, but this can be helpful in cases where it's important to avoid a flood of repeated log messages caused by state files somehow disappearing between invocations. +.It Fl c +Match each +.Ar pattern +and +.Ar firstpat +(if any) case-insensitively. .It Fl d Specify .Ar dir @@ -146,12 +153,19 @@ (as of this invocation) end of .Ar logfile . .It Fl L -Specify the maximum number of lines to output for any single log message. +Produce at most +.Ar maxlines +lines of output for any single log message; continuation lines beyond +this limit are suppressed. This flag is not needed unless multi-line messages are being detected using .Fl m . .Pp -Setting this value to zero has the same effect as +Setting +.Ar maxlines +to zero has the same effect as .Fl q . +.It Fl l +Prefix each output line with the line number from the log file. .It Fl m Enable multi-line support using .Ar firstpat @@ -168,15 +182,49 @@ .Pp Multi-line mode will work correctly even if a message crosses a log file rotation boundary. .It Fl M -Specify the maximum number of log messages to output. -Log messages beyond this limit are processed normally but their output is suppressed. +Output at most +.Ar maxprint +log messages; log messages beyond this limit are processed normally but their output is suppressed. .Pp Messages that span multiple lines (see .Fl m ) only count once. .Pp -Setting this value to zero has the same effect as +Setting +.Ar maxprint +zero has the same effect as .Fl q . +.It Fl N +Process at most +.Ar maxerrors +log messages. +.Pp +In contrast to +.Fl M , +which limits the number of log messages output without affecting how +many are processed, the +.Fl N +flag causes +.Nm +to stop processing after encountering the specified number of log messages, +possibly before reaching the end of the log file. +.Pp +As a result, repeated invocations of +.Nm +may be required to output all outstanding log messages. +When using the +.Fl N +flag, be sure to invoke +.Nm +frequently enough so that it doesn't fall behind. +.Pp +Messages that span multiple lines (see +.Fl m ) +only count once. +.Pp +The value of +.Ar maxerrors +must be at least one. .It Fl n Normally, if the .Ar logfile 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/logwarn-1.0.10/logwarn.spec.in new/logwarn-1.0.11/logwarn.spec.in --- old/logwarn-1.0.10/logwarn.spec.in 2011-05-23 17:49:17.000000000 +0200 +++ new/logwarn-1.0.11/logwarn.spec.in 2013-05-13 17:16:13.000000000 +0200 @@ -15,20 +15,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# $Id: logwarn.spec.in 54 2011-05-23 15:49:17Z archie.cobbs $ +# $Id: logwarn.spec.in 110 2013-05-13 15:16:13Z archie.cobbs $ # Name: logwarn Version: @PACKAGE_VERSION@ Release: 1 -License: Apache License, Version 2.0 +License: Apache-2.0 Summary: Utility for finding interesting messages in log files -Group: System/Utilities +Group: System/Monitoring Source: %{name}-%{version}.tar.gz URL: http://%{name}.googlecode.com/ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: make BuildRequires: gcc +BuildRequires: nagios-rpm-macros %description %{name} searches for interesting messages in log files, where ``interest- @@ -55,9 +56,11 @@ make %install -rm -rf ${RPM_BUILD_ROOT} %{makeinstall} -install -d ${RPM_BUILD_ROOT}%{_var}/lib/%{name} +install -d %{buildroot}%{_var}/lib/%{name} +install -d %{buildroot}%{_datadir}/doc/packages/%{name} +install COPYING %{buildroot}%{_datadir}/doc/packages/%{name}/ +rm -rf %{buildroot}%{_datadir}/doc/packages/%{name}/INSTALL %files %attr(0755,root,root) %{_bindir}/%{name} @@ -68,16 +71,24 @@ %package nagios-plugin Summary: Nagios plugin based on the logwarn(1) utility -Group: System/Utilities +Group: System/Monitoring Requires: bash Requires: logwarn >= %{version} Buildarch: noarch %description nagios-plugin -A Nagios plugin based on the logwarn(1) utility. +%{name} searches for interesting messages in log files, where ``interest- +ing'' is defined by an user-supplied list of positive and negative (pre- +ceeded with a ``!'') extended regular expressions provided on the command +line. + +This package contains the Nagios plugin that is based on %{name}. %files nagios-plugin %defattr(0755,root,root,0755) -%attr(0755,root,root) %{_prefix}/lib/nagios +# avoid build dependecy of nagios - own the dirs +%dir %{nagios_libdir} +%dir %{nagios_plugindir} +%{nagios_plugindir}/check_logwarn %changelog 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/logwarn-1.0.10/main.c new/logwarn-1.0.11/main.c --- old/logwarn-1.0.10/main.c 2012-11-25 23:21:43.000000000 +0100 +++ new/logwarn-1.0.11/main.c 2013-12-30 19:13:49.000000000 +0100 @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * $Id: main.c 102 2012-11-25 22:21:41Z archie.cobbs $ + * $Id: main.c 114 2013-12-30 18:13:46Z archie.cobbs $ */ #include "config.h" @@ -63,15 +63,17 @@ static int read_from_beginning; static int quiet; static int any_matches; +static int line_numbers; static unsigned int error_count; -static unsigned int max_errors = UINT_MAX; -static unsigned int line_count = 0; -static unsigned int max_lines = UINT_MAX; +static unsigned int line_count; +static unsigned int max_errors_processed = UINT_MAX; +static unsigned int max_errors_output = UINT_MAX; +static unsigned int max_lines_output = UINT_MAX; static struct repat *match_patterns; // Internal functions static void scan_file(const char *file, struct scan_state *state); -static void parse_pattern(struct repat *pat, const char *string); +static void parse_pattern(struct repat *pat, const char *string, int eflags); static void version(void); static void usage(void); @@ -82,17 +84,22 @@ const char *logfile; struct stat sb; const char *rotpat = DEFAULT_ROTPAT; + const char *mpat = NULL; char *eptr; int ignore_nonexistent = 0; + int eflags = 0; int initialize = 0; int i; // Parse command line - while ((i = getopt(argc, argv, "ad:f:hiL:m:M:npqr:tvz")) != -1) { + while ((i = getopt(argc, argv, "acd:f:hilL:m:M:N:npqr:tvz")) != -1) { switch (i) { case 'a': auto_initialize = 1; break; + case 'c': + eflags |= REG_ICASE; + break; case 'd': state_dir = optarg; break; @@ -100,18 +107,28 @@ state_file = optarg; break; case 'm': - parse_pattern(&log_pattern, optarg); + mpat = optarg; + break; + case 'l': + line_numbers = 1; break; case 'L': - max_lines = (int)strtoul(optarg, &eptr, 10); - if (*optarg == '\0' || *eptr != '\0') { + max_lines_output = (int)strtoul(optarg, &eptr, 10); + if (*optarg == '\0' || *eptr != '\0' || max_lines_output < 0) { fprintf(stderr, "%s: invalid argument `%s' to `-%c' flag\n", PACKAGE, optarg, i); exit(EXIT_ERROR); } break; case 'M': - max_errors = (int)strtoul(optarg, &eptr, 10); - if (*optarg == '\0' || *eptr != '\0') { + max_errors_output = (int)strtoul(optarg, &eptr, 10); + if (*optarg == '\0' || *eptr != '\0' || max_errors_output < 0) { + fprintf(stderr, "%s: invalid argument `%s' to `-%c' flag\n", PACKAGE, optarg, i); + exit(EXIT_ERROR); + } + break; + case 'N': + max_errors_processed = (int)strtoul(optarg, &eptr, 10); + if (*optarg == '\0' || *eptr != '\0' || max_errors_processed <= 0) { fprintf(stderr, "%s: invalid argument `%s' to `-%c' flag\n", PACKAGE, optarg, i); exit(EXIT_ERROR); } @@ -146,6 +163,8 @@ exit(EXIT_ERROR); } } + if (mpat != NULL) + parse_pattern(&log_pattern, mpat, eflags); argv += optind; argc -= optind; switch (argc) { @@ -177,7 +196,7 @@ patstr++; pat->negate = 1; } - parse_pattern(pat, patstr); + parse_pattern(pat, patstr, eflags); } } break; @@ -199,7 +218,7 @@ } // Parse rotated file pattern - parse_pattern(&rot_pattern, rotpat); + parse_pattern(&rot_pattern, rotpat, 0); // Initialize state memset(&state, 0, sizeof(state)); @@ -424,13 +443,19 @@ break; } + // Is this a new log entry or a continuation line? + continuation = log_pattern.string != NULL && regexec(&log_pattern.regex, line, 0, NULL, 0) != 0; + + // If this is not a continuation, check if we have reached our limit on the number of errors processed + if (!continuation && error_count >= max_errors_processed) { + save_state(state_file, logfile, state); + break; + } + // Bump position and number of lines read state->pos += len; state->line++; - // Is this a new log entry or a continuation line? - continuation = log_pattern.string != NULL && regexec(&log_pattern.regex, line, 0, NULL, 0) != 0; - // Does this line match? New log entries lines only. if (!continuation) { int matches = -1; @@ -466,8 +491,11 @@ any_matches = 1; // Output line if appropriate - if (!quiet && line_count < max_lines && error_count <= max_errors) - printf("%s\n", line); + if (!quiet && line_count < max_lines_output && error_count <= max_errors_output) { + if (line_numbers) + printf("%ld:", state->line - 1); + printf("%s\n",line); + } // Update line and error counters line_count++; @@ -492,12 +520,12 @@ } static void -parse_pattern(struct repat *pat, const char *string) +parse_pattern(struct repat *pat, const char *string, int eflags) { char ebuf[1024]; int r; - if ((r = regcomp(&pat->regex, string, REG_EXTENDED|REG_NOSUB)) != 0) { + if ((r = regcomp(&pat->regex, string, REG_EXTENDED|REG_NOSUB|eflags)) != 0) { regerror(r, &pat->regex, ebuf, sizeof(ebuf)); fprintf(stderr, "%s: invalid regular expression \"%s\": %s", PACKAGE, string, ebuf); exit(EXIT_ERROR); @@ -509,17 +537,20 @@ usage(void) { fprintf(stderr, "Usage:\n"); - fprintf(stderr, " logwarn [-d dir | -f file] [-m firstpat] [-r sufpat] [-L lines] [-M msgs] [-ahnqpvz] logfile [!]pattern ...\n"); + fprintf(stderr, " logwarn [-d dir | -f file] [-m firstpat] [-r sufpat] [-L maxlines] [-M maxprint] [-N maxerrors] [-achlnqpvz] logfile [!]pattern ...\n"); fprintf(stderr, " logwarn [-d dir | -f file] -i logfile\n"); fprintf(stderr, "Options:\n"); fprintf(stderr, " -a Auto-init: force `-i' if no state file exists\n"); + fprintf(stderr, " -c Match patterns (and firstpat) case-insensitively"); fprintf(stderr, " -d Specify state directory; default \"%s\"\n", DEFAULT_STATE_DIR); fprintf(stderr, " -f Specify state file directly\n"); fprintf(stderr, " -h Output this help message and exit\n"); fprintf(stderr, " -i Initialize state as `up to date' (implies -n)\n"); fprintf(stderr, " -L Specify maximum number of lines to output per log message\n"); + fprintf(stderr, " -l Prefix each output line with the line number from the log file\n"); fprintf(stderr, " -m Enable multi-line support; first lines start with firstpat\n"); fprintf(stderr, " -M Specify maximum number of log messages to output\n"); + fprintf(stderr, " -N Specify maximum number of log messages to process\n"); fprintf(stderr, " -n A nonexistent log file is not an error; treat as empty\n"); fprintf(stderr, " -q Don't output the matched log messages\n"); fprintf(stderr, " -r Specify rotated file suffix pattern; default \"%s\"\n", DEFAULT_ROTPAT); @@ -532,7 +563,7 @@ version(void) { fprintf(stderr, "%s version %s (r%s)\n", PACKAGE_TARNAME, PACKAGE_VERSION, logwarn_svnrev); - fprintf(stderr, "Copyright (C) 2010-2012 Archie L. Cobbs\n"); + fprintf(stderr, "Copyright (C) 2010-2013 Archie L. Cobbs\n"); fprintf(stderr, "This is free software; see the source for copying conditions. There is NO\n"); fprintf(stderr, "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"); } 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/logwarn-1.0.10/scripts/missing new/logwarn-1.0.11/scripts/missing --- old/logwarn-1.0.10/scripts/missing 2012-11-25 23:33:56.000000000 +0100 +++ new/logwarn-1.0.11/scripts/missing 2014-01-12 20:18:48.000000000 +0100 @@ -1,10 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.18; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -26,7 +25,7 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi @@ -34,7 +33,7 @@ sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' sed_minuso='s/.* -o \([^ ]*\).*/\1/p' -# In the cases where this matters, `missing' is being run in the +# In the cases where this matters, 'missing' is being run in the # srcdir already. if test -f configure.ac; then configure_ac=configure.ac @@ -65,7 +64,7 @@ echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an error status if there is no known handling for PROGRAM. Options: @@ -74,21 +73,20 @@ --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' + aclocal touch file 'aclocal.m4' + autoconf touch file 'configure' + autoheader touch file 'config.h.in' autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c + automake touch all 'Makefile.in' files + bison create 'y.tab.[ch]', if possible, from existing .[ch] + flex create 'lex.yy.c', if possible, from existing .c help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c + lex create 'lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + yacc create 'y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <bug-autom...@gnu.org>." exit $? @@ -100,8 +98,8 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; @@ -122,22 +120,13 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 elif test "x$2" = "x--version" || test "x$2" = "x--help"; then # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether + # running '$TOOL --version' or '$TOOL --help' to check whether # $TOOL exists and not knowing $TOOL uses missing. exit 1 fi @@ -149,27 +138,27 @@ case $program in aclocal*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from +WARNING: '$1' is $msg. You should only need it if + you modified 'acinclude.m4' or '${configure_ac}'. You might want + to install the Automake and Perl packages. Grab them from any GNU archive site." touch aclocal.m4 ;; autoconf*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU +WARNING: '$1' is $msg. You should only need it if + you modified '${configure_ac}'. You might want to install the + Autoconf and GNU m4 packages. Grab them from any GNU archive site." touch configure ;; autoheader*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them +WARNING: '$1' is $msg. You should only need it if + you modified 'acconfig.h' or '${configure_ac}'. You might want + to install the Autoconf and GNU m4 packages. Grab them from any GNU archive site." files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" @@ -186,9 +175,9 @@ automake*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. +WARNING: '$1' is $msg. You should only need it if + you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. + You might want to install the Automake and Perl packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | sed 's/\.am$/.in/' | @@ -197,10 +186,10 @@ autom4te*) echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. +WARNING: '$1' is needed, but is $msg. You might have modified some files without having the proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU + You can get '$1' as part of Autoconf from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` @@ -220,13 +209,13 @@ bison*|yacc*) echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package +WARNING: '$1' $msg. You should only need it if + you modified a '.y' file. You may need the Bison package in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." + Bison from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -250,13 +239,13 @@ lex*|flex*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package +WARNING: '$1' is $msg. You should only need it if + you modified a '.l' file. You may need the Flex package in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." + Flex from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -273,10 +262,10 @@ help2man*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if +WARNING: '$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." + Help2man package in order for those modifications to take + effect. You can get Help2man from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -291,12 +280,12 @@ makeinfo*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file +WARNING: '$1' is $msg. You should only need it if + you modified a '.texi' or '.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." + call might also be the consequence of using a buggy 'make' (AIX, + DU, IRIX). You might want to install the Texinfo package or + the GNU make package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -318,49 +307,14 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. +WARNING: '$1' is needed, and is $msg. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, + proper tools for further handling them. Check the 'README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." + some other package would contain this missing '$1' program." exit 1 ;; esac 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/logwarn-1.0.10/svnrev.c new/logwarn-1.0.11/svnrev.c --- old/logwarn-1.0.10/svnrev.c 2012-11-25 23:34:25.000000000 +0100 +++ new/logwarn-1.0.11/svnrev.c 2014-01-12 20:18:56.000000000 +0100 @@ -1 +1 @@ -const char logwarn_svnrev[] = "104"; +const char logwarn_svnrev[] = "115"; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
