Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/dhcp/dist updat to 4.2.5



details:   https://anonhg.NetBSD.org/src/rev/ea4fef4cf13b
branches:  trunk
changeset: 785688:ea4fef4cf13b
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Mar 24 22:50:21 2013 +0000

description:
updat to 4.2.5

diffstat:

 external/bsd/dhcp/dist/LICENSE                           |     2 +-
 external/bsd/dhcp/dist/Makefile.am                       |     3 +-
 external/bsd/dhcp/dist/Makefile.in                       |    12 +-
 external/bsd/dhcp/dist/README                            |    56 +-
 external/bsd/dhcp/dist/RELNOTES                          |   257 +-
 external/bsd/dhcp/dist/aclocal.m4                        |     4 +-
 external/bsd/dhcp/dist/client/Makefile.am                |     2 +-
 external/bsd/dhcp/dist/client/Makefile.in                |     4 +-
 external/bsd/dhcp/dist/client/clparse.c                  |    17 +-
 external/bsd/dhcp/dist/client/dhclient-script.8          |    27 +-
 external/bsd/dhcp/dist/client/dhclient.8                 |    66 +-
 external/bsd/dhcp/dist/client/dhclient.conf.5            |   143 +-
 external/bsd/dhcp/dist/client/dhclient.conf.example      |    36 +
 external/bsd/dhcp/dist/client/dhclient.leases.5          |     6 +-
 external/bsd/dhcp/dist/client/scripts/freebsd            |     2 +-
 external/bsd/dhcp/dist/client/scripts/macos              |     2 +-
 external/bsd/dhcp/dist/common/Makefile.am                |     6 +-
 external/bsd/dhcp/dist/common/Makefile.in                |     9 +-
 external/bsd/dhcp/dist/common/alloc.c                    |    15 +-
 external/bsd/dhcp/dist/common/comapi.c                   |    71 +-
 external/bsd/dhcp/dist/common/dhcp-eval.5                |   166 +-
 external/bsd/dhcp/dist/common/dhcp-options.5             |   175 +-
 external/bsd/dhcp/dist/common/execute.c                  |   139 +-
 external/bsd/dhcp/dist/common/lpf.c                      |     9 +-
 external/bsd/dhcp/dist/common/options.c                  |   288 +-
 external/bsd/dhcp/dist/common/packet.c                   |    53 +-
 external/bsd/dhcp/dist/common/parse.c                    |   241 +-
 external/bsd/dhcp/dist/common/print.c                    |    23 +-
 external/bsd/dhcp/dist/common/socket.c                   |    89 +-
 external/bsd/dhcp/dist/common/tables.c                   |    14 +-
 external/bsd/dhcp/dist/common/tests/Atffile              |     5 +
 external/bsd/dhcp/dist/common/tests/Makefile.am          |    23 +-
 external/bsd/dhcp/dist/common/tests/Makefile.in          |   313 +-
 external/bsd/dhcp/dist/common/tests/test_alloc.c         |   772 ++---
 external/bsd/dhcp/dist/common/tree.c                     |   132 +-
 external/bsd/dhcp/dist/configure                         |   227 +-
 external/bsd/dhcp/dist/configure.ac                      |   115 +-
 external/bsd/dhcp/dist/contrib/3.0b1-lease-convert       |     4 +-
 external/bsd/dhcp/dist/dhcpctl/Makefile.in               |     2 +
 external/bsd/dhcp/dist/dhcpctl/dhcpctl.3                 |     4 +-
 external/bsd/dhcp/dist/dhcpctl/dhcpctl.h                 |     6 +-
 external/bsd/dhcp/dist/dhcpctl/omshell.1                 |    13 +-
 external/bsd/dhcp/dist/doc/Makefile                      |    15 +
 external/bsd/dhcp/dist/doc/References.html               |    12 +-
 external/bsd/dhcp/dist/doc/References.txt                |   198 +-
 external/bsd/dhcp/dist/doc/References.xml                |    11 +-
 external/bsd/dhcp/dist/doc/devel/doxyfile.in             |  1792 ++++++++++++++
 external/bsd/dhcp/dist/doc/ja_JP.eucJP/dhclient-script.8 |     4 +-
 external/bsd/dhcp/dist/doc/ja_JP.eucJP/dhclient.8        |     4 +-
 external/bsd/dhcp/dist/doc/ja_JP.eucJP/dhclient.conf.5   |     4 +-
 external/bsd/dhcp/dist/doc/ja_JP.eucJP/dhclient.leases.5 |     4 +-
 external/bsd/dhcp/dist/doc/ja_JP.eucJP/dhcp-eval.5       |     4 +-
 external/bsd/dhcp/dist/doc/ja_JP.eucJP/dhcp-options.5    |     4 +-
 external/bsd/dhcp/dist/dst/Makefile.in                   |     2 +
 external/bsd/dhcp/dist/dst/dst_api.c                     |    22 +-
 external/bsd/dhcp/dist/dst/dst_support.c                 |    21 +-
 external/bsd/dhcp/dist/dst/hmac_link.c                   |    35 +-
 external/bsd/dhcp/dist/dst/prandom.c                     |    46 +-
 external/bsd/dhcp/dist/includes/Makefile.in              |     2 +
 external/bsd/dhcp/dist/includes/arpa/nameser.h           |     4 +-
 external/bsd/dhcp/dist/includes/arpa/nameser_compat.h    |     4 +-
 external/bsd/dhcp/dist/includes/cdefs.h                  |    20 +-
 external/bsd/dhcp/dist/includes/config.h.in              |     6 +
 external/bsd/dhcp/dist/includes/dhcp.h                   |     7 +-
 external/bsd/dhcp/dist/includes/dhctoken.h               |     9 +-
 external/bsd/dhcp/dist/includes/heap.h                   |     4 +-
 external/bsd/dhcp/dist/includes/omapip/omapip_p.h        |     6 +-
 external/bsd/dhcp/dist/includes/site.h                   |    50 +-
 external/bsd/dhcp/dist/includes/t_api.h                  |     4 +-
 external/bsd/dhcp/dist/omapip/Makefile.in                |     2 +
 external/bsd/dhcp/dist/omapip/alloc.c                    |    10 +-
 external/bsd/dhcp/dist/omapip/buffer.c                   |    11 +-
 external/bsd/dhcp/dist/omapip/connection.c               |    35 +-
 external/bsd/dhcp/dist/omapip/handle.c                   |     8 +-
 external/bsd/dhcp/dist/omapip/iscprint.c                 |     6 +-
 external/bsd/dhcp/dist/omapip/listener.c                 |    22 +-
 external/bsd/dhcp/dist/omapip/protocol.c                 |    38 +-
 external/bsd/dhcp/dist/omapip/support.c                  |    17 +-
 external/bsd/dhcp/dist/omapip/trace.c                    |    19 +-
 external/bsd/dhcp/dist/relay/Makefile.in                 |     2 +
 external/bsd/dhcp/dist/relay/dhcrelay.8                  |    10 +-
 external/bsd/dhcp/dist/server/Makefile.am                |     8 +-
 external/bsd/dhcp/dist/server/Makefile.in                |   202 +-
 external/bsd/dhcp/dist/server/bootp.c                    |    63 +-
 external/bsd/dhcp/dist/server/class.c                    |     9 +-
 external/bsd/dhcp/dist/server/confpars.c                 |   184 +-
 external/bsd/dhcp/dist/server/db.c                       |    34 +-
 external/bsd/dhcp/dist/server/dhcp.c                     |   288 +-
 external/bsd/dhcp/dist/server/dhcpd.8                    |    94 +-
 external/bsd/dhcp/dist/server/dhcpd.c                    |    13 +-
 external/bsd/dhcp/dist/server/dhcpd.conf.5               |   465 +-
 external/bsd/dhcp/dist/server/dhcpd.conf.example         |   104 +
 external/bsd/dhcp/dist/server/dhcpd.leases.5             |     4 +-
 external/bsd/dhcp/dist/server/failover.c                 |    90 +-
 external/bsd/dhcp/dist/server/ldap.c                     |     4 +-
 external/bsd/dhcp/dist/server/mdb.c                      |    88 +-
 external/bsd/dhcp/dist/server/omapi.c                    |    68 +-
 external/bsd/dhcp/dist/server/salloc.c                   |    51 +-
 external/bsd/dhcp/dist/server/tests/Atffile              |     5 +
 external/bsd/dhcp/dist/server/tests/Makefile.am          |    54 +
 external/bsd/dhcp/dist/server/tests/Makefile.in          |   933 +++++++
 external/bsd/dhcp/dist/server/tests/hash_unittest.c      |   609 ++++
 external/bsd/dhcp/dist/server/tests/load_bal_unittest.c  |   193 +
 external/bsd/dhcp/dist/server/tests/mdb6_unittest.c      |   959 +++++++
 external/bsd/dhcp/dist/server/tests/simple_unittest.c    |    79 +
 external/bsd/dhcp/dist/tests/HOWTO-unit-test             |   148 +-
 external/bsd/dhcp/dist/tests/Makefile.in                 |     2 +
 external/bsd/dhcp/dist/tests/t_api.c                     |     4 +-
 external/bsd/dhcp/dist/util/bindvar.sh                   |     2 +-
 109 files changed, 8462 insertions(+), 2322 deletions(-)

diffs (truncated from 17500 to 300 lines):

diff -r 6131e3630e32 -r ea4fef4cf13b external/bsd/dhcp/dist/LICENSE
--- a/external/bsd/dhcp/dist/LICENSE    Sun Mar 24 22:38:45 2013 +0000
+++ b/external/bsd/dhcp/dist/LICENSE    Sun Mar 24 22:50:21 2013 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2004-2011 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (c) 2004-2013 by Internet Systems Consortium, Inc. ("ISC")
 # Copyright (c) 1995-2003 by Internet Software Consortium
 #
 # Permission to use, copy, modify, and distribute this software for any
diff -r 6131e3630e32 -r ea4fef4cf13b external/bsd/dhcp/dist/Makefile.am
--- a/external/bsd/dhcp/dist/Makefile.am        Sun Mar 24 22:38:45 2013 +0000
+++ b/external/bsd/dhcp/dist/Makefile.am        Sun Mar 24 22:50:21 2013 +0000
@@ -19,7 +19,8 @@
             doc/ja_JP.eucJP/dhcp-eval.5 doc/ja_JP.eucJP/dhcp-options.5 \
             doc/examples/dhclient-dhcpv6.conf doc/examples/dhcpd-dhcpv6.conf \
             util/bindvar.sh \
-            bind/Makefile bind/bind.tar.gz bind/version.tmp 
+            bind/Makefile bind/bind.tar.gz bind/version.tmp \
+            common/tests/Atffile server/tests/Atffile
 
 SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server
 
diff -r 6131e3630e32 -r ea4fef4cf13b external/bsd/dhcp/dist/Makefile.in
--- a/external/bsd/dhcp/dist/Makefile.in        Sun Mar 24 22:38:45 2013 +0000
+++ b/external/bsd/dhcp/dist/Makefile.in        Sun Mar 24 22:50:21 2013 +0000
@@ -33,7 +33,8 @@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(nobase_include_HEADERS) \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-       $(top_srcdir)/configure depcomp install-sh missing
+       $(top_srcdir)/configure $(top_srcdir)/doc/devel/doxyfile.in \
+       depcomp install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -42,7 +43,7 @@
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/includes/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = doc/devel/doxyfile
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -79,6 +80,8 @@
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+ATF_CFLAGS = @ATF_CFLAGS@
+ATF_LDFLAGS = @ATF_LDFLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -185,7 +188,8 @@
             doc/ja_JP.eucJP/dhcp-eval.5 doc/ja_JP.eucJP/dhcp-options.5 \
             doc/examples/dhclient-dhcpv6.conf doc/examples/dhcpd-dhcpv6.conf \
             util/bindvar.sh \
-            bind/Makefile bind/bind.tar.gz bind/version.tmp 
+            bind/Makefile bind/bind.tar.gz bind/version.tmp \
+            common/tests/Atffile server/tests/Atffile
 
 SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server
 nobase_include_HEADERS = dhcpctl/dhcpctl.h
@@ -216,6 +220,8 @@
        cd $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+doc/devel/doxyfile: $(top_builddir)/config.status $(top_srcdir)/doc/devel/doxyfile.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
 install-nobase_includeHEADERS: $(nobase_include_HEADERS)
        @$(NORMAL_INSTALL)
        test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
diff -r 6131e3630e32 -r ea4fef4cf13b external/bsd/dhcp/dist/README
--- a/external/bsd/dhcp/dist/README     Sun Mar 24 22:38:45 2013 +0000
+++ b/external/bsd/dhcp/dist/README     Sun Mar 24 22:50:21 2013 +0000
@@ -1,8 +1,8 @@
              Internet Systems Consortium DHCP Distribution
-                             Version 4.2.3
-                            18 October 2011
+                             Version 4.2.5
+                             8 January 2013
 
-                             README FILE
+                               README FILE
 
 You should read this file carefully before trying to install or use
 the ISC DHCP Distribution.
@@ -34,7 +34,8 @@
         5.7     NeXTSTEP
         5.8     SOLARIS
          5.8.1 Solaris 11
-         5.8.2 Other Solaris Items
+         5.8.2 Solaris 11 and ATF
+         5.8.3 Other Solaris Items
         5.9     AIX
         5.10    MacOS X
        6       SUPPORT
@@ -58,8 +59,8 @@
 the DHCP server lease database is in the dhcpd.leases man page.
 Server configuration documentation is in the dhcpd.conf man page as
 well as the dhcp-options man page.   A sample DHCP server
-configuration is in the file server/dhcpd.conf.   The source for the
-dhcpd, dhcpd.leases and dhcpd.conf man pages is in the server/ sub-
+configuration is in the file server/dhcpd.conf.example.   The source for
+the dhcpd, dhcpd.leases and dhcpd.conf man pages is in the server/ sub-
 directory in the distribution.   The source for the dhcp-options.5
 man page is in the common/ subdirectory.
 
@@ -97,7 +98,7 @@
 
                            RELEASE STATUS
 
-This is ISC DHCP 4.2.3, a maintenance release containing patches.
+This is ISC DHCP 4.2.5, a maintenance release containing patches.
 
 In this release, the DHCPv6 server should be fully functional on Linux,
 Solaris, or any BSD.  The DHCPv6 client should be similarly functional
@@ -132,12 +133,12 @@
 To build the DHCP Distribution, unpack the compressed tar file using
 the tar utility and the gzip command - type something like:
 
-       gunzip dhcp-4.2.3.tar.gz
-       tar xvf dhcp-4.2.3.tar
+       gunzip dhcp-4.2.5.tar.gz
+       tar xvf dhcp-4.2.5.tar
 
                            CONFIGURING IT
 
-Now, cd to the dhcp-4.2.3 subdirectory that you've just created and
+Now, cd to the dhcp-4.2.5 subdirectory that you've just created and
 configure the source tree by typing:
 
        ./configure
@@ -148,6 +149,11 @@
 system you are using, that system is not supported - you are on
 your own.
 
+Several options may be enabled or disabled via the configure command.
+You can get a list of these by typing:
+
+       ./configure --help
+
                         DYNAMIC DNS UPDATES
 
 A fully-featured implementation of dynamic DNS updates is included in
@@ -450,6 +456,36 @@
 
          ./configure --enable-use-sockets --enable-ipv4-pktinfo
 
+                               Solaris 11 and ATF
+
+We have reports that ATF 0.15 and 0.16 do not build on Solaris 11.  The
+following changes to the ATF source code appear to fix this issue:
+
+diff -ru atf-0.15/atf-c/tp_test.c atf-0.15-patched/atf-c/tp_test.c
+--- atf-0.15/atf-c/tp_test.c 2011-12-06 06:31:11.000000000 +0100
++++ atf-0.15-patched/atf-c/tp_test.c 2012-06-19 15:54:57.000000000 +0200
+@@ -28,6 +28,7 @@
+*/
+
+#include <string.h>
++#include <stdio.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+diff -ru atf-0.15/atf-run/requirements.cpp atf-0.15-patched/atf-run/requirements.cpp
+--- atf-0.15/atf-run/requirements.cpp 2012-01-13 20:44:25.000000000 +0100
++++ atf-0.15-patched/atf-run/requirements.cpp 2012-06-19 15:41:51.000000000 +0200
+@@ -29,7 +29,7 @@
+
+extern "C" {
+#include <sys/param.h>
+-#include <sys/sysctl.h>
++//#include <sys/sysctl.h>
+}
+
+#include <cerrno>
+
                                Other Solaris Items
 
 One problem which has been observed and is not fixed in this
diff -r 6131e3630e32 -r ea4fef4cf13b external/bsd/dhcp/dist/RELNOTES
--- a/external/bsd/dhcp/dist/RELNOTES   Sun Mar 24 22:38:45 2013 +0000
+++ b/external/bsd/dhcp/dist/RELNOTES   Sun Mar 24 22:50:21 2013 +0000
@@ -1,6 +1,6 @@
              Internet Systems Consortium DHCP Distribution
-                             Version 4.2.3
-                            18 October 2011
+                            Version 4.2.5
+                            8 January 2013
 
                              Release Notes
 
@@ -39,6 +39,259 @@
 work on other platforms. Please report any problems and suggested fixes to
 <dhcp-users%isc.org@localhost>.
 
+                       Changes since 4.2.5rc1
+
+- None
+                       Changes since 4.2.5b1
+
+- Modify test makefiles to be more similar to standard makefiles
+  and comment out a currently unused test.
+  [ISC-Bugs #32098]
+
+                       Changes since 4.2.4
+
+- Correct code to calculate timing values in client to compare
+  rebind value to infinity instead of renew value.
+  Thanks to Chenda Huang from H3C Technologies Co., Limited
+  for reporting this issue.
+  [ISC-Bugs #29062]
+
+- Fix some issues in the code for parsing and printing options.
+  [ISC-Bugs #22625] - properly print options that have several fields
+  followed by an array of something for example "fIa"
+  [ISC-Bugs #27289] - properly parse options in declarations that have
+  several fields followed by an array of something for example "fIa"
+  [ISC-Bugs #27296] - properly determine if we parsed a 16 or 32 bit
+  value in evaluate_numeric_expression (extract-int).
+  [ISC-Bugs #27314] - properly parse a zero length option from
+  a lease file.  Thanks to Marius Tomaschewski from SUSE for the report
+  and prototype patch for this ticket as well as ticket 27289.
+
+! Previously the server code was relaxed to allow packets with zero
+  length client ids to be processed.  Under some situations use of
+  zero length client ids can cause the server to go into an infinite
+  loop.  As such ids are not valid according to RFC 2132 section 9.14
+  the server no longer accepts them.  Client ids with a length of 1
+  are also invalid but the server still accepts them in order to
+  minimize disruption.  The restriction will likely be tightened in
+  the future to disallow ids with a length of 1.
+  Thanks to Markus Hietava of Codenomicon CROSS project for the
+  finding this issue and CERT-FI for vulnerability coordination. 
+  [ISC-Bugs #29851]
+  CVE: CVE-2012-3571
+
+! When attempting to convert a DUID from a client id option
+  into a hardware address handle unexpected client ids properly.
+  Thanks to Markus Hietava of Codenomicon CROSS project for the
+  finding this issue and CERT-FI for vulnerability coordination. 
+  [ISC-Bugs #29852]
+  CVE: CVE-2012-3570
+
+! A pair of memory leaks were found and fixed.  Thanks to
+  Glen Eustace of Massey University, New Zealand for finding
+  this issue.
+  [ISC-Bugs #30024]
+  CVE: CVE-2012-3954
+
+- Existing legacy unit-tests have been migrated to Automated Test
+  Framework (ATF). Several new tests have been developed. To enable
+  unit-tests, please use --with-atf in configure script. A Developer's
+  Guide has been added. To generate it, please use make devel in
+  the doc directory. It is currently in early stages of development,
+  but is expected to grow in the near future. [ISC-Bugs 25901]
+
+! An issue with the use of lease times was found and fixed.  Making
+  certain changes to the end time of an IPv6 lease could cause the
+  server to abort.  Thanks to Glen Eustace of Massey University,
+  New Zealand for finding this issue.
+  [ISC-Bugs #30281]
+  CVE: CVE-2012-3955
+
+- Update the memory leakage debug code to work with v6.
+  [ISC-Bugs #30297]
+
+- Relax the requirements for deleting an A or AAAA record.
+  Previously the DDNS removal code required both the A or AAAA
+  record and the TXT record to exist.  This requirement could
+  cause problems if something interrupted the removal leaving
+  the TXT record alone.  This relaxation was codified in RFC 4703.
+  [ISC-Bugs #30734]
+
+- Modify the failover code to handle incorrect peer names
+  better.  Previously the structure holding the name might
+  have been freed inappropriately in some cases and not
+  freed in other cases.
+  [ISC-Bugs #30320]
+
+- Add a configure option, enable-secs-byteorder, to deal with
+  clients that do the byte ordering on the secs field incorrectly.
+  This field should be in network byte order but some clients
+  get it wrong.  When this option is enabled the server will examine
+  the secs field and if it looks wrong (high byte non zero and low
+  byte zero) swap the bytes.  The default is disabled.  This option
+  is only useful when doing load balancing within failover.
+  [ISC-Bugs #26108]
+
+- Fix a set of issues that were discovered via a code inspection
+  tool.  Thanks to Jiri Popelka and Tomas Hozza Red Hat for the logs
+  and patches.
+  [ISC-Bugs #23833]
+
+- Parsing unquoted base64 strings improved. Parser now properly handles 
+  strings that contain reserved names. [ISC-Bugs #23048]
+
+- Modify the nak_lease function to make some attempts to find a



Home | Main Index | Thread Index | Old Index