From nobody Fri Oct 18 09:04:46 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XVJgL1sW4z5YxtV; Fri, 18 Oct 2024 09:04:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XVJgL16MZz3xrH; Fri, 18 Oct 2024 09:04:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729242286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EgWVBvEJ62jJoleQ6G4VmW88jlIuPKWNL0U8tOISlAo=; b=oChDP7973vLQxuTcNh4YTeiWOypmV0g/qixuoZ0jFLMGByhFR1h0MAew+ZM9sN9sVT1a3D d2Bb2RpGklxw0VJZq+khFKeNdIEknSMulNdfpEhNkQMNB94OuMxuVbLfKlbcPA3Bz7kxbe NY56pOC52/jBePeFSumDsJ6VC7D2p3cOCh8Hal+3j8iqkEGzHN5/9jOo7TMI7ZpCVWQWMv QOTpMClbRT3L+odFlS+PmpLJbZgb9EJmISmw9xW2tdfpeWmtt8YbCSlQkUYTI+oAErcxaf wV4Yw/asfR1HjMhdKdGQcH2Vx5GWuaTDZeY042MFBPEzl+z24x0A0st4OZh3hA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729242286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EgWVBvEJ62jJoleQ6G4VmW88jlIuPKWNL0U8tOISlAo=; b=pq/67018THpDTbN5VFQ/vrXOMEKJ3iKgQdcHhcTFkTFUjk1J/Mww2ZE5ZiYSi6f9lEYbR0 k4ki3g+fu32eDr4oXIosmJCfCKa2eBOH8/JGU3Vxx0n9MiMDofc8g1DZZAZ551e+g+CXuc OkZkE6X6TPuO7kUc24CXzcWXUNvOPYxgw4f2jKXnvHitfkZ8sVQJyXZh0fyDnd6oiiN01o VOrhqvgK7/Fc6ecoMnpbqS11m2Utoe+wZ2w3v5iLJhAx2ZD3S46yyrGTvhO07KsjVEl7XQ clE0kgjkf1HtdpoXf0i48yiLze1XDWx/NCHrxLBniIkQGTbWqp5cZNabFu8jUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729242286; a=rsa-sha256; cv=none; b=seh3mBRLD+vF4G1agzPIiiFfr4QGcTJHntY7UcscfjDBcMEKy3A2io+qC8Gy14GQQtRUzv fTzcaavtykDuaSx7ORzxFsrJIaXsg03mg5ogG0OxUEljZbdUDMuZoGxJ1jIJJ01urwau8i udD5WiG7s+uYyqHOfxaxZM1YyeVCfLMI4vDRYrLbV7JgZl33ciV01ATUCo/QmjXfSMeYoL bHqMsBZ7ze4gmbgH+b5L/0rL48gmKtE2ma7d/Hmurnu3mq8si581umB+s6+LRs6qifl6cn ndVsXlYp98tMrOdnNtkveFH5zXI7qWlbXQ/qlfOodj1aB0w8FoMOBkWYBd7+SA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XVJgL0bNfzS9l; Fri, 18 Oct 2024 09:04:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49I94kv2023690; Fri, 18 Oct 2024 09:04:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49I94kTD023687; Fri, 18 Oct 2024 09:04:46 GMT (envelope-from git) Date: Fri, 18 Oct 2024 09:04:46 GMT Message-Id: <202410180904.49I94kTD023687@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Stefan =?utf-8?Q?E=C3=9Fer?= Subject: git: f12b97f4a030 - main - net/tcptrace: fix build after libcap change List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f12b97f4a030d9d64b761e64f37eed21867d4a6a Auto-Submitted: auto-generated The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=f12b97f4a030d9d64b761e64f37eed21867d4a6a commit f12b97f4a030d9d64b761e64f37eed21867d4a6a Author: Stefan Eßer AuthorDate: 2024-10-18 09:01:12 +0000 Commit: Stefan Eßer CommitDate: 2024-10-18 09:01:12 +0000 net/tcptrace: fix build after libcap change The pcap_offline_read() function is no longer exported from the pcap library, it has become an internal function named pcapint_offline_read(). The pcap_dispatch() function can be used instead in this particular case. Reported by: pkg-fallout --- net/tcptrace/Makefile | 2 +- net/tcptrace/files/patch-tcpdump.c | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile index 4af48347a4a3..63b41285e685 100644 --- a/net/tcptrace/Makefile +++ b/net/tcptrace/Makefile @@ -1,6 +1,6 @@ PORTNAME= tcptrace PORTVERSION= 6.6.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net #MASTER_SITES= http://www.tcptrace.org/download/ diff --git a/net/tcptrace/files/patch-tcpdump.c b/net/tcptrace/files/patch-tcpdump.c index f82fb83b2b38..936c571a965c 100644 --- a/net/tcptrace/files/patch-tcpdump.c +++ b/net/tcptrace/files/patch-tcpdump.c @@ -1,6 +1,16 @@ --- tcpdump.c.orig 2013-07-01 18:43:14 UTC +++ tcpdump.c -@@ -114,10 +114,13 @@ static int callback( +@@ -68,9 +68,6 @@ static char const GCC_UNUSED rcsid[] = + + + +-/* external ref, in case missing in older version */ +-extern int pcap_offline_read(void *, int, pcap_handler, u_char *); +- + /* global pointer, the pcap info header */ + static pcap_t *pcap; + +@@ -114,10 +111,13 @@ static int callback( /* for some reason, the windows version of tcpdump is using */ /* this. It looks just like ethernet to me */ case PCAP_DLT_EN10MB: @@ -15,3 +25,12 @@ case EH_SIZE: /* straight Ethernet encapsulation */ memcpy((char *)ip_buf,buf+offset,iplen-offset); callback_plast = ip_buf+iplen-offset-1; +@@ -250,7 +250,7 @@ pread_tcpdump( + int ret; + + while (1) { +- if ((ret = pcap_offline_read(pcap,1,(pcap_handler)callback,0)) != 1) { ++ if ((ret = pcap_dispatch(pcap,1,(pcap_handler)callback,0)) != 1) { + /* prob EOF */ + + if (ret == -1) {