- depend on res_update.h rather on libbind.a, to catch a bind8 that

has res_update.h - older versions of bind didn't have this file
  but had libbind.8 - needed for nsupdate
- Adjust more PREFIX handling
- Add dhcp3-specials + WWW to DESCR

Submitted by:	Cyrille Lefevre <clefevre%no-spam@citeweb.net>
Approved by:	obrien
This commit is contained in:
Alexander Langer 2000-07-18 08:50:54 +00:00
parent 834813f53a
commit 3457a02a10
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=30779
20 changed files with 260 additions and 35 deletions

View File

@ -14,7 +14,7 @@ DISTNAME= dhcp-3.0b1pl14
MAINTAINER= obrien@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/lib/libbind.a:${PORTSDIR}/net/bind8
BUILD_DEPENDS= ${LOCALBASE}/include/bind/res_update.h:${PORTSDIR}/net/bind8
Y2K= http://www.isc.org/y2k.html

View File

@ -1,22 +1,43 @@
--- includes/dhcpd.h.orig Wed Feb 2 09:01:17 2000
+++ includes/dhcpd.h Wed Jun 14 08:28:48 2000
@@ -773,3 +773,3 @@
--- includes/dhcpd.h.orig Wed Feb 2 18:01:17 2000
+++ includes/dhcpd.h Mon Jul 17 21:21:04 2000
@@ -329,7 +329,7 @@
#endif
#ifndef CL_DEFAULT_SCRIPT_NAME
-# define CL_DEFAULT_SCRIPT_NAME "/etc/dhclient-script"
+# define CL_DEFAULT_SCRIPT_NAME "!!PREFIX!!/etc/dhclient-script"
#endif
#ifndef CL_DEFAULT_REQUESTED_OPTIONS
@@ -771,11 +771,11 @@
#define _PATH_DHCPD_DB "dhcpd.leases"
#else
#ifndef _PATH_DHCPD_CONF
-#define _PATH_DHCPD_CONF "/etc/dhcpd.conf"
+#define _PATH_DHCPD_CONF "!!PREFIX!!/etc/dhcpd.conf"
#endif
@@ -777,3 +777,3 @@
#ifndef _PATH_DHCPD_DB
-#define _PATH_DHCPD_DB "/etc/dhcpd.leases"
+#define _PATH_DHCPD_DB "!!PREFIX!!/etc/dhcpd.leases"
#endif
@@ -786,3 +786,3 @@
#ifndef _PATH_DHCPD_PID
@@ -784,7 +784,7 @@
#endif
#ifndef _PATH_DHCLIENT_CONF
-#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf"
+#define _PATH_DHCLIENT_CONF "!!PREFIX!!/etc/dhclient.conf"
#endif
@@ -794,3 +794,3 @@
#ifndef _PATH_DHCLIENT_PID
@@ -792,7 +792,7 @@
#endif
#ifndef _PATH_DHCLIENT_DB
-#define _PATH_DHCLIENT_DB "/etc/dhclient.leases"
+#define _PATH_DHCLIENT_DB "!!PREFIX!!/etc/dhclient.leases"
#endif
#ifndef _PATH_RESOLV_CONF

View File

@ -0,0 +1,11 @@
--- client/clparse.c.orig Wed May 10 02:20:11 2000
+++ client/clparse.c Wed May 10 02:20:31 2000
@@ -74,7 +74,7 @@
top_level_config.backoff_cutoff = 15;
top_level_config.initial_interval = 3;
top_level_config.bootp_policy = P_ACCEPT;
- top_level_config.script_name = "/etc/dhclient-script";
+ top_level_config.script_name = CL_DEFAULT_SCRIPT_NAME;
top_level_config.requested_options = default_requested_options;
top_level_config.on_receipt = new_group ("read_client_conf");

View File

@ -4,3 +4,16 @@ This is a release of the Internet Software Consortium
DHCP Server (ISC dhcpd). In this release, support for the core
DHCP protocol is provided. BOOTP support is also provided for
backwards compatibility.
Version 3 of the ISC DHCP Distribution adds conditional behaviour,
address pools with access control, and client classing. An interim
implementation of dynamic DNS updates for the server only is
included, but is not supported.
Features in upcoming releases, starting with 3.1, will include the
final asynchronous Dynamic DNS Support, DHCPv4 16-bit option codes,
asynchronous DNS query resolution, DHCP Authentication, and support
for a DHCP Interserver Protocol and live querying and update of the
DHCP database.
WWW: http://www.isc.org/products/DHCP/

View File

@ -14,7 +14,7 @@ DISTNAME= dhcp-3.0b1pl14
MAINTAINER= obrien@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/lib/libbind.a:${PORTSDIR}/net/bind8
BUILD_DEPENDS= ${LOCALBASE}/include/bind/res_update.h:${PORTSDIR}/net/bind8
Y2K= http://www.isc.org/y2k.html

View File

@ -1,22 +1,43 @@
--- includes/dhcpd.h.orig Wed Feb 2 09:01:17 2000
+++ includes/dhcpd.h Wed Jun 14 08:28:48 2000
@@ -773,3 +773,3 @@
--- includes/dhcpd.h.orig Wed Feb 2 18:01:17 2000
+++ includes/dhcpd.h Mon Jul 17 21:21:04 2000
@@ -329,7 +329,7 @@
#endif
#ifndef CL_DEFAULT_SCRIPT_NAME
-# define CL_DEFAULT_SCRIPT_NAME "/etc/dhclient-script"
+# define CL_DEFAULT_SCRIPT_NAME "!!PREFIX!!/etc/dhclient-script"
#endif
#ifndef CL_DEFAULT_REQUESTED_OPTIONS
@@ -771,11 +771,11 @@
#define _PATH_DHCPD_DB "dhcpd.leases"
#else
#ifndef _PATH_DHCPD_CONF
-#define _PATH_DHCPD_CONF "/etc/dhcpd.conf"
+#define _PATH_DHCPD_CONF "!!PREFIX!!/etc/dhcpd.conf"
#endif
@@ -777,3 +777,3 @@
#ifndef _PATH_DHCPD_DB
-#define _PATH_DHCPD_DB "/etc/dhcpd.leases"
+#define _PATH_DHCPD_DB "!!PREFIX!!/etc/dhcpd.leases"
#endif
@@ -786,3 +786,3 @@
#ifndef _PATH_DHCPD_PID
@@ -784,7 +784,7 @@
#endif
#ifndef _PATH_DHCLIENT_CONF
-#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf"
+#define _PATH_DHCLIENT_CONF "!!PREFIX!!/etc/dhclient.conf"
#endif
@@ -794,3 +794,3 @@
#ifndef _PATH_DHCLIENT_PID
@@ -792,7 +792,7 @@
#endif
#ifndef _PATH_DHCLIENT_DB
-#define _PATH_DHCLIENT_DB "/etc/dhclient.leases"
+#define _PATH_DHCLIENT_DB "!!PREFIX!!/etc/dhclient.leases"
#endif
#ifndef _PATH_RESOLV_CONF

View File

@ -0,0 +1,11 @@
--- client/clparse.c.orig Wed May 10 02:20:11 2000
+++ client/clparse.c Wed May 10 02:20:31 2000
@@ -74,7 +74,7 @@
top_level_config.backoff_cutoff = 15;
top_level_config.initial_interval = 3;
top_level_config.bootp_policy = P_ACCEPT;
- top_level_config.script_name = "/etc/dhclient-script";
+ top_level_config.script_name = CL_DEFAULT_SCRIPT_NAME;
top_level_config.requested_options = default_requested_options;
top_level_config.on_receipt = new_group ("read_client_conf");

View File

@ -4,3 +4,16 @@ This is a release of the Internet Software Consortium
DHCP Server (ISC dhcpd). In this release, support for the core
DHCP protocol is provided. BOOTP support is also provided for
backwards compatibility.
Version 3 of the ISC DHCP Distribution adds conditional behaviour,
address pools with access control, and client classing. An interim
implementation of dynamic DNS updates for the server only is
included, but is not supported.
Features in upcoming releases, starting with 3.1, will include the
final asynchronous Dynamic DNS Support, DHCPv4 16-bit option codes,
asynchronous DNS query resolution, DHCP Authentication, and support
for a DHCP Interserver Protocol and live querying and update of the
DHCP database.
WWW: http://www.isc.org/products/DHCP/

View File

@ -14,7 +14,7 @@ DISTNAME= dhcp-3.0b1pl14
MAINTAINER= obrien@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/lib/libbind.a:${PORTSDIR}/net/bind8
BUILD_DEPENDS= ${LOCALBASE}/include/bind/res_update.h:${PORTSDIR}/net/bind8
Y2K= http://www.isc.org/y2k.html

View File

@ -1,22 +1,43 @@
--- includes/dhcpd.h.orig Wed Feb 2 09:01:17 2000
+++ includes/dhcpd.h Wed Jun 14 08:28:48 2000
@@ -773,3 +773,3 @@
--- includes/dhcpd.h.orig Wed Feb 2 18:01:17 2000
+++ includes/dhcpd.h Mon Jul 17 21:21:04 2000
@@ -329,7 +329,7 @@
#endif
#ifndef CL_DEFAULT_SCRIPT_NAME
-# define CL_DEFAULT_SCRIPT_NAME "/etc/dhclient-script"
+# define CL_DEFAULT_SCRIPT_NAME "!!PREFIX!!/etc/dhclient-script"
#endif
#ifndef CL_DEFAULT_REQUESTED_OPTIONS
@@ -771,11 +771,11 @@
#define _PATH_DHCPD_DB "dhcpd.leases"
#else
#ifndef _PATH_DHCPD_CONF
-#define _PATH_DHCPD_CONF "/etc/dhcpd.conf"
+#define _PATH_DHCPD_CONF "!!PREFIX!!/etc/dhcpd.conf"
#endif
@@ -777,3 +777,3 @@
#ifndef _PATH_DHCPD_DB
-#define _PATH_DHCPD_DB "/etc/dhcpd.leases"
+#define _PATH_DHCPD_DB "!!PREFIX!!/etc/dhcpd.leases"
#endif
@@ -786,3 +786,3 @@
#ifndef _PATH_DHCPD_PID
@@ -784,7 +784,7 @@
#endif
#ifndef _PATH_DHCLIENT_CONF
-#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf"
+#define _PATH_DHCLIENT_CONF "!!PREFIX!!/etc/dhclient.conf"
#endif
@@ -794,3 +794,3 @@
#ifndef _PATH_DHCLIENT_PID
@@ -792,7 +792,7 @@
#endif
#ifndef _PATH_DHCLIENT_DB
-#define _PATH_DHCLIENT_DB "/etc/dhclient.leases"
+#define _PATH_DHCLIENT_DB "!!PREFIX!!/etc/dhclient.leases"
#endif
#ifndef _PATH_RESOLV_CONF

View File

@ -0,0 +1,11 @@
--- client/clparse.c.orig Wed May 10 02:20:11 2000
+++ client/clparse.c Wed May 10 02:20:31 2000
@@ -74,7 +74,7 @@
top_level_config.backoff_cutoff = 15;
top_level_config.initial_interval = 3;
top_level_config.bootp_policy = P_ACCEPT;
- top_level_config.script_name = "/etc/dhclient-script";
+ top_level_config.script_name = CL_DEFAULT_SCRIPT_NAME;
top_level_config.requested_options = default_requested_options;
top_level_config.on_receipt = new_group ("read_client_conf");

View File

@ -4,3 +4,16 @@ This is a release of the Internet Software Consortium
DHCP Server (ISC dhcpd). In this release, support for the core
DHCP protocol is provided. BOOTP support is also provided for
backwards compatibility.
Version 3 of the ISC DHCP Distribution adds conditional behaviour,
address pools with access control, and client classing. An interim
implementation of dynamic DNS updates for the server only is
included, but is not supported.
Features in upcoming releases, starting with 3.1, will include the
final asynchronous Dynamic DNS Support, DHCPv4 16-bit option codes,
asynchronous DNS query resolution, DHCP Authentication, and support
for a DHCP Interserver Protocol and live querying and update of the
DHCP database.
WWW: http://www.isc.org/products/DHCP/

View File

@ -14,7 +14,7 @@ DISTNAME= dhcp-3.0b1pl14
MAINTAINER= obrien@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/lib/libbind.a:${PORTSDIR}/net/bind8
BUILD_DEPENDS= ${LOCALBASE}/include/bind/res_update.h:${PORTSDIR}/net/bind8
Y2K= http://www.isc.org/y2k.html

View File

@ -1,22 +1,43 @@
--- includes/dhcpd.h.orig Wed Feb 2 09:01:17 2000
+++ includes/dhcpd.h Wed Jun 14 08:28:48 2000
@@ -773,3 +773,3 @@
--- includes/dhcpd.h.orig Wed Feb 2 18:01:17 2000
+++ includes/dhcpd.h Mon Jul 17 21:21:04 2000
@@ -329,7 +329,7 @@
#endif
#ifndef CL_DEFAULT_SCRIPT_NAME
-# define CL_DEFAULT_SCRIPT_NAME "/etc/dhclient-script"
+# define CL_DEFAULT_SCRIPT_NAME "!!PREFIX!!/etc/dhclient-script"
#endif
#ifndef CL_DEFAULT_REQUESTED_OPTIONS
@@ -771,11 +771,11 @@
#define _PATH_DHCPD_DB "dhcpd.leases"
#else
#ifndef _PATH_DHCPD_CONF
-#define _PATH_DHCPD_CONF "/etc/dhcpd.conf"
+#define _PATH_DHCPD_CONF "!!PREFIX!!/etc/dhcpd.conf"
#endif
@@ -777,3 +777,3 @@
#ifndef _PATH_DHCPD_DB
-#define _PATH_DHCPD_DB "/etc/dhcpd.leases"
+#define _PATH_DHCPD_DB "!!PREFIX!!/etc/dhcpd.leases"
#endif
@@ -786,3 +786,3 @@
#ifndef _PATH_DHCPD_PID
@@ -784,7 +784,7 @@
#endif
#ifndef _PATH_DHCLIENT_CONF
-#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf"
+#define _PATH_DHCLIENT_CONF "!!PREFIX!!/etc/dhclient.conf"
#endif
@@ -794,3 +794,3 @@
#ifndef _PATH_DHCLIENT_PID
@@ -792,7 +792,7 @@
#endif
#ifndef _PATH_DHCLIENT_DB
-#define _PATH_DHCLIENT_DB "/etc/dhclient.leases"
+#define _PATH_DHCLIENT_DB "!!PREFIX!!/etc/dhclient.leases"
#endif
#ifndef _PATH_RESOLV_CONF

View File

@ -0,0 +1,11 @@
--- client/clparse.c.orig Wed May 10 02:20:11 2000
+++ client/clparse.c Wed May 10 02:20:31 2000
@@ -74,7 +74,7 @@
top_level_config.backoff_cutoff = 15;
top_level_config.initial_interval = 3;
top_level_config.bootp_policy = P_ACCEPT;
- top_level_config.script_name = "/etc/dhclient-script";
+ top_level_config.script_name = CL_DEFAULT_SCRIPT_NAME;
top_level_config.requested_options = default_requested_options;
top_level_config.on_receipt = new_group ("read_client_conf");

View File

@ -4,3 +4,16 @@ This is a release of the Internet Software Consortium
DHCP Server (ISC dhcpd). In this release, support for the core
DHCP protocol is provided. BOOTP support is also provided for
backwards compatibility.
Version 3 of the ISC DHCP Distribution adds conditional behaviour,
address pools with access control, and client classing. An interim
implementation of dynamic DNS updates for the server only is
included, but is not supported.
Features in upcoming releases, starting with 3.1, will include the
final asynchronous Dynamic DNS Support, DHCPv4 16-bit option codes,
asynchronous DNS query resolution, DHCP Authentication, and support
for a DHCP Interserver Protocol and live querying and update of the
DHCP database.
WWW: http://www.isc.org/products/DHCP/

View File

@ -14,7 +14,7 @@ DISTNAME= dhcp-3.0b1pl14
MAINTAINER= obrien@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/lib/libbind.a:${PORTSDIR}/net/bind8
BUILD_DEPENDS= ${LOCALBASE}/include/bind/res_update.h:${PORTSDIR}/net/bind8
Y2K= http://www.isc.org/y2k.html

View File

@ -1,22 +1,43 @@
--- includes/dhcpd.h.orig Wed Feb 2 09:01:17 2000
+++ includes/dhcpd.h Wed Jun 14 08:28:48 2000
@@ -773,3 +773,3 @@
--- includes/dhcpd.h.orig Wed Feb 2 18:01:17 2000
+++ includes/dhcpd.h Mon Jul 17 21:21:04 2000
@@ -329,7 +329,7 @@
#endif
#ifndef CL_DEFAULT_SCRIPT_NAME
-# define CL_DEFAULT_SCRIPT_NAME "/etc/dhclient-script"
+# define CL_DEFAULT_SCRIPT_NAME "!!PREFIX!!/etc/dhclient-script"
#endif
#ifndef CL_DEFAULT_REQUESTED_OPTIONS
@@ -771,11 +771,11 @@
#define _PATH_DHCPD_DB "dhcpd.leases"
#else
#ifndef _PATH_DHCPD_CONF
-#define _PATH_DHCPD_CONF "/etc/dhcpd.conf"
+#define _PATH_DHCPD_CONF "!!PREFIX!!/etc/dhcpd.conf"
#endif
@@ -777,3 +777,3 @@
#ifndef _PATH_DHCPD_DB
-#define _PATH_DHCPD_DB "/etc/dhcpd.leases"
+#define _PATH_DHCPD_DB "!!PREFIX!!/etc/dhcpd.leases"
#endif
@@ -786,3 +786,3 @@
#ifndef _PATH_DHCPD_PID
@@ -784,7 +784,7 @@
#endif
#ifndef _PATH_DHCLIENT_CONF
-#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf"
+#define _PATH_DHCLIENT_CONF "!!PREFIX!!/etc/dhclient.conf"
#endif
@@ -794,3 +794,3 @@
#ifndef _PATH_DHCLIENT_PID
@@ -792,7 +792,7 @@
#endif
#ifndef _PATH_DHCLIENT_DB
-#define _PATH_DHCLIENT_DB "/etc/dhclient.leases"
+#define _PATH_DHCLIENT_DB "!!PREFIX!!/etc/dhclient.leases"
#endif
#ifndef _PATH_RESOLV_CONF

View File

@ -0,0 +1,11 @@
--- client/clparse.c.orig Wed May 10 02:20:11 2000
+++ client/clparse.c Wed May 10 02:20:31 2000
@@ -74,7 +74,7 @@
top_level_config.backoff_cutoff = 15;
top_level_config.initial_interval = 3;
top_level_config.bootp_policy = P_ACCEPT;
- top_level_config.script_name = "/etc/dhclient-script";
+ top_level_config.script_name = CL_DEFAULT_SCRIPT_NAME;
top_level_config.requested_options = default_requested_options;
top_level_config.on_receipt = new_group ("read_client_conf");

View File

@ -4,3 +4,16 @@ This is a release of the Internet Software Consortium
DHCP Server (ISC dhcpd). In this release, support for the core
DHCP protocol is provided. BOOTP support is also provided for
backwards compatibility.
Version 3 of the ISC DHCP Distribution adds conditional behaviour,
address pools with access control, and client classing. An interim
implementation of dynamic DNS updates for the server only is
included, but is not supported.
Features in upcoming releases, starting with 3.1, will include the
final asynchronous Dynamic DNS Support, DHCPv4 16-bit option codes,
asynchronous DNS query resolution, DHCP Authentication, and support
for a DHCP Interserver Protocol and live querying and update of the
DHCP database.
WWW: http://www.isc.org/products/DHCP/