diff options
-rwxr-xr-x | configure | 22 | ||||
-rw-r--r-- | configure.ac | 9 | ||||
-rw-r--r-- | omapip/isclib.c | 7 | ||||
-rw-r--r-- | util/Makefile.bind.in | 66 | ||||
-rw-r--r-- | util/bind.sh | 7 |
5 files changed, 38 insertions, 73 deletions
@@ -651,8 +651,6 @@ RANLIB EGREP GREP CPP -CROSS_COMPILING_FALSE -CROSS_COMPILING_TRUE BINDCONFIG am__fastdepCC_FALSE am__fastdepCC_TRUE @@ -4504,14 +4502,6 @@ do esac done - if test "$cross_compiling" = "yes"; then - CROSS_COMPILING_TRUE= - CROSS_COMPILING_FALSE='#' -else - CROSS_COMPILING_TRUE='#' - CROSS_COMPILING_FALSE= -fi - # POSIX doesn't include the IPv6 Advanced Socket API and glibc hides # parts of the IPv6 Advanced Socket API as a result. This is stupid @@ -6949,10 +6939,10 @@ no) ac_config_files="$ac_config_files $srcdir/bind/Makefile" - BINDLIBIRSDIR="$BINDSRCDIR/lib/export/irs" - BINDLIBDNSDIR="$BINDSRCDIR/lib/export/dns" - BINDLIBISCCFGDIR="$BINDSRCDIR/lib/export/isccfg" - BINDLIBISCDIR="$BINDSRCDIR/lib/export/isc" + BINDLIBIRSDIR="$BINDSRCDIR/lib/irs" + BINDLIBDNSDIR="$BINDSRCDIR/lib/dns" + BINDLIBISCCFGDIR="$BINDSRCDIR/lib/isccfg" + BINDLIBISCDIR="$BINDSRCDIR/lib/isc" ;; *) if test ! -d "$use_libbind"; then @@ -7499,10 +7489,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then - as_fn_error $? "conditional \"CROSS_COMPILING\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${BIND_ATF_TRUE}" && test -z "${BIND_ATF_FALSE}"; then as_fn_error $? "conditional \"BIND_ATF\" was never defined. diff --git a/configure.ac b/configure.ac index 862108ca..46d56275 100644 --- a/configure.ac +++ b/configure.ac @@ -51,7 +51,6 @@ do esac done AC_SUBST(BINDCONFIG) -AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = "yes") # POSIX doesn't include the IPv6 Advanced Socket API and glibc hides # parts of the IPv6 Advanced Socket API as a result. This is stupid @@ -765,10 +764,10 @@ no) fi AC_CONFIG_FILES([$srcdir/bind/Makefile]) - BINDLIBIRSDIR="$BINDSRCDIR/lib/export/irs" - BINDLIBDNSDIR="$BINDSRCDIR/lib/export/dns" - BINDLIBISCCFGDIR="$BINDSRCDIR/lib/export/isccfg" - BINDLIBISCDIR="$BINDSRCDIR/lib/export/isc" + BINDLIBIRSDIR="$BINDSRCDIR/lib/irs" + BINDLIBDNSDIR="$BINDSRCDIR/lib/dns" + BINDLIBISCCFGDIR="$BINDSRCDIR/lib/isccfg" + BINDLIBISCDIR="$BINDSRCDIR/lib/isc" ;; *) if test ! -d "$use_libbind"; then diff --git a/omapip/isclib.c b/omapip/isclib.c index 13f0d3eb..12608a7b 100644 --- a/omapip/isclib.c +++ b/omapip/isclib.c @@ -22,7 +22,7 @@ */ /*Trying to figure out what we need to define to get things to work. - It looks like we want/need the export library but need the fdwatchcommand + It looks like we want/need the library but need the fdwatchcommand which may be a problem */ #include "dhcpd.h" @@ -195,6 +195,11 @@ dhcp_context_create(int flags, * broken connections to fail gracefully with EPIPE on writes */ handle_signal(SIGPIPE, SIG_IGN); + /* Reset handlers installed by isc_app_ctxstart() + * to default for control-c and kill */ + handle_signal(SIGINT, SIG_DFL); + handle_signal(SIGTERM, SIG_DFL); + result = isc_taskmgr_createinctx(dhcp_gbl_ctx.mctx, dhcp_gbl_ctx.actx, 1, 0, diff --git a/util/Makefile.bind.in b/util/Makefile.bind.in index 7e127e18..47711db9 100644 --- a/util/Makefile.bind.in +++ b/util/Makefile.bind.in @@ -18,15 +18,13 @@ binddir=@BINDDIR@ bindsrcdir=@BINDSRCDIR@ -bindconfig = --without-openssl --without-libxml2 \ +bindconfig = --without-openssl --without-libxml2 --without-libjson \ --without-gssapi --disable-threads \ - --enable-exportlib \ - --with-export-includedir=${binddir}/include \ - --with-export-libdir=${binddir}/lib \ + --prefix=${binddir} \ @BINDIOMUX@ @BINDCONFIG@ --enable-full-report -@BIND_ATF_FALSE@cleandirs = ./lib ./include -@BIND_ATF_TRUE@cleandirs = ./lib ./include ./atf +@BIND_ATF_FALSE@cleandirs = ./lib ./include ./share +@BIND_ATF_TRUE@cleandirs = ./lib ./include /share ./atf cleanfiles = ./configure.log ./build.log ./install.log @BIND_ATF_FALSE@all: bind1 bind2 @@ -40,16 +38,16 @@ bind1: gunzip -c bind.tar.gz | tar xf - ; \ fi -# Configure the export libraries +# Configure the libraries # Currently disable the epoll, devpoll and kqueue options as they # don't interact well with the DHCP code. # If the top-level Bind Makefile exists we skip the configuration step # as we assume it's done and won't change. Doing a make clean will # reset things if necessary. @if test -f ${bindsrcdir}/Makefile ; then \ - echo Bind export libraries already configured ; \ + echo Bind libraries already configured ; \ else \ - echo Configuring BIND Export libraries for DHCP. ; \ + echo Configuring BIND libraries for DHCP. ; \ rm -rf ${cleandirs} ${cleanfiles} ; \ (cd ${bindsrcdir} && \ ./configure ${bindconfig} > ${binddir}/configure.log); \ @@ -66,46 +64,24 @@ atf: cp -rp atf ${binddir}) ; \ fi -@CROSS_COMPILING_FALSE@bind2: bind2-noguest -@CROSS_COMPILING_TRUE@bind2: bind2-hostgen - -bind2-noguest: -# Build and install the export libraries -# No need to do anything if we already have something installed. - @if test -d ${binddir}/lib ; then \ - echo Bind export libraries already installed ; \ - else \ - echo Building BIND Export libraries - this takes some time. ;\ - (cd ${bindsrcdir}/lib/export ; \ - echo building in `pwd` ; \ - $(MAKE) >> ${binddir}/build.log) ; \ - \ - echo Installing BIND Export libraries to ${binddir}. ; \ - (cd ${bindsrcdir}/lib/export ; \ - $(MAKE) install > ${binddir}/install.log) ; \ - fi - -bind2-hostgen: -# Build and install the export libraries +bind2: +# Build and install the libraries # No need to do anything if we already have something installed. - @if test -d ${binddir}/lib ; then \ - echo Bind export libraries already installed ; \ - else \ - echo Building BIND Export libraries - this takes some time. ;\ - (cd ${bindsrcdir}/lib/export/dns ; \ - echo building gen using ${BUILD_CC} in `pwd` ; \ - $(MAKE) CC=${BUILD_CC} CFLAGS=${BUILD_CFLAGS} CPPFLAGS=${BUILD_CPPFLAGS} LDFLAGS=${BUILD_LDFLAGS} LIBS=${BUILD_LIBS} gen >> ${binddir}/build.log) ; \ - (cd ${bindsrcdir}/lib/export ; \ - echo building in `pwd` ; \ - $(MAKE) >> ${binddir}/build.log) ; \ - \ - echo Installing BIND Export libraries to ${binddir}. ; \ - (cd ${bindsrcdir}/lib/export ; \ - $(MAKE) install > ${binddir}/install.log) ; \ + @if test -d ${binddir}/lib ; then \ + echo Bind libraries already installed ; \ + else \ + echo Building BIND libraries - this takes some time. ; \ + (cd ${bindsrcdir}/lib ; \ + echo building in `pwd` ; \ + $(MAKE) >> ${binddir}/build.log) ; \ + \ + echo Installing BIND libraries to ${binddir}. ; \ + (cd ${bindsrcdir}/lib ; \ + $(MAKE) install > ${binddir}/install.log) ; \ fi clean: - @echo Cleaning BIND export library. + @echo Cleaning BIND library. rm -rf ${bindsrcdir} ${cleandirs} ${cleanfiles} # Include the following so that this Makefile is happy when the parent diff --git a/util/bind.sh b/util/bind.sh index 54f5778a..75b8dd5e 100644 --- a/util/bind.sh +++ b/util/bind.sh @@ -51,9 +51,8 @@ case $# in ### v4_2) noSNAP=snapshot BINDTAG=v9_9 ;; v4_3) noSNAP=snapshot BINDTAG=v9_9 ;; - ### change to using the head of v9_9 until we upgrade DHCP - ### to use shared libraries - HEAD|v[0-9]_[0-9].*) noSNAP=snapshot BINDTAG=v9_9 ;; + v4_4) noSNAP=snapshot BINDTAG=v9_11 ;; + HEAD|v[0-9]_[0-9].*) noSNAP=snapshot BINDTAG=v9_11 ;; ### HEAD|v[0-9]_[0-9].*) noSNAP=snapshot BINDTAG=HEAD ;; ### ### For ease of use, this records the sticky tag of versions @@ -124,7 +123,7 @@ else # Create the bind tarball, which has the side effect of # setting up the bind directory we will use for building - # the export libraries + # the libraries echo Creating tarball for $BINDTAG sh kit.sh $remote $SNAP $BINDTAG $binddir |