Attachment #196661 for bug #230990




# Created by: Bas Kruit <baskruit@bsltwr.dhis.org>
# $FreeBSD$

PORTNAME=	dhisd
PORTVERSION=	5.5
PORTREVISION=	5
CATEGORIES=	dns
MASTER_SITES=	NETBSD_PKGSRC \
		ftp://ftp.dhis.org/pub/dhis/

MAINTAINER=	egypcio@googlemail.com
COMMENT=	DHIS server for dynamic updates on the server using specific engines

LICENSE=	BSD2CLAUSE
LICENSE_FILE=	${WRKSRC}/COPYRIGHT

LIB_DEPENDS=	libgmp.so:math/gmp

USE_RC_SUBR=	${PORTNAME}
SUB_LIST=	USER="${USERS}" GROUP="${GROUPS}"
PLIST_SUB=	USER="${USERS}" GROUP="${GROUPS}"

USERS=		dhis
GROUPS=		dhis

DOCS=	CONTRIBUTORS INSTALL README
PORTDOCS=	*

OPTIONS_DEFINE=	DOCS

post-patch:
	@${CP} ${FILESDIR}/dhisd.sh ${WRKSRC}/dhisd.sh
	@cd ${WRKSRC} && ${REINPLACE_CMD} -e "s^__PREFIX__^${PREFIX}^g" \
		Makefile dhisd.h dhisd.sh ${DOCS}

do-install:
	${MKDIR} ${STAGEDIR}/var/run/dhis ${STAGEDIR}/var/log/dhis
	${INSTALL_DATA} ${WRKSRC}/dhisd.conf.sample ${STAGEDIR}${PREFIX}/etc
	${INSTALL_DATA} ${WRKSRC}/dhis.db.sample ${STAGEDIR}${PREFIX}/etc/dhisd.db.sample
	${INSTALL_PROGRAM} ${WRKSRC}/dhisd ${STAGEDIR}${PREFIX}/sbin
	${INSTALL_PROGRAM} ${WRKSRC}/dhisgenkeys ${STAGEDIR}${PREFIX}/sbin
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/dhis
	${INSTALL_DATA} ${WRKSRC}/dhis.db.sample ${STAGEDIR}${PREFIX}/etc/dhis/dhis.db.sample
	${INSTALL_DATA} ${WRKSRC}/services.db.sample ${STAGEDIR}${PREFIX}/etc/dhis/services.db.sample
	${INSTALL_SCRIPT} ${WRKSRC}/dhisd.sh ${STAGEDIR}${PREFIX}/etc/rc.d/dhisd.sh

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/dhisd
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/dhisgenkeys
	cd ${WRKSRC} && ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
.endfor
	${INSTALL_DATA} ${FILESDIR}/INSTALL.bsd ${STAGEDIR}${DOCSDIR}

post-install-DOCS-on:
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	cd ${WRKSRC} && \
		${INSTALL_MAN} ${DOCS} ${STAGEDIR}${DOCSDIR}
	@${REINPLACE_CMD} -e '/^__DOCS__/ d' ${PKGMESSAGE}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)dns/dhisd/distinfo (-2 / +3 lines)
1	SHA256 (dhisd-5.1.tar.gz) = b4228daf5accef9bac3e00922328d713a5a022ca14cbcada830e6738b3defe9f	1	TIMESTAMP = 1535492360
2	SIZE (dhisd-5.1.tar.gz) = 27910	2	SHA256 (dhisd-5.5.tar.gz) = 736352209b18fb3b95a82782ddbf2fb524c0e9019ca11ba525a22f97f41936d3
		3	SIZE (dhisd-5.5.tar.gz) = 26221





Install instructions for DHIS server rel5.1 for FreeBSD
=======================================================

dhisd is the DHIS server, meant to permit updating external 
databases with dynamically assiged IP addresses to clients.

In order to build the dhisd server the following requirements must
be met:

	The machine must be permanently connected to the internet
	with a static IP address.

	The machine which will act as a server should be running
	a distribution of UNIX or similar system.


For full information, read the INSTALL file in /usr/local/share/doc/dhisd

Setting up the server

	Create the database file which will hold information for
	current dynamic hosts:

	Change directory to /usr/local/etc/dhis
	
	Create a text file named dhis.db with a text editor.
	You can copy the dhis.db.sample to dhis.db as a starting point.

	Change the permissions as you wish. In particular dhis.db
	should not be readable by anyone. Suggested example:

	chmod 700 /usr/local/etc/dhis /usr/local/etc/dhis/*
	chmod 600 /usr/local/etc/dhis/dhis.db

	Now create /usr/local/etc/dhis/services.db

	As before, you can copy the included services.db.sample as a
	starting point.
	
	Insert one line	per module implemented. See MODULES for	a
	detailed description of	the modular architecture and
	services.db format.

	See the README file for more information on the server
	and MODULES for information on the new modular structure 
	of the server.

	For starting the server, you can use the following script:

	/usr/local/etc/rc.d/dhis.sh

	It has the following options:
	start		start the server
	restart 	restart the server (after changing the db)
	stop		stop the server

	And that's it. The DHIS server is installed.





#!/bin/sh
#
# $FreeBSD$
#
# PROVIDE: dhisd
# REQUIRE: SERVERS

. /etc/rc.subr

: ${dhisd_enable="NO"}
: ${dhisd_flags=""}
: ${dhisd_user="%%USER%%"}
: ${dhisd_group="%%GROUP%%"}

name="dhisd"
rcvar="${name}_enable"
command="%%PREFIX%%/sbin/dhisd"
command_args=""

pidfile="/var/run/dhis/${name}.pid"

load_rc_config $name
run_rc_command "$1"




#!/bin/sh

case "$1" in
start)
	[ -x "__PREFIX__/sbin/dhisd" ] && __PREFIX__/sbin/dhisd > /dev/null && echo -n ' dhisd'
	;;
restart)
	killall -HUP dhisd && echo -n 'dhisd restarted'
	;;
stop)
	killall dhisd && echo -n ' dhisd'
	;;
*)
	echo "Usage: `basename $0` {start|restart|stop}" >&2
	;;
esac

exit 0




--- INSTALL.orig	Sun Nov  4 21:47:45 2001
+++ INSTALL	Sun Nov  4 22:09:55 2001
@@ -50,28 +50,25 @@
 2. Install stage
 ----------------
 
-	In this installation we will use /etc/dhis as the default
-	base directory for the server. Another directory may be
-	used in which case file location command line options must
-	be given to dhisd when executing.
+	In this installation we will use __PREFIX__/etc/dhis 
+	as the default base directory for the server. Another 
+	directory may be used in which case file location command 
+	line options must be given to dhisd when executing.
 
 	Create the directories:
 
-	/etc/dhis
-	/etc/dhis/bin
-	/etc/dhis/pid
-	/etc/dhis/db
-	/etc/dhis/log
+	__PREFIX__/etc/dhis
 	
-	You may wish to create /etc/dhis/src and put dhisd-5.1 under
-	this directory.
+	You may wish to create __PREFIX__/etc/dhis/src and put
+	dhisd-5.1 under	this directory.
 
-	Copy dhisd to /etc/dhis/bin . This is the server binary.
+	Copy dhisd to __PREFIX__/bin.
+	This is the server binary.
 
 	Create the database file which will hold information for
 	current dynamic hosts:
 
-	Change directory to /etc/dhis/db
+	Change directory to __PREFIX__/etc/dhis
 	
 	Create a text file named dhis.db with a text editor.
 
@@ -162,19 +159,19 @@
 	Change the permissions as you wish. In particular dhis.db
 	should not be readable by anyone. Suggested example:
 
-	chmod 700 /etc/dhis /etc/dhis/*
-	chmod 600 /etc/dhis/db/dhis.db
+	chmod 700 __PREFIX__/etc/dhis __PREFIX__/etc/dhis/*
+	chmod 600 __PREFIX__/etc/dhis/dhis.db
 
 	Add dhisd to your system's startup script 
 	(rc.local for BSD systems, SXXdhis under /etc/rc2.d
 	for System V). A simple line such as 
 
-		/etc/dhis/bin/dhisd
+		/usr/local/bin/dhisd
 
 	will do. 
 
 
-	Now create /etc/dhis/db/services.db 
+	Now create __PREFIX__/etc/dhis/services.db 
 	
 	Insert one line per module implemented. See MODULES
 	for a detailed description of the modular architecture 
@@ -187,7 +184,7 @@
 	and MODULES for information on the new modular structure 
 	of the server.
 
-	You may also run /etc/dhis/bin/dhisd now if you wish to 
+	You may also run __PREFIX__/bin/dhisd now if you wish to 
 	run DHIS at once.
 
 




--- MODULES.orig	Sun Nov  4 21:51:27 2001
+++ MODULES	Sun Nov  4 21:51:19 2001
@@ -14,8 +14,9 @@
 to update DNS, to update a tunneling service, to update a firewall, etc ... 
 based on a dynamically changing IP address from its clients.
 
-The new server has an additional database (by default /etc/dhis/db/services.db)
-containing the list of support services (modules).
+The new server has an additional database (by default 
+__PREFIX__/etc/dhis/services.db) containing the list of 
+support services (modules).
 
 In order to run dhisd >= 5 you will need to create and configure this
 file first.
@@ -24,13 +25,14 @@
 ---------------------------------------
 
 When executed the DHIS server reads its client's database (by default from
-/etc/dhis/db/dhis.db) into memory and proceeds to listening mode on a UDP
-port (by default 58800). When messages arrive the server responds accordingly,
-authenticates the clients (based on the keys and information loaded from the
-database) and marks them online. Furthermore the server keeps sending periodic
-checks to each and every client in order to verify that these are still 
-connected. If a particular client fails to reply the server will consider it 
-offline and mark it accordingly.
+__PREFIX__/etc/dhis/db/dhis.db) into memory and proceeds to listening 
+mode on a UDP port (by default 58800). When messages arrive the server
+responds accordingly, authenticates the clients (based on the keys and
+information loaded from the database) and marks them online. Furthermore
+the server keeps sending periodic checks to each and every client in
+order to verify that these are still connected. If a particular client
+fails to reply the server will consider it offline and mark it
+accordingly.
 
 Each client is identified to a server by a single ID number called the HostID.
 The new modular structure implements a means to mark these hosts online and 
@@ -61,11 +63,10 @@
 command - the module engine process command to be executed
 
 
-Example of /etc/dhis/db/services.db
------------------------------------
-
-Before executing dhisd ensure to have created a valid /etc/dhis/db/services.db 
-file.
+Example of __PREFIX__/etc/dhis/db/services.db
+-------------------------------------------------------------------------------
+Before executing dhisd ensure to have created a valid 
+__PREFIX__/etc/dhis/services.db file.
 
 The syntax for the file is as follows:
 
@@ -76,8 +77,8 @@
 
 ;------------------------------------------------------------------------------
 ; This is a comment line
-dns 4 /etc/dhis/bin/dhis-dns-engine
-fw  2 /etc/dhis/bin/dhis-fw-engine
+dns 4 __PREFIX__/etc/dhis/dhis-dns-engine
+fw  2 __PREFIX__/etc/dhis/dhis-fw-engine
 ;------------------------------------------------------------------------------
 
 Inter-process communication for modules:




--- Makefile.orig	2008-05-22 14:14:08.000000000 +0000
+++ Makefile	2018-08-29 01:12:04.540685000 +0000
@@ -24,7 +24,7 @@
 # SUCH DAMAGE.
 #
 #      DHIS(c)  Dynamic Host Information System Release 5.1
 
-CC=gcc
+CC=clang
-LFLAGS=-L/usr/local/lib 
+CC?=gcc
+#CFLAGS=-Wall -Wformat -I/usr/local/include # -DDONT_FORK
+#LDFLAGS=-L/usr/local/lib 
 CP=cp
 
 MYSQL_INCLUDE=	-I/usr/local/include/mysql -I/usr/local/mysql/include \
 		-I/usr/local/mysql/include/mysql
@@ -33,14 +33,14 @@
 		-L/usr/local/mysql/lib/mysql
 MKDIR=mkdir -p
@@ -46,11 +46,11 @@
 all: dhisd genkeys
 
 WFLAGS=-Wall -Wstrict-prototypes -Wpointer-arith \
-        -Wno-sign-compare -Wno-traditional -Wreturn-type -Wswitch -Wshadow \
+        -Wno-sign-compare -Wreturn-type -Wswitch -Wshadow \
         -Wwrite-strings -Wextra -funsigned-char 
 
 # Possible CFLAGS: -g -O3 -DDONT_FORK
 #
+	$(CC) $(CFLAGS) $(LDFLAGS) genkeys.c -DQRC=1 -o genkeys -lgmp
 
-CFLAGS= -O3 $(WFLAGS) -I. -I/usr/local/include # $(MYSQL_INCLUDE) -DWITH_MYSQL=1
-LFLAGS= -L/usr/local/lib # $(MYSQL_LIBDIR)
+CFLAGS= $(WFLAGS) -I. -I/usr/local/include
+LDFLAGS= -L/usr/local/lib
 
 # For System V (Solaris) add -lnsl and -lsocket
 # For MySQL support add -lmysqlclient
@@ -66,10 +66,10 @@
 all: dhisd dhisgenkeys
 
 dhisd:	$(OBJS) main.o
-	$(CC) $(LFLAGS) -o dhisd $(OBJS) $(LIBS) main.o
+	$(CC) $(LDFLAGS) -o dhisd $(OBJS) $(LIBS) main.o
 
 dhisgenkeys: qrc.o genkeys.o
-	$(CC) $(LFLAGS) -o dhisgenkeys qrc.o $(LIBS) genkeys.o
+	$(CC) $(LDFLAGS) -o dhisgenkeys qrc.o $(LIBS) genkeys.o
 
 main.o: main.c
 	$(CC) $(CFLAGS) -c main.c
@@ -84,18 +84,12 @@
 	$(MKDIR) $(PIDDIR)
 	$(CP) dhisd $(INSTALLBIN)
 	$(CP) dhisgenkeys $(INSTALLBIN)
-	$(CHOWN) dhis $(INSTALLBIN)/dhisd $(INSTALLBIN)/dhisgenkeys $(LOGDIR) $(PIDDIR)
-	$(CHGRP) dhis $(INSTALLBIN)/dhisd $(INSTALLBIN)/dhisgenkeys $(LOGDIR) $(PIDDIR)
-	$(CHMOD) 770 $(INSTALLBIN)/dhisd $(INSTALLBIN)/dhisgenkeys $(LOGDIR) $(PIDDIR)
+	$(CHMOD) 750 $(INSTALLBIN)/dhisd $(INSTALLBIN)/dhisgenkeys $(LOGDIR) $(PIDDIR)
 	$(CHMOD) u+s $(INSTALLBIN)/dhisd
 	$(CP) dhis.db.sample dhisd.conf.sample $(INSTALLCONF)
-	$(CHOWN) dhis $(INSTALLCONF)/dhis.db.sample $(INSTALLCONF)/dhisd.conf.sample
-	$(CHGRP) dhis $(INSTALLCONF)/dhis.db.sample $(INSTALLCONF)/dhisd.conf.sample
 	$(CHMOD) 640 $(INSTALLCONF)/dhis.db.sample $(INSTALLCONF)/dhisd.conf.sample
 	$(CP) dhisd.rc $(INSTALLRC)/dhisd
-	$(CHOWN) dhis $(INSTALLRC)/dhisd
-	$(CHGRP) dhis $(INSTALLRC)/dhisd
-	$(CHMOD) 755 $(INSTALLRC)/dhisd
+	$(CHMOD) 555 $(INSTALLRC)/dhisd
 
 clean:
 	$(RM) dhisgenkeys *.core core dhisd *.o *~




--- README.orig	Sun Nov  4 21:47:55 2001
+++ README	Sun Nov  4 22:15:04 2001
@@ -146,7 +146,7 @@
 	dhisd accepts HUP and TERM signals. A kill -HUP will
 	make it reload the hosts database and kill -TERM
 	will terminate it. Its pid number is recorded a the
-	text file (default: /etc/dhis/pid/dhisd.pid)
+	text file (default: /var/pid/dhisd.pid)
 
 	Before terminating with SIGTERM dhisd will attempt to bring all 
 	online clients offline.
@@ -155,7 +155,7 @@
 ========
 
 	dhisd logs online and offline transitions on a text file
-	(default: /etc/dhis/log/dhisd.log)
+	(default: /var/log/dhisd.log)
 
 Command Line Options:
 =====================
@@ -175,12 +175,12 @@
 	
 	-d <dbase_file> allows specifying a path for the database file
 
-		      e.g. dhisd -d /usr/local/etc/dhis.db
+		      e.g. dhisd -d /usr/local/etc/dhis/dhis.db
 
 	-s <service_file> allows specifying a path for the services 
                           file.
 
-                      e.g. dhisd -s /usr/local/etc/services.db
+                      e.g. dhisd -s /usr/local/etc/dhis/services.db
 
 	All options may be used in conjunction.
 
@@ -327,11 +327,11 @@
 
 	1000 {
 		hostpass something
-		oncmd /etc/oncmd
+		oncmd /usr/local/etc/dhis/oncmd
 	}
 
 
-	# /etc/oncmd
+	# /usr/local/etc/dhis/oncmd
 	#!/bin/sh	
 	#
 	echo I am $1 online now at $2




--- dhisd.h.orig	Sun Nov  4 20:50:14 2001
+++ dhisd.h	Sun Nov  4 20:51:05 2001
@@ -47,7 +47,7 @@
 #include<sys/signal.h>
 #include<sys/wait.h>
 #include<syslog.h>
-#include<varargs.h>
+#include<stdarg.h>
 #include<gmp.h>
 
 #define	BOURNE_SHELL		"/bin/sh"
@@ -64,10 +64,10 @@
 #define	CHECK_FAILS	3		/* maximum check fails */
 
 #define	DHISD_PORT	58800
-#define	DHISD_PID	"/etc/dhis/pid/dhisd.pid"
-#define	DHISD_DB	"/etc/dhis/db/dhis.db"
-#define	DHISD_LOG	"/etc/dhis/log/dhisd.log"
-#define	DHISD_SERVICES	"/etc/dhis/db/services.db"
+#define	DHISD_PID	"/var/run/dhisd.pid"
+#define	DHISD_DB	"__PREFIX__/etc/dhis/dhis.db"
+#define	DHISD_LOG	"/var/log/dhisd.log"
+#define	DHISD_SERVICES	"__PREFIX__/etc/dhis/services.db"
 
 #define	MAX_HOSTNAME	64
 #define	MAX_PASS	16

Lines 1-9 Link Here

(-)dns/dhisd/files/pkg-message.in (-9 lines)
1	--------------------------------------------------------------------------
2	Before dhisd can run, you will need configure BIND.
3
4	For more information, see the following site:
5	http://www.dhis.org/dhis/r5/
6	__DOCS__
7	__DOCS__or the documents in %%DOCSDIR%%
8	__DOCS__Read INSTALL and INSTALL.bsd at least for the setup information of dhisd.
9	--------------------------------------------------------------------------




DHIS Daemon release 5.1
==============================

The server is now modular through the introduction of a services
sub-system. DNS updates are no longer part of the main code but
are now implemented as a module.

The main dhisd process listens to DHIS clients and after authentication
marks these with their dynamic IP address. The request is passed to a
sub-process through a pipe which implements the services for which the
client is subscribed to. Clients may be subscribed to one or more
services individually.
The sub-engine interface does a basic read from stdin and process.

Examples of things DHIS could update:
    Dns, Firewalls, tunnel servers, relay access lists, etc ...

For more information on the services of DHIS, you should look at the
official DHIS site.
	http://www.dhis.org/dhis/services/

WWW: http://www.dhis.org/

Lines 1-6 Link Here

(-)dns/dhisd/pkg-plist (-5 / +8 lines)
		1	@dir(%%USER%%,%%GROUP%%,750) /var/log/dhis
		2	@dir(%%USER%%,%%GROUP%%,750) /var/run/dhis
		3	@sample etc/dhisd.conf.sample
		4	@sample etc/dhisd.db.sample
1	sbin/dhisd	5	sbin/dhisd
2	sbin/genkeys	6	sbin/dhisgenkeys
3	@(,,600) etc/dhis/dhis.db.sample	7	%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
4	@(,,600) etc/dhis/services.db.sample	8	%%PORTDOCS%%%%DOCSDIR%%/INSTALL
5	etc/rc.d/dhisd.sh	9	%%PORTDOCS%%%%DOCSDIR%%/README
6	@dir(,,700) etc/dhis

Return to bug 230990

Lines 1-53 Link Here

(-)dns/dhisd/Makefile (-28 / +20 lines)
1	# Created by: Bas Kruit <baskruit@bsltwr.dhis.org>	1	# Created by: Bas Kruit <baskruit@bsltwr.dhis.org>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= dhisd	4	PORTNAME= dhisd
5	PORTVERSION= 5.1	5	PORTVERSION= 5.5
6	PORTREVISION= 5
7	CATEGORIES= dns	6	CATEGORIES= dns
8	MASTER_SITES= ftp://ftp.dhis.org/pub/dhis/	7	MASTER_SITES= NETBSD_PKGSRC \
		8	ftp://ftp.dhis.org/pub/dhis/
9		9
10	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= egypcio@googlemail.com
11	COMMENT= DHIS server for dynamic updates on the server using specific engines	11	COMMENT= DHIS server for dynamic updates on the server using specific engines
12		12
13	LICENSE= BSD2CLAUSE	13	LICENSE= BSD2CLAUSE
14	LICENSE_FILE= ${WRKSRC}/COPYRIGHT	14	LICENSE_FILE= ${WRKSRC}/COPYRIGHT
15		15
16	LIB_DEPENDS= libgmp.so:math/gmp	16	LIB_DEPENDS= libgmp.so:math/gmp
17		17
18	USES= localbase:ldflags	18	USE_RC_SUBR= ${PORTNAME}
		19	SUB_LIST= USER="${USERS}" GROUP="${GROUPS}"
		20	PLIST_SUB= USER="${USERS}" GROUP="${GROUPS}"
19		21
20	SUB_FILES= pkg-message	22	USERS= dhis
		23	GROUPS= dhis
21		24
22	DOCS= CONTRIBUTORS INSTALL MODULES README	25	DOCS= CONTRIBUTORS INSTALL README
23	PORTDOCS= *
24		26
25	OPTIONS_DEFINE= DOCS	27	OPTIONS_DEFINE= DOCS
26		28
27	post-patch:
28	@${CP} ${FILESDIR}/dhisd.sh ${WRKSRC}/dhisd.sh
29	@cd ${WRKSRC} && ${REINPLACE_CMD} -e "s^__PREFIX__^${PREFIX}^g" \
30	Makefile dhisd.h dhisd.sh ${DOCS}
31
32	do-install:	29	do-install:
		30	${MKDIR} ${STAGEDIR}/var/run/dhis ${STAGEDIR}/var/log/dhis
		31	${INSTALL_DATA} ${WRKSRC}/dhisd.conf.sample ${STAGEDIR}${PREFIX}/etc
		32	${INSTALL_DATA} ${WRKSRC}/dhis.db.sample ${STAGEDIR}${PREFIX}/etc/dhisd.db.sample
33	${INSTALL_PROGRAM} ${WRKSRC}/dhisd ${STAGEDIR}${PREFIX}/sbin	33	${INSTALL_PROGRAM} ${WRKSRC}/dhisd ${STAGEDIR}${PREFIX}/sbin
34	${INSTALL_PROGRAM} ${WRKSRC}/genkeys ${STAGEDIR}${PREFIX}/sbin	34	${INSTALL_PROGRAM} ${WRKSRC}/dhisgenkeys ${STAGEDIR}${PREFIX}/sbin
35	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/dhis
36	${INSTALL_DATA} ${WRKSRC}/dhis.db.sample ${STAGEDIR}${PREFIX}/etc/dhis/dhis.db.sample
37	${INSTALL_DATA} ${WRKSRC}/services.db.sample ${STAGEDIR}${PREFIX}/etc/dhis/services.db.sample
38	${INSTALL_SCRIPT} ${WRKSRC}/dhisd.sh ${STAGEDIR}${PREFIX}/etc/rc.d/dhisd.sh
39		35
40	do-install-DOCS-on:	36	post-install:
41	@${MKDIR} ${STAGEDIR}${DOCSDIR}	37	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/dhisd
42	.for f in ${DOCS}	38	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/dhisgenkeys
43	cd ${WRKSRC} && ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
44	.endfor
45	${INSTALL_DATA} ${FILESDIR}/INSTALL.bsd ${STAGEDIR}${DOCSDIR}
46		39
47	post-install-DOCS-on:	40	post-install-DOCS-on:
48	@${REINPLACE_CMD} -e 's\|^__DOCS__\|\|' ${PKGMESSAGE}	41	${MKDIR} ${STAGEDIR}${DOCSDIR}
49		42	cd ${WRKSRC} && \
50	post-install-DOCS-off:	43	${INSTALL_MAN} ${DOCS} ${STAGEDIR}${DOCSDIR}
51	@${REINPLACE_CMD} -e '/^__DOCS__/ d' ${PKGMESSAGE}
52		44
53	.include <bsd.port.mk>	45	.include <bsd.port.mk>

Lines 1-59 Link Here

(-)dns/dhisd/files/INSTALL.bsd (-59 lines)
1
2	Install instructions for DHIS server rel5.1 for FreeBSD
3	=======================================================
4
5	dhisd is the DHIS server, meant to permit updating external
6	databases with dynamically assiged IP addresses to clients.
7
8	In order to build the dhisd server the following requirements must
9	be met:
10
11	The machine must be permanently connected to the internet
12	with a static IP address.
13
14	The machine which will act as a server should be running
15	a distribution of UNIX or similar system.
16
17
18	For full information, read the INSTALL file in /usr/local/share/doc/dhisd
19
20	Setting up the server
21
22	Create the database file which will hold information for
23	current dynamic hosts:
24
25	Change directory to /usr/local/etc/dhis
26
27	Create a text file named dhis.db with a text editor.
28	You can copy the dhis.db.sample to dhis.db as a starting point.
29
30	Change the permissions as you wish. In particular dhis.db
31	should not be readable by anyone. Suggested example:
32
33	chmod 700 /usr/local/etc/dhis /usr/local/etc/dhis/*
34	chmod 600 /usr/local/etc/dhis/dhis.db
35
36	Now create /usr/local/etc/dhis/services.db
37
38	As before, you can copy the included services.db.sample as a
39	starting point.
40
41	Insert one line per module implemented. See MODULES for a
42	detailed description of the modular architecture and
43	services.db format.
44
45	See the README file for more information on the server
46	and MODULES for information on the new modular structure
47	of the server.
48
49	For starting the server, you can use the following script:
50
51	/usr/local/etc/rc.d/dhis.sh
52
53	It has the following options:
54	start start the server
55	restart restart the server (after changing the db)
56	stop stop the server
57
58	And that's it. The DHIS server is installed.
59

Line 0 Link Here

(-)dns/dhisd/files/dhisd.in (+23 lines)
	1	#!/bin/sh
	2	#
	3	# $FreeBSD$
	4	#
	5	# PROVIDE: dhisd
	6	# REQUIRE: SERVERS
	7
	8	. /etc/rc.subr
	9
	10	: ${dhisd_enable="NO"}
	11	: ${dhisd_flags=""}
	12	: ${dhisd_user="%%USER%%"}
	13	: ${dhisd_group="%%GROUP%%"}
	14
	15	name="dhisd"
	16	rcvar="${name}_enable"
	17	command="%%PREFIX%%/sbin/dhisd"
	18	command_args=""
	19
	20	pidfile="/var/run/dhis/${name}.pid"
	21
	22	load_rc_config $name
	23	run_rc_command "$1"

Lines 1-18 Link Here

(-)dns/dhisd/files/dhisd.sh (-18 lines)
1	#!/bin/sh
2
3	case "$1" in
4	start)
5	[ -x "__PREFIX__/sbin/dhisd" ] && __PREFIX__/sbin/dhisd > /dev/null && echo -n ' dhisd'
6	;;
7	restart)
8	killall -HUP dhisd && echo -n 'dhisd restarted'
9	;;
10	stop)
11	killall dhisd && echo -n ' dhisd'
12	;;
13	*)
14	echo "Usage: `basename $0` {start\|restart\|stop}" >&2
15	;;
16	esac
17
18	exit 0

Lines 1-74 Link Here

(-)dns/dhisd/files/patch-INSTALL (-74 lines)
1	--- INSTALL.orig Sun Nov 4 21:47:45 2001
2	+++ INSTALL Sun Nov 4 22:09:55 2001
3	@@ -50,28 +50,25 @@
4	2. Install stage
5	----------------
6
7	- In this installation we will use /etc/dhis as the default
8	- base directory for the server. Another directory may be
9	- used in which case file location command line options must
10	- be given to dhisd when executing.
11	+ In this installation we will use __PREFIX__/etc/dhis
12	+ as the default base directory for the server. Another
13	+ directory may be used in which case file location command
14	+ line options must be given to dhisd when executing.
15
16	Create the directories:
17
18	- /etc/dhis
19	- /etc/dhis/bin
20	- /etc/dhis/pid
21	- /etc/dhis/db
22	- /etc/dhis/log
23	+ __PREFIX__/etc/dhis
24
25	- You may wish to create /etc/dhis/src and put dhisd-5.1 under
26	- this directory.
27	+ You may wish to create __PREFIX__/etc/dhis/src and put
28	+ dhisd-5.1 under this directory.
29
30	- Copy dhisd to /etc/dhis/bin . This is the server binary.
31	+ Copy dhisd to __PREFIX__/bin.
32	+ This is the server binary.
33
34	Create the database file which will hold information for
35	current dynamic hosts:
36
37	- Change directory to /etc/dhis/db
38	+ Change directory to __PREFIX__/etc/dhis
39
40	Create a text file named dhis.db with a text editor.
41
42	@@ -162,19 +159,19 @@
43	Change the permissions as you wish. In particular dhis.db
44	should not be readable by anyone. Suggested example:
45
46	- chmod 700 /etc/dhis /etc/dhis/*
47	- chmod 600 /etc/dhis/db/dhis.db
48	+ chmod 700 __PREFIX__/etc/dhis __PREFIX__/etc/dhis/*
49	+ chmod 600 __PREFIX__/etc/dhis/dhis.db
50
51	Add dhisd to your system's startup script
52	(rc.local for BSD systems, SXXdhis under /etc/rc2.d
53	for System V). A simple line such as
54
55	- /etc/dhis/bin/dhisd
56	+ /usr/local/bin/dhisd
57
58	will do.
59
60
61	- Now create /etc/dhis/db/services.db
62	+ Now create __PREFIX__/etc/dhis/services.db
63
64	Insert one line per module implemented. See MODULES
65	for a detailed description of the modular architecture
66	@@ -187,7 +184,7 @@
67	and MODULES for information on the new modular structure
68	of the server.
69
70	- You may also run /etc/dhis/bin/dhisd now if you wish to
71	+ You may also run __PREFIX__/bin/dhisd now if you wish to
72	run DHIS at once.
73
74

Lines 1-63 Link Here

(-)dns/dhisd/files/patch-MODULES (-63 lines)
1	--- MODULES.orig Sun Nov 4 21:51:27 2001
2	+++ MODULES Sun Nov 4 21:51:19 2001
3	@@ -14,8 +14,9 @@
4	to update DNS, to update a tunneling service, to update a firewall, etc ...
5	based on a dynamically changing IP address from its clients.
6
7	-The new server has an additional database (by default /etc/dhis/db/services.db)
8	-containing the list of support services (modules).
9	+The new server has an additional database (by default
10	+__PREFIX__/etc/dhis/services.db) containing the list of
11	+support services (modules).
12
13	In order to run dhisd >= 5 you will need to create and configure this
14	file first.
15	@@ -24,13 +25,14 @@
16	---------------------------------------
17
18	When executed the DHIS server reads its client's database (by default from
19	-/etc/dhis/db/dhis.db) into memory and proceeds to listening mode on a UDP
20	-port (by default 58800). When messages arrive the server responds accordingly,
21	-authenticates the clients (based on the keys and information loaded from the
22	-database) and marks them online. Furthermore the server keeps sending periodic
23	-checks to each and every client in order to verify that these are still
24	-connected. If a particular client fails to reply the server will consider it
25	-offline and mark it accordingly.
26	+__PREFIX__/etc/dhis/db/dhis.db) into memory and proceeds to listening
27	+mode on a UDP port (by default 58800). When messages arrive the server
28	+responds accordingly, authenticates the clients (based on the keys and
29	+information loaded from the database) and marks them online. Furthermore
30	+the server keeps sending periodic checks to each and every client in
31	+order to verify that these are still connected. If a particular client
32	+fails to reply the server will consider it offline and mark it
33	+accordingly.
34
35	Each client is identified to a server by a single ID number called the HostID.
36	The new modular structure implements a means to mark these hosts online and
37	@@ -61,11 +63,10 @@
38	command - the module engine process command to be executed
39
40
41	-Example of /etc/dhis/db/services.db
42	------------------------------------
43	-
44	-Before executing dhisd ensure to have created a valid /etc/dhis/db/services.db
45	-file.
46	+Example of __PREFIX__/etc/dhis/db/services.db
47	+-------------------------------------------------------------------------------
48	+Before executing dhisd ensure to have created a valid
49	+__PREFIX__/etc/dhis/services.db file.
50
51	The syntax for the file is as follows:
52
53	@@ -76,8 +77,8 @@
54
55	;------------------------------------------------------------------------------
56	; This is a comment line
57	-dns 4 /etc/dhis/bin/dhis-dns-engine
58	-fw 2 /etc/dhis/bin/dhis-fw-engine
59	+dns 4 __PREFIX__/etc/dhis/dhis-dns-engine
60	+fw 2 __PREFIX__/etc/dhis/dhis-fw-engine
61	;------------------------------------------------------------------------------
62
63	Inter-process communication for modules:

Lines 1-33 Link Here

(-)dns/dhisd/files/patch-Makefile (-26 / +56 lines)
1	--- Makefile.orig Sun Nov 4 20:48:12 2001	1	--- Makefile.orig 2008-05-22 14:14:08.000000000 +0000
2	+++ Makefile Sun Nov 4 20:49:08 2001	2	+++ Makefile 2018-08-29 01:12:04.540685000 +0000
3	@@ -25,12 +25,12 @@	3	@@ -24,7 +24,7 @@
		4	# SUCH DAMAGE.
4	#	5	#
5	# DHIS(c) Dynamic Host Information System Release 5.1
6		6
7	-CC=gcc	7	-CC=gcc
8	-CFLAGS=-Wall -Wformat -I/usr/local/include # -DDONT_FORK	8	+CC=clang
9	-LFLAGS=-L/usr/local/lib
10	+CC?=gcc
11	+#CFLAGS=-Wall -Wformat -I/usr/local/include # -DDONT_FORK
12	+#LDFLAGS=-L/usr/local/lib
13	CP=cp
14		9
15	-INSTALLDIR=/etc/dhis/bin	10	MYSQL_INCLUDE= -I/usr/local/include/mysql -I/usr/local/mysql/include \
16	+INSTALLDIR=__PREFIX__/sbin	11	-I/usr/local/mysql/include/mysql
17	MODE=700	12	@@ -33,14 +33,14 @@
18	OWNER=root	13	-L/usr/local/mysql/lib/mysql
19	MKDIR=mkdir -p
20	@@ -46,11 +46,11 @@
21	all: dhisd genkeys
22		14
23	dhisd: $(OBJS)	15	WFLAGS=-Wall -Wstrict-prototypes -Wpointer-arith \
24	- $(CC) $(LFLAGS) -o dhisd $(OBJS) $(LIBS)	16	- -Wno-sign-compare -Wno-traditional -Wreturn-type -Wswitch -Wshadow \
25	+ $(CC) $(LDFLAGS) -o dhisd $(OBJS) $(LIBS)	17	+ -Wno-sign-compare -Wreturn-type -Wswitch -Wshadow \
26	strip dhisd	18	-Wwrite-strings -Wextra -funsigned-char
27		19
28	genkeys:	20	# Possible CFLAGS: -g -O3 -DDONT_FORK
29	- $(CC) $(CFLAGS) $(LFLAGS) genkeys.c -DQRC=1 -o genkeys -lgmp	21	#
30	+ $(CC) $(CFLAGS) $(LDFLAGS) genkeys.c -DQRC=1 -o genkeys -lgmp
31		22
32	install: dhisd genkeys	23	-CFLAGS= -O3 $(WFLAGS) -I. -I/usr/local/include # $(MYSQL_INCLUDE) -DWITH_MYSQL=1
33	$(MKDIR) $(INSTALLDIR)	24	-LFLAGS= -L/usr/local/lib # $(MYSQL_LIBDIR)
		25	+CFLAGS= $(WFLAGS) -I. -I/usr/local/include
		26	+LDFLAGS= -L/usr/local/lib
		27
		28	# For System V (Solaris) add -lnsl and -lsocket
		29	# For MySQL support add -lmysqlclient
		30	@@ -66,10 +66,10 @@
		31	all: dhisd dhisgenkeys
		32
		33	dhisd: $(OBJS) main.o
		34	- $(CC) $(LFLAGS) -o dhisd $(OBJS) $(LIBS) main.o
		35	+ $(CC) $(LDFLAGS) -o dhisd $(OBJS) $(LIBS) main.o
		36
		37	dhisgenkeys: qrc.o genkeys.o
		38	- $(CC) $(LFLAGS) -o dhisgenkeys qrc.o $(LIBS) genkeys.o
		39	+ $(CC) $(LDFLAGS) -o dhisgenkeys qrc.o $(LIBS) genkeys.o
		40
		41	main.o: main.c
		42	$(CC) $(CFLAGS) -c main.c
		43	@@ -84,18 +84,12 @@
		44	$(MKDIR) $(PIDDIR)
		45	$(CP) dhisd $(INSTALLBIN)
		46	$(CP) dhisgenkeys $(INSTALLBIN)
		47	- $(CHOWN) dhis $(INSTALLBIN)/dhisd $(INSTALLBIN)/dhisgenkeys $(LOGDIR) $(PIDDIR)
		48	- $(CHGRP) dhis $(INSTALLBIN)/dhisd $(INSTALLBIN)/dhisgenkeys $(LOGDIR) $(PIDDIR)
		49	- $(CHMOD) 770 $(INSTALLBIN)/dhisd $(INSTALLBIN)/dhisgenkeys $(LOGDIR) $(PIDDIR)
		50	+ $(CHMOD) 750 $(INSTALLBIN)/dhisd $(INSTALLBIN)/dhisgenkeys $(LOGDIR) $(PIDDIR)
		51	$(CHMOD) u+s $(INSTALLBIN)/dhisd
		52	$(CP) dhis.db.sample dhisd.conf.sample $(INSTALLCONF)
		53	- $(CHOWN) dhis $(INSTALLCONF)/dhis.db.sample $(INSTALLCONF)/dhisd.conf.sample
		54	- $(CHGRP) dhis $(INSTALLCONF)/dhis.db.sample $(INSTALLCONF)/dhisd.conf.sample
		55	$(CHMOD) 640 $(INSTALLCONF)/dhis.db.sample $(INSTALLCONF)/dhisd.conf.sample
		56	$(CP) dhisd.rc $(INSTALLRC)/dhisd
		57	- $(CHOWN) dhis $(INSTALLRC)/dhisd
		58	- $(CHGRP) dhis $(INSTALLRC)/dhisd
		59	- $(CHMOD) 755 $(INSTALLRC)/dhisd
		60	+ $(CHMOD) 555 $(INSTALLRC)/dhisd
		61
		62	clean:
		63	$(RM) dhisgenkeys .core core dhisd .o *~

Lines 1-49 Link Here

(-)dns/dhisd/files/patch-README (-49 lines)
1	--- README.orig Sun Nov 4 21:47:55 2001
2	+++ README Sun Nov 4 22:15:04 2001
3	@@ -146,7 +146,7 @@
4	dhisd accepts HUP and TERM signals. A kill -HUP will
5	make it reload the hosts database and kill -TERM
6	will terminate it. Its pid number is recorded a the
7	- text file (default: /etc/dhis/pid/dhisd.pid)
8	+ text file (default: /var/pid/dhisd.pid)
9
10	Before terminating with SIGTERM dhisd will attempt to bring all
11	online clients offline.
12	@@ -155,7 +155,7 @@
13	========
14
15	dhisd logs online and offline transitions on a text file
16	- (default: /etc/dhis/log/dhisd.log)
17	+ (default: /var/log/dhisd.log)
18
19	Command Line Options:
20	=====================
21	@@ -175,12 +175,12 @@
22
23	-d <dbase_file> allows specifying a path for the database file
24
25	- e.g. dhisd -d /usr/local/etc/dhis.db
26	+ e.g. dhisd -d /usr/local/etc/dhis/dhis.db
27
28	-s <service_file> allows specifying a path for the services
29	file.
30
31	- e.g. dhisd -s /usr/local/etc/services.db
32	+ e.g. dhisd -s /usr/local/etc/dhis/services.db
33
34	All options may be used in conjunction.
35
36	@@ -327,11 +327,11 @@
37
38	1000 {
39	hostpass something
40	- oncmd /etc/oncmd
41	+ oncmd /usr/local/etc/dhis/oncmd
42	}
43
44
45	- # /etc/oncmd
46	+ # /usr/local/etc/dhis/oncmd
47	#!/bin/sh
48	#
49	echo I am $1 online now at $2

Lines 1-26 Link Here

(-)dns/dhisd/files/patch-dhisd.h (-26 lines)
1	--- dhisd.h.orig Sun Nov 4 20:50:14 2001
2	+++ dhisd.h Sun Nov 4 20:51:05 2001
3	@@ -47,7 +47,7 @@
4	#include<sys/signal.h>
5	#include<sys/wait.h>
6	#include<syslog.h>
7	-#include<varargs.h>
8	+#include<stdarg.h>
9	#include<gmp.h>
10
11	#define BOURNE_SHELL "/bin/sh"
12	@@ -64,10 +64,10 @@
13	#define CHECK_FAILS 3 /* maximum check fails */
14
15	#define DHISD_PORT 58800
16	-#define DHISD_PID "/etc/dhis/pid/dhisd.pid"
17	-#define DHISD_DB "/etc/dhis/db/dhis.db"
18	-#define DHISD_LOG "/etc/dhis/log/dhisd.log"
19	-#define DHISD_SERVICES "/etc/dhis/db/services.db"
20	+#define DHISD_PID "/var/run/dhisd.pid"
21	+#define DHISD_DB "__PREFIX__/etc/dhis/dhis.db"
22	+#define DHISD_LOG "/var/log/dhisd.log"
23	+#define DHISD_SERVICES "__PREFIX__/etc/dhis/services.db"
24
25	#define MAX_HOSTNAME 64
26	#define MAX_PASS 16

Lines 1-22 Link Here

(-)dns/dhisd/pkg-descr (-6 / +2 lines)
1	DHIS Daemon release 5.1
2	==============================
3
4	The server is now modular through the introduction of a services	1	The server is now modular through the introduction of a services
5	sub-system. DNS updates are no longer part of the main code but	2	sub-system. DNS updates are no longer part of the main code but
6	are now implemented as a module.	3	are now implemented as a module.
7		4
8	The main dhisd process listens to DHIS clients and after authentication	5	The main dhisd process listens to DHIS clients and after authentication
9	marks these with their dynamic IP address. The request is passed to a	6	marks these with their dynamic IP address. The request is passed to a
10	sub-process through a pipe which implements the services for which the	7	sub-process through a pipe which implements the services for which the
11	client is subscribed to. Clients may be subscribed to one or more	8	client is subscribed to. Clients may be subscribed to one or more
12	services individually.	9	services individually.
13	The sub-engine interface does a basic read from stdin and process.	10	The sub-engine interface does a basic read from stdin and process.
14		11
15	Examples of things DHIS could update:	12	Examples of things DHIS could update:
16	Dns, Firewalls, tunnel servers, relay access lists, etc ...	13	Dns, Firewalls, tunnel servers, relay access lists, etc ...
17		14
18	For more information on the services of DHIS, you should look at the	15	For more information on the services of DHIS, you should look at the
19	official DHIS site:	16	official DHIS site.
20	http://www.dhis.org/dhis/services/
21		17
22	WWW: http://www.dhis.org/r5/	18	WWW: http://www.dhis.org/