Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 19 Sep 2000 01:49:11 +0200 (CEST)
From:      clefevre@citeweb.net (Cyrille Lefevre)
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/21379: Updated port - net/isc-dhcp3 (beta 2 patch level 4)
Message-ID:  <200009182349.BAA42092@gits.dyndns.org>

next in thread | raw e-mail | index | archive | help

>Number:         21379
>Category:       ports
>Synopsis:       Updated port - net/isc-dhcp3 (beta 2 patch level 4)
>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:   Mon Sep 18 17:00:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Cyrille Lefevre
>Release:        FreeBSD 4.1-RC i386
>Organization:
ACME
>Environment:

FreeBSD gits 4.1-RC FreeBSD 4.1-RC #0: Tue Jul 18 01:55:07 CEST 2000     root@gits:/disk2/4.0-stable/obj/disk2/4.0-stable/src/sys/CUSTOM  i386

>Description:

	update ISC dhcp to the latest version, which is 3.0b2pl4.

    updated files:

	Makefile
		bind8 dependency and --with-nsupdate are no more needed
		added section 3 manual pages

	patches/patch-freebsd
		dhclient-script updated to accordingly bin/15046 and
		conf/18771 PR

	patches/patches-*
		almost the sames

	pkg/DESCR
		updated

    added files:

	patch-{dhcpctl,minires,omapip}-Makefile.dist
		DEBUG disabled (?=), CFLAGS augmented (+=).

>How-To-Repeat:

	n/a

>Fix:

diff -bur isc-dhcp3.orig/Makefile isc-dhcp3/Makefile
--- isc-dhcp3.orig/Makefile	Fri Jul 21 07:42:17 2000
+++ isc-dhcp3/Makefile	Tue Sep 19 01:05:59 2000
@@ -3,24 +3,22 @@
 # Date created:         7 Mar 1996
 # Whom:                 se
 #
-# $FreeBSD: ports/net/isc-dhcp3/Makefile,v 1.38 2000/07/21 05:42:17 obrien Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	isc-dhcp3
-PORTVERSION=	3.0.b1.17
+PORTVERSION=	3.0.b2.4
 CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.isc.org/isc/dhcp/
-DISTNAME=	dhcp-3.0b1pl17
+DISTNAME=	dhcp-3.0b2pl4
 
 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 -bur isc-dhcp3.orig/files/md5 isc-dhcp3/files/md5
--- isc-dhcp3.orig/files/md5	Fri Jul 21 07:42:18 2000
+++ isc-dhcp3/files/md5	Mon Sep 18 22:13:42 2000
@@ -1 +1 @@
-MD5 (dhcp-3.0b1pl17.tar.gz) = 9e5202eefc133bd30a46882239123be4
+MD5 (dhcp-3.0b2pl4.tar.gz) = 7c1b33c8a5fc5ed86d494905daed5dce
diff -bur isc-dhcp3.orig/patches/patch-ae isc-dhcp3/patches/patch-ae
--- isc-dhcp3.orig/patches/patch-ae	Tue Jul 18 10:50:54 2000
+++ isc-dhcp3/patches/patch-ae	Mon Sep 18 23:14:28 2000
@@ -1,13 +1,13 @@
---- relay/Makefile.dist.orig	Thu Jul  1 21:29:20 1999
-+++ relay/Makefile.dist	Tue May  9 21:07:24 2000
+--- relay/Makefile.dist.orig	Thu Aug  3 23:00:36 2000
++++ relay/Makefile.dist	Mon Sep 18 22:26:26 2000
 @@ -24,10 +24,10 @@
  PROG   = dhcrelay
  MAN    = dhcrelay.8
  
 -DEBUG  = -g
 +DEBUG  ?= -g
- INCLUDES = -I.. $(BINDINC) -I../includes
- DHCPLIB = ../common/libdhcp.a
+ 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)
  
diff -bur isc-dhcp3.orig/patches/patch-af isc-dhcp3/patches/patch-af
--- isc-dhcp3.orig/patches/patch-af	Tue Jul 18 10:50:54 2000
+++ isc-dhcp3/patches/patch-af	Mon Sep 18 23:14:54 2000
@@ -1,13 +1,13 @@
---- server/Makefile.dist.orig	Thu Jul  1 20:21:36 1999
-+++ server/Makefile.dist	Tue May  9 21:07:30 2000
-@@ -24,10 +24,10 @@
+--- server/Makefile.dist.orig	Tue Jun 20 22:29:16 2000
++++ server/Makefile.dist	Mon Sep 18 22:27:17 2000
+@@ -26,10 +26,10 @@
  PROG   = dhcpd
  MAN    = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
  
 -DEBUG  = -g
 +DEBUG  ?= -g
- INCLUDES = -I.. $(BINDINC) -I../includes
- DHCPLIB = ../common/libdhcp.a
+ 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)
  
diff -bur 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	Mon Sep 18 23:19:34 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	Mon Sep 18 23:16:50 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 -bur 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	Mon Sep 18 23:27:52 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	Mon Sep 18 22:27:59 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 -bur 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	Mon Sep 18 23:29:02 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	Mon Sep 18 22:58:49 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 -bur isc-dhcp3.orig/patches/patch-common-Makefile.dist isc-dhcp3/patches/patch-common-Makefile.dist
--- isc-dhcp3.orig/patches/patch-common-Makefile.dist	Tue Jul 18 10:50:54 2000
+++ isc-dhcp3/patches/patch-common-Makefile.dist	Mon Sep 18 23:29:56 2000
@@ -1,12 +1,12 @@
---- common/Makefile.dist.orig	Thu Oct 14 22:38:23 1999
-+++ common/Makefile.dist	Tue May  9 21:07:17 2000
+--- common/Makefile.dist.orig	Wed Aug  2 00:54:46 2000
++++ common/Makefile.dist	Mon Sep 18 23:05:44 2000
 @@ -29,9 +29,9 @@
- 	 inet_addr.o dns.o resolv.o execute.o discover.o auth.o nsupdate.o
+ 	 inet_addr.o dns.o resolv.o execute.o discover.o comapi.o
  MAN    = dhcp-options.5 dhcp-contrib.5 dhcp-eval.5
  
 -DEBUG  = -g
 +DEBUG  ?= -g
- INCLUDES = -I.. $(BINDINC) -I../includes
+ INCLUDES = -I$(TOP) $(BINDINC) -I$(TOP)/includes
 -CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
 +CFLAGS += $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
  
diff -bur 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	Mon Sep 18 23:30:40 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	Mon Sep 18 23:06:03 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 -bur isc-dhcp3.orig/patches/patch-dhclient.c isc-dhcp3/patches/patch-dhclient.c
--- isc-dhcp3.orig/patches/patch-dhclient.c	Sun Aug 13 20:06:42 2000
+++ isc-dhcp3/patches/patch-dhclient.c	Mon Sep 18 23:32:18 2000
@@ -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 14:42:01 2000
++++ client/dhclient.c	Mon Sep 18 23:10:28 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",
  		   "[-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 -bur isc-dhcp3.orig/patches/patch-dhcpctl-Makefile.dist isc-dhcp3/patches/patch-dhcpctl-Makefile.dist
--- isc-dhcp3.orig/patches/patch-dhcpctl-Makefile.dist	Tue Sep 19 01:23:54 2000
+++ isc-dhcp3/patches/patch-dhcpctl-Makefile.dist	Tue Sep 19 00:12:31 2000
@@ -0,0 +1,14 @@
+--- dhcpctl/Makefile.dist.orig	Thu Aug  3 22:59:41 2000
++++ dhcpctl/Makefile.dist	Tue Sep 19 00:12:01 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 -bur isc-dhcp3.orig/patches/patch-freebsd isc-dhcp3/patches/patch-freebsd
--- isc-dhcp3.orig/patches/patch-freebsd	Sun Jun 25 23:08:08 2000
+++ isc-dhcp3/patches/patch-freebsd	Tue Sep 19 00:23:18 2000
@@ -1,25 +1,31 @@
---- client/scripts/freebsd.orig	Wed May 10 01:51:09 2000
-+++ client/scripts/freebsd	Wed May 10 02:01:48 2000
-@@ -1,5 +1,11 @@
+--- client/scripts/freebsd.orig	Mon May  1 19:17:19 2000
++++ client/scripts/freebsd	Tue Sep 19 00:22:54 2000
+@@ -1,26 +1,32 @@
  #!/bin/sh
  
+-make_resolv_conf() {
+-  echo search $new_domain_name >/etc/resolv.conf
 +if [ -x /usr/bin/logger ]; then
 +	LOGGER="/usr/bin/logger -s -p user.notice -t dhclient"
 +else
 +	LOGGER=echo
 +fi
 +
- make_resolv_conf() {
-   echo search $new_domain_name >/etc/resolv.conf
++make_resolv_conf() { # file
++  echo search $new_domain_name > $1
    for nameserver in $new_domain_name_servers; do
-@@ -10,17 +16,17 @@
+-    echo nameserver $nameserver >>/etc/resolv.conf
++    echo nameserver $nameserver >> $1
+   done
+ }
+ 
  # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
  exit_with_hooks() {
    exit_status=$1
 -  if [ -x /etc/dhclient-exit-hooks ]; then
 -    . /etc/dhclient-exit-hooks
-+  if [ -x !!PREFIX!!/etc/dhclient-exit-hooks ]; then
-+    . !!PREFIX!!/etc/dhclient-exit-hooks
++  if [ -x /usr/local/etc/dhclient-exit-hooks ]; then
++    . /usr/local/etc/dhclient-exit-hooks
    fi
  # probably should do something with exit status of the local script
    exit $exit_status
@@ -27,10 +33,10 @@
  
  # Invoke the local dhcp client enter hooks, if they exist.
 -if [ -x /etc/dhclient-enter-hooks ]; then
-+if [ -x !!PREFIX!!/etc/dhclient-enter-hooks ]; then
++if [ -x /usr/local/etc/dhclient-enter-hooks ]; then
    exit_status=0
 -  . /etc/dhclient-enter-hooks
-+  . !!PREFIX!!/etc/dhclient-enter-hooks
++  . /usr/local/etc/dhclient-enter-hooks
    # allow the local script to abort processing of this state
    # local script must set exit_status variable to nonzero.
    if [ $exit_status -ne 0 ]; then
@@ -47,15 +53,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 +80,19 @@
        set $new_static_routes
        while [ $# -gt 1 ]; do
  	route add $1 $2
-@@ -162,8 +175,12 @@
+@@ -122,10 +135,7 @@
+     ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
+     route add $alias_ip_address 127.0.0.1
+   fi
+-  echo search $new_domain_name >/etc/resolv.conf
+-  for nameserver in $new_domain_name_servers; do
+-    echo nameserver $nameserver >>/etc/resolv.conf
+-  done
++  make_resolv_conf /etc/resolv.conf
+   exit_with_hooks 0
+ fi
+ 
+@@ -164,8 +174,12 @@
    fi
    ifconfig $interface inet $new_ip_address $new_netmask_arg \
  					$new_broadcast_arg $medium
@@ -87,3 +105,15 @@
      set $new_routers
      if ping -q -c 1 $1; then
        if [ x$new_ip_address != x$alias_ip_address ] && \
+@@ -182,10 +196,7 @@
+ 	route add $0 $1
+ 	shift; shift
+       done
+-      echo search $new_domain_name >/etc/resolv.conf.std
+-      for nameserver in $new_domain_name_servers; do
+-	echo nameserver $nameserver >>/etc/resolv.conf.std
+-      done
++      make_resolv_conf /etc/resolv.conf.std
+       if [ -f /etc/resolv.conf ]; then
+ 	rm -f /etc/resolv.conf
+       fi
diff -bur isc-dhcp3.orig/patches/patch-minires-Makefile.dist isc-dhcp3/patches/patch-minires-Makefile.dist
--- isc-dhcp3.orig/patches/patch-minires-Makefile.dist	Tue Sep 19 01:24:00 2000
+++ isc-dhcp3/patches/patch-minires-Makefile.dist	Tue Sep 19 00:04:30 2000
@@ -0,0 +1,14 @@
+--- minires/Makefile.dist.orig	Tue Jun 20 22:28:36 2000
++++ minires/Makefile.dist	Mon Sep 18 23:45:29 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 -bur isc-dhcp3.orig/patches/patch-omapip-Makefile.dist isc-dhcp3/patches/patch-omapip-Makefile.dist
--- isc-dhcp3.orig/patches/patch-omapip-Makefile.dist	Tue Sep 19 01:24:05 2000
+++ isc-dhcp3/patches/patch-omapip-Makefile.dist	Tue Sep 19 00:04:56 2000
@@ -0,0 +1,14 @@
+--- omapip/Makefile.dist.orig	Thu Aug 17 19:39:51 2000
++++ omapip/Makefile.dist	Tue Sep 19 00:03:42 2000
+@@ -27,9 +27,9 @@
+ 	 convert.o hash.o auth.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 -bur 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	Tue Sep 19 00:42:14 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 -bur 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	Tue Sep 19 01:01:27 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?200009182349.BAA42092>