Sun Jan 4 00:56:32 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-dhcp4/Makefile
diff -r1.2 -r1.3 pkgsrc/net/isc-dhcp4/distinfo
diff -r1.3 -r1.4 pkgsrc/net/isc-dhcp4/Makefile.common
diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcp4/PLIST
diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcp4/buildlink3.mk
diff -r1.1.1.1 -r0 pkgsrc/net/isc-dhcp4/files/isc_dhclient.sh
diff -r1.1.1.1 -r0 pkgsrc/net/isc-dhcp4/files/isc_dhcpd.sh
diff -r1.1.1.1 -r0 pkgsrc/net/isc-dhcp4/files/isc_dhcrelay.sh
diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcp4/patches/patch-aa
diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcp4/patches/patch-ab
cvs diff -r1.2 -r1.3 pkgsrc/net/isc-dhcp4/Makefile (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcp4/Makefile 2008/12/21 21:24:08 1.2
+++ pkgsrc/net/isc-dhcp4/Makefile 2009/01/04 00:56:32 1.3
@@ -1,22 +1,21 @@ @@ -1,22 +1,21 @@
1# $NetBSD: Makefile,v 1.2 2008/12/21 21:24:08 adrianp Exp $ 1# $NetBSD: Makefile,v 1.3 2009/01/04 00:56:32 adrianp Exp $
2# 2#
3 3
 4PKGNAME= isc-dhcp-${DHVER}
4COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Base 5COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Base
5COMPONENT= base 
6PKGREVISION= 1 
7SUBDIR= includes common minires dst 6SUBDIR= includes common minires dst
8 7
9.include "options.mk" 8.include "options.mk"
10 9
11post-install: 10post-install:
12 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/isc-dhcp-${COMPONENT} 11 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGBASE}
13 12
14 ${INSTALL_DATA} ${WRKSRC}/README \ 13 ${INSTALL_DATA} ${WRKSRC}/README \
15 ${PREFIX}/share/doc/isc-dhcp-${COMPONENT} 14 ${PREFIX}/share/doc/${PKGBASE}
16 ${INSTALL_DATA} ${WRKSRC}/RELNOTES \ 15 ${INSTALL_DATA} ${WRKSRC}/RELNOTES \
17 ${PREFIX}/share/doc/isc-dhcp-${COMPONENT} 16 ${PREFIX}/share/doc/${PKGBASE}
18 ${INSTALL_DATA} ${WRKSRC}/doc/References.txt \ 17 ${INSTALL_DATA} ${WRKSRC}/doc/References.txt \
19 ${PREFIX}/share/doc/isc-dhcp-${COMPONENT} 18 ${PREFIX}/share/doc/${PKGBASE}
20 19
21.include "../../net/isc-dhcp4/Makefile.common" 20.include "../../net/isc-dhcp4/Makefile.common"
22.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/net/isc-dhcp4/distinfo (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcp4/distinfo 2008/12/21 21:24:08 1.2
+++ pkgsrc/net/isc-dhcp4/distinfo 2009/01/04 00:56:32 1.3
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.2 2008/12/21 21:24:08 adrianp Exp $ 1$NetBSD: distinfo,v 1.3 2009/01/04 00:56:32 adrianp Exp $
2 2
3SHA1 (dhcp-4.0.0.tar.gz) = acb4ab7634ba002893b15baba1443ef4d6c92201 3SHA1 (dhcp-4.1.0.tar.gz) = 46e161892140a3b60cd56e62b442f48f51bc605f
4RMD160 (dhcp-4.0.0.tar.gz) = 86963598124617bc7d1059262c75176db431f26d 4RMD160 (dhcp-4.1.0.tar.gz) = bf96fa9d135a65b4d9b27f8caf4f3744f0636c80
5Size (dhcp-4.0.0.tar.gz) = 1043725 bytes 5Size (dhcp-4.1.0.tar.gz) = 1086815 bytes
6SHA1 (patch-aa) = 162f8950cfcbb9647b81d8d1518867aaf8ec7905 6SHA1 (patch-aa) = 4090c4198ee16bd596d16a06856cfb5bb83dab81
7SHA1 (patch-ab) = cd38b5075d2f3a3121fb7dc9f870a6091c603ef1 7SHA1 (patch-ab) = 049a3a5037c91a83c0f3eb22e76d861d8c3aa801
8SHA1 (patch-ac) = 7079a37a7bbdf7ede805ecba61700ecf86fffaea 8SHA1 (patch-ac) = 7079a37a7bbdf7ede805ecba61700ecf86fffaea
cvs diff -r1.3 -r1.4 pkgsrc/net/isc-dhcp4/Makefile.common (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcp4/Makefile.common 2008/12/21 21:24:08 1.3
+++ pkgsrc/net/isc-dhcp4/Makefile.common 2009/01/04 00:56:32 1.4
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1# $NetBSD: Makefile.common,v 1.3 2008/12/21 21:24:08 adrianp Exp $ 1# $NetBSD: Makefile.common,v 1.4 2009/01/04 00:56:32 adrianp Exp $
2# 2#
3# used by net/isc-dhcp4/Makefile 3# used by net/isc-dhcp4/Makefile
4# used by net/isc-dhcpd4/Makefile 4# used by net/isc-dhcpd4/Makefile
5# used by net/isc-dhclient4/Makefile 5# used by net/isc-dhclient4/Makefile
6# used by net/isc-dhcrelay4/Makefile 6# used by net/isc-dhcrelay4/Makefile
7 7
8DISTNAME= dhcp-4.0.0 8DISTNAME= dhcp-4.1.0
9PKGNAME= ${DISTNAME:S/dhcp/isc-dhcp-${COMPONENT}/} 9DHVER= ${DISTNAME:S/dhcp-//}
10CATEGORIES= net 10CATEGORIES= net
11MASTER_SITES= http://ftp.isc.org/isc/dhcp/ 11MASTER_SITES= http://ftp.isc.org/isc/dhcp/
12 12
13MAINTAINER= adrianp@NetBSD.org 13MAINTAINER= adrianp@NetBSD.org
14HOMEPAGE= http://www.isc.org/sw/dhcp/dhcp4_0.php 14HOMEPAGE= https://www.isc.org/sw/dhcp
15 15
16CONFLICTS+= isc-dhcp-base-3.*{,nb*} 16CONFLICTS+= isc-dhcp-base-3.*{,nb*}
17 17
18.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
19 19
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
21DHCP_HOME?= ${VARBASE}/db/isc-dhcp 21DHCP_HOME?= ${VARBASE}/db/isc-dhcp
22DHCP_PID?= ${VARBASE}/run/isc-dhcp 22DHCP_PID?= ${VARBASE}/run/isc-dhcp
23PKG_SYSCONFSUBDIR= dhcp 23PKG_SYSCONFSUBDIR= dhcp
24 24
25FILESDIR= ${.CURDIR}/../isc-dhcp4/files 
26PATCHDIR= ${.CURDIR}/../isc-dhcp4/patches 25PATCHDIR= ${.CURDIR}/../isc-dhcp4/patches
27EGDIR= ${PREFIX}/share/examples/isc-dhcp-${COMPONENT} 26DISTINFO_FILE= ${.CURDIR}/../isc-dhcp4/distinfo
 27EGDIR= ${PREFIX}/share/examples/${PKGBASE}
28BUILD_DEFS+= VARBASE DHCP_HOME DHCP_PID 28BUILD_DEFS+= VARBASE DHCP_HOME DHCP_PID
29 29
30CONFIGURE_ARGS+= --localstatedir=${VARBASE} 30CONFIGURE_ARGS+= --localstatedir=${VARBASE}
31CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 31CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
32CONFIGURE_ARGS+= --with-srv-lease-file=${DHCP_HOME}/dhcpd.leases 32CONFIGURE_ARGS+= --with-srv-lease-file=${DHCP_HOME}/dhcpd.leases
33CONFIGURE_ARGS+= --with-cli-lease-file=${DHCP_HOME}/dhclient.leases 33CONFIGURE_ARGS+= --with-cli-lease-file=${DHCP_HOME}/dhclient.leases
34CONFIGURE_ARGS+= --with-srv-pid-file=${DHCP_PID}/isc-dhcpd.pid 34CONFIGURE_ARGS+= --with-srv-pid-file=${DHCP_PID}/isc-dhcpd.pid
35CONFIGURE_ARGS+= --with-cli-pid-file=${DHCP_PID}/isc-dhclient.pid 35CONFIGURE_ARGS+= --with-cli-pid-file=${DHCP_PID}/isc-dhclient.pid
36CONFIGURE_ARGS+= --with-relay-pid-file=${DHCP_PID}/isc-dhcrelay.pid 36CONFIGURE_ARGS+= --with-relay-pid-file=${DHCP_PID}/isc-dhcrelay.pid
37 37
38SUBST_CLASSES+= config 38SUBST_CLASSES+= config
39SUBST_STAGE.config= post-patch 39SUBST_STAGE.config= post-patch
40SUBST_FILES.config= includes/dhcpd.h 40SUBST_FILES.config= includes/dhcpd.h
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcp4/PLIST (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcp4/PLIST 2008/02/13 22:03:58 1.1.1.1
+++ pkgsrc/net/isc-dhcp4/PLIST 2009/01/04 00:56:32 1.2
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2008/02/13 22:03:58 adrianp Exp $ 1@comment $NetBSD: PLIST,v 1.2 2009/01/04 00:56:32 adrianp Exp $
2include/isc-dhcp/boolean.h 2include/isc-dhcp/boolean.h
3include/isc-dhcp/commandline.h 3include/isc-dhcp/commandline.h
4include/isc-dhcp/dst.h 4include/isc-dhcp/dst.h
5include/isc-dhcp/formatcheck.h 5include/isc-dhcp/formatcheck.h
6include/isc-dhcp/int.h 6include/isc-dhcp/int.h
7include/isc-dhcp/lang.h 7include/isc-dhcp/lang.h
8include/isc-dhcp/list.h 8include/isc-dhcp/list.h
9include/isc-dhcp/mem.h 9include/isc-dhcp/mem.h
10include/isc-dhcp/print.h 10include/isc-dhcp/print.h
11include/isc-dhcp/result.h 11include/isc-dhcp/result.h
12include/isc-dhcp/string.h 12include/isc-dhcp/string.h
13include/isc-dhcp/types.h 13include/isc-dhcp/types.h
14include/omapip/alloc.h 14include/omapip/alloc.h
15include/omapip/buffer.h 15include/omapip/buffer.h
16include/omapip/convert.h 16include/omapip/convert.h
17include/omapip/hash.h 17include/omapip/hash.h
18include/omapip/omapip.h 18include/omapip/omapip.h
19include/omapip/omapip_p.h 19include/omapip/omapip_p.h
20include/omapip/trace.h 20include/omapip/trace.h
21lib/libdst.a 21lib/libdst.a
22man/man5/dhcp-eval.5 22man/man5/dhcp-eval.5
23man/man5/dhcp-options.5 23man/man5/dhcp-options.5
24share/doc/isc-dhcp-base/README 24share/doc/isc-dhcp/README
25share/doc/isc-dhcp-base/RELNOTES 25share/doc/isc-dhcp/RELNOTES
26share/doc/isc-dhcp-base/References.txt 26share/doc/isc-dhcp/References.txt
27@dirrm share/doc/isc-dhcp-base 27@dirrm share/doc/isc-dhcp
28@dirrm include/isc-dhcp 28@dirrm include/isc-dhcp
29@dirrm include/omapip 29@dirrm include/omapip
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcp4/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcp4/buildlink3.mk 2008/02/13 22:03:58 1.1.1.1
+++ pkgsrc/net/isc-dhcp4/buildlink3.mk 2009/01/04 00:56:32 1.2
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/02/13 22:03:58 adrianp Exp $ 1# $NetBSD: buildlink3.mk,v 1.2 2009/01/04 00:56:32 adrianp Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4ISC_DHCP_BASE_BUILDLINK3_MK:= ${ISC_DHCP_BASE_BUILDLINK3_MK}+ 4ISC_DHCP_BUILDLINK3_MK:= ${ISC_DHCP_BUILDLINK3_MK}+
5 5
6.if ${BUILDLINK_DEPTH} == "+" 6.if ${BUILDLINK_DEPTH} == "+"
7BUILDLINK_DEPENDS+= isc-dhcp-base 7BUILDLINK_DEPENDS+= isc-dhcp
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nisc-dhcp-base} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nisc-dhcp}
11BUILDLINK_PACKAGES+= isc-dhcp-base 11BUILDLINK_PACKAGES+= isc-dhcp
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}isc-dhcp-base 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}isc-dhcp
13 13
14.if ${ISC_DHCP_BASE_BUILDLINK3_MK} == "+" 14.if ${ISC_DHCP_BUILDLINK3_MK} == "+"
15BUILDLINK_API_DEPENDS.isc-dhcp-base+= isc-dhcp-base>=4.0.0 15BUILDLINK_API_DEPENDS.isc-dhcp+= isc-dhcp>=4.1.0
16BUILDLINK_PKGSRCDIR.isc-dhcp-base?= ../../net/isc-dhcp4 16BUILDLINK_PKGSRCDIR.isc-dhcp?= ../../net/isc-dhcp4
17.endif # ISC_DHCP_BASE_BUILDLINK3_MK 17.endif # ISC_DHCP_BUILDLINK3_MK
18 18
19BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 19BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
File Deleted: pkgsrc/net/isc-dhcp4/files/Attic/isc_dhclient.sh
File Deleted: pkgsrc/net/isc-dhcp4/files/Attic/isc_dhcpd.sh
File Deleted: pkgsrc/net/isc-dhcp4/files/Attic/isc_dhcrelay.sh
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcp4/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcp4/patches/patch-aa 2008/02/13 22:03:58 1.1.1.1
+++ pkgsrc/net/isc-dhcp4/patches/patch-aa 2009/01/04 00:56:32 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-aa,v 1.1.1.1 2008/02/13 22:03:58 adrianp Exp $ 1$NetBSD: patch-aa,v 1.2 2009/01/04 00:56:32 adrianp Exp $
2 2
3--- server/Makefile.in.orig 2007-12-14 18:26:36.000000000 +0000 3--- server/Makefile.in.orig 2008-12-05 20:14:57.000000000 +0000
4+++ server/Makefile.in 4+++ server/Makefile.in
5@@ -367,13 +367,6 @@ uninstall-man8: 5@@ -360,13 +360,6 @@ uninstall-man8:
6 done 6 done
7 install-dist_sysconfDATA: $(dist_sysconf_DATA) 7 install-dist_sysconfDATA: $(dist_sysconf_DATA)
8 @$(NORMAL_INSTALL) 8 @$(NORMAL_INSTALL)
9- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" 9- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
10- @list='$(dist_sysconf_DATA)'; for p in $$list; do \ 10- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
11- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ 11- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
12- f=$(am__strip_dir) \ 12- f=$(am__strip_dir) \
13- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ 13- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
14- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ 14- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
15- done 15- done
16  16
17 uninstall-dist_sysconfDATA: 17 uninstall-dist_sysconfDATA:
18 @$(NORMAL_UNINSTALL) 18 @$(NORMAL_UNINSTALL)
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcp4/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcp4/patches/patch-ab 2008/02/13 22:03:58 1.1.1.1
+++ pkgsrc/net/isc-dhcp4/patches/patch-ab 2009/01/04 00:56:32 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-ab,v 1.1.1.1 2008/02/13 22:03:58 adrianp Exp $ 1$NetBSD: patch-ab,v 1.2 2009/01/04 00:56:32 adrianp Exp $
2 2
3--- client/Makefile.in.orig 2007-12-14 18:26:07.000000000 +0000 3--- client/Makefile.in.orig 2008-12-05 20:14:48.000000000 +0000
4+++ client/Makefile.in 4+++ client/Makefile.in
5@@ -347,13 +347,6 @@ uninstall-man8: 5@@ -341,13 +341,6 @@ uninstall-man8:
6 done 6 done
7 install-dist_sysconfDATA: $(dist_sysconf_DATA) 7 install-dist_sysconfDATA: $(dist_sysconf_DATA)
8 @$(NORMAL_INSTALL) 8 @$(NORMAL_INSTALL)
9- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" 9- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
10- @list='$(dist_sysconf_DATA)'; for p in $$list; do \ 10- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
11- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ 11- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
12- f=$(am__strip_dir) \ 12- f=$(am__strip_dir) \
13- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ 13- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
14- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ 14- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
15- done 15- done
16  16
17 uninstall-dist_sysconfDATA: 17 uninstall-dist_sysconfDATA:
18 @$(NORMAL_UNINSTALL) 18 @$(NORMAL_UNINSTALL)