aboutsummaryrefslogtreecommitdiffstats
path: root/net/isc-dhcp3
diff options
context:
space:
mode:
authorsf <sf@FreeBSD.org>2001-03-09 04:06:36 +0800
committersf <sf@FreeBSD.org>2001-03-09 04:06:36 +0800
commitb84af273e4c16cbe0b40ae460da8199d713c02fa (patch)
tree0721d397acb27bf45303a9720a0a55143b1932d4 /net/isc-dhcp3
parent3495c993d3b8fc048345584103e700cb51018e8c (diff)
downloadfreebsd-ports-gnome-b84af273e4c16cbe0b40ae460da8199d713c02fa.tar.gz
freebsd-ports-gnome-b84af273e4c16cbe0b40ae460da8199d713c02fa.tar.zst
freebsd-ports-gnome-b84af273e4c16cbe0b40ae460da8199d713c02fa.zip
update to 3.0b2pl18.
PR: 25501 Submitted by: maintainer
Diffstat (limited to 'net/isc-dhcp3')
-rw-r--r--net/isc-dhcp3/Makefile6
-rw-r--r--net/isc-dhcp3/distinfo2
-rw-r--r--net/isc-dhcp3/files/isc-dhcpd.sh.sample5
-rw-r--r--net/isc-dhcp3/files/patch-dhclient.c38
4 files changed, 23 insertions, 28 deletions
diff --git a/net/isc-dhcp3/Makefile b/net/isc-dhcp3/Makefile
index 30c420164b8b..ace50a3366eb 100644
--- a/net/isc-dhcp3/Makefile
+++ b/net/isc-dhcp3/Makefile
@@ -7,9 +7,9 @@
#
PORTNAME= isc-dhcp3
-PORTVERSION= 3.0.b2.16
+PORTVERSION= 3.0.b2.18
CATEGORIES= net
-MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
+MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
DISTNAME= ${PORTNAME:S/isc-//:S/3/-/}${PORTVERSION:S/.b/b/:R}pl${PORTVERSION:E}
MAINTAINER= clefevre@poboxes.com
@@ -30,7 +30,7 @@ MAN8= dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8
# 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 --git a/net/isc-dhcp3/distinfo b/net/isc-dhcp3/distinfo
index bdb0966a924d..16de2cef3ac6 100644
--- a/net/isc-dhcp3/distinfo
+++ b/net/isc-dhcp3/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0b2pl16.tar.gz) = 88fb65480a1b66c8d011957ea6c2e138
+MD5 (dhcp-3.0b2pl18.tar.gz) = 807485e8f6f6ad9028201b9f22354b3e
diff --git a/net/isc-dhcp3/files/isc-dhcpd.sh.sample b/net/isc-dhcp3/files/isc-dhcpd.sh.sample
index 3cc86c5e65a3..bd9f10dbc3fd 100644
--- a/net/isc-dhcp3/files/isc-dhcpd.sh.sample
+++ b/net/isc-dhcp3/files/isc-dhcpd.sh.sample
@@ -3,7 +3,7 @@
# $FreeBSD$
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 @@ fi
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 --git a/net/isc-dhcp3/files/patch-dhclient.c b/net/isc-dhcp3/files/patch-dhclient.c
index ebbd815ecc5e..5828f2d2c088 100644
--- a/net/isc-dhcp3/files/patch-dhclient.c
+++ b/net/isc-dhcp3/files/patch-dhclient.c
@@ -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. */