Update to dhis client R4. Changes:

 * improved security
 * server can detect when client goes down, and remove entry

4 files changed, 37 insertions, 54 deletions

diff --git a/net/dhid/patches/patch-aa b/net/dhid/patches/patch-aa
index 4ec4ca604b7..d0d958313a1 100644
--- a/net/dhid/patches/patch-aa
+++ b/net/dhid/patches/patch-aa
@@ -1,13 +1,30 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/07/19 11:38:33 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2000/08/09 21:00:11 hubertf Exp $
 
---- Makefile.orig	Tue Jun 22 07:30:37 1999
-+++ Makefile	Mon Jul 19 07:19:04 1999
-@@ -26,7 +26,7 @@
- #      DHIS(c)  Dynamic Host Information System Release 3.0
- 
- CC=cc
--CFLAGS=
-+CFLAGS+=-O2
- LFLAGS=
- LIBS=
+--- Makefile.orig	Sat Apr  8 20:02:28 2000
++++ Makefile	Mon Aug  7 04:22:23 2000
+@@ -29,8 +29,8 @@
+ 
+ # Add -lnsl and -lsocket to LIBS in SysV systems 
+ #
+-CFLAGS=-I/usr/local/include -DQRC=1 
+-LFLAGS=-L/usr/local/lib
++CFLAGS+=	-I${LOCALBASE}/include -DQRC=1  -DLOCALBASE=\"${LOCALBASE}\"
++LFLAGS+=	-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
+ LIBS=-lgmp
+ 
+ # Use these and comment the above if you wish to compile dhid without 
+@@ -43,10 +43,13 @@
+ 
  RM=rm -f
+ 
+-all:	dhid 
++all:	dhid  genkeys
+ 
+ dhid:	conf.o network.o main.o
+ 	$(CC) $(LFLAGS) -o dhid conf.o network.o main.o $(LIBS)
++
++genkeys: genkeys.c
++	$(CC) $(CFLAGS) $(LFLAGS) -o genkeys genkeys.c $(LIBS)
+ 
+ main.o: dhid.h main.c
+ 	$(CC) $(CFLAGS) -c main.c
diff --git a/net/dhid/patches/patch-ab b/net/dhid/patches/patch-ab
index b0a90765f78..0cf8d032145 100644
--- a/net/dhid/patches/patch-ab
+++ b/net/dhid/patches/patch-ab
@@ -1,13 +1,15 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/07/19 11:38:33 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2000/08/09 21:00:11 hubertf Exp $
 
---- dhid.h.orig	Tue Jun 22 20:01:43 1999
-+++ dhid.h	Mon Jul 19 06:24:53 1999
-@@ -64,7 +64,7 @@
- #define	POLL_INTERVAL	60
+--- dhid.h.orig	Wed Dec 15 19:59:48 1999
++++ dhid.h	Mon Aug  7 04:15:57 2000
+@@ -73,8 +73,8 @@
+ #define	OFFLINE_REQ	0x00000451
  
- #define	DHID_CONF	"/etc/dhid.conf"
+ 
+-#define	DHID_CONF	"/etc/dhid.conf"
 -#define	DHID_PID	"/etc/dhid.pid"
++#define	DHID_CONF	LOCALBASE "/etc/dhid.conf"
 +#define	DHID_PID	"/var/run/dhid.pid"
  
  #define	DEF_ISPORT	58800
- #define	DEF_MXPORT	58801
+ #define	FAIL_ALLOW	3
diff --git a/net/dhid/patches/patch-ac b/net/dhid/patches/patch-ac
deleted file mode 100644
index 644e118e32a..00000000000
--- a/net/dhid/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/07/19 11:38:33 jlam Exp $
-
---- dtool.1.orig	Wed Jun 23 20:22:09 1999
-+++ dtool.1	Mon Jul 19 06:34:03 1999
-@@ -13,7 +13,7 @@
- .BR dtool
- command and its usage.
- .BR dtool 
--is now a simple bash script that emulates the behaviour
-+is now a simple shell script that emulates the behaviour
- of the former administration utility to DHIS. It allows to send
- online, offline, mail and staus query. It also provides a good way to
- start and stop the daemon manually. Registration, password changes
diff --git a/net/dhid/patches/patch-ad b/net/dhid/patches/patch-ad
deleted file mode 100644
index 470610ee0d1..00000000000
--- a/net/dhid/patches/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/07/19 11:38:33 jlam Exp $
-
---- dtool.in.orig	Fri Jun 25 08:20:58 1999
-+++ dtool.in	Mon Jul 19 06:36:42 1999
-@@ -28,7 +28,8 @@
- 
- USAGE="usage: dtool [-o] [-d] [-m] [-a host] [-w host] [-k] [-s] [-h]"
- 
--PIDFILE=/etc/dhid.pid
-+PIDFILE=/var/run/dhid.pid
-+DHID=@PREFIX@/libexec/dhid
- 
- 
- usage()
-@@ -77,7 +78,7 @@
-       ;;
-       
-     s)
--      if ( /usr/sbin/dhid ); then
-+      if ( $DHID ); then
-         echo "Starting dhid daemon."
-       fi
-       ;;