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).

1 files changed, 29 insertions, 90 deletions

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