From eb5edcd5a01f014ab3bbf7e9a6f8b09e1cc0834f Mon Sep 17 00:00:00 2001 From: florian Date: Sat, 3 Feb 2018 11:04:01 +0000 Subject: [PATCH] regen --- usr.sbin/nsd/config.h.in | 71 +++++++++++++++++++++++-------------- usr.sbin/nsd/configure | 75 ++++++++++++++++++++++++++++++++++------ 2 files changed, 110 insertions(+), 36 deletions(-) diff --git a/usr.sbin/nsd/config.h.in b/usr.sbin/nsd/config.h.in index 6c44616432f..3cc7d4e546d 100644 --- a/usr.sbin/nsd/config.h.in +++ b/usr.sbin/nsd/config.h.in @@ -73,6 +73,9 @@ /* Define to 1 if you have the `endpwent' function. */ #undef HAVE_ENDPWENT +/* Define to 1 if you have the `ERR_load_crypto_strings' function. */ +#undef HAVE_ERR_LOAD_CRYPTO_STRINGS + /* Define to 1 if you have the `event_base_free' function. */ #undef HAVE_EVENT_BASE_FREE @@ -88,6 +91,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_EVENT_H +/* Define to 1 if you have the `EVP_cleanup' function. */ +#undef HAVE_EVP_CLEANUP + /* Define to 1 if you have the `ev_default_loop' function. */ #undef HAVE_EV_DEFAULT_LOOP @@ -194,6 +200,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_OPENSSL_ERR_H +/* Define to 1 if you have the `OPENSSL_init_crypto' function. */ +#undef HAVE_OPENSSL_INIT_CRYPTO + +/* Define to 1 if you have the `OPENSSL_init_ssl' function. */ +#undef HAVE_OPENSSL_INIT_SSL + /* Define to 1 if you have the header file. */ #undef HAVE_OPENSSL_RAND_H @@ -426,6 +438,9 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Define this to use packed structure alignment. */ +#undef PACKED_STRUCTS + /* Pathname to the NSD pidfile */ #undef PIDFILE @@ -483,6 +498,9 @@ /* Define this to enable mmap instead of malloc. Experimental. */ #undef USE_MMAP_ALLOC +/* Define this to configure to use the radix tree. */ +#undef USE_RADIX_TREE + /* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE @@ -659,6 +677,29 @@ + +/* provide timespec def if not available */ +#ifndef CONFIG_DEFINES +#define CONFIG_DEFINES +#ifndef HAVE_STRUCT_TIMESPEC +#ifndef __timespec_defined +#define __timespec_defined 1 + struct timespec { + long tv_sec; /* seconds */ + long tv_nsec; /* nanoseconds */ + }; +#endif /* !__timespec_defined */ +#endif /* !HAVE_STRUCT_TIMESPEC */ +#endif /* !CONFIG_DEFINES */ + +#ifdef PACKED_STRUCTS +#define ATTR_PACKED __attribute__((packed)) +#else +#define ATTR_PACKED +#endif + + + #ifdef HAVE_VA_LIST_DOUBLE_DEF /* workaround double va_list definition on some platforms */ # ifndef _VA_LIST_DEFINED @@ -736,13 +777,12 @@ -#ifndef HAVE_B64_NTOP -int b64_ntop(uint8_t const *src, size_t srclength, +int __b64_ntop(uint8_t const *src, size_t srclength, char *target, size_t targsize); -#endif /* !HAVE_B64_NTOP */ -#ifndef HAVE_B64_PTON -int b64_pton(char const *src, uint8_t *target, size_t targsize); -#endif /* !HAVE_B64_PTON */ +int __b64_pton(char const *src, uint8_t *target, size_t targsize); + + + #ifndef HAVE_FSEEKO #define fseeko fseek #define ftello ftell @@ -800,22 +840,3 @@ int memcmp(const void *x, const void *y, size_t n); #endif - - - -/* provide timespec def if not available */ -#ifndef CONFIG_DEFINES -#define CONFIG_DEFINES -#ifndef HAVE_STRUCT_TIMESPEC -#ifndef __timespec_defined -#define __timespec_defined 1 - struct timespec { - long tv_sec; /* seconds */ - long tv_nsec; /* nanoseconds */ - }; -#endif /* !__timespec_defined */ -#endif /* !HAVE_STRUCT_TIMESPEC */ -#endif /* !CONFIG_DEFINES */ - -int __b64_ntop(uint8_t const *, size_t, char *, size_t); -int __b64_pton(char const *, uint8_t*, size_t); diff --git a/usr.sbin/nsd/configure b/usr.sbin/nsd/configure index 15ceae2b292..e73ca9121cd 100644 --- a/usr.sbin/nsd/configure +++ b/usr.sbin/nsd/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for NSD 4.1.17. +# Generated by GNU Autoconf 2.69 for NSD 4.1.19. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NSD' PACKAGE_TARNAME='nsd' -PACKAGE_VERSION='4.1.17' -PACKAGE_STRING='NSD 4.1.17' +PACKAGE_VERSION='4.1.19' +PACKAGE_STRING='NSD 4.1.19' PACKAGE_BUGREPORT='nsd-bugs@nlnetlabs.nl' PACKAGE_URL='' @@ -732,6 +732,7 @@ enable_nsec3 enable_minimal_responses enable_mmap enable_radix_tree +enable_packed ' ac_precious_vars='build_alias host_alias @@ -1284,7 +1285,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures NSD 4.1.17 to adapt to many kinds of systems. +\`configure' configures NSD 4.1.19 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1345,7 +1346,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NSD 4.1.17:";; + short | recursive ) echo "Configuration of NSD 4.1.19:";; esac cat <<\_ACEOF @@ -1381,6 +1382,8 @@ Optional Features: --disable-radix-tree You can disable the radix tree and use the red-black tree for the main lookups, the red-black tree uses less memory, but uses some more CPU. + --enable-packed Enable packed structure alignment, uses less memory, + but unaligned reads. Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1491,7 +1494,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NSD configure 4.1.17 +NSD configure 4.1.19 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2200,7 +2203,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by NSD $as_me 4.1.17, which was +It was created by NSD $as_me 4.1.19, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -8266,9 +8269,11 @@ $as_echo "no" >&6; } fi fi if test "x$found_b64_ntop" = xyes; then - $as_echo "#define HAVE_B64_NTOP 1" >>confdefs.h - $as_echo "#define HAVE_B64_PTON 1" >>confdefs.h +$as_echo "#define HAVE_B64_NTOP 1" >>confdefs.h + + +$as_echo "#define HAVE_B64_PTON 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -9171,6 +9176,54 @@ _ACEOF ;; esac +# Check whether --enable-packed was given. +if test "${enable_packed+set}" = set; then : + enableval=$enable_packed; +fi + +case "$enable_packed" in + yes) + +cat >>confdefs.h <<_ACEOF +#define PACKED_STRUCTS /**/ +_ACEOF + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wno-address-of-packed-member" >&5 +$as_echo_n "checking whether $CC supports -Wno-address-of-packed-member... " >&6; } +cache=`echo Wno-address-of-packed-member | sed 'y%.=/+-%___p_%'` +if eval \${cv_prog_cc_flag_$cache+:} false; then : + $as_echo_n "(cached) " >&6 +else + +echo 'void f(void){}' >conftest.c +if test -z "`$CC $CPPFLAGS $CFLAGS -Wno-address-of-packed-member -c conftest.c 2>&1`"; then +eval "cv_prog_cc_flag_$cache=yes" +else +eval "cv_prog_cc_flag_$cache=no" +fi +rm -f conftest conftest.o conftest.c + +fi + +if eval "test \"`echo '$cv_prog_cc_flag_'$cache`\" = yes"; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +: +CFLAGS="$CFLAGS -Wno-address-of-packed-member" +else +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +: + +fi + + ;; + no|*) + ;; +esac + @@ -9717,7 +9770,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by NSD $as_me 4.1.17, which was +This file was extended by NSD $as_me 4.1.19, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9779,7 +9832,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -NSD config.status 4.1.17 +NSD config.status 4.1.19 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -- 2.20.1