updated news/nn to 6.7.3. Changes from 6.6.5 according to nn's ChangeLog

are various bug fixes and code cleanups.

32 files changed, 359 insertions, 796 deletions

diff --git a/news/nn/Makefile b/news/nn/Makefile
index da14e8ea61f..1646cc1a6b3 100644
--- a/news/nn/Makefile
+++ b/news/nn/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2006/06/01 23:11:29 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/10/14 19:33:45 schwarz Exp $
 
-DISTNAME=	nn-6.6.5
+DISTNAME=	nn-6.7.3
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.nndev.org/pub/nn-6.6/ \
 		ftp://ftp.nndev.org/pub/nn-6.6/old/
diff --git a/news/nn/distinfo b/news/nn/distinfo
index 425e2708cc7..10c685d45ec 100644
--- a/news/nn/distinfo
+++ b/news/nn/distinfo
@@ -1,37 +1,29 @@
-$NetBSD: distinfo,v 1.11 2006/09/17 13:18:59 rillig Exp $
+$NetBSD: distinfo,v 1.12 2006/10/14 19:33:45 schwarz Exp $
 
-SHA1 (nn-6.6.5.tar.Z) = 7f96de47dd96862fc9eb9b29a251964a01b63b1b
-RMD160 (nn-6.6.5.tar.Z) = 460592974b953ba0d6cb5a7234e6e4d688051090
-Size (nn-6.6.5.tar.Z) = 826135 bytes
-SHA1 (patch-aa) = 4db396e04494940d01ddbb17b6f8df1629267a5e
-SHA1 (patch-ab) = 262d50b08031187e2fc99bf49f547fbcf21a2f39
-SHA1 (patch-ac) = 0388486772d5c8f57438a70b8d3bcfe55be5473d
-SHA1 (patch-ad) = 30f6a683b9d6f6b347822589b72baf8c00ac5c2d
-SHA1 (patch-ae) = de6c5331482f0f2165dd79bdbf57fff1703b5780
-SHA1 (patch-af) = 2287796a2c6e7aaddd5e8b766309d3fa706982d1
-SHA1 (patch-ag) = 7d5055a2ae040a5588634f7ac1a2136cce325dc7
-SHA1 (patch-ah) = 25a7d447f425e177a1c0c0628bc7432defb449fe
-SHA1 (patch-ai) = 0aa2908e2f735ed7f2930960e9ec317c383acfed
-SHA1 (patch-aj) = fac8d9a74a0f4d4cc2226511607c50e38fd8af7e
-SHA1 (patch-ak) = 45790b88eee03fa755b227c05d53664c41d3688f
-SHA1 (patch-al) = 86ef5d494eaf07b024640d3d1d2ae36fcff0cb87
-SHA1 (patch-am) = bf8d96a52fb9a4113827a20ccc00ffaced566b8b
-SHA1 (patch-an) = 772ee53b349e0e4b0f70efa5a86682a38e42893c
-SHA1 (patch-ao) = 1eaa536567c78d9a346848a6f5c73d722ef52253
-SHA1 (patch-ap) = a40fe9840594bffc7d8f576b5ea6e49ec7bf4d7d
-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) = 3335bfd42044331fba85ff7369898df82f7672ae
-SHA1 (patch-ax) = 07350a8ee3fc58404b8607773fc6091b1b1b58ba
-SHA1 (patch-ay) = ab12b19222a22424effb13c72124ae8037e610f1
-SHA1 (patch-az) = 9a6ad8f19a641ca33107366bf2d92d66ea475110
-SHA1 (patch-ba) = bbc9cbec0d191be082b1f211d146916e07100d43
+SHA1 (nn-6.7.3.tar.Z) = 1879aae59131e4b86e82021802918a0a39cea826
+RMD160 (nn-6.7.3.tar.Z) = 2617fe7dce42c36ae970579e27ebd00a60f23653
+Size (nn-6.7.3.tar.Z) = 688446 bytes
+SHA1 (patch-aa) = 175941d5d91b822be577409f4d32420209b33d1c
+SHA1 (patch-ab) = 911d5e19c352085a2a9fa715d2dee4a8ebfe7fa9
+SHA1 (patch-ae) = 5d9968a29408cfc753b27cba6fc48076bb849317
+SHA1 (patch-af) = 446d8359228f5afd73d9d770b78cbe573e39fac0
+SHA1 (patch-ag) = 4857f66029c77e46e1506cb33a64ec098bdaeb39
+SHA1 (patch-ah) = d4d23e9072b473f3069218b43b8a54c9c4562c91
+SHA1 (patch-ai) = cf2c0b56772de4b630e6172a10f6f8ab69865c49
+SHA1 (patch-aj) = e7a6a94b242ae1ee652117799642b7711e049993
+SHA1 (patch-ak) = 005bf2286b0b988434d81b5c7cc5ab97e4909841
+SHA1 (patch-al) = 6bff7c2dd0739acf57db7d7694ed8cb68f1f3b3d
+SHA1 (patch-ao) = 3aaba60ab311af8e21ca8691b940eb190cc95337
+SHA1 (patch-aq) = fb7ce095d66e4df324b6a6116256a5a7a7239f2e
+SHA1 (patch-ar) = 8c40f584182b734348d50489ffab1a03e791ef9c
+SHA1 (patch-at) = 11541ea36bbdacfbd84af6b3be4c4dbc983ef16d
+SHA1 (patch-au) = e247b3a62b24409a04a1f1604606d6e38474af67
+SHA1 (patch-av) = 4013cfa3d4dc9bba84593ce68310e7d9b75b0aa0
+SHA1 (patch-ax) = 8c8599991d71d4b72d56258bdaf474e4ddd13bd6
+SHA1 (patch-ay) = d707b74d2c6d2f39b8515531cf90d435784deaf1
+SHA1 (patch-az) = 206fcead17eb09c8c019eeb78335841ff9ce9c94
+SHA1 (patch-ba) = d021b28f813aa39189b863cff3c5be059b904a54
 SHA1 (patch-bb) = af094b78b3f2fc0cdb77dea834d74a35fbb170a4
 SHA1 (patch-bc) = 981b2abf745d41f82e1dd4b77981457a5f19591c
-SHA1 (patch-bd) = ed29e33c446dc62296d0079e51c6089bb4706a95
-SHA1 (patch-be) = 9a12e0eb1f9f9e821d2beb08adc887dab69382f1
-SHA1 (patch-bf) = 723695b59196db63a0128f60637a4d11a1d7818e
+SHA1 (patch-be) = 61eaadbf56104d484055ebf3b05eeaac045e4450
+SHA1 (patch-bf) = dd419adf7bb727e5ebd8a2cd7f3b69467bb49b44
diff --git a/news/nn/patches/patch-aa b/news/nn/patches/patch-aa
index 034c557466c..5c2e52d6868 100644
--- a/news/nn/patches/patch-aa
+++ b/news/nn/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.11 2006/09/17 13:18:59 rillig Exp $
+$NetBSD: patch-aa,v 1.12 2006/10/14 19:33:45 schwarz Exp $
 
---- Makefile.orig	2002-02-08 05:14:41.000000000 +0100
-+++ Makefile	2006-09-17 15:17:04.000000000 +0200
+--- Makefile.orig	2005-10-26 06:08:03.000000000 +0200
++++ Makefile	2006-10-14 19:35:24.000000000 +0200
 @@ -18,16 +18,16 @@
  #
  # Use /lib/cpp or /usr/ccs/lib/cpp for CPP on Solaris or SVR4 machines.
@@ -23,16 +23,7 @@ $NetBSD: patch-aa,v 1.11 2006/09/17 13:18:59 rillig Exp $
  
  
  SHELL = /bin/sh
-@@ -60,7 +60,7 @@ ymakefile: Makefile xmakefile config.h
- 	       -DCDEBUG="$(CFLAGS)" -Iconf MF.c | \
- 	sed -e '1,/MAKE WILL CUT HERE/d' \
- 	    -e '/^#/d' \
--	    -e 's/^        /	/' \
-+	    -e 's/^  */	/' \
- 	    -e '/^[ \f	]$$/d' \
- 	    -e '/^[ \/]*[*]/d' | \
- 	sed -n -e '/^..*$$/p' > ymakefile
-@@ -97,3 +97,5 @@ split: tar
+@@ -97,3 +97,5 @@
  man/nn.1.D: man/nn.1
  	sh SPLITNN1
  
diff --git a/news/nn/patches/patch-ab b/news/nn/patches/patch-ab
index 9fd919a6741..76f7c28e456 100644
--- a/news/nn/patches/patch-ab
+++ b/news/nn/patches/patch-ab
@@ -1,22 +1,22 @@
-$NetBSD: patch-ab,v 1.5 1999/08/22 22:55:46 kim Exp $
+$NetBSD: patch-ab,v 1.6 2006/10/14 19:33:45 schwarz Exp $
 
---- 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;
+--- account.c.orig	2005-03-31 08:03:10.000000000 +0200
++++ account.c	2006-10-14 19:40:00.000000000 +0200
+@@ -31,7 +31,7 @@
+ extern int      errno;
  
  struct account {
--    off_t ac_offset;	/* offset in acct file */
-+    long ac_offset;    /* offset in acct file */
-     int ac_found;	/* present in acct file */
-     
-     char ac_user[24];	/* user name */
-@@ -204,7 +204,7 @@
+-    off_t           ac_offset;	/* offset in acct file */
++    long          ac_offset;	/* offset in acct file */
+     int             ac_found;	/* present in acct file */
+ 
+     char            ac_user[24];/* user name */
+@@ -216,7 +216,7 @@
      if (ac->ac_found)
  	fseek(acctf, ac->ac_offset, 0);
      else
--	fseek(acctf, (off_t)0, 2);
-+	fseek(acctf, (long)0, 2);
-     
-     fprintf(acctf, OUTPUT_FMT, 
+-	fseek(acctf, (off_t) 0, 2);
++	fseek(acctf, (long) 0, 2);
+ 
+     fprintf(acctf, OUTPUT_FMT,
  	    ac->ac_user, ac->ac_total, ac->ac_last,
diff --git a/news/nn/patches/patch-ac b/news/nn/patches/patch-ac
deleted file mode 100644
index a9bc2880241..00000000000
--- a/news/nn/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.5 1999/07/26 21:19:24 tron Exp $
-
---- active.c.orig	Sun Aug 15 08:59:33 1993
-+++ active.c	Mon Jul 26 23:11:38 1999
-@@ -116,7 +116,7 @@
- 		    continue;
- 	    } else {
- 		gh->master_flag |= M_ALIASED | M_IGNORE_A;
--		gh->data_write_offset = (off_t)gh1->group_num;
-+		gh->data_write_offset = (long)gh1->group_num;
- 	    }
- 	    must_update = 1;
- 	    break;
diff --git a/news/nn/patches/patch-ad b/news/nn/patches/patch-ad
deleted file mode 100644
index c155635c82e..00000000000
--- a/news/nn/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.3 1999/07/26 21:19:26 tron Exp $
-
---- admin.c.orig	Mon Sep 13 19:42:00 1993
-+++ admin.c	Mon Jul 26 23:11:38 1999
-@@ -290,7 +290,7 @@
- group_header *gh;
- {
-     FILE *data, *ix;
--    off_t data_offset, next_offset;
-+    long data_offset, next_offset;
-     cross_post_number cross_post;
-     article_number cur_article;
-     int n, err_type;
-@@ -453,7 +453,7 @@
- group_header *gh;
- {
-     FILE *data, *ix;
--    off_t offset;
-+    long offset;
-     cross_post_number cross_post;
-     article_number first_article;
-     int n;
diff --git a/news/nn/patches/patch-ae b/news/nn/patches/patch-ae
index a5d460e1246..6925d266e26 100644
--- a/news/nn/patches/patch-ae
+++ b/news/nn/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2005/04/11 11:18:06 schwarz Exp $
+$NetBSD: patch-ae,v 1.6 2006/10/14 19:33:45 schwarz Exp $
 
---- conf/s-linux.h.orig	Sat Apr  9 00:52:08 2005
-+++ conf/s-linux.h	Sat Apr  9 00:52:34 2005
-@@ -247,7 +247,7 @@
+--- conf/s-linux.h.orig	2005-06-24 00:48:52.000000000 +0200
++++ conf/s-linux.h	2006-10-14 19:44:37.000000000 +0200
+@@ -225,7 +225,7 @@
   *	Define standard compiler flags here:
   */
  
diff --git a/news/nn/patches/patch-af b/news/nn/patches/patch-af
index 8e3af950a41..cec4ccfeb06 100644
--- a/news/nn/patches/patch-af
+++ b/news/nn/patches/patch-af
@@ -1,40 +1,22 @@
-$NetBSD: patch-af,v 1.5 2002/07/08 02:21:19 kim Exp $
+$NetBSD: patch-af,v 1.6 2006/10/14 19:33:45 schwarz Exp $
 
---- 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 */
-     FILE *data;
--    off_t data_offset, data_size;
-+    long data_offset, data_size;
- #endif /* NOV */
-     cross_post_number cross_post;
-     attr_type leave_attr;
-@@ -286,7 +286,7 @@
-     data = open_data_file(gh, 'd', OPEN_READ);
-     if (data == NULL) return -10;
- 
--    if ((data_offset = get_data_offset(gh, first_article)) == (off_t)(-1))
-+    if ((data_offset = get_data_offset(gh, first_article)) == (long)(-1))
- 	return -11;
- #endif /* NOV */
- 
-@@ -355,7 +355,7 @@
- 	}
+--- articles.c.orig	2005-04-10 03:39:05.000000000 +0200
++++ articles.c	2006-10-14 20:51:00.000000000 +0200
+@@ -363,7 +363,7 @@
  	data_offset += data_size;
- #endif /* NOV */
--	if (db_hdr.dh_lpos == (off_t)0)
-+	if (db_hdr.dh_lpos == (long)0)
- 	    continue;	/* article not accessible */
+ #endif				/* NOV */
+ 
+-	if (db_hdr.dh_lpos == (off_t) 0)
++	if (db_hdr.dh_lpos == (long) 0)
+ 	    continue;		/* article not accessible */
  
  	if (db_hdr.dh_number > gh->last_db_article
-@@ -421,7 +421,7 @@
+@@ -432,7 +432,7 @@
+ 	    continue;
  	}
- 
  	ah->hpos = db_hdr.dh_hpos;
--	ah->fpos = ah->hpos + (off_t)(db_hdr.dh_fpos);
-+	ah->fpos = ah->hpos + (long)(db_hdr.dh_fpos);
+-	ah->fpos = ah->hpos + (off_t) (db_hdr.dh_fpos);
++	ah->fpos = ah->hpos + (long) (db_hdr.dh_fpos);
  	ah->lpos = db_hdr.dh_lpos;
  
  	ah->attr = test_article(ah);
diff --git a/news/nn/patches/patch-ag b/news/nn/patches/patch-ag
index 127e8388c80..a4e880bb11b 100644
--- a/news/nn/patches/patch-ag
+++ b/news/nn/patches/patch-ag
@@ -1,12 +1,12 @@
-$NetBSD: patch-ag,v 1.2 2002/07/08 02:21:19 kim Exp $
+$NetBSD: patch-ag,v 1.3 2006/10/14 19:33:45 schwarz Exp $
 
---- 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,
-     "iso-8859-15",	8,
-+    "koi8-r",		8,
-     "unknown",		0,
-     NULL,		0,
+--- chset.c.orig	2005-03-30 21:34:27.000000000 +0200
++++ chset.c	2006-10-14 19:50:17.000000000 +0200
+@@ -22,6 +22,7 @@
+     "iso-8859-8", 8,
+     "iso-8859-9", 8,
+     "iso-8859-15", 8,
++    "koi8-r", 8,
+     "unknown", 0,
+     NULL, 0,
  };
diff --git a/news/nn/patches/patch-ah b/news/nn/patches/patch-ah
index 77b987eb33f..cd67f1eca20 100644
--- a/news/nn/patches/patch-ah
+++ b/news/nn/patches/patch-ah
@@ -1,45 +1,13 @@
-$NetBSD: patch-ah,v 1.2 1999/08/22 22:55:46 kim Exp $
+$NetBSD: patch-ah,v 1.3 2006/10/14 19:33:45 schwarz Exp $
 
---- 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;
-     register int c;
--    off_t start;
-+    long start;
-     static char *arc_header = "Archived-Last: ";
-     /* Header format: Archived-Last: 88888888 group.name */
-     /* Fixed constants length == 15 and offset == 24 are used below */
-@@ -83,9 +83,9 @@
- 
-     fseek(arc, start, 0);
-     fprintf(arc, "%s%8ld %s\n", arc_header, (long)num, gh->group_name);
--    fseek(arc, (off_t)0, 2);
-+    fseek(arc, (long)0, 2);
- 
--    fseek(f, (off_t)0, 0);
-+    fseek(f, (long)0, 0);
-     while ((c = getc(f)) != EOF) putc(c, arc);
-     putc(NL, arc);
-     fclose(arc);
-@@ -177,8 +177,8 @@
-     /* get article header */
+--- collect.c.orig	2005-03-31 09:07:51.000000000 +0200
++++ collect.c	2006-10-14 19:52:04.000000000 +0200
+@@ -187,7 +187,7 @@
  
      art_hdr.a_number = art_num;
--    art_hdr.hpos = (off_t)0;
--    art_hdr.lpos = (off_t)0;
-+    art_hdr.hpos = (long)0;
-+    art_hdr.lpos = (long)0;
+     art_hdr.hpos = 0;
+-    art_hdr.lpos = (off_t) 0;
++    art_hdr.lpos = (long) 0;
      art_hdr.flag = 0;
  
      mode = FILL_NEWS_HEADER | FILL_OFFSETS | SKIP_HEADER;
-@@ -391,7 +391,7 @@
- 	}
- #endif
- #ifndef RENUMBER_DANGER
--	if (temp == 0 && gh->data_write_offset == (off_t)0) {
-+	if (temp == 0 && gh->data_write_offset == (long)0) {
- 	    gh->first_db_article = gh->last_db_article + 1;
- 	    continue;
- 	}
diff --git a/news/nn/patches/patch-ai b/news/nn/patches/patch-ai
index 87cef9fc506..1fcfa181aaa 100644
--- a/news/nn/patches/patch-ai
+++ b/news/nn/patches/patch-ai
@@ -1,27 +1,17 @@
-$NetBSD: patch-ai,v 1.7 2005/04/11 11:05:47 schwarz Exp $
+$NetBSD: patch-ai,v 1.8 2006/10/14 19:33:45 schwarz Exp $
 
---- config.h-dist.orig	Thu Feb  6 18:06:02 2003
-+++ config.h-dist	Fri Apr  8 22:20:37 2005
-@@ -11,6 +11,9 @@
+--- config.h-dist.orig	2005-04-01 22:44:22.000000000 +0200
++++ config.h-dist	2006-10-14 20:03:22.000000000 +0200
+@@ -11,6 +11,8 @@
   *	(c) Copyright 1990, Kim F. Storm.  All rights reserved.
   */
  
 +#define PREFIX		"@PREFIX@"
 +#define PKG_SYSCONFDIR	"@PKG_SYSCONFDIR@"
-+
- #include <stdio.h>
- #include <ctype.h>
- 
-@@ -66,7 +69,7 @@
-  *	ascii files.  (Thank you Geoff!)
-  */
- 
--/* #define NETWORK_DATABASE	*/
-+#define NETWORK_DATABASE
- 
  
- /********************************** NNTP *********************************
-@@ -100,7 +103,7 @@
+ /*
+  * The Good Net-Keeping Seal of Approval folks seem to think it necessary to
+@@ -68,7 +70,7 @@
   *	LIB_DIRECTORY defined below.
   */
  
@@ -29,17 +19,17 @@ $NetBSD: patch-ai,v 1.7 2005/04/11 11:05:47 schwarz Exp $
 +#define NNTP_SERVER	PKG_SYSCONFDIR "/server"
  
  /*
-  *	Define NNTP_PATH_HOSTNAME to force a specific hostname into the
-@@ -138,7 +141,7 @@
+  *  Define your local domain name.  If you leave this undefined, nn will
+@@ -95,7 +97,7 @@
   *	conf/s-template.h as a starting point for writing you own.
   */
  
 -#include "s-sunos5.h"
 +#include "@SFILE@"
  
- 
- /********************** MACHINE DEPENDENT DEFINITIONS **********************
-@@ -149,7 +152,7 @@
+ /*
+  *	Define DEFAULT_PAGER as the initial value of the 'pager' variable.
+@@ -122,7 +124,7 @@
   *	conf/m-template.h as a starting point for writing you own.
   */
  
@@ -47,8 +37,19 @@ $NetBSD: patch-ai,v 1.7 2005/04/11 11:05:47 schwarz Exp $
 +#include "@MFILE@"
  
  
+ /***************************** OWNERSHIP ***************************
+@@ -139,8 +141,8 @@
+  *	Common choices are: (news, news) and (your uid, your gid)
+  */
+ 
+-#define OWNER	"news"
+-#define GROUP	"news"
++#define OWNER	"@BINOWN@"
++#define GROUP	"@BINGRP@"
+ 
+ 
  /**************************** LOCALIZATION ****************************
-@@ -182,8 +185,12 @@
+@@ -173,8 +175,12 @@
   *			   (= LIB_DIRECTORY/Log if undefined).
   */
  
@@ -57,13 +58,13 @@ $NetBSD: patch-ai,v 1.7 2005/04/11 11:05:47 schwarz Exp $
 +#define BIN_DIRECTORY	PREFIX "/bin"
 +#define LIB_DIRECTORY	PREFIX "/share/nn"
 +#ifndef _PATH_VARTMP
-+# define _PATH_VARTMP	"/var/tmp"
++# define _PATH_VARTMP  "/var/tmp"
 +#endif
 +#define TMP_DIRECTORY   _PATH_VARTMP
  
  
- /*************************** NEWS TRANSPORT **************************
-@@ -258,7 +265,10 @@
+ /*************************** MAIL INTERFACE *************************
+@@ -189,7 +195,11 @@
   */
  
  /* #define REC_MAIL	"/usr/lib/news/recmail"	*/	/* non-sendmail */
@@ -71,11 +72,12 @@ $NetBSD: patch-ai,v 1.7 2005/04/11 11:05:47 schwarz Exp $
 +#ifndef _PATH_SENDMAIL
 +# define _PATH_SENDMAIL	"/usr/lib/sendmail"
 +#endif
-+#define REC_MAIL        _PATH_SENDMAIL " -t"		/* sendmail */
- 
++#define REC_MAIL	_PATH_SENDMAIL " -t"		/* sendmail */
++
  
  /*
-@@ -307,13 +317,13 @@
+  *	nn needs to know the name of your host.
+@@ -237,13 +247,13 @@
   *	DAEMON_MAN	- nnmaster
   */
  
@@ -93,14 +95,12 @@ $NetBSD: patch-ai,v 1.7 2005/04/11 11:05:47 schwarz Exp $
  #define DAEMON_MAN_SECTION	"8"
  
  
-@@ -383,8 +393,8 @@
-  *	Common choices are:  (news, news)  and	 (your uid, your gid)
+@@ -374,7 +384,7 @@
+  *	performance (no data conversion is needed).
   */
  
--#define	OWNER	"news"
--#define	GROUP	"news"
-+#define	OWNER	"@BINOWN@"
-+#define	GROUP	"@BINGRP@"
+-/* #define NETWORK_DATABASE	*/
++#define NETWORK_DATABASE
  
- /*
-  *	Default folder directory
+ 
+ /**************************** DATABASE LOCATION **************************
diff --git a/news/nn/patches/patch-aj b/news/nn/patches/patch-aj
index b73b06daea1..38606405ee9 100644
--- a/news/nn/patches/patch-aj
+++ b/news/nn/patches/patch-aj
@@ -1,37 +1,22 @@
-$NetBSD: patch-aj,v 1.2 1999/08/22 22:55:46 kim Exp $
+$NetBSD: patch-aj,v 1.3 2006/10/14 19:33:45 schwarz Exp $
 
---- 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 */
-     time_t		last_scan; /* age of active file at last scan */
--    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;
-     int32		free_groups;
- } master_header;
-@@ -68,8 +68,8 @@
-     article_number	first_a_article; /* min article in active */
-     article_number	last_a_article;  /* max article in active */
+--- data.h.orig	2005-03-25 01:50:04.000000000 +0100
++++ data.h	2006-10-14 20:05:18.000000000 +0200
+@@ -30,7 +30,7 @@
+     char            db_lock[DB_LOCK_MESSAGE];
+     time_t          db_created;	/* when database was last built */
+     time_t          last_scan;	/* age of active file at last scan */
+-    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;
+     int32           free_groups;
+ }               master_header;
+@@ -148,7 +148,7 @@
+     /* indexes to header line text	 */
+     long            hpos;	/* first byte of header		 */
+     long            fpos;	/* first byte in article text	 */
+-    off_t           lpos;	/* last pos of article		 */
++    long            lpos;	/* last pos of article		 */
  
--    off_t		index_write_offset;
--    off_t		data_write_offset;
-+    long                index_write_offset;
-+    long                data_write_offset;
- 
-     time_t		creation_time; /* when group was created */
- 
-@@ -145,9 +145,9 @@
-     group_header *a_group;	/* if merged article menu	*/
- 
- 				/* indexes to header line text	*/
--    off_t	hpos;		/* first byte of header		*/
--    off_t	fpos;		/* first byte in article text	*/
--    off_t	lpos;		/* last pos of article		*/
-+    long        hpos;           /* first byte of header         */
-+    long        fpos;           /* first byte in article text   */
-+    long        lpos;           /* last pos of article          */
- 
-     time_stamp 	t_stamp;	/* encoded time_stamp		*/
-     time_stamp 	root_t_stamp;	/* subject's time_stamp		*/
+     time_stamp      t_stamp;	/* encoded time_stamp		 */
+     time_stamp      root_t_stamp;	/* subject's time_stamp		 */
diff --git a/news/nn/patches/patch-ak b/news/nn/patches/patch-ak
index 0be866ec8e4..743f44be7ff 100644
--- a/news/nn/patches/patch-ak
+++ b/news/nn/patches/patch-ak
@@ -1,157 +1,88 @@
-$NetBSD: patch-ak,v 1.3 2002/07/08 02:21:20 kim Exp $
+$NetBSD: patch-ak,v 1.4 2006/10/14 19:33:45 schwarz Exp $
 
---- db.c.orig	Thu Jan 31 23:10:27 2002
-+++ db.c	Sun Jul  7 21:33:09 2002
-@@ -1103,7 +1103,7 @@
+--- db.c.orig	2005-04-03 06:29:15.000000000 +0200
++++ db.c	2006-10-14 20:13:27.000000000 +0200
+@@ -1139,7 +1139,7 @@
  
      if (!db_sequential)
  	fseek(master_file,
--	      (off_t)(MASTER_FIELDS * sizeof(net_long) + DB_LOCK_MESSAGE +
-+	      (long)(MASTER_FIELDS * sizeof(net_long) + DB_LOCK_MESSAGE +
- 	      GROUP_FIELDS * sizeof(net_long) * gh->group_num), 0);
+-	      (off_t) (MASTER_FIELDS * sizeof(net_long) + DB_LOCK_MESSAGE +
++	      (long) (MASTER_FIELDS * sizeof(net_long) + DB_LOCK_MESSAGE +
+ 		       GROUP_FIELDS * sizeof(net_long) * gh->group_num), 0);
  
-     if (fread((char *)buf, sizeof(net_long), GROUP_FIELDS, master_file) != GROUP_FIELDS)
-@@ -1123,7 +1123,7 @@
- #else
-     if (!db_sequential)
- 	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;
-@@ -1145,7 +1145,7 @@
+     if (fread((char *) buf, sizeof(net_long), GROUP_FIELDS, master_file) != GROUP_FIELDS)
+@@ -1181,7 +1181,7 @@
  
      if (!db_sequential)
  	fseek(master_file,
--	      (off_t)(MASTER_FIELDS * sizeof(net_long) + DB_LOCK_MESSAGE +
-+	      (long)(MASTER_FIELDS * sizeof(net_long) + DB_LOCK_MESSAGE +
- 	      GROUP_FIELDS * sizeof(net_long) * gh->group_num), 0);
+-	      (off_t) (MASTER_FIELDS * sizeof(net_long) + DB_LOCK_MESSAGE +
++	      (long) (MASTER_FIELDS * sizeof(net_long) + DB_LOCK_MESSAGE +
+ 		       GROUP_FIELDS * sizeof(net_long) * gh->group_num), 0);
  
      buf[0] = gh->first_db_article;
-@@ -1163,7 +1163,7 @@
- 	goto err;
- #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)
-@@ -1348,10 +1348,10 @@
+@@ -1386,10 +1386,10 @@
  
  
  #ifndef NOV
--off_t db_read_art(f)
-+long db_read_art(f)
- FILE *f;
+-off_t
++long
+ db_read_art(FILE * f)
  {
--    off_t bytes;
-+    long bytes;
+-    off_t           bytes;
++     long          bytes;
  
  #ifdef NETWORK_DATABASE
-     net_long buf[ARTICLE_FIELDS];
-@@ -1556,7 +1556,7 @@
+     net_long        buf[ARTICLE_FIELDS];
+@@ -1594,7 +1594,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.
   */
 -off_t
 +long
- db_read_art(f)
- FILE *f;
+ db_read_art(FILE * f)
  {
-@@ -1764,32 +1764,32 @@
- }
- 
- 
--off_t get_index_offset(gh, art_num)
-+long get_index_offset(gh, art_num)
- group_header *gh;
- article_number art_num;
+     register data_header *dhp = &db_hdr;
+@@ -1820,9 +1820,9 @@
  {
+ 
  #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	/* 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	/* 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				/* 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				/* NETWORK_DATABASE */
  }
  
--off_t get_data_offset(gh, art_num)
-+long get_data_offset(gh, art_num)
- group_header *gh;
- article_number art_num;
- {
-     FILE *index;
--    off_t data_offset;
-+    long data_offset;
+@@ -1833,11 +1833,11 @@
+     long            data_offset;
  
--    if (gh->first_db_article == art_num) return (off_t)0;
-+    if (gh->first_db_article == art_num) return (long)0;
+     if (gh->first_db_article == art_num)
+-	return (off_t) 0;
++	return (long) 0;
  
      index = open_data_file(gh, 'x', OPEN_READ);
--    if (index == NULL) return (off_t)(-1);
-+    if (index == NULL) return (long)(-1);
+     if (index == NULL)
+-	return (off_t) (-1);
++	return (long) (-1);
  
      fseek(index, get_index_offset(gh, art_num), 0);
      if (!db_read_offset(index, &data_offset))
--	data_offset = (off_t)(-1);
-+	data_offset = (long)(-1);
- 
-     fclose(index);
- 
-@@ -1800,7 +1800,7 @@
- int
- db_read_offset(f, offset)
- FILE *f;
--off_t *offset;
-+long *offset;
- {
- #ifdef NETWORK_DATABASE
-     net_long temp;
-@@ -1813,7 +1813,7 @@
+@@ -1866,7 +1866,7 @@
      *offset = temp;
- #else	/* NETWORK_DATABASE */
+ #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	/* NETWORK_DATABASE */
-     return 1;
- }
-@@ -1821,7 +1821,7 @@
- int
- db_write_offset(f, offset)
- FILE *f;
--off_t *offset;
-+long *offset;
- {
- #ifdef NETWORK_DATABASE
-     net_long temp;
-@@ -1835,7 +1835,7 @@
+-    if              (fread((char *) offset, sizeof(off_t), 1, f) != 1)
++    if              (fread((char *) offset, sizeof(long), 1, f) != 1)
+ 	                return 0;
+ #endif				/* NETWORK_DATABASE */
  
- #else	/* NETWORK_DATABASE */
+@@ -1891,7 +1891,7 @@
  
--    if (fwrite((char *)offset, sizeof(off_t), 1, f) != 1) return 0;
-+    if (fwrite((char *)offset, sizeof(long), 1, f) != 1) return 0;
- #endif	/* NETWORK_DATABASE */
-     return 1;
- }
-@@ -1859,7 +1859,7 @@
- int
- db_read_offset(f, offset)
- FILE *f;
--off_t *offset;
-+long *offset;
- {
-   nn_exitmsg(50, "STUB ROUTINE CALLED: db_read_offset\n");
-   return -1;
-@@ -1883,7 +1883,7 @@
-   return NULL;
- }
+ #else				/* NETWORK_DATABASE */
+ 
+-    if              (fwrite((char *) offset, sizeof(off_t), 1, f) != 1)
++    if              (fwrite((char *) offset, sizeof(long), 1, f) != 1)
+ 	                return 0;
+ #endif				/* NETWORK_DATABASE */
  
--off_t
-+long
- get_index_offset(gh, art_num)
- group_header *gh;
- article_number art_num;
diff --git a/news/nn/patches/patch-al b/news/nn/patches/patch-al
index 8210fe60c88..435aaf70c59 100644
--- a/news/nn/patches/patch-al
+++ b/news/nn/patches/patch-al
@@ -1,26 +1,24 @@
-$NetBSD: patch-al,v 1.1 1999/07/26 21:19:28 tron Exp $
+$NetBSD: patch-al,v 1.2 2006/10/14 19:33:45 schwarz Exp $
 
---- db.h.orig	Sun Aug 15 08:59:46 1993
-+++ db.h	Mon Jul 26 23:11:38 1999
-@@ -71,8 +71,8 @@
+--- db.h.orig	2005-03-20 06:39:52.000000000 +0100
++++ db.h	2006-10-14 20:15:23.000000000 +0200
+@@ -74,8 +74,8 @@
  
-     time_stamp	dh_date; /* encoded Date: filed (not a time_t value!!) */
+     time_stamp      dh_date;	/* encoded Date: filed (not a time_t value!!) */
  
--    off_t	dh_hpos; /* absolute offset for first byte of header */
--    off_t	dh_lpos; /* absolute offset for last byte of article */
-+    long        dh_hpos; /* absolute offset for first byte of header */
-+    long        dh_lpos; /* absolute offset for last byte of article */
-     int16	dh_fpos; /* relative offset for first byte in article text */
+-    off_t           dh_hpos;	/* absolute offset for first byte of header */
+-    off_t           dh_lpos;	/* absolute offset for last byte of article */
++    long            dh_hpos;	/* absolute offset for first byte of header */
++    long            dh_lpos;	/* absolute offset for last byte of article */
+     int16           dh_fpos;	/* relative offset for first byte in article
+ 				 * text */
  
-     int16	dh_lines;
-@@ -104,8 +104,8 @@
+@@ -125,7 +125,7 @@
+ char           *db_data_path(char *, group_header *, char);
+ FILE           *open_data_file(group_header *, char, int);
+ void            db_write_group(register group_header *);
+-off_t           db_read_art(FILE *);
++long            db_read_art(FILE *);
+ long            get_index_offset(group_header *, article_number);
+ int             db_read_offset(FILE *, long *);
  
- /* data access */
- 
--off_t db_read_art();
--off_t get_index_offset(), get_data_offset();
-+long db_read_art();
-+long get_index_offset(), get_data_offset();
- 
- extern data_header db_hdr;
- extern data_dynamic_data db_data;
diff --git a/news/nn/patches/patch-am b/news/nn/patches/patch-am
deleted file mode 100644
index 401f8d87a1f..00000000000
--- a/news/nn/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.2 2002/07/08 02:21:20 kim Exp $
-
---- 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;
-     long expect_size;
- 
-     onedone = 0;
diff --git a/news/nn/patches/patch-an b/news/nn/patches/patch-an
deleted file mode 100644
index 964da29b4e3..00000000000
--- a/news/nn/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 1999/07/26 21:19:29 tron Exp $
-
---- digest.c.orig	Sun Aug 15 08:59:50 1993
-+++ digest.c	Mon Jul 26 23:11:38 1999
-@@ -267,7 +267,7 @@
- skip_digest_body(f)
- register FILE *f;
- {
--    off_t  backup_p[BACKUP_LINES];
-+    long   backup_p[BACKUP_LINES];
-     int	   line_type[BACKUP_LINES];
-     register int backup_index, backup_count;
-     int    more_header_lines, end_or_asterisks, blanks;
diff --git a/news/nn/patches/patch-ao b/news/nn/patches/patch-ao
index e5fe4e18688..4cc3134668e 100644
--- a/news/nn/patches/patch-ao
+++ b/news/nn/patches/patch-ao
@@ -1,61 +1,22 @@
-$NetBSD: patch-ao,v 1.2 1999/08/22 22:55:46 kim Exp $
+$NetBSD: patch-ao,v 1.3 2006/10/14 19:33:45 schwarz Exp $
 
---- 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;
+--- expire.c.orig	2005-03-31 08:52:17.000000000 +0200
++++ expire.c	2006-10-14 20:18:42.000000000 +0200
+@@ -104,7 +104,7 @@
+ expire_in_database(register group_header * gh)
  {
-     FILE *old, *data, *ix;
--    off_t old_max_offset;
-+    long old_max_offset;
+     FILE           *old, *data = NULL, *ix = NULL;
+-    off_t           old_max_offset;
++    long            old_max_offset;
      register article_number *list;
-     article_number old_last_article;
-     long count;
-@@ -148,9 +148,9 @@
-     old_last_article = gh->last_db_article;
-     gh->last_db_article = 0;
- 
--    gh->index_write_offset = (off_t)0;
-+    gh->index_write_offset = (long)0;
-     old_max_offset = gh->data_write_offset;
--    gh->data_write_offset = (off_t)0;
-+    gh->data_write_offset = (long)0;
- 
-     gh->master_flag &= ~M_EXPIRE;
-     gh->master_flag |= M_BLOCKED;
-@@ -268,7 +268,7 @@
- {
-     FILE *old_x, *old_d;
-     FILE *new;
--    off_t index_offset, data_offset, new_offset;
-+    long index_offset, data_offset, new_offset;
-     long count, expire_count;
-     char *err_message;
- 
-@@ -333,7 +333,7 @@
-      *	calculate the number of entries to copy
-      */
- 
--    count = gh->index_write_offset / sizeof(off_t);
-+    count = gh->index_write_offset / sizeof(long);
- 
-     /*
-      *	data offset is the offset into the old data file for the
-@@ -342,7 +342,7 @@
-      *	offset 'index_offset'.
+     article_number  old_last_article;
+     long            count;
+@@ -368,7 +368,7 @@
+      * entry in the old index file at offset 'index_offset'.
       */
  
--    data_offset = (off_t)0;
-+    data_offset = (long)0;
+-    data_offset = (off_t) 0;
++    data_offset = (long) 0;
  
      /*
-      *	read 'count' entries from the old index file starting from
-@@ -356,7 +356,7 @@
- 	if (!db_read_offset(old_x, &new_offset))
- 	    expire_error("INDEX: too short");
- 
--	if (data_offset == (off_t)0) data_offset = new_offset;
-+	if (data_offset == (long)0) data_offset = new_offset;
- 
- 	new_offset -= data_offset;
- 	if (!db_write_offset(new, &new_offset))
+      * read 'count' entries from the old index file starting from
diff --git a/news/nn/patches/patch-ap b/news/nn/patches/patch-ap
deleted file mode 100644
index 924a31cd4c1..00000000000
--- a/news/nn/patches/patch-ap
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ap,v 1.4 2006/06/01 23:11:29 joerg Exp $
-
---- global.h.orig	2002-02-04 03:53:13.000000000 +0000
-+++ global.h
-@@ -146,8 +146,6 @@ extern gid_t    group_id;
- extern int
-     process_id;
- 
--extern int errno;
--
- /*
-  *	Storage management
-  */
-@@ -374,12 +372,12 @@ void	db_read_group	__APROTO((group_heade
- void	db_read_group	__APROTO((group_header *gh));
- #endif
- void	db_write_group	__APROTO((group_header *gh));
--off_t	db_read_art	__APROTO((FILE *f));
-+long    db_read_art     __APROTO((FILE *f));
- int	db_write_art	__APROTO((FILE *f));
--off_t	get_index_offset __APROTO((group_header *gh, article_number art_num));
--off_t	get_data_offset	 __APROTO((group_header *gh, article_number art_num));
--int	db_read_offset	__APROTO((FILE *f, off_t *offset));
--int	db_write_offset	__APROTO((FILE *f, off_t *offset));
-+long    get_index_offset __APROTO((group_header *gh, article_number art_num));
-+long    get_data_offset  __APROTO((group_header *gh, article_number art_num));
-+int     db_read_offset  __APROTO((FILE *f, long *offset));
-+int     db_write_offset __APROTO((FILE *f, long *offset));
- 
- /* decode.c */
- 
diff --git a/news/nn/patches/patch-aq b/news/nn/patches/patch-aq
index 7b41e3f807b..a3098cd331e 100644
--- a/news/nn/patches/patch-aq
+++ b/news/nn/patches/patch-aq
@@ -1,7 +1,7 @@
-$NetBSD: patch-aq,v 1.3 2002/07/08 02:21:20 kim Exp $
+$NetBSD: patch-aq,v 1.4 2006/10/14 19:33:45 schwarz Exp $
 
---- inst.sh.orig	Thu Oct  4 01:33:06 2001
-+++ inst.sh	Sun Jul  7 21:33:10 2002
+--- inst.sh.orig	2005-05-01 23:56:21.000000000 +0200
++++ inst.sh	2006-10-14 20:21:40.000000000 +0200
 @@ -1,8 +1,8 @@
  
  # (Large) prefix inserted above by Make
@@ -13,7 +13,7 @@ $NetBSD: patch-aq,v 1.3 2002/07/08 02:21:20 kim Exp $
  
  case "$1" in
  mkdir)
-@@ -55,7 +55,7 @@
+@@ -42,7 +42,7 @@
  	;;
  esac
  
@@ -22,7 +22,7 @@ $NetBSD: patch-aq,v 1.3 2002/07/08 02:21:20 kim Exp $
  
  (
  if $NNTP
-@@ -363,7 +363,6 @@
+@@ -350,7 +350,6 @@
  
  	echo
  	echo "Formatting online manual $MAN"
@@ -30,7 +30,7 @@ $NetBSD: patch-aq,v 1.3 2002/07/08 02:21:20 kim Exp $
  
  	rm -f $MAN
  
-@@ -378,7 +377,7 @@
+@@ -365,7 +364,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 16ad0c29619..181a3757586 100644
--- a/news/nn/patches/patch-ar
+++ b/news/nn/patches/patch-ar
@@ -1,49 +1,13 @@
-$NetBSD: patch-ar,v 1.2 2002/07/08 02:21:20 kim Exp $
+$NetBSD: patch-ar,v 1.3 2006/10/14 19:33:45 schwarz Exp $
 
---- kill.c.orig	Mon Jun 17 23:58:08 2002
-+++ kill.c	Sun Jul  7 21:33:10 2002
-@@ -424,7 +424,7 @@
+--- kill.c.orig	2005-04-20 01:53:17.000000000 +0200
++++ kill.c	2006-10-14 20:23:09.000000000 +0200
+@@ -450,7 +450,7 @@
  typedef struct {
-     long		ckh_magic;
-     time_t		ckh_db_check;
--    off_t		ckh_pattern_offset;
-+    long                ckh_pattern_offset;
-     long		ckh_pattern_size;
-     long		ckh_entries;
-     long		ckh_regexp_size;
-@@ -579,7 +579,7 @@
-     comp_kill_header header;
-     comp_kill_entry  entry;
-     time_t now, age;
--    off_t cur_line_start;
-+    long cur_line_start;
-     char line[512];
-     register char *cp, *np;
-     register int c;
-@@ -605,7 +605,7 @@
- 
-     tprintf("\nCompiling kill file\n");
- 
--    fseek(compf, (off_t)sizeof(header), 0);
-+    fseek(compf, (long)sizeof(header), 0);
- 
-     now = cur_time();
- 
-@@ -850,7 +850,7 @@
- 
-     if (header.ckh_pattern_size > 0) {
- 	kill_patterns = newstr(header.ckh_pattern_size);
--	fseek(killf, (off_t)(header.ckh_entries * sizeof(entry)), 1);
-+	fseek(killf, (long)(header.ckh_entries * sizeof(entry)), 1);
- 	if (fread(kill_patterns, sizeof(char), (int)header.ckh_pattern_size, killf)
- 	    !=  header.ckh_pattern_size) goto err;
-     } else
-@@ -862,7 +862,7 @@
- 
-     tb = group_regexp_table;
- 
--    fseek(killf, (off_t)sizeof(header), 0);
-+    fseek(killf, (long)sizeof(header), 0);
-     for (n = header.ckh_entries, kl = kill_tab; --n >= 0; kl++) {
- 	if (fread((char *)&entry, sizeof(entry), 1, killf) != 1) goto err;
- 	if (header.ckh_pattern_size <= entry.ck_pattern_index ||
+     long            ckh_magic;
+     time_t          ckh_db_check;
+-    off_t           ckh_pattern_offset;
++    long            ckh_pattern_offset;
+     long            ckh_pattern_size;
+     long            ckh_entries;
+     long            ckh_regexp_size;
diff --git a/news/nn/patches/patch-as b/news/nn/patches/patch-as
deleted file mode 100644
index 4692307a7fc..00000000000
--- a/news/nn/patches/patch-as
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-as,v 1.1 1999/07/26 21:19:31 tron Exp $
-
---- master.c.orig	Sat Oct  2 12:33:50 1993
-+++ master.c	Mon Jul 26 23:11:38 1999
-@@ -193,8 +193,8 @@
-     gh->first_db_article = 0;
-     gh->last_db_article = 0;
- 
--    gh->data_write_offset = (off_t)0;
--    gh->index_write_offset = (off_t)0;
-+    gh->data_write_offset = (long)0;
-+    gh->index_write_offset = (long)0;
- 
-     if (init_group(gh)) {
- 	(void)open_data_file(gh, 'd', -1);
diff --git a/news/nn/patches/patch-at b/news/nn/patches/patch-at
index 8cbb550cc05..798e4e15164 100644
--- a/news/nn/patches/patch-at
+++ b/news/nn/patches/patch-at
@@ -1,38 +1,13 @@
-$NetBSD: patch-at,v 1.2 1999/08/22 22:55:46 kim Exp $
+$NetBSD: patch-at,v 1.3 2006/10/14 19:33:45 schwarz Exp $
 
---- 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 lineposbuf[LINEMAX];
--    off_t *linepos = lineposbuf;
-+    long lineposbuf[LINEMAX];
-+    long *linepos = lineposbuf;
-     int linemax = LINEMAX;
-     char linebuf[200], skip_char;
-     int skip_wrap;
-@@ -368,7 +368,7 @@
+--- more.c.orig	2005-04-20 01:44:29.000000000 +0200
++++ more.c	2006-10-14 20:28:07.000000000 +0200
+@@ -380,7 +380,7 @@
      struct digest_header digest_save;
-     int linenum, maxline, topline, print_lines, lno1;
-     int scroll_lines, scroll_from;
--    off_t scroll_offset;
-+    long scroll_offset;
-     int underline_line, fake_underline;
-     int match_lines, match_redraw, match_topline = 0, match_botline;
-     int goto_line, prev_goto, stop_line, extra_lines;
-@@ -655,11 +655,11 @@
-     if (linenum == linemax) {
- 	linemax += 500;
- 	if (linepos == lineposbuf) {
--	    linepos = newobj(off_t, linemax);
-+	    linepos = newobj(long, linemax);
- 	    for (linenum = 0; linenum < LINEMAX; linenum++)
- 		linepos[linenum] = lineposbuf[linenum];
- 	} else
--	    linepos = resizeobj(linepos, off_t, linemax);
-+	    linepos = resizeobj(linepos, long, linemax);
-     }
- 
-     if (goto_line == linenum) {
+     int             linenum, maxline, topline, print_lines, lno1;
+     int             scroll_lines, scroll_from;
+-    off_t           scroll_offset;
++    long            scroll_offset;
+     int             underline_line, fake_underline;
+     int             match_lines, match_redraw, match_topline = 0, match_botline;
+     int             goto_line, prev_goto, stop_line, extra_lines;
diff --git a/news/nn/patches/patch-au b/news/nn/patches/patch-au
index 807cd80f5cc..edddc8b7e60 100644
--- a/news/nn/patches/patch-au
+++ b/news/nn/patches/patch-au
@@ -1,63 +1,25 @@
-$NetBSD: patch-au,v 1.2 1999/08/22 22:55:46 kim Exp $
+$NetBSD: patch-au,v 1.3 2006/10/14 19:33:45 schwarz Exp $
 
---- 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;
-     int siz, all, date_only;
--    off_t pos;
-+    long pos;
+--- news.c.orig	2005-04-20 01:56:27.000000000 +0200
++++ news.c	2006-10-14 20:30:52.000000000 +0200
+@@ -255,7 +255,7 @@
  
-     pos = ftell(f);
- 
-@@ -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 = 0;
--    off_t fpos;
-+    long fpos;
-     FILE *nntp_get_article();
- #endif /* NNTP */
+     int             c;
+-    off_t           digest_artlen = 0;
++    long           digest_artlen = 0;
+ #endif				/* DONT_COUNT_LINES */
  
-@@ -275,9 +275,9 @@
- 	/* necessary because empty files wreak havoc */
+ #ifdef NNTP
+@@ -301,9 +301,9 @@
  	if (fstat(fileno(f), &statb) < 0 ||
+ 
  #ifdef NOV
--	    (art->lpos = statb.st_size, statb.st_size <= (off_t)0)) {
-+	    (art->lpos = (long)statb.st_size, statb.st_size <= (off_t)0)) {
+-	    (art->lpos = statb.st_size, statb.st_size <= (off_t) 0)) {
++	    (art->lpos = (long)statb.st_size, statb.st_size <= (off_t) 0)) {
  #else
--	    statb.st_size < art->lpos || statb.st_size <= (off_t)0) {
-+	    (long)statb.st_size < art->lpos || statb.st_size <= (off_t)0) {
- #endif /* NOV */
- 	    fclose(f);
- 	    return who_am_i == I_AM_MASTER ? (FILE *)1 : NULL;
-@@ -363,12 +363,12 @@
- 	}
+-	    statb.st_size < art->lpos || statb.st_size <= (off_t) 0) {
++	    (long)statb.st_size < art->lpos || statb.st_size <= (off_t) 0) {
+ #endif				/* NOV */
  
- 	if (modes & FILL_OFFSETS) {
--	    fseek(f, (off_t)0, 2);
-+	    fseek(f, (long)0, 2);
- 	    news.ng_lpos = ftell(f);
- 	}
- #ifdef NNTP
- 	else if (use_nntp && (art->flag & (A_DIGEST | A_FOLDER)) == 0) {
--	    fseek(f, (off_t)0, 2);
-+	    fseek(f, (long)0, 2);
- 	    art->lpos = ftell(f);
- 	}
- #endif
-@@ -391,7 +391,7 @@
-     }
- #ifdef NNTP
-     else if (use_nntp && (art->flag & (A_DIGEST | A_FOLDER)) == 0) {
--	fseek(f, (off_t)0, 2);
-+	fseek(f, (long)0, 2);
- 	art->lpos = ftell(f);
-     }
- #endif
+ 	    fclose(f);
diff --git a/news/nn/patches/patch-av b/news/nn/patches/patch-av
index c1d66b82e3e..93357724bbc 100644
--- a/news/nn/patches/patch-av
+++ b/news/nn/patches/patch-av
@@ -1,28 +1,28 @@
-$NetBSD: patch-av,v 1.1 1999/07/26 21:19:32 tron Exp $
+$NetBSD: patch-av,v 1.2 2006/10/14 19:33:45 schwarz Exp $
 
---- news.h.orig	Tue Aug 31 23:06:07 1993
-+++ news.h	Mon Jul 26 23:11:38 1999
-@@ -13,8 +13,8 @@
- #	  define N_DIGEST 1	/*   article is part of a digest*/
- #	  define N_MODERATED 2	/*   group is moderated		*/
+--- news.h.orig	2003-11-03 10:36:23.000000000 +0100
++++ news.h	2006-10-14 20:32:23.000000000 +0200
+@@ -14,8 +14,8 @@
+ #define N_DIGEST 1		/* article is part of a digest */
+ #define N_MODERATED 2		/* group is moderated		 */
  
--	off_t	ng_fpos;	/* position of article text	*/
--	off_t	ng_lpos;	/* last text offset		*/
-+	long    ng_fpos;        /* position of article text     */
-+	long    ng_lpos;        /* last text offset             */
- 				/* header lines:		*/
- 	char	*ng_from;	/*   from			*/
- 	char	*ng_name;	/*   senders name		*/
-@@ -51,9 +51,9 @@
+-    off_t           ng_fpos;	/* position of article text	 */
+-    off_t           ng_lpos;	/* last text offset		 */
++    long            ng_fpos;	/* position of article text	 */
++    long            ng_lpos;	/* last text offset		 */
+     /* header lines:		 */
+     char           *ng_from;	/* from			 */
+     char           *ng_name;	/* senders name		 */
+@@ -52,9 +52,9 @@
   */
  
  struct digest_header {
--	off_t	dg_hpos;	/* position of article header	*/
--	off_t	dg_fpos;	/* position of article text	*/
--	off_t	dg_lpos;	/* last text position		*/
-+	long    dg_hpos;        /* position of article header   */
-+	long    dg_fpos;        /* position of article text     */
-+	long    dg_lpos;        /* last text position           */
- 				/* header lines:		*/
- 	char	*dg_date;	/*   date			*/
- 	char	*dg_from;	/*   from			*/
+-    off_t           dg_hpos;	/* position of article header	 */
+-    off_t           dg_fpos;	/* position of article text	 */
+-    off_t           dg_lpos;	/* last text position		 */
++    long            dg_hpos;	/* position of article header	 */
++    long            dg_fpos;	/* position of article text	 */
++    long            dg_lpos;	/* last text position		 */
+     /* header lines:		 */
+     char           *dg_date;	/* date			 */
+     char           *dg_from;	/* from			 */
diff --git a/news/nn/patches/patch-aw b/news/nn/patches/patch-aw
deleted file mode 100644
index 653933b703a..00000000000
--- a/news/nn/patches/patch-aw
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aw,v 1.2 2002/07/08 02:21:20 kim Exp $
-
---- 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) {
--	fseek(rc, (off_t)0, 2);
-+	fseek(rc, (long)0, 2);
- 	if (ftell(rc))
- 	    rewind(rc);
- 	else {
diff --git a/news/nn/patches/patch-ax b/news/nn/patches/patch-ax
index cafeafec22d..9687055b166 100644
--- a/news/nn/patches/patch-ax
+++ b/news/nn/patches/patch-ax
@@ -1,8 +1,8 @@
-$NetBSD: patch-ax,v 1.5 2005/04/11 11:05:47 schwarz Exp $
+$NetBSD: patch-ax,v 1.6 2006/10/14 19:33:45 schwarz Exp $
 
---- nntp.c.orig	Sat Jan 25 07:10:39 2003
-+++ nntp.c	Fri Apr  8 22:23:05 2005
-@@ -832,7 +832,11 @@
+--- nntp.c.orig	2005-04-20 01:06:51.000000000 +0200
++++ nntp.c	2006-10-14 20:33:45.000000000 +0200
+@@ -915,7 +915,11 @@
  	server_real_name = hp->h_name;
      else
  	nn_exitmsg(1, "NNTPSERVER is invalid");
@@ -14,12 +14,3 @@ $NetBSD: patch-ax,v 1.5 2005/04/11 11:05:47 schwarz Exp $
  
      if (use_nntp) {
  	freeobj(news_active);
-@@ -1159,7 +1163,7 @@
- 
-      case OK_BODY:
- 	tmp = open_file(cptr->file_name, OPEN_APPEND|MUST_EXIST);
--	fseek(tmp, (off_t)0, 2);
-+	fseek(tmp, (long)0, 2);
- 	if (copy_text(tmp) < 0)
- 	    return NULL;
- 	if (fclose(tmp) == EOF) goto err;
diff --git a/news/nn/patches/patch-ay b/news/nn/patches/patch-ay
index 02971512b4c..cd5082211e2 100644
--- a/news/nn/patches/patch-ay
+++ b/news/nn/patches/patch-ay
@@ -1,40 +1,31 @@
-$NetBSD: patch-ay,v 1.2 2002/07/08 02:21:20 kim Exp $
+$NetBSD: patch-ay,v 1.3 2006/10/14 19:33:45 schwarz Exp $
 
---- save.c.orig	Thu Jul 12 01:18:34 2001
-+++ save.c	Sun Jul  7 21:39:15 2002
-@@ -521,7 +521,7 @@
+--- save.c.orig	2005-03-30 21:29:29.000000000 +0200
++++ save.c	2006-10-14 20:37:17.000000000 +0200
+@@ -525,7 +525,7 @@
  		return 0;
  	    }
  	    current_folder_type = -1;
--	    if (ftell(save_file) != (off_t)0) {
-+	    if (ftell(save_file) != (long)0) {
- 		if (mode != NO_HEADER) set_folder_type(save_name);
+-	    if (ftell(save_file) != (off_t) 0) {
++	    if (ftell(save_file) != (long) 0) {
+ 		if (mode != NO_HEADER)
+ 		    set_folder_type(save_name);
  		save_mode &= ~FILE_IS_NEW;
- 	    }
-@@ -538,7 +538,7 @@
+@@ -542,7 +542,7 @@
  	mailbox_format(save_file, 1);
  
      if (mode == FULL_HEADER || mode == HEADER_ONLY) {
--	off_t cnt = ah->fpos - ah->hpos;
-+	long cnt = ah->fpos - ah->hpos;
+-	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);
-@@ -656,7 +656,7 @@
- char *dir, *file;
+ 	    if ((c = getc(art)) == EOF)
+ 		break;
+@@ -663,7 +663,7 @@
+ store_header(article_header * ah, FILE * f, char *dir, char *file)
  {
-     register int c;
--    off_t endpos;
-+    long endpos;
-     FILE *h;
+     register int    c;
+-    off_t           endpos;
++    long            endpos;
+     FILE           *h;
  
-     if (dir != (char *)NULL && file[0] != '/')
-@@ -665,7 +665,7 @@
- 	msg("Cannot open %s", file);
- 	return;
-     }
--    fseek(h, (off_t)0, 2);
-+    fseek(h, (long)0, 2);
-     if (ftell(h) > 0)
- 	set_folder_type(file);
-     else
+     if (dir != (char *) NULL && file[0] != '/')
diff --git a/news/nn/patches/patch-az b/news/nn/patches/patch-az
index 1212eb55682..fca0780a7e0 100644
--- a/news/nn/patches/patch-az
+++ b/news/nn/patches/patch-az
@@ -1,8 +1,8 @@
-$NetBSD: patch-az,v 1.1 1999/07/26 21:19:33 tron Exp $
+$NetBSD: patch-az,v 1.2 2006/10/14 19:33:45 schwarz Exp $
 
---- sort.c.orig	Tue Aug 31 23:06:25 1993
-+++ sort.c	Mon Jul 26 23:11:39 1999
-@@ -43,6 +43,29 @@
+--- sort.c.orig	2005-03-30 21:24:35.000000000 +0200
++++ sort.c	2006-10-14 20:38:02.000000000 +0200
+@@ -51,6 +51,29 @@
   *	before MATCH_?? (t, a, b) is used.
   */
  
@@ -32,11 +32,11 @@ $NetBSD: patch-az,v 1.1 1999/07/26 21:19:33 tron Exp $
  #define	MATCH_DROP(table, c) ( c & 0200 || table[c] == 0 )
  #define MATCH_EQ(table, a, b) ( a == b || table[a] == table[b] )
  #define MATCH_LS_EQ(table, a, b) ( a <= b || table[a] <= table[b] )
-@@ -77,6 +100,7 @@
+@@ -85,6 +108,7 @@
      26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 00, 00
  };
  
 +#endif /* HAVE_WORKING_COLLATE */
  
  static int
- order_subj_date(ah1, ah2)
+ order_subj_date(article_header ** ah1, article_header ** ah2)
diff --git a/news/nn/patches/patch-ba b/news/nn/patches/patch-ba
index d2a4b56894c..560f1514ec0 100644
--- a/news/nn/patches/patch-ba
+++ b/news/nn/patches/patch-ba
@@ -1,21 +1,28 @@
-$NetBSD: patch-ba,v 1.3 2002/07/08 02:21:20 kim Exp $
-
---- 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 */
+--- term.c.orig	2005-06-29 23:40:27.000000000 +0200
++++ term.c	2006-10-14 21:03:30.000000000 +0200
+@@ -25,7 +25,7 @@
+ #include "regexp.h"
+ #include "nn_term.h"
+ 
+-#if !defined(__FreeBSD__) && !(__NetBSD__) && !defined(NeXT)
++#if !defined(__FreeBSD__) && !(__NetBSD__) && !defined(NeXT) && !defined(__APPLE__) && !defined(__DragonFly__)
+ #include <stropts.h>
+ #else
+ #include <sys/ioctl.h>
+@@ -74,9 +74,9 @@
+ 
  #else
+ 
 -#ifndef __FreeBSD__
 +#ifndef HAVE_TERMIOS_H
- # include <sgtty.h>
--#endif	/* __FreeBSD__ */
-+#endif	/* HAVE_TERMIOS_H */
+ #include <sgtty.h>
+-#endif				/* __FreeBSD__ */
++#endif				/* HAVE_TERMIOS_H */
+ 
  #endif
  
- #ifdef SYSV_RESIZING
-@@ -401,6 +401,12 @@
- #endif	/* FAKE_INTERRUPT */
+@@ -456,6 +456,12 @@
+ #endif				/* FAKE_INTERRUPT */
  
  static unsigned sp_table[] = {
 +#ifdef B115200
@@ -25,5 +32,5 @@ $NetBSD: patch-ba,v 1.3 2002/07/08 02:21:20 kim Exp $
 +    B57600, 5760,
 +#endif
      B9600, 960,
+ 
  #ifdef B19200
-     B19200, 1920,
diff --git a/news/nn/patches/patch-bd b/news/nn/patches/patch-bd
deleted file mode 100644
index fc7dfe6391e..00000000000
--- a/news/nn/patches/patch-bd
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bd,v 1.2 2005/06/17 15:36:32 hira Exp $
-
---- nntp.c.old	2004-07-18 15:16:03.000000000 -0400
-+++ nntp.c	2004-07-18 15:16:07.000000000 -0400
-@@ -837,7 +837,9 @@
-     if (nntp_local_server) return;
- 
-     find_server();
--    strncpy(host_name, (gethostbyname(host_name))->h_name, sizeof host_name);
-+
-+    if ((hp = gethostbyname(host_name)) != NULL)
-+    	strncpy(host_name, hp->h_name, sizeof host_name);
- 
-     if ((hp = gethostbyname(nntp_server)) != NULL)
- 	server_real_name = hp->h_name;
diff --git a/news/nn/patches/patch-be b/news/nn/patches/patch-be
index 3bd85d0bd5e..dfa97fdb2ae 100644
--- a/news/nn/patches/patch-be
+++ b/news/nn/patches/patch-be
@@ -1,12 +1,12 @@
-$NetBSD: patch-be,v 1.1 2006/06/01 23:11:29 joerg Exp $
+$NetBSD: patch-be,v 1.2 2006/10/14 19:33:45 schwarz Exp $
 
---- global.c.orig	2006-06-01 23:08:34.000000000 +0000
-+++ global.c
-@@ -61,7 +61,6 @@ export int who_am_i;
- export int dont_write_console = 0;
- export int mail_errors_mode = 2;
+--- global.c.orig	2005-04-20 00:26:50.000000000 +0200
++++ global.c	2006-10-14 20:43:21.000000000 +0200
+@@ -81,7 +81,6 @@
+ int             dont_write_console = 0;
+ int             mail_errors_mode = 2;
+ 
+-extern int      errno;
+ extern char    *getlogin(), *getenv();
  
--extern int errno;
- struct passwd *getpwuid();
- extern char *getlogin(), *getenv();
  
diff --git a/news/nn/patches/patch-bf b/news/nn/patches/patch-bf
index 0d6e727929f..f72d071fa6c 100644
--- a/news/nn/patches/patch-bf
+++ b/news/nn/patches/patch-bf
@@ -1,14 +1,14 @@
-$NetBSD: patch-bf,v 1.1 2006/06/01 23:11:29 joerg Exp $
+$NetBSD: patch-bf,v 1.2 2006/10/14 19:33:45 schwarz Exp $
 
---- execute.c.orig	2006-06-01 23:09:21.000000000 +0000
-+++ execute.c
-@@ -23,9 +23,6 @@ export char *init_shell = SHELL;
- export char *user_shell;
- export char *exec_chdir_to = NULL;
+--- execute.c.orig	2006-10-14 20:46:22.000000000 +0200
++++ execute.c	2006-10-14 20:46:36.000000000 +0200
+@@ -30,9 +30,6 @@
+ char           *user_shell;
+ char           *exec_chdir_to = NULL;
  
--extern int errno;
+-extern int      errno;
 -
 -
  static int
- shell_check()
+ shell_check(void)
  {