[src/trunk]: src/external/bsd/nsd fix for OpenSSL 1.0 and 1.1 co-existance, m...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7640b394452c
branches:  trunk
changeset: 829733:7640b394452c
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Feb 09 17:13:27 2018 +0000

description:
fix for OpenSSL 1.0 and 1.1 co-existance, merge conflicts.

diffstat:

 external/bsd/nsd/Makefile.inc     |   6 +++++-
 external/bsd/nsd/dist/util.h      |   4 ++++
 external/bsd/nsd/include/config.h |  16 ++++++++++++----
 3 files changed, 21 insertions(+), 5 deletions(-)

diffs (80 lines):

diff -r ca1b1f3baed2 -r 7640b394452c external/bsd/nsd/Makefile.inc
--- a/external/bsd/nsd/Makefile.inc     Fri Feb 09 17:11:14 2018 +0000
+++ b/external/bsd/nsd/Makefile.inc     Fri Feb 09 17:13:27 2018 +0000
@@ -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+=      -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 -r ca1b1f3baed2 -r 7640b394452c external/bsd/nsd/dist/util.h
--- a/external/bsd/nsd/dist/util.h      Fri Feb 09 17:11:14 2018 +0000
+++ b/external/bsd/nsd/dist/util.h      Fri Feb 09 17:13:27 2018 +0000
@@ -25,6 +25,10 @@
 #  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 -r ca1b1f3baed2 -r 7640b394452c external/bsd/nsd/include/config.h
--- a/external/bsd/nsd/include/config.h Fri Feb 09 17:11:14 2018 +0000
+++ b/external/bsd/nsd/include/config.h Fri Feb 09 17:13:27 2018 +0000
@@ -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 @@
 #endif /* !HAVE_STRUCT_TIMESPEC */
 #endif /* !CONFIG_DEFINES */
 
+#ifdef PACKED_STRUCTS
+#define ATTR_PACKED __attribute__((__packed__))
+#else
+#define ATTR_PACKED
+#endif