INN commit: trunk (6 files)
INN Commit
Russ_Allbery at isc.org
Thu Sep 20 20:53:16 UTC 2007
Date: Thursday, September 20, 2007 @ 13:53:16
Author: iulius
Revision: 7686
Fix the use of uustat in send-uucp(8).
The program is now searched at configure time and a $uustat
variable is provided by innshellvars and INN::Config.
Modified:
trunk/backends/send-uucp.in
trunk/configure.ac
trunk/perl/INN/Config.pm.in
trunk/scripts/innshellvars.in
trunk/scripts/innshellvars.pl.in
trunk/scripts/innshellvars.tcl.in
-----------------------------+
backends/send-uucp.in | 4 ++--
configure.ac | 2 ++
perl/INN/Config.pm.in | 3 ++-
scripts/innshellvars.in | 1 +
scripts/innshellvars.pl.in | 1 +
scripts/innshellvars.tcl.in | 1 +
6 files changed, 9 insertions(+), 3 deletions(-)
Modified: backends/send-uucp.in
===================================================================
--- backends/send-uucp.in 2007-09-20 20:12:55 UTC (rev 7685)
+++ backends/send-uucp.in 2007-09-20 20:53:16 UTC (rev 7686)
@@ -120,8 +120,8 @@
sub count_jobs {
my ($site) = @_;
- return 0 if not $INN::Config::have_uustat;
- open(JOBS, "uustat -s $site 2> /dev/null |") or logdie("cannot fork: $!");
+ return 0 if not $INN::Config::uustat;
+ open(JOBS, "$INN::Config::uustat -s $site 2> /dev/null |") or logdie("cannot fork: $!");
my $count = grep(/ Executing rnews /, <JOBS>);
close JOBS; # ignore errors, uustat may fail
return $count;
Modified: configure.ac
===================================================================
--- configure.ac 2007-09-20 20:12:55 UTC (rev 7685)
+++ configure.ac 2007-09-20 20:53:16 UTC (rev 7686)
@@ -248,12 +248,14 @@
AC_ARG_VAR([SED], [Location of sed])
AC_ARG_VAR([SORT], [Location of sort])
AC_ARG_VAR([SSLBIN], [Location of openssl])
+AC_ARG_VAR([UUSTAT], [Location of uustat])
AC_ARG_VAR([UUX], [Location of uux])
INN_PATH_PROG_ENSURE([AWK], [awk])
INN_PATH_PROG_ENSURE([EGREP], [egrep])
INN_PATH_PROG_ENSURE([SED], [sed])
INN_PATH_PROG_ENSURE([SORT], [sort])
AC_PATH_PROGS([SSLBIN], [openssl], [openssl])
+AC_PATH_PROGS([UUSTAT], [uustat])
AC_PATH_PROGS([UUX], [uux], [uux])
INN_PATH_COMPRESS
INN_PATH_SENDMAIL
Modified: perl/INN/Config.pm.in
===================================================================
--- perl/INN/Config.pm.in 2007-09-20 20:12:55 UTC (rev 7685)
+++ perl/INN/Config.pm.in 2007-09-20 20:53:16 UTC (rev 7686)
@@ -111,7 +111,7 @@
## Paths of external used programs.
my @EXTPROGVAR = qw($awk $egrep $gpgv $perl $pgp $sed
-$sort $getftp $uux);
+$sort $getftp $uustat $uux);
our $awk = '@AWK@';
our $egrep = '@EGREP@';
our $gpgv = '@GPGV@';
@@ -120,6 +120,7 @@
our $sed = '@SED@';
our $sort = '@SORT@';
our $getftp = '@PATH_GETFTP@';
+our $uustat = '@UUSTAT@';
our $uux = '@UUX@';
Modified: scripts/innshellvars.in
===================================================================
--- scripts/innshellvars.in 2007-09-20 20:12:55 UTC (rev 7685)
+++ scripts/innshellvars.in 2007-09-20 20:53:16 UTC (rev 7686)
@@ -78,6 +78,7 @@
PGP='@PGP@'
SORT='@SORT@'
GETFTP='@PATH_GETFTP@'
+UUSTAT='@UUSTAT@'
UUX='@UUX@'
BZIP2='@BZIP2@'
Modified: scripts/innshellvars.pl.in
===================================================================
--- scripts/innshellvars.pl.in 2007-09-20 20:12:55 UTC (rev 7685)
+++ scripts/innshellvars.pl.in 2007-09-20 20:53:16 UTC (rev 7686)
@@ -83,6 +83,7 @@
$pgp = '@PGP@' ;
$sort = '@SORT@' ;
$getftp = '@PATH_GETFTP@' ;
+$uustat = '@UUSTAT@' ;
$uux = '@UUX@' ;
$bzip2 = '@BZIP2@' ;
Modified: scripts/innshellvars.tcl.in
===================================================================
--- scripts/innshellvars.tcl.in 2007-09-20 20:12:55 UTC (rev 7685)
+++ scripts/innshellvars.tcl.in 2007-09-20 20:53:16 UTC (rev 7686)
@@ -78,6 +78,7 @@
set inn_egrep "@EGREP@"
set inn_sort "@SORT@"
set inn_getftp "@PATH_GETFTP@"
+set inn_uustat "@UUSTAT@"
set inn_uux "@UUX@"
set inn_bzip2 "@BZIP2@"
More information about the inn-committers
mailing list