From: Shawn Routhier Date: Wed, 2 Dec 2009 22:35:03 +0000 (+0000) Subject: Updates to build the bind libraries via make instead of with a X-Git-Tag: v4_2_0a1~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=56d3e491067f92eb00de0d4c53449a912e3c5328;p=thirdparty%2Fdhcp.git Updates to build the bind libraries via make instead of with a separate step --- diff --git a/Makefile.am b/Makefile.am index e940e2be5..698740142 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,10 +17,10 @@ EXTRA_DIST = RELNOTES LICENSE \ doc/ja_JP.eucJP/dhclient.conf.5 doc/ja_JP.eucJP/dhclient.leases.5 \ 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/bind.sh util/bindlib.sh util/bindcus.sh \ - bind/bind.tar.gz bind/version.tmp + util/bindvar.sh \ + bind/Makefile bind/bind.tar.gz bind/version.tmp -SUBDIRS = includes tests common dst omapip client dhcpctl relay server +SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server nobase_include_HEADERS = dhcpctl/dhcpctl.h diff --git a/README b/README index f2b881acd..39087c369 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ Internet Systems Consortium DHCP Distribution Version 4.2.0a1 - 24 November 2009 + 2 December 2009 README FILE @@ -94,8 +94,7 @@ directory, it may not have up-to-date information). RELEASE STATUS -This is ISC DHCP 4.2.0a1, which adds new DHCPv6 features omitted from -ISC DHCP 4.0.0. +This is ISC DHCP 4.2.0a1, which modifies the DDNS code to be asynchronous. In this release, the DHCPv6 server should be fully functional on Linux, Solaris, or any BSD. The DHCPv6 client should be similarly functional @@ -134,17 +133,6 @@ the tar utility and the gzip command - type something like: gunzip dhcp-4.2.0a1.tar.gz tar xvf dhcp-4.2.0a1.tar - BUILDING BIND LIBRARIES - -To build the BIND libraries used by DHCP cd to the dhcp-4.2.0a1 subdirectory -that you've just created and run the bindcus.sh from the the util -subdirectory - something like this: - - sh util/bindcus.sh - -In order to build the necessary libraries you will need to have "gmake" -available on your build system. - CONFIGURING IT Now, cd to the dhcp-4.2.0a1 subdirectory that you've just created and @@ -162,7 +150,11 @@ your own. A fully-featured implementation of dynamic DNS updates is included in this release. It uses libraries from BIND and, to avoid issues with -different versions, includes the necessary BIND version. +different versions, includes the necessary BIND version. The appropriate +BIND libraries will be compiled and installed in the bind subdirectory +as part of the make step. In order to build the necessary libraries you +will need to have "gmake" available on your build system. + There is documentation for the DDNS support in the dhcpd.conf manual page - see the beginning of this document for information on finding diff --git a/RELNOTES b/RELNOTES index e2039f94c..e38c3b696 100644 --- a/RELNOTES +++ b/RELNOTES @@ -1,6 +1,6 @@ Internet Systems Consortium DHCP Distribution Version 4.2.0a1 - 24 November 2009 + 2 December 2009 Release Notes @@ -222,6 +222,11 @@ work on other platforms. Please report any problems and suggested fixes to this error was a segfault when a failover secondary attempted to connect to the failover primary if their clocks were not synchronized. +- Clean up to allow compilation with gcc 2.95.4 on FreeBSD. Remove an + extra semi-colon from common/dns.c and moved setting a variable to NULL + in server/dhcpv6.c to allow the compiler to decide that the variable + was always properly set. + Changes since 4.1.0b1 - A missing "else" in dhcrelay.c could have caused an interface not to diff --git a/configure.ac b/configure.ac index 9e67fb370..8f0a8b13b 100644 --- a/configure.ac +++ b/configure.ac @@ -522,3 +522,4 @@ AC_OUTPUT([ tests/Makefile ]) +sh util/bindvar.sh diff --git a/util/bind.sh b/util/bind.sh index 57e6ca2db..3b57b3df9 100644 --- a/util/bind.sh +++ b/util/bind.sh @@ -14,14 +14,13 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: bind.sh,v 1.6 2009/11/20 00:10:14 sar Exp $ +# $Id: bind.sh,v 1.6.2.1 2009/12/02 22:35:03 sar Exp $ # Get the bind distribution for the libraries # This script is used to build the DHCP distribution and shouldn't be shipped # -# Usage: sh bind.sh +# Usage: sh bind.sh # -# Currently no arguments # topdir=`pwd` @@ -46,6 +45,7 @@ rm -rf bind # Make and move to our directory for all things bind mkdir $binddir +cp util/Makefile.bind bind/Makefile cd $binddir # Get the bind release kit shell script @@ -68,5 +68,6 @@ mv bind-9.7*.tar.gz bind.tar.gz #mv $binddir/bind-9.7* $binddir/$bindsrcdir # Run the script to build and install the export libraries -sh $topdir/util/bindlib.sh $binddir $bindsrcdir +# Let make do this now. +#sh $topdir/util/bindlib.sh $binddir $bindsrcdir