Module Name: src
Committed By: christos
Date: Thu Aug 17 15:30:36 UTC 2023
Modified Files:
src/external/bsd/libpcap: Makefile.inc
src/external/bsd/libpcap/include: config.h
src/external/bsd/libpcap/lib: Makefile
src/external/bsd/libpcap/sbin/rpcapd: Makefile
Log Message:
Don't build with OpenSSL by default because we install in /lib and there
is no libcrypto there.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libpcap/Makefile.inc
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/libpcap/include/config.h
cvs rdiff -u -r1.32 -r1.33 src/external/bsd/libpcap/lib/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libpcap/sbin/rpcapd/Makefile
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/libpcap/Makefile.inc
diff -u src/external/bsd/libpcap/Makefile.inc:1.3 src/external/bsd/libpcap/Makefile.inc:1.4
--- src/external/bsd/libpcap/Makefile.inc:1.3 Thu Aug 17 11:18:12 2023
+++ src/external/bsd/libpcap/Makefile.inc Thu Aug 17 11:30:35 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.3 2023/08/17 15:18:12 christos Exp $
+# $NetBSD: Makefile.inc,v 1.4 2023/08/17 15:30:35 christos Exp $
SRCDIR := ${.PARSEDIR}/dist
+USE_OPENSSL ?= no
CPPFLAGS+=-DLBL_ALIGN
OPENSSLDIR= ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}
Index: src/external/bsd/libpcap/include/config.h
diff -u src/external/bsd/libpcap/include/config.h:1.12 src/external/bsd/libpcap/include/config.h:1.13
--- src/external/bsd/libpcap/include/config.h:1.12 Thu Aug 17 11:18:13 2023
+++ src/external/bsd/libpcap/include/config.h Thu Aug 17 11:30:36 2023
@@ -136,8 +136,8 @@
/* Define to 1 if you have the <net/raw.h> header file. */
/* #undef HAVE_NET_RAW_H */
-/* Use OpenSSL */
-#define HAVE_OPENSSL 1
+/* Use OpenSSL from the Makefile */
+/* #define HAVE_OPENSSL 1 */
/* if there's an os_proto.h for this platform, to use additional prototypes */
/* #undef HAVE_OS_PROTO_H */
Index: src/external/bsd/libpcap/lib/Makefile
diff -u src/external/bsd/libpcap/lib/Makefile:1.32 src/external/bsd/libpcap/lib/Makefile:1.33
--- src/external/bsd/libpcap/lib/Makefile:1.32 Thu Aug 17 11:18:13 2023
+++ src/external/bsd/libpcap/lib/Makefile Thu Aug 17 11:30:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2023/08/17 15:18:13 christos Exp $
+# $NetBSD: Makefile,v 1.33 2023/08/17 15:30:36 christos Exp $
USE_SHLIBDIR=yes
.include <bsd.init.mk>
@@ -148,8 +148,7 @@ savefile.c \
scanner.l \
sf-pcap.c \
sf-pcapng.c \
-sockutils.c \
-sslutils.c
+sockutils.c
INCS= pcap/pcap.h pcap/namedb.h pcap/funcattrs.h \
@@ -181,7 +180,11 @@ grammar.y: grammar.y.in
${_MKTARGET_CREATE}
${TOOL_SED} -e 's/@REENTRANT_PARSER@/%pure-parser/g' < ${.ALLSRC} > ${.TARGET}
+.if ${USE_OPENSSL:Uno} == "yes"
+CPPFLAGS += -DHAVE_OPENSSL
+SRCS += sslutils.c
LIBDPLIBS += ssl ${OPENSSLDIR}/lib/libssl \
crypto ${OPENSSLDIR}/lib/libcrypto
+.endif
.include <bsd.lib.mk>
Index: src/external/bsd/libpcap/sbin/rpcapd/Makefile
diff -u src/external/bsd/libpcap/sbin/rpcapd/Makefile:1.3 src/external/bsd/libpcap/sbin/rpcapd/Makefile:1.4
--- src/external/bsd/libpcap/sbin/rpcapd/Makefile:1.3 Thu Aug 17 11:18:13 2023
+++ src/external/bsd/libpcap/sbin/rpcapd/Makefile Thu Aug 17 11:30:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/08/17 15:18:13 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/08/17 15:30:36 christos Exp $
USE_FORT?= yes # network server
@@ -34,8 +34,12 @@ CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -DPCAP_DONT_INCLUDE_PCAP_BPF_H
PROGDPLIBS+= pcap ${.CURDIR}/../../lib \
- ssl ${OPENSSLDIR}/lib/libssl \
- crypto ${OPENSSLDIR}/lib/libcrypto \
crypt ${NETBSDSRCDIR}/lib/libcrypt
+.if ${USE_OPENSSL:Uno} == "yes"
+CPPFLAGS+= -DHAVE_OPENSSL
+PROGDPLIBS+= ssl ${OPENSSLDIR}/lib/libssl \
+ crypto ${OPENSSLDIR}/lib/libcrypto
+.endif
+
.include <bsd.prog.mk>
