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

- pgpverify now supports using GnuPG to check signatures (rather than
  PGP) without the pgpgpg wrapper.  GnuPG can check both old-style RSA
  signatures and new OpenPGP signatures and is recommended over PGP 2.6.
  If you have GnuPG installed, pgpverify will use it rather than PGP,
  which means that you may have to create a new key ring for GnuPG to
  use to verify signatures if you were previously using PGP.
- An item that was noted in NEWS below but was inadvertently left out of
  nnrpd has actually been added this time:  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.
- Two bugs in repacking overview index files and a reliability bug with
  writing overview data were all fixed in the tradindexed overview
  method, hopefully making it somewhat more reliable, particularly for
  makehistory.
- If rc.news.local exists in the INN binary directory, it will be run
  with the start or stop argument whenever rc.news is run.  This is
  available as a hook for local startup and shutdown code.
- The default history table hash sizes were increased because a
  too-small value can cause serious performance problems (whereas a
  too-large hash just wastes a bit of disk space).
- The sample control.ctl file has been extensively updated.
- Wildmat exclusions (@ and !) should now work properly in storage.conf
  newsgroup patterns.
- The implementation of the -w flag for expireover was fixed;
  previously, the value given to -w to change expireover's notion of the
  current time was scaled by too much.
- Various other more minor bug fixes, standards compliance fixes, and
  documentation improvements.

4 files changed, 19 insertions, 28 deletions

diff --git a/news/inn/Makefile b/news/inn/Makefile
index 025a81bf7a6..7abc273bdf5 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2002/07/06 14:33:36 tron Exp $
+# $NetBSD: Makefile,v 1.35 2002/07/06 15:04:57 tron Exp $
 
-DISTNAME=		inn-2.3.2
+DISTNAME=		inn-2.3.3
 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-[0-9]*
 
 PATCH_SITES=		ftp://ftp.north.ad.jp/pub/IPv6/INN/
-PATCHFILES=		inn-2.3.2-v6-20010607.diff.gz
+PATCHFILES=		inn-2.3.3-v6-20020618.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 INN_DATA_DIR?=		/var/news
diff --git a/news/inn/distinfo b/news/inn/distinfo
index f5719576a75..7d2cbeee927 100644
--- a/news/inn/distinfo
+++ b/news/inn/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.4 2001/09/12 11:20:57 tron Exp $
+$NetBSD: distinfo,v 1.5 2002/07/06 15:04:58 tron Exp $
 
-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 (inn-2.3.3.tar.gz) = f1dedd28d10127678084ebd779e2681e9440f889
+Size (inn-2.3.3.tar.gz) = 1413433 bytes
+SHA1 (inn-2.3.3-v6-20020618.diff.gz) = 61b667da65f1c3b0bb4e67736b2c0aaa8ff9a0aa
+Size (inn-2.3.3-v6-20020618.diff.gz) = 41249 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-ag) = 44d79c3a24c9aabcdbe7e84265df95bebcf124f8
+SHA1 (patch-af) = 49ce07f3d2b2cc17b91f48ee4e9c7044695a2919
+SHA1 (patch-ag) = 1087421f2a893c030d5299850b0ad0c4f6a37ecd
 SHA1 (patch-ah) = f7ed6195149c03551a5e5d7bb1d5a24bc71bb48c
diff --git a/news/inn/patches/patch-af b/news/inn/patches/patch-af
index 3f111eb9e98..5dc9e9aabe9 100644
--- a/news/inn/patches/patch-af
+++ b/news/inn/patches/patch-af
@@ -1,16 +1,7 @@
-$NetBSD: patch-af,v 1.4 2001/02/08 16:23:07 tron Exp $
+$NetBSD: patch-af,v 1.5 2002/07/06 15:04:58 tron Exp $
 
 --- backends/sendbatch.in.orig	Thu Sep 17 08:15:02 1998
 +++ backends/sendbatch.in	Mon Jul 19 01:23:35 1999
-@@ -12,7 +12,7 @@
- COMP=
- COMPFLAGS=
- # Use the COMPRESS variable as it is in innshellvars
--# COMPRESS=/usr/ucb/compress
-+COMPRESS=/usr/bin/compress
- ECHO=
- ##  Not a config param since this is the remote rnews.
- RNEWS=rnews
 @@ -37,6 +37,10 @@
  	DEFBYTES=`expr "${SITE}" : '-s\(.*\)'`
  	continue
diff --git a/news/inn/patches/patch-ag b/news/inn/patches/patch-ag
index 6ce4d4c4c78..2b64118b0e1 100644
--- a/news/inn/patches/patch-ag
+++ b/news/inn/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.5 2001/09/12 11:20:57 tron Exp $
+$NetBSD: patch-ag,v 1.6 2002/07/06 15:04:58 tron Exp $
 
---- backends/pgpverify.in.orig	Thu May  3 22:27:32 2001
-+++ backends/pgpverify.in	Wed Sep 12 13:18:32 2001
-@@ -69,7 +69,7 @@
- # GnuPG users should point this to the pgpgpg wrapper.
- # If you have INN and the script is able to successfully include you
+--- backends/pgpverify.in.orig	Mon May  6 08:02:07 2002
++++ backends/pgpverify.in	Sat Jul  6 16:58:05 2002
+@@ -90,7 +90,7 @@
+ # Path to pgp binary; for PGP 5.0, set the path to the pgpv binary.
+ # If you have INN and the script is able to successfully include your
  # innshellvars.pl file, the value of $inn::pgp will override this.
 -$pgp = '/usr/local/bin/pgp';
 +$pgp = '@_PATH_PGP@';
  
- # if you keep your keyring somewhere that is not the default used by pgp,
- # uncomment the next line and set appropriately.
+ # If you keep your keyring somewhere that is not the default used by pgp,
+ # uncomment the next line and set appropriately.  If you have INN and the