Changes for latest release

2 files changed, 11 insertions, 158 deletions

diff --git a/news/cnews/files/patch-aa b/news/cnews/files/patch-aa
index 9eeb4695ff51..c75a0b6765fe 100644
--- a/news/cnews/files/patch-aa
+++ b/news/cnews/files/patch-aa
@@ -1,13 +1,13 @@
-*** ../work/conf/makeinc	Thu Jan  1 00:00:00 1970
---- ./conf/makeinc	Fri Sep 30 12:34:00 1994
+*** ../work/conf/makeinc	Wed Dec 31 16:00:00 1969
+--- ./conf/makeinc	Tue Oct 25 04:00:55 1994
 ***************
 *** 0 ****
 --- 1,3 ----
 + # makefile substitutions file
 + # how to include ../include/config.make
 + INCLUDE		.include "../include/config.make"
-*** ../work/conf/quiz.def	Thu Jan  1 00:00:00 1970
---- ./conf/quiz.def	Fri Sep 30 12:33:59 1994
+*** ../work/conf/quiz.def	Wed Dec 31 16:00:00 1969
+--- ./conf/quiz.def	Tue Oct 25 04:00:54 1994
 ***************
 *** 0 ****
 --- 1,68 ----
@@ -79,8 +79,8 @@
 + faststrchr="no"
 + # These answers are interdependent; do not edit this file!
 + sftype="c"
-*** ../work/conf/substitutions	Thu Jan  1 00:00:00 1970
---- ./conf/substitutions	Fri Sep 30 12:34:00 1994
+*** ../work/conf/substitutions	Wed Dec 31 16:00:00 1969
+--- ./conf/substitutions	Tue Oct 25 04:00:55 1994
 ***************
 *** 0 ****
 --- 1,8 ----
@@ -92,11 +92,11 @@
 + NEWSPATH	/bin:/usr/bin:/usr/local/bin
 + NEWSUMASK	022
 + NEWSCONFIG	/usr/local/lib/news/bin/config
-*** ../work/include/config.make	Thu Jan  1 00:00:00 1970
---- ./include/config.make	Fri Sep 30 12:34:01 1994
+*** ../work/include/config.make	Wed Dec 31 16:00:00 1969
+--- ./include/config.make	Tue Oct 25 04:00:55 1994
 ***************
 *** 0 ****
---- 1,56 ----
+--- 1,58 ----
 + # make header file
 + # pathname variables
 + # =()<NEWSARTS=@<NEWSARTS>@>()=
@@ -107,6 +107,8 @@
 + NEWSBIN=/usr/local/libexec/news
 + # =()<NEWSCTL=@<NEWSCTL>@>()=
 + NEWSCTL=/usr/local/lib/news
++ # =()<NEWSCONFIG=@<NEWSCONFIG>@>()=
++ NEWSCONFIG=/usr/local/lib/news/bin/config
 + 
 + # workaround for System V make bug
 + SHELL=/bin/sh
diff --git a/news/cnews/files/patch-ab b/news/cnews/files/patch-ab
index a1cf811cfbba..1566db4c673f 100644
--- a/news/cnews/files/patch-ab
+++ b/news/cnews/files/patch-ab
@@ -1,22 +1,3 @@
-*** ../work.old/makefile	Mon Sep 26 16:21:40 1994
---- ./makefile	Sat Oct  1 11:35:43 1994
-***************
-*** 16,22 ****
-  # System V bug fix
-  SHELL=/bin/sh
-  
-! build:	msub sub mx libcnews.a pgms
-  	: everything built successfully
-  
-  lib:	libcnews.a
---- 16,22 ----
-  # System V bug fix
-  SHELL=/bin/sh
-  
-! build all:	msub sub mx libcnews.a pgms
-  	: everything built successfully
-  
-  lib:	libcnews.a
 *** ../work.old/util/dostatfs.c	Thu Sep  8 13:06:30 1994
 --- ./util/dostatfs.c	Sat Oct  1 11:27:59 1994
 ***************
@@ -29,84 +10,6 @@
   #include <sys/mount.h>
   
   #ifndef MNAMELEN
-***************
-*** 19,26 ****
-  #include <sys/statfs.h>
-  #endif
-  
-- #define	f_fsize	f_bsize		/* idiotic incompatible naming in 4.4 */
-  #endif	/* MNAMELEN */
-  
-  extern int debug;
-  
---- 20,30 ----
-  #include <sys/statfs.h>
-  #endif
-  
-  #endif	/* MNAMELEN */
-+ 
-+ #if BSD4_4 >= 1
-+ #define	f_fsize	f_bsize		/* idiotic incompatible naming in 4.4 */
-+ #endif
-  
-  extern int debug;
-  
-*** ./maint/makefile	Tue Sep 20 21:56:32 1994
---- ../cnews/maint/makefile	Thu Sep 29 09:40:58 1994
-***************
-*** 77,83 ****
-  	echo 'Message-ID: <legal>' >>arts/bar/ugh/12
-  	echo '<bar.ugh/13@trash>	0~0	bar.ugh/13' >>history.good
-  	echo 'Message-ID: illegal' >arts/bar/ugh/13
-! 	sed $(FIXMIDFIELD) history.good | sort -o history.good
-  
-  r:	$(PROGS) rclean rsetup
-  	: "mkhistory"
---- 77,84 ----
-  	echo 'Message-ID: <legal>' >>arts/bar/ugh/12
-  	echo '<bar.ugh/13@trash>	0~0	bar.ugh/13' >>history.good
-  	echo 'Message-ID: illegal' >arts/bar/ugh/13
-! 	sed $(FIXMIDFIELD) history.good | sort -o history.good2
-! 	mv history.good2 history.good
-  
-  r:	$(PROGS) rclean rsetup
-  	: "mkhistory"
-***************
-*** 93,99 ****
-  	: "addmissing"
-  	echo '<missing>	9999~-	bar.ugh/14' >>history.good
-  	echo 'Message-ID: <missing>' >arts/bar/ugh/14
-! 	sed $(FIXMIDFIELD) history.good | sort -o history.good
-  	sleep 2		# ensure article looks older than addmissing startup
-  	$(HERE) ./addmissing -v >addm.out 2>addm.diag
-  	sed $(FIXMIDFIELD) history | sort >history.fixed
---- 94,101 ----
-  	: "addmissing"
-  	echo '<missing>	9999~-	bar.ugh/14' >>history.good
-  	echo 'Message-ID: <missing>' >arts/bar/ugh/14
-! 	sed $(FIXMIDFIELD) history.good | sort -o history.good2
-! 	mv history.good2 history.good
-  	sleep 2		# ensure article looks older than addmissing startup
-  	$(HERE) ./addmissing -v >addm.out 2>addm.diag
-  	sed $(FIXMIDFIELD) history | sort >history.fixed
-***************
-*** 106,112 ****
-  	: "cnewsdo, using addmissing as test command"
-  	echo '<missing2>	9999~-	bar.ugh/15' >>history.good
-  	echo 'Message-ID: <missing2>' >arts/bar/ugh/15
-! 	sed $(FIXMIDFIELD) history.good | sort -o history.good
-  	sleep 2		# ensure article looks older than addmissing startup
-  	touch active
-  	$(HERE) ./cnewsdo addmissing >addm.out 2>addm.diag
---- 108,115 ----
-  	: "cnewsdo, using addmissing as test command"
-  	echo '<missing2>	9999~-	bar.ugh/15' >>history.good
-  	echo 'Message-ID: <missing2>' >arts/bar/ugh/15
-! 	sed $(FIXMIDFIELD) history.good | sort -o history.good2
-! 	mv history.good2 history.good
-  	sleep 2		# ensure article looks older than addmissing startup
-  	touch active
-  	$(HERE) ./cnewsdo addmissing >addm.out 2>addm.diag
 *** batch/usenntpxmit.old	Thu Sep 22 17:28:37 1994
 --- batch/usenntpxmit	Fri Sep 30 12:30:17 1994
 ***************
@@ -126,39 +29,6 @@
   if test -s $tmp
   then
   	cat $tmp >>$NEWSSITEDIR/togo.leftover
-*** nov/mkov.c.old	Sun Sep 18 17:55:05 1994
---- nov/mkov.c	Fri Sep 30 13:39:22 1994
-***************
-*** 305,317 ****
-  	putfld(hdrp->h_bytes);
-  	putfld(hdrp->h_lines);
-  	/* put Xref in only if there is more than one locator in it */
-! 	p = strchr(hdrp->h_xref, ' ');	/* p -> space after relayer */
-! 	if (p != NULL)
-  		p = strchr(p, ':');	/* p -> colon in first location */
-! 	if (p != NULL)
-  		p = strchr(p+1, ':');	/* p -> colon in second location */
-! 	if (p != NULL)			/* at least two locations! */
-  		putextfld("xref", hdrp->h_xref);
-  	/* step 3 of 4: add new header output before this line */
-  	(void) putchar('\n');
-  }
---- 305,319 ----
-  	putfld(hdrp->h_bytes);
-  	putfld(hdrp->h_lines);
-  	/* put Xref in only if there is more than one locator in it */
-! 	if (hdrp->h_xref != NULL) {
-! 	    p = strchr(hdrp->h_xref, ' ');	/* p -> space after relayer */
-! 	    if (p != NULL)
-  		p = strchr(p, ':');	/* p -> colon in first location */
-! 	    if (p != NULL)
-  		p = strchr(p+1, ':');	/* p -> colon in second location */
-! 	    if (p != NULL)			/* at least two locations! */
-  		putextfld("xref", hdrp->h_xref);
-+ 	}
-  	/* step 3 of 4: add new header output before this line */
-  	(void) putchar('\n');
-  }
 *** util/report.old	Thu Sep 15 13:24:57 1994
 --- util/report	Fri Sep 30 16:57:05 1994
 ***************
@@ -176,22 +46,3 @@
 ! ) | /usr/sbin/sendmail -t $args	# some sites might want "mail" instead
   
   # and the trap handles the exit status
-*** expire/doexpire.old	Sun Sep 18 17:49:21 1994
---- expire/doexpire	Fri Sep 30 19:47:39 1994
-***************
-*** 10,16 ****
-  dor='?'
-  opts=
-  histdir=$NEWSCTL
-! for dummy
-  do
-  	case "$1" in
-  	-r)	dor=yes ; opts="$opts -r"	;;
---- 10,16 ----
-  dor='?'
-  opts=
-  histdir=$NEWSCTL
-! while test $# -ne 0
-  do
-  	case "$1" in
-  	-r)	dor=yes ; opts="$opts -r"	;;