update to gnut-0.4.12, w/ help from itojun.

v0.4.12 2000.08.04
-------
 (0804) drop very long queries (more than 80 characters) because such
packets have recently been seen spamming the Gnutella network.
 (0804) (internal) Update aclocal.m4, configure, install-sh, missing,
mkinstalldirs and the Makefile.in's to agree with my version of
aclocal, autoconf and automake, then rebuild configure.
 (0802) (internal) Fix minor file-locking bugs: unlock download file
if HAVE_FNCTL, don't unlock upload files (because they're never
locked!).
 (0801) Changes to default_upload_cap and default_download_cap now
take effect immediately on current transfers.
 (0801) Transfer rates are now computed and displayed by a
decaying-average formula with a half-life of about 10 seconds, to more
accurately show actual rises and falls in the transfer rate.
 (0801) (internal) add get_rate_limit(), decay_rate()
 (0801) #get# checks IP address before sending push request.
 (0731) Add quotes around strings displayed by #monitor#.
 (0731) Add "no_rfc_1597" setting to disable VPN address checks.
 (0731) (internal) change host address routines in host.c to support
no_rfc_1597 setting.
 (0731) Make #push# error messages (for IP address checks) more
informative.
 (0731) Add configure check for <term.h>
 (0730) Add some overlap code for transfer, but it's disabled for the
time being.
 (0728) Add "search_extensions" variable, to specify filename
extensions to use in limiting search results.

v0.4.11 2000.07.28
-------
 (0728) Drop queries of 3 characters or less.
 (0727) Fix #push# command -- it now sends the proper GUID in the PUSH
packet, so the remote host actually recognizes and responds now.
<homer>DOH!</homer>
 (0727) Shared files are now displayed to remote hosts as filenames
only, not full pathnames.
 (0727) PUSH handler ignores requests from IP addresses that failed to
connect or issue a GET on a previous PUSH attempt, for an amount of
time that depends on the type of failure.
 (0725) #response# (and #find# or #search# without argument) display
current query string.
 (0725) PUSH handler no longer tries to make multiple simultaneous
connections to the same host for the same file.
 (0725) Change default TTL from 4 to 7.
 (0725) #monitor# command now takes an argument, which is used as a
boolean AND filter against the query match strings displayed.
 (0724) Respond to PUSH requests with full pathname of requested file,
thus making PUSH transfers work properly for files in a subdirectory.
 (0723) Add option "strict_search", which specifies filtering search
results to make sure they match (by boolean AND, and not ignoring
punctuation) the string given in the #find# or #search# command ( but
not yet implemented for searches through the HTTP interface).
 (internal) Change all "//" style comments to "/* */" (makes it
compile on old or non-GCC compilers). Move more text strings to
gnut_ui.h.

v0.4.10 2000.07.21
-------
 (0721) (internal) ./configure now checks for getopt_long() in two
places. Create gnut_ui.h, move all language-specific strings from
gnut_http.c into gnut_ui.h
 (0721) HTTP search form pop-up choices (time and # replies) now
default to the same values you used in your previous search. Also,
increase the number of choices (delays from 15 to 240; results from 5
to 320)
 (0721) Improve look of HTML pages. Add GnutellaNet statistics to each
page. Make number-of-replies setting in HTTP search work.
 (0721) HTTP search sends a trickle of data while searching so the
browser won't say "(stalled)" in the status line
 (0720) HTTP server now formats search results in a table, and
includes size and server speed for each file. Add "please wait ##
seconds for page to finish loading" message.

v0.4.9 2000.07.19
------
 (0719) #find# "results received" display now prints only when the
number actually changes (important to users of screen reader software
and users running #gnut# over #ssh# or a slow terminal link).
 (0719) Add 'beep_on_all' preference; if set (and if 'wait_after_find'
is also set) #find# will beep every time the number of responses goes
up, rather than just the first time.
 (0719) #monitor# no longer prints non-ASCII characters (which often
screw up an xterm or console window so bad that you'd have to log out
to recover)
 (0719) #sleep# and #kill# no longer cause a segfault if they have no
argument.
 (0719) Update gnut URL in "Powered by gnut" link on web page.
 (0719) (internal) Remove a debug printf. Fix small memory leak in
gnut_connection_delete()

v0.4.8 2000.06.16
------
 (0615) Rewrite parts of manual and tutorial to reflect the
changes in gnut. Bring up new web site. Automate synchronization
of documentation files and web site. Put 0.4.1 on web site.
 (0612) Enforce max_responses on the actual list in memory (rather
than on just the displayed results).
 (0612) Add CRC check to eliminate duplicate query results (necessary
because of the new-connection-query-packet change in 0.4.7)
 (0612) Implement VPN host address filtering: gnut no longer uses
hosts that are unreachable because they have behind-firewall
addresses, unless they're in your own firewall address range; also
removes some non-downloadable files from results list (but only if you
and the other file are both in VPN's and the VPN's are different
ranges).
 (internal) add crc32_start(), crc32_add8(), host_ok_for_connect(),
host_ok_for_download(); local_vpn_class global

v0.4.7 2000.06.12
------
 (0611) Sent current query packet out to any new connection as soon as
the connection opens.
 (0611) 'find' with no arguments displays results.
 (0611) 'search' is synonym for 'find'.
 (0611) Add 'download_timeout' preference, because some hosts make
downloads wait in a queue before connecting.
 (0611) Add 'autokill_thres' option, if set to zero it disables
autokill (described in 0.4.6 changes)
 (0611) New connections now appended to end of connection-list rather
than beginning; makes the connection numbers in #info c# more stable,
which in turn makes it easier to issue the #kill# command.
 (internal) Reserve 2 bytes of GUID for possible future multiple
concurrent search feature. kill_worst now breaks ties in preference to
the last 'bad' connection rather than the first.


v0.4.6 2000.06.11
------
 (0611) Add autokill: automatic connection-list grooming. If left
alone, gnut will now optimize its N connections to get the minimum
possible overlap; this means you get more results when you do a
search.
 Dropped packets now counted as in Windows Gnutella ('dropped' =
duplicate). run_config_file() now takes a parameter to only run #set#
commands, which allows us to get settings (like the port number) from
.gnutrc before the rest of initialization.
 (internal) clean up #ifdefs in command_loop()

v0.4.5 2000.06.08 (another INTERIM DEBUG VERSION)
------
 Like version 0.4.4, this version isn't too useful because it prints a
lot of stuff (I was in the middle of fixing the inefficiencies in the
connection list and host list)
 (0608) Dramatically improve stability of connections by handling
the buffer-overrun problem differently: now, instead of dropping
the connection, it simply drops one packet and tries again.
 (0608) Add total packets sent (at bottom of 'info c'). Append new
hosts to hash bucket instead of prepend (improves long-term freshness
of host list). Fix ttl and hops reject checks.
 (internal) add total_sent global, bad_host()

v0.4.4 2000.06.07 (INTERIM DEBUG VERSION)
------
 This version isn't too useful because it prints a lot of stuff (I was
in the middle of fixing the inefficiencies in the connection list and
host list)
 (0607) Randomize choice of next host when opening a new outgoing
connection (it used to always choose a host with a hashcode of 0, and
would repeatedly attempt to connect to the same hosts)
 (0607) (internal) add 'next_hashstart' global; add some debug
printf's; cosmetic reformatting

v0.4.3 2000.06.07
------
 (0607) Added 'kill w' command -- kills connection with worst
duplicate-packet count
 (0607) (internal): rename 'state' field to 'cstate', and 'type' to
'ctype'; add gnut_connection_kill_worst()

v0.4.2 2000.06.07
------
 (0607) Add 'stats_format' config parameter, which makes the
connection stats look more like the original Windows Gnutella.
 (internal) add droprate()

v0.4.1 2000.06.07
------

First version after Robert Munafo began maintenence. 0.4.1 is actually
the same as 0.3.29, but many files have tabs changed to spaces. This
is to make it easier to track changes in CVS when, eventually, the
sources are put into CVS.

5 files changed, 110 insertions, 21 deletions

diff --git a/net/gnut/Makefile b/net/gnut/Makefile
index e4f236bdaee..b8f6c8c7c75 100644
--- a/net/gnut/Makefile
+++ b/net/gnut/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.3 2000/07/16 18:17:30 kim Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/12 15:12:40 deberg Exp $
 #
 
-DISTNAME=	gnut-0.3.29
+DISTNAME=	gnut-0.4.12
 CATEGORIES=	net
-MASTER_SITES=	http://www.umr.edu/~jjp/
+MASTER_SITES=	http://www.mrob.com/gnut/tars/
 
 MAINTAINER=	deberg@netbsd.org
-HOMEPAGE=	http://www.umr.edu/~jjp/
+HOMEPAGE=	http://www.mrob.com/gnut/
 
-BUILD_DEPENDS+=	autoreconf:../../devel/autoconf
+#BUILD_DEPENDS+=	autoreconf:../../devel/autoconf
+#BUILD_DEPENDS+=	automake:../../devel/automake
 #DEPENDS+=	pth>=1.3.6:../../devel/pth
 
 # Sync these with devel/unproven-pthreads:
@@ -30,8 +31,8 @@ GNUTDOCDIR=	${PREFIX}/share/doc/gnut
 LDFLAGS=	-Wl,-R${LOCALBASE}/pthreads/lib -L${LOCALBASE}/pthreads/lib
 .endif
 
-post-patch:
-	cd ${WRKSRC} && autoreconf
+#post-patch:
+#	cd ${WRKSRC} && ${CP} aclocal.m4 acinclude.m4 && autoreconf
 
 GNUTDOCS=	TUTORIAL \
 		gnut-1.html \
diff --git a/net/gnut/files/md5 b/net/gnut/files/md5
index 01149d77d8e..a7111c16fa4 100644
--- a/net/gnut/files/md5
+++ b/net/gnut/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2000/07/16 18:17:30 kim Exp $
+$NetBSD: md5,v 1.3 2000/08/12 15:12:41 deberg Exp $
 
-MD5 (gnut-0.3.29.tar.gz) = 6d0d804715be0cac4c603a6524a72471
+MD5 (gnut-0.4.12.tar.gz) = 328f407fa1a4b066f7c68577e359ff98
diff --git a/net/gnut/files/patch-sum b/net/gnut/files/patch-sum
index 445c3f98a7c..1ac9239ab2c 100644
--- a/net/gnut/files/patch-sum
+++ b/net/gnut/files/patch-sum
@@ -1,5 +1,6 @@
-$NetBSD: patch-sum,v 1.1 2000/07/16 18:17:30 kim Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/12 15:12:41 deberg Exp $
 
 MD5 (patch-aa) = 8827072f034e0ce33e990354d2afe802
-MD5 (patch-ab) = e5df1887c1de187c35a57678c83dae73
+MD5 (patch-ab) = 771a937cf7caaf4c9e4fc1591c8a79e8
 MD5 (patch-ac) = e549a24bba21f3c558bd4a91d88f4620
+MD5 (patch-ad) = 93792303c73a1e95b07deebc2de612ed
diff --git a/net/gnut/patches/patch-ab b/net/gnut/patches/patch-ab
index 5790205a136..86d104039f2 100644
--- a/net/gnut/patches/patch-ab
+++ b/net/gnut/patches/patch-ab
@@ -1,13 +1,11 @@
-$NetBSD: patch-ab,v 1.1 2000/07/16 18:17:31 kim Exp $
+$NetBSD: patch-ab,v 1.2 2000/08/12 15:12:41 deberg Exp $
 
---- src/cli_input.c.orig	Fri May  5 20:48:19 2000
-+++ src/cli_input.c	Sun Jul 16 12:12:20 2000
-@@ -15,8 +15,13 @@
- #include <pthread.h>
- 
+--- src/cli_input.c.orig	Thu Aug  3 03:43:22 2000
++++ src/cli_input.c	Fri Aug 11 16:05:53 2000
+@@ -17,4 +17,9 @@
  #ifdef HAVE_READLINE
--	#include <readline/readline.h>
--	#include <readline/history.h>
+-  #include <readline/readline.h>
+-  #include <readline/history.h>
 +# ifdef HAVE_LIBEDIT
 +#  include <readline.h>
 +#  include <history.h>
@@ -16,5 +14,3 @@ $NetBSD: patch-ab,v 1.1 2000/07/16 18:17:31 kim Exp $
 +#  include <readline/history.h>
 +# endif
  #endif
- 
- #ifdef HAVE_REGEX_H
diff --git a/net/gnut/patches/patch-ad b/net/gnut/patches/patch-ad
new file mode 100644
index 00000000000..a7e1bf03aa2
--- /dev/null
+++ b/net/gnut/patches/patch-ad
@@ -0,0 +1,91 @@
+$NetBSD: patch-ad,v 1.1 2000/08/12 15:12:41 deberg Exp $
+
+--- configure.orig	Sun Aug  6 20:29:43 2000
++++ configure	Sat Aug 12 10:23:24 2000
+@@ -1208,20 +1208,20 @@
+ fi
+ 
+ 
+-echo $ac_n "checking for readline in readline.h""... $ac_c" 1>&6
+-echo "configure:1213: checking for readline in readline.h" >&5
++echo $ac_n "checking for readline in readline.h with libedit""... $ac_c" 1>&6
++echo "configure:1213: checking for readline in readline.h with libedit" >&5
+ if eval "test \"`echo '$''{'g_cv_readline'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ 	save_LIBS="$LIBS"
+-	LIBS="-lreadline $LIBS"
++	LIBS="-ledit -ltermcap $LIBS"
+ 	cat > conftest.$ac_ext <<EOF
+ #line 1221 "configure"
+ #include "confdefs.h"
+ 
+ 		#include <stdio.h>
+-		#include <readline/readline.h>
++		#include <readline.h>
+ 		
+ int main() {
+ readline(NULL);
+@@ -1244,10 +1244,60 @@
+ echo "$ac_t""$g_cv_readline" 1>&6
+ 	
+ if test $g_cv_readline = yes ; then
+-	LIBS="$LIBS -lreadline"
++	LIBS="$LIBS -ledit -ltermcap"
+ 	cat >> confdefs.h <<\EOF
+ #define HAVE_READLINE 1
+ EOF
++
++	cat >> confdefs.h <<\EOF
++#define HAVE_LIBEDIT 1
++EOF
++
++fi
++
++if test $g_cv_readline = no ; then
++	echo $ac_n "checking for readline in readline.h""... $ac_c" 1>&6
++echo "configure:1261: checking for readline in readline.h" >&5
++if eval "test \"`echo '$''{'g_cv_readline'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  
++		save_LIBS="$LIBS"
++		LIBS="-lreadline $LIBS"
++		cat > conftest.$ac_ext <<EOF
++#line 1269 "configure"
++#include "confdefs.h"
++
++			#include <stdio.h>
++			#include <readline/readline.h>
++			
++int main() {
++readline(NULL);
++; return 0; }
++EOF
++if { (eval echo configure:1279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++  rm -rf conftest*
++  g_cv_readline=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  g_cv_readline=no
++fi
++rm -f conftest*
++		LIBS="$save_LIBS"
++	
++fi
++
++echo "$ac_t""$g_cv_readline" 1>&6
++		
++	if test $g_cv_readline = yes ; then
++		LIBS="$LIBS -lreadline"
++		cat >> confdefs.h <<\EOF
++#define HAVE_READLINE 1
++EOF
++
++	fi
+ 
+ fi
+