From owner-freebsd-ports Thu Mar 22 22:23:25 2001 Delivered-To: freebsd-ports@freebsd.org Received: from racine.cybercable.fr (racine.cybercable.fr [212.198.0.201]) by hub.freebsd.org (Postfix) with SMTP id CD2DB37B71A for ; Thu, 22 Mar 2001 22:23:19 -0800 (PST) (envelope-from root@gits.dyndns.org) Received: (qmail 2408463 invoked from network); 23 Mar 2001 06:23:18 -0000 Received: from d165.dhcp212-231.cybercable.fr (HELO gits.dyndns.org) ([212.198.231.165]) (envelope-sender ) by racine.cybercable.fr (qmail-ldap-1.03) with SMTP for ; 23 Mar 2001 06:23:18 -0000 Received: (from root@localhost) by gits.dyndns.org (8.11.3/8.11.3) id f2N6NHV34860; Fri, 23 Mar 2001 07:23:17 +0100 (CET) (envelope-from root) From: Cyrille Lefevre Message-Id: <200103230623.f2N6NHV34860@gits.dyndns.org> Subject: Re: ports/25977: Updated port: net/isc-dhcp3 (beta 2 patch level 22) In-Reply-To: <200103230134.f2N1Y4U52809@freefall.freebsd.org> "from jeh@FreeBSD.org at Mar 22, 2001 05:34:04 pm" To: jeh@FreeBSD.org Date: Fri, 23 Mar 2001 07:23:17 +0100 (CET) Cc: freebsd-ports@FreeBSD.org Reply-To: clefevre@poboxes.com Organization: ACME X-Face: V|+c;4!|B?E%BE^{E6);aI.[<97Zd*>^#%Y5Cxv;%Y[PT-LW3;A:fRrJ8+^k"e7@+30g0YD0*^^3jgyShN7o?a]C la*Zv'5NA,=963bM%J^o]C X-Mailer: ELM [version 2.4ME+ PL88 (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org jeh@FreeBSD.org wrote: > Synopsis: Updated port: net/isc-dhcp3 (beta 2 patch level 22) > > State-Changed-From-To: open->closed > State-Changed-By: jeh > State-Changed-When: Thu Mar 22 17:33:51 PST 2001 > State-Changed-Why: > Committed. Thanks. > > http://www.freebsd.org/cgi/query-pr.cgi?pr=25977 hi, you forgot to apply the followup. grrr :) here is a new one which apply cleanly regarding the current cvs tree. see you. Index: /usr/ports/net/isc-dhcp3/files/patch-dhclient.c =================================================================== RCS file: /home/ncvs/ports/net/isc-dhcp3/files/patch-dhclient.c,v retrieving revision 1.6 diff -u -r1.6 patch-dhclient.c --- /usr/ports/net/isc-dhcp3/files/patch-dhclient.c 2001/03/23 01:33:47 1.6 +++ /usr/ports/net/isc-dhcp3/files/patch-dhclient.c 2001/03/23 06:20:01 @@ -1,5 +1,5 @@ --- client/dhclient.c.orig Fri Mar 16 00:12:03 2001 -+++ client/dhclient.c Thu Mar 22 02:49:59 2001 ++++ client/dhclient.c Thu Mar 22 14:57:19 2001 @@ -78,6 +78,7 @@ u_int16_t remote_port; int no_daemon; @@ -56,13 +56,16 @@ } isc_result_t find_class (struct class **c, -@@ -1453,6 +1467,10 @@ +@@ -1453,6 +1467,13 @@ /* No leases were available, or what was available didn't work, so tell the shell script that we failed to allocate an address, and try again later. */ + if (onetry) { ++ if (!quiet) ++ log_info ("Unable to obtain a lease on first try - %s.", ++ ++ "exiting"); + exit(2); -+ log_info ("Unable to obtain a lease on first try - exiting.\n"); + } log_info ("No working leases in persistent database - sleeping."); script_init (client, "FAIL", (struct string_list *)0); Cyrille. -- home: mailto:clefevre@poboxes.com UNIX is user-friendly; it's just particular work: mailto:Cyrille.Lefevre@edf.fr about who it chooses to be friends with. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message