diff --git a/CHANGES b/CHANGES index 8611739afc..33add501a0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +1408. [bug] distclean was not complete. [RT #4700] + 1407. [bug] lfsr incorrectly implements the shift register. [RT #4617] diff --git a/Makefile.in b/Makefile.in index 616cc5bb9e..fca041f681 100644 --- a/Makefile.in +++ b/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.41 2001/07/13 01:38:49 gson Exp $ +# $Id: Makefile.in,v 1.42 2002/12/13 02:00:14 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -26,10 +26,17 @@ TARGETS = @BIND9_MAKE_RULES@ +distclean:: + @if [ "X@LIBBIND@" = "X" ] ; then \ + i=lib/bind; \ + echo "making $@ in `pwd`/$$i"; \ + (cd $$i; ${MAKE} ${MAKEDEFS} $@) || exit 1; \ + fi + distclean:: rm -f config.cache config.h config.log config.status TAGS - rm -f libtool isc-config.sh - rm -f util/conf.sh + rm -f libtool isc-config.sh configure.lineno + rm -f util/conf.sh docutil/docbook2man-wrapper.sh # XXX we should clean libtool stuff too. Only do this after we add rules # to make it. diff --git a/configure b/configure index 9c17471671..6d5abc3401 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.334 . +# From configure.in Revision: 1.335 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.53. # @@ -13840,7 +13840,7 @@ LIBBIND9_API=$srcdir/lib/bind9/api LIBLWRES_API=$srcdir/lib/lwres/api -ac_config_files="$ac_config_files make/rules make/includes Makefile make/Makefile make/mkdep lib/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/nls/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/sec/Makefile lib/dns/sec/dst/Makefile lib/dns/sec/dst/include/Makefile lib/dns/sec/dst/include/dst/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/lwres/win32/Makefile lib/lwres/win32/include/Makefile lib/lwres/win32/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile bin/Makefile bin/check/Makefile bin/named/Makefile bin/named/unix/Makefile bin/rndc/Makefile bin/rndc/unix/Makefile bin/dig/Makefile bin/nsupdate/Makefile bin/tests/Makefile bin/tests/names/Makefile bin/tests/master/Makefile bin/tests/rbt/Makefile bin/tests/db/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/dst/Makefile bin/tests/mem/Makefile bin/tests/net/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/lwresd/Makefile bin/tests/system/tkey/Makefile bin/tests/headerdep_test.sh bin/dnssec/Makefile doc/Makefile doc/arm/Makefile doc/arm/nominum-docbook-html.dsl doc/arm/nominum-docbook-print.dsl doc/arm/validate.sh doc/misc/Makefile docutil/docbook2man-wrapper.sh isc-config.sh" +ac_config_files="$ac_config_files make/rules make/includes Makefile make/Makefile make/mkdep lib/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/nls/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/sec/Makefile lib/dns/sec/dst/Makefile lib/dns/sec/dst/include/Makefile lib/dns/sec/dst/include/dst/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile bin/Makefile bin/check/Makefile bin/named/Makefile bin/named/unix/Makefile bin/rndc/Makefile bin/rndc/unix/Makefile bin/dig/Makefile bin/nsupdate/Makefile bin/tests/Makefile bin/tests/names/Makefile bin/tests/master/Makefile bin/tests/rbt/Makefile bin/tests/db/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/dst/Makefile bin/tests/mem/Makefile bin/tests/net/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/lwresd/Makefile bin/tests/system/tkey/Makefile bin/tests/headerdep_test.sh bin/dnssec/Makefile doc/Makefile doc/arm/Makefile doc/arm/nominum-docbook-html.dsl doc/arm/nominum-docbook-print.dsl doc/arm/validate.sh doc/misc/Makefile docutil/docbook2man-wrapper.sh isc-config.sh" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -14354,9 +14354,6 @@ do "lib/lwres/unix/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/lwres/unix/Makefile" ;; "lib/lwres/unix/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/lwres/unix/include/Makefile" ;; "lib/lwres/unix/include/lwres/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/lwres/unix/include/lwres/Makefile" ;; - "lib/lwres/win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/lwres/win32/Makefile" ;; - "lib/lwres/win32/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/lwres/win32/include/Makefile" ;; - "lib/lwres/win32/include/lwres/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/lwres/win32/include/lwres/Makefile" ;; "lib/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/tests/Makefile" ;; "lib/tests/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/tests/include/Makefile" ;; "lib/tests/include/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/tests/include/tests/Makefile" ;; diff --git a/configure.in b/configure.in index 8b99fb23be..f9332382bb 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl esyscmd([sed "s/^/# /" COPYRIGHT])dnl AC_DIVERT_POP()dnl -AC_REVISION($Revision: 1.334 $) +AC_REVISION($Revision: 1.335 $) AC_INIT(lib/dns/name.c) AC_PREREQ(2.13) @@ -1949,9 +1949,6 @@ AC_OUTPUT( lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile - lib/lwres/win32/Makefile - lib/lwres/win32/include/Makefile - lib/lwres/win32/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile diff --git a/lib/bind/Makefile.in b/lib/bind/Makefile.in index 9e0254e1e6..d1bc163fda 100644 --- a/lib/bind/Makefile.in +++ b/lib/bind/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.17 2002/08/05 05:06:07 marka Exp $ +# $Id: Makefile.in,v 1.18 2002/12/13 02:00:15 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -120,6 +120,7 @@ distclean:: distclean:: rm -f config.cache config.h config.log config.status libtool - rm -f port_before.h port_after.h + rm -f port_before.h port_after.h configure.lineno + rm -f port/Makefile @PORT_DIR@/Makefile man: diff --git a/lib/bind/make/rules.in b/lib/bind/make/rules.in index 4a1a0f8e5f..eb535e488c 100644 --- a/lib/bind/make/rules.in +++ b/lib/bind/make/rules.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: rules.in,v 1.5 2002/09/18 05:18:18 marka Exp $ +# $Id: rules.in,v 1.6 2002/12/13 02:00:16 marka Exp $ ### ### Common Makefile rules for BIND 9. @@ -126,7 +126,7 @@ MKDEP = ${SHELL} ${top_builddir}/make/mkdep cleandir: distclean clean distclean:: - rm -f *.@O@ *.lo *.la core *.core + rm -f *.@O@ *.lo *.la core *.core .depend rm -rf .libs distclean:: diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in index ad0c89c6cd..fab37cf5ac 100644 --- a/lib/dns/Makefile.in +++ b/lib/dns/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.132 2002/11/27 09:52:51 marka Exp $ +# $Id: Makefile.in,v 1.133 2002/12/13 02:00:16 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -34,13 +34,13 @@ LIBS = @LIBS@ # Alphabetically -DSTOBJS = sec/dst/dst_api.@O@ \ - sec/dst/dst_lib.@O@ sec/dst/dst_parse.@O@ \ - sec/dst/dst_result.@O@ sec/dst/gssapi_link.@O@ \ - sec/dst/gssapictx.@O@ sec/dst/hmac_link.@O@ \ - sec/dst/key.@O@ sec/dst/openssl_link.@O@ \ - sec/dst/openssldh_link.@O@ sec/dst/openssldsa_link.@O@ \ - sec/dst/opensslrsa_link.@O@ +DSTOBJS = sec/dst/dst_api.@O@ sec/dst/dst_lib.@O@ sec/dst/dst_parse.@O@ \ + sec/dst/dst_result.@O@ sec/dst/hmac_link.@O@ sec/dst/key.@O@ + +OPENSSLOBJS = sec/dst/openssl_link.@O@ sec/dst/openssldh_link.@O@ \ + sec/dst/openssldsa_link.@O@ sec/dst/opensslrsa_link.@O@ + +GSSAPIOBJS = sec/dst/gssapi_link.@O@ sec/dst/gssapictx.@O@ # Alphabetically OBJS = acl.@O@ adb.@O@ byaddr.@O@ \ @@ -56,7 +56,7 @@ OBJS = acl.@O@ adb.@O@ byaddr.@O@ \ stats.@O@ tcpmsg.@O@ time.@O@ timer.@O@ tkey.@O@ \ tsig.@O@ ttl.@O@ validator.@O@ \ version.@O@ view.@O@ xfrin.@O@ zone.@O@ zonekey.@O@ zt.@O@ \ - ${OTHEROBJS} ${DSTOBJS} + ${OTHEROBJS} ${DSTOBJS} ${OPENSSLOBJS} ${GSSAPIOBJS} # Alphabetically SRCS = acl.c adb.c byaddr.c \ @@ -100,6 +100,26 @@ libdns.la: ${OBJS} -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \ ${OBJS} ${LIBS} +libdstcypto.@SA@: ${OPENSSLOBJS} + ${AR} ${ARFLAGS} $@ ${OPENSSLOBJS} + ${RANLIB} $@ + +libdstcypto.la: ${OPENSSLOBJS} + ${LIBTOOL} --mode=link \ + ${CC} ${ALL_CFLAGS} -o $@ -rpath ${libdir} \ + -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \ + ${OPENSSLOBJS} ${LIBS} + +libdstgssapi.@SA@: ${GSSAPIOBJS} + ${AR} ${ARFLAGS} $@ ${GSSAPIOBJS} + ${RANLIB} $@ + +libdstgssapi.la: ${GSSAPIOBJS} + ${LIBTOOL} --mode=link \ + ${CC} ${ALL_CFLAGS} -o $@ -rpath ${libdir} \ + -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \ + ${GSSAPIOBJS} ${LIBS} + timestamp: libdns.@A@ touch timestamp diff --git a/make/rules.in b/make/rules.in index bc7655d089..0c22658ec0 100644 --- a/make/rules.in +++ b/make/rules.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: rules.in,v 1.43 2002/04/16 04:24:31 marka Exp $ +# $Id: rules.in,v 1.44 2002/12/13 02:00:16 marka Exp $ ### ### Common Makefile rules for BIND 9. @@ -127,7 +127,7 @@ cleandir: distclean superclean: maintainer-clean clean distclean maintainer-clean:: - rm -f *.@O@ *.lo *.la core *.core + rm -f *.@O@ *.lo *.la core *.core .depend rm -rf .libs distclean maintainer-clean::