Module Name: src
Committed By: christos
Date: Fri Feb 9 17:13:27 UTC 2018
Modified Files:
src/external/bsd/nsd: Makefile.inc
src/external/bsd/nsd/dist: util.h
src/external/bsd/nsd/include: config.h
Log Message:
fix for OpenSSL 1.0 and 1.1 co-existance, merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nsd/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/dist/util.h
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nsd/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nsd/Makefile.inc
diff -u src/external/bsd/nsd/Makefile.inc:1.3 src/external/bsd/nsd/Makefile.inc:1.4
--- src/external/bsd/nsd/Makefile.inc:1.3 Sat Feb 3 22:19:52 2018
+++ src/external/bsd/nsd/Makefile.inc Fri Feb 9 12:13:27 2018
@@ -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
Index: src/external/bsd/nsd/dist/util.h
diff -u src/external/bsd/nsd/dist/util.h:1.2 src/external/bsd/nsd/dist/util.h:1.3
--- src/external/bsd/nsd/dist/util.h:1.2 Sat Jan 7 14:53:21 2017
+++ src/external/bsd/nsd/dist/util.h Fri Feb 9 12:13:27 2018
@@ -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) \
Index: src/external/bsd/nsd/include/config.h
diff -u src/external/bsd/nsd/include/config.h:1.1 src/external/bsd/nsd/include/config.h:1.2
--- src/external/bsd/nsd/include/config.h:1.1 Sat Jan 7 14:51:21 2017
+++ src/external/bsd/nsd/include/config.h Fri Feb 9 12:13:27 2018
@@ -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,
#endif /* !HAVE_STRUCT_TIMESPEC */
#endif /* !CONFIG_DEFINES */
+#ifdef PACKED_STRUCTS
+#define ATTR_PACKED __attribute__((__packed__))
+#else
+#define ATTR_PACKED
+#endif
