Update to 0.99.17.

        * src/crypt.cc: corrected stupid salt calculation
        * src/NewsCache.cc (ns_newgroups): fixed a y2k bug
        (nnrpd): disabled stream buffering, some clients had problems with
        this

5 files changed, 35 insertions, 40 deletions

diff --git a/news/newscache/Makefile b/news/newscache/Makefile
index d11d3ce43a5..809a5d7e896 100644
--- a/news/newscache/Makefile
+++ b/news/newscache/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:54:48 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/08/28 03:30:41 mjl Exp $
 #
 
-DISTNAME=	NewsCache-0.99.15
+DISTNAME=	NewsCache-0.99.17
 CATEGORIES=	news
 MASTER_SITES=	http://www.infosys.tuwien.ac.at/NewsCache/download/
 
diff --git a/news/newscache/distinfo b/news/newscache/distinfo
index 9b86e77d453..dafec19c66f 100644
--- a/news/newscache/distinfo
+++ b/news/newscache/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 13:37:54 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/08/28 03:30:41 mjl Exp $
 
-SHA1 (NewsCache-0.99.15.tar.gz) = 7a5509a34bc826fa0e3da169021a47dfa2cc7b80
-Size (NewsCache-0.99.15.tar.gz) = 309984 bytes
-SHA1 (patch-aa) = 875f37be9f753c638af4fc868958439156c424ce
+SHA1 (NewsCache-0.99.17.tar.gz) = cb7411a00eeec7dd3a12193733a440b810102cf0
+Size (NewsCache-0.99.17.tar.gz) = 311921 bytes
+SHA1 (patch-aa) = 0964e234041c6ad76c215cbb2d381d8e9feeea85
 SHA1 (patch-ab) = 30da9db48ce320a5e21bb74a38cdbff05b3db28c
-SHA1 (patch-ac) = f53a37461ef03e9f73ef8dc1509c0072ac6ea528
+SHA1 (patch-ac) = 48a21e95d80569784f91c3fc288d711d9e4f77d3
 SHA1 (patch-ad) = 93ca8786fea2c745587e6acdc9ec8f422cdbe8ee
-SHA1 (patch-ae) = 223f000653fe32953fcb743a71e4bd3b0b201def
+SHA1 (patch-ae) = 94bf16d68d09f86bbd30d34b8932e400b39af462
diff --git a/news/newscache/patches/patch-aa b/news/newscache/patches/patch-aa
index 355fb4d0edb..3321808a7b8 100644
--- a/news/newscache/patches/patch-aa
+++ b/news/newscache/patches/patch-aa
@@ -1,29 +1,25 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/08/22 13:44:20 rh Exp $
+$NetBSD: patch-aa,v 1.2 2001/08/28 03:30:43 mjl Exp $
 
---- configure.orig	Sat Jul  3 23:14:38 1999
-+++ configure	Sun Aug 22 13:34:41 1999
-@@ -1181,6 +1181,8 @@
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char hosts_ctl();
-+int allow_severity;
-+int deny_severity;
- 
- int main() {
- hosts_ctl()
-@@ -1207,9 +1209,10 @@
- #define $ac_tr_lib 1
+--- configure.orig	Tue Aug 28 05:11:12 2001
++++ configure	Tue Aug 28 05:13:05 2001
+@@ -1421,6 +1421,8 @@
  EOF
  
--  LIBS="-lwrap $LIBS"
+ ac_cv_lib_wrap_hosts_ctl=yes
++  LIBS="$ac_save_LIBS"
 +  LIBWRAP="-lwrap"
- 
  else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -1428,6 +1430,7 @@
+   LIBS="$ac_save_LIBS"
+ echo "$ac_t""no" 1>&6
+ ac_cv_lib_wrap_hosts_ctl=no
 +  LIBWRAP=""
-   echo "$ac_t""no" 1>&6
  fi
+ rm -f conftest*
  
-@@ -2361,6 +2364,7 @@
+@@ -2435,6 +2438,7 @@
  s%@DEFS@%$DEFS%g
  s%@LDFLAGS@%$LDFLAGS%g
  s%@LIBS@%$LIBS%g
diff --git a/news/newscache/patches/patch-ac b/news/newscache/patches/patch-ac
index 357dfacccfa..048d0df5cb6 100644
--- a/news/newscache/patches/patch-ac
+++ b/news/newscache/patches/patch-ac
@@ -1,21 +1,22 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/08/22 13:44:20 rh Exp $
+$NetBSD: patch-ac,v 1.2 2001/08/28 03:30:43 mjl Exp $
 
---- src/Makefile.in.orig	Mon Jul  5 19:08:49 1999
-+++ src/Makefile.in	Sun Aug 22 13:37:26 1999
-@@ -120,6 +120,7 @@
+--- src/Makefile.in.orig	Tue Aug 28 05:14:04 2001
++++ src/Makefile.in	Tue Aug 28 05:14:52 2001
+@@ -103,6 +103,8 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
 +LIBWRAP = @LIBWRAP@
++
  cConfig_OBJECTS =  AccessList.o cConfig.o Config.o
  cConfig_LDADD = $(LDADD)
  cConfig_DEPENDENCIES =  ../NServer-0.9.1/libnserver.a \
-@@ -264,7 +265,7 @@
+@@ -251,7 +253,7 @@
  
  NewsCache: $(NewsCache_OBJECTS) $(NewsCache_DEPENDENCIES)
  	@rm -f NewsCache
 -	$(CXXLINK) $(NewsCache_LDFLAGS) $(NewsCache_OBJECTS) $(NewsCache_LDADD) $(LIBS)
-+	${CXXLINK} ${NewsCache_LDFLAGS} ${NewsCache_OBJECTS} ${NewsCache_LDADD} ${LIBS} ${LIBWRAP}
++	$(CXXLINK) $(NewsCache_LDFLAGS) $(NewsCache_OBJECTS) $(NewsCache_LDADD) $(LIBS) $(LIBWRAP)
  
  NewsCacheClean: $(NewsCacheClean_OBJECTS) $(NewsCacheClean_DEPENDENCIES)
  	@rm -f NewsCacheClean
diff --git a/news/newscache/patches/patch-ae b/news/newscache/patches/patch-ae
index 20af960ef8e..e44ac43dac6 100644
--- a/news/newscache/patches/patch-ae
+++ b/news/newscache/patches/patch-ae
@@ -1,14 +1,12 @@
-$NetBSD: patch-ae,v 1.1 1999/08/25 11:22:16 fredb Exp $
+$NetBSD: patch-ae,v 1.2 2001/08/28 03:30:43 mjl Exp $
 
---- NServer-0.9.1/Article.h.orig	Mon Jul  5 12:07:49 1999
-+++ NServer-0.9.1/Article.h	Wed Aug 25 05:58:07 1999
-@@ -2,8 +2,8 @@
- #define _Article_h_
- 
+--- NServer-0.9.1/Article.h.orig	Sun Jul  9 22:12:20 2000
++++ NServer-0.9.1/Article.h	Tue Aug 28 05:01:51 2001
+@@ -4,7 +4,7 @@
  #include <ctype.h>
--
+ #include <stdio.h>
+ 
 -#include <string>
-+#include <stdio.h>
 +#include <string.h>
  
  #include "NSError.h"