diff options
| author | christos <christos@NetBSD.org> | 2018-02-09 17:13:27 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2018-02-09 17:13:27 +0000 |
| commit | ff84eb62ccbb5b4f54067b45db379015dcc02bdf (patch) | |
| tree | d9d7e0a16b41f953cc08e395fed19cad2c0c5083 /external | |
| parent | 677755a11aab2a3e6b91480d2315e1336e501bd1 (diff) | |
fix for OpenSSL 1.0 and 1.1 co-existance, merge conflicts.
Diffstat (limited to 'external')
| -rw-r--r-- | external/bsd/nsd/Makefile.inc | 6 | ||||
| -rw-r--r-- | external/bsd/nsd/dist/util.h | 4 | ||||
| -rw-r--r-- | external/bsd/nsd/include/config.h | 16 |
3 files changed, 21 insertions, 5 deletions
diff --git a/external/bsd/nsd/Makefile.inc b/external/bsd/nsd/Makefile.inc index edfc8899ab2..0bb34943923 100644 --- a/external/bsd/nsd/Makefile.inc +++ b/external/bsd/nsd/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.3 2018/02/04 03:19:52 christos Exp $ +# $NetBSD: Makefile.inc,v 1.4 2018/02/09 17:13:27 christos Exp $ .include <bsd.own.mk> @@ -14,6 +14,10 @@ CPPFLAGS+=-I${NSD} -I${NSD}/../include CPPFLAGS+= -DINET6 .endif +.if ${HAVE_OPENSSL} < 11 +CPPFLAGS+= -DOPENSSL_API_COMPAT 0x10100000L +.endif + DPLIBS+= event ${NETBSDSRCDIR}/external/bsd/libevent/lib/libevent DPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libssl DPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto diff --git a/external/bsd/nsd/dist/util.h b/external/bsd/nsd/dist/util.h index 2feda93ee6f..b7134a3c114 100644 --- a/external/bsd/nsd/dist/util.h +++ b/external/bsd/nsd/dist/util.h @@ -25,6 +25,10 @@ struct region; # define LOG_WARNING 4 # define LOG_NOTICE 5 # define LOG_INFO 6 + +/* Unused, but passed to log_open. */ +# define LOG_PID 0x01 +# define LOG_DAEMON (3<<3) #endif #define ALIGN_UP(n, alignment) \ diff --git a/external/bsd/nsd/include/config.h b/external/bsd/nsd/include/config.h index 32825d0856d..515d534f828 100644 --- a/external/bsd/nsd/include/config.h +++ b/external/bsd/nsd/include/config.h @@ -138,10 +138,10 @@ #define HAVE_GRP_H 1 /* Define to 1 if you have the `HMAC_CTX_new' function. */ -/* #undef HAVE_HMAC_CTX_NEW */ +#define HAVE_HMAC_CTX_NEW 1 /* Define to 1 if you have the `HMAC_CTX_reset' function. */ -/* #undef HAVE_HMAC_CTX_RESET */ +#define HAVE_HMAC_CTX_RESET 1 /* Define to 1 if you have the `inet_aton' function. */ #define HAVE_INET_ATON 1 @@ -432,7 +432,7 @@ #define PACKAGE_NAME "NSD" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "NSD 4.1.14" +#define PACKAGE_STRING "NSD 4.1.19" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "nsd" @@ -441,7 +441,10 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.1.14" +#define PACKAGE_VERSION "4.1.19" + +/* Define this to use packed structure alignment. */ +/* #undef PACKED_STRUCTS */ /* Pathname to the NSD pidfile */ #define PIDFILE CHROOTDIR "/var/run/nsd.pid" @@ -837,3 +840,8 @@ int memcmp(const void *x, const void *y, size_t n); #endif /* !HAVE_STRUCT_TIMESPEC */ #endif /* !CONFIG_DEFINES */ +#ifdef PACKED_STRUCTS +#define ATTR_PACKED __attribute__((__packed__)) +#else +#define ATTR_PACKED +#endif |
