Hello community,
here is the log from the commit of package fs-check
checked in at Wed Apr 2 20:19:22 CEST 2008.
--------
--- fs-check/fs-check.changes 2007-01-08 13:00:54.000000000 +0100
+++ fs-check/fs-check.changes 2008-04-02 15:19:43.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Apr 2 15:18:31 CEST 2008 - hvogel@suse.de
+
+- update to version 0.8
+ * Correct pidfile option parsing
+- some rpmlint warnings fixed
+
+-------------------------------------------------------------------
Old:
----
fs-check-0.7.dif
fs-check-0.7.tar.bz2
New:
----
fs-check-0.8.dif
fs-check-0.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fs-check.spec ++++++
--- /var/tmp/diff_new_pack.AP9004/_old 2008-04-02 20:16:52.000000000 +0200
+++ /var/tmp/diff_new_pack.AP9004/_new 2008-04-02 20:16:52.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package fs-check (Version 0.7)
+# spec file for package fs-check (Version 0.8)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,18 +10,19 @@
# norootforbuild
+
Name: fs-check
BuildRequires: mailx
-URL: http://fs-check.sourceforge.net
-License: GNU General Public License (GPL)
+Url: http://fs-check.sourceforge.net
+License: GPL v2 or later
Group: System/Monitoring
-Autoreqprov: on
+AutoReqProv: on
Requires: mailx
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Version: 0.7
-Release: 26
+Version: 0.8
+Release: 1
Summary: Check File System Usage
-BuildArchitectures: noarch
+BuildArch: noarch
Source: %{name}-%{version}.tar.bz2
Source1: %{name}.cf
Patch: %{name}-%{version}.dif
@@ -43,11 +44,13 @@
%build
./configure --prefix=%{_prefix} --mandir=%{_mandir}
make
+
+%check
make check
-mkdir -p $RPM_BUILD_ROOT/etc
-cp %SOURCE1 $RPM_BUILD_ROOT/etc
%install
+mkdir -p $RPM_BUILD_ROOT/etc
+cp %SOURCE1 $RPM_BUILD_ROOT/etc
make install DESTDIR=$RPM_BUILD_ROOT
%clean
@@ -62,25 +65,29 @@
%{_bindir}/fs-check
%{_bindir}/fs-report
-%changelog -n fs-check
-* Mon Jan 08 2007 - mskibbe@suse.de
+%changelog
+* Wed Apr 02 2008 hvogel@suse.de
+- update to version 0.8
+ * Correct pidfile option parsing
+- some rpmlint warnings fixed
+* Mon Jan 08 2007 mskibbe@suse.de
- fs-check expects fs-check.cfg in /var/adm rather then etc
( #231222 )
-* Wed Aug 30 2006 - mskibbe@suse.de
+* Wed Aug 30 2006 mskibbe@suse.de
- update to version 0.7 which
o contains bugfixes
o fix make distcheck
o update copyright
-* Sat Feb 25 2006 - kukuk@suse.de
+* Sat Feb 25 2006 kukuk@suse.de
- Workaround configure checks for autobuild
- Don't start in "norun" mode per default
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Wed Sep 07 2005 - kukuk@suse.de
+* Wed Sep 07 2005 kukuk@suse.de
- Update to version 0.6
-* Thu Jul 21 2005 - kukuk@suse.de
+* Thu Jul 21 2005 kukuk@suse.de
- Update to version 0.5
-* Tue Nov 02 2004 - kukuk@suse.de
+* Tue Nov 02 2004 kukuk@suse.de
- Update to version 0.4
-* Mon Jun 28 2004 - kukuk@suse.de
+* Mon Jun 28 2004 kukuk@suse.de
- Initial version
++++++ fs-check-0.7.dif -> fs-check-0.8.dif ++++++
++++++ fs-check-0.7.tar.bz2 -> fs-check-0.8.tar.bz2 ++++++
++++ 7054 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/fs-check-0.7/ChangeLog new/fs-check-0.8/ChangeLog
--- old/fs-check-0.7/ChangeLog 2006-02-27 10:03:17.000000000 +0100
+++ new/fs-check-0.8/ChangeLog 2008-03-08 04:13:58.000000000 +0100
@@ -2,6 +2,39 @@
## autogenerated ChangeLog -- don't edit
##
+2008-03-07 Friday 18:42 Rocky Bernstein
+
+ * NEWS, configure.ac: Minor typos. Change to release 0.8
+
+2008-03-07 Friday 18:36 Rocky Bernstein
+
+ * fs-check.in.in, test/fs-check.t.in: Correct pidfile option
+ parsing. Bug found by Jan Gruber. Remove warnings for Perl 5.8.8
+ and autoconf now seems to not include trailing slash in
+ top_builddir.
+
+2006-11-14 Tuesday 21:10 Rocky Bernstein
+
+ * home-page/index.html.in: Correct download link, and make HTML
+ 4.01 transitional valid as well.
+
+2006-11-14 Tuesday 18:47 Rocky Bernstein
+
+ * home-page/: download.html, index.html.in: Correct download link
+ and make valid HTML 4.01 transitional.
+
+2006-05-13 Saturday 12:46 Rocky Bernstein
+
+ * post-configure.in: minor changes
+
+2006-02-27 Monday 09:42 Rocky Bernstein
+
+ * home-page/index.html.in: Better HTML.
+
+2006-02-27 Monday 09:04 Rocky Bernstein
+
+ * cvs2cl_usermap: Use cpan address.
+
2006-02-27 Monday 08:30 Rocky Bernstein
* NEWS: NEWS
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/fs-check-0.7/configure.ac new/fs-check-0.8/configure.ac
--- old/fs-check-0.7/configure.ac 2006-02-27 09:22:56.000000000 +0100
+++ new/fs-check-0.8/configure.ac 2008-03-07 19:42:26.000000000 +0100
@@ -1,7 +1,7 @@
-dnl $Id: configure.ac,v 1.35 2006/02/27 08:22:56 rockyb Exp $
+dnl $Id: configure.ac,v 1.36 2008/03/07 18:42:26 rockyb Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(fs-check.in.in)
-AM_INIT_AUTOMAKE(fs-check,0.7)
+AM_INIT_AUTOMAKE(fs-check,0.8)
AM_MISSING_PROG(CVS2CL, cvs2cl, $missing_dir)
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/fs-check-0.7/doc/fs-check.8 new/fs-check-0.8/doc/fs-check.8
--- old/fs-check-0.7/doc/fs-check.8 2006-02-27 09:23:20.000000000 +0100
+++ new/fs-check-0.8/doc/fs-check.8 2008-03-08 05:10:05.000000000 +0100
@@ -25,11 +25,11 @@
..
.\" Set up some character translations and predefined strings. \*(-- will
.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote. | will give a
-.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to
-.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C'
-.\" expand to `' in nroff, nothing in troff, for use with C<>.
-.tr \(*W-|\(bv\*(Tr
+.\" double quote, and \*(R" will give a right double quote. \*(C+ will
+.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
.ie n \{\
. ds -- \(*W-
@@ -129,7 +129,7 @@
.\" ========================================================================
.\"
.IX Title "FS-CHECK 8"
-.TH FS-CHECK 8 "2006-02-27" "perl v5.8.8" "User Contributed Perl Documentation"
+.TH FS-CHECK 8 "2008-03-07" "perl v5.8.8" "User Contributed Perl Documentation"
.SH "NAME"
fs\-check \- size report daemon/program
.SH "SYNOPSIS"
@@ -169,7 +169,7 @@
The default is
.Sp
.Vb 1
-\& /bin/df -t jfs -t ext2 -t ext3 -t ntfs -t reiserfs -t vfat --local
+\& /bin/df \-t jfs \-t ext2 \-t ext3 \-t ntfs \-t reiserfs \-t vfat \-\-local
.Ve
.IP "\-\-mail \fImail program\fR" 4
.IX Item "--mail mail program"
@@ -280,11 +280,11 @@
.PP
.Vb 2
\& # This is the program to run when no other program is specified...
-\& default action /usr/local/bin/fs-report
+\& default action /usr/local/bin/fs\-report
.Ve
.PP
.Vb 2
-\& # Limit at which to complain about i-nodes...
+\& # Limit at which to complain about i\-nodes...
\& default ilimit 99%
.Ve
.PP
@@ -304,7 +304,7 @@
\& #limit /usr 95%
\& #limit /src 90%
\& limit /home 90%
-\& action /var /usr/local/bin/fs-report --nocore
+\& action /var /usr/local/bin/fs\-report \-\-nocore
.Ve
.PP
.Vb 3
@@ -347,14 +347,14 @@
To debug a configuration file the following options are useful:
.PP
.Vb 1
-\& fs-check --norun -1 --debug 2 *configuration-file*
+\& fs\-check \-\-norun \-1 \-\-debug 2 *configuration\-file*
.Ve
.PP
For even more information and control try running the above under the
Perl debugger, e.g.
.PP
.Vb 1
-\& perl -d fs-check --norun -1 --debug *configuration-file*
+\& perl \-d fs\-check \-\-norun \-1 \-\-debug *configuration\-file*
.Ve
.SH "SEE ALSO"
.IX Header "SEE ALSO"
@@ -402,8 +402,8 @@
.Vb 4
\& You should have received a copy of the GNU General Public License
\& along with GNU Make; see the file COPYING. If not, write to the
-\& Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-\& MA 02111-1307, USA.
+\& Free Software Foundation, Inc., 59 Temple Place \- Suite 330, Boston,
+\& MA 02111\-1307, USA.
.Ve
.PP
-\&\fI$Id: fs\-check.in.in,v 1.26 2006/02/25 18:27:54 rockyb Exp $\fR
+\&\fI$Id: fs\-check.in.in,v 1.28 2008/03/07 18:36:40 rockyb Exp $\fR
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/fs-check-0.7/doc/fs-check.html new/fs-check-0.8/doc/fs-check.html
--- old/fs-check-0.7/doc/fs-check.html 2006-02-27 09:23:20.000000000 +0100
+++ new/fs-check-0.8/doc/fs-check.html 2008-03-08 05:12:47.000000000 +0100
@@ -341,7 +341,7 @@
along with GNU Make; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
MA 02111-1307, USA.</pre>
-<p><em>$Id: fs-check.in.in,v 1.26 2006/02/25 18:27:54 rockyb Exp $</em></p>
+<p><em>$Id: fs-check.in.in,v 1.28 2008/03/07 18:36:40 rockyb Exp $</em></p>
</body>
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/fs-check-0.7/fs-check new/fs-check-0.8/fs-check
--- old/fs-check-0.7/fs-check 2006-02-27 09:23:11.000000000 +0100
+++ new/fs-check-0.8/fs-check 2008-03-08 05:09:59.000000000 +0100
@@ -1,10 +1,10 @@
#!/usr/bin/perl -w
# -*- Perl -*-
use diagnostics;
-my $vcid='$Id: fs-check.in.in,v 1.26 2006/02/25 18:27:54 rockyb Exp $ ';
+my $vcid='$Id: fs-check.in.in,v 1.28 2008/03/07 18:36:40 rockyb Exp $ ';
###########################################################################
-# Copyright (C) 2004, 2005, 2006 R. Bernstein email:
+# Copyright (C) 2004, 2005, 2006, 2008 R. Bernstein email:
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
@@ -155,8 +155,6 @@
# Now do some work...
install_trap_handlers();
-# Check if another copy of this is running?
-create_pid_file();
read_config_file($config_file);
# Handle verbose processing: print out internal tables built from
@@ -192,9 +190,11 @@
}
if ($opt_once) {
+ create_pid_file();
check_fs();
} else {
daemonize();
+ create_pid_file();
while (1) {
check_fs();
print "Sleeping for $sleep_interval seconds\n" if $opt_verbose;
@@ -690,7 +690,7 @@
'timeout:n' => \$opt_timeout,
'df:s' => \$df_program,
'mail:s' => \$mail_program,
- 'pidfile' => \$pid_file,
+ 'pidfile:s' => \$pid_file,
'inode!' => \$check_inode,
'd|debug:n' => \$debug,
'v|verbose' => \$opt_verbose,
@@ -1018,7 +1018,7 @@
Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
MA 02111-1307, USA.
-I<$Id: fs-check.in.in,v 1.26 2006/02/25 18:27:54 rockyb Exp $>
+I<$Id: fs-check.in.in,v 1.28 2008/03/07 18:36:40 rockyb Exp $>
=cut
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/fs-check-0.7/fs-check.in.in new/fs-check-0.8/fs-check.in.in
--- old/fs-check-0.7/fs-check.in.in 2006-02-27 09:22:56.000000000 +0100
+++ new/fs-check-0.8/fs-check.in.in 2008-03-08 05:12:41.000000000 +0100
@@ -1,10 +1,10 @@
#!@PERL@ -w
# -*- Perl -*-
use diagnostics;
-my $vcid='$Id: fs-check.in.in,v 1.27 2006/02/27 08:22:56 rockyb Exp $ ';
+my $vcid='$Id: fs-check.in.in,v 1.29 2008/03/08 04:12:41 rockyb Exp $ ';
###########################################################################
-# Copyright (C) 2004, 2005, 2006 R. Bernstein email:
+# Copyright (C) 2004, 2005, 2006, 2008 R. Bernstein email:
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
@@ -155,8 +155,6 @@
# Now do some work...
install_trap_handlers();
-# Check if another copy of this is running?
-create_pid_file();
read_config_file($config_file);
# Handle verbose processing: print out internal tables built from
@@ -192,9 +190,11 @@
}
if ($opt_once) {
+ create_pid_file();
check_fs();
} else {
daemonize();
+ create_pid_file();
while (1) {
check_fs();
print "Sleeping for $sleep_interval seconds\n" if $opt_verbose;
@@ -690,7 +690,7 @@
'timeout:n' => \$opt_timeout,
'df:s' => \$df_program,
'mail:s' => \$mail_program,
- 'pidfile' => \$pid_file,
+ 'pidfile:s' => \$pid_file,
'inode!' => \$check_inode,
'd|debug:n' => \$debug,
'v|verbose' => \$opt_verbose,
@@ -1018,7 +1018,7 @@
Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
MA 02111-1307, USA.
-I<$Id: fs-check.in.in,v 1.27 2006/02/27 08:22:56 rockyb Exp $>
+I<$Id: fs-check.in.in,v 1.29 2008/03/08 04:12:41 rockyb Exp $>
=cut
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/fs-check-0.7/INSTALL new/fs-check-0.8/INSTALL
--- old/fs-check-0.7/INSTALL 2005-12-19 16:38:26.000000000 +0100
+++ new/fs-check-0.8/INSTALL 2006-11-17 14:08:39.000000000 +0100
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -10,7 +10,10 @@
Basic Installation
==================
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -23,9 +26,9 @@
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -78,7 +78,7 @@
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
@@ -87,17 +87,15 @@
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
Installation Names
==================
@@ -190,12 +188,12 @@
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
+overridden in the site shell script).
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
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/fs-check-0.7/missing new/fs-check-0.8/missing
--- old/fs-check-0.7/missing 2005-12-19 16:38:26.000000000 +0100
+++ new/fs-check-0.8/missing 2006-11-17 14:08:39.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
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
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
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 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
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/fs-check-0.7/NEWS new/fs-check-0.8/NEWS
--- old/fs-check-0.7/NEWS 2006-02-27 09:30:55.000000000 +0100
+++ new/fs-check-0.8/NEWS 2008-03-08 05:12:41.000000000 +0100
@@ -1,3 +1,7 @@
+0.8
+ - Fix bug for handling --pidfile from Jan Gurber
+ Wrong PID put in pidfile when is a daemon.
+
0.7
- Patches from Thorsten Kukuk (see ChangeLog)
- Allow default config file to get specified in configuration.
@@ -66,4 +70,4 @@
This program goes back a decade or so. I've just gotten
around to generalizing and autoconfiguring it.
-$Id: NEWS,v 1.18 2006/02/27 08:30:55 rockyb Exp $
+$Id: NEWS,v 1.20 2008/03/08 04:12:41 rockyb Exp $
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/fs-check-0.7/post-configure.in new/fs-check-0.8/post-configure.in
--- old/fs-check-0.7/post-configure.in 2006-02-27 09:22:56.000000000 +0100
+++ new/fs-check-0.8/post-configure.in 2006-05-13 14:46:08.000000000 +0200
@@ -1,10 +1,10 @@
#!@PERL@ -w
-# $Id: post-configure.in,v 1.9 2006/02/27 08:22:56 rockyb Exp $
+# -*- Perl -*-
+# $Id: post-configure.in,v 1.10 2006/05/13 12:46:08 rockyb Exp $
require 5.006;
use strict;
sub touch_file($);
-my $srcdir= $ARGV[0] ? $ARGV[0] : '.';
my $program='@PACKAGE@';
# Reassignment to variable makes interactive debugging easier
@@ -60,6 +60,7 @@
# the version that get's checked into CVS.
touch_file("./${program}.stamp");
print "All done. Now run \"make\"; \"make check\"\n";
+exit;
sub touch_file($) {
my $file_name = $_[0];
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/fs-check-0.7/test/fs-check.t new/fs-check-0.8/test/fs-check.t
--- old/fs-check-0.7/test/fs-check.t 2006-02-27 09:23:12.000000000 +0100
+++ new/fs-check-0.8/test/fs-check.t 2008-03-08 05:09:57.000000000 +0100
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
# -*- Perl -*-
-# $Id: fs-check.t.in,v 1.13 2006/02/25 18:48:36 rockyb Exp $
+# $Id: fs-check.t.in,v 1.14 2008/03/07 18:36:40 rockyb Exp $
use strict;
# require 'driver-init.pl';
@@ -10,19 +10,22 @@
system("rm -f /tmp/fs-check*.timestamp");
print "1..6\n";
-
+my @good_output;
+my $i;
#
# First simple test -- nothing should trigger.
#
-my @output=`../fs-check --pidfile ./fs-check.pid --df ../test/bogus-df --mail mailtest -n -v -1 -f ./fs-check-t1.cnf 2>&1`;
+my $top_builddir = (substr("..", -1)) eq '/' ?
+ substr("..", 0, -1) : "..";
+my @output=`$top_builddir/fs-check --pidfile ./fs-check.pid --df $top_builddir/test/bogus-df --mail mailtest -n -v -1 -f ./fs-check-t1.cnf 2>&1`;
if (!open(TEST_LOG, "<", "./fs-check-t1.log")) {
print "not ok 1\n";
print "not ok 2\n";
} else {
print "ok 1\n";
- my @good_output=;
+ @good_output=;
close(TEST_LOG);
# Remove top_builddir differences.
@@ -32,7 +35,7 @@
if (@good_output != @output) {
print "not ok 2\n";
} else {
- my $i=0;
+ $i=0;
for ($i=0; $i <= $#good_output; $i++) {
last if $good_output[$i] ne $output[$i];
}
@@ -47,19 +50,19 @@
# Remove any timestamp files
system("rm -f /tmp/fs-check*.timestamp");
-@output=`../fs-check --pidfile ./fs-check.pid --noinode --df ../test/bogus-df --mail mailtest -n -v -1 -f ./fs-check-t2.cnf 2>&1`;
+@output=`$top_builddir/fs-check --pidfile ./fs-check.pid --noinode --df $top_builddir/test/bogus-df --mail mailtest -n -v -1 -f ./fs-check-t2.cnf 2>&1`;
if (!open(TEST_LOG, "<", "./fs-check-t2.log")) {
print "not ok 3\n";
print "not ok 4\n";
} else {
print "ok 3\n";
- my @good_output=;
+ @good_output=;
close(TEST_LOG);
if (@good_output != @output) {
print "not ok 4\n";
} else {
- my $i=0;
+ $i=0;
# Remove top_builddir differences.
$output[1] =~ s|program:.*bogus-df|program: bogus-df|;
$good_output[1] =~ s|program:.*bogus-df|program: bogus-df|;
@@ -87,14 +90,14 @@
system("rm -f /tmp/fs-check*.timestamp");
if (1) {
- @output=`../fs-check --pidfile ./fs-check.pid --df ../test/bogus-df --mail mailtest -n -v -1 -f ./fs-check-ti.cnf 2>&1`;
+ @output=`$top_builddir/fs-check --pidfile ./fs-check.pid --df $top_builddir/test/bogus-df --mail mailtest -n -v -1 -f ./fs-check-ti.cnf 2>&1`;
if (!open(TEST_LOG, "<", "./fs-check-ti.log")) {
print "not ok 5\n";
print "not ok 6\n";
} else {
print "ok 5\n";
- my @good_output=;
+ @good_output=;
close(TEST_LOG);
# Remove top_builddir differences.
@@ -104,7 +107,7 @@
if (@good_output != @output) {
print "not ok 6\n";
} else {
- my $i=0;
+ $i=0;
for ($i=0; $i <= $#good_output; $i++) {
if ($i == 16) {
last if $output[16] !~
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/fs-check-0.7/test/fs-check.t.in new/fs-check-0.8/test/fs-check.t.in
--- old/fs-check-0.7/test/fs-check.t.in 2006-02-25 19:48:36.000000000 +0100
+++ new/fs-check-0.8/test/fs-check.t.in 2008-03-07 19:36:40.000000000 +0100
@@ -1,6 +1,6 @@
#!@PERL@ -w
# -*- Perl -*-
-# $Id: fs-check.t.in,v 1.13 2006/02/25 18:48:36 rockyb Exp $
+# $Id: fs-check.t.in,v 1.14 2008/03/07 18:36:40 rockyb Exp $
use strict;
# require 'driver-init.pl';
@@ -10,19 +10,22 @@
system("rm -f /tmp/fs-check*.timestamp");
print "1..6\n";
-
+my @good_output;
+my $i;
#
# First simple test -- nothing should trigger.
#
-my @output=`@top_builddir@fs-check --pidfile ./fs-check.pid --df @top_builddir@test/bogus-df --mail mailtest -n -v -1 -f @srcdir@/fs-check-t1.cnf 2>&1`;
+my $top_builddir = (substr("@top_builddir@", -1)) eq '/' ?
+ substr("@top_builddir@", 0, -1) : "@top_builddir@";
+my @output=`$top_builddir/fs-check --pidfile ./fs-check.pid --df $top_builddir/test/bogus-df --mail mailtest -n -v -1 -f @srcdir@/fs-check-t1.cnf 2>&1`;
if (!open(TEST_LOG, "<", "@srcdir@/fs-check-t1.log")) {
print "not ok 1\n";
print "not ok 2\n";
} else {
print "ok 1\n";
- my @good_output=;
+ @good_output=;
close(TEST_LOG);
# Remove top_builddir differences.
@@ -32,7 +35,7 @@
if (@good_output != @output) {
print "not ok 2\n";
} else {
- my $i=0;
+ $i=0;
for ($i=0; $i <= $#good_output; $i++) {
last if $good_output[$i] ne $output[$i];
}
@@ -47,19 +50,19 @@
# Remove any timestamp files
system("rm -f /tmp/fs-check*.timestamp");
-@output=`@top_builddir@fs-check --pidfile ./fs-check.pid --noinode --df @top_builddir@test/bogus-df --mail mailtest -n -v -1 -f @srcdir@/fs-check-t2.cnf 2>&1`;
+@output=`$top_builddir/fs-check --pidfile ./fs-check.pid --noinode --df $top_builddir/test/bogus-df --mail mailtest -n -v -1 -f @srcdir@/fs-check-t2.cnf 2>&1`;
if (!open(TEST_LOG, "<", "@srcdir@/fs-check-t2.log")) {
print "not ok 3\n";
print "not ok 4\n";
} else {
print "ok 3\n";
- my @good_output=;
+ @good_output=;
close(TEST_LOG);
if (@good_output != @output) {
print "not ok 4\n";
} else {
- my $i=0;
+ $i=0;
# Remove top_builddir differences.
$output[1] =~ s|program:.*bogus-df|program: bogus-df|;
$good_output[1] =~ s|program:.*bogus-df|program: bogus-df|;
@@ -87,14 +90,14 @@
system("rm -f /tmp/fs-check*.timestamp");
if (@HAVE_DF_INODES@) {
- @output=`@top_builddir@fs-check --pidfile ./fs-check.pid --df @top_builddir@test/bogus-df --mail mailtest -n -v -1 -f @srcdir@/fs-check-ti.cnf 2>&1`;
+ @output=`$top_builddir/fs-check --pidfile ./fs-check.pid --df $top_builddir/test/bogus-df --mail mailtest -n -v -1 -f @srcdir@/fs-check-ti.cnf 2>&1`;
if (!open(TEST_LOG, "<", "@srcdir@/fs-check-ti.log")) {
print "not ok 5\n";
print "not ok 6\n";
} else {
print "ok 5\n";
- my @good_output=;
+ @good_output=;
close(TEST_LOG);
# Remove top_builddir differences.
@@ -104,7 +107,7 @@
if (@good_output != @output) {
print "not ok 6\n";
} else {
- my $i=0;
+ $i=0;
for ($i=0; $i <= $#good_output; $i++) {
if ($i == 16) {
last if $output[16] !~
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org