Update INN package to version 2.4.1. Major changes since version 2.3.x:

- builtin IPv6 support
- new configuration parser
- completely rewriten "send-uucp" which replaces "sendbatch"

6 files changed, 17 insertions, 97 deletions

diff --git a/news/inn/patches/patch-ad b/news/inn/patches/patch-ad
index 2704850f350..58df5b67fc2 100644
--- a/news/inn/patches/patch-ad
+++ b/news/inn/patches/patch-ad
@@ -1,13 +1,14 @@
-$NetBSD: patch-ad,v 1.4 2001/02/08 16:23:07 tron Exp $
+$NetBSD: patch-ad,v 1.5 2004/06/02 11:43:55 tron Exp $
 
---- scripts/rc.news.in.orig	Thu Jan 11 09:55:23 2001
-+++ scripts/rc.news.in	Mon Feb  5 11:39:49 2001
-@@ -48,6 +48,8 @@
+--- scripts/rc.news.in.orig	2004-01-07 23:47:19.000000000 +0100
++++ scripts/rc.news.in	2004-06-02 11:36:29.000000000 +0200
+@@ -76,6 +76,9 @@
  ;;
  esac
  
 +## Unlimit
 +ulimit -n `ulimit -H -n`
++
+ ##  Pick ${INND} or ${INNDSTART}
+ WHAT=${INNDSTART}
  
- AZ=ABCDEFGHIJKLMNOPQRSTUVWXYZ
- az=abcdefghijklmnopqrstuvwxyz
diff --git a/news/inn/patches/patch-ae b/news/inn/patches/patch-ae
deleted file mode 100644
index 5c5497e3dcb..00000000000
--- a/news/inn/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2001/02/08 16:23:07 tron Exp $
-
---- backends/actsyncd.in.orig	Wed Jul 19 01:54:07 2000
-+++ backends/actsyncd.in	Fri Sep  1 21:05:19 2000
-@@ -163,7 +163,7 @@
-         if [ -z "$ftp" ]; then
-            echo "getlist -h $host" >>$out
-            if getlist -h $host > active 2>>$out; then
--             :
-+             status=0
-            else
-              status=$NOSYNC
-            fi
diff --git a/news/inn/patches/patch-af b/news/inn/patches/patch-af
deleted file mode 100644
index 5dc9e9aabe9..00000000000
--- a/news/inn/patches/patch-af
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-af,v 1.5 2002/07/06 15:04:58 tron Exp $
-
---- backends/sendbatch.in.orig	Thu Sep 17 08:15:02 1998
-+++ backends/sendbatch.in	Mon Jul 19 01:23:35 1999
-@@ -37,6 +37,10 @@
- 	DEFBYTES=`expr "${SITE}" : '-s\(.*\)'`
- 	continue
- 	;;
-+    -t*)
-+	TRANSHOST=`expr "${SITE}" : '-t\(.*\)'`
-+	continue
-+	;;
-     -m*)
- 	BYTESQUEUED=`expr "${SITE}" : '-m\(.*\)'`
- 	continue
-@@ -75,6 +79,16 @@
- 	ECHO="echo '#! cunbatch'"
- 	continue
- 	;;
-+    -cg)
-+	COMP="; exec gzip -9"
-+	ECHO="echo '#! cunbatch'"
-+	continue
-+	;;
-+    -g)
-+	COMP="; exec gzip -9"
-+	ECHO="echo '#! gunbatch'"
-+	continue
-+	;;
-     +c)
- 	COMP=''
- 	C7=''
-@@ -160,12 +174,20 @@
- 	fi
- #    fi
- 
-+     if [ ${TRANSHOST-none} != none ]; then
-+       SITE_SPOOLDIR=${UUSPOOL}/${TRANSHOST}
-+       UUCPPATH=${TRANSHOST}!${SITE}
-+     else
-+       UUCPPATH=${SITE}
-+       SITE_SPOOLDIR=${UUSPOOL}/${SITE}
-+    fi
-+
-     ##  Check the host's queue size?
-     QUEUE=0
-     if [ -n "${BYTESQUEUED}" ] ; then
--	if [ -d ${UUSPOOL}/${SITE} ] ; then
-+	if [ -d ${SITE_SPOOLDIR} ] ; then
- 	    # Get queue size from directory size
--	    QUEUE=`du -s "${UUSPOOL}/${SITE}" \
-+	    QUEUE=`du -s "${SITE_SPOOLDIR}" \
- 		    | ${AWK} '{ printf("%s000\n", $1); }'`
- 
- 	else
-@@ -199,9 +221,9 @@
-     if [ -f ${SITE}.cmd ] ; then
- 	UUXCOM="`cat ${SITE}.cmd`"
-     elif [ -n "${ECHO}" -o -n "${COMP}" ]; then
--	UUXCOM="( ${ECHO} ${COMP} ) | ${UUX} - ${UUXFLAGS} ${SITE}!${RNEWS}"
-+	UUXCOM="( ${ECHO} ${COMP} ) | ${UUX} - ${UUXFLAGS} ${UUCPPATH}!${RNEWS}"
-     else
--	UUXCOM="${UUX} - ${UUXFLAGS} ${SITE}!${RNEWS}"
-+	UUXCOM="${UUX} - ${UUXFLAGS} ${UUCPPATH}!${RNEWS}"
-     fi
- 
-     ## Create batches.
diff --git a/news/inn/patches/patch-ag b/news/inn/patches/patch-ag
index 2b64118b0e1..d9830b29cc9 100644
--- a/news/inn/patches/patch-ag
+++ b/news/inn/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.6 2002/07/06 15:04:58 tron Exp $
+$NetBSD: patch-ag,v 1.7 2004/06/02 11:43:55 tron Exp $
 
---- backends/pgpverify.in.orig	Mon May  6 08:02:07 2002
-+++ backends/pgpverify.in	Sat Jul  6 16:58:05 2002
+--- control/pgpverify.in.orig	Mon May  6 08:02:07 2002
++++ control/pgpverify.in	Sat Jul  6 16:58:05 2002
 @@ -90,7 +90,7 @@
  # Path to pgp binary; for PGP 5.0, set the path to the pgpv binary.
  # If you have INN and the script is able to successfully include your
diff --git a/news/inn/patches/patch-ah b/news/inn/patches/patch-ah
index 855274ba9f1..334ed43b03f 100644
--- a/news/inn/patches/patch-ah
+++ b/news/inn/patches/patch-ah
@@ -1,9 +1,8 @@
-$NetBSD: patch-ah,v 1.5 2001/07/10 16:02:12 tron Exp $
+$NetBSD: patch-ah,v 1.6 2004/06/02 11:43:55 tron Exp $
 
 --- site/Makefile.orig	Thu May  3 22:27:32 2001
 +++ site/Makefile	Sun Jun 24 13:01:33 2001
-@@ -84,22 +84,11 @@
- 	$D$(CTLBIN)/sendsys.pl $D$(CTLBIN)/senduuname.pl $D$(CTLBIN)/version.pl
+@@ -85,21 +85,10 @@
  
  REST_INSTALLED	= \
 -	$D$(PATH_NEWSFEEDS) $D$(PATH_INNDHOSTS) \
diff --git a/news/inn/patches/patch-ai b/news/inn/patches/patch-ai
index ba1f000a5ae..39a7dfef732 100644
--- a/news/inn/patches/patch-ai
+++ b/news/inn/patches/patch-ai
@@ -1,9 +1,9 @@
-$NetBSD: patch-ai,v 1.3 2003/07/29 16:27:27 wiz Exp $
+$NetBSD: patch-ai,v 1.4 2004/06/02 11:43:55 tron Exp $
 
---- include/dbz.h.orig	2002-12-23 00:00:38.000000000 +0100
-+++ include/dbz.h
-@@ -42,7 +42,7 @@ typedef struct {
-     BOOL             nonblock;
+--- include/dbz.h.orig	2004-01-07 23:47:19.000000000 +0100
++++ include/dbz.h	2004-06-02 13:02:04.000000000 +0200
+@@ -38,7 +38,7 @@
+     bool             nonblock;
  } dbzoptions;
  
 -#ifdef __GNUC__