From 7c4b701763a4b6816fabb1730f32604cbed68bca Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Mon, 12 Mar 2001 13:22:59 +0000
Subject: Don't try to connect to alternate IP addresses of the news server if
 the user cancelled the operation. Bump version number to "1.0nb6".

---
 news/knews/Makefile         |  4 ++--
 news/knews/files/patch-sum  |  4 ++--
 news/knews/patches/patch-ai | 10 ++++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'news')

diff --git a/news/knews/Makefile b/news/knews/Makefile
index edbcaef8039..2e2371e50f6 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2001/03/10 22:05:53 tron Exp $
+# $NetBSD: Makefile,v 1.33 2001/03/12 13:22:59 tron Exp $
 
 DISTNAME=	knews-1.0b.1
-PKGNAME=	knews-1.0nb5
+PKGNAME=	knews-1.0nb6
 CATEGORIES=	news x11
 MASTER_SITES=	http://www.matematik.su.se/~kjj/
 
diff --git a/news/knews/files/patch-sum b/news/knews/files/patch-sum
index ba210afc160..1ac6e0be7f5 100644
--- a/news/knews/files/patch-sum
+++ b/news/knews/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.8 2001/03/10 22:05:54 tron Exp $
+$NetBSD: patch-sum,v 1.9 2001/03/12 13:23:00 tron Exp $
 
 SHA1 (patch-aa) = b125c5b5078e809dd0483a17d83fd0f055604639
 SHA1 (patch-ab) = c91ef1a71a9bd63a64d87e59a0a441386dc3d3c0
@@ -8,7 +8,7 @@ SHA1 (patch-ae) = 5048f46e187abb84822702de2aab486f707ea185
 SHA1 (patch-af) = 44698e8579f2ce6779a2959803ec8c2abf45c83d
 SHA1 (patch-ag) = c40ecd5f97542e968b21b340e65552be06142b43
 SHA1 (patch-ah) = b971332d24fe400c30fb46e44be9e5317166898f
-SHA1 (patch-ai) = 23a087b084321a022cf7d7abfcd491b63bdc8b6c
+SHA1 (patch-ai) = 58e085e2b55300889709c2cd95a9cd4d14be177d
 SHA1 (patch-aj) = e19750ae0c64cf65dd5c52cc8e1a4798a6c69c0a
 SHA1 (patch-ak) = 45aa66d4d30cb5d5bfa5ce407472ec663481faa6
 SHA1 (patch-al) = 2988f9b41d0f22b4395ee8213f94ca47032a3f23
diff --git a/news/knews/patches/patch-ai b/news/knews/patches/patch-ai
index 5a8a9768cd4..db28d7dccf4 100644
--- a/news/knews/patches/patch-ai
+++ b/news/knews/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.4 2001/03/10 22:05:54 tron Exp $
+$NetBSD: patch-ai,v 1.5 2001/03/12 13:23:00 tron Exp $
 
 --- src/server.c.orig	Fri Jan  9 18:16:22 1998
-+++ src/server.c	Sat Mar 10 23:00:44 2001
++++ src/server.c	Mon Mar 12 14:11:00 2001
 @@ -2,19 +2,21 @@
   *  Copyright (C) 1995, 1996  Karl-Johan Johnsson.
   */
@@ -26,7 +26,7 @@ $NetBSD: patch-ai,v 1.4 2001/03/10 22:05:54 tron Exp $
  struct SERVER {
      int		fd;
      char	*buffer;
-@@ -128,37 +130,68 @@
+@@ -128,37 +130,70 @@
   *  tell != 0   means tell about errors
   *  tell >  1   means say what you're doing
   */
@@ -71,7 +71,9 @@ $NetBSD: patch-ai,v 1.4 2001/03/10 22:05:54 tron Exp $
 +		return 0; /* don't block */
 +
 +	    do_wait(&server->fd, True, server->quit_func, server);
-+	    if (server->fd >= 0) {
++	    if (server->fd < 0)
++		return -1;
++	    else {
 +#ifdef __NetBSD__
 +		socklen_t	length;
 +		int		error;
-- 
cgit v1.2.3