ports/110028: net/isc-dhcp3-server: fix after ascii2addr() removal in CURRENT

[Joerg Pulz]

>Number:         110028
>Category:       ports
>Synopsis:       net/isc-dhcp3-server: fix after ascii2addr() removal in CURRENT
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 07 07:10:05 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Joerg Pulz
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
TU-Munich / ZWE FRM-II
>Environment:
System: FreeBSD hades.admin.frm2 6.2-STABLE FreeBSD 6.2-STABLE #0: Thu Feb 8 18:53:53 CET 2007 root at hades.admin.frm2:/usr/obj/usr/src/sys/HADES i386


	
>Description:
	As reported by Scott Ullrich <sullrich_at_gmail.com> on freebsd-current@
	there is a problem building this port after the removal of the
	ascii2addr() function by bms at .
	bms@ kindly provided a solution for this problem.
>How-To-Repeat:
	
>Fix:

	- apply the patch

--- net_isc-dhcp3-server.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/isc-dhcp3-server/Makefile,v
retrieving revision 1.120
diff -u -r1.120 Makefile
--- Makefile	26 Feb 2007 22:20:58 -0000	1.120
+++ Makefile	7 Mar 2007 06:47:21 -0000
@@ -19,7 +19,7 @@
 MAINTAINER=	Joerg.Pulz at frm2.tum.de
 COMMENT?=	The ISC Dynamic Host Configuration Protocol server
 
-PORTREVISION_SERVER=	1
+PORTREVISION_SERVER=	2
 PORTREVISION_CLIENT=	0
 PORTREVISION_RELAY=	0
 PORTREVISION_DEVEL=	0
Index: files/patch-server::dhcpd.c
===================================================================
RCS file: /home/ncvs/ports/net/isc-dhcp3-server/files/patch-server::dhcpd.c,v
retrieving revision 1.2
diff -u -r1.2 patch-server::dhcpd.c
--- files/patch-server::dhcpd.c	25 Jun 2004 18:50:13 -0000	1.2
+++ files/patch-server::dhcpd.c	7 Mar 2007 06:47:21 -0000
@@ -117,7 +117,7 @@
 +			set_jail = argv [i];
 +			if (++i == argc)
 +				usage ();
-+			if (ascii2addr (AF_INET, argv[i], &jail_ip_address) < 0)
++			if (inet_pton (AF_INET, argv[i], &jail_ip_address) < 0)
 +				log_fatal ("invalid ip address: %s", argv[i]);
 +			jail_ip_address = ntohl (jail_ip_address);
 +			no_dhcpd_jail = 1;
@@ -146,7 +146,7 @@
 +	if (!no_dhcpd_jail && (s = getenv ("DHCPD_JAIL_HOSTNAME")) &&
 +	    (s2 = getenv ("DHCPD_JAIL_IPADDRESS"))) {
 +		set_jail = s;
-+		if (ascii2addr (AF_INET, s2, &jail_ip_address) < 0)
++		if (inet_pton (AF_INET, s2, &jail_ip_address) < 0)
 +			log_fatal ("invalid ip address: %s", s2);
 +		jail_ip_address = ntohl (jail_ip_address);
 +	}
--- net_isc-dhcp3-server.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: