INN commit: branches/2.5 (3 files)

[INN Commit]

    Date: Sunday, June 28, 2009 @ 01:48:31
  Author: iulius
Revision: 8537

Use gzip instead of compress as the default UUCP batcher.

Modified:
  branches/2.5/backends/send-uucp.in
  branches/2.5/doc/pod/news.pod
  branches/2.5/doc/pod/rnews.pod

-----------------------+
 backends/send-uucp.in |   15 ++++++++-------
 doc/pod/news.pod      |    5 +++++
 doc/pod/rnews.pod     |    2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

Modified: backends/send-uucp.in
===================================================================
--- backends/send-uucp.in	2009-06-28 08:47:41 UTC (rev 8536)
+++ backends/send-uucp.in	2009-06-28 08:48:31 UTC (rev 8537)
@@ -142,7 +142,7 @@
 
     $compressor =~ s%.*/%%;   # Do not keep the complete path.
     $compressor =~ s% .*%%;   # Do not keep the optional parameters.
-    return $UNBATCHER{$compressor} || 'cunbatch';
+    return $UNBATCHER{$compressor} || $UNBATCHER{'gzip'};
 }
 
 ##############################################################################
@@ -162,7 +162,7 @@
         $maxjobs = '-N ' . ($MAXJOBS - $jobs);
     }
 
-    $compress ||= $INN::Config::compress;
+    $compress ||= $INN::Config::gzip;
     $size ||= $MAXSIZE;
 
     # if a .work temp file left by a previous invocation exists, rename
@@ -320,7 +320,7 @@
 The compression method to use for batches.  This should be one of C<bzip2>,
 C<compress>, C<gzip> or C<none>.  Arguments for the compression command may be
 specified by using C<_> instead of spaces.  For example, C<gzip_-9>.
-The default value is C<compress>.
+The default value is C<gzip>.
 
 =item I<maxsize>
 
@@ -353,14 +353,15 @@
     able
     pern::MYFUNNEL!
 
-This defines eight UUCP sites.  The first three use C<gzip> compression, the
-following site uses C<bzip2> and the last three use C<compress>.  The first
-six use a batch size of S<1 MB>, and the last site (C<able>) uses the default of
+This defines eight UUCP sites.  The first three and the last two use C<gzip>
+compression, the fourth site (C<drinkel>) uses C<bzip2> and the remaining sites
+(C<manhole> and C<owl>) use C<compress>.  The first six use a batch size of
+S<1 MB>, and the two last sites (C<able> and C<pern>) use the default of
 500,000 bytes.  The C<zoetermeer>, C<hoofddorp>, C<pa3ebv>, and C<manhole> sites
 will only have batches generated for them during the hours of 05:00, 18:00,
 and 22:00, and the C<drinkel> site will only have batches generated during those
 hours and 06:00, 20:00, 00:00, and 02:00.  There are no restrictions on when
-batches will be generated for C<owl> or C<able>.
+batches will be generated for C<owl>, C<able> and C<pern>.
 
 The C<pern> site is configured as a funnel into C<MYFUNNEL!>.  B<send-uucp> will
 issue C<ctlinnd flush MYFUNNEL!> instead of C<ctlinnd flush pern>.

Modified: doc/pod/news.pod
===================================================================
--- doc/pod/news.pod	2009-06-28 08:47:41 UTC (rev 8536)
+++ doc/pod/news.pod	2009-06-28 08:48:31 UTC (rev 8537)
@@ -43,6 +43,11 @@
 added to I<tlscapath> because it is required by B<nnrpd> when TLS
 is used.
 
+=item *
+
+gzip(1) is now the default UUCP batcher in B<send-uucp>, instead of
+compress(1) whose algorithm has patent issues.
+
 =back
 
 =head1 Upgrading from 2.4 to 2.5

Modified: doc/pod/rnews.pod
===================================================================
--- doc/pod/rnews.pod	2009-06-28 08:47:41 UTC (rev 8536)
+++ doc/pod/rnews.pod	2009-06-28 08:48:31 UTC (rev 8537)
@@ -49,7 +49,7 @@
 
 Otherwise, if the command is any other word, then B<rnews> will try to
 execute a program with that name, looking for it in the directory
-I<pathbin>/bin/rnews.libexec.  The rest of the batch will be fed to that
+I<pathbin>/rnews.libexec.  The rest of the batch will be fed to that
 program's standard input, and the standard output from the program will be
 treated as if it were the original input to B<rnews>.  INN comes with three
 such standard batch processors: