7a8
> sinclude(dnstap/dnstap.m4)
11,12c12,13
< m4_define([VERSION_MINOR],[4])
< m4_define([VERSION_MICRO],[22])
---
> m4_define([VERSION_MINOR],[5])
> m4_define([VERSION_MICRO],[1])
18,20c19,21
< LIBUNBOUND_CURRENT=4
< LIBUNBOUND_REVISION=1
< LIBUNBOUND_AGE=2
---
> LIBUNBOUND_CURRENT=5
> LIBUNBOUND_REVISION=3
> LIBUNBOUND_AGE=3
56a58,60
> # 1.4.22 had 4:1:2
> # 1.5.0 had 5:3:3 # adds ub_ctx_add_ta_autr
> # 1.5.1 had 5:4:3
265c269
< AC_CHECK_HEADERS([stdarg.h stdbool.h netinet/in.h sys/param.h sys/socket.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h],,, [AC_INCLUDES_DEFAULT])
---
> AC_CHECK_HEADERS([stdarg.h stdbool.h netinet/in.h sys/param.h sys/socket.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h],,, [AC_INCLUDES_DEFAULT])
317c321
< #define _XOPEN_SOURCE
---
> #define _XOPEN_SOURCE 600
465c469
< if test `$PYTHON -c "print '$PYTHON_VERSION' >= '2.4.0'"` = "False"; then
---
> if test `$PYTHON -c "print('$PYTHON_VERSION' >= '2.4.0')"` = "False"; then
556a561,570
> AC_MSG_CHECKING([for LibreSSL])
> if grep OPENSSL_VERSION_TEXT $ssldir/include/openssl/opensslv.h | grep "LibreSSL" >/dev/null; then
> AC_MSG_RESULT([yes])
> AC_DEFINE([HAVE_LIBRESSL], [1], [Define if we have LibreSSL])
> # libressl provides these compat functions, but they may also be
> # declared by the OS in libc. See if they have been declared.
> AC_CHECK_DECLS([strlcpy,strlcat,arc4random,arc4random_uniform])
> else
> AC_MSG_RESULT([no])
> fi
722,724c736,742
< if grep OPENSSL_VERSION_NUMBER $ssldir/include/openssl/opensslv.h | grep 0x0 >/dev/null; then
< AC_MSG_RESULT([no])
< AC_DEFINE_UNQUOTED([USE_ECDSA_EVP_WORKAROUND], [1], [Define this to enable an EVP workaround for older openssl])
---
> if grep OPENSSL_VERSION_TEXT $ssldir/include/openssl/opensslv.h | grep "OpenSSL" >/dev/null; then
> if grep OPENSSL_VERSION_NUMBER $ssldir/include/openssl/opensslv.h | grep 0x0 >/dev/null; then
> AC_MSG_RESULT([no])
> AC_DEFINE_UNQUOTED([USE_ECDSA_EVP_WORKAROUND], [1], [Define this to enable an EVP workaround for older openssl])
> else
> AC_MSG_RESULT([yes])
> fi
725a744
> # not OpenSSL, thus likely LibreSSL, which supports it
968a988,1029
> LIBOBJ_WITHOUT_CTIMEARC4="$LIBOBJS"
> AC_SUBST(LIBOBJ_WITHOUT_CTIMEARC4)
> if test "$USE_NSS" = "no"; then
> AC_REPLACE_FUNCS(arc4random)
> AC_REPLACE_FUNCS(arc4random_uniform)
> if test "$ac_cv_func_arc4random" = "no"; then
> AC_LIBOBJ(explicit_bzero)
> AC_LIBOBJ(arc4_lock)
> AC_CHECK_FUNCS([getentropy],,[
> if test "$USE_WINSOCK" = 1; then
> AC_LIBOBJ(getentropy_win)
> else
> case `uname` in
> Darwin)
> AC_LIBOBJ(getentropy_osx)
> ;;
> SunOS)
> AC_LIBOBJ(getentropy_solaris)
> AC_CHECK_HEADERS([sys/sha2.h],, [
> AC_CHECK_FUNCS([SHA512_Update],,[
> AC_LIBOBJ(sha512)
> ])
> ], [AC_INCLUDES_DEFAULT])
> if test "$ac_cv_header_sys_sha2_h" = "yes"; then
> # this lib needed for sha2 on solaris
> LIBS="$LIBS -lmd"
> fi
> ;;
> Linux|*)
> AC_LIBOBJ(getentropy_linux)
> AC_CHECK_FUNCS([SHA512_Update],,[
> AC_DEFINE([COMPAT_SHA512], [1], [Do sha512 definitions in config.h])
> AC_LIBOBJ(sha512)
> ])
> AC_CHECK_HEADERS([sys/sysctl.h],,, [AC_INCLUDES_DEFAULT])
> AC_SEARCH_LIBS([clock_gettime], [rt])
> ;;
> esac
> fi
> ])
> fi
> fi
1004a1066,1084
> # check for dnstap if requested
> dt_DNSTAP([$UNBOUND_RUN_DIR/dnstap.sock],
> [
> AC_DEFINE([USE_DNSTAP], [1], [Define to 1 to enable dnstap support])
> AC_SUBST([ENABLE_DNSTAP], [1])
>
> AC_SUBST([opt_dnstap_socket_path])
> ACX_ESCAPE_BACKSLASH($opt_dnstap_socket_path, hdr_dnstap_socket_path)
> AC_DEFINE_UNQUOTED(DNSTAP_SOCKET_PATH,
> ["$hdr_dnstap_socket_path"], [default dnstap socket path])
>
> AC_SUBST([DNSTAP_SRC], ["dnstap/dnstap.c dnstap/dnstap.pb-c.c"])
> AC_SUBST([DNSTAP_OBJ], ["dnstap.lo dnstap.pb-c.lo"])
> ],
> [
> AC_SUBST([ENABLE_DNSTAP], [0])
> ]
> )
>
1161a1242,1285
> #ifdef HAVE_LIBRESSL
> # if !HAVE_DECL_STRLCPY
> size_t strlcpy(char *dst, const char *src, size_t siz);
> # endif
> # if !HAVE_DECL_STRLCAT
> size_t strlcat(char *dst, const char *src, size_t siz);
> # endif
> # if !HAVE_DECL_ARC4RANDOM && defined(HAVE_ARC4RANDOM)
> uint32_t arc4random(void);
> # endif
> # if !HAVE_DECL_ARC4RANDOM_UNIFORM && defined(HAVE_ARC4RANDOM_UNIFORM)
> uint32_t arc4random_uniform(uint32_t upper_bound);
> # endif
> #endif /* HAVE_LIBRESSL */
> #ifndef HAVE_ARC4RANDOM
> void explicit_bzero(void* buf, size_t len);
> int getentropy(void* buf, size_t len);
> uint32_t arc4random(void);
> void arc4random_buf(void* buf, size_t n);
> void _ARC4_LOCK(void);
> void _ARC4_UNLOCK(void);
> #endif
> #ifndef HAVE_ARC4RANDOM_UNIFORM
> uint32_t arc4random_uniform(uint32_t upper_bound);
> #endif
> #ifdef COMPAT_SHA512
> #ifndef SHA512_DIGEST_LENGTH
> #define SHA512_BLOCK_LENGTH 128
> #define SHA512_DIGEST_LENGTH 64
> #define SHA512_DIGEST_STRING_LENGTH (SHA512_DIGEST_LENGTH * 2 + 1)
> typedef struct _SHA512_CTX {
> uint64_t state[8];
> uint64_t bitcount[2];
> uint8_t buffer[SHA512_BLOCK_LENGTH];
> } SHA512_CTX;
> #endif /* SHA512_DIGEST_LENGTH */
> void SHA512_Init(SHA512_CTX*);
> void SHA512_Update(SHA512_CTX*, void*, size_t);
> void SHA512_Final(uint8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*);
> unsigned char *SHA512(void* data, unsigned int data_len, unsigned char *digest);
> #endif /* COMPAT_SHA512 */
>
>
>
1212c1336,1341
< AC_CONFIG_FILES([Makefile doc/example.conf doc/libunbound.3 doc/unbound.8 doc/unbound-anchor.8 doc/unbound-checkconf.8 doc/unbound.conf.5 doc/unbound-control.8 smallapp/unbound-control-setup.sh])
---
> dnl if we build from source tree, the man pages need @date@ and @version@
> dnl if this is a distro tarball, that was already done by makedist.sh
> AC_SUBST(version, [VERSION_MAJOR.VERSION_MINOR.VERSION_MICRO])
> AC_SUBST(date, [`date +'%b %e, %Y'`])
>
> AC_CONFIG_FILES([Makefile doc/example.conf doc/libunbound.3 doc/unbound.8 doc/unbound-anchor.8 doc/unbound-checkconf.8 doc/unbound.conf.5 doc/unbound-control.8 doc/unbound-host.1 smallapp/unbound-control-setup.sh dnstap/dnstap_config.h])
> sinclude(dnstap/dnstap.m4)
11,12c12,13
< m4_define([VERSION_MINOR],[4])
< m4_define([VERSION_MICRO],[22])
---
> m4_define([VERSION_MINOR],[5])
> m4_define([VERSION_MICRO],[1])
18,20c19,21
< LIBUNBOUND_CURRENT=4
< LIBUNBOUND_REVISION=1
< LIBUNBOUND_AGE=2
---
> LIBUNBOUND_CURRENT=5
> LIBUNBOUND_REVISION=3
> LIBUNBOUND_AGE=3
56a58,60
> # 1.4.22 had 4:1:2
> # 1.5.0 had 5:3:3 # adds ub_ctx_add_ta_autr
> # 1.5.1 had 5:4:3
265c269
< AC_CHECK_HEADERS([stdarg.h stdbool.h netinet/in.h sys/param.h sys/socket.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h],,, [AC_INCLUDES_DEFAULT])
---
> AC_CHECK_HEADERS([stdarg.h stdbool.h netinet/in.h sys/param.h sys/socket.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h],,, [AC_INCLUDES_DEFAULT])
317c321
< #define _XOPEN_SOURCE
---
> #define _XOPEN_SOURCE 600
465c469
< if test `$PYTHON -c "print '$PYTHON_VERSION' >= '2.4.0'"` = "False"; then
---
> if test `$PYTHON -c "print('$PYTHON_VERSION' >= '2.4.0')"` = "False"; then
556a561,570
> AC_MSG_CHECKING([for LibreSSL])
> if grep OPENSSL_VERSION_TEXT $ssldir/include/openssl/opensslv.h | grep "LibreSSL" >/dev/null; then
> AC_MSG_RESULT([yes])
> AC_DEFINE([HAVE_LIBRESSL], [1], [Define if we have LibreSSL])
> # libressl provides these compat functions, but they may also be
> # declared by the OS in libc. See if they have been declared.
> AC_CHECK_DECLS([strlcpy,strlcat,arc4random,arc4random_uniform])
> else
> AC_MSG_RESULT([no])
> fi
722,724c736,742
< if grep OPENSSL_VERSION_NUMBER $ssldir/include/openssl/opensslv.h | grep 0x0 >/dev/null; then
< AC_MSG_RESULT([no])
< AC_DEFINE_UNQUOTED([USE_ECDSA_EVP_WORKAROUND], [1], [Define this to enable an EVP workaround for older openssl])
---
> if grep OPENSSL_VERSION_TEXT $ssldir/include/openssl/opensslv.h | grep "OpenSSL" >/dev/null; then
> if grep OPENSSL_VERSION_NUMBER $ssldir/include/openssl/opensslv.h | grep 0x0 >/dev/null; then
> AC_MSG_RESULT([no])
> AC_DEFINE_UNQUOTED([USE_ECDSA_EVP_WORKAROUND], [1], [Define this to enable an EVP workaround for older openssl])
> else
> AC_MSG_RESULT([yes])
> fi
725a744
> # not OpenSSL, thus likely LibreSSL, which supports it
968a988,1029
> LIBOBJ_WITHOUT_CTIMEARC4="$LIBOBJS"
> AC_SUBST(LIBOBJ_WITHOUT_CTIMEARC4)
> if test "$USE_NSS" = "no"; then
> AC_REPLACE_FUNCS(arc4random)
> AC_REPLACE_FUNCS(arc4random_uniform)
> if test "$ac_cv_func_arc4random" = "no"; then
> AC_LIBOBJ(explicit_bzero)
> AC_LIBOBJ(arc4_lock)
> AC_CHECK_FUNCS([getentropy],,[
> if test "$USE_WINSOCK" = 1; then
> AC_LIBOBJ(getentropy_win)
> else
> case `uname` in
> Darwin)
> AC_LIBOBJ(getentropy_osx)
> ;;
> SunOS)
> AC_LIBOBJ(getentropy_solaris)
> AC_CHECK_HEADERS([sys/sha2.h],, [
> AC_CHECK_FUNCS([SHA512_Update],,[
> AC_LIBOBJ(sha512)
> ])
> ], [AC_INCLUDES_DEFAULT])
> if test "$ac_cv_header_sys_sha2_h" = "yes"; then
> # this lib needed for sha2 on solaris
> LIBS="$LIBS -lmd"
> fi
> ;;
> Linux|*)
> AC_LIBOBJ(getentropy_linux)
> AC_CHECK_FUNCS([SHA512_Update],,[
> AC_DEFINE([COMPAT_SHA512], [1], [Do sha512 definitions in config.h])
> AC_LIBOBJ(sha512)
> ])
> AC_CHECK_HEADERS([sys/sysctl.h],,, [AC_INCLUDES_DEFAULT])
> AC_SEARCH_LIBS([clock_gettime], [rt])
> ;;
> esac
> fi
> ])
> fi
> fi
1004a1066,1084
> # check for dnstap if requested
> dt_DNSTAP([$UNBOUND_RUN_DIR/dnstap.sock],
> [
> AC_DEFINE([USE_DNSTAP], [1], [Define to 1 to enable dnstap support])
> AC_SUBST([ENABLE_DNSTAP], [1])
>
> AC_SUBST([opt_dnstap_socket_path])
> ACX_ESCAPE_BACKSLASH($opt_dnstap_socket_path, hdr_dnstap_socket_path)
> AC_DEFINE_UNQUOTED(DNSTAP_SOCKET_PATH,
> ["$hdr_dnstap_socket_path"], [default dnstap socket path])
>
> AC_SUBST([DNSTAP_SRC], ["dnstap/dnstap.c dnstap/dnstap.pb-c.c"])
> AC_SUBST([DNSTAP_OBJ], ["dnstap.lo dnstap.pb-c.lo"])
> ],
> [
> AC_SUBST([ENABLE_DNSTAP], [0])
> ]
> )
>
1161a1242,1285
> #ifdef HAVE_LIBRESSL
> # if !HAVE_DECL_STRLCPY
> size_t strlcpy(char *dst, const char *src, size_t siz);
> # endif
> # if !HAVE_DECL_STRLCAT
> size_t strlcat(char *dst, const char *src, size_t siz);
> # endif
> # if !HAVE_DECL_ARC4RANDOM && defined(HAVE_ARC4RANDOM)
> uint32_t arc4random(void);
> # endif
> # if !HAVE_DECL_ARC4RANDOM_UNIFORM && defined(HAVE_ARC4RANDOM_UNIFORM)
> uint32_t arc4random_uniform(uint32_t upper_bound);
> # endif
> #endif /* HAVE_LIBRESSL */
> #ifndef HAVE_ARC4RANDOM
> void explicit_bzero(void* buf, size_t len);
> int getentropy(void* buf, size_t len);
> uint32_t arc4random(void);
> void arc4random_buf(void* buf, size_t n);
> void _ARC4_LOCK(void);
> void _ARC4_UNLOCK(void);
> #endif
> #ifndef HAVE_ARC4RANDOM_UNIFORM
> uint32_t arc4random_uniform(uint32_t upper_bound);
> #endif
> #ifdef COMPAT_SHA512
> #ifndef SHA512_DIGEST_LENGTH
> #define SHA512_BLOCK_LENGTH 128
> #define SHA512_DIGEST_LENGTH 64
> #define SHA512_DIGEST_STRING_LENGTH (SHA512_DIGEST_LENGTH * 2 + 1)
> typedef struct _SHA512_CTX {
> uint64_t state[8];
> uint64_t bitcount[2];
> uint8_t buffer[SHA512_BLOCK_LENGTH];
> } SHA512_CTX;
> #endif /* SHA512_DIGEST_LENGTH */
> void SHA512_Init(SHA512_CTX*);
> void SHA512_Update(SHA512_CTX*, void*, size_t);
> void SHA512_Final(uint8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*);
> unsigned char *SHA512(void* data, unsigned int data_len, unsigned char *digest);
> #endif /* COMPAT_SHA512 */
>
>
>
1212c1336,1341
< AC_CONFIG_FILES([Makefile doc/example.conf doc/libunbound.3 doc/unbound.8 doc/unbound-anchor.8 doc/unbound-checkconf.8 doc/unbound.conf.5 doc/unbound-control.8 smallapp/unbound-control-setup.sh])
---
> dnl if we build from source tree, the man pages need @date@ and @version@
> dnl if this is a distro tarball, that was already done by makedist.sh
> AC_SUBST(version, [VERSION_MAJOR.VERSION_MINOR.VERSION_MICRO])
> AC_SUBST(date, [`date +'%b %e, %Y'`])
>
> AC_CONFIG_FILES([Makefile doc/example.conf doc/libunbound.3 doc/unbound.8 doc/unbound-anchor.8 doc/unbound-checkconf.8 doc/unbound.conf.5 doc/unbound-control.8 doc/unbound-host.1 smallapp/unbound-control-setup.sh dnstap/dnstap_config.h])