Upgrade to nn 6.5.4. The main reason for the upgrade is to run completely

over NNTP without any access to a news spool file system.  NOV is accessed
using the XOVER command (INN has this and it is available for nntpd too).

18 files changed, 166 insertions, 388 deletions

diff --git a/news/nn/Makefile b/news/nn/Makefile
index 85a257c2d7f..b0cbe7e30ba 100644
--- a/news/nn/Makefile
+++ b/news/nn/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.7 1999/08/18 09:08:10 agc Exp $
-# $FreeBSD Id: Makefile,v 1.14 1997/07/30 18:17:48 adam Exp
+# $NetBSD: Makefile,v 1.8 1999/08/22 22:55:45 kim Exp $
+# FreeBSD Id: Makefile,v 1.14 1997/07/30 18:17:48 adam Exp
 #
 
-DISTNAME=	nn-6.5.0.b3
-PKGNAME=	nn-6.5.0
+DISTNAME=	nn-6.5.4
 CATEGORIES=	news
-MASTER_SITES=	ftp://uniwa.uwa.edu.au/pub/nn/old/beta/ \
-		ftp://ftp.cs.tu-berlin.de/pub/net/news/nn.old/beta/
+MASTER_SITES=	ftp://ftp.gw.com/pub/unix/news/nn/
 
 MAINTAINER=     tron@netbsd.org
 
diff --git a/news/nn/files/md5 b/news/nn/files/md5
index 87c00becd26..6bd12d422e8 100644
--- a/news/nn/files/md5
+++ b/news/nn/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:25:14 agc Exp $
+$NetBSD: md5,v 1.3 1999/08/22 22:55:45 kim Exp $
 
-MD5 (nn-6.5.0.b3.tar.gz) = fbf52e517eb9d256f51d70cb8769b5e3
+MD5 (nn-6.5.4.tar.gz) = 658d97f06ce1eb18924da1f2a655798c
diff --git a/news/nn/files/patch-sum b/news/nn/files/patch-sum
index 5aedf1a757a..6eb47551a9f 100644
--- a/news/nn/files/patch-sum
+++ b/news/nn/files/patch-sum
@@ -1,29 +1,29 @@
-$NetBSD: patch-sum,v 1.3 1999/07/26 21:49:49 tron Exp $
+$NetBSD: patch-sum,v 1.4 1999/08/22 22:55:45 kim Exp $
 
-MD5 (patch-aa) = 3214454b138209e9cc3cd60c81fb4c63
-MD5 (patch-ab) = 3e7292c6537e28b538fd1c9c42cc6ebc
+MD5 (patch-aa) = 77dd8dfa6af2c829995236be1ba07c6b
+MD5 (patch-ab) = bb054068ebdbe26eb6f9d3928881a040
 MD5 (patch-ac) = c6636066ce812fdd07c254f8c0be747c
 MD5 (patch-ad) = f2d79425b4d086e3aae3459e4d8ac2c8
 MD5 (patch-ae) = c34f531bda131227034abc77f7566462
-MD5 (patch-af) = fb864926d9c7a1901a8b7faaa04e80a6
+MD5 (patch-af) = ecafb60c9a95a6a111769469770acbe4
 MD5 (patch-ag) = bdf9d3dc7322b1e019f4d5715e659831
-MD5 (patch-ah) = b7c53a69e5eb9c06ff709f1eadc31e85
-MD5 (patch-ai) = f23b1637e9cff9a013136488be3c808c
-MD5 (patch-aj) = d92f7105e0d3e0f8968e69da8437d8e6
-MD5 (patch-ak) = 6f163207434d3dbc64381c326becbddc
+MD5 (patch-ah) = 9856d63280d2869d3b35a763b4d0048e
+MD5 (patch-ai) = febe6b85ec279dfe4a108f53f8af5f5f
+MD5 (patch-aj) = e4c6355e820ab3998df0c5825e1655cc
+MD5 (patch-ak) = be82a315a25ae6498e9afe2cf395948a
 MD5 (patch-al) = 90d15ac44ae2b6efd1e316ff45f00bf5
 MD5 (patch-am) = 3eb94051b0e17dd57ce3078a6913e92b
 MD5 (patch-an) = 7fd66a470489eeb2a3359fc4d9f492f8
-MD5 (patch-ao) = 9cd486834a7672b00ba6128aa4f236e5
-MD5 (patch-ap) = 28b0d8ad1bcc47d0d69bb31bfa0f6173
+MD5 (patch-ao) = 44e632364ed3e60b0970b05c3b75fa65
+MD5 (patch-ap) = c6a15db066784f0c667b05376b6885b8
 MD5 (patch-aq) = 7bd3be6e14a9d687a44a526da70c16b4
 MD5 (patch-ar) = 429e06b80f39a6e584ba8719924518e6
 MD5 (patch-as) = ed7a235ed962463e77dd4aecc4b678f8
-MD5 (patch-at) = 0e0ffa9b1fcbd8b78a00e38e12cae4de
-MD5 (patch-au) = 39974ff21adc6214cf81e44e02298b0e
+MD5 (patch-at) = 3ffeb8a418622ed6dc18e805ba4953b4
+MD5 (patch-au) = 0a6b62267f42e330eeb775234a90b401
 MD5 (patch-av) = 49f2bc72bf16fbe492f79bfcfe5b6e61
 MD5 (patch-aw) = 4c12bb192bd4851af86ed761d0480cff
-MD5 (patch-ax) = 8f64236d16fd5c16d9a91fe981df6c1a
+MD5 (patch-ax) = aecfc01f35e687d567ff813d3f13f734
 MD5 (patch-ay) = b7bfb52b31aa3440749252a29ce4391c
 MD5 (patch-az) = 9539751382afdcc1154ecc2af121ede4
-MD5 (patch-ba) = b08d6881ed3f7aa55781c45cb20cbdae
+MD5 (patch-ba) = 8cb4fb821467550224b57ff414e1b539
diff --git a/news/nn/patches/patch-aa b/news/nn/patches/patch-aa
index dd0b3633623..8ec79089587 100644
--- a/news/nn/patches/patch-aa
+++ b/news/nn/patches/patch-aa
@@ -1,27 +1,19 @@
-$NetBSD: patch-aa,v 1.5 1999/07/26 21:19:23 tron Exp $
+$NetBSD: patch-aa,v 1.6 1999/08/22 22:55:45 kim Exp $
 
---- Makefile.orig	Fri Feb 18 03:15:46 1994
-+++ Makefile	Mon Jul 26 23:11:38 1999
-@@ -18,10 +18,10 @@
+--- Makefile.orig	Sat Jun  5 00:07:14 1999
++++ Makefile	Sun Aug 22 17:48:44 1999
+@@ -18,7 +18,7 @@
  #
  # Use /lib/cpp or /usr/ccs/lib/cpp for CPP on Solaris or SVR4 machines.
  
--CC =		gcc
--#CPP =		$(CC) -E
--CPP =		/lib/cpp
--CFLAGS =	-O2 # -g # -I/usr/local/lib/malloc-debug -DMALLOC_FUNC_CHECK
-+#CC =            cc
-+CPP =		$(CC) -E
-+#CPP =		/lib/cpp
-+#CFLAGS =        -O2 # -g # -I/usr/local/lib/malloc-debug -DMALLOC_FUNC_CHECK
- #-Wall -Wcomment \
- #-Wtraditional -Wshadow \
- #-Wpointer-arith -Wcast-qual -Wcast-align -Wconversion \
-@@ -95,4 +95,6 @@
- 
+-CC =		cc
++#CC =		cc
+ CPP =		$(CC) -E
+ #CPP =		/lib/cpp
+ #CFLAGS =	-O2 # -g # -I/usr/local/lib/malloc-debug -DMALLOC_FUNC_CHECK
+@@ -97,3 +97,5 @@
  man/nn.1.D: man/nn.1
  	sh SPLITNN1
--	
-+
+ 
 +install:
 +	./inst n
diff --git a/news/nn/patches/patch-ab b/news/nn/patches/patch-ab
index 01ba8d84f85..9fd919a6741 100644
--- a/news/nn/patches/patch-ab
+++ b/news/nn/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 1999/07/26 21:19:23 tron Exp $
+$NetBSD: patch-ab,v 1.5 1999/08/22 22:55:46 kim Exp $
 
---- account.c.orig	Thu Sep 23 04:10:59 1993
-+++ account.c	Mon Jul 26 23:11:38 1999
-@@ -43,7 +43,7 @@
+--- account.c.orig	Fri Jul  3 17:02:18 1998
++++ account.c	Sun Aug 22 18:20:40 1999
+@@ -25,7 +25,7 @@
  extern int errno;
  
  struct account {
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.4 1999/07/26 21:19:23 tron Exp $
      int ac_found;	/* present in acct file */
      
      char ac_user[24];	/* user name */
-@@ -240,7 +240,7 @@
+@@ -204,7 +204,7 @@
      if (ac->ac_found)
  	fseek(acctf, ac->ac_offset, 0);
      else
diff --git a/news/nn/patches/patch-af b/news/nn/patches/patch-af
index 671d462d9d7..aacccb6bdba 100644
--- a/news/nn/patches/patch-af
+++ b/news/nn/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 1999/07/26 21:19:26 tron Exp $
+$NetBSD: patch-af,v 1.4 1999/08/22 22:55:46 kim Exp $
 
---- articles.c.orig	Fri Feb 18 03:15:47 1994
-+++ articles.c	Mon Jul 26 23:11:38 1999
-@@ -259,7 +259,7 @@
+--- articles.c.orig	Fri Jul  3 13:44:35 1998
++++ articles.c	Sun Aug 22 18:21:23 1999
+@@ -264,7 +264,7 @@
      int dbstatus;
  #else /* NOV */
      FILE *data;
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.3 1999/07/26 21:19:26 tron Exp $
  #endif /* NOV */
      cross_post_number cross_post;
      attr_type leave_attr;
-@@ -281,7 +281,7 @@
+@@ -292,7 +292,7 @@
      data = open_data_file(gh, 'd', OPEN_READ);
      if (data == NULL) return -10;
  
@@ -20,7 +20,7 @@ $NetBSD: patch-af,v 1.3 1999/07/26 21:19:26 tron Exp $
  	return -11;
  #endif /* NOV */
  
-@@ -350,7 +350,7 @@
+@@ -361,7 +361,7 @@
  	}
  	data_offset += data_size;
  #endif /* NOV */
@@ -29,7 +29,7 @@ $NetBSD: patch-af,v 1.3 1999/07/26 21:19:26 tron Exp $
  	    continue;	/* article not accessible */
  
  	if (db_hdr.dh_number > gh->last_db_article
-@@ -413,7 +413,7 @@
+@@ -427,7 +427,7 @@
  	}
  
  	ah->hpos = db_hdr.dh_hpos;
diff --git a/news/nn/patches/patch-ah b/news/nn/patches/patch-ah
index 768dba41012..77b987eb33f 100644
--- a/news/nn/patches/patch-ah
+++ b/news/nn/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1 1999/07/26 21:19:27 tron Exp $
+$NetBSD: patch-ah,v 1.2 1999/08/22 22:55:46 kim Exp $
 
---- collect.c.orig	Tue Aug 31 23:05:31 1993
-+++ collect.c	Mon Jul 26 23:11:38 1999
+--- collect.c.orig	Wed Aug 14 23:08:39 1996
++++ collect.c	Sun Aug 22 18:21:47 1999
 @@ -45,7 +45,7 @@
      article_number last;
      register FILE *arc;
@@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.1 1999/07/26 21:19:27 tron Exp $
      static char *arc_header = "Archived-Last: ";
      /* Header format: Archived-Last: 88888888 group.name */
      /* Fixed constants length == 15 and offset == 24 are used below */
-@@ -84,9 +84,9 @@
+@@ -83,9 +83,9 @@
  
      fseek(arc, start, 0);
      fprintf(arc, "%s%8ld %s\n", arc_header, (long)num, gh->group_name);
@@ -23,7 +23,7 @@ $NetBSD: patch-ah,v 1.1 1999/07/26 21:19:27 tron Exp $
      while ((c = getc(f)) != EOF) putc(c, arc);
      putc(NL, arc);
      fclose(arc);
-@@ -178,8 +178,8 @@
+@@ -177,8 +177,8 @@
      /* get article header */
  
      art_hdr.a_number = art_num;
@@ -34,7 +34,7 @@ $NetBSD: patch-ah,v 1.1 1999/07/26 21:19:27 tron Exp $
      art_hdr.flag = 0;
  
      mode = FILL_NEWS_HEADER | FILL_OFFSETS | SKIP_HEADER;
-@@ -392,7 +392,7 @@
+@@ -391,7 +391,7 @@
  	}
  #endif
  #ifndef RENUMBER_DANGER
diff --git a/news/nn/patches/patch-ai b/news/nn/patches/patch-ai
index 353141cd7ac..3a88024af98 100644
--- a/news/nn/patches/patch-ai
+++ b/news/nn/patches/patch-ai
@@ -1,75 +1,37 @@
-$NetBSD: patch-ai,v 1.2 1999/07/26 21:49:50 tron Exp $
+$NetBSD: patch-ai,v 1.3 1999/08/22 22:55:46 kim Exp $
 
---- config.h.orig	Fri Feb 18 03:15:47 1994
-+++ config.h	Mon Jul 26 23:21:24 1999
-@@ -32,7 +32,7 @@
- #define NOV
- 
- /* Optional */
--#define NOV_DIRECTORY "/usr/spool/news"
-+#define NOV_DIRECTORY "/var/news/spool/overview"
- 
- /*********************** NETWORK DEPENDENT DEFINITIONS **********************
-  *
-@@ -69,7 +69,7 @@
-  *	Consult the file NNTP for further information on the use of NNTP.
-  */
- 
--#undef NNTP
-+#define NNTP
- 
- /*
-  *	Define NNTP_SERVER to the name of a file containing the name of the
-@@ -84,7 +84,7 @@
+--- config.h.orig	Sun Jun  6 18:22:28 1999
++++ config.h	Sun Aug 22 17:57:00 1999
+@@ -107,7 +107,7 @@
   *	NOTE: If you plan to use the included inews, it MUST be a full pathname
   */
  
--#define NNTP_SERVER	"/usr/lib/nntp_server"
-+#define NNTP_SERVER     PREFIX "/etc/nntp/server"
+-#define NNTP_SERVER	"/usr/local/lib/nntp_server"
++#define NNTP_SERVER	PREFIX "/etc/nntp/server"
  
  /*
   *	Define NNTP_POST if you want nn to reject attempts to post via
-@@ -104,7 +104,7 @@
-  *	be present, define NNTP_MINI_INEWS_HEADER below.
-  */
- 
--#define NNTP_MINI_INEWS_HEADER	/* uses "broken" mini-inews */
-+#undef NNTP_MINI_INEWS_HEADER
- 
- /*
-  *	Define NNTP_PATH_HOSTNAME to force a specific hostname into the
-@@ -126,7 +126,7 @@
+@@ -149,7 +149,7 @@
   *	conf/s-template.h as a starting point for writing you own.
   */
  
--#include "s-sys5-4.h"
+-#include "s-hpux9-0.h"
 +#include "s-netbsd.h"
  
  /*
   *	Define DEFAULT_PAGER as the initial value of the 'pager' variable.
-@@ -141,8 +141,8 @@
-  *	nn's :print command pipes text into this command.
-  */
- 
--#define DEFAULT_PRINTER		"lp -s"			/* System V */
--/* #define DEFAULT_PRINTER	"lpr -p -JNEWS"	*/ 	/* bsd */
-+/* #define DEFAULT_PRINTER         "lp -s"                 /* System V */
-+#define DEFAULT_PRINTER      "lpr -p -JNEWS"       /* bsd */
- 
- /*
-  * 	Define RESIZING to make nn understand dynamic window-resizing.
-@@ -203,8 +203,8 @@
+@@ -227,8 +227,8 @@
   *	Common choices are:  (news, news)  and   (your uid, your gid)
   */
  
--#define OWNER	"news"
+-#define	OWNER	"news"
 -#define	GROUP	"news"
-+#define OWNER	BINOWN
++#define	OWNER	BINOWN
 +#define	GROUP	BINGRP
  
  
  /**************************** LOCALIZATION ****************************
-@@ -237,9 +237,9 @@
+@@ -261,9 +261,9 @@
   *			   (= LIB_DIRECTORY/Log if undefined).
   */
  
@@ -82,30 +44,16 @@ $NetBSD: patch-ai,v 1.2 1999/07/26 21:49:50 tron Exp $
  
  /**************************** DATABASE LOCATION **************************
   *
-@@ -270,7 +270,7 @@
-  *	     (The file system must support long file names!!)
-  */
- 
--#define DB_DIRECTORY	"/usr/spool/nn"
-+#define DB_DIRECTORY    "/var/news/spool/nn"
- 
- 
- /*************************** NEWS TRANSPORT **************************
-@@ -292,10 +292,10 @@
-  *				  Default: NEWS_LIB_DIR/{rm,del}group
-  */
- 
--#define NEWS_DIRECTORY		"/usr/spool/news"
--#define NEWS_LIB_DIRECTORY	"/usr/lib/news"
-+#define NEWS_DIRECTORY		"/var/news/spool/articles"
-+#define NEWS_LIB_DIRECTORY	"/var/news/db"
+@@ -318,7 +318,7 @@
  
+ /* #define NEWS_DIRECTORY	"/usr/spool/news"	*/
+ /* #define NEWS_LIB_DIRECTORY	"/usr/lib/news"		*/
 -/* #define INEWS_PATH		"/usr/lib/news/inews"	*/
 +#define INEWS_PATH		BIN_DIRECTORY "/inews"
  
  
  /*
-@@ -317,7 +317,7 @@
+@@ -341,7 +341,7 @@
   */
  
  /* #define REC_MAIL	"/usr/lib/news/recmail"	*/	/* non-sendmail */
@@ -114,39 +62,30 @@ $NetBSD: patch-ai,v 1.2 1999/07/26 21:49:50 tron Exp $
  
  
  /*
-@@ -379,13 +379,13 @@
+@@ -403,13 +403,13 @@
   *	DAEMON_MAN	- nnmaster
   */
  
--#define USER_MAN_DIR 	"/usr/man/man1"
-+#define USER_MAN_DIR    PREFIX "/man/man1"
- #define USER_MAN_SECTION 	"1"
- 
--#define SYS_MAN_DIR 	"/usr/man/man1"
--#define SYS_MAN_SECTION 	"1m"
-+#define SYS_MAN_DIR     PREFIX "/man/man1"
-+#define SYS_MAN_SECTION         "1"
+-#define USER_MAN_DIR	"/usr/local/man/man1"
++#define USER_MAN_DIR	PREFIX "/man/man1"
+ #define USER_MAN_SECTION	"1"
  
--#define DAEMON_MAN_DIR 	"/usr/man/man8"
-+#define DAEMON_MAN_DIR  PREFIX "/man/man8"
- #define DAEMON_MAN_SECTION 	"8"
+-#define SYS_MAN_DIR	"/usr/local/man/man1"
+-#define SYS_MAN_SECTION		"1m"
++#define SYS_MAN_DIR	PREFIX "/man/man1"
++#define SYS_MAN_SECTION		"1"
  
+-#define DAEMON_MAN_DIR	"/usr/local/man/man8"
++#define DAEMON_MAN_DIR	PREFIX "/man/man8"
+ #define DAEMON_MAN_SECTION	"8"
  
-@@ -445,7 +445,7 @@
-  *	was accepted, whereas with INN, it only takes seconds.
-  */
- 
--#define INEWS_IS_FAST		/* comment out for C-News */
-+/*#define INEWS_IS_FAST           /* comment out for C-News */
  
- /*
-  *	Synchronous posting: If set this will cause NN to wait until a
-@@ -457,7 +457,7 @@
+@@ -481,7 +481,7 @@
   *	via some sort of NNTP.
   */
  
 -#define SYNCHRONOUS_POSTING	/* comment out for C-News */
-+/*#define SYNCHRONOUS_POSTING     /* comment out for C-News */
++#define SYNCHRONOUS_POSTING     /* comment out for C-News */
  
  /*
   *	PUT_TIMESTAMP_IN_SCRIPTS
diff --git a/news/nn/patches/patch-aj b/news/nn/patches/patch-aj
index fac147564ac..b73b06daea1 100644
--- a/news/nn/patches/patch-aj
+++ b/news/nn/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.1 1999/07/26 21:19:28 tron Exp $
+$NetBSD: patch-aj,v 1.2 1999/08/22 22:55:46 kim Exp $
 
---- data.h.orig	Sun Aug 15 08:59:43 1993
-+++ data.h	Mon Jul 26 23:11:38 1999
+--- data.h.orig	Tue Jun 23 10:57:44 1998
++++ data.h	Sun Aug 22 18:22:16 1999
 @@ -29,7 +29,7 @@
      char		db_lock[DB_LOCK_MESSAGE];
      time_t		db_created; /* when database was last built */
@@ -9,7 +9,7 @@ $NetBSD: patch-aj,v 1.1 1999/07/26 21:19:28 tron Exp $
 -    off_t		last_size; /* size of active file at last scan */
 +    long                last_size; /* size of active file at last scan */
      group_number	number_of_groups;
-     int			free_groups;
+     int32		free_groups;
  } master_header;
 @@ -68,8 +68,8 @@
      article_number	first_a_article; /* min article in active */
diff --git a/news/nn/patches/patch-ak b/news/nn/patches/patch-ak
index d89a4ec6871..97a047917d3 100644
--- a/news/nn/patches/patch-ak
+++ b/news/nn/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1 1999/07/26 21:19:28 tron Exp $
+$NetBSD: patch-ak,v 1.2 1999/08/22 22:55:46 kim Exp $
 
---- db.c.orig	Thu Nov 25 10:39:33 1993
-+++ db.c	Mon Jul 26 23:11:38 1999
-@@ -1055,7 +1055,7 @@
+--- db.c.orig	Tue Jun  8 00:19:45 1999
++++ db.c	Sun Aug 22 18:04:14 1999
+@@ -1095,7 +1095,7 @@
  
      if (!db_sequential)
  	fseek(master_file,
@@ -11,16 +11,16 @@ $NetBSD: patch-ak,v 1.1 1999/07/26 21:19:28 tron Exp $
  	      GROUP_FIELDS * sizeof(net_long) * gh->group_num), 0);
  
      if (fread((char *)buf, sizeof(net_long), GROUP_FIELDS, master_file) != GROUP_FIELDS)
-@@ -1075,7 +1075,7 @@
+@@ -1115,7 +1115,7 @@
  #else
      if (!db_sequential)
- 	fseek(master_file, 
+ 	fseek(master_file,
 -	      (off_t)(sizeof(master_header) + SAVED_GROUP_HEADER_SIZE(*gh) * gh->group_num), 0);
 +	      (long)(sizeof(master_header) + SAVED_GROUP_HEADER_SIZE(*gh) * gh->group_num), 0);
  
      if (fread((char *)gh, SAVED_GROUP_HEADER_SIZE(*gh), 1, master_file) != 1)
  	goto err;
-@@ -1097,7 +1097,7 @@
+@@ -1137,7 +1137,7 @@
  
      if (!db_sequential)
  	fseek(master_file,
@@ -29,16 +29,16 @@ $NetBSD: patch-ak,v 1.1 1999/07/26 21:19:28 tron Exp $
  	      GROUP_FIELDS * sizeof(net_long) * gh->group_num), 0);
  
      buf[0] = gh->first_db_article;
-@@ -1115,7 +1115,7 @@
+@@ -1155,7 +1155,7 @@
  	goto err;
- #else
+ #else	/* NETWORK_DATABASE */
      if (!db_sequential)
 -	fseek(master_file, (off_t)(sizeof(master_header) + SAVED_GROUP_HEADER_SIZE(*gh) * gh->group_num), 0);
 +	fseek(master_file, (long)(sizeof(master_header) + SAVED_GROUP_HEADER_SIZE(*gh) * gh->group_num), 0);
  
  
      if (fwrite((char *)gh, SAVED_GROUP_HEADER_SIZE(*gh), 1, master_file) != 1)
-@@ -1188,10 +1188,10 @@
+@@ -1340,10 +1340,10 @@
  
  
  #ifndef NOV
@@ -51,7 +51,7 @@ $NetBSD: patch-ak,v 1.1 1999/07/26 21:19:28 tron Exp $
  
  #ifdef NETWORK_DATABASE
      net_long buf[ARTICLE_FIELDS];
-@@ -1368,7 +1368,7 @@
+@@ -1526,7 +1526,7 @@
   * fill in db_hdr and db_data from the overview data for the next
   * article in this group.  does weirdo nn encodings of header fields.
   */
@@ -60,7 +60,7 @@ $NetBSD: patch-ak,v 1.1 1999/07/26 21:19:28 tron Exp $
  db_read_art(f)
  FILE *f;
  {
-@@ -1564,32 +1564,32 @@
+@@ -1734,32 +1734,32 @@
  }
  
  
@@ -72,10 +72,10 @@ $NetBSD: patch-ak,v 1.1 1999/07/26 21:19:28 tron Exp $
  #ifdef NETWORK_DATABASE
 -    return (off_t)((art_num - gh->first_db_article) * sizeof(net_long));
 +    return (long)((art_num - gh->first_db_article) * sizeof(net_long));
- #else
+ #else	/* NETWORK_DATABASE */
 -    return (off_t)((art_num - gh->first_db_article) * sizeof(off_t));
 +    return (long)((art_num - gh->first_db_article) * sizeof(long));
- #endif
+ #endif	/* NETWORK_DATABASE */
  }
  
 -off_t get_data_offset(gh, art_num)
@@ -101,7 +101,7 @@ $NetBSD: patch-ak,v 1.1 1999/07/26 21:19:28 tron Exp $
  
      fclose(index);
  
-@@ -1600,7 +1600,7 @@
+@@ -1770,7 +1770,7 @@
  int
  db_read_offset(f, offset)
  FILE *f;
@@ -110,16 +110,16 @@ $NetBSD: patch-ak,v 1.1 1999/07/26 21:19:28 tron Exp $
  {
  #ifdef NETWORK_DATABASE
      net_long temp;
-@@ -1613,7 +1613,7 @@
+@@ -1783,7 +1783,7 @@
      *offset = temp;
- #else
+ #else	/* NETWORK_DATABASE */
  
 -    if (fread((char *)offset, sizeof(off_t), 1, f) != 1) return 0;
 +    if (fread((char *)offset, sizeof(long), 1, f) != 1) return 0;
- #endif
+ #endif	/* NETWORK_DATABASE */
      return 1;
  }
-@@ -1621,7 +1621,7 @@
+@@ -1791,7 +1791,7 @@
  int
  db_write_offset(f, offset)
  FILE *f;
@@ -128,16 +128,16 @@ $NetBSD: patch-ak,v 1.1 1999/07/26 21:19:28 tron Exp $
  {
  #ifdef NETWORK_DATABASE
      net_long temp;
-@@ -1635,7 +1635,7 @@
+@@ -1805,7 +1805,7 @@
  
- #else
+ #else	/* NETWORK_DATABASE */
  
 -    if (fwrite((char *)offset, sizeof(off_t), 1, f) != 1) return 0;
 +    if (fwrite((char *)offset, sizeof(long), 1, f) != 1) return 0;
- #endif
+ #endif	/* NETWORK_DATABASE */
      return 1;
  }
-@@ -1659,7 +1659,7 @@
+@@ -1829,7 +1829,7 @@
  int
  db_read_offset(f, offset)
  FILE *f;
@@ -146,7 +146,7 @@ $NetBSD: patch-ak,v 1.1 1999/07/26 21:19:28 tron Exp $
  {
    nn_exitmsg(50, "STUB ROUTINE CALLED: db_read_offset\n");
    return -1;
-@@ -1683,7 +1683,7 @@
+@@ -1853,7 +1853,7 @@
    return NULL;
  }
  
diff --git a/news/nn/patches/patch-ao b/news/nn/patches/patch-ao
index 52ca263a71e..e5fe4e18688 100644
--- a/news/nn/patches/patch-ao
+++ b/news/nn/patches/patch-ao
@@ -1,7 +1,7 @@
-$NetBSD: patch-ao,v 1.1 1999/07/26 21:19:29 tron Exp $
+$NetBSD: patch-ao,v 1.2 1999/08/22 22:55:46 kim Exp $
 
---- expire.c.orig	Tue Aug 31 23:05:40 1993
-+++ expire.c	Mon Jul 26 23:11:38 1999
+--- expire.c.orig	Wed Aug 14 23:16:10 1996
++++ expire.c	Sun Aug 22 18:05:19 1999
 @@ -95,7 +95,7 @@
  register group_header *gh;
  {
@@ -11,7 +11,7 @@ $NetBSD: patch-ao,v 1.1 1999/07/26 21:19:29 tron Exp $
      register article_number *list;
      article_number old_last_article;
      long count;
-@@ -149,9 +149,9 @@
+@@ -148,9 +148,9 @@
      old_last_article = gh->last_db_article;
      gh->last_db_article = 0;
  
@@ -23,7 +23,7 @@ $NetBSD: patch-ao,v 1.1 1999/07/26 21:19:29 tron Exp $
  
      gh->master_flag &= ~M_EXPIRE;
      gh->master_flag |= M_BLOCKED;
-@@ -269,7 +269,7 @@
+@@ -268,7 +268,7 @@
  {
      FILE *old_x, *old_d;
      FILE *new;
@@ -32,7 +32,7 @@ $NetBSD: patch-ao,v 1.1 1999/07/26 21:19:29 tron Exp $
      long count, expire_count;
      char *err_message;
  
-@@ -336,7 +336,7 @@
+@@ -333,7 +333,7 @@
       *	calculate the number of entries to copy
       */
  
@@ -41,7 +41,7 @@ $NetBSD: patch-ao,v 1.1 1999/07/26 21:19:29 tron Exp $
  
      /*
       *	data offset is the offset into the old data file for the
-@@ -345,7 +345,7 @@
+@@ -342,7 +342,7 @@
       *	offset 'index_offset'.
       */
  
@@ -50,7 +50,7 @@ $NetBSD: patch-ao,v 1.1 1999/07/26 21:19:29 tron Exp $
  
      /*
       *	read 'count' entries from the old index file starting from
-@@ -359,7 +359,7 @@
+@@ -356,7 +356,7 @@
  	if (!db_read_offset(old_x, &new_offset))
  	    expire_error("INDEX: too short");
  
diff --git a/news/nn/patches/patch-ap b/news/nn/patches/patch-ap
index 3004d944d16..aaa1aa97357 100644
--- a/news/nn/patches/patch-ap
+++ b/news/nn/patches/patch-ap
@@ -1,36 +1,8 @@
-$NetBSD: patch-ap,v 1.1 1999/07/26 21:19:30 tron Exp $
+$NetBSD: patch-ap,v 1.2 1999/08/22 22:55:46 kim Exp $
 
---- global.h.orig	Fri Feb 18 03:15:48 1994
-+++ global.h	Mon Jul 26 23:11:38 1999
-@@ -8,7 +8,9 @@
- #define _NN_GLOBAL_H 1
- 
- #include <stdlib.h>
-+#ifdef USE_MALLOC_H
- #include <malloc.h>
-+#endif
- /*
-  *	Marks for global/external variables
-  */
-@@ -88,13 +90,16 @@
- 
- /* define types of library functions */
- 
-+#ifndef __NetBSD__
- char 	*getenv(), *ctime();
- #ifndef MALLOC_FUNC_CHECK
- char 	*strchr(), *strrchr();
- #endif
--off_t 	lseek(), ftell(), tell();
-+off_t   lseek(), tell();
-+long    ftell();
- int	atoi();
- long	atol();
-+#endif
- 
- 
- /* define types of own functions */
-@@ -387,12 +392,12 @@
+--- global.h.orig	Tue Jul 14 09:48:40 1998
++++ global.h	Sun Aug 22 18:08:37 1999
+@@ -387,12 +387,12 @@
  void	db_read_group	__APROTO((group_header *gh));
  #endif
  void	db_write_group	__APROTO((group_header *gh));
@@ -48,12 +20,3 @@ $NetBSD: patch-ap,v 1.1 1999/07/26 21:19:30 tron Exp $
  
  /* decode.c */
  
-@@ -650,7 +655,7 @@
- int	nntp_set_group		__APROTO((group_header *gh));
- int	nntp_get_active		__APROTO((void));
- FILE *	nntp_get_newsgroups	__APROTO((void));
--struct novgroup *nntp_get_overview	__APROTO((group_header *gh, int low, int high));
-+struct novgroup *nntp_get_overview      __APROTO((group_header *gh, article_number low, article_number high));
- FILE *	nntp_fopen_list		__APROTO((char *cmd));
- char *	nntp_fgets		__APROTO((char *buf, int size));
- article_number *nntp_get_article_list	__APROTO((group_header *gh));
diff --git a/news/nn/patches/patch-at b/news/nn/patches/patch-at
index 27817e6d1bc..8cbb550cc05 100644
--- a/news/nn/patches/patch-at
+++ b/news/nn/patches/patch-at
@@ -1,21 +1,19 @@
-$NetBSD: patch-at,v 1.1 1999/07/26 21:19:31 tron Exp $
+$NetBSD: patch-at,v 1.2 1999/08/22 22:55:46 kim Exp $
 
---- more.c.orig	Sat Oct  2 12:33:56 1993
-+++ more.c	Mon Jul 26 23:11:38 1999
-@@ -352,9 +352,9 @@
+--- more.c.orig	Wed Jul 15 14:18:32 1998
++++ more.c	Sun Aug 22 18:11:22 1999
+@@ -358,8 +358,8 @@
      register FILE *art;
      int more_cmd, eof, skip_spaces, has_space, window_lines;
      int form_feed, last_ff_line, ignore_nl = 0;
--    off_t firstl, lastl;
 -    off_t lineposbuf[LINEMAX];
 -    off_t *linepos = lineposbuf;
-+    long firstl, lastl;
 +    long lineposbuf[LINEMAX];
 +    long *linepos = lineposbuf;
      int linemax = LINEMAX;
      char linebuf[200], skip_char;
      int skip_wrap;
-@@ -363,7 +363,7 @@
+@@ -368,7 +368,7 @@
      struct digest_header digest_save;
      int linenum, maxline, topline, print_lines, lno1;
      int scroll_lines, scroll_from;
@@ -24,7 +22,7 @@ $NetBSD: patch-at,v 1.1 1999/07/26 21:19:31 tron Exp $
      int underline_line, fake_underline;
      int match_lines, match_redraw, match_topline = 0, match_botline;
      int goto_line, prev_goto, stop_line, extra_lines;
-@@ -653,11 +653,11 @@
+@@ -655,11 +655,11 @@
      if (linenum == linemax) {
  	linemax += 500;
  	if (linepos == lineposbuf) {
diff --git a/news/nn/patches/patch-au b/news/nn/patches/patch-au
index 00612f9be8e..807cd80f5cc 100644
--- a/news/nn/patches/patch-au
+++ b/news/nn/patches/patch-au
@@ -1,7 +1,7 @@
-$NetBSD: patch-au,v 1.1 1999/07/26 21:19:32 tron Exp $
+$NetBSD: patch-au,v 1.2 1999/08/22 22:55:46 kim Exp $
 
---- news.c.orig	Tue Aug 31 23:06:06 1993
-+++ news.c	Mon Jul 26 23:11:38 1999
+--- news.c.orig	Fri Jul  3 14:58:51 1998
++++ news.c	Sun Aug 22 18:13:43 1999
 @@ -23,7 +23,7 @@
  {
      register char *bp, *cp, **fptr;
@@ -11,16 +11,21 @@ $NetBSD: patch-au,v 1.1 1999/07/26 21:19:32 tron Exp $
  
      pos = ftell(f);
  
-@@ -239,7 +239,7 @@
+@@ -238,11 +238,11 @@
+     FILE *f;
      struct stat statb;
+ #ifndef DONT_COUNT_LINES
+-    off_t digest_artlen;
++    long digest_artlen;
+ #endif	/* DONT_COUNT_LINES */
  #ifdef NNTP
-     int lazy;
+     int lazy = 0;
 -    off_t fpos;
 +    long fpos;
      FILE *nntp_get_article();
  #endif /* NNTP */
  
-@@ -266,9 +266,9 @@
+@@ -275,9 +275,9 @@
  	/* necessary because empty files wreak havoc */
  	if (fstat(fileno(f), &statb) < 0 ||
  #ifdef NOV
@@ -32,7 +37,7 @@ $NetBSD: patch-au,v 1.1 1999/07/26 21:19:32 tron Exp $
  #endif /* NOV */
  	    fclose(f);
  	    return who_am_i == I_AM_MASTER ? (FILE *)1 : NULL;
-@@ -351,12 +351,12 @@
+@@ -363,12 +363,12 @@
  	}
  
  	if (modes & FILL_OFFSETS) {
@@ -47,7 +52,7 @@ $NetBSD: patch-au,v 1.1 1999/07/26 21:19:32 tron Exp $
  	    art->lpos = ftell(f);
  	}
  #endif
-@@ -378,7 +378,7 @@
+@@ -391,7 +391,7 @@
      }
  #ifdef NNTP
      else if (use_nntp && (art->flag & (A_DIGEST | A_FOLDER)) == 0) {
diff --git a/news/nn/patches/patch-ax b/news/nn/patches/patch-ax
index 9532af74439..f54911163fa 100644
--- a/news/nn/patches/patch-ax
+++ b/news/nn/patches/patch-ax
@@ -1,18 +1,8 @@
-$NetBSD: patch-ax,v 1.2 1999/07/26 21:49:50 tron Exp $
+$NetBSD: patch-ax,v 1.3 1999/08/22 22:55:46 kim Exp $
 
---- nntp.c.orig	Thu Nov 25 10:39:37 1993
-+++ nntp.c	Mon Jul 26 23:20:32 1999
-@@ -85,7 +85,9 @@
- import int silent, no_update;
- 
- import int sys_nerr;
-+#ifndef __NetBSD__
- import char *sys_errlist[];
-+#endif
- extern void nn_exitmsg();
- extern void sys_error();
- extern int sys_warning();
-@@ -759,7 +761,7 @@
+--- nntp.c.orig	Wed Jun  9 14:18:25 1999
++++ nntp.c	Sun Aug 22 18:14:18 1999
+@@ -769,7 +769,7 @@
      strncpy(host, (gethostbyname(host))->h_name, sizeof host);
  
      server_real_name = (gethostbyname(nntp_server))->h_name;
@@ -21,7 +11,7 @@ $NetBSD: patch-ax,v 1.2 1999/07/26 21:49:50 tron Exp $
  
      if (use_nntp) {
  	freeobj(news_active);
-@@ -1098,7 +1100,7 @@
+@@ -1108,7 +1108,7 @@
  
       case OK_BODY:
  	tmp = open_file(cptr->file_name, OPEN_APPEND|MUST_EXIST);
diff --git a/news/nn/patches/patch-ba b/news/nn/patches/patch-ba
index 38fad803d96..5181ad7d5bb 100644
--- a/news/nn/patches/patch-ba
+++ b/news/nn/patches/patch-ba
@@ -1,60 +1,20 @@
-$NetBSD: patch-ba,v 1.1 1999/07/26 21:19:34 tron Exp $
+$NetBSD: patch-ba,v 1.2 1999/08/22 22:55:46 kim Exp $
 
---- term.c.orig	Sat Oct  2 12:34:09 1993
-+++ term.c	Mon Jul 26 23:11:39 1999
-@@ -26,6 +26,10 @@
- #include <setjmp.h>
- #endif
- 
-+#ifdef HAVE_TERMIOS
-+#include <termios.h>
-+#endif
-+
- #ifdef USE_TERMINFO
- # ifdef HPUX80
- # include <termio.h>
-@@ -46,8 +50,10 @@
+--- term.c.orig	Wed Jun  9 14:19:01 1999
++++ term.c	Sun Aug 22 18:28:48 1999
+@@ -47,9 +47,9 @@
  #  include <termio.h>
  # endif	/* USE_TERMCAP */
  #else
-+#ifndef HAVE_TERMIOS
+-#ifndef __FreeBSD__
++#ifndef HAVE_TERMIOS_H
  # include <sgtty.h>
+-#endif	/* __FreeBSD__ */
++#endif	/* HAVE_TERMIOS_H */
  #endif
-+#endif
  
  /* SYSV curses.h clash */
- #undef raw
-@@ -206,7 +212,7 @@
- extern char fake_keyb_siglist[];
- #endif	/* FAKE_INTERRUPT */
- 
--#ifdef HAVE_TERMIO
-+#if defined(HAVE_TERMIO) || defined(HAVE_TERMIOS)
- 
- /* This used to be 50, but there are some rather complex bugs in the SYSV */
- /* TERMIO driver... */
-@@ -214,12 +220,20 @@
- 
- #undef CBREAK
- 
-+#ifdef HAVE_TERMIOS
-+static struct termios norm_tty, raw_tty;
-+#else
- static struct termio norm_tty, raw_tty;
-+#endif
- 
- #define	IntrC	((key_type) norm_tty.c_cc[VINTR])
- #define	EraseC	((key_type) norm_tty.c_cc[VERASE])
- #define KillC	((key_type) norm_tty.c_cc[VKILL])
-+#ifdef HAVE_TERMIOS
-+#define SuspC   ((key_type) norm_tty.c_cc[VSUSP])
-+#else
- #define SuspC	((key_type) CONTROL_('Z'))	/* norm_tty.c_cc[SWTCH] */
-+#endif
- 
- #else	/* V7/BSD TTY DRIVER */
- 
-@@ -390,6 +404,12 @@
+@@ -413,6 +413,12 @@
  #endif	/* FAKE_INTERRUPT */
  
  static unsigned sp_table[] = {
@@ -67,72 +27,3 @@ $NetBSD: patch-ba,v 1.1 1999/07/26 21:19:34 tron Exp $
      B9600, 960,
  #ifdef B19200
      B19200, 1920,
-@@ -473,7 +493,11 @@
- #ifdef HAVE_TERMIO
-     ioctl(0, TCGETA, &norm_tty);
- #else
-+#ifdef HAVE_TERMIOS
-+    tcgetattr(0, &norm_tty);
-+#else
-     ioctl(0, TIOCGETP, &norm_tty);
-+#endif
- #endif	/* HAVE_TERMIO */
- 
- #ifdef USE_TERMINFO
-@@ -581,6 +605,17 @@
-     raw_tty.c_cc[VTIME] = ((int)(raw_tty.c_cflag & CBAUD) > B1200) ? 1 : 2;
-     set_term_speed((unsigned long)(raw_tty.c_cflag & CBAUD));
- #else
-+#ifdef HAVE_TERMIOS
-+    cfmakeraw(&raw_tty);
-+    /* read a maximum of 10 characters in one burst; timeout in 1-200 ms */
-+    raw_tty.c_cc[VMIN] = KEY_BURST;
-+    raw_tty.c_cc[VTIME] = (cfgetispeed(&raw_tty) > B1200) ? 1 : 2;
-+    set_term_speed((unsigned long)cfgetospeed(&raw_tty));
-+#ifdef SV_INTERRUPT
-+    siginterrupt(SIGTSTP, 1);
-+    siginterrupt(SIGALRM, 1);
-+#endif	/* SV_INTERRUPT */
-+#else
-     ioctl(0, TIOCGETC, &norm_chars);
- 
- #ifdef TIOCGLTC
-@@ -603,6 +638,7 @@
- #ifdef SV_INTERRUPT
-     siginterrupt(SIGALRM, 1);		/* make read from tty interruptable */
- #endif	/* SV_INTERRUPT */
-+#endif
- #endif	/* HAVE_TERMIO */
- 
-     erase_key = EraseC;
-@@ -1124,8 +1160,13 @@
- #define RAW_MODE_ON    ioctl(0, TCSETAW, &raw_tty)
- #define RAW_MODE_OFF   ioctl(0, TCSETAW, &norm_tty)
- #else
-+#ifdef HAVE_TERMIOS
-+#define RAW_MODE_ON    tcsetattr(0, TCSADRAIN, &raw_tty)
-+#define RAW_MODE_OFF   tcsetattr(0, TCSADRAIN, &norm_tty)
-+#else
- #define RAW_MODE_ON    ioctl(0, TIOCSETP, &raw_tty)
- #define RAW_MODE_OFF   ioctl(0, TIOCSETP, &norm_tty)
-+#endif
- #endif	/* HAVE_TERMIO */
- 
- void
-@@ -1344,12 +1385,16 @@
- #ifdef HAVE_TERMIO
-     ioctl(0, TCFLSH, 0);
- #else
-+#ifdef HAVE_TERMIOS
-+    tcflush(0, TCIFLUSH);
-+#else
- #ifdef FREAD
-     arg = FREAD;
-     ioctl(0, TIOCFLUSH, &arg);
- #else
-     ioctl(0, TIOCFLUSH, 0);
- #endif	/* FREAD */
-+#endif
- #endif	/* HAVE_TERMIO */
-     rd_count = 0;
- }
diff --git a/news/nn/pkg/DESCR b/news/nn/pkg/DESCR
index e91c29f1ec5..f1d5b464e57 100644
--- a/news/nn/pkg/DESCR
+++ b/news/nn/pkg/DESCR
@@ -1 +1 @@
-No News is good news. This version of nn has NOV support.
+No News is good news. This version of nn has NNTP and NOV support.
diff --git a/news/nn/pkg/PLIST b/news/nn/pkg/PLIST
index 28084d36c9b..2c4cf3ae97a 100644
--- a/news/nn/pkg/PLIST
+++ b/news/nn/pkg/PLIST
@@ -1,18 +1,19 @@
-@comment $NetBSD: PLIST,v 1.3 1998/05/22 08:30:32 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 1999/08/22 22:55:46 kim Exp $
 bin/nn
-bin/nnusage
-bin/nngrab
-bin/nnstats
-bin/nncheck
 bin/nnadmin
-bin/nntidy
+bin/nnbatch
+bin/nncheck
 bin/nngoback
+bin/nngrab
 bin/nngrep
 bin/nnpost
-bin/nnbatch
+bin/nnstats
+bin/nntidy
+bin/nnusage
+bin/nnview
 lib/nn/aux
-lib/nn/upgrade_rc
 lib/nn/conf
+lib/nn/help/Manual
 lib/nn/help/adm.upgrade1
 lib/nn/help/adm.upgrade2
 lib/nn/help/adm.upgrade3
@@ -30,18 +31,19 @@ lib/nn/help/help.set
 lib/nn/help/help.show
 lib/nn/help/help.sort
 lib/nn/help/help.variables
-lib/nn/help/Manual
+lib/nn/upgrade_rc
 man/man1/nn.1
+man/man1/nnacct.1
+man/man1/nnadmin.1
 man/man1/nncheck.1
 man/man1/nngoback.1
 man/man1/nngrab.1
 man/man1/nngrep.1
 man/man1/nnpost.1
-man/man1/nntidy.1
-man/man1/nnacct.1
-man/man1/nnadmin.1
 man/man1/nnstats.1
+man/man1/nntidy.1
 man/man1/nnusage.1
+man/man1/nnview.1
 man/man8/nnmaster.8
 man/man8/nnspew.8
 @dirrm lib/nn/help