Update to 5.4

4 files changed, 24 insertions, 23 deletions

diff --git a/dns/dhid/Makefile b/dns/dhid/Makefile
index af623860b3cf..90c404f26c28 100644
--- a/dns/dhid/Makefile
+++ b/dns/dhid/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dhid
-PORTVERSION=	5.3
-PORTREVISION=	2
+PORTVERSION=	5.4
 CATEGORIES=	dns
 MASTER_SITES=	ftp://ftp.dhis.org/pub/dhis/
 
diff --git a/dns/dhid/distinfo b/dns/dhid/distinfo
index d095fc481d97..da69749ce6e8 100644
--- a/dns/dhid/distinfo
+++ b/dns/dhid/distinfo
@@ -1,3 +1,3 @@
-MD5 (dhid-5.3.tar.gz) = 3603ee2db6d8eb7172c7c937425e1d84
-SHA256 (dhid-5.3.tar.gz) = 83dcc9b0318fab860f8110d616a17ee891fd17496538f44063db3aab013e4791
-SIZE (dhid-5.3.tar.gz) = 16165
+MD5 (dhid-5.4.tar.gz) = 8970c23ab54ed6c9fa5ede155b60984b
+SHA256 (dhid-5.4.tar.gz) = f5074dcc4b77fcc29ec9a1d97ac73c835b46ffe0583b68b9d1613fd5cef6a863
+SIZE (dhid-5.4.tar.gz) = 16772
diff --git a/dns/dhid/files/patch-ac b/dns/dhid/files/patch-ac
index ce7c7837e224..c6e63b0a7cfa 100644
--- a/dns/dhid/files/patch-ac
+++ b/dns/dhid/files/patch-ac
@@ -1,7 +1,7 @@
---- main.c.orig	Fri Oct 28 23:41:02 2005
-+++ main.c	Sat Jan  7 19:11:18 2006
+--- 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 @@
-                         unsigned char linecmd[512];
+                         char linecmd[512];
                          struct in_addr sa;
                          sa.s_addr=cp->laddr;
 -                        sprintf(linecmd,"%s %d %s %s",cp->off_cmd,cp->id,
@@ -10,7 +10,7 @@
                          ,cp->off_cmdp);
                          cmd_fork(linecmd);
 @@ -106,7 +106,7 @@
-                         unsigned char linecmd[512];
+                         char linecmd[512];
                          struct in_addr sa;
                          sa.s_addr=cp->laddr;
 -                        sprintf(linecmd,"%s %d %s %s",cp->off_cmd,cp->id,
@@ -18,8 +18,8 @@
                          inet_ntoa((struct in_addr)sa)
                          ,cp->off_cmdp);
                          cmd_fork(linecmd);
-@@ -189,7 +189,7 @@
- 		unsigned char linecmd[512];
+@@ -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,
@@ -38,7 +38,7 @@
  		m.hdr.opcode=AUTH_REQ;
  		m.hdr.hostid=cp->id;
  		m.refresh=cp->refresh;
-@@ -289,14 +289,14 @@
+@@ -292,14 +292,14 @@
  	int c;
  	extern char *optarg;
  
@@ -57,12 +57,12 @@
  	case('h'): usage(argv);
  	default: usage(argv);
  	}
-@@ -370,7 +370,7 @@
-                 	unsigned char linecmd[512];
+@@ -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);
++                	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
index 2bdf658d8808..4f4ab7b6f6a2 100644
--- a/dns/dhid/files/patch-ad
+++ b/dns/dhid/files/patch-ad
@@ -1,5 +1,5 @@
---- conf.c.orig	Wed Sep 12 12:32:09 2001
-+++ conf.c	Sat Feb 19 21:26:06 2005
+--- 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));
  
@@ -9,15 +9,16 @@
                  cp->atype=APASS;
          }
          if(!strcmp(line_entry(1,line),"isaddr")) {
-@@ -180,32 +180,32 @@
+@@ -180,33 +180,33 @@
  		sp->addr=0;
  		sp->hostname[0]='\0';
  	
 -		strcpy(str2,line_entry(2,line));
-+		strlcpy(str2,line_entry(2,line),sizeof(str2));
- 
+-
 -		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));
  
@@ -30,6 +31,7 @@
 -                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));
@@ -52,7 +54,7 @@
                  cp->atype=AQRC;
  #else
                  syslog(LOG_ERR,"QRC authentication not available in this client"
-@@ -216,7 +216,7 @@
+@@ -217,7 +217,7 @@
          }
         if(!strcmp(line_entry(1,line),"authq")) {
  #ifdef  QRC