From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Mar 7 07:10:06 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B0C2216A403 for ; Wed, 7 Mar 2007 07:10:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 88AE313C49D for ; Wed, 7 Mar 2007 07:10:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l277A6Yc049461 for ; Wed, 7 Mar 2007 07:10:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l277A6Ct049460; Wed, 7 Mar 2007 07:10:06 GMT (envelope-from gnats) Resent-Date: Wed, 7 Mar 2007 07:10:06 GMT Resent-Message-Id: <200703070710.l277A6Ct049460@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Joerg Pulz Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3240116A401 for ; Wed, 7 Mar 2007 07:04:00 +0000 (UTC) (envelope-from Joerg.Pulz@frm2.tum.de) Received: from mailhost.frm2.tum.de (mailhost.frm2.tum.de [129.187.179.12]) by mx1.freebsd.org (Postfix) with ESMTP id B523513C48E for ; Wed, 7 Mar 2007 07:03:59 +0000 (UTC) (envelope-from Joerg.Pulz@frm2.tum.de) Received: from localhost (mailhost.frm2.tum.de [129.187.179.12]) by mailhost.frm2.tum.de (8.13.8/8.13.8) with ESMTP id l2773w4h045082 for ; Wed, 7 Mar 2007 08:03:58 +0100 (CET) (envelope-from jpulz@frm2.tum.de) Received: from hades.admin.frm2 (hades.admin.frm2 [172.25.1.10]) by mailhost.frm2.tum.de (8.13.8/8.13.8) with ESMTP id l2773tHD045075 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Wed, 7 Mar 2007 08:03:55 +0100 (CET) (envelope-from jpulz@frm2.tum.de) Received: from hades.admin.frm2 (localhost [127.0.0.1]) by hades.admin.frm2 (8.13.8/8.13.8) with ESMTP id l2773tIa068423 for ; Wed, 7 Mar 2007 08:03:55 +0100 (CET) (envelope-from jpulz@frm2.tum.de) Received: (from jpulz@localhost) by hades.admin.frm2 (8.13.8/8.13.8/Submit) id l2773tv5068422; Wed, 7 Mar 2007 08:03:55 +0100 (CET) (envelope-from jpulz) Message-Id: <200703070703.l2773tv5068422@hades.admin.frm2> Date: Wed, 7 Mar 2007 08:03:55 +0100 (CET) From: Joerg Pulz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/110028: net/isc-dhcp3-server: fix after ascii2addr() removal in CURRENT X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Joerg Pulz List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Mar 2007 07:10:06 -0000 >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@hades.admin.frm2:/usr/obj/usr/src/sys/HADES i386 >Description: As reported by Scott Ullrich on freebsd-current@ there is a problem building this port after the removal of the ascii2addr() function by bms@. 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@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: