Date: Fri, 29 Sep 2000 01:33:17 +0200 (CEST) From: clefevre@citeweb.net To: FreeBSD-gnats-submit@freebsd.org Cc: obrien@freebsd.org Subject: ports/21632: Updated port - net/isc-dhcp3 (beta 2 patch level 5) Message-ID: <200009282333.e8SNXH806928@gits.dyndns.org>
next in thread | raw e-mail | index | archive | help
>Number: 21632
>Category: ports
>Synopsis: Updated port - net/isc-dhcp3 (beta 2 patch level 5)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Sep 28 16:40:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Cyrille Lefevre
>Release: FreeBSD 4.1-STABLE i386
>Organization:
ACME
>Environment:
FreeBSD gits 4.1-STABLE FreeBSD 4.1-STABLE #3: Sat Sep 23 10:20:30 CEST 2000 root@gits:/disk2/4.0-stable/src/sys/compile/CUSTOM i386
>Description:
*** this PR supersed the ports/21379 PR which should be closed. ***
update ISC dhcp to the latest version, which is 3.0b2pl5.
updated files:
Makefile
bind8 dependency and --with-nsupdate are no more needed.
added section 3 manual pages.
patches/patch-ae
patches/patch-af
patches/patch-ai
patches/patch-clparse.c
patches/patch-common-Makefile.dist
context to unified diff.
patches/patch-aj
patches/patch-dhclient.8
line numbers changes.
patches/patch-site.conf
LIBMAN* added.
pkg/DESCR
updated.
added files (missing from ports/21379 PR):
patches/patch-dhcpctl-Makefile.dist
patches/patch-minires-Makefile.dist
patches/patch-omapip-Makefile.dist
new files, DEBUG disabled (?=), CFLAGS augmented (+=).
>How-To-Repeat:
n/a
>Fix:
diff -burN --exclude CVS isc-dhcp3.orig/Makefile isc-dhcp3/Makefile
--- isc-dhcp3.orig/Makefile Wed Sep 27 12:36:12 2000
+++ isc-dhcp3/Makefile Fri Sep 29 00:32:20 2000
@@ -3,7 +3,7 @@
# Date created: 7 Mar 1996
# Whom: se
#
-# $FreeBSD: ports/net/isc-dhcp3/Makefile,v 1.39 2000/09/27 10:36:12 obrien Exp $
+# $FreeBSD$
#
PORTNAME= isc-dhcp3
@@ -14,13 +14,11 @@
MAINTAINER= obrien@FreeBSD.org
-BUILD_DEPENDS= ${LOCALBASE}/include/bind/res_update.h:${PORTSDIR}/net/bind8
-
Y2K= http://www.isc.org/y2k.html
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= --with-nsupdate
+MAN3= dhcpctl.3 omapi.3
MAN5= dhclient.conf.5 dhclient.leases.5 dhcp-contrib.5 \
dhcp-eval.5 dhcp-options.5 dhcpd.conf.5 \
dhcpd.leases.5
diff -burN --exclude CVS isc-dhcp3.orig/patches/patch-ae isc-dhcp3/patches/patch-ae
--- isc-dhcp3.orig/patches/patch-ae Wed Sep 27 12:36:13 2000
+++ isc-dhcp3/patches/patch-ae Fri Sep 29 00:49:43 2000
@@ -1,8 +1,15 @@
---- relay/Makefile.dist.orig Thu Aug 3 14:00:36 2000
-+++ relay/Makefile.dist Wed Sep 27 03:26:53 2000
-@@ -27 +27 @@
+--- relay/Makefile.dist.orig Thu Aug 3 23:00:36 2000
++++ relay/Makefile.dist Fri Sep 29 00:34:35 2000
+@@ -24,10 +24,10 @@
+ PROG = dhcrelay
+ MAN = dhcrelay.8
+
-DEBUG = -g
+DEBUG ?= -g
-@@ -30 +30 @@
+ INCLUDES = -I$(TOP) $(BINDINC) -I$(TOP)/includes
+ DHCPLIB = ../common/libdhcp.a ../omapip/libomapi.a $(BINDLIB)
-CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
+CFLAGS += $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
+
+ all: $(PROG) $(CATMANPAGES)
+
diff -burN --exclude CVS isc-dhcp3.orig/patches/patch-af isc-dhcp3/patches/patch-af
--- isc-dhcp3.orig/patches/patch-af Wed Sep 27 12:36:13 2000
+++ isc-dhcp3/patches/patch-af Fri Sep 29 00:50:21 2000
@@ -1,8 +1,15 @@
---- server/Makefile.dist.orig Tue Jun 20 13:29:16 2000
-+++ server/Makefile.dist Wed Sep 27 03:27:49 2000
-@@ -29 +29 @@
+--- server/Makefile.dist.orig Tue Jun 20 22:29:16 2000
++++ server/Makefile.dist Fri Sep 29 00:34:35 2000
+@@ -26,10 +26,10 @@
+ PROG = dhcpd
+ MAN = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
+
-DEBUG = -g
+DEBUG ?= -g
-@@ -32 +32 @@
+ INCLUDES = -I$(TOP) $(BINDINC) -I$(TOP)/includes
+ DHCPLIB = ../common/libdhcp.a ../omapip/libomapi.a $(BINDLIB)
-CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
+CFLAGS += $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
+
+ all: $(PROG) $(CATMANPAGES)
+
diff -burN --exclude CVS isc-dhcp3.orig/patches/patch-ai isc-dhcp3/patches/patch-ai
--- isc-dhcp3.orig/patches/patch-ai Fri Jul 21 07:42:18 2000
+++ isc-dhcp3/patches/patch-ai Fri Sep 29 00:46:18 2000
@@ -1,5 +1,15 @@
---- client/Makefile.dist.orig Wed Jul 19 21:13:09 2000
-+++ client/Makefile.dist Thu Jul 20 21:51:21 2000
-@@ -32 +32 @@
+--- client/Makefile.dist.orig Thu Jul 20 02:53:15 2000
++++ client/Makefile.dist Fri Sep 29 00:34:35 2000
+@@ -26,10 +26,10 @@
+ PROG = dhclient
+ MAN = dhclient.8 dhclient.conf.5 dhclient-script.8 dhclient.leases.5
+
+-DEBUG = -g
++DEBUG ?= -g
+ INCLUDES = -I$(TOP) $(BINDINC) -I$(TOP)/includes
+ DHCPLIB = ../common/libdhcp.a ../omapip/libomapi.a $(BINDLIB)
-CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS) \
-+CFLAGS += $(PREDEFINES) $(INCLUDES) $(COPTS) \
++CFLAGS += $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS) \
+ -DCLIENT_PATH=${CLIENT_PATH}
+
+ all: $(PROG) $(CATMANPAGES)
diff -burN --exclude CVS isc-dhcp3.orig/patches/patch-aj isc-dhcp3/patches/patch-aj
--- isc-dhcp3.orig/patches/patch-aj Tue Jul 18 10:50:54 2000
+++ isc-dhcp3/patches/patch-aj Fri Sep 29 00:48:59 2000
@@ -1,6 +1,6 @@
---- 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 @@
+--- includes/dhcpd.h.orig Sat Sep 2 01:08:07 2000
++++ includes/dhcpd.h Fri Sep 29 00:34:36 2000
+@@ -431,7 +431,7 @@
#endif
#ifndef CL_DEFAULT_SCRIPT_NAME
@@ -9,7 +9,7 @@
#endif
#ifndef CL_DEFAULT_REQUESTED_OPTIONS
-@@ -771,11 +771,11 @@
+@@ -837,11 +837,11 @@
#define _PATH_DHCPD_DB "dhcpd.leases"
#else
#ifndef _PATH_DHCPD_CONF
@@ -23,7 +23,7 @@
#endif
#ifndef _PATH_DHCPD_PID
-@@ -784,7 +784,7 @@
+@@ -850,7 +850,7 @@
#endif
#ifndef _PATH_DHCLIENT_CONF
@@ -32,7 +32,7 @@
#endif
#ifndef _PATH_DHCLIENT_PID
-@@ -792,7 +792,7 @@
+@@ -858,7 +858,7 @@
#endif
#ifndef _PATH_DHCLIENT_DB
diff -burN --exclude CVS isc-dhcp3.orig/patches/patch-clparse.c isc-dhcp3/patches/patch-clparse.c
--- isc-dhcp3.orig/patches/patch-clparse.c Fri Jul 21 07:42:18 2000
+++ isc-dhcp3/patches/patch-clparse.c Fri Sep 29 00:46:39 2000
@@ -1,5 +1,11 @@
---- client/clparse.c.orig Wed Jul 19 21:13:10 2000
-+++ client/clparse.c Thu Jul 20 21:52:53 2000
-@@ -46 +46 @@
+--- client/clparse.c.orig Thu Aug 3 22:59:31 2000
++++ client/clparse.c Fri Sep 29 00:34:36 2000
+@@ -50,7 +50,7 @@
+
+ static TIME parsed_time;
+
-char client_script_name [] = "/etc/dhclient-script";
+char client_script_name [] = CL_DEFAULT_SCRIPT_NAME;
+
+ struct client_config top_level_config;
+
diff -burN --exclude CVS isc-dhcp3.orig/patches/patch-common-Makefile.dist isc-dhcp3/patches/patch-common-Makefile.dist
--- isc-dhcp3.orig/patches/patch-common-Makefile.dist Wed Sep 27 12:36:13 2000
+++ isc-dhcp3/patches/patch-common-Makefile.dist Fri Sep 29 00:47:54 2000
@@ -1,8 +1,14 @@
---- common/Makefile.dist.orig Tue Sep 19 17:01:43 2000
-+++ common/Makefile.dist Wed Sep 27 03:28:42 2000
-@@ -32 +32 @@
+--- common/Makefile.dist.orig Wed Sep 20 02:01:43 2000
++++ common/Makefile.dist Fri Sep 29 00:34:36 2000
+@@ -29,9 +29,9 @@
+ dns.o resolv.o execute.o discover.o comapi.o
+ MAN = dhcp-options.5 dhcp-contrib.5 dhcp-eval.5
+
-DEBUG = -g
+DEBUG ?= -g
-@@ -34 +34 @@
+ INCLUDES = -I$(TOP) $(BINDINC) -I$(TOP)/includes
-CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
+CFLAGS += $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
+
+ all: libdhcp.a $(CATMANPAGES)
+
diff -burN --exclude CVS isc-dhcp3.orig/patches/patch-dhclient.8 isc-dhcp3/patches/patch-dhclient.8
--- isc-dhcp3.orig/patches/patch-dhclient.8 Sun Jun 25 23:08:08 2000
+++ isc-dhcp3/patches/patch-dhclient.8 Fri Sep 29 00:47:06 2000
@@ -1,5 +1,5 @@
---- client/dhclient.8.orig Wed May 10 02:36:03 2000
-+++ client/dhclient.8 Wed May 10 02:39:43 2000
+--- client/dhclient.8.orig Mon May 1 19:11:36 2000
++++ client/dhclient.8 Fri Sep 29 00:34:36 2000
@@ -34,7 +34,7 @@
.B -q
]
@@ -9,7 +9,7 @@
]
[
.B -lf
-@@ -170,6 +170,11 @@
+@@ -173,6 +173,11 @@
.B -q
flag prevents any messages other than errors from being printed to the
standard error descriptor.
diff -burN --exclude CVS isc-dhcp3.orig/patches/patch-dhcpctl-Makefile.dist isc-dhcp3/patches/patch-dhcpctl-Makefile.dist
--- isc-dhcp3.orig/patches/patch-dhcpctl-Makefile.dist Thu Jan 1 01:00:00 1970
+++ isc-dhcp3/patches/patch-dhcpctl-Makefile.dist Fri Sep 29 00:48:35 2000
@@ -0,0 +1,14 @@
+--- dhcpctl/Makefile.dist.orig Thu Aug 3 22:59:41 2000
++++ dhcpctl/Makefile.dist Fri Sep 29 00:34:36 2000
+@@ -24,9 +24,9 @@
+ MAN = dhcpctl.3
+ HDRS = dhcpctl.h
+
+-DEBUG = -g
++DEBUG ?= -g
+ INCLUDES = $(BINDINC) -I$(TOP)/includes
+-CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
++CFLAGS += $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
+
+ all: libdhcpctl.a svtest cltest $(CATMANPAGES)
+
diff -burN --exclude CVS isc-dhcp3.orig/patches/patch-minires-Makefile.dist isc-dhcp3/patches/patch-minires-Makefile.dist
--- isc-dhcp3.orig/patches/patch-minires-Makefile.dist Thu Jan 1 01:00:00 1970
+++ isc-dhcp3/patches/patch-minires-Makefile.dist Fri Sep 29 00:52:35 2000
@@ -0,0 +1,14 @@
+--- minires/Makefile.dist.orig Tue Jun 20 22:28:36 2000
++++ minires/Makefile.dist Fri Sep 29 00:51:27 2000
+@@ -30,9 +30,9 @@
+ dst_api.o hmac_link.o md5_dgst.o prandom.o support.o base64.o
+ HDRS = dst_internal.h md5.h md5_locl.h
+
+-DEBUG = -g
++DEBUG ?= -g
+ INCLUDES = $(BINDINC) -I$(TOP)/includes
+-CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS) -DHMAC_MD5 -DMINIRES_LIB
++CFLAGS += $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS) -DHMAC_MD5 -DMINIRES_LIB
+
+ all: libres.a
+
diff -burN --exclude CVS isc-dhcp3.orig/patches/patch-omapip-Makefile.dist isc-dhcp3/patches/patch-omapip-Makefile.dist
--- isc-dhcp3.orig/patches/patch-omapip-Makefile.dist Thu Jan 1 01:00:00 1970
+++ isc-dhcp3/patches/patch-omapip-Makefile.dist Fri Sep 29 00:53:00 2000
@@ -0,0 +1,14 @@
+--- omapip/Makefile.dist.orig Wed Sep 20 02:01:49 2000
++++ omapip/Makefile.dist Fri Sep 29 00:51:39 2000
+@@ -27,9 +27,9 @@
+ convert.o hash.o auth.o inet_addr.o
+ MAN = omapi.3
+
+-DEBUG = -g
++DEBUG ?= -g
+ INCLUDES = $(BINDINC) -I$(TOP)/includes
+-CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
++CFLAGS += $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
+
+ all: libomapi.a svtest $(CATMANPAGES)
+
diff -burN --exclude CVS isc-dhcp3.orig/patches/patch-site.conf isc-dhcp3/patches/patch-site.conf
--- isc-dhcp3.orig/patches/patch-site.conf Sun Jun 25 23:08:08 2000
+++ isc-dhcp3/patches/patch-site.conf Fri Sep 29 00:29:20 2000
@@ -1,6 +1,6 @@
---- site.conf Wed Jul 7 17:20:10 1999
-+++ site.conf Tue May 9 21:23:20 2000
-@@ -1,2 +1,21 @@
+--- site.conf.orig Wed Jul 7 17:20:10 1999
++++ site.conf Tue Sep 19 00:39:08 2000
+@@ -1,2 +1,23 @@
# Put local site configuration stuff here to override the default
# settings in Makefile.conf
+
@@ -14,6 +14,8 @@
+ADMMANEXT = .8
+FFMANDIR = $(PREFIX)/man/man5
+FFMANEXT = .5
++LIBMANDIR = $(PREFIX)/man/man3
++LIBMANEXT = .3
+
+BINDLIBDEF = -L$(PREFIX)/lib -lbind
+BINDINCDEF = -I$(PREFIX)/include/bind
diff -burN --exclude CVS isc-dhcp3.orig/pkg/DESCR isc-dhcp3/pkg/DESCR
--- isc-dhcp3.orig/pkg/DESCR Tue Jul 18 10:50:54 2000
+++ isc-dhcp3/pkg/DESCR Fri Sep 29 00:29:20 2000
@@ -5,15 +5,24 @@
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.
+Version 3, Beta 2 of the ISC DHCP Distribution includes the following
+features that are new since version 2.0:
+
+ * DHCP Failover Protocol support
+ * OMAPI, an API for accessing and modifying the DHCP
+ server and client state.
+ * Conditional behaviour
+ * Storing arbitrary information on leases
+ * Address pools with access control
+ * Client classing
+ * Address allocation restriction by class
+ * Relay agent information option support
+ * Dynamic DNS updates
+ * Many bug fixes, performance enhancements, and minor
+ new DHCP protocol features.
+
+A fully-featured implementation of dynamic DNS updates is included in
+this release. There are no build dependencies with any BIND version.
-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/
>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?200009282333.e8SNXH806928>