updating the isc-dhcp packages to 4.1.1-P1

Changelog:
			      NEW FEATURES

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

- Support for the rapid-commit option on the client side

- Prefix Delegation support

- IA_TA address support

- A basic DHCPv6 relay agent

- Basic and partial DHCPv6 leasequery support

There are a number of DHCPv6 limitations and features missing in this
release, which will be addressed in the future:

- Only Solaris, Linux, FreeBSD, NetBSD, and OpenBSD are supported.

- Only a single address is supported per IA.

- DHCPv6 includes human-readable text in status code messages. These
  should be configurable, and probably localized via gettext() or the
  like.

- The "host-identifier" option is limited to a simple token.

- The client and server can only operate DHCPv4 or DHCPv6 at a time,
  not both.  To use both protocols simultaneously, two instances of the
  relevant daemon are required, one with the '-6' command line option.

For information on how to install, configure and run this software, as
well as how to find documentation and report bugs, please consult the
README file.

ISC DHCP uses standard GNU configure for installation. Please review the
output of "./configure --help" to see what options are available.

The system has only been tested on Linux, FreeBSD, and Solaris, and may not
work on other platforms. Please report any problems and suggested fixes to
<dhcp-users@isc.org>.

                        Changes since 4.1.1

- A bug was fixed that could cause the DHCPv6 server to advertise/assign a
  previously allocated (active) lease to a client that has changed subnets,
  despite being on different shared networks.  Dynamic prefixes specifically
  allocated in shared networks also now are not offered if the client has
  moved.  [ISC-Bugs #21152]

! Accept a client id of length 0 while hashing.  Previously the server would
  exit if it attempted to hash a zero length client id, providing attackers
  with a simple denial of service attack.  [ISC-Bugs #21253]

                        Changes since 4.1.1rc1

- When using 'ignore client-updates;', the FQDN returned to the client
  is no longer truncated to one octet.

                        Changes since 4.1.1b3

- None.

			Changes since 4.1.1b2

- Fix test in dhcp_interface_signal_handler to check that the inner handler
  has a signal_handler before calling it.

- Both host and subnet6 configuration groups are now included whether a
  fixed-address6 (DHCPv6) is in use or not.  Host scoped configuration takes
  precedence.  This fixes two bugs, one where host scoped configuration
  would not be included from a non-fixed-address6 host record, and the equal
  and opposite bug where subnet6 scoped configuration would not be used when
  over-riding values were not present in a matching fixed-address6 host
  configuration.

- ./configure now checks to ensure the intX_t and u_intX_t types are defined,
  correcting a compilation failure when using Sun's compiler.

- Modified the handling of a connection to avoid releasing the omapi io
  object for the connection while it is still in use.  One symptom from
  this error was a segfault when a failover secondary attempted to connect
  to the failover primary if their clocks were not synchronized.

			Changes since 4.1.1b1

- Remove infinite loop in token_print_indent_concat().

- Memory leak in the load_balance_mine() function is fixed.  This would
  leak ~20-30 octets per DHCPDISCOVER packet while failover was in use
  and in normal state.

- Various compilation fixes have been included for the memory related
  DEBUG #defines in includes/site.h.

- Fixed Linux client script 'unary operator expected' errors with DHCPv6.

- Fixed setting hostname in Linux hosts that require hostname argument
  to be double-quoted.  Also allow server-provided hostname to
  override hostnames 'localhost' and '(none)'.

- Added client support for setting interface MTU and metric, thanks to
  Roy "UberLord" Marples <roy@marples.name>.

- Fixed failover reconnection retry code to continue to retry to reconnect
  rather than restarting the listener.

- Compilation on Solaris with USE_SOCKETS defined in includes/site.h has
  been repaired.  Other USE_ overrides should work better.

- A check for the local flavor of IFNAMSIZ had a broken 'else' condition,
  that probably still resulted in the correct behaviour (but wouldn't use
  a larger defined value provided by the host OS).

- Fixed a bug where an OMAPI socket disconnection message would not result
  in scheduling a failover reconnection, if the link had not negotiated a
  failover connect yet (e.g.: connection refused, asynch socket connect()
  timeouts).

- A bug was fixed that caused the 'conflict-done' state to fail to be parsed
  in failover state records.

! A stack overflow vulnerability was fixed in dhclient that could allow
  remote attackers to execute arbitrary commands as root on the system,
  or simply terminate the client, by providing an over-long subnet-mask
  option.  CERT VU#410676 - CVE-2009-0692

- Versions 3.0.x syntax with multiple name->code option definitions is now
  supported.  Note that, similarly to 3.0.x, for by-code lookups only the
  last option definition is used.

- Fixed a bug where a time difference of greater than 60 seconds between a
  failover pair could cause the primary to crash on contact with the
  secondary.  Thanks to a patch from Steinar Haug.

- Don't look for IPv6 interfaces on Linux when running in DHCPv4 mode.
  Thanks to patches from Matthew Newton and David Cantrell.

- Secondary servers in a failover pair will now perform ddns removals if
  they had performed ddns updates on a lease that is expiring, or was
  released through the primary.  As part of the same fix, stale binding scopes
  will now be removed if a change in identity of a lease's active client is
  detected, rather than simply if a lease is noticed to have expired (which it
  may have expired without a failover server noticing in some situations).

- A patch supplied by David Cantrell at RedHat was applied that detects
  invalid calling parameters given to the ns_name_ntop() function.
  Specifically, it detects if the caller passed a pointer and size pair
  that causes the pointer to integer-wrap past zero.

! Fixed a fenceposting bug when a client had two host records configured,
  one using 'uid' and the other using 'hardware ethernet'.  CVE-2009-1892

			Changes since 4.1.0

- Validate the argument to the -p option.

- The notorious 'option <unknown> ... larger than buffer' log line,
  which is seen in some malformed DHCP client packets, was modified.
  It now logs the universe name, and does not log the length values
  (which are bogus corruption read from the packet anyway).  It also
  carries a hopefully more useful explanation.

- A bug was fixed that caused the server not to answer some valid Solicit
  and Request packets, if the dynamic range covering any requested addresses
  had been deleted from configuration.

- Suppress spurious warnings from configure about --datarootdir

- Update the code to deal with GCC 4.3.  This included two sets of changes.
  The first is to the configuration files to include the use of
  AC_USE_SYSTEM_EXTENSIONS.  The second is to deal with return values that
  were being ignored.

- The db-time-format option was documented in manpages.

- Using reserved leases no longer results in 'lease with binding state
  free not on its queue' error messages, thanks to a patch from Frode
  Nordahl.

- DDNS removal routines were updated so that the DHCID is not removed until
  the client has been deprived of all A and AAAA records (not only the last
  one of either of those).  This resolves a bug where dual stack clients
  would not be able to regain their names after either expiration event.

- Fix a build error in dhcrelay, using older versions of gcc with
  dhcpv6 disabled.

- Two uninitialized stack structures are now memset to zero, thanks to
  patch from David Cantrell at Red Hat.

- Fixed a cosmetic bug where pretty-printing valid domain-search options would
  result in an erroneous error log message ('garbage in format string').

- A bug in DLPI packet transmission (Solaris, HP/UX) that caused the server
  to stop receiving packets is fixed.  The same fix also means that the MAC
  address will no longer appear 'bogus' on DLPI-based systems.

- A bug in select handling was discovered where the results of one select()
  call were discarded, causing the server to process the next select() call
  and use more system calls than required.  This has been repaired - the
  sockets will be handled after the first return from select(), resulting in
  fewer system calls.

- The update-conflict-detection feature would leave an FQDN updated without
  a DHCID (still currently implemented as a TXT RR).  This would cause later
  expiration or release events to fail to remove the domain name.  The feature
  now also inserts the client's up to date DHCID record, so records may safely
  be removed at expiration or release time.  Thanks to a patch submitted by
  Christof Chen.

5 files changed, 21 insertions, 19 deletions

diff --git a/net/isc-dhcp4/Makefile b/net/isc-dhcp4/Makefile
index 56f46d94536..c8effeb40d4 100644
--- a/net/isc-dhcp4/Makefile
+++ b/net/isc-dhcp4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2010/06/25 21:56:46 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2010/09/24 20:29:27 spz Exp $
 #
 
 PKGNAME=	isc-dhcp-${DHVER}
-PKGREVISION=	1
 COMMENT=	ISC Dynamic Host Configuration Protocol (DHCP) Base
 SUBDIR=		includes common minires dst
 
diff --git a/net/isc-dhcp4/Makefile.common b/net/isc-dhcp4/Makefile.common
index 3b229d58e6b..f87afe21e3f 100644
--- a/net/isc-dhcp4/Makefile.common
+++ b/net/isc-dhcp4/Makefile.common
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile.common,v 1.7 2010/06/25 21:56:46 joerg Exp $
+# $NetBSD: Makefile.common,v 1.8 2010/09/24 20:29:28 spz Exp $
 #
 # used by net/isc-dhcp4/Makefile
 # used by net/isc-dhcpd4/Makefile
 # used by net/isc-dhclient4/Makefile
 # used by net/isc-dhcrelay4/Makefile
 
-DISTNAME=		dhcp-4.1.0p1
-DHVER=			${DISTNAME:S/dhcp-//}
+DISTNAME=		dhcp-4.1.1-P1
+DHVER=			${DISTNAME:S/dhcp-//:S/-P/p/}
 CATEGORIES=		net
 MASTER_SITES=		http://ftp.isc.org/isc/dhcp/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		https://www.isc.org/sw/dhcp
+LICENSE=		isc
 
 CONFLICTS+=		isc-dhcp-base-3.*{,nb*}
 
@@ -22,6 +23,8 @@ DHCP_HOME?=		${VARBASE}/db/isc-dhcp
 DHCP_PID?=		${VARBASE}/run/isc-dhcp
 PKG_SYSCONFSUBDIR=	dhcp
 
+USE_LANGUAGES+=		c c++
+
 PATCHDIR=		${.CURDIR}/../isc-dhcp4/patches
 DISTINFO_FILE= 		${.CURDIR}/../isc-dhcp4/distinfo
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
diff --git a/net/isc-dhcp4/distinfo b/net/isc-dhcp4/distinfo
index d46ccde1b68..2dd6318577f 100644
--- a/net/isc-dhcp4/distinfo
+++ b/net/isc-dhcp4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2009/07/16 18:41:11 adrianp Exp $
+$NetBSD: distinfo,v 1.5 2010/09/24 20:29:28 spz Exp $
 
-SHA1 (dhcp-4.1.0p1.tar.gz) = 71cd106f518283f6af55d3a6006b7e8f34ffe0e0
-RMD160 (dhcp-4.1.0p1.tar.gz) = ac8472946615e2a45a8e8a64474d437f328d5439
-Size (dhcp-4.1.0p1.tar.gz) = 1073227 bytes
-SHA1 (patch-aa) = 4090c4198ee16bd596d16a06856cfb5bb83dab81
-SHA1 (patch-ab) = 049a3a5037c91a83c0f3eb22e76d861d8c3aa801
+SHA1 (dhcp-4.1.1-P1.tar.gz) = e9e756df09502f6666cd79bdf0ab3af0f92b41b0
+RMD160 (dhcp-4.1.1-P1.tar.gz) = d963e87a24e4dd8f98002577446169773a0b8422
+Size (dhcp-4.1.1-P1.tar.gz) = 1085414 bytes
+SHA1 (patch-aa) = d55d7d6fae1ebaae4351b7c419c8750aeed77d2c
+SHA1 (patch-ab) = 5e26435c3aab88d2752d7ebf2ba2822a69df5c73
 SHA1 (patch-ac) = 7079a37a7bbdf7ede805ecba61700ecf86fffaea
diff --git a/net/isc-dhcp4/patches/patch-aa b/net/isc-dhcp4/patches/patch-aa
index fc373da0828..0df0ec74d7b 100644
--- a/net/isc-dhcp4/patches/patch-aa
+++ b/net/isc-dhcp4/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2009/01/04 00:56:32 adrianp Exp $
+$NetBSD: patch-aa,v 1.3 2010/09/24 20:29:28 spz Exp $
 
---- server/Makefile.in.orig	2008-12-05 20:14:57.000000000 +0000
+--- server/Makefile.in.orig	2010-05-17 20:52:18.000000000 +0000
 +++ server/Makefile.in
-@@ -360,13 +360,6 @@ uninstall-man8:
+@@ -368,13 +368,6 @@ uninstall-man8:
  	done
  install-dist_sysconfDATA: $(dist_sysconf_DATA)
  	@$(NORMAL_INSTALL)
--	test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
+-	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
 -	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
 -	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 -	  f=$(am__strip_dir) \
diff --git a/net/isc-dhcp4/patches/patch-ab b/net/isc-dhcp4/patches/patch-ab
index 647e39e6974..fe93f636208 100644
--- a/net/isc-dhcp4/patches/patch-ab
+++ b/net/isc-dhcp4/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.2 2009/01/04 00:56:32 adrianp Exp $
+$NetBSD: patch-ab,v 1.3 2010/09/24 20:29:28 spz Exp $
 
---- client/Makefile.in.orig	2008-12-05 20:14:48.000000000 +0000
+--- client/Makefile.in.orig	2010-07-10 03:26:17.000000000 +0000
 +++ client/Makefile.in
-@@ -341,13 +341,6 @@ uninstall-man8:
+@@ -350,13 +350,6 @@ uninstall-man8:
  	done
  install-dist_sysconfDATA: $(dist_sysconf_DATA)
  	@$(NORMAL_INSTALL)
--	test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
+-	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
 -	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
 -	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 -	  f=$(am__strip_dir) \