Update to 3.1.2

Changes since 3.1.2rc1
* None.

Changes since 3.1.2b1
* Fix handling of domain-search option to append "." as already done with 4.x.

Changes since 3.1.1
* A double-dereference in dhclient transmission of DHCPDECLINEs was repaired.
* Fix handling of -A and -a flags in dhcrelay; it was failing to expand packet size as needed to add relay agent options.
* Corrected list of failover state values in dhcpd man page.
* Fixed a bug that caused some request types to be logged incorrectly.
* Fixed a coredump when adding a class via OMAPI.
* Clients that sent a parameter request list containing the routers option before the subnet mask option were receiving only the latter. Fixed.
* The server wasn't always sending the FQDN option when it should.
* A partner-down failover server no longer emits 'peer holds all free leases' if it is able to newly-allocate one of the peer's leases.
* A cosmetic bug in DHCPDECLINE processing was fixed which caused all successful DHCPDECLINEs to be logged as "not found" rather than "abandoned".
* Some failover debugging #defines have been better defined and some high frequency messages moved to a deeper debugging symbol.
* The CLTT parameter in failover is now only updated by client activity, and not by failover binding updates (taking on the peer's CLTT).
* Failover BNDUPD messages are now discarded if they conflict with an update that has been trasnmitted, but not acknowledged.
* A bug cleaning up unknown-xxx temporary option definitions was fixed.

Changes since 3.1.1rc2
* None.

Changes since 3.1.1rc1
* Changes in 4.0.x to common/options.c "pretty_domain()" (which turns wireformat rfc1035 into printable form for dhclient.leases) were pulled down. This addresses a bug where "option domain-search , ;" would appear in dhclient.leases.
* Changes in 4.0.x to common/tables.c "option_dereference()" were pulled down. This addresses a bug where overlapping option code definitions in a config file may cause an attempt to free a NULL pointer.

Changes since 3.1.1b1
* A memory leak when using omapi has been fixed.

7 files changed, 20 insertions, 22 deletions

diff --git a/net/isc-dhclient/Makefile b/net/isc-dhclient/Makefile
index e8e982abeca..f6f3c1c00b1 100644
--- a/net/isc-dhclient/Makefile
+++ b/net/isc-dhclient/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2008/06/16 14:52:58 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2009/03/05 23:35:12 adrianp Exp $
 #
 
 COMMENT=	ISC Dynamic Host Configuration Protocol (DHCP) Client
 COMPONENT=	client
 SUBDIR=		client
-PKGREVISION=	1
 
 CONFLICTS+=	isc-dhclient-[0-9]*
 
diff --git a/net/isc-dhclient/distinfo b/net/isc-dhclient/distinfo
index c1af1bd870e..dcc200664bf 100644
--- a/net/isc-dhclient/distinfo
+++ b/net/isc-dhclient/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2008/05/27 19:35:16 adrianp Exp $
+$NetBSD: distinfo,v 1.3 2009/03/05 23:35:12 adrianp Exp $
 
-SHA1 (dhcp-3.1.1.tar.gz) = 3f7e013cb62aed0f3af45bdd97424d8b63e9c280
-RMD160 (dhcp-3.1.1.tar.gz) = 08ed15d26ca64928e1d3b07c631cbbfa9a3dc8cb
-Size (dhcp-3.1.1.tar.gz) = 798228 bytes
+SHA1 (dhcp-3.1.2.tar.gz) = a60cccec2402a35025ddaafc8ac896595188560e
+RMD160 (dhcp-3.1.2.tar.gz) = 026ac48b176ec273397fafa8a834a21fd6331681
+Size (dhcp-3.1.2.tar.gz) = 799626 bytes
 SHA1 (patch-ab) = e5d0a682c0228ce1c63533fe361f5649d5dd2c17
 SHA1 (patch-ad) = bd10d5f519065ecbd061f3ccff6685c390a1118a
diff --git a/net/isc-dhcp/Makefile.common b/net/isc-dhcp/Makefile.common
index 08fe9936b38..dbdc3cb8b94 100644
--- a/net/isc-dhcp/Makefile.common
+++ b/net/isc-dhcp/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.3 2008/05/27 19:34:30 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.4 2009/03/05 23:35:12 adrianp Exp $
 #
 # used by net/isc-dhcp/Makefile
 # used by net/isc-dhcpd/Makefile
 # used by net/isc-dhclient/Makefile
 # used by net/isc-dhcrelay/Makefile
 
-DISTNAME=		dhcp-3.1.1
+DISTNAME=		dhcp-3.1.2
 PKGNAME=		${DISTNAME:S/dhcp/isc-dhcp-${COMPONENT}/}
 CATEGORIES=		net
 MASTER_SITES=		http://ftp.isc.org/isc/dhcp/ \
diff --git a/net/isc-dhcp/distinfo b/net/isc-dhcp/distinfo
index 5d0cf790f0b..dcc200664bf 100644
--- a/net/isc-dhcp/distinfo
+++ b/net/isc-dhcp/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2008/05/27 19:34:30 adrianp Exp $
+$NetBSD: distinfo,v 1.3 2009/03/05 23:35:12 adrianp Exp $
 
-SHA1 (dhcp-3.1.1.tar.gz) = 3f7e013cb62aed0f3af45bdd97424d8b63e9c280
-RMD160 (dhcp-3.1.1.tar.gz) = 08ed15d26ca64928e1d3b07c631cbbfa9a3dc8cb
-Size (dhcp-3.1.1.tar.gz) = 798228 bytes
+SHA1 (dhcp-3.1.2.tar.gz) = a60cccec2402a35025ddaafc8ac896595188560e
+RMD160 (dhcp-3.1.2.tar.gz) = 026ac48b176ec273397fafa8a834a21fd6331681
+Size (dhcp-3.1.2.tar.gz) = 799626 bytes
 SHA1 (patch-ab) = e5d0a682c0228ce1c63533fe361f5649d5dd2c17
 SHA1 (patch-ad) = bd10d5f519065ecbd061f3ccff6685c390a1118a
diff --git a/net/isc-dhcpd/distinfo b/net/isc-dhcpd/distinfo
index 62623495c58..dcc200664bf 100644
--- a/net/isc-dhcpd/distinfo
+++ b/net/isc-dhcpd/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2008/05/27 19:35:49 adrianp Exp $
+$NetBSD: distinfo,v 1.3 2009/03/05 23:35:12 adrianp Exp $
 
-SHA1 (dhcp-3.1.1.tar.gz) = 3f7e013cb62aed0f3af45bdd97424d8b63e9c280
-RMD160 (dhcp-3.1.1.tar.gz) = 08ed15d26ca64928e1d3b07c631cbbfa9a3dc8cb
-Size (dhcp-3.1.1.tar.gz) = 798228 bytes
+SHA1 (dhcp-3.1.2.tar.gz) = a60cccec2402a35025ddaafc8ac896595188560e
+RMD160 (dhcp-3.1.2.tar.gz) = 026ac48b176ec273397fafa8a834a21fd6331681
+Size (dhcp-3.1.2.tar.gz) = 799626 bytes
 SHA1 (patch-ab) = e5d0a682c0228ce1c63533fe361f5649d5dd2c17
 SHA1 (patch-ad) = bd10d5f519065ecbd061f3ccff6685c390a1118a
diff --git a/net/isc-dhcrelay/Makefile b/net/isc-dhcrelay/Makefile
index 1d63df318e5..dbe485e4f4f 100644
--- a/net/isc-dhcrelay/Makefile
+++ b/net/isc-dhcrelay/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2008/06/16 14:52:58 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/03/05 23:35:12 adrianp Exp $
 #
 
 COMMENT=	ISC Dynamic Host Configuration Protocol (DHCP) Relay
 COMPONENT=	relay
 SUBDIR=		relay
-PKGREVISION=	1
 
 RCD_SCRIPTS=	isc_dhcrelay
 MAN_FILES=	man8/dhcrelay.8
diff --git a/net/isc-dhcrelay/distinfo b/net/isc-dhcrelay/distinfo
index 0c44754f669..dcc200664bf 100644
--- a/net/isc-dhcrelay/distinfo
+++ b/net/isc-dhcrelay/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2008/05/27 19:35:36 adrianp Exp $
+$NetBSD: distinfo,v 1.3 2009/03/05 23:35:12 adrianp Exp $
 
-SHA1 (dhcp-3.1.1.tar.gz) = 3f7e013cb62aed0f3af45bdd97424d8b63e9c280
-RMD160 (dhcp-3.1.1.tar.gz) = 08ed15d26ca64928e1d3b07c631cbbfa9a3dc8cb
-Size (dhcp-3.1.1.tar.gz) = 798228 bytes
+SHA1 (dhcp-3.1.2.tar.gz) = a60cccec2402a35025ddaafc8ac896595188560e
+RMD160 (dhcp-3.1.2.tar.gz) = 026ac48b176ec273397fafa8a834a21fd6331681
+Size (dhcp-3.1.2.tar.gz) = 799626 bytes
 SHA1 (patch-ab) = e5d0a682c0228ce1c63533fe361f5649d5dd2c17
 SHA1 (patch-ad) = bd10d5f519065ecbd061f3ccff6685c390a1118a