Upgrade to 6.6.4, which does not depend on an external inews program anymore.

This should avoid any vulnerability issues with INN.

NOTE:  The text files from lib/nn can now be found in share/nn instead.

17 files changed, 164 insertions, 194 deletions

diff --git a/news/nn/Makefile b/news/nn/Makefile
index c95f179eb70..df36f536e46 100644
--- a/news/nn/Makefile
+++ b/news/nn/Makefile
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.16 2002/03/13 23:07:29 jmc Exp $
+# $NetBSD: Makefile,v 1.17 2002/07/08 02:21:18 kim Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/07/30 18:17:48 adam Exp
 #
 
-DISTNAME=	nn-6.5.4
+DISTNAME=	nn-6.6.4
 CATEGORIES=	news
-MASTER_SITES=	ftp://ftp.gw.com/pub/unix/news/nn/ \
-		ftp://ftp.visi.com/users/mtpins/nn/
+MASTER_SITES=	ftp://ftp.gw.com/pub/unix/news/nn/nn-6.6/ \
+		ftp://ftp.gw.com/pub/unix/news/nn/nn-6.6/old/ \
+		ftp://ftp.nndev.org/pub/nn-6.6/ \
+		ftp://ftp.nndev.org/pub/nn-6.6/old/
 
 MAINTAINER=	packages@netbsd.org
 COMMENT=	NN newsreader
@@ -14,12 +16,6 @@ BUILD_DEFS+=	USE_INN
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(USE_INN) && ${USE_INN} == YES
-DEPENDS=	inn>=2.2:../inn
-.else
-DEPENDS=	nntpclnt-1.6.1:../nntpclnt
-.endif
-
 .if ${OPSYS} == "SunOS"
 SFILE=		s-sunos5.h
 .elif ${OPSYS} == "Linux"
diff --git a/news/nn/PLIST b/news/nn/PLIST
index 0b879649653..3369cbae534 100644
--- a/news/nn/PLIST
+++ b/news/nn/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:03:46 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/07/08 02:21:18 kim Exp $
 bin/nn
 bin/nnadmin
 bin/nnbatch
@@ -11,27 +11,6 @@ bin/nnstats
 bin/nntidy
 bin/nnusage
 bin/nnview
-lib/nn/aux
-lib/nn/conf
-lib/nn/help/Manual
-lib/nn/help/adm.upgrade1
-lib/nn/help/adm.upgrade2
-lib/nn/help/adm.upgrade3
-lib/nn/help/adm.upgrade4
-lib/nn/help/adm.welcome
-lib/nn/help/help.attr
-lib/nn/help/help.commands
-lib/nn/help/help.extended
-lib/nn/help/help.help
-lib/nn/help/help.map
-lib/nn/help/help.menu
-lib/nn/help/help.more
-lib/nn/help/help.read
-lib/nn/help/help.set
-lib/nn/help/help.show
-lib/nn/help/help.sort
-lib/nn/help/help.variables
-lib/nn/upgrade_rc
 man/man1/nn.1
 man/man1/nnacct.1
 man/man1/nnadmin.1
@@ -46,5 +25,26 @@ man/man1/nnusage.1
 man/man1/nnview.1
 man/man8/nnmaster.8
 man/man8/nnspew.8
-@dirrm lib/nn/help
-@dirrm lib/nn
+share/nn/aux
+share/nn/conf
+share/nn/help/Manual
+share/nn/help/adm.upgrade1
+share/nn/help/adm.upgrade2
+share/nn/help/adm.upgrade3
+share/nn/help/adm.upgrade4
+share/nn/help/adm.welcome
+share/nn/help/help.attr
+share/nn/help/help.commands
+share/nn/help/help.extended
+share/nn/help/help.help
+share/nn/help/help.map
+share/nn/help/help.menu
+share/nn/help/help.more
+share/nn/help/help.read
+share/nn/help/help.set
+share/nn/help/help.show
+share/nn/help/help.sort
+share/nn/help/help.variables
+share/nn/upgrade_rc
+@dirrm share/nn/help
+@dirrm share/nn
diff --git a/news/nn/distinfo b/news/nn/distinfo
index ba17f6a6302..5ee46afdc4f 100644
--- a/news/nn/distinfo
+++ b/news/nn/distinfo
@@ -1,33 +1,32 @@
-$NetBSD: distinfo,v 1.2 2001/05/09 20:24:30 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/07/08 02:21:18 kim Exp $
 
-SHA1 (nn-6.5.4.tar.gz) = d084b14b5fda449345d479a7d11791dedf1ab134
-Size (nn-6.5.4.tar.gz) = 518185 bytes
-SHA1 (patch-aa) = e3445823eaf0f1efce02daf70ce098b2fa40c5ec
+SHA1 (nn-6.6.4.tar.gz) = 9e89a1b93b4315d3ed484bf87495f357bb9cc7b4
+Size (nn-6.6.4.tar.gz) = 581672 bytes
+SHA1 (patch-aa) = cd3319db3229a7eea907849b7f37a7c409200bfe
 SHA1 (patch-ab) = 262d50b08031187e2fc99bf49f547fbcf21a2f39
 SHA1 (patch-ac) = 0388486772d5c8f57438a70b8d3bcfe55be5473d
 SHA1 (patch-ad) = 30f6a683b9d6f6b347822589b72baf8c00ac5c2d
-SHA1 (patch-ae) = 8fcd4e24263b4f670b3a5fea1f23e3a538284b2d
-SHA1 (patch-af) = b630a8f798825efe109d295430e11bf2bf0f7515
-SHA1 (patch-ag) = 40b431ddfe9f7f8142dd963d898c50cdbceb1fe7
+SHA1 (patch-af) = 2287796a2c6e7aaddd5e8b766309d3fa706982d1
+SHA1 (patch-ag) = 7d5055a2ae040a5588634f7ac1a2136cce325dc7
 SHA1 (patch-ah) = 25a7d447f425e177a1c0c0628bc7432defb449fe
-SHA1 (patch-ai) = 52856cc60890d73dce4f9e5d07939d7d31c6f42d
+SHA1 (patch-ai) = b2ed7995a5e67566dc60371a6f456c36f0b3e46f
 SHA1 (patch-aj) = fac8d9a74a0f4d4cc2226511607c50e38fd8af7e
-SHA1 (patch-ak) = 229227fcc8936ab8c6905951461780baad4159d7
+SHA1 (patch-ak) = 45790b88eee03fa755b227c05d53664c41d3688f
 SHA1 (patch-al) = 86ef5d494eaf07b024640d3d1d2ae36fcff0cb87
-SHA1 (patch-am) = f7964c85d3e751ab7398a3a619f80e956c439587
+SHA1 (patch-am) = bf8d96a52fb9a4113827a20ccc00ffaced566b8b
 SHA1 (patch-an) = 772ee53b349e0e4b0f70efa5a86682a38e42893c
 SHA1 (patch-ao) = 1eaa536567c78d9a346848a6f5c73d722ef52253
-SHA1 (patch-ap) = 5ffa99e685ad22c8486b41ea5012aa1ca3dfea40
-SHA1 (patch-aq) = 47749cb141fa9e4f2a7fe6fbde37cfece5308e5b
-SHA1 (patch-ar) = 74926ec329620fed95171e785d75781c248c16df
+SHA1 (patch-ap) = 5f6377ae6dea06e5e20c2e003b44c2f05afc22b4
+SHA1 (patch-aq) = d93d9612b4048242316182326954ffc95f338e07
+SHA1 (patch-ar) = f584b683c3218146507a4fc71369cad58fa43de0
 SHA1 (patch-as) = 1f8688cdf80a9059744a4469461e16647fc9a66f
 SHA1 (patch-at) = f9556163a2272d913e3a122ca57e75e681193454
 SHA1 (patch-au) = 387b997c502439d5e679668c4c243eb286c42a31
 SHA1 (patch-av) = 9caf765e5714953470512a07cbe6c4efd4b08e45
-SHA1 (patch-aw) = c992549817cd081c124b269e38ea0593dd3daa34
-SHA1 (patch-ax) = a16a5ea5950e96180d885673eb20b33d9a9de44f
-SHA1 (patch-ay) = 1fe2387ed8460ae9a0e15e755eef8c9f738efd38
+SHA1 (patch-aw) = 3335bfd42044331fba85ff7369898df82f7672ae
+SHA1 (patch-ax) = a4f5447f582836e1735e5771195bad505e731408
+SHA1 (patch-ay) = ab12b19222a22424effb13c72124ae8037e610f1
 SHA1 (patch-az) = 9a6ad8f19a641ca33107366bf2d92d66ea475110
-SHA1 (patch-ba) = 3e655a309788ea5fd5c8841ab72ee595871852b0
+SHA1 (patch-ba) = bbc9cbec0d191be082b1f211d146916e07100d43
 SHA1 (patch-bb) = af094b78b3f2fc0cdb77dea834d74a35fbb170a4
 SHA1 (patch-bc) = 981b2abf745d41f82e1dd4b77981457a5f19591c
diff --git a/news/nn/patches/patch-aa b/news/nn/patches/patch-aa
index 841b43d8f88..8f66513966c 100644
--- a/news/nn/patches/patch-aa
+++ b/news/nn/patches/patch-aa
@@ -1,20 +1,20 @@
-$NetBSD: patch-aa,v 1.7 1999/09/20 21:43:34 kim Exp $
+$NetBSD: patch-aa,v 1.8 2002/07/08 02:21:19 kim Exp $
 
---- Makefile.orig	Sat Jun  5 00:07:14 1999
-+++ Makefile	Mon Sep 20 17:30:05 1999
+--- Makefile.orig	Thu Feb  7 23:14:41 2002
++++ Makefile	Sun Jul  7 21:34:04 2002
 @@ -18,7 +18,7 @@
  #
  # Use /lib/cpp or /usr/ccs/lib/cpp for CPP on Solaris or SVR4 machines.
  
 -CC =		cc
 +#CC =		cc
+ 
  CPP =		$(CC) -E
  #CPP =		/lib/cpp
- #CFLAGS =	-O2 # -g # -I/usr/local/lib/malloc-debug -DMALLOC_FUNC_CHECK
-@@ -28,7 +28,7 @@
- #-Wpointer-arith -Wcast-qual -Wcast-align -Wconversion \
- #-Waggregate-return -Wmissing-prototypes -Wnested-externs
- #LDFLAGS =	-s # -lmalloc # /usr/local/lib/malloc-debug/libmalloc.a
+@@ -27,7 +27,7 @@
+ CFLAGS =	-O # -g -Wall -ansi -pedantic
+ #CFLAGS =	-O # -w0 -g3			# for DEC
+ 
 -MAKE =		make
 +#MAKE =		make
  
diff --git a/news/nn/patches/patch-ae b/news/nn/patches/patch-ae
deleted file mode 100644
index 2f3b7ec77ab..00000000000
--- a/news/nn/patches/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.3 1999/07/26 21:19:26 tron Exp $
-
---- answer.c.orig	Mon Sep 13 19:42:02 1993
-+++ answer.c	Mon Jul 26 23:11:39 1999
-@@ -132,9 +132,13 @@
-     nn_gethostname(host, 64);
- #endif
- 
-+#if 0
-     fprintf(t, "Path: %s!%s\n", host, user_name());
-+#endif
-     fprintf(t, "Date: %s %s %s %s GMT\n", date+8, date+4, date+22, date+11);
-+#if 0
-     fprintf(t, "Message-ID: <%s.%ld@%s>\n", user_name(), (long)now, host);
-+#endif
-     ed_line += 3;
- }
- #endif
diff --git a/news/nn/patches/patch-af b/news/nn/patches/patch-af
index aacccb6bdba..8e3af950a41 100644
--- a/news/nn/patches/patch-af
+++ b/news/nn/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.4 1999/08/22 22:55:46 kim Exp $
+$NetBSD: patch-af,v 1.5 2002/07/08 02:21:19 kim Exp $
 
---- articles.c.orig	Fri Jul  3 13:44:35 1998
-+++ articles.c	Sun Aug 22 18:21:23 1999
+--- articles.c.orig	Wed Oct  3 03:01:08 2001
++++ articles.c	Sun Jul  7 21:33:09 2002
 @@ -264,7 +264,7 @@
      int dbstatus;
  #else /* NOV */
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.4 1999/08/22 22:55:46 kim Exp $
  #endif /* NOV */
      cross_post_number cross_post;
      attr_type leave_attr;
-@@ -292,7 +292,7 @@
+@@ -286,7 +286,7 @@
      data = open_data_file(gh, 'd', OPEN_READ);
      if (data == NULL) return -10;
  
@@ -20,7 +20,7 @@ $NetBSD: patch-af,v 1.4 1999/08/22 22:55:46 kim Exp $
  	return -11;
  #endif /* NOV */
  
-@@ -361,7 +361,7 @@
+@@ -355,7 +355,7 @@
  	}
  	data_offset += data_size;
  #endif /* NOV */
@@ -29,7 +29,7 @@ $NetBSD: patch-af,v 1.4 1999/08/22 22:55:46 kim Exp $
  	    continue;	/* article not accessible */
  
  	if (db_hdr.dh_number > gh->last_db_article
-@@ -427,7 +427,7 @@
+@@ -421,7 +421,7 @@
  	}
  
  	ah->hpos = db_hdr.dh_hpos;
diff --git a/news/nn/patches/patch-ag b/news/nn/patches/patch-ag
index 427fcfbb56c..127e8388c80 100644
--- a/news/nn/patches/patch-ag
+++ b/news/nn/patches/patch-ag
@@ -1,12 +1,12 @@
-$NetBSD: patch-ag,v 1.1 1999/07/26 21:19:27 tron Exp $
+$NetBSD: patch-ag,v 1.2 2002/07/08 02:21:19 kim Exp $
 
---- chset.c.orig	Fri Mar 12 06:35:13 1993
-+++ chset.c	Mon Jul 26 23:11:38 1999
-@@ -18,6 +18,7 @@
-     "iso-8859-7",	8,
+--- chset.c.orig	Wed Feb 13 14:31:39 2002
++++ chset.c	Sun Jul  7 21:36:12 2002
+@@ -19,6 +19,7 @@
      "iso-8859-8",	8,
      "iso-8859-9",	8,
-+    "koi8-r",           8,
+     "iso-8859-15",	8,
++    "koi8-r",		8,
      "unknown",		0,
      NULL,		0,
  };
diff --git a/news/nn/patches/patch-ai b/news/nn/patches/patch-ai
index 1f38c648f61..a618964fd4b 100644
--- a/news/nn/patches/patch-ai
+++ b/news/nn/patches/patch-ai
@@ -1,17 +1,17 @@
-$NetBSD: patch-ai,v 1.4 1999/09/20 21:43:34 kim Exp $
+$NetBSD: patch-ai,v 1.5 2002/07/08 02:21:19 kim Exp $
 
---- config.h-dist.orig	Sun Jun  6 18:22:28 1999
-+++ config.h-dist	Mon Sep 20 17:18:32 1999
-@@ -13,6 +13,8 @@
- 
- #define	RELEASE 	"6.5"
+--- config.h-dist.orig	Thu Feb  7 22:39:03 2002
++++ config.h-dist	Sun Jul  7 21:44:08 2002
+@@ -11,6 +11,8 @@
+  *	(c) Copyright 1990, Kim F. Storm.  All rights reserved.
+  */
  
 +#define PREFIX		"@PREFIX@"
 +
  #include <stdio.h>
  #include <ctype.h>
  
-@@ -71,7 +73,7 @@
+@@ -66,7 +68,7 @@
   *	ascii files.  (Thank you Geoff!)
   */
  
@@ -20,70 +20,49 @@ $NetBSD: patch-ai,v 1.4 1999/09/20 21:43:34 kim Exp $
  
  
  /********************************** NNTP *********************************
-@@ -107,7 +109,7 @@
-  *	NOTE: If you plan to use the included inews, it MUST be a full pathname
+@@ -100,7 +102,7 @@
+  *	LIB_DIRECTORY defined below.
   */
  
 -#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
-@@ -149,7 +151,7 @@
+  *	Define NNTP_PATH_HOSTNAME to force a specific hostname into the
+@@ -138,7 +140,7 @@
   *	conf/s-template.h as a starting point for writing you own.
   */
  
--#include "s-hpux9-0.h"
+-#include "s-sunos5.h"
 +#include "@SFILE@"
  
- /*
-  *	Define DEFAULT_PAGER as the initial value of the 'pager' variable.
-@@ -210,7 +212,7 @@
+ 
+ /********************** MACHINE DEPENDENT DEFINITIONS **********************
+@@ -149,7 +151,7 @@
   *	conf/m-template.h as a starting point for writing you own.
   */
  
--#include "m-hp9000.h"
+-#include "m-sparc.h"
 +#include "@MFILE@"
  
  
- /***************************** OWNERSHIP ***************************
-@@ -227,8 +229,8 @@
-  *	Common choices are:  (news, news)  and   (your uid, your gid)
-  */
- 
--#define	OWNER	"news"
--#define	GROUP	"news"
-+#define	OWNER	"@BINOWN@"
-+#define	GROUP	"@BINGRP@"
- 
- 
  /**************************** LOCALIZATION ****************************
-@@ -261,9 +263,12 @@
+@@ -182,8 +184,12 @@
   *			   (= LIB_DIRECTORY/Log if undefined).
   */
  
 -#define BIN_DIRECTORY	"/usr/local/bin"
 -#define LIB_DIRECTORY	"/usr/local/lib/nn"
--
 +#define BIN_DIRECTORY	PREFIX "/bin"
-+#define LIB_DIRECTORY	PREFIX "/lib/nn"
++#define LIB_DIRECTORY	PREFIX "/share/nn"
 +#ifndef _PATH_VARTMP
 +# define _PATH_VARTMP	"/var/tmp"
 +#endif
 +#define TMP_DIRECTORY   _PATH_VARTMP
  
- /**************************** DATABASE LOCATION **************************
-  *
-@@ -318,7 +323,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"
  
- 
- /*
-@@ -341,7 +346,10 @@
+ /*************************** NEWS TRANSPORT **************************
+@@ -258,7 +264,10 @@
   */
  
  /* #define REC_MAIL	"/usr/lib/news/recmail"	*/	/* non-sendmail */
@@ -95,7 +74,7 @@ $NetBSD: patch-ai,v 1.4 1999/09/20 21:43:34 kim Exp $
  
  
  /*
-@@ -403,13 +411,13 @@
+@@ -307,13 +316,13 @@
   *	DAEMON_MAN	- nnmaster
   */
  
@@ -113,3 +92,14 @@ $NetBSD: patch-ai,v 1.4 1999/09/20 21:43:34 kim Exp $
  #define DAEMON_MAN_SECTION	"8"
  
  
+@@ -383,8 +392,8 @@
+  *	Common choices are:  (news, news)  and   (your uid, your gid)
+  */
+ 
+-#define	OWNER	"news"
+-#define	GROUP	"news"
++#define	OWNER	"@BINOWN@"
++#define	GROUP	"@BINGRP@"
+ 
+ /*
+  *	Default folder directory
diff --git a/news/nn/patches/patch-ak b/news/nn/patches/patch-ak
index 97a047917d3..0be866ec8e4 100644
--- a/news/nn/patches/patch-ak
+++ b/news/nn/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.2 1999/08/22 22:55:46 kim Exp $
+$NetBSD: patch-ak,v 1.3 2002/07/08 02:21:20 kim Exp $
 
---- db.c.orig	Tue Jun  8 00:19:45 1999
-+++ db.c	Sun Aug 22 18:04:14 1999
-@@ -1095,7 +1095,7 @@
+--- db.c.orig	Thu Jan 31 23:10:27 2002
++++ db.c	Sun Jul  7 21:33:09 2002
+@@ -1103,7 +1103,7 @@
  
      if (!db_sequential)
  	fseek(master_file,
@@ -11,7 +11,7 @@ $NetBSD: patch-ak,v 1.2 1999/08/22 22:55:46 kim Exp $
  	      GROUP_FIELDS * sizeof(net_long) * gh->group_num), 0);
  
      if (fread((char *)buf, sizeof(net_long), GROUP_FIELDS, master_file) != GROUP_FIELDS)
-@@ -1115,7 +1115,7 @@
+@@ -1123,7 +1123,7 @@
  #else
      if (!db_sequential)
  	fseek(master_file,
@@ -20,7 +20,7 @@ $NetBSD: patch-ak,v 1.2 1999/08/22 22:55:46 kim Exp $
  
      if (fread((char *)gh, SAVED_GROUP_HEADER_SIZE(*gh), 1, master_file) != 1)
  	goto err;
-@@ -1137,7 +1137,7 @@
+@@ -1145,7 +1145,7 @@
  
      if (!db_sequential)
  	fseek(master_file,
@@ -29,7 +29,7 @@ $NetBSD: patch-ak,v 1.2 1999/08/22 22:55:46 kim Exp $
  	      GROUP_FIELDS * sizeof(net_long) * gh->group_num), 0);
  
      buf[0] = gh->first_db_article;
-@@ -1155,7 +1155,7 @@
+@@ -1163,7 +1163,7 @@
  	goto err;
  #else	/* NETWORK_DATABASE */
      if (!db_sequential)
@@ -38,7 +38,7 @@ $NetBSD: patch-ak,v 1.2 1999/08/22 22:55:46 kim Exp $
  
  
      if (fwrite((char *)gh, SAVED_GROUP_HEADER_SIZE(*gh), 1, master_file) != 1)
-@@ -1340,10 +1340,10 @@
+@@ -1348,10 +1348,10 @@
  
  
  #ifndef NOV
@@ -51,7 +51,7 @@ $NetBSD: patch-ak,v 1.2 1999/08/22 22:55:46 kim Exp $
  
  #ifdef NETWORK_DATABASE
      net_long buf[ARTICLE_FIELDS];
-@@ -1526,7 +1526,7 @@
+@@ -1556,7 +1556,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.2 1999/08/22 22:55:46 kim Exp $
  db_read_art(f)
  FILE *f;
  {
-@@ -1734,32 +1734,32 @@
+@@ -1764,32 +1764,32 @@
  }
  
  
@@ -101,7 +101,7 @@ $NetBSD: patch-ak,v 1.2 1999/08/22 22:55:46 kim Exp $
  
      fclose(index);
  
-@@ -1770,7 +1770,7 @@
+@@ -1800,7 +1800,7 @@
  int
  db_read_offset(f, offset)
  FILE *f;
@@ -110,7 +110,7 @@ $NetBSD: patch-ak,v 1.2 1999/08/22 22:55:46 kim Exp $
  {
  #ifdef NETWORK_DATABASE
      net_long temp;
-@@ -1783,7 +1783,7 @@
+@@ -1813,7 +1813,7 @@
      *offset = temp;
  #else	/* NETWORK_DATABASE */
  
@@ -119,7 +119,7 @@ $NetBSD: patch-ak,v 1.2 1999/08/22 22:55:46 kim Exp $
  #endif	/* NETWORK_DATABASE */
      return 1;
  }
-@@ -1791,7 +1791,7 @@
+@@ -1821,7 +1821,7 @@
  int
  db_write_offset(f, offset)
  FILE *f;
@@ -128,7 +128,7 @@ $NetBSD: patch-ak,v 1.2 1999/08/22 22:55:46 kim Exp $
  {
  #ifdef NETWORK_DATABASE
      net_long temp;
-@@ -1805,7 +1805,7 @@
+@@ -1835,7 +1835,7 @@
  
  #else	/* NETWORK_DATABASE */
  
@@ -137,7 +137,7 @@ $NetBSD: patch-ak,v 1.2 1999/08/22 22:55:46 kim Exp $
  #endif	/* NETWORK_DATABASE */
      return 1;
  }
-@@ -1829,7 +1829,7 @@
+@@ -1859,7 +1859,7 @@
  int
  db_read_offset(f, offset)
  FILE *f;
@@ -146,7 +146,7 @@ $NetBSD: patch-ak,v 1.2 1999/08/22 22:55:46 kim Exp $
  {
    nn_exitmsg(50, "STUB ROUTINE CALLED: db_read_offset\n");
    return -1;
-@@ -1853,7 +1853,7 @@
+@@ -1883,7 +1883,7 @@
    return NULL;
  }
  
diff --git a/news/nn/patches/patch-am b/news/nn/patches/patch-am
index f37558f0b7e..401f8d87a1f 100644
--- a/news/nn/patches/patch-am
+++ b/news/nn/patches/patch-am
@@ -1,10 +1,10 @@
-$NetBSD: patch-am,v 1.1 1999/07/26 21:19:29 tron Exp $
+$NetBSD: patch-am,v 1.2 2002/07/08 02:21:20 kim Exp $
 
---- decode.c.orig	Tue Aug 31 23:05:37 1993
-+++ decode.c	Mon Jul 26 23:11:38 1999
-@@ -351,7 +351,7 @@
- {
-     int mode, onedone, len, lead_check = 0;
+--- decode.c.orig	Thu Jan 31 23:28:20 2002
++++ decode.c	Sun Jul  7 21:33:09 2002
+@@ -357,7 +357,7 @@
+     mode_t mode;
+     int onedone, len, lead_check = 0;
      char buf[LINELEN], part[2], *line;
 -    off_t real_size, start_offset;
 +    long real_size, start_offset;
diff --git a/news/nn/patches/patch-ap b/news/nn/patches/patch-ap
index aaa1aa97357..5d953312fd1 100644
--- a/news/nn/patches/patch-ap
+++ b/news/nn/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.2 1999/08/22 22:55:46 kim Exp $
+$NetBSD: patch-ap,v 1.3 2002/07/08 02:21:20 kim Exp $
 
---- global.h.orig	Tue Jul 14 09:48:40 1998
-+++ global.h	Sun Aug 22 18:08:37 1999
-@@ -387,12 +387,12 @@
+--- global.h.orig	Sun Feb  3 22:53:13 2002
++++ global.h	Sun Jul  7 21:33:09 2002
+@@ -374,12 +374,12 @@
  void	db_read_group	__APROTO((group_header *gh));
  #endif
  void	db_write_group	__APROTO((group_header *gh));
diff --git a/news/nn/patches/patch-aq b/news/nn/patches/patch-aq
index 89d09eca3f7..7b41e3f807b 100644
--- a/news/nn/patches/patch-aq
+++ b/news/nn/patches/patch-aq
@@ -1,7 +1,7 @@
-$NetBSD: patch-aq,v 1.2 1999/09/20 21:43:34 kim Exp $
+$NetBSD: patch-aq,v 1.3 2002/07/08 02:21:20 kim Exp $
 
---- inst.sh.orig	Sat Apr 29 01:34:49 1995
-+++ inst.sh	Mon Sep 20 17:07:28 1999
+--- inst.sh.orig	Thu Oct  4 01:33:06 2001
++++ inst.sh	Sun Jul  7 21:33:10 2002
 @@ -1,8 +1,8 @@
  
  # (Large) prefix inserted above by Make
@@ -22,7 +22,7 @@ $NetBSD: patch-aq,v 1.2 1999/09/20 21:43:34 kim Exp $
  
  (
  if $NNTP
-@@ -365,7 +365,6 @@
+@@ -363,7 +363,6 @@
  
  	echo
  	echo "Formatting online manual $MAN"
@@ -30,7 +30,7 @@ $NetBSD: patch-aq,v 1.2 1999/09/20 21:43:34 kim Exp $
  
  	rm -f $MAN
  
-@@ -380,7 +379,7 @@
+@@ -378,7 +377,7 @@
  	${AWK} -f format.awk - > $MAN
  
  	./inst chmod 644 $MAN
diff --git a/news/nn/patches/patch-ar b/news/nn/patches/patch-ar
index 609b64e7d7e..16ad0c29619 100644
--- a/news/nn/patches/patch-ar
+++ b/news/nn/patches/patch-ar
@@ -1,7 +1,7 @@
-$NetBSD: patch-ar,v 1.1 1999/07/26 21:19:31 tron Exp $
+$NetBSD: patch-ar,v 1.2 2002/07/08 02:21:20 kim Exp $
 
---- kill.c.orig	Mon Sep 13 19:42:28 1993
-+++ kill.c	Mon Jul 26 23:11:38 1999
+--- kill.c.orig	Mon Jun 17 23:58:08 2002
++++ kill.c	Sun Jul  7 21:33:10 2002
 @@ -424,7 +424,7 @@
  typedef struct {
      long		ckh_magic;
@@ -29,7 +29,7 @@ $NetBSD: patch-ar,v 1.1 1999/07/26 21:19:31 tron Exp $
  
      now = cur_time();
  
-@@ -844,7 +844,7 @@
+@@ -850,7 +850,7 @@
  
      if (header.ckh_pattern_size > 0) {
  	kill_patterns = newstr(header.ckh_pattern_size);
@@ -38,7 +38,7 @@ $NetBSD: patch-ar,v 1.1 1999/07/26 21:19:31 tron Exp $
  	if (fread(kill_patterns, sizeof(char), (int)header.ckh_pattern_size, killf)
  	    !=  header.ckh_pattern_size) goto err;
      } else
-@@ -856,7 +856,7 @@
+@@ -862,7 +862,7 @@
  
      tb = group_regexp_table;
  
diff --git a/news/nn/patches/patch-aw b/news/nn/patches/patch-aw
index e2521b1fa42..653933b703a 100644
--- a/news/nn/patches/patch-aw
+++ b/news/nn/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.1 1999/07/26 21:19:32 tron Exp $
+$NetBSD: patch-aw,v 1.2 2002/07/08 02:21:20 kim Exp $
 
---- newsrc.c.orig	Thu Sep 23 04:11:10 1993
-+++ newsrc.c	Mon Jul 26 23:11:38 1999
-@@ -379,7 +379,7 @@
+--- newsrc.c.orig	Sun Jun 16 00:22:19 2002
++++ newsrc.c	Sun Jul  7 21:33:10 2002
+@@ -378,7 +378,7 @@
  
      rc = open_file(newsrc_file, OPEN_READ);
      if (rc != NULL) {
diff --git a/news/nn/patches/patch-ax b/news/nn/patches/patch-ax
index f54911163fa..263df10e31b 100644
--- a/news/nn/patches/patch-ax
+++ b/news/nn/patches/patch-ax
@@ -1,17 +1,20 @@
-$NetBSD: patch-ax,v 1.3 1999/08/22 22:55:46 kim Exp $
+$NetBSD: patch-ax,v 1.4 2002/07/08 02:21:20 kim Exp $
 
---- 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;
--    use_nntp = (strcmp(host, server_real_name) != 0);
+--- nntp.c.orig	Sun Jun 16 23:26:44 2002
++++ nntp.c	Sun Jul  7 21:38:22 2002
+@@ -843,7 +843,11 @@
+ 	server_real_name = hp->h_name;
+     else
+ 	nn_exitmsg(1, "NNTPSERVER is invalid");
++#if 0
+     use_nntp = (strcmp(host_name, server_real_name) != 0);
++#else
 +    use_nntp = 1;
++#endif
  
      if (use_nntp) {
  	freeobj(news_active);
-@@ -1108,7 +1108,7 @@
+@@ -1170,7 +1174,7 @@
  
       case OK_BODY:
  	tmp = open_file(cptr->file_name, OPEN_APPEND|MUST_EXIST);
diff --git a/news/nn/patches/patch-ay b/news/nn/patches/patch-ay
index fa6141d9406..02971512b4c 100644
--- a/news/nn/patches/patch-ay
+++ b/news/nn/patches/patch-ay
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.1 1999/07/26 21:19:33 tron Exp $
+$NetBSD: patch-ay,v 1.2 2002/07/08 02:21:20 kim Exp $
 
---- save.c.orig	Mon Sep 13 19:42:52 1993
-+++ save.c	Mon Jul 26 23:11:39 1999
-@@ -514,7 +514,7 @@
+--- save.c.orig	Thu Jul 12 01:18:34 2001
++++ save.c	Sun Jul  7 21:39:15 2002
+@@ -521,7 +521,7 @@
  		return 0;
  	    }
  	    current_folder_type = -1;
@@ -11,16 +11,16 @@ $NetBSD: patch-ay,v 1.1 1999/07/26 21:19:33 tron Exp $
  		if (mode != NO_HEADER) set_folder_type(save_name);
  		save_mode &= ~FILE_IS_NEW;
  	    }
-@@ -531,7 +531,7 @@
+@@ -538,7 +538,7 @@
  	mailbox_format(save_file, 1);
  
-     if (mode == FULL_HEADER) {
+     if (mode == FULL_HEADER || mode == HEADER_ONLY) {
 -	off_t cnt = ah->fpos - ah->hpos;
 +	long cnt = ah->fpos - ah->hpos;
  	while (--cnt >= 0) {
  	    if ((c = getc(art)) == EOF) break;
  	    putc(c, save_file);
-@@ -647,7 +647,7 @@
+@@ -656,7 +656,7 @@
  char *dir, *file;
  {
      register int c;
@@ -29,7 +29,7 @@ $NetBSD: patch-ay,v 1.1 1999/07/26 21:19:33 tron Exp $
      FILE *h;
  
      if (dir != (char *)NULL && file[0] != '/')
-@@ -656,7 +656,7 @@
+@@ -665,7 +665,7 @@
  	msg("Cannot open %s", file);
  	return;
      }
diff --git a/news/nn/patches/patch-ba b/news/nn/patches/patch-ba
index 5181ad7d5bb..d2a4b56894c 100644
--- a/news/nn/patches/patch-ba
+++ b/news/nn/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.2 1999/08/22 22:55:46 kim Exp $
+$NetBSD: patch-ba,v 1.3 2002/07/08 02:21:20 kim Exp $
 
---- term.c.orig	Wed Jun  9 14:19:01 1999
-+++ term.c	Sun Aug 22 18:28:48 1999
-@@ -47,9 +47,9 @@
+--- term.c.orig	Sun Jun 16 01:54:33 2002
++++ term.c	Sun Jul  7 21:33:10 2002
+@@ -42,9 +42,9 @@
  #  include <termio.h>
  # endif	/* USE_TERMCAP */
  #else
@@ -13,8 +13,8 @@ $NetBSD: patch-ba,v 1.2 1999/08/22 22:55:46 kim Exp $
 +#endif	/* HAVE_TERMIOS_H */
  #endif
  
- /* SYSV curses.h clash */
-@@ -413,6 +413,12 @@
+ #ifdef SYSV_RESIZING
+@@ -401,6 +401,12 @@
  #endif	/* FAKE_INTERRUPT */
  
  static unsigned sp_table[] = {