3 files changed, 23 insertions, 17 deletions

diff --git a/net/isc-dhcp30-server/files/patch-dhclient.8 b/net/isc-dhcp30-server/files/patch-dhclient.8
index 2ba9899869c3..d92e06169d76 100644
--- a/net/isc-dhcp30-server/files/patch-dhclient.8
+++ b/net/isc-dhcp30-server/files/patch-dhclient.8
@@ -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
diff --git a/net/isc-dhcp30-server/files/patch-dhclient.c b/net/isc-dhcp30-server/files/patch-dhclient.c
index 5828f2d2c088..b1f5599304aa 100644
--- a/net/isc-dhcp30-server/files/patch-dhclient.c
+++ b/net/isc-dhcp30-server/files/patch-dhclient.c
@@ -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]");
diff --git a/net/isc-dhcp30-server/files/patch-freebsd b/net/isc-dhcp30-server/files/patch-freebsd
index 2376cbb7ec40..e4da6d9797d8 100644
--- a/net/isc-dhcp30-server/files/patch-freebsd
+++ b/net/isc-dhcp30-server/files/patch-freebsd
@@ -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"