12 files changed, 0 insertions, 347 deletions

diff --git a/dns/Makefile b/dns/Makefile
index 872de888874d..d19be1129329 100644
--- a/dns/Makefile
+++ b/dns/Makefile
@@ -19,7 +19,6 @@
     SUBDIR += crossip
     SUBDIR += curvedns
     SUBDIR += ddclient
-    SUBDIR += dhid
     SUBDIR += dhisd
     SUBDIR += djbdns
     SUBDIR += djbdns-tools
diff --git a/dns/dhid/Makefile b/dns/dhid/Makefile
deleted file mode 100644
index 7561abe98c7a..000000000000
--- a/dns/dhid/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# New ports collection makefile for:	dhid
-# Date created:		Sat Aug 21 06:13:59 EDT 1999
-# Whom:			Oryx Gazella <oryx@ungulate.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	dhid
-PORTVERSION=	5.5
-PORTREVISION=	2
-CATEGORIES=	dns
-MASTER_SITES=	ftp://ftp.dhis.org/pub/dhis/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	DHIS client for updating dynamic DNS entries in dhisd DNS tables
-
-LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp
-
-MAKE_ARGS+=	CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include -DQRC=1" \
-		LFLAGS="-L${LOCALBASE}/lib"
-
-USE_RC_SUBR=	dhid
-
-PORTDOCS=	AUTHORS CONTRIBUTORS COPYRIGHT INSTALL README WHATSNEW
-PLIST_FILES=	sbin/dhid bin/genkeys etc/dhid.conf.sample
-
-DEPRECATED=	Unmaintained, distfile has changed with no explanation
-EXPIRATION_DATE=2011-07-25
-
-DHID_USER=	dhis
-DHID_GROUP=	dhis
-DHID_PID_DIR=	/var/run/dhis
-
-post-patch:
-	@${ECHO} "===>   Patching dhid.h"
-	@${REINPLACE_CMD} -e "s^__PREFIX__^${PREFIX}^g" ${WRKSRC}/dhid.h
-
-pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/dhid ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/genkeys ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/dhid.conf.sample ${PREFIX}/etc/dhid.conf.sample
-	${CHOWN} ${DHID_USER}:${DHID_GROUP} ${PREFIX}/etc/dhid.conf.sample
-	${CHMOD} 0600 ${PREFIX}/etc/dhid.conf.sample
-	@${ECHO_CMD} "@exec ${CHOWN} ${DHID_USER}:${DHID_GROUP} %D/etc/dhid.conf.sample" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHMOD} 0600 %D/etc/dhid.conf.sample" >> ${TMPPLIST}
-	${MKDIR} ${DHID_PID_DIR}
-	${CHOWN} ${DHID_USER}:${DHID_GROUP} ${DHID_PID_DIR}
-	${CHMOD} 0700 ${DHID_PID_DIR}
-	@${ECHO_CMD} "@exec ${MKDIR} ${DHID_PID_DIR}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHOWN} ${DHID_USER}:${DHID_GROUP} ${DHID_PID_DIR}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHMOD} 0700 ${DHID_PID_DIR}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${RM} -rf /${DHID_PID_DIR}" >> ${TMPPLIST}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/dns/dhid/distinfo b/dns/dhid/distinfo
deleted file mode 100644
index b45368e8f044..000000000000
--- a/dns/dhid/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (dhid-5.5.tar.gz) = a1bd2f15e506ea8dcab4f68457cf17edaba7276ed4e973d81286435bc2fb06f6
-SIZE (dhid-5.5.tar.gz) = 17314
diff --git a/dns/dhid/files/dhid.in b/dns/dhid/files/dhid.in
deleted file mode 100644
index c5e0d9a9eff2..000000000000
--- a/dns/dhid/files/dhid.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: dhid
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable dhid:
-#
-# dhid_enable="YES"
-#
-
-. /etc/rc.subr
-
-name="dhid"
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-dhid_enable=${dhid_enable:-"NO"}
-dhid_user=${dhid_user:-"dhis"}
-
-command="%%PREFIX%%/sbin/${name}"
-required_files="%%PREFIX%%/etc/${name}.conf"
-
-run_rc_command "$1"
diff --git a/dns/dhid/files/patch-aa b/dns/dhid/files/patch-aa
deleted file mode 100644
index 8b67a9804971..000000000000
--- a/dns/dhid/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- dhid.h.orig	Fri Oct 28 23:43:56 2005
-+++ dhid.h	Sat Jan  7 19:09:55 2006
-@@ -72,8 +72,8 @@
- #define	OFFLINE_REQ	0x00000551
- 
- 
--#define	DHID_CONF	"/etc/dhid.conf"
--#define	DHID_PID	"/var/run/dhid.pid"
-+#define	DHID_CONF	"__PREFIX__/etc/dhid.conf"
-+#define	DHID_PID	"/var/run/dhis/dhid.pid"
- 
- #define	DEF_ISPORT	58800
- #define	FAIL_ALLOW	3
diff --git a/dns/dhid/files/patch-ac b/dns/dhid/files/patch-ac
deleted file mode 100644
index c6e63b0a7cfa..000000000000
--- a/dns/dhid/files/patch-ac
+++ /dev/null
@@ -1,68 +0,0 @@
---- main.c.orig	2008-04-22 22:37:12.000000000 +0000
-+++ main.c	2008-04-29 04:16:08.000000000 +0000
-@@ -74,7 +74,7 @@
-                         char linecmd[512];
-                         struct in_addr sa;
-                         sa.s_addr=cp->laddr;
--                        sprintf(linecmd,"%s %d %s %s",cp->off_cmd,cp->id,
-+                        snprintf(linecmd,sizeof(linecmd),"%s %d %s %s",cp->off_cmd,cp->id,
-                         inet_ntoa((struct in_addr)sa)
-                         ,cp->off_cmdp);
-                         cmd_fork(linecmd);
-@@ -106,7 +106,7 @@
-                         char linecmd[512];
-                         struct in_addr sa;
-                         sa.s_addr=cp->laddr;
--                        sprintf(linecmd,"%s %d %s %s",cp->off_cmd,cp->id,
-+                        snprintf(linecmd,sizeof(linecmd),"%s %d %s %s",cp->off_cmd,cp->id,
-                         inet_ntoa((struct in_addr)sa)
-                         ,cp->off_cmdp);
-                         cmd_fork(linecmd);
-@@ -191,7 +191,7 @@
- 		char linecmd[512];
- 		struct in_addr sa;
- 		sa.s_addr=cp->laddr;
--		sprintf(linecmd,"%s %d %s %s",cp->on_cmd,cp->id,
-+		snprintf(linecmd,sizeof(linecmd),"%s %d %s %s",cp->on_cmd,cp->id,
- 		inet_ntoa((struct in_addr)sa)
- 		,cp->on_cmdp);
- 		cmd_fork(linecmd);
-@@ -223,8 +223,8 @@
- 			return;
- 		cp->cserver=sp;
- 		cp->stage=AUTH_STAGE;
--		if(cp->atype==APASS) strcpy(m.pass,cp->pass);
--		else memset(m.pass,0,16);
-+		if(cp->atype==APASS) strlcpy(m.pass,cp->pass,sizeof(m.pass));
-+		else memset(m.pass,0,sizeof(m.pass));
- 		m.hdr.opcode=AUTH_REQ;
- 		m.hdr.hostid=cp->id;
- 		m.refresh=cp->refresh;
-@@ -292,14 +292,14 @@
- 	int c;
- 	extern char *optarg;
- 
--	strcpy(conf_file,DHID_CONF);
--	strcpy(pid_file,DHID_PID);
-+	strlcpy(conf_file,DHID_CONF,sizeof(conf_file));
-+	strlcpy(pid_file,DHID_PID,sizeof(pid_file));
- 
- 	while((c=getopt(argc,argv,"hf:p:P:"))!=EOF)
- 	switch(c) {
- 	case('p'): rport=atoi(optarg); break;
--	case('P'): strncpy(pid_file,optarg,sizeof(pid_file)); break;
--	case('f'): strncpy(conf_file,optarg,sizeof(conf_file)); break;
-+	case('P'): strlcpy(pid_file,optarg,sizeof(pid_file)); break;
-+	case('f'): strlcpy(conf_file,optarg,sizeof(conf_file)); break;
- 	case('h'): usage(argv);
- 	default: usage(argv);
- 	}
-@@ -381,7 +381,7 @@
-                 	char linecmd[512];
-                 	struct in_addr sa;
-                 	sa.s_addr=cp->laddr;
--                	sprintf(linecmd,"%s %d %s %s",cp->off_cmd,cp->id,
-+                	snprintf(linecmd, sizeof(linecmd), "%s %d %s %s",cp->off_cmd,cp->id,
-                 	inet_ntoa((struct in_addr)sa),cp->off_cmdp);
-                 	cmd_fork(linecmd);
-                 	}
diff --git a/dns/dhid/files/patch-ad b/dns/dhid/files/patch-ad
deleted file mode 100644
index 4f4ab7b6f6a2..000000000000
--- a/dns/dhid/files/patch-ad
+++ /dev/null
@@ -1,65 +0,0 @@
---- conf.c.orig	2008-04-17 11:38:54.000000000 +0000
-+++ conf.c	2008-04-29 04:20:36.000000000 +0000
-@@ -155,7 +155,7 @@
-                 cp->id=atoi(line_entry(2,line));
- 
-         if(!strcmp(line_entry(1,line),"hostpass")) {
--                strcpy(cp->pass,line_entry(2,line));
-+                strlcpy(cp->pass,line_entry(2,line),sizeof(cp->pass));
-                 cp->atype=APASS;
-         }
-         if(!strcmp(line_entry(1,line),"isaddr")) {
-@@ -180,33 +180,33 @@
- 		sp->addr=0;
- 		sp->hostname[0]='\0';
- 	
--		strcpy(str2,line_entry(2,line));
--
--		strcpy(str,dot_entry(1,str2));
--		strcpy(str3,dot_entry(2,str2));
-+		strlcpy(str2,line_entry(2,line),sizeof(str2));
-+  
-+		strlcpy(str,dot_entry(1,str2),sizeof(str));
-+		strlcpy(str3,dot_entry(2,str2),sizeof(str3));
- 
-                 if(isdigit(str[0])) sp->addr=inet_addr(str);
--		else strcpy(sp->hostname,str);
-+		else strlcpy(sp->hostname,str,sizeof(sp->hostname));
- 		if(str3[0]!='\0') sp->port=atoi(str3);
-         }
-         if(!strcmp(line_entry(1,line),"refresh")) {
--                strcpy(str,line_entry(2,line));
-+                strlcpy(str,line_entry(2,line),sizeof(str));
-                 cp->refresh=atoi(str);
- 		if(cp->refresh<60) cp->refresh=60;
-         }
-         if(!strcmp(line_entry(1,line),"oncmd")) {
--                strcpy(cp->on_cmd,line_entry(2,line));
--                strcpy(cp->on_cmdp,line_ptr(3,line));
-+                strlcpy(cp->on_cmd,line_entry(2,line),sizeof(cp->on_cmd));
-+                strlcpy(cp->on_cmdp,line_ptr(3,line),sizeof(cp->on_cmdp));
-         }
-         if(!strcmp(line_entry(1,line),"offcmd")) {
--                strcpy(cp->off_cmd,line_entry(2,line));
--                strcpy(cp->off_cmdp,line_ptr(3,line));
-+                strlcpy(cp->off_cmd,line_entry(2,line),sizeof(cp->off_cmd));
-+                strlcpy(cp->off_cmdp,line_ptr(3,line),sizeof(cp->off_cmdp));
-         }
- 
- 
-         if(!strcmp(line_entry(1,line),"authp")) {
- #ifdef  QRC
--                strcat(keyp,line_entry(2,line));
-+                strlcat(keyp,line_entry(2,line),sizeof(keyp));
-                 cp->atype=AQRC;
- #else
-                 syslog(LOG_ERR,"QRC authentication not available in this client"
-@@ -217,7 +217,7 @@
-         }
-        if(!strcmp(line_entry(1,line),"authq")) {
- #ifdef  QRC
--                strcat(keyq,line_entry(2,line));
-+                strlcat(keyq,line_entry(2,line),sizeof(keyq));
-                 cp->atype=AQRC;
- #else
-                 syslog(LOG_ERR,"QRC authentication not available in this client"
diff --git a/dns/dhid/files/patch-ae b/dns/dhid/files/patch-ae
deleted file mode 100644
index cfdb5c27e90d..000000000000
--- a/dns/dhid/files/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
---- genkeys.c.orig	Wed Sep 12 12:13:07 2001
-+++ genkeys.c	Sat Feb 19 21:27:32 2005
-@@ -46,12 +46,12 @@
- 	static int seed=0;
- 
- 	if(!seed) { seed++; srandom(time(NULL)); }
--	memset(buff,0,256);	
--	memset(temp,0,128);	
-+	memset(buff,0,sizeof(buff));	
-+	memset(temp,0,sizeof(temp));	
- 
- 	do {
--		sprintf(temp,"%lu",(unsigned long int)random());
--		strcat(buff,temp);
-+		snprintf(temp,sizeof(temp),"%lu",(unsigned long int)random());
-+		strlcat(buff,temp,sizeof(buff));
- 		
- 	} while(strlen(buff) < n);
- 	buff[n]='\0';
diff --git a/dns/dhid/files/patch-af b/dns/dhid/files/patch-af
deleted file mode 100644
index cad212e50d09..000000000000
--- a/dns/dhid/files/patch-af
+++ /dev/null
@@ -1,32 +0,0 @@
---- network.c.orig	Wed Sep 12 12:13:18 2001
-+++ network.c	Sat Feb 19 21:29:32 2005
-@@ -290,12 +290,12 @@
- 	static int seed=0;
- 
- 	if(!seed) { seed++; srandom(time(NULL)); }
--	memset(buff,0,256);	
--	memset(temp,0,128);	
-+	memset(buff,0,sizeof(buff));
-+	memset(temp,0,sizeof(temp));
- 
- 	do {
--		sprintf(temp,"%u",(unsigned)random());
--		strcat(buff,temp);
-+		snprintf(temp,sizeof(temp),"%u",(unsigned)random());
-+		strlcat(buff,temp,sizeof(buff));
- 		
- 	} while(strlen(buff) < n);
- 	buff[n]='\0';
-@@ -441,10 +441,10 @@
- 	if(j<0) return;
- 
- 	buff[0]='\0';
--	for(i=0;i<j;i++) strcat(buff,"0");	/* Place 0's */
-+	for(i=0;i<j;i++) strlcat(buff,"0",sizeof(buff));	/* Place 0's */
- 
- 	mpz_get_str(buff2,10,x);		/* Add x */
--	strcat(buff,buff2);
-+	strlcat(buff,buff2,sizeof(buff));
- 
- 	/* Now copy n digits to str */
- 	cp1=str;
diff --git a/dns/dhid/pkg-descr b/dns/dhid/pkg-descr
deleted file mode 100644
index 682592d1c474..000000000000
--- a/dns/dhid/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-DHIS Daemon Client
-================================
-
-dhid is the DHIS client daemon. dhid is used to update the DNS tables on
-a DHIS provider.
-
-If you haven't done so yet, you will need to register your host with a
-DHIS provider. http://www.dhis.org/dhis/register.html
-
-dhid.conf should be configured according to the provider's assigned
-parameters. Use the dhid.conf.sample for a template.
-
-WWW: http://www.dhis.org/dhis/install.html
diff --git a/dns/dhid/pkg-install b/dns/dhid/pkg-install
deleted file mode 100644
index 3d28af3e73d5..000000000000
--- a/dns/dhid/pkg-install
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-
-# $FreeBSD: /tmp/pcvs/ports/dns/dhid/Attic/pkg-install,v 1.1 2005-02-19 20:42:39 pav Exp $
-
-PATH=/bin:/usr/sbin
-
-case $2 in
-PRE-INSTALL)
-       USER=dhis
-       GROUP=${USER}
-
-       if pw group show "${GROUP}" 2>/dev/null; then
-               echo "You already have a group \"${GROUP}\", so I will use it."
-       else
-               if pw groupadd ${GROUP} -g 114 -h -; then
-                       echo "Added group \"${GROUP}\"."
-               else
-                       echo "Adding group \"${GROUP}\" failed..."
-                       exit 1
-               fi
-       fi
-
-       if pw user show "${USER}" 2>/dev/null; then
-               echo "You already have a user \"${USER}\", so I will use it."
-       else
-               if pw useradd ${USER} -u 114 -g ${GROUP} -h - \
-                       -d /nonexistent -s /sbin/nologin \
-                       -c "DHIS Daemon"
-               then
-                       echo "Added user \"${USER}\"."
-               else
-                       echo "Adding user \"${USER}\" failed..."
-                       exit 1
-               fi
-       fi
-       ;;
-esac
diff --git a/dns/dhid/pkg-message b/dns/dhid/pkg-message
deleted file mode 100644
index 3d27a9f9cd1e..000000000000
--- a/dns/dhid/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
-
-Before dhid can run, you will need to register with a DHIS provider.
-See http://www.dhis.org/dhis/services/ for a list of providers.
-Enter the DHIS account information into the dhid.conf file.