Attachment 198526 Details for Bug 230990 – use-local-distfiles

use-local-distfiles

patch-dhisd-5.5.txt (text/plain), 22.10 KB, created by Koichiro Iwao on 2018-10-24 00:19:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Koichiro Iwao

Created: 2018-10-24 00:19:10 UTC

Size: 22.10 KB

patch

obsolete

>Index: dns/dhisd/Makefile
>===================================================================
>--- dns/dhisd/Makefile	(revision 482840)
>+++ dns/dhisd/Makefile	(working copy)
>@@ -2,12 +2,12 @@
> # $FreeBSD$
> 
> PORTNAME=	dhisd
>-PORTVERSION=	5.1
>-PORTREVISION=	5
>+PORTVERSION=	5.5
> CATEGORIES=	dns
>-MASTER_SITES=	ftp://ftp.dhis.org/pub/dhis/
>+MASTER_SITES=	ftp://ftp.dhis.org/pub/dhis/ \
>+		LOCAL/meta
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	egypcio@googlemail.com
> COMMENT=	DHIS server for dynamic updates on the server using specific engines
> 
> LICENSE=	BSD2CLAUSE
>@@ -15,39 +15,32 @@
> 
> LIB_DEPENDS=	libgmp.so:math/gmp
> 
>-USES=		localbase:ldflags
>+USE_RC_SUBR=	${PORTNAME}
> 
>-SUB_FILES=	pkg-message
>+SUB_LIST=	USER="${USERS}" GROUP="${GROUPS}"
>+PLIST_SUB=	USER="${USERS}" GROUP="${GROUPS}"
> 
>-DOCS=		CONTRIBUTORS INSTALL MODULES README
>-PORTDOCS=	*
>+USERS=		dhis
>+GROUPS=		dhis
> 
>+DOCS=	CONTRIBUTORS INSTALL README
>+
> 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}/genkeys ${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
>+	${INSTALL_PROGRAM} ${WRKSRC}/dhisgenkeys ${STAGEDIR}${PREFIX}/sbin
> 
>-do-install-DOCS-on:
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-.for f in ${DOCS}
>-	cd ${WRKSRC} && ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
>-.endfor
>-	${INSTALL_DATA} ${FILESDIR}/INSTALL.bsd ${STAGEDIR}${DOCSDIR}
>+post-install:
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/dhisd
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/dhisgenkeys
> 
> post-install-DOCS-on:
>-	@${REINPLACE_CMD} -e 's|^__DOCS__||' ${PKGMESSAGE}
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	cd ${WRKSRC} && \
>+		${INSTALL_MAN} ${DOCS} ${STAGEDIR}${DOCSDIR}
> 
>-post-install-DOCS-off:
>-	@${REINPLACE_CMD} -e '/^__DOCS__/ d' ${PKGMESSAGE}
>-
> .include <bsd.port.mk>
>Index: dns/dhisd/distinfo
>===================================================================
>--- dns/dhisd/distinfo	(revision 482840)
>+++ dns/dhisd/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (dhisd-5.1.tar.gz) = b4228daf5accef9bac3e00922328d713a5a022ca14cbcada830e6738b3defe9f
>-SIZE (dhisd-5.1.tar.gz) = 27910
>+TIMESTAMP = 1535492360
>+SHA256 (dhisd-5.5.tar.gz) = 736352209b18fb3b95a82782ddbf2fb524c0e9019ca11ba525a22f97f41936d3
>+SIZE (dhisd-5.5.tar.gz) = 26221
>Index: dns/dhisd/files/INSTALL.bsd
>===================================================================
>--- dns/dhisd/files/INSTALL.bsd	(revision 482840)
>+++ dns/dhisd/files/INSTALL.bsd	(nonexistent)
>@@ -1,59 +0,0 @@
>-
>-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.
>-
>
>Property changes on: dns/dhisd/files/INSTALL.bsd
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: dns/dhisd/files/dhisd.in
>===================================================================
>--- dns/dhisd/files/dhisd.in	(nonexistent)
>+++ dns/dhisd/files/dhisd.in	(working copy)
>@@ -0,0 +1,46 @@
>+#!/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
>+#
>+# $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"
>
>Property changes on: dns/dhisd/files/dhisd.in
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: dns/dhisd/files/dhisd.sh
>===================================================================
>--- dns/dhisd/files/dhisd.sh	(revision 482840)
>+++ dns/dhisd/files/dhisd.sh	(nonexistent)
>@@ -1,18 +0,0 @@
>-#!/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
>
>Property changes on: dns/dhisd/files/dhisd.sh
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: dns/dhisd/files/patch-INSTALL
>===================================================================
>--- dns/dhisd/files/patch-INSTALL	(revision 482840)
>+++ dns/dhisd/files/patch-INSTALL	(nonexistent)
>@@ -1,74 +0,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.
>- 
>- 
>
>Property changes on: dns/dhisd/files/patch-INSTALL
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: dns/dhisd/files/patch-MODULES
>===================================================================
>--- dns/dhisd/files/patch-MODULES	(revision 482840)
>+++ dns/dhisd/files/patch-MODULES	(nonexistent)
>@@ -1,63 +0,0 @@
>---- 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:
>
>Property changes on: dns/dhisd/files/patch-MODULES
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: dns/dhisd/files/patch-Makefile
>===================================================================
>--- dns/dhisd/files/patch-Makefile	(revision 482840)
>+++ dns/dhisd/files/patch-Makefile	(working copy)
>@@ -1,33 +1,63 @@
>---- Makefile.orig	Sun Nov  4 20:48:12 2001
>-+++ Makefile	Sun Nov  4 20:49:08 2001
>-@@ -25,12 +25,12 @@
>+--- 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
>--CFLAGS=-Wall -Wformat -I/usr/local/include # -DDONT_FORK
>--LFLAGS=-L/usr/local/lib 
>-+CC?=gcc
>-+#CFLAGS=-Wall -Wformat -I/usr/local/include # -DDONT_FORK
>-+#LDFLAGS=-L/usr/local/lib 
>- CP=cp
>++CC=clang
>  
>--INSTALLDIR=/etc/dhis/bin
>-+INSTALLDIR=__PREFIX__/sbin
>- MODE=700
>- OWNER=root
>- MKDIR=mkdir -p
>-@@ -46,11 +46,11 @@
>- all: dhisd genkeys
>+ 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
>  
>- dhisd:	$(OBJS)
>--	$(CC) $(LFLAGS) -o dhisd $(OBJS) $(LIBS)
>-+	$(CC) $(LDFLAGS) -o dhisd $(OBJS) $(LIBS)
>- 	strip dhisd
>+ 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 
>  
>- genkeys:
>--	$(CC) $(CFLAGS) $(LFLAGS) genkeys.c -DQRC=1 -o genkeys -lgmp
>-+	$(CC) $(CFLAGS) $(LDFLAGS) genkeys.c -DQRC=1 -o genkeys -lgmp
>+ # Possible CFLAGS: -g -O3 -DDONT_FORK
>+ #
>  
>- install: dhisd genkeys
>- 	$(MKDIR) $(INSTALLDIR)
>+-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 *~
>Index: dns/dhisd/files/patch-README
>===================================================================
>--- dns/dhisd/files/patch-README	(revision 482840)
>+++ dns/dhisd/files/patch-README	(nonexistent)
>@@ -1,49 +0,0 @@
>---- 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
>
>Property changes on: dns/dhisd/files/patch-README
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: dns/dhisd/files/patch-dhisd.h
>===================================================================
>--- dns/dhisd/files/patch-dhisd.h	(revision 482840)
>+++ dns/dhisd/files/patch-dhisd.h	(nonexistent)
>@@ -1,26 +0,0 @@
>---- 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
>
>Property changes on: dns/dhisd/files/patch-dhisd.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: dns/dhisd/files/pkg-message.in
>===================================================================
>--- dns/dhisd/files/pkg-message.in	(revision 482840)
>+++ dns/dhisd/files/pkg-message.in	(nonexistent)
>@@ -1,9 +0,0 @@
>---------------------------------------------------------------------------
>-Before dhisd can run, you will need configure BIND.
>-
>-For more information, see the following site:
>-http://www.dhis.org/dhis/r5/
>-__DOCS__
>-__DOCS__or the documents in %%DOCSDIR%%
>-__DOCS__Read INSTALL and INSTALL.bsd at least for the setup information of dhisd.
>---------------------------------------------------------------------------
>
>Property changes on: dns/dhisd/files/pkg-message.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: dns/dhisd/pkg-descr
>===================================================================
>--- dns/dhisd/pkg-descr	(revision 482840)
>+++ dns/dhisd/pkg-descr	(working copy)
>@@ -1,6 +1,3 @@
>-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.
>@@ -16,7 +13,6 @@
>     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/
>+official DHIS site.
> 
>-WWW: http://www.dhis.org/r5/
>+WWW: http://www.dhis.org/
>Index: dns/dhisd/pkg-plist
>===================================================================
>--- dns/dhisd/pkg-plist	(revision 482840)
>+++ dns/dhisd/pkg-plist	(working copy)
>@@ -1,6 +1,9 @@
>+@dir(%%USER%%,%%GROUP%%,750) /var/log/dhis
>+@dir(%%USER%%,%%GROUP%%,750) /var/run/dhis
>+@sample etc/dhisd.conf.sample
>+@sample etc/dhisd.db.sample
> sbin/dhisd
>-sbin/genkeys
>-@(,,600) etc/dhis/dhis.db.sample
>-@(,,600) etc/dhis/services.db.sample
>-etc/rc.d/dhisd.sh
>-@dir(,,700) etc/dhis
>+sbin/dhisgenkeys
>+%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
>+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
>+%%PORTDOCS%%%%DOCSDIR%%/README

Actions: View

Attachments on bug 230990: 196661 | 198526 | 198533 | 198534 | 198535 | 198960