From nobody Wed Apr 8 23:14:45 2026 X-Original-To: dev-commits-src-branches@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 4frf6F40M3z6Xxvp for ; Wed, 08 Apr 2026 23:14:45 +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 4frf6F18hpz43Ny for ; Wed, 08 Apr 2026 23:14:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775690085; 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=sPVxOHpDqSSO+/fISA27q8fQ0hlyv8wWnkdMXB30u6k=; b=fa0h020RilD6MuQ/A6no6Q9lgigu4TEQh3ZKJ2Ay3fwxr4z/S08HGnHUH1l6avohVX1orz xiz7or2jet7uFdMXwKWQWXalUgCsjJVZGqp+tRkx2PjcNtMEd5sBOwoc6Vlc5v3T1jPSL0 xU7rGYxm7WDaQJv3j2NfT/UlLS3/gqfda4ss7gWcJNHZYi1ZYNQc+QnsY68lU7Ci3fWdZh Br/Ecm2XkkpPVEeZNLpMcMa2/gkzlH5bZa3lemUS6qY6/Yxrf6Q1tfL6tOYw5z8JPPzmPs 54KT/b/LBi8JWT+S47AzDxtO6n1zjXkn6zafUXjj/BWjurmIENyBk8adtqQZHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775690085; a=rsa-sha256; cv=none; b=KTSZ8qia9t8Rl8FCu58p5Ey5GT8bmgfrLzs2W5EzH7c05gQsDFGwxdGAOWZieLKzcphgqQ phcNzceOm/5Xtnk3TG+zOIxPNMw7xatjv/rmhb0vqHsrlITg8ClC5CVA4Kx2vxU6WL4RT+ BERFLVi4XmLUi2uzQmn4I467Xhz0gJWCcptApg5NpBAWHfbhimCf2mpOXBwp4A4Q9Tsd37 C88tY2ICxbm67Z1k94MOTechpM1wjVtdPVzvya+K3RbFnEs7O1GeLg4wLFBbkbbpViQfJh 8HL56PUVXh8qOtcuRsPbDUOxgKkXOEWLMprCYHH7OJPe+FlVKSg/QmcWBovXwA== 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=1775690085; 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=sPVxOHpDqSSO+/fISA27q8fQ0hlyv8wWnkdMXB30u6k=; b=ZeQu+2zhBfJU7SDo7I0OTLjuMwDIyKEOJPPPw9jGlcGfbdnfRxQOcrazfcgNsFh6yx21TO 9nDuIhUHRSdupvhnzoGzUa8rjtl7AIh0yQ1glqpdeOXD3Pb0OR+qqC53GdJl0QR6NdoGNm JbA+4ctp372UBsucInrlZ79saAjSci1uCn6ofl+7HCx0hHZl0lY0lF9NG/e4xKOKB0gr+/ IybBxiJCztWmgpBSYi+B5QZllnja80oF3q53XAYita/MNC5CPf5BJYEmli5HxCXC3LXdv3 aPq7BRzttjc2t/Y55tmSrzA1bO70gnchouuXIrNVSjjoZB2aRqWuqhEXKoKY7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frf6F0NzPznZT for ; Wed, 08 Apr 2026 23:14:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2611e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 23:14:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Joseph Mingrone Subject: git: 150048878988 - stable/14 - ipfwpcap: Fix build after libpcap 1.10.6 update List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 150048878988717cd5e96718886610d6bfdaf9ac Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 23:14:45 +0000 Message-Id: <69d6e165.2611e.1dd95933@gitrepo.freebsd.org> The branch stable/14 has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=150048878988717cd5e96718886610d6bfdaf9ac commit 150048878988717cd5e96718886610d6bfdaf9ac Author: Joseph Mingrone AuthorDate: 2026-03-15 05:32:01 +0000 Commit: Joseph Mingrone CommitDate: 2026-04-08 19:10:06 +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);