INN commit: trunk (11 files)

Fri Aug 10 11:25:06 UTC 2007

Date: Friday, August 10, 2007 @ 04:25:05
  Author: iulius
Revision: 7642

Add support for bzip2-compressed batches (with bunbatch)
and documentation update.

Modified:
  trunk/Makefile.global.in
  trunk/doc/pod/batcher.pod
  trunk/doc/pod/rnews.pod
  trunk/frontends/	(properties)
  trunk/frontends/Makefile
  trunk/m4/compress.m4
  trunk/scripts/inncheck.in
  trunk/scripts/innshellvars.in
  trunk/scripts/innshellvars.pl.in
  trunk/scripts/innshellvars.tcl.in
  trunk/support/mkmanifest

-----------------------------+
 Makefile.global.in          |    1 +
 doc/pod/batcher.pod         |    6 +++---
 doc/pod/rnews.pod           |   26 ++++++++++++++++++++------
 frontends/Makefile          |    7 ++++++-
 m4/compress.m4              |   10 +++++++++-
 scripts/inncheck.in         |    2 +-
 scripts/innshellvars.in     |    1 +
 scripts/innshellvars.pl.in  |    1 +
 scripts/innshellvars.tcl.in |    1 +
 support/mkmanifest          |    1 +
 10 files changed, 44 insertions(+), 12 deletions(-)

Modified: Makefile.global.in
===================================================================

--- Makefile.global.in	2007-08-10 07:56:30 UTC (rev 7641)
+++ Makefile.global.in	2007-08-10 11:25:05 UTC (rev 7642)
@@ -180,6 +180,7 @@
 ##  include/inn/paths.h.  You may also need to modify scripts/innshellvars*.
 
 AWK		= @AWK@
+BZIP2		= @BZIP2@
 COMPRESS	= @COMPRESS@
 CTAGS		= ctags -t -w
 GZIP		= @GZIP@

Modified: doc/pod/batcher.pod
===================================================================
--- doc/pod/batcher.pod	2007-08-10 07:56:30 UTC (rev 7641)
+++ doc/pod/batcher.pod	2007-08-10 11:25:05 UTC (rev 7642)
@@ -74,7 +74,7 @@
 =item B<-N> I<batches>
 
 Limits the total number of batches written.  As soon as the number of
-batches written reaches or exceeds I<baches>, all additional articles in
+batches written reaches or exceeds I<batches>, all additional articles in
 the input will be deferred.  The default is no limit.
 
 =item B<-p> I<process>
@@ -114,7 +114,7 @@
 
 Specifies an additional spool directory to search in for articles.  If
 this option is given, the first field of an input line is a relative path
-name, and the article isn't found in I<patharticles>, it is also looked
+name, and if the article isn't found in I<patharticles>, it is also looked
 for under I<spool>.
 
 =item B<-v>
@@ -164,6 +164,6 @@
 
 =head1 SEE ALSO
 
-ctlinnd(8), inn.conf(5), newsfeeds(5), rnews(8), send-uucp(8), shlock(1)
+ctlinnd(8), inn.conf(5), newsfeeds(5), rnews(8), send-uucp(8), shlock(1).
 
 =cut

Modified: doc/pod/rnews.pod
===================================================================
--- doc/pod/rnews.pod	2007-08-10 07:56:30 UTC (rev 7641)
+++ doc/pod/rnews.pod	2007-08-10 11:25:05 UTC (rev 7642)
@@ -51,12 +51,26 @@
 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
 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 two
-such standard batch processors:  B<c7unbatch>, which undoes an ASCII
-encoding to recover the original binary compressed stream and then
-decompresses it as above, and B<gunbatch>, which also invokes B<gzip> and
-should be used for batches compressed with B<gzip>.
+treated as if it were the original input to B<rnews>.  INN comes with three
+such standard batch processors:
 
+=over 2
+
+=item B<bunbatch>
+
+It invokes B<bzip2> and should be used for batches compressed with B<bzip2>.
+
+=item B<c7unbatch>
+
+It undoes an ASCII encoding to recover the original binary compressed stream
+and then decompresses it as explained above.
+
+=item B<gunbatch>
+
+It invokes B<gzip> and should be used for batches compressed with B<gzip>.
+
+=back
+
 By default, B<rnews> will log and discard any articles that are rejected
 by the server or cannot be parsed by B<rnews> for some reason (such as a
 missing header).  This default can be changed when compiling INN by
@@ -121,6 +135,6 @@
 
 =head1 SEE ALSO
 
-compress(1), gzip(1), inn.conf(5), innd(8), nnrpd(8)
+bzip2(1), compress(1), gzip(1), inn.conf(5), innd(8), nnrpd(8).
 
 =cut


Property changes on: trunk/frontends
___________________________________________________________________
Name: svn:ignore
   - .libs
c7unbatch
cnfsheadconf
cnfsstat
ctlinnd
decode
encode
getlist
gunbatch
inews
innconfval
mailpost
ovdb_init
ovdb_monitor
ovdb_server
ovdb_stat
pullnews
rnews
scanspool
sm
   + .libs
bunbatch
c7unbatch
cnfsheadconf
cnfsstat
ctlinnd
decode
encode
getlist
gunbatch
inews
innconfval
mailpost
ovdb_init
ovdb_monitor
ovdb_server
ovdb_stat
pullnews
rnews
scanspool
sm


Modified: frontends/Makefile
===================================================================
--- frontends/Makefile	2007-08-10 07:56:30 UTC (rev 7641)
+++ frontends/Makefile	2007-08-10 11:25:05 UTC (rev 7642)
@@ -5,7 +5,7 @@
 top           = ..
 CFLAGS        = $(GCFLAGS)
 
-ALL	      = c7unbatch cnfsheadconf cnfsstat ctlinnd decode encode \
+ALL	      = bunbatch c7unbatch cnfsheadconf cnfsstat ctlinnd decode encode \
 		getlist gunbatch inews innconfval mailpost pullnews \
 		ovdb_init ovdb_monitor ovdb_server ovdb_stat rnews \
 		scanspool sm
@@ -34,6 +34,7 @@
 	for F in getlist innconfval sm ; do \
 	    $(LI_XPUB) $$F $D$(PATHBIN)/$$F ; \
 	done
+	$(CP_XPUB) bunbatch $D$(PATHBIN)/rnews.libexec/bunbatch
 	$(CP_XPUB) c7unbatch $D$(PATHBIN)/rnews.libexec/c7unbatch
 	$(LI_XPUB) decode $D$(PATHBIN)/rnews.libexec/decode
 	$(LI_XPUB) encode $D$(PATHBIN)/rnews.libexec/encode
@@ -100,6 +101,10 @@
 pullnews:	pullnews.in      $(FIX)	; $(FIX) -i pullnews.in
 scanspool:	scanspool.in     $(FIX)	; $(FIX) scanspool.in
 
+bunbatch: Makefile ../Makefile.global
+	( echo '#! $(SHELL)' ; echo 'exec $(BZIP2) -d -c' ) > $@
+	chmod 755 bunbatch
+
 c7unbatch: Makefile ../Makefile.global
 	( echo '#! $(SHELL)' ; echo 'decode | $(UNCOMPRESS)' ) > $@
 	chmod 755 c7unbatch

Modified: m4/compress.m4
===================================================================
--- m4/compress.m4	2007-08-10 07:56:30 UTC (rev 7641)
+++ m4/compress.m4	2007-08-10 11:25:05 UTC (rev 7642)
@@ -37,8 +37,10 @@
 dnl Only the program for log compression has to be found; for other purposes,
 dnl use the bare program name if it can't be found in the path.
 AC_DEFUN([INN_PATH_COMPRESS],
-[AC_ARG_VAR([COMPRESS], [Location of compress program])
+[AC_ARG_VAR([BZIP2], [Location of bzip2 program])
+AC_ARG_VAR([COMPRESS], [Location of compress program])
 AC_ARG_VAR([GZIP], [Location of gzip program])
+AC_PATH_PROG([BZIP2], [bzip2], [bzip2])
 AC_PATH_PROG([COMPRESS], [compress], [compress])
 AC_PATH_PROG([GZIP], [gzip], [gzip])
 case "$LOG_COMPRESS" in
@@ -54,6 +56,12 @@
     fi
     LOG_COMPRESS=$COMPRESS
     ;;
+bzip2)
+    if test x"$BZIP2" = xbzip2 ; then
+        AC_MSG_ERROR([bzip2 not found but specified for log compression])
+    fi
+    LOG_COMPRESS=$BZIP2
+    ;;
 *)
     INN_PATH_PROG_ENSURE([LOG_COMPRESS], [$LOG_COMPRESS])
     ;;

Modified: scripts/inncheck.in
===================================================================
--- scripts/inncheck.in	2007-08-10 07:56:30 UTC (rev 7641)
+++ scripts/inncheck.in	2007-08-10 11:25:05 UTC (rev 7642)
@@ -728,7 +728,7 @@
     'newsetc', 'newslib', 'oldlogs', 'rnewsprogs', 'spooltemp', 'spool', 'spoolnews'
 );
 @rnews_programs = (
-    'c7unbatch', 'decode', 'encode', 'gunbatch'
+    'bunbatch', 'c7unbatch', 'decode', 'encode', 'gunbatch'
 );
 @newsbin_public = (
     'archive', 'batcher', 'buffchan', 'convdate', 'cvtbatch',

Modified: scripts/innshellvars.in
===================================================================
--- scripts/innshellvars.in	2007-08-10 07:56:30 UTC (rev 7641)
+++ scripts/innshellvars.in	2007-08-10 11:25:05 UTC (rev 7642)
@@ -79,6 +79,7 @@
 GETFTP='@PATH_GETFTP@'
 UUX='@UUX@'
 
+BZIP2='@BZIP2@'
 COMPRESS='@COMPRESS@'
 GZIP='@GZIP@'
 UNCOMPRESS='@UNCOMPRESS@'

Modified: scripts/innshellvars.pl.in
===================================================================
--- scripts/innshellvars.pl.in	2007-08-10 07:56:30 UTC (rev 7641)
+++ scripts/innshellvars.pl.in	2007-08-10 11:25:05 UTC (rev 7642)
@@ -81,6 +81,7 @@
 $getftp = '@PATH_GETFTP@' ;
 $uux = '@UUX@' ;
 
+$bzip2 = '@BZIP2@' ;
 $compress = '@COMPRESS@' ;
 $gzip = '@GZIP@' ;
 $uncompress = '@UNCOMPRESS@' ;

Modified: scripts/innshellvars.tcl.in
===================================================================
--- scripts/innshellvars.tcl.in	2007-08-10 07:56:30 UTC (rev 7641)
+++ scripts/innshellvars.tcl.in	2007-08-10 11:25:05 UTC (rev 7642)
@@ -80,6 +80,7 @@
 set inn_getftp "@PATH_GETFTP@"
 set inn_uux "@UUX@"
 
+set inn_bzip2 "@BZIP2@"
 set inn_compress "@COMPRESS@"
 set inn_gzip "@GZIP@"
 set inn_uncompress "@UNCOMPRESS@"

Modified: support/mkmanifest
===================================================================
--- support/mkmanifest	2007-08-10 07:56:30 UTC (rev 7641)
+++ support/mkmanifest	2007-08-10 11:25:05 UTC (rev 7642)
@@ -146,6 +146,7 @@
 expire/makedbz
 expire/makehistory
 expire/prunehistory
+frontends/bunbatch
 frontends/c7unbatch
 frontends/cnfsheadconf
 frontends/cnfsstat

