(pkgsrc)

 - Add LICENSE= modified-bsd
(upstream)
 - Update 5.2 to 5.5
-----------------
WHATSNEW in 5.5
===============

In 5.4 the new NAT friendly behaviour was achieved by sending packets
with an rport of 0 to the server. In 5.5 this is no longer needed since
the server looks at the version number; hence 5.5 packets still go out
with rport set, making them compatible with servers of versions 5.3 or lower.
This was a small change/correction and 5.5 is a minor update.

WHATSNEW in 5.4
===============

DHIS packet messages leaving a host will now leave from the DHIS
return port (58800 by default) instead of a randomly assigned port.

Messages sent by this client to a server are marked with a return port of 0 in
the payload of the DHIS packet which causes the server to reply to the UDP port
from which it receives a packet. In other words, the return UDP port is no
longer embedded in a DHIS packet but instead is taken by the server from the
UDP layer of the network packet.

This feature (dhis client) only works with a DHIS server that implements it;
hence, a dhisd server of version 5.4 or above is required for a 5.4 client to
operate.

This feature is particularly useful in systems behind NAT; whereas before a
NAT redirect rule to the return DHIS port (58800 by default) was required, with
DHIS 5.4 this is no longer required since NAT boxes should keep the UDP state
and redirect back to the right host.

A new protocol is also implemented with DHID 5.4; instead of waiting for
server checks with CHECK_REQ, the client refreshes itself to the server
by sending periodic ECHO_REQ packets to it (every refresh period). The
server keeps the host online and only brings it offline it it doesn't
see any ECHO_REQ packets for up to 3 times the refresh period.

WHATSNEW in 5.3
===============

The documentation was updated.

DHID can now be executed under any user (not only root) without
changes to the code.

The pid file default location was changed to /var/run/dhid.pid

4 files changed, 31 insertions, 26 deletions

diff --git a/net/dhid/Makefile b/net/dhid/Makefile
index 444f3d2bfef..6cc8c78c736 100644
--- a/net/dhid/Makefile
+++ b/net/dhid/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.23 2014/09/23 14:59:24 jperkin Exp $
+# $NetBSD: Makefile,v 1.24 2015/03/05 14:44:33 mef Exp $
 #
 
-DISTNAME=	dhid-5.2
-PKGREVISION=	3
+DISTNAME=	dhid-5.5
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.dhis.org/pub/dhis/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.dhis.org/
 COMMENT=	Dynamic Host Information System client daemon
+LICENSE=	modified-bsd
 
 RCD_SCRIPTS=	dhid
 
diff --git a/net/dhid/distinfo b/net/dhid/distinfo
index 75af9462892..531340e48e0 100644
--- a/net/dhid/distinfo
+++ b/net/dhid/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2014/09/23 14:59:24 jperkin Exp $
+$NetBSD: distinfo,v 1.7 2015/03/05 14:44:33 mef Exp $
 
-SHA1 (dhid-5.2.tar.gz) = 92252834c1d84d19470b438fec53894abfd245e5
-RMD160 (dhid-5.2.tar.gz) = 04cfb6a779ca761957f9a945ea876f31fa011326
-Size (dhid-5.2.tar.gz) = 16485 bytes
-SHA1 (patch-aa) = 6e6268ecbbcd432e612c3c84f3872eda100d7f38
-SHA1 (patch-ab) = 096401626fdc628f126749933fe27d9e67c25595
+SHA1 (dhid-5.5.tar.gz) = b9f3212b2f696c64ff886153655b3f3a4de5d5ce
+RMD160 (dhid-5.5.tar.gz) = 2d93a32bafdef6f389ee0831b6fdb0a4e5a445fb
+Size (dhid-5.5.tar.gz) = 17314 bytes
+SHA1 (patch-aa) = 4f339b0701e8c6d8dfbd7284e794c10271f0fdd1
+SHA1 (patch-ab) = 695ea02904c2df2dd0bbd364d7c9e0d7b5529d87
diff --git a/net/dhid/patches/patch-aa b/net/dhid/patches/patch-aa
index e393cbb7b81..3b5c61ef349 100644
--- a/net/dhid/patches/patch-aa
+++ b/net/dhid/patches/patch-aa
@@ -1,17 +1,24 @@
-$NetBSD: patch-aa,v 1.4 2014/09/23 14:59:24 jperkin Exp $
+$NetBSD: patch-aa,v 1.5 2015/03/05 14:44:33 mef Exp $
 
---- Makefile.orig	2001-09-12 10:12:02.000000000 +0000
-+++ Makefile
-@@ -29,9 +29,9 @@ CC=cc
- 
- # Add -lnsl and -lsocket to LIBS in SysV systems 
+--- Makefile.orig	2008-05-22 23:11:43.000000000 +0900
++++ Makefile	2015-03-05 23:36:46.000000000 +0900
+@@ -29,16 +29,16 @@ CC=cc
  #
+ # For password mode only (no QRC), remove the -DQRC=1 statement 
+ # CFLAGS=-I/usr/local/include -Wall 
 -CFLAGS=-I/usr/local/include -DQRC=1 -Wall 
--LFLAGS=-L/usr/local/lib
--LIBS=-lgmp
 +CFLAGS=-I${LOCALBASE}/include -DQRC=1  -DLOCALBASE=\"${LOCALBASE}\"
+ 
+-LFLAGS=-L/usr/local/lib
 +LFLAGS=-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
+ 
+ # For password mode only (no QRC), comment the following line and keep LIBS 
+ # empty.
+ # Add -lnsl and -lsocket to LIBS in SysV systems (e.g. Solaris)
+ # LIBS=
+ # LIBS=-lnsl -lsocket
+-LIBS=-lgmp
 +LIBS=-lgmp ${LDFLAGS}
  
- # Use these and comment the above if you wish to compile dhid without 
- # secure public key authentication or don't have the GMP library 
+ 
+ RM=rm -f
diff --git a/net/dhid/patches/patch-ab b/net/dhid/patches/patch-ab
index 510b07654c6..83fe1e92300 100644
--- a/net/dhid/patches/patch-ab
+++ b/net/dhid/patches/patch-ab
@@ -1,15 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2003/07/03 00:08:54 hubertf Exp $
+$NetBSD: patch-ab,v 1.4 2015/03/05 14:44:33 mef Exp $
 
---- dhid.h.orig	Wed Sep 12 12:32:26 2001
-+++ dhid.h
-@@ -72,8 +72,8 @@
+--- dhid.h.orig	2008-05-22 23:10:54.000000000 +0900
++++ dhid.h	2015-03-05 23:38:48.000000000 +0900
+@@ -72,7 +72,7 @@
  #define	OFFLINE_REQ	0x00000551
  
  
 -#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	DHID_PID	"/var/run/dhid.pid"
  
  #define	DEF_ISPORT	58800
- #define	FAIL_ALLOW	3