automaticly build drill when given 'make tools'

drill is configured when you make the library

diff --git a/Makefile.in b/Makefile.in
index 4f2007a95db70167744729799456e9d65319822d..71659e24d2a134ce445cbbc924ea40f1371643a2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -67,10 +67,17 @@ LINK_LIB    = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)
 .PHONY:        clean realclean docclean doc lint test all lib
 .PHONY: install uninstall install-doc uninstall-doc 
 .PHONY: install-h uninstall-h install-lib uninstall-lib snapshot release
+.PHONY: confdrill tools-drill
 
-all:           lib tools
+all:           lib confdrill
 
-tools:         $(PROG_TARGETS)
+tools:         $(PROG_TARGETS) tools-drill
+
+confdrill:     
+               ( cd drill ; ./configure --with-ldns=../)
+
+tools-drill:   
+               ( cd drill ; make -f Makefile all)
 
 lib:           $(LIBDNS_OBJECTS) b64_pton$U.o b64_ntop$U.o
                $(LINK_LIB) -o libldns.la $(LIBDNS_LOBJECTS) b64_pton$U.lo b64_ntop$U.lo \
@@ -87,7 +94,7 @@ uninstall:    uninstall-doc uninstall-h uninstall-lib uninstall-progs
 
 destclean:     uninstall
 
-install-progs:
+install-progs:  all tools
                for i in $(PROG_TARGETS); do \
                        ${INSTALL} -c $$i $(bindir)/ ; done
                exit 0
@@ -187,6 +194,7 @@ realclean: clean docclean libclean
        rm -f config.sub
        rm -f config.guess
        rm -f ltmain.sh
+       (cd drill ; make -f Makefile clean)
 
 docclean:
        rm -rf doc/html/

diff --git a/TODO b/TODO
index af91c187c3d8cbda4a94007d8029af2e4dae8518..d5f3f53b556ed7476a913ffd18c7cdfcda73756b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -5,14 +5,12 @@ Post 1.0 Stuff:
 o Dname compression
 o A /fast/ impl. for holding a zone (and retrieving data from it)
 o refactor ldns_verify_rrsig_keylist and
-  ldns_verify_rrsig
+  ldns_verify_rrsig (fold in TSIG stuff or leave it out?)
+o Different digest for DS (spec currently specifies SHA-1)
 
 What actually doesn't work:
 ---------------------------
-o [dnssec] Different digests for DS
- - need a digest type?
 o [doc]  const function are correct i think, but const values in struct not
-o Error handling needs to be improved
 o manual page for signzone
 
 Implementation:
@@ -29,14 +27,7 @@ o use size_t where needed
 
 To ponder and discuss:
 ----------------------
-o private key type? This works, but not (yet) for tsig stuff
-       ldns_algorithm used for verfication
-       ldns_sign_algorithm used for signing - including
-                               shared secret signing
-       work in progress - works for RSA/DSA. I want to 
-       fold in the tsig stuff as well
 o install mx, keygen, chaos somewhere, along with manpages??
-o All lookup table stuff in _table types?
 
 To be removed:
 -------------

diff --git a/configure.ac b/configure.ac
index cb6657997fdaf9253e5cc96c8632aa8f079922f8..645fdfc288e029f3cd7e9a162f645c6ab9e21e08 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.57)
-AC_INIT(libdns, 0.80, libdns@nlnetlabs.nl, libdns)
+AC_INIT(libdns, 1.00, libdns@nlnetlabs.nl, libdns)
 AC_CONFIG_SRCDIR([packet.c])
 
 OURCPPFLAGS='-ansi -pedantic -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600'

diff --git a/drill/Makefile.in b/drill/Makefile.in
index 157bd4cf8aeb7b0f0487e304624d36533240e9be..30cff69ca7c503a44e356b56c3a92f3d701c8853 100644 (file)
--- a/drill/Makefile.in
+++ b/drill/Makefile.in
@@ -36,7 +36,7 @@ all:  drill
 release:       clean docclean tarclean
        (rm -rf ../drill-$(VERSION)/)
        (cd .. ; cp -r $(basesrcdir)/ drill-$(VERSION)/)
-       (cd .. ; tar --verbose --exclude ".svn" --create --gzip --file drill-$(VERSION).tar.bz2 drill-$(VERSION)/)
+       (cd .. ; tar --verbose --exclude ".svn" --create --gzip --file drill-$(VERSION).tar.gz drill-$(VERSION)/)
        (rm -rf ../drill-$(VERSION)/)
 
 tags:  

diff --git a/drill/configure.ac b/drill/configure.ac
index 8cfbb6abc0dda833fbd1850236ba7fc561fb8b4a..fe151e9f2387927fcd4cbb0a579e932521e3a21b 100644 (file)
--- a/drill/configure.ac
+++ b/drill/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(drill, 0.80, drill@nlnetlabs.nl, drill)
+AC_INIT(drill, 1.00, drill@nlnetlabs.nl, drill)
 AC_CONFIG_SRCDIR([drill_util.h])
 
 AC_AIX

diff --git a/ldns-keygen.c b/ldns-keygen.c
index e6eed59afa4cb67729cc141d13a75e29b061ab38..480df7c87277fb339520f00cac8c7d428fef7eea 100644 (file)
--- a/ldns-keygen.c
+++ b/ldns-keygen.c
@@ -171,6 +171,7 @@ main(int argc, char *argv[])
                LDNS_FREE(filename);
        }
        
+#if 0
        /* TEMP: create PEM format too */
        filename = LDNS_XMALLOC(char, strlen(owner) + 17);
        snprintf(filename, strlen(owner) + 16, "K%s+%03u+%05u.pem", owner, algorithm, ldns_key_keytag(key));
@@ -184,7 +185,7 @@ PEM_write_DSAPrivateKey(file, key->_key.dsa, NULL, NULL, 0, NULL, NULL);
                fclose(file);
                LDNS_FREE(filename);
        }
-
+#endif
 
        fprintf(stdout, "K%s+%03u+%05u\n", owner, algorithm, ldns_key_keytag(key));
         exit(EXIT_SUCCESS);