From: Jan Lentfer Date: Mon, 28 Nov 2011 15:58:25 +0000 (+0100) Subject: ldns: Update local files for update to 1.6.11 X-Git-Tag: v3.0.0~546 X-Git-Url: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/de9b0015f0d4da79aabf37a2be9bd4acbd0b8ec8 ldns: Update local files for update to 1.6.11 --- diff --git a/contrib/ldns/README.DRAGONFLY b/contrib/ldns/README.DRAGONFLY index 88cc732..496227a 100644 --- a/contrib/ldns/README.DRAGONFLY +++ b/contrib/ldns/README.DRAGONFLY @@ -1,8 +1,8 @@ Original source can be downloaded from: http://www.nlnetlabs.nl/projects/ldns/ - MD5 (ldns-1.6.7.tar.gz) = 7c0c50ee6b91ae6b713616b70005ad03 - SHA1 (ldns-1.6.7.tar.gz) = 667173af99641997de248d211da0705874d1f030 + MD5 (ldns-1.6.11.tar.gz) = c55b592a679672281712c457fbb41eb5 + SHA1 (ldns-1.6.11.tar.gz) = 2c4537eee39a1af63e8dde4f35498ce78c968c1f A list of deleted files is in README.DELETED. diff --git a/lib/libldns/ldns/common.h b/lib/libldns/ldns/common.h new file mode 100644 index 0000000..ed3847f --- /dev/null +++ b/lib/libldns/ldns/common.h @@ -0,0 +1,69 @@ +/** + * \file common.h + * + * Common definitions for LDNS + */ + +/** + * a Net::DNS like library for C + * + * (c) NLnet Labs, 2004-2006 + * + * See the file LICENSE for the license + */ + +#ifndef LDNS_COMMON_H +#define LDNS_COMMON_H + +/* + * The build configuration that is used in the distributed headers, + * as detected and determined by the auto configure script. + */ +#define LDNS_BUILD_CONFIG_HAVE_SSL 1 +#define LDNS_BUILD_CONFIG_USE_ECDSA 0 +#define LDNS_BUILD_CONFIG_HAVE_INTTYPES_H 1 +#define LDNS_BUILD_CONFIG_HAVE_ATTR_FORMAT 1 +#define LDNS_BUILD_CONFIG_HAVE_ATTR_UNUSED 1 + +/* + * HAVE_STDBOOL_H is not available when distributed as a library, but no build + * configuration variables may be used (like those above) because the header + * is sometimes only available when using special compiler flags to enable the + * c99 environment. Because we cannot force the usage of this flag, we have to + * provide a default type. Below what is suggested by the autoconf manual. + */ +/*@ignore@*/ +/* splint barfs on this construct */ +#ifdef HAVE_STDBOOL_H +# include +#else +# ifndef HAVE__BOOL +# ifdef __cplusplus +typedef bool _Bool; +# else +# define _Bool signed char +# endif +# endif +# define bool _Bool +# define false 0 +# define true 1 +# define __bool_true_false_are_defined 1 +#endif +/*@end@*/ + +#if LDNS_BUILD_CONFIG_HAVE_ATTR_FORMAT +#define ATTR_FORMAT(archetype, string_index, first_to_check) \ + __attribute__ ((format (archetype, string_index, first_to_check))) +#else /* !LDNS_BUILD_CONFIG_HAVE_ATTR_FORMAT */ +#define ATTR_FORMAT(archetype, string_index, first_to_check) /* empty */ +#endif /* !LDNS_BUILD_CONFIG_HAVE_ATTR_FORMAT */ + +#if defined(__cplusplus) +#define ATTR_UNUSED(x) +#elif LDNS_BUILD_CONFIG_HAVE_ATTR_UNUSED +#define ATTR_UNUSED(x) x __attribute__((unused)) +#else /* !LDNS_BUILD_CONFIG_HAVE_ATTR_UNUSED */ +#define ATTR_UNUSED(x) x +#endif /* !LDNS_BUILD_CONFIG_HAVE_ATTR_UNUSED */ + +#endif /* LDNS_COMMON_H */ diff --git a/lib/libldns/ldns/config.h b/lib/libldns/ldns/config.h index ce3d694..eddc18a 100644 --- a/lib/libldns/ldns/config.h +++ b/lib/libldns/ldns/config.h @@ -25,6 +25,12 @@ /* Define to 1 if you have the `b64_pton' function. */ /* #undef HAVE_B64_PTON */ +/* Define to 1 if you have the `bzero' function. */ +#define HAVE_BZERO 1 + +/* Define to 1 if you have the `calloc' function. */ +#define HAVE_CALLOC 1 + /* Define to 1 if you have the `ctime_r' function. */ #define HAVE_CTIME_R 1 @@ -94,6 +100,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 +/* Define to 1 if you have the `memset' function. */ +#define HAVE_MEMSET 1 + /* Define to 1 if you have the header file. */ #define HAVE_NETDB_H 1 @@ -109,7 +118,7 @@ /* Define to 1 if you have the header file. */ #define HAVE_OPENSSL_SSL_H 1 -/* Define if you have Python libraries and header files. */ +/* If available, contains the Python version number currently in use. */ /* #undef HAVE_PYTHON */ /* Define to 1 if you have the `random' function. */ @@ -131,7 +140,7 @@ /* Define to 1 if you have the header file. */ #define HAVE_STDARG_H 1 -/* Define to 1 if you have the header file. */ +/* Define to 1 if stdbool.h conforms to C99. */ #define HAVE_STDBOOL_H 1 /* Define to 1 if you have the header file. */ @@ -152,7 +161,7 @@ /* Define to 1 if you have the `strtoul' function. */ #define HAVE_STRTOUL 1 -/* Define if you have Swig libraries and header files. */ +/* Define if you have SWIG libraries and header files. */ /* #undef HAVE_SWIG */ /* Define to 1 if you have the header file. */ @@ -185,6 +194,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_WS2TCPIP_H */ +/* Define to 1 if the system has the type `_Bool'. */ +#define HAVE__BOOL 1 + /* Define to the sub-directory in which libtool stores uninstalled libraries. */ #define LT_OBJDIR ".libs/" @@ -196,7 +208,7 @@ #define PACKAGE_NAME "ldns" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ldns 1.6.9" +#define PACKAGE_STRING "ldns 1.6.11" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libdns" @@ -205,7 +217,10 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.6.9" +#define PACKAGE_VERSION "1.6.11" + +/* The size of `time_t', as computed by sizeof. */ +#define SIZEOF_TIME_T 4 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 diff --git a/lib/libldns/ldns/net.h b/lib/libldns/ldns/net.h index 6a617c9..cd7bc4b 100644 --- a/lib/libldns/ldns/net.h +++ b/lib/libldns/ldns/net.h @@ -20,7 +20,7 @@ extern "C" { #endif -#define LDNS_DEFAULT_TIMEOUT_SEC 2 +#define LDNS_DEFAULT_TIMEOUT_SEC 5 #define LDNS_DEFAULT_TIMEOUT_USEC 0 /** diff --git a/lib/libldns/ldns/util.h b/lib/libldns/ldns/util.h index 8ce850a..3da321b 100644 --- a/lib/libldns/ldns/util.h +++ b/lib/libldns/ldns/util.h @@ -27,8 +27,8 @@ extern "C" { #define dprintf(X,Y) fprintf(stderr, (X), (Y)) /* #define dprintf(X, Y) */ -#define LDNS_VERSION "1.6.9" -#define LDNS_REVISION ((1<<16)|(6<<8)|(9)) +#define LDNS_VERSION "1.6.11" +#define LDNS_REVISION ((1<<16)|(6<<8)|(11)) /** * splint static inline workaround @@ -50,6 +50,8 @@ extern "C" { #define LDNS_XMALLOC(type, count) ((type *) malloc((count) * sizeof(type))) +#define LDNS_CALLOC(type, count) ((type *) calloc((count), sizeof(type))) + #define LDNS_REALLOC(ptr, type) LDNS_XREALLOC((ptr), type, 1) #define LDNS_XREALLOC(ptr, type, count) \ @@ -269,6 +271,22 @@ const char * ldns_version(void); time_t mktime_from_utc(const struct tm *tm); /** + * The function interprets time as the number of seconds since epoch + * with respect to now using serial arithmitics (rfc1982). + * That number of seconds is then converted to broken-out time information. + * This is especially usefull when converting the inception and expiration + * fields of RRSIG records. + * + * \param[in] time number of seconds since epoch (midnight, January 1st, 1970) + * to be intepreted as a serial arithmitics number relative to now. + * \param[in] now number of seconds since epoch (midnight, January 1st, 1970) + * to which the time value is compared to determine the final value. + * \param[out] result the struct with the broken-out time information + * \return result on success or NULL on error + */ +struct tm * ldns_serial_arithmitics_gmtime_r(int32_t time, time_t now, struct tm *result); + +/** * Seed the random function. * If the file descriptor is specified, the random generator is seeded with * data from that file. If not, /dev/urandom is used. diff --git a/usr.bin/drill/drill.h b/usr.bin/drill/drill.h index bf6a336..a92af5c 100644 --- a/usr.bin/drill/drill.h +++ b/usr.bin/drill/drill.h @@ -12,7 +12,7 @@ #include "drill_util.h" -#define DRILL_VERSION "1.6.9" +#define DRILL_VERSION "1.6.11" /* what kind of stuff do we allow */ #define DRILL_QUERY 0