Sun Jan 4 00:58:42 2009 UTC ()
Update to 4.1.0

ISC DHCP 4.1.x will have several new DHCPv6 features that were not in DHCP 4.0.x. These new features include:

* Support for the rapid-commit option on the client side
* Prefix Delegation support
* IA_TA address support
* A basic DHCPv6 relay agent
* basic DHCPv6 Leasequery support


(adrianp)
diff -r1.2 -r1.3 pkgsrc/net/isc-dhcpd4/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcpd4/PLIST
diff -r1.2 -r0 pkgsrc/net/isc-dhcpd4/distinfo
diff -r0 -r1.1 pkgsrc/net/isc-dhcpd4/files/isc_dhcpd.sh

cvs diff -r1.2 -r1.3 pkgsrc/net/isc-dhcpd4/Makefile (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcpd4/Makefile 2008/12/21 21:24:08 1.2
+++ pkgsrc/net/isc-dhcpd4/Makefile 2009/01/04 00:58:41 1.3
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.2 2008/12/21 21:24:08 adrianp Exp $ 1# $NetBSD: Makefile,v 1.3 2009/01/04 00:58:41 adrianp Exp $
2# 2#
3 3
 4PKGNAME= isc-dhcpd-${DHVER}
4COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Server 5COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Server
5COMPONENT= server 
6PKGREVISION= 1 
7SUBDIR= omapip dhcpctl server 6SUBDIR= omapip dhcpctl server
8 7
9CONF_FILES+= ${EGDIR}/dhcpd.conf ${PKG_SYSCONFDIR}/dhcpd.conf 8CONF_FILES+= ${EGDIR}/dhcpd.conf ${PKG_SYSCONFDIR}/dhcpd.conf
10RCD_SCRIPTS= isc_dhcpd 9RCD_SCRIPTS= isc_dhcpd
11FILES_SUBST+= DHCP_HOME=${DHCP_HOME} 10FILES_SUBST+= DHCP_HOME=${DHCP_HOME}
12 11
13.include "${.CURDIR}/../isc-dhcp4/options.mk" 12.include "${.CURDIR}/../isc-dhcp4/options.mk"
14 13
15post-install: 14post-install:
16 ${INSTALL_DATA_DIR} ${EGDIR} 15 ${INSTALL_DATA_DIR} ${EGDIR}
17 ${INSTALL_DATA} ${WRKSRC}/server/dhcpd.conf ${EGDIR} 16 ${INSTALL_DATA} ${WRKSRC}/server/dhcpd.conf ${EGDIR}
18 17
19.include "../../net/isc-dhcp4/Makefile.common" 18.include "../../net/isc-dhcp4/Makefile.common"

cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcpd4/PLIST (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcpd4/PLIST 2008/02/13 22:06:15 1.1.1.1
+++ pkgsrc/net/isc-dhcpd4/PLIST 2009/01/04 00:58:41 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2008/02/13 22:06:15 adrianp Exp $ 1@comment $NetBSD: PLIST,v 1.2 2009/01/04 00:58:41 adrianp Exp $
2bin/omshell 2bin/omshell
3lib/libdhcpctl.a 3lib/libdhcpctl.a
4lib/libomapi.a 4lib/libomapi.a
5man/man1/omshell.1 5man/man1/omshell.1
6man/man3/dhcpctl.3 6man/man3/dhcpctl.3
7man/man3/omapi.3 7man/man3/omapi.3
8man/man5/dhcpd.conf.5 8man/man5/dhcpd.conf.5
9man/man5/dhcpd.leases.5 9man/man5/dhcpd.leases.5
10man/man8/dhcpd.8 10man/man8/dhcpd.8
11sbin/dhcpd 11sbin/dhcpd
12share/examples/isc-dhcp-server/dhcpd.conf 12share/examples/isc-dhcpd/dhcpd.conf
13share/examples/rc.d/isc_dhcpd 13share/examples/rc.d/isc_dhcpd
14@dirrm share/examples/isc-dhcp-server 14@dirrm share/examples/isc-dhcpd

File Deleted: pkgsrc/net/isc-dhcpd4/Attic/distinfo

File Added: pkgsrc/net/isc-dhcpd4/files/isc_dhcpd.sh
#!@RCD_SCRIPTS_SHELL@
#
# $NetBSD: isc_dhcpd.sh,v 1.1 2009/01/04 00:58:42 adrianp Exp $
#

# PROVIDE: dhcpd
# REQUIRE: DAEMON
# BEFORE:  LOGIN

if [ -f /etc/rc.subr ]; then
        . /etc/rc.subr
fi

name="isc_dhcpd"
rcvar="${name}"
command="@PREFIX@/sbin/dhcpd"
pidfile="@VARBASE@/run/isc-dhcp/isc-dhcpd.pid"
required_files="@PKG_SYSCONFDIR@/dhcpd.conf"
start_precmd="isc_dhcpd_precmd"

isc_dhcpd_precmd()
{
	if [ ! -d @VARBASE@/run/isc-dhcp ]; then
		@MKDIR@ @VARBASE@/run/isc-dhcp
		@CHMOD@ 0770 @VARBASE@/run/isc-dhcp
	fi

	if [ ! -f @DHCP_HOME@/dhcpd.leases ]; then
		@MKDIR@ @DHCP_HOME@
		@TOUCH@ @DHCP_HOME@/dhcpd.leases
		@CHMOD@ 0640 @DHCP_HOME@/dhcpd.leases
	fi
}

load_rc_config $rcvar
run_rc_command "$1"