Date: Sat, 3 Mar 2001 00:44:58 +0100 (CET) From: Cyrille Lefevre <clefevre@poboxes.com> To: FreeBSD-gnats-submit@freebsd.org Cc: roman@xpert.com Subject: ports/25501: Updated port: net/isc-dhcp3 (beta 2 patch level 18) Message-ID: <200103022344.f22Niwf86073@gits.dyndns.org>
next in thread | raw e-mail | index | archive | help
>Number: 25501 >Category: ports >Synopsis: Updated port: net/isc-dhcp3 (beta 2 patch level 18) >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Mar 02 15:50:04 PST 2001 >Closed-Date: >Last-Modified: >Originator: Cyrille Lefevre >Release: FreeBSD 4.2-STABLE i386 >Organization: ACME >Environment: FreeBSD gits 4.2-STABLE FreeBSD 4.2-STABLE #7: Tue Jan 23 07:33:34 CET 2001 root@gits:/disk2/4.x-stable/src/sys/compile/CUSTOM i386 >Description: update ISC dhcp to the latest version, which is 3.0b2pl18. Makefile version bumbed. distinfo updated. files/isc-dhcpd.sh.sample $IFACES empty by default. files/patch-dhclient.c updated. >How-To-Repeat: n/a >Fix: diff -ruN -x CVS -x work -x *~ -x *.orig -x *.rej -I $Id.*$ -I $FreeBSD.*$ isc-dhcp3.old/Makefile isc-dhcp3/Makefile --- isc-dhcp3.old/Makefile Thu Mar 1 23:15:00 2001 +++ isc-dhcp3/Makefile Fri Mar 2 05:14:48 2001 @@ -7,7 +7,7 @@ # PORTNAME= isc-dhcp3 -PORTVERSION= 3.0.b2.16 +PORTVERSION= 3.0.b2.18 CATEGORIES= net MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/ DISTNAME= ${PORTNAME:S/isc-//:S/3/-/}${PORTVERSION:S/.b/b/:R}pl${PORTVERSION:E} @@ -30,7 +30,7 @@ # Local variables # -PATCH_SUBDIRS= client common dhcpctl minires omapip relay server +PATCH_SUBDIRS= client common dhcpctl dst minires omapip relay server BIN_FILES= dhclient dhcpd dhcrelay SAMP_FILES= client/dhclient.conf server/dhcpd.conf diff -ruN -x CVS -x work -x *~ -x *.orig -x *.rej -I $Id.*$ -I $FreeBSD.*$ isc-dhcp3.old/distinfo isc-dhcp3/distinfo --- isc-dhcp3.old/distinfo Mon Feb 19 06:23:13 2001 +++ isc-dhcp3/distinfo Fri Mar 2 05:14:48 2001 @@ -1 +1 @@ -MD5 (dhcp-3.0b2pl16.tar.gz) = 88fb65480a1b66c8d011957ea6c2e138 +MD5 (dhcp-3.0b2pl18.tar.gz) = 807485e8f6f6ad9028201b9f22354b3e diff -ruN -x CVS -x work -x *~ -x *.orig -x *.rej -I $Id.*$ -I $FreeBSD.*$ isc-dhcp3.old/files/isc-dhcpd.sh.sample isc-dhcp3/files/isc-dhcpd.sh.sample --- isc-dhcp3.old/files/isc-dhcpd.sh.sample Mon Feb 19 06:23:14 2001 +++ isc-dhcp3/files/isc-dhcpd.sh.sample Fri Mar 2 05:20:00 2001 @@ -3,7 +3,7 @@ # $FreeBSD: ports/net/isc-dhcp3/files/isc-dhcpd.sh.sample,v 1.2 2001/02/17 14:17:30 roam Exp $ OPTIONS="" -IFACES="SET_THIS" +IFACES="" if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then echo "$0: Cannot determine the PREFIX" >&2 @@ -12,7 +12,8 @@ case "$1" in start) - ${PREFIX}/sbin/dhcpd $OPTIONS $IFACES + ${PREFIX}/sbin/dhcpd $OPTIONS $IFACES > /dev/null 2>&1 + echo -n ' dhcpd' ;; stop) killall dhcpd diff -ruN -x CVS -x work -x *~ -x *.orig -x *.rej -I $Id.*$ -I $FreeBSD.*$ isc-dhcp3.old/files/patch-dhclient.c isc-dhcp3/files/patch-dhclient.c --- isc-dhcp3.old/files/patch-dhclient.c Mon Feb 19 06:23:14 2001 +++ isc-dhcp3/files/patch-dhclient.c Fri Mar 2 05:52:47 2001 @@ -1,14 +1,14 @@ ---- client/dhclient.c.orig Thu Jan 25 09:18:06 2001 -+++ client/dhclient.c Fri Jan 26 06:15:50 2001 +--- client/dhclient.c.orig Thu Feb 15 23:17:05 2001 ++++ client/dhclient.c Fri Mar 2 05:51:43 2001 @@ -78,6 +78,7 @@ u_int16_t remote_port; int no_daemon; int save_scripts; +int onetry; + struct string_list *client_env; + int client_env_count; - static void usage PROTO ((void)); - -@@ -104,6 +105,7 @@ +@@ -106,6 +107,7 @@ int no_dhclient_conf = 0; int no_dhclient_db = 0; int no_dhclient_pid = 0; @@ -16,7 +16,7 @@ char *s; #ifdef SYSLOG_4_2 -@@ -159,6 +161,11 @@ +@@ -161,6 +163,13 @@ usage (); path_dhclient_db = argv [i]; no_dhclient_db = 1; @@ -25,19 +25,12 @@ + usage (); + client_script_name = argv [i]; + no_dhclient_script = 1; ++ } else if (!strcmp (argv [i], "-1")) { ++ onetry = 1; } else if (!strcmp (argv [i], "-q")) { quiet = 1; quiet_interface_discovery = 1; -@@ -176,6 +183,8 @@ - } else if (!strcmp (argv [i], "-w")) { - /* do not exit if there are no broadcast interfaces. */ - persist = 1; -+ } else if (!strcmp (argv [i], "-1")) { -+ onetry = 1; - } else if (argv [i][0] == '-') { - usage (); - } else { -@@ -208,6 +217,9 @@ +@@ -224,6 +233,9 @@ if (!no_dhclient_pid && (s = getenv ("PATH_DHCLIENT_PID"))) { path_dhclient_pid = s; } @@ -47,22 +40,23 @@ /* first kill of any currently running client */ if (release_mode) { -@@ -423,10 +435,11 @@ +@@ -445,10 +457,12 @@ log_info (arr); log_info (url); - log_error ("Usage: dhclient [-d] [-D] [-q] [-p <port>] %s", -+ log_error ("usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s", ++ log_error ("Usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s", "[-s server]"); - log_fatal (" [-lf lease-file] [-pf pid-file]%s", -- "[-cf config-file] [interface]"); +- "[-cf config-file] [interface] [-e VAR=val]"); + log_error (" [-cf config-file] [-lf lease-file] %s", -+ "[-pf pid-file] [-sf script-file]"); -+ log_fatal (" [interface]"); ++ "[-pf pid-file]"); ++ log_fatal (" [-sf script-file] [interface] %s", ++ "[-e VAR=val]"); } isc_result_t find_class (struct class **c, -@@ -1432,6 +1445,10 @@ +@@ -1453,6 +1467,10 @@ /* 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. */ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200103022344.f22Niwf86073>