Update "inn" package to version 2.3.2. Changes since version 2.3.1:

- innxmit can again handle regular filenames as input as well as storage
  API tokens (allowing it to be used to import an old traditional
  spool).
- Several problems with tagged-hash history files have been fixed thanks
  to the debugging efforts of Andrew Gierth and Sang-yong Suh.
- A very long-standing (since INN 1.0!) NNTP protocol bug in nnrpd was
  fixed.  The response to an ARTICLE command retrieving a message by
  message ID should have the message ID as the third word of the
  response, not the fourth.  Fixing this is reported to *possibly* cause
  problems with some Netscape browsers, but other news servers correctly
  follow the protocol.
- Some serious performance problems with expiration of tradspool should
  now be at least somewhat alleviated.  tradspool and timehash now know
  how to output file names for removal rather than tokens, and fastrm's
  ability to remove regular files has been restored.  This should bring
  expiration times for tradspool back to within a factor of two of
  pre-storage-API expiration times.
- An item that was actually changed in 2.3.0 but wasn't noted in NEWS
  when it should have been:  Users can no longer post articles
  containing Approved: headers to moderated groups by default; they must
  be specifically given that permission with the access: parameter in
  readers.conf.  See the man page for more details.
- Added a sample subscriptions file and documentation for it and
  innmail.
The changes required for this update were contributed by Bernd Ernesti
in PR pkg/13299.

4 files changed, 20 insertions, 16 deletions

diff --git a/news/inn/Makefile b/news/inn/Makefile
index 8db4eccad5f..c6ed15c8e93 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2001/03/01 19:07:53 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2001/07/10 16:02:12 tron Exp $
 
-DISTNAME=		inn-2.3.1
+DISTNAME=		inn-2.3.2
 CATEGORIES=		news
 MASTER_SITES=		ftp://ftp.isc.org/isc/inn/ \
 			ftp://ftp.sunet.se/pub/news/nntp/inn/ \
@@ -13,7 +13,7 @@ COMMENT=		the public release of InterNet News (INN)
 CONFLICTS+=		nntpclnt-*
 
 PATCH_SITES=		ftp://ftp.north.ad.jp/pub/IPv6/INN/
-PATCHFILES=		inn-2.3.1-v6-20010213.diff.gz
+PATCHFILES=		inn-2.3.2-v6-20010607.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 INN_DATA_DIR?=		/var/news
diff --git a/news/inn/distinfo b/news/inn/distinfo
index 3b2346a0dfb..291266d7ae7 100644
--- a/news/inn/distinfo
+++ b/news/inn/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 13:37:53 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/10 16:02:12 tron Exp $
 
-SHA1 (inn-2.3.1.tar.gz) = 8232a435f874284f3d04b66e1ca8da9747014c7d
-Size (inn-2.3.1.tar.gz) = 1375097 bytes
-SHA1 (inn-2.3.1-v6-20010213.diff.gz) = 7394559a1eb36caca27c7afeb3712036eb7de83f
-Size (inn-2.3.1-v6-20010213.diff.gz) = 34981 bytes
+SHA1 (inn-2.3.2.tar.gz) = 47da2b20e179933e2a999b58fb4097e4315e1121
+Size (inn-2.3.2.tar.gz) = 1410950 bytes
+SHA1 (inn-2.3.2-v6-20010607.diff.gz) = 3c354c2344c9222c86549c62b0d46bfa35ad3255
+Size (inn-2.3.2-v6-20010607.diff.gz) = 36203 bytes
 SHA1 (patch-aa) = 8d7bc0e2fef8ef473bbb19c075e7037621199d1e
 SHA1 (patch-ab) = c3360248137c07c0e1750860de79aa1f372a6352
 SHA1 (patch-ac) = dafbd4918eb771cf0bb49b9d2503125812fe6852
 SHA1 (patch-ad) = 9c23ed46cd3bde1c9ac3797e166bc69a2218ef42
 SHA1 (patch-ae) = cdf3e9783c13a4481bb8ff48bdc5fb0bddf68f62
 SHA1 (patch-af) = 0449aaa139797f9ece20b0b452f91ea41430d148
-SHA1 (patch-ah) = f854184c52a6fca5908ccbaafc7969ae0e34099b
+SHA1 (patch-ah) = f7ed6195149c03551a5e5d7bb1d5a24bc71bb48c
diff --git a/news/inn/patches/patch-ah b/news/inn/patches/patch-ah
index a3df44fd2fd..855274ba9f1 100644
--- a/news/inn/patches/patch-ah
+++ b/news/inn/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.4 2001/02/08 16:23:07 tron Exp $
+$NetBSD: patch-ah,v 1.5 2001/07/10 16:02:12 tron Exp $
 
---- site/Makefile.orig	Thu Jan 11 09:55:23 2001
-+++ site/Makefile	Tue Feb  6 14:51:11 2001
-@@ -83,22 +83,11 @@
+--- site/Makefile.orig	Thu May  3 22:27:32 2001
++++ site/Makefile	Sun Jun 24 13:01:33 2001
+@@ -84,22 +84,11 @@
  	$D$(CTLBIN)/sendsys.pl $D$(CTLBIN)/senduuname.pl $D$(CTLBIN)/version.pl
  
  REST_INSTALLED	= \
@@ -22,7 +22,7 @@ $NetBSD: patch-ah,v 1.4 2001/02/08 16:23:07 tron Exp $
  	$D$(PATH_TCL_STARTUP) $D$(PATH_TCL_FILTER) \
 -	$D$(PATH_NNRPAUTH) $D$(PATHETC)/news2mail.cf $D$(PATH_READERSCONF) \
 -	$D$(PATH_RADIUS_CONF) $D$(PATH_NNRPYAUTH) $D$(PATH_OVDB_CONF) \
--	$D$(PATH_SASL_CONF)
+-	$D$(PATH_SASL_CONF) $D$(PATH_SUBSCRIPTIONS)
 +	$D$(PATH_NNRPAUTH) $D$(PATH_NNRPYAUTH)
  
  ALL_INSTALLED	= $(MOST_INSTALLED) $(REST_INSTALLED)
diff --git a/news/inn/pkg/PLIST b/news/inn/pkg/PLIST
index 81ea3e70fbd..b2657467a93 100644
--- a/news/inn/pkg/PLIST
+++ b/news/inn/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2001/02/08 16:23:07 tron Exp $
+@comment $NetBSD: PLIST,v 1.12 2001/07/10 16:02:13 tron Exp $
 bin/inews
 @exec mkdir -p %D/etc/nntp
 @unexec rm -rf %D/etc/nntp
@@ -54,6 +54,7 @@ inn/bin/filter/nnrpd_auth.py
 inn/bin/filter/startup.tcl
 inn/bin/filter/startup_innd.pl
 inn/bin/getlist
+inn/bin/gpgverify
 inn/bin/grephistory
 inn/bin/inews
 inn/bin/inncheck
@@ -115,11 +116,13 @@ inn/lib/innshellvars.tcl
 inn/lib/libinn.a
 inn/lib/libstorage.a
 man/man1/convdate.1
+man/man1/fastrm.1
 man/man1/getlist.1
 man/man1/grephistory.1
 man/man1/inews.1
 man/man1/innconfval.1
 man/man1/innfeed.1
+man/man1/innmail.1
 man/man1/nntpget.1
 man/man1/rnews.1
 man/man1/shlock.1
@@ -153,6 +156,7 @@ man/man5/nntpsend.ctl.5
 man/man5/overview.fmt.5
 man/man5/passwd.nntp.5
 man/man5/storage.conf.5
+man/man5/subscriptions.5
 man/man8/actsync.8
 man/man8/actsyncd.8
 man/man8/archive.8
@@ -165,7 +169,6 @@ man/man8/cvtbatch.8
 man/man8/expire.8
 man/man8/expireover.8
 man/man8/expirerm.8
-man/man8/fastrm.8
 man/man8/filechan.8
 man/man8/inncheck.8
 man/man8/innd.8
@@ -246,6 +249,7 @@ share/examples/inn/senduuname.pl
 share/examples/inn/startup.tcl
 share/examples/inn/startup_innd.pl
 share/examples/inn/storage.conf
+share/examples/inn/subscriptions
 share/examples/inn/version
 share/examples/inn/version.pl
 @dirrm share/examples/inn