svn commit: r484793 - in head/dns/dhisd: . files

Mon Nov 12 09:15:40 UTC 2018

Author: egypcio
Date: Mon Nov 12 09:15:38 2018
New Revision: 484793
URL: https://svnweb.freebsd.org/changeset/ports/484793

Log:
  dns/dhisd: update to 5.5
  
    * while here, adopt the port;
  
    * files/patch-Makefile;
        use CC=${CC} for clang and GCC compatibility;
        use PREFIX instead of hardcoding "/usr/local";
        better use WFLAGS+= (with a plus).
  
    * also updated 'pkg-descr' with a longer description about the port.
  
  PR:		230990
  Submitted by:	egypcio
  Approved by:	rene (mentor)

Added:
  head/dns/dhisd/files/dhisd.in   (contents, props changed)
Deleted:
  head/dns/dhisd/files/INSTALL.bsd
  head/dns/dhisd/files/dhisd.sh
  head/dns/dhisd/files/patch-INSTALL
  head/dns/dhisd/files/patch-MODULES
  head/dns/dhisd/files/patch-README
  head/dns/dhisd/files/patch-dhisd.h
  head/dns/dhisd/files/pkg-message.in
Modified:
  head/dns/dhisd/Makefile
  head/dns/dhisd/distinfo
  head/dns/dhisd/files/patch-Makefile
  head/dns/dhisd/pkg-descr
  head/dns/dhisd/pkg-plist

Modified: head/dns/dhisd/Makefile
==============================================================================

--- head/dns/dhisd/Makefile	Mon Nov 12 08:56:56 2018	(r484792)
+++ head/dns/dhisd/Makefile	Mon Nov 12 09:15:38 2018	(r484793)
@@ -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 at FreeBSD.org
+MAINTAINER=	egypcio at googlemail.com
 COMMENT=	DHIS server for dynamic updates on the server using specific engines
 
 LICENSE=	BSD2CLAUSE
@@ -15,39 +15,32 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 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}
-
-post-install-DOCS-off:
-	@${REINPLACE_CMD} -e '/^__DOCS__/ d' ${PKGMESSAGE}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && \
+		${INSTALL_MAN} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/dns/dhisd/distinfo
==============================================================================
--- head/dns/dhisd/distinfo	Mon Nov 12 08:56:56 2018	(r484792)
+++ head/dns/dhisd/distinfo	Mon Nov 12 09:15:38 2018	(r484793)
@@ -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

Added: head/dns/dhisd/files/dhisd.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/dns/dhisd/files/dhisd.in	Mon Nov 12 09:15:38 2018	(r484793)
@@ -0,0 +1,23 @@
+#!/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"

Modified: head/dns/dhisd/files/patch-Makefile
==============================================================================
--- head/dns/dhisd/files/patch-Makefile	Mon Nov 12 08:56:56 2018	(r484792)
+++ head/dns/dhisd/files/patch-Makefile	Mon Nov 12 09:15:38 2018	(r484793)
@@ -1,33 +1,80 @@
---- 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 UTC
++++ Makefile
+@@ -24,31 +24,31 @@
+ # 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 
++CC ?= ${CC}
+ 
+-MYSQL_INCLUDE=	-I/usr/local/include/mysql -I/usr/local/mysql/include \
+-		-I/usr/local/mysql/include/mysql
++MYSQL_INCLUDE=	-I${PREFIX}/include/mysql -I${PREFIX}/mysql/include \
++		-I${PREFIX}/mysql/include/mysql
+ 
+-MYSQL_LIBDIR=	-L/usr/local/lib/mysql -L/usr/local/mysql/lib \
+-		-L/usr/local/mysql/lib/mysql
++MYSQL_LIBDIR=	-L${PREFIX}/lib/mysql -L${PREFIX}/mysql/lib \
++		-L${PREFIX}/mysql/lib/mysql
+ 
+-WFLAGS=-Wall -Wstrict-prototypes -Wpointer-arith \
+-        -Wno-sign-compare -Wno-traditional -Wreturn-type -Wswitch -Wshadow \
++WFLAGS += -Wall -Wstrict-prototypes -Wpointer-arith \
++        -Wno-sign-compare -Wreturn-type -Wswitch -Wshadow \
+         -Wwrite-strings -Wextra -funsigned-char 
+ 
+ # Possible CFLAGS: -g -O3 -DDONT_FORK
+ #
+ 
+-CFLAGS= -O3 $(WFLAGS) -I. -I/usr/local/include # $(MYSQL_INCLUDE) -DWITH_MYSQL=1
+-LFLAGS= -L/usr/local/lib # $(MYSQL_LIBDIR)
++CFLAGS= $(WFLAGS) -I. -I${PREFIX}/include
++LDFLAGS= -L${PREFIX}/lib
+ 
+ # For System V (Solaris) add -lnsl and -lsocket
+ # For MySQL support add -lmysqlclient
+ LIBS=-lgmp # -lmysqlclient #-lnsl -lsocket 
+ 
+-INSTALLBIN=/usr/local/sbin
+-INSTALLCONF=/usr/local/etc
+-INSTALLRC=/usr/local/etc/rc.d
++INSTALLBIN=${PREFIX}/sbin
++INSTALLCONF=${PREFIX}/etc
++INSTALLRC=${PREFIX}/etc/rc.d
+ LOGDIR=/var/log/dhis
+ PIDDIR=/var/run/dhis
  CP=cp
+@@ -66,10 +66,10 @@ RM=rm -f
+ all: dhisd dhisgenkeys
  
--INSTALLDIR=/etc/dhis/bin
-+INSTALLDIR=__PREFIX__/sbin
- MODE=700
- OWNER=root
- MKDIR=mkdir -p
-@@ -46,11 +46,11 @@
- all: dhisd genkeys
+ dhisd:	$(OBJS) main.o
+-	$(CC) $(LFLAGS) -o dhisd $(OBJS) $(LIBS) main.o
++	$(CC) $(LDFLAGS) -o dhisd $(OBJS) $(LIBS) main.o
  
- dhisd:	$(OBJS)
--	$(CC) $(LFLAGS) -o dhisd $(OBJS) $(LIBS)
-+	$(CC) $(LDFLAGS) -o dhisd $(OBJS) $(LIBS)
- 	strip dhisd
+ dhisgenkeys: qrc.o genkeys.o
+-	$(CC) $(LFLAGS) -o dhisgenkeys qrc.o $(LIBS) genkeys.o
++	$(CC) $(LDFLAGS) -o dhisgenkeys qrc.o $(LIBS) genkeys.o
  
- genkeys:
--	$(CC) $(CFLAGS) $(LFLAGS) genkeys.c -DQRC=1 -o genkeys -lgmp
-+	$(CC) $(CFLAGS) $(LDFLAGS) genkeys.c -DQRC=1 -o genkeys -lgmp
+ main.o: main.c
+ 	$(CC) $(CFLAGS) -c main.c
+@@ -84,18 +84,12 @@ install: dhisd  dhisgenkeys
+ 	$(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
  
- install: dhisd genkeys
- 	$(MKDIR) $(INSTALLDIR)
+ clean:
+ 	$(RM) dhisgenkeys *.core core dhisd *.o *~

Modified: head/dns/dhisd/pkg-descr
==============================================================================
--- head/dns/dhisd/pkg-descr	Mon Nov 12 08:56:56 2018	(r484792)
+++ head/dns/dhisd/pkg-descr	Mon Nov 12 09:15:38 2018	(r484793)
@@ -1,22 +1,9 @@
-DHIS Daemon release 5.1
-==============================
+DHIS is a client-server based system architecture primarily meant for
+ updating DNS for hosts that have dynamic IP addresses. With DHIS you
+ can have your computer always recognised and available on the Internet
+ with the same unique name, even if its IP address changes frequently.
 
-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.
+It supports both IPv4 and IPv6. For more information on the services,
+ you should look at the official DHIS website.
 
-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/r5/
+WWW: http://www.dhis.org/

Modified: head/dns/dhisd/pkg-plist
==============================================================================
--- head/dns/dhisd/pkg-plist	Mon Nov 12 08:56:56 2018	(r484792)
+++ head/dns/dhisd/pkg-plist	Mon Nov 12 09:15:38 2018	(r484793)
@@ -1,6 +1,9 @@
+ at dir(%%USER%%,%%GROUP%%,750) /var/log/dhis
+ at dir(%%USER%%,%%GROUP%%,750) /var/run/dhis
+ at sample etc/dhisd.conf.sample
+ at 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
- at dir(,,700) etc/dhis
+sbin/dhisgenkeys
+%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
