From nobody Mon Apr 6 21:03:51 2026 X-Original-To: dev-commits-src-all@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 4fqMJ72w8zz6Y0Z6 for ; Mon, 06 Apr 2026 21:03:51 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqMJ722PFz3nTM for ; Mon, 06 Apr 2026 21:03:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775509431; 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=g/ZmRF0Q9+hoaBgOt5DIswPZuyiUjWG9dozpsjbwK5w=; b=NUXmZWkQYUl1jBALM2xhc9GIsbJebP7FpzgiThpsDzEZWFyZHRXqPfIm+QuCQepp1sDNVN Rcs+BABAr2YLDwwBhV94whrm0Nz3/cNEtQybdnv3GHDrNdIXOG1r/osYSi5r2f9W4s8FRq DAs6z4sffk9J+UUiR6XVrcEmv8K80yBSeWI2IUt3QBqhmVHxMrsGeNx0jwL+y56eIDDWNe 0rcMxFQrp4eI1vxfLzbMb0OPYWMnT2jvSgg73bedtG5ckT/q7ltWoo2OZ/NobEDXLEhZD3 AZ2XaKNpPt+YndtrSPbZFrepJpfnzbFFRHeGclu8jDXQS0XzJbU5OONMcNJ4ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775509431; a=rsa-sha256; cv=none; b=soHp/enrrzNdyAGEhmPcDe/uG49PXrik/yPPAy1yEUZ2YNvFMoPmR403w4kPpykLlfxGlA 2eC0baD7imeXlNnswOET/nGj3mYGqOV87IwpMByJ3g47paSDw7PqOgynNgYwrYcNmLei1L hOlR81UZUwiHWMS31+TmD5v0el0cnQoTUNR4IvobEokGzP5U6rW6UPRW8uuCxQILdh9W41 0285Nea4wZ4g3WCk1it0VlR8r8JOqKP+M4Zmkckl8PSz/J1Y0/GiCoSHAZb/y8A+z2Ubpx yDBO+qeFRci465IyiJcer47ztuJDVePJ2QWvGGV7c4/bK2WV/JiAZ1Zbw95Yfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775509431; 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=g/ZmRF0Q9+hoaBgOt5DIswPZuyiUjWG9dozpsjbwK5w=; b=PmPWCH/0metGTyLzUmCtK5EmOQJBKfYrqghJLQG6L0vUATSzuj661HVMzmSK2v7SpjsVsX XbFT9zfHoXc7Vmq4SvS7ulJbNza1/AS0M1tdvbjsFoB6bWDApEpce76gjo+WRasaqw/MDE 2cfPb93j0zXSyI5WbgJOdRxsqUQgjaKFvwhB4AUutuC4490eQsNcNTMh0QJQmofa/q2yH3 4EuNEcuTPWC1Z6PE2VfnbH7h8Maj+6BKNoFZE987CsPrCYwKx5Asy+HCufeh4fdcIReui5 /cyCUZgOiPSNYLkg6aRFe0GpbaUc55+hjsecdkH3+Ro0OZp5LFOjYq+Z2x+ZlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqMJ71bKNz17yw for ; Mon, 06 Apr 2026 21:03:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e596 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 21:03:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Joseph Mingrone Subject: git: cd87e82499e8 - stable/15 - ipfwpcap: Fix build after libpcap 1.10.6 update List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cd87e82499e853a3de76580ce3981b011d0ebbcf Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 21:03:51 +0000 Message-Id: <69d41fb7.3e596.6e7f634b@gitrepo.freebsd.org> The branch stable/15 has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=cd87e82499e853a3de76580ce3981b011d0ebbcf commit cd87e82499e853a3de76580ce3981b011d0ebbcf Author: Joseph Mingrone AuthorDate: 2026-03-15 05:32:01 +0000 Commit: Joseph Mingrone CommitDate: 2026-04-06 19:42:28 +0000 ipfwpcap: Fix build after libpcap 1.10.6 update pcap-int.h now references SIZEOF_TIME_T from libpcap's config.h, which is not available to consumers of the internal header outside of the libpcap build. Switch to the public header and replace the direct FILE* casts and ferror()/fflush() calls with pcap_dump_flush(3), which is the correct public API for flushing a pcap dump file. Sponsored by: The FreeBSD Foundation (cherry picked from commit a0b3ef1952603ebf0307ca723b03e5a71598dd5a) --- usr.sbin/ipfwpcap/ipfwpcap.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/usr.sbin/ipfwpcap/ipfwpcap.c b/usr.sbin/ipfwpcap/ipfwpcap.c index a9cead99bd07..2032387aaa0b 100644 --- a/usr.sbin/ipfwpcap/ipfwpcap.c +++ b/usr.sbin/ipfwpcap/ipfwpcap.c @@ -41,11 +41,7 @@ #include -/* XXX normally defined in config.h */ -#define HAVE_STRLCPY 1 -#define HAVE_SNPRINTF 1 -#define HAVE_VSNPRINTF 1 -#include /* see pcap(3) and /usr/src/contrib/libpcap/. */ +#include #ifdef IP_MAXPACKET #define BUFMAX IP_MAXPACKET @@ -295,8 +291,7 @@ if (debug) fprintf(stderr, " sendto(%d) = %d\n", sd, r); (void) gettimeofday(&(phd.ts), NULL); phd.caplen = phd.len = nr; pcap_dump((u_char *)dp, &phd, buf); - if (ferror((FILE *)dp)) { perror(dumpf); quit(14); } - (void) fflush((FILE *)dp); + if (pcap_dump_flush(dp) == -1) { pcap_perror(p, dumpf); quit(14); } } quit(0);