From 19c63ad7a82bf6db0835fee0fd00d55857a0bd41 Mon Sep 17 00:00:00 2001
From: mvs <mvs@cvs.openbsd.org>
Date: Fri, 4 Dec 2020 11:36:14 +0000
Subject: Don't link tcpdump(8) with libl and remove reference to `yydebug'.

From Martin Vahlensieck.
---
 usr.sbin/tcpdump/Makefile  |  6 +++---
 usr.sbin/tcpdump/privsep.c |  4 ++--
 usr.sbin/tcpdump/tcpdump.c | 14 +++-----------
 3 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'usr.sbin/tcpdump')

diff --git a/usr.sbin/tcpdump/Makefile b/usr.sbin/tcpdump/Makefile
index 76119942c25..d5f3d521c23 100644
--- a/usr.sbin/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.66 2020/06/21 05:00:17 dlg Exp $
+#	$OpenBSD: Makefile,v 1.67 2020/12/04 11:36:13 mvs Exp $
 #
 #  Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994
 # 	The Regents of the University of California.  All rights reserved.
@@ -30,8 +30,8 @@ CFLAGS+=-I${.CURDIR}/../../lib/libpcap
 
 CFLAGS+=-DCSLIP -DPPP -DHAVE_FDDI -DETHER_SERVICE -DHAVE_ETHER_NTOHOST -DINET6
 
-LDADD+=	-lpcap -ll -lcrypto
-DPADD+=	${LIBL} ${LIBPCAP} ${LIBCRYPTO}
+LDADD+=	-lpcap -lcrypto
+DPADD+=	${LIBPCAP} ${LIBCRYPTO}
 
 SRCS=	tcpdump.c addrtoname.c privsep.c privsep_fdpass.c privsep_pcap.c \
 	print-ether.c print-ip.c print-arp.c print-tcp.c print-udp.c \
diff --git a/usr.sbin/tcpdump/privsep.c b/usr.sbin/tcpdump/privsep.c
index 7caa398597e..2eaaa584482 100644
--- a/usr.sbin/tcpdump/privsep.c
+++ b/usr.sbin/tcpdump/privsep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: privsep.c,v 1.54 2019/06/28 13:32:51 deraadt Exp $	*/
+/*	$OpenBSD: privsep.c,v 1.55 2020/12/04 11:36:13 mvs Exp $	*/
 
 /*
  * Copyright (c) 2003 Can Erkin Acar
@@ -224,7 +224,7 @@ priv_exec(int argc, char *argv[])
 	/* parse the arguments for required options */
 	opterr = 0;
 	while ((i = getopt(argc, argv,
-	    "aB:c:D:deE:fF:i:lLnNOopPqr:s:StT:vw:xXy:Y")) != -1) {
+	    "aB:c:D:deE:fF:i:lLnNOopPqr:s:StT:vw:xXy:")) != -1) {
 		switch (i) {
 		case 'n':
 			nflag++;
diff --git a/usr.sbin/tcpdump/tcpdump.c b/usr.sbin/tcpdump/tcpdump.c
index bbdba4d4c48..e0b6a4b318a 100644
--- a/usr.sbin/tcpdump/tcpdump.c
+++ b/usr.sbin/tcpdump/tcpdump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcpdump.c,v 1.94 2020/08/17 06:29:29 dlg Exp $	*/
+/*	$OpenBSD: tcpdump.c,v 1.95 2020/12/04 11:36:13 mvs Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -232,7 +232,7 @@ main(int argc, char **argv)
 
 	opterr = 0;
 	while ((op = getopt(argc, argv,
-	    "AaB:c:D:deE:fF:i:IlLnNOopqr:s:StT:vw:xXy:Y")) != -1)
+	    "AaB:c:D:deE:fF:i:IlLnNOopqr:s:StT:vw:xXy:")) != -1)
 		switch (op) {
 
 		case 'A':
@@ -392,15 +392,7 @@ main(int argc, char **argv)
 		case 'w':
 			WFileName = optarg;
 			break;
-#ifdef YYDEBUG
-		case 'Y':
-			{
-			/* Undocumented flag */
-			extern int yydebug;
-			yydebug = 1;
-			}
-			break;
-#endif
+
 		case 'y':
 			i = pcap_datalink_name_to_val(optarg);
 			if (i < 0)
-- 
cgit v1.2.3