Date: Thu, 22 Mar 2001 04:08:13 +0100 (CET) From: Cyrille Lefevre <clefevre@poboxes.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/25977: Updated port: net/isc-dhcp3 (beta 2 patch level 22) Message-ID: <200103220308.f2M38De12941@gits.dyndns.org>
next in thread | raw e-mail | index | archive | help
>Number: 25977 >Category: ports >Synopsis: Updated port: net/isc-dhcp3 (beta 2 patch level 22) >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Mar 21 19:10:00 PST 2001 >Closed-Date: >Last-Modified: >Originator: Cyrille Lefevre >Release: FreeBSD 4.3-BETA i386 >Organization: ACME >Environment: System: FreeBSD gits 4.3-BETA FreeBSD 4.3-BETA #18: Sat Mar 17 02:17:40 CET 2001 root@:/disk2/4.x-stable/src/sys/compile/CUSTOM i386 >Description: regarding the ports survey, the dhcp-3.0b2pl18 archive file isn't online anymore. see the following url for more informations. http://people.freebsd.org/~fenner/portsurvey/net.html#isc-dhcp3 this PR updates ISC dhcp to the latest version, which is 3.0b2pl22. Makefile version bumped. DEBUG has moved from */Makefile.dist to Makefile.conf. DEBUG is unset by default. distinfo updated. files/patch-dhclient.c added missing -r option in the usage string. files/patch-dhclient.8 files/patch-freebsd update needed to apply cleanly. >How-To-Repeat: cd /usr/ports/net/isc-dhcp3 make fetch kaboum! >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/isc-dhcp3/Makefile,v retrieving revision 1.54 diff -u -r1.54 Makefile --- Makefile 2001/03/15 14:29:14 1.54 +++ Makefile 2001/03/22 02:00:02 @@ -7,7 +7,7 @@ # PORTNAME= dhcp -PORTVERSION= 3.0.b2.18 +PORTVERSION= 3.0.b2.22 CATEGORIES= net MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/ PKGNAMEPREFIX= isc- @@ -32,7 +32,7 @@ # Local variables # -PATCH_SUBDIRS= client common dhcpctl dst minires omapip relay server +PATCH_SUBDIRS= common minires dst omapip server client relay dhcpctl BIN_FILES= dhclient dhcpd dhcrelay SAMP_FILES= client/dhclient.conf server/dhcpd.conf @@ -53,16 +53,19 @@ # Post-patch # -post-patch: patch-scripts patch-makefiles +post-patch: patch-scripts patch-makefile-conf patch-makefiles-dist patch-scripts: @${PERL} -pi.fbsd -e 's.!!PREFIX!!.${PREFIX}.g' \ ${WRKSRC}/client/scripts/freebsd -patch-makefiles: +patch-makefile-conf: + @${PERL} -pi.fbsd -e 's|^DEBUG[ ]*=|# DEBUG ?=|g' \ + ${WRKSRC}/Makefile.conf + +patch-makefiles-dist: .for subdir in ${PATCH_SUBDIRS} - @${PERL} -pi.fbsd -e \ - 's|^DEBUG[ ]*=|DEBUG ?=|g;s|^CFLAGS[ ]*=|CFLAGS +=|g' \ + @${PERL} -pi.fbsd -e 's|^CFLAGS[ ]*=|CFLAGS +=|g' \ ${WRKSRC}/${subdir}/Makefile.dist .endfor Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net/isc-dhcp3/distinfo,v retrieving revision 1.22 diff -u -r1.22 distinfo --- distinfo 2001/03/08 20:06:36 1.22 +++ distinfo 2001/03/22 01:07:35 @@ -1 +1 @@ -MD5 (dhcp-3.0b2pl18.tar.gz) = 807485e8f6f6ad9028201b9f22354b3e +MD5 (dhcp-3.0b2pl22.tar.gz) = 9a0155b192a82bd44b38fa6ceae7976e Index: files/patch-dhclient.8 =================================================================== RCS file: /home/ncvs/ports/net/isc-dhcp3/files/patch-dhclient.8,v retrieving revision 1.2 diff -u -r1.2 patch-dhclient.8 --- files/patch-dhclient.8 2001/02/17 14:17:30 1.2 +++ files/patch-dhclient.8 2001/03/22 03:05:02 @@ -1,15 +1,21 @@ ---- client/dhclient.8.orig Mon May 1 19:11:36 2000 -+++ client/dhclient.8 Fri Jan 26 05:12:37 2001 -@@ -34,7 +34,7 @@ +--- client/dhclient.8.orig Thu Mar 1 23:11:12 2001 ++++ client/dhclient.8 Thu Mar 22 04:04:29 2001 +@@ -34,12 +34,12 @@ .B -q ] [ -.B -c +.B -1 ] ++[ + .B -r + ] [ +-[ .B -lf -@@ -49,6 +49,10 @@ + .I lease-file + ] +@@ -52,6 +52,10 @@ .I config-file ] [ @@ -20,9 +26,9 @@ .B -s server ] -@@ -174,17 +178,25 @@ - flag prevents any messages other than errors from being printed to the - standard error descriptor. +@@ -184,17 +188,25 @@ + .B -r + flag explicitly releases the current lease. .PP +The +.B -1 @@ -50,7 +56,7 @@ flags, respectively, followed by the name of the file. This can be particularly useful if, for example, .B DBDIR -@@ -206,10 +218,12 @@ +@@ -216,10 +228,12 @@ .SH CONFIGURATION The syntax of the dhclient.conf(8) file is discussed seperately. .SH FILES Index: files/patch-dhclient.c =================================================================== RCS file: /home/ncvs/ports/net/isc-dhcp3/files/patch-dhclient.c,v retrieving revision 1.5 diff -u -r1.5 patch-dhclient.c --- files/patch-dhclient.c 2001/03/08 20:06:36 1.5 +++ files/patch-dhclient.c 2001/03/22 02:47:17 @@ -1,5 +1,5 @@ ---- client/dhclient.c.orig Thu Feb 15 23:17:05 2001 -+++ client/dhclient.c Fri Mar 2 05:51:43 2001 +--- client/dhclient.c.orig Fri Mar 16 00:12:03 2001 ++++ client/dhclient.c Thu Mar 22 02:49:59 2001 @@ -78,6 +78,7 @@ u_int16_t remote_port; int no_daemon; @@ -45,7 +45,7 @@ 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 [-1dDqr] [-p <port>] %s", "[-s server]"); - log_fatal (" [-lf lease-file] [-pf pid-file]%s", - "[-cf config-file] [interface] [-e VAR=val]"); Index: files/patch-freebsd =================================================================== RCS file: /home/ncvs/ports/net/isc-dhcp3/files/patch-freebsd,v retrieving revision 1.3 diff -u -r1.3 patch-freebsd --- files/patch-freebsd 2001/02/17 14:17:30 1.3 +++ files/patch-freebsd 2001/03/22 01:48:32 @@ -1,5 +1,5 @@ ---- client/scripts/freebsd.orig Wed Sep 20 11:38:03 2000 -+++ client/scripts/freebsd Sat Jan 27 02:17:01 2001 +--- client/scripts/freebsd.orig Fri Mar 16 00:16:49 2001 ++++ client/scripts/freebsd Thu Mar 22 02:42:13 2001 @@ -1,5 +1,11 @@ #!/bin/sh @@ -71,8 +71,8 @@ fi if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \ [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then - ifconfig $interface inet $new_ip_address $new_netmask_arg \ - $new_broadcast_arg $medium + eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \ + $new_broadcast_arg $medium" + $LOGGER "New IP Address($interface): $new_ip_address" + $LOGGER "New Subnet Mask($interface): $new_subnet_mask" + $LOGGER "New Broadcast Address($interface): $new_broadcast_address" @@ -108,8 +108,8 @@ if [ x$alias_ip_address != x ]; then @@ -161,9 +174,13 @@ fi - ifconfig $interface inet $new_ip_address $new_netmask_arg \ - $new_broadcast_arg $medium + eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \ + $new_broadcast_arg $medium" + $LOGGER "New IP Address($interface): $new_ip_address" + $LOGGER "New Subnet Mask($interface): $new_subnet_mask" + $LOGGER "New Broadcast Address($interface): $new_broadcast_address" >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?200103220308.f2M38De12941>