summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/isc-dhcp3-server/Makefile4
-rw-r--r--net/isc-dhcp3-server/distinfo2
-rw-r--r--net/isc-dhcp3-server/files/patch-dhclient.c39
-rw-r--r--net/isc-dhcp3-server/files/patch-freebsd14
-rw-r--r--net/isc-dhcp3/Makefile4
-rw-r--r--net/isc-dhcp3/distinfo2
-rw-r--r--net/isc-dhcp3/files/patch-dhclient.c39
-rw-r--r--net/isc-dhcp3/files/patch-freebsd14
-rw-r--r--net/isc-dhcp30-server/Makefile4
-rw-r--r--net/isc-dhcp30-server/distinfo2
-rw-r--r--net/isc-dhcp30-server/files/patch-dhclient.c39
-rw-r--r--net/isc-dhcp30-server/files/patch-freebsd14
-rw-r--r--net/isc-dhcp31-server/Makefile4
-rw-r--r--net/isc-dhcp31-server/distinfo2
-rw-r--r--net/isc-dhcp31-server/files/patch-dhclient.c39
-rw-r--r--net/isc-dhcp31-server/files/patch-freebsd14
-rw-r--r--net/isc-dhcp40-server/Makefile4
-rw-r--r--net/isc-dhcp40-server/distinfo2
-rw-r--r--net/isc-dhcp40-server/files/patch-dhclient.c39
-rw-r--r--net/isc-dhcp40-server/files/patch-freebsd14
20 files changed, 125 insertions, 170 deletions
diff --git a/net/isc-dhcp3-server/Makefile b/net/isc-dhcp3-server/Makefile
index a18d5a6c56db..bbe831a5ca3d 100644
--- a/net/isc-dhcp3-server/Makefile
+++ b/net/isc-dhcp3-server/Makefile
@@ -7,10 +7,10 @@
#
PORTNAME= isc-dhcp3
-PORTVERSION= 3.0.b1.17
+PORTVERSION= 3.0.b2.5
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
-DISTNAME= dhcp-3.0b1pl17
+DISTNAME= dhcp-3.0b2pl5
MAINTAINER= obrien@FreeBSD.org
diff --git a/net/isc-dhcp3-server/distinfo b/net/isc-dhcp3-server/distinfo
index f0e647982b35..8aa9c6fcbc34 100644
--- a/net/isc-dhcp3-server/distinfo
+++ b/net/isc-dhcp3-server/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0b1pl17.tar.gz) = 9e5202eefc133bd30a46882239123be4
+MD5 (dhcp-3.0b2pl5.tar.gz) = 0d50d90279906dd0bd9cd971eb6c38bc
diff --git a/net/isc-dhcp3-server/files/patch-dhclient.c b/net/isc-dhcp3-server/files/patch-dhclient.c
index c9f593dfa42f..bb43074fbd36 100644
--- a/net/isc-dhcp3-server/files/patch-dhclient.c
+++ b/net/isc-dhcp3-server/files/patch-dhclient.c
@@ -1,32 +1,32 @@
---- client/dhclient.c.orig Wed Jul 19 23:13:11 2000
-+++ client/dhclient.c Sun Aug 6 20:43:14 2000
-@@ -64,6 +64,7 @@
- int log_priority;
+--- client/dhclient.c.orig Thu Sep 14 05:42:01 2000
++++ client/dhclient.c Wed Sep 27 03:31:33 2000
+@@ -78,6 +78,7 @@
+ u_int16_t remote_port;
int no_daemon;
int save_scripts;
+int onetry;
static void usage PROTO ((void));
-@@ -120,6 +121,8 @@
- if (++i == argc)
- usage ();
- server = argv [i];
+@@ -176,6 +177,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 {
-@@ -273,7 +276,7 @@
+@@ -417,7 +420,7 @@
+ log_info (arr);
+ log_info (url);
- static void usage ()
- {
- log_error ("Usage: dhclient [-d] [-D] [-q] [-p <port>] %s",
-+ log_error ("Usage: dhclient [-d] [-D] [-q] [-1] [-p <port>] %s",
++ log_error ("Usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s",
"[-s server]");
- log_error (" [-lf lease-file] [-pf pid-file]%s",
+ log_fatal (" [-lf lease-file] [-pf pid-file]%s",
"[-cf config-file] [interface]");
-@@ -1239,6 +1242,10 @@
+@@ -1402,6 +1405,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. */
@@ -34,15 +34,6 @@
+ exit(2);
+ log_info ("Unable to obtain a lease on first try - exiting.\n");
+ }
- log_info ("No working leases in persistent database - sleeping.\n");
+ log_info ("No working leases in persistent database - sleeping.");
script_init (client, "FAIL", (struct string_list *)0);
if (client -> alias)
-@@ -2157,7 +2164,7 @@
-
- int dhcp_option_ev_name (buf, buflen, option)
- char *buf;
-- unsigned buflen;
-+ size_t buflen;
- struct option *option;
- {
- int i;
diff --git a/net/isc-dhcp3-server/files/patch-freebsd b/net/isc-dhcp3-server/files/patch-freebsd
index 8f063987b726..293aa2a33130 100644
--- a/net/isc-dhcp3-server/files/patch-freebsd
+++ b/net/isc-dhcp3-server/files/patch-freebsd
@@ -1,5 +1,5 @@
---- client/scripts/freebsd.orig Wed May 10 01:51:09 2000
-+++ client/scripts/freebsd Wed May 10 02:01:48 2000
+--- client/scripts/freebsd.orig Wed Sep 20 02:38:03 2000
++++ client/scripts/freebsd Wed Sep 27 03:33:29 2000
@@ -1,5 +1,11 @@
#!/bin/sh
@@ -47,15 +47,15 @@
new_broadcast_arg="broadcast $new_broadcast_address"
fi
if [ x$old_broadcast_address != x ]; then
-@@ -76,6 +81,7 @@
- if [ x$current_hostname = x ] || \
+@@ -77,6 +82,7 @@
[ x$current_hostname = x$old_host_name ]; then
- if [ x$new_host_name != x$old_host_name ]; then
+ if [ x$current_hostname = x ] || \
+ [ x$new_host_name != x$old_host_name ]; then
+ $LOGGER "New Hostname: $new_host_name"
hostname $new_host_name
fi
fi
-@@ -103,11 +109,18 @@
+@@ -105,11 +111,18 @@
[ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
ifconfig $interface inet $new_ip_address $new_netmask_arg \
$new_broadcast_arg $medium
@@ -74,7 +74,7 @@
set $new_static_routes
while [ $# -gt 1 ]; do
route add $1 $2
-@@ -162,8 +175,12 @@
+@@ -161,8 +174,12 @@
fi
ifconfig $interface inet $new_ip_address $new_netmask_arg \
$new_broadcast_arg $medium
diff --git a/net/isc-dhcp3/Makefile b/net/isc-dhcp3/Makefile
index a18d5a6c56db..bbe831a5ca3d 100644
--- a/net/isc-dhcp3/Makefile
+++ b/net/isc-dhcp3/Makefile
@@ -7,10 +7,10 @@
#
PORTNAME= isc-dhcp3
-PORTVERSION= 3.0.b1.17
+PORTVERSION= 3.0.b2.5
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
-DISTNAME= dhcp-3.0b1pl17
+DISTNAME= dhcp-3.0b2pl5
MAINTAINER= obrien@FreeBSD.org
diff --git a/net/isc-dhcp3/distinfo b/net/isc-dhcp3/distinfo
index f0e647982b35..8aa9c6fcbc34 100644
--- a/net/isc-dhcp3/distinfo
+++ b/net/isc-dhcp3/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0b1pl17.tar.gz) = 9e5202eefc133bd30a46882239123be4
+MD5 (dhcp-3.0b2pl5.tar.gz) = 0d50d90279906dd0bd9cd971eb6c38bc
diff --git a/net/isc-dhcp3/files/patch-dhclient.c b/net/isc-dhcp3/files/patch-dhclient.c
index c9f593dfa42f..bb43074fbd36 100644
--- a/net/isc-dhcp3/files/patch-dhclient.c
+++ b/net/isc-dhcp3/files/patch-dhclient.c
@@ -1,32 +1,32 @@
---- client/dhclient.c.orig Wed Jul 19 23:13:11 2000
-+++ client/dhclient.c Sun Aug 6 20:43:14 2000
-@@ -64,6 +64,7 @@
- int log_priority;
+--- client/dhclient.c.orig Thu Sep 14 05:42:01 2000
++++ client/dhclient.c Wed Sep 27 03:31:33 2000
+@@ -78,6 +78,7 @@
+ u_int16_t remote_port;
int no_daemon;
int save_scripts;
+int onetry;
static void usage PROTO ((void));
-@@ -120,6 +121,8 @@
- if (++i == argc)
- usage ();
- server = argv [i];
+@@ -176,6 +177,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 {
-@@ -273,7 +276,7 @@
+@@ -417,7 +420,7 @@
+ log_info (arr);
+ log_info (url);
- static void usage ()
- {
- log_error ("Usage: dhclient [-d] [-D] [-q] [-p <port>] %s",
-+ log_error ("Usage: dhclient [-d] [-D] [-q] [-1] [-p <port>] %s",
++ log_error ("Usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s",
"[-s server]");
- log_error (" [-lf lease-file] [-pf pid-file]%s",
+ log_fatal (" [-lf lease-file] [-pf pid-file]%s",
"[-cf config-file] [interface]");
-@@ -1239,6 +1242,10 @@
+@@ -1402,6 +1405,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. */
@@ -34,15 +34,6 @@
+ exit(2);
+ log_info ("Unable to obtain a lease on first try - exiting.\n");
+ }
- log_info ("No working leases in persistent database - sleeping.\n");
+ log_info ("No working leases in persistent database - sleeping.");
script_init (client, "FAIL", (struct string_list *)0);
if (client -> alias)
-@@ -2157,7 +2164,7 @@
-
- int dhcp_option_ev_name (buf, buflen, option)
- char *buf;
-- unsigned buflen;
-+ size_t buflen;
- struct option *option;
- {
- int i;
diff --git a/net/isc-dhcp3/files/patch-freebsd b/net/isc-dhcp3/files/patch-freebsd
index 8f063987b726..293aa2a33130 100644
--- a/net/isc-dhcp3/files/patch-freebsd
+++ b/net/isc-dhcp3/files/patch-freebsd
@@ -1,5 +1,5 @@
---- client/scripts/freebsd.orig Wed May 10 01:51:09 2000
-+++ client/scripts/freebsd Wed May 10 02:01:48 2000
+--- client/scripts/freebsd.orig Wed Sep 20 02:38:03 2000
++++ client/scripts/freebsd Wed Sep 27 03:33:29 2000
@@ -1,5 +1,11 @@
#!/bin/sh
@@ -47,15 +47,15 @@
new_broadcast_arg="broadcast $new_broadcast_address"
fi
if [ x$old_broadcast_address != x ]; then
-@@ -76,6 +81,7 @@
- if [ x$current_hostname = x ] || \
+@@ -77,6 +82,7 @@
[ x$current_hostname = x$old_host_name ]; then
- if [ x$new_host_name != x$old_host_name ]; then
+ if [ x$current_hostname = x ] || \
+ [ x$new_host_name != x$old_host_name ]; then
+ $LOGGER "New Hostname: $new_host_name"
hostname $new_host_name
fi
fi
-@@ -103,11 +109,18 @@
+@@ -105,11 +111,18 @@
[ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
ifconfig $interface inet $new_ip_address $new_netmask_arg \
$new_broadcast_arg $medium
@@ -74,7 +74,7 @@
set $new_static_routes
while [ $# -gt 1 ]; do
route add $1 $2
-@@ -162,8 +175,12 @@
+@@ -161,8 +174,12 @@
fi
ifconfig $interface inet $new_ip_address $new_netmask_arg \
$new_broadcast_arg $medium
diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile
index a18d5a6c56db..bbe831a5ca3d 100644
--- a/net/isc-dhcp30-server/Makefile
+++ b/net/isc-dhcp30-server/Makefile
@@ -7,10 +7,10 @@
#
PORTNAME= isc-dhcp3
-PORTVERSION= 3.0.b1.17
+PORTVERSION= 3.0.b2.5
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
-DISTNAME= dhcp-3.0b1pl17
+DISTNAME= dhcp-3.0b2pl5
MAINTAINER= obrien@FreeBSD.org
diff --git a/net/isc-dhcp30-server/distinfo b/net/isc-dhcp30-server/distinfo
index f0e647982b35..8aa9c6fcbc34 100644
--- a/net/isc-dhcp30-server/distinfo
+++ b/net/isc-dhcp30-server/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0b1pl17.tar.gz) = 9e5202eefc133bd30a46882239123be4
+MD5 (dhcp-3.0b2pl5.tar.gz) = 0d50d90279906dd0bd9cd971eb6c38bc
diff --git a/net/isc-dhcp30-server/files/patch-dhclient.c b/net/isc-dhcp30-server/files/patch-dhclient.c
index c9f593dfa42f..bb43074fbd36 100644
--- a/net/isc-dhcp30-server/files/patch-dhclient.c
+++ b/net/isc-dhcp30-server/files/patch-dhclient.c
@@ -1,32 +1,32 @@
---- client/dhclient.c.orig Wed Jul 19 23:13:11 2000
-+++ client/dhclient.c Sun Aug 6 20:43:14 2000
-@@ -64,6 +64,7 @@
- int log_priority;
+--- client/dhclient.c.orig Thu Sep 14 05:42:01 2000
++++ client/dhclient.c Wed Sep 27 03:31:33 2000
+@@ -78,6 +78,7 @@
+ u_int16_t remote_port;
int no_daemon;
int save_scripts;
+int onetry;
static void usage PROTO ((void));
-@@ -120,6 +121,8 @@
- if (++i == argc)
- usage ();
- server = argv [i];
+@@ -176,6 +177,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 {
-@@ -273,7 +276,7 @@
+@@ -417,7 +420,7 @@
+ log_info (arr);
+ log_info (url);
- static void usage ()
- {
- log_error ("Usage: dhclient [-d] [-D] [-q] [-p <port>] %s",
-+ log_error ("Usage: dhclient [-d] [-D] [-q] [-1] [-p <port>] %s",
++ log_error ("Usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s",
"[-s server]");
- log_error (" [-lf lease-file] [-pf pid-file]%s",
+ log_fatal (" [-lf lease-file] [-pf pid-file]%s",
"[-cf config-file] [interface]");
-@@ -1239,6 +1242,10 @@
+@@ -1402,6 +1405,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. */
@@ -34,15 +34,6 @@
+ exit(2);
+ log_info ("Unable to obtain a lease on first try - exiting.\n");
+ }
- log_info ("No working leases in persistent database - sleeping.\n");
+ log_info ("No working leases in persistent database - sleeping.");
script_init (client, "FAIL", (struct string_list *)0);
if (client -> alias)
-@@ -2157,7 +2164,7 @@
-
- int dhcp_option_ev_name (buf, buflen, option)
- char *buf;
-- unsigned buflen;
-+ size_t buflen;
- struct option *option;
- {
- int i;
diff --git a/net/isc-dhcp30-server/files/patch-freebsd b/net/isc-dhcp30-server/files/patch-freebsd
index 8f063987b726..293aa2a33130 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 May 10 01:51:09 2000
-+++ client/scripts/freebsd Wed May 10 02:01:48 2000
+--- client/scripts/freebsd.orig Wed Sep 20 02:38:03 2000
++++ client/scripts/freebsd Wed Sep 27 03:33:29 2000
@@ -1,5 +1,11 @@
#!/bin/sh
@@ -47,15 +47,15 @@
new_broadcast_arg="broadcast $new_broadcast_address"
fi
if [ x$old_broadcast_address != x ]; then
-@@ -76,6 +81,7 @@
- if [ x$current_hostname = x ] || \
+@@ -77,6 +82,7 @@
[ x$current_hostname = x$old_host_name ]; then
- if [ x$new_host_name != x$old_host_name ]; then
+ if [ x$current_hostname = x ] || \
+ [ x$new_host_name != x$old_host_name ]; then
+ $LOGGER "New Hostname: $new_host_name"
hostname $new_host_name
fi
fi
-@@ -103,11 +109,18 @@
+@@ -105,11 +111,18 @@
[ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
ifconfig $interface inet $new_ip_address $new_netmask_arg \
$new_broadcast_arg $medium
@@ -74,7 +74,7 @@
set $new_static_routes
while [ $# -gt 1 ]; do
route add $1 $2
-@@ -162,8 +175,12 @@
+@@ -161,8 +174,12 @@
fi
ifconfig $interface inet $new_ip_address $new_netmask_arg \
$new_broadcast_arg $medium
diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
index a18d5a6c56db..bbe831a5ca3d 100644
--- a/net/isc-dhcp31-server/Makefile
+++ b/net/isc-dhcp31-server/Makefile
@@ -7,10 +7,10 @@
#
PORTNAME= isc-dhcp3
-PORTVERSION= 3.0.b1.17
+PORTVERSION= 3.0.b2.5
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
-DISTNAME= dhcp-3.0b1pl17
+DISTNAME= dhcp-3.0b2pl5
MAINTAINER= obrien@FreeBSD.org
diff --git a/net/isc-dhcp31-server/distinfo b/net/isc-dhcp31-server/distinfo
index f0e647982b35..8aa9c6fcbc34 100644
--- a/net/isc-dhcp31-server/distinfo
+++ b/net/isc-dhcp31-server/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0b1pl17.tar.gz) = 9e5202eefc133bd30a46882239123be4
+MD5 (dhcp-3.0b2pl5.tar.gz) = 0d50d90279906dd0bd9cd971eb6c38bc
diff --git a/net/isc-dhcp31-server/files/patch-dhclient.c b/net/isc-dhcp31-server/files/patch-dhclient.c
index c9f593dfa42f..bb43074fbd36 100644
--- a/net/isc-dhcp31-server/files/patch-dhclient.c
+++ b/net/isc-dhcp31-server/files/patch-dhclient.c
@@ -1,32 +1,32 @@
---- client/dhclient.c.orig Wed Jul 19 23:13:11 2000
-+++ client/dhclient.c Sun Aug 6 20:43:14 2000
-@@ -64,6 +64,7 @@
- int log_priority;
+--- client/dhclient.c.orig Thu Sep 14 05:42:01 2000
++++ client/dhclient.c Wed Sep 27 03:31:33 2000
+@@ -78,6 +78,7 @@
+ u_int16_t remote_port;
int no_daemon;
int save_scripts;
+int onetry;
static void usage PROTO ((void));
-@@ -120,6 +121,8 @@
- if (++i == argc)
- usage ();
- server = argv [i];
+@@ -176,6 +177,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 {
-@@ -273,7 +276,7 @@
+@@ -417,7 +420,7 @@
+ log_info (arr);
+ log_info (url);
- static void usage ()
- {
- log_error ("Usage: dhclient [-d] [-D] [-q] [-p <port>] %s",
-+ log_error ("Usage: dhclient [-d] [-D] [-q] [-1] [-p <port>] %s",
++ log_error ("Usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s",
"[-s server]");
- log_error (" [-lf lease-file] [-pf pid-file]%s",
+ log_fatal (" [-lf lease-file] [-pf pid-file]%s",
"[-cf config-file] [interface]");
-@@ -1239,6 +1242,10 @@
+@@ -1402,6 +1405,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. */
@@ -34,15 +34,6 @@
+ exit(2);
+ log_info ("Unable to obtain a lease on first try - exiting.\n");
+ }
- log_info ("No working leases in persistent database - sleeping.\n");
+ log_info ("No working leases in persistent database - sleeping.");
script_init (client, "FAIL", (struct string_list *)0);
if (client -> alias)
-@@ -2157,7 +2164,7 @@
-
- int dhcp_option_ev_name (buf, buflen, option)
- char *buf;
-- unsigned buflen;
-+ size_t buflen;
- struct option *option;
- {
- int i;
diff --git a/net/isc-dhcp31-server/files/patch-freebsd b/net/isc-dhcp31-server/files/patch-freebsd
index 8f063987b726..293aa2a33130 100644
--- a/net/isc-dhcp31-server/files/patch-freebsd
+++ b/net/isc-dhcp31-server/files/patch-freebsd
@@ -1,5 +1,5 @@
---- client/scripts/freebsd.orig Wed May 10 01:51:09 2000
-+++ client/scripts/freebsd Wed May 10 02:01:48 2000
+--- client/scripts/freebsd.orig Wed Sep 20 02:38:03 2000
++++ client/scripts/freebsd Wed Sep 27 03:33:29 2000
@@ -1,5 +1,11 @@
#!/bin/sh
@@ -47,15 +47,15 @@
new_broadcast_arg="broadcast $new_broadcast_address"
fi
if [ x$old_broadcast_address != x ]; then
-@@ -76,6 +81,7 @@
- if [ x$current_hostname = x ] || \
+@@ -77,6 +82,7 @@
[ x$current_hostname = x$old_host_name ]; then
- if [ x$new_host_name != x$old_host_name ]; then
+ if [ x$current_hostname = x ] || \
+ [ x$new_host_name != x$old_host_name ]; then
+ $LOGGER "New Hostname: $new_host_name"
hostname $new_host_name
fi
fi
-@@ -103,11 +109,18 @@
+@@ -105,11 +111,18 @@
[ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
ifconfig $interface inet $new_ip_address $new_netmask_arg \
$new_broadcast_arg $medium
@@ -74,7 +74,7 @@
set $new_static_routes
while [ $# -gt 1 ]; do
route add $1 $2
-@@ -162,8 +175,12 @@
+@@ -161,8 +174,12 @@
fi
ifconfig $interface inet $new_ip_address $new_netmask_arg \
$new_broadcast_arg $medium
diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile
index a18d5a6c56db..bbe831a5ca3d 100644
--- a/net/isc-dhcp40-server/Makefile
+++ b/net/isc-dhcp40-server/Makefile
@@ -7,10 +7,10 @@
#
PORTNAME= isc-dhcp3
-PORTVERSION= 3.0.b1.17
+PORTVERSION= 3.0.b2.5
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
-DISTNAME= dhcp-3.0b1pl17
+DISTNAME= dhcp-3.0b2pl5
MAINTAINER= obrien@FreeBSD.org
diff --git a/net/isc-dhcp40-server/distinfo b/net/isc-dhcp40-server/distinfo
index f0e647982b35..8aa9c6fcbc34 100644
--- a/net/isc-dhcp40-server/distinfo
+++ b/net/isc-dhcp40-server/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0b1pl17.tar.gz) = 9e5202eefc133bd30a46882239123be4
+MD5 (dhcp-3.0b2pl5.tar.gz) = 0d50d90279906dd0bd9cd971eb6c38bc
diff --git a/net/isc-dhcp40-server/files/patch-dhclient.c b/net/isc-dhcp40-server/files/patch-dhclient.c
index c9f593dfa42f..bb43074fbd36 100644
--- a/net/isc-dhcp40-server/files/patch-dhclient.c
+++ b/net/isc-dhcp40-server/files/patch-dhclient.c
@@ -1,32 +1,32 @@
---- client/dhclient.c.orig Wed Jul 19 23:13:11 2000
-+++ client/dhclient.c Sun Aug 6 20:43:14 2000
-@@ -64,6 +64,7 @@
- int log_priority;
+--- client/dhclient.c.orig Thu Sep 14 05:42:01 2000
++++ client/dhclient.c Wed Sep 27 03:31:33 2000
+@@ -78,6 +78,7 @@
+ u_int16_t remote_port;
int no_daemon;
int save_scripts;
+int onetry;
static void usage PROTO ((void));
-@@ -120,6 +121,8 @@
- if (++i == argc)
- usage ();
- server = argv [i];
+@@ -176,6 +177,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 {
-@@ -273,7 +276,7 @@
+@@ -417,7 +420,7 @@
+ log_info (arr);
+ log_info (url);
- static void usage ()
- {
- log_error ("Usage: dhclient [-d] [-D] [-q] [-p <port>] %s",
-+ log_error ("Usage: dhclient [-d] [-D] [-q] [-1] [-p <port>] %s",
++ log_error ("Usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s",
"[-s server]");
- log_error (" [-lf lease-file] [-pf pid-file]%s",
+ log_fatal (" [-lf lease-file] [-pf pid-file]%s",
"[-cf config-file] [interface]");
-@@ -1239,6 +1242,10 @@
+@@ -1402,6 +1405,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. */
@@ -34,15 +34,6 @@
+ exit(2);
+ log_info ("Unable to obtain a lease on first try - exiting.\n");
+ }
- log_info ("No working leases in persistent database - sleeping.\n");
+ log_info ("No working leases in persistent database - sleeping.");
script_init (client, "FAIL", (struct string_list *)0);
if (client -> alias)
-@@ -2157,7 +2164,7 @@
-
- int dhcp_option_ev_name (buf, buflen, option)
- char *buf;
-- unsigned buflen;
-+ size_t buflen;
- struct option *option;
- {
- int i;
diff --git a/net/isc-dhcp40-server/files/patch-freebsd b/net/isc-dhcp40-server/files/patch-freebsd
index 8f063987b726..293aa2a33130 100644
--- a/net/isc-dhcp40-server/files/patch-freebsd
+++ b/net/isc-dhcp40-server/files/patch-freebsd
@@ -1,5 +1,5 @@
---- client/scripts/freebsd.orig Wed May 10 01:51:09 2000
-+++ client/scripts/freebsd Wed May 10 02:01:48 2000
+--- client/scripts/freebsd.orig Wed Sep 20 02:38:03 2000
++++ client/scripts/freebsd Wed Sep 27 03:33:29 2000
@@ -1,5 +1,11 @@
#!/bin/sh
@@ -47,15 +47,15 @@
new_broadcast_arg="broadcast $new_broadcast_address"
fi
if [ x$old_broadcast_address != x ]; then
-@@ -76,6 +81,7 @@
- if [ x$current_hostname = x ] || \
+@@ -77,6 +82,7 @@
[ x$current_hostname = x$old_host_name ]; then
- if [ x$new_host_name != x$old_host_name ]; then
+ if [ x$current_hostname = x ] || \
+ [ x$new_host_name != x$old_host_name ]; then
+ $LOGGER "New Hostname: $new_host_name"
hostname $new_host_name
fi
fi
-@@ -103,11 +109,18 @@
+@@ -105,11 +111,18 @@
[ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
ifconfig $interface inet $new_ip_address $new_netmask_arg \
$new_broadcast_arg $medium
@@ -74,7 +74,7 @@
set $new_static_routes
while [ $# -gt 1 ]; do
route add $1 $2
-@@ -162,8 +175,12 @@
+@@ -161,8 +174,12 @@
fi
ifconfig $interface inet $new_ip_address $new_netmask_arg \
$new_broadcast_arg $medium
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 02:17:06 +0000