From nobody Sat Jul 31 18:45:45 2021 X-Original-To: freebsd-ports@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 5190012B2961 for ; Sat, 31 Jul 2021 18:45:54 +0000 (UTC) (envelope-from jmg@gold.funkthat.com) Received: from gold.funkthat.com (gate2.funkthat.com [208.87.223.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "gate2.funkthat.com", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GcYB90RNSz4q1d for ; Sat, 31 Jul 2021 18:45:52 +0000 (UTC) (envelope-from jmg@gold.funkthat.com) Received: from gold.funkthat.com (localhost [127.0.0.1]) by gold.funkthat.com (8.15.2/8.15.2) with ESMTPS id 16VIjjTG038090 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Sat, 31 Jul 2021 11:45:45 -0700 (PDT) (envelope-from jmg@gold.funkthat.com) Received: (from jmg@localhost) by gold.funkthat.com (8.15.2/8.15.2/Submit) id 16VIjjRx038089 for freebsd-ports@FreeBSD.org; Sat, 31 Jul 2021 11:45:45 -0700 (PDT) (envelope-from jmg) Date: Sat, 31 Jul 2021 11:45:45 -0700 From: John-Mark Gurney To: freebsd-ports@FreeBSD.org Subject: patch to fix pkt-gen Message-ID: <20210731184545.GA41029@funkthat.com> Mail-Followup-To: John-Mark Gurney , freebsd-ports@FreeBSD.org List-Id: Porting software to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-ports List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="CUfgB8w4ZwR/yMy5" Content-Disposition: inline X-Operating-System: FreeBSD 11.3-STABLE amd64 X-PGP-Fingerprint: D87A 235F FB71 1F3F 55B7 ED9B D5FF 5A51 C0AC 3D65 X-Files: The truth is out there X-URL: https://www.funkthat.com/ X-Resume: https://www.funkthat.com/~jmg/resume.html X-TipJar: bitcoin:13Qmb6AeTgQecazTWph4XasEsP7nGRbAPE X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? can i haz chizburger? User-Agent: Mutt/1.6.1 (2016-04-27) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (gold.funkthat.com [127.0.0.1]); Sat, 31 Jul 2021 11:45:45 -0700 (PDT) X-Rspamd-Queue-Id: 4GcYB90RNSz4q1d X-Spamd-Bar: ++ Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of jmg@gold.funkthat.com has no SPF policy when checking 208.87.223.18) smtp.mailfrom=jmg@gold.funkthat.com X-Spamd-Result: default: False [2.78 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[jmg]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; MIME_GOOD(-0.10)[multipart/mixed,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-ports@freebsd.org]; TO_DN_NONE(0.00)[]; HAS_ATTACHMENT(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(1.00)[0.999]; DMARC_NA(0.00)[funkthat.com]; NEURAL_HAM_SHORT(-1.00)[-0.998]; CTYPE_MIXED_BOGUS(1.00)[]; NEURAL_SPAM_LONG(0.58)[0.577]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[jmg@funkthat.com,jmg@gold.funkthat.com]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:+]; ASN(0.00)[asn:32354, ipnet:208.87.216.0/21, country:US]; FROM_NEQ_ENVFROM(0.00)[jmg@funkthat.com,jmg@gold.funkthat.com]; MAILMAN_DEST(0.00)[freebsd-ports]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N --CUfgB8w4ZwR/yMy5 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline pkt-gen by default compiles against headers that it ships with. This is likely to deal w/ Linux, but now that FreeBSD has rev'd the API a few times, it fails to work on FreeBSD, instead, giving you this: 360.000574 [ 376] netmap_ioctl_legacy Minimum supported API is 14 (requested 11) This drops the inclusion of the header files when building pkt-gen, so that it uses the correct FreeBSD kernel headers. I have done basic testing, and pkt-gen is working. Note, that this does not update pkt-gen to the latest in github, and it is almost 4 years out of date. I can commit it (I think, I haven't used a ports bit in years) if someone wants to approve it, or someone else can commit it for me. I have included it both inline and attached, in case there are problems w/ either. patch: diff --git a/net/pkt-gen/files/patch-pkt-gen_GNUmakefile b/net/pkt-gen/files/patch-pkt-gen_GNUmakefile index 5237c3d4d3c7..e4a1d15abb4c 100644 --- a/net/pkt-gen/files/patch-pkt-gen_GNUmakefile +++ b/net/pkt-gen/files/patch-pkt-gen_GNUmakefile @@ -1,13 +1,14 @@ ---- pkt-gen/GNUmakefile.orig 2018-08-15 02:22:27 UTC +--- pkt-gen/GNUmakefile.orig 2017-08-06 18:26:36 UTC +++ pkt-gen/GNUmakefile @@ -10,9 +10,8 @@ VPATH = $(SRCDIR)/apps/pkt-gen NO_MAN= CFLAGS = -O2 -pipe -CFLAGS += -Werror -Wall -Wunused-function -+CFLAGS += -Wunused-function - CFLAGS += -I $(SRCDIR)/sys -I $(SRCDIR)/apps/include +-CFLAGS += -I $(SRCDIR)/sys -I $(SRCDIR)/apps/include -CFLAGS += -Wextra ++CFLAGS += -Wunused-function ++CFLAGS += -I $(SRCDIR)/apps/include LDLIBS += -lpthread -lm ifeq ($(shell uname),Linux) -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not." --CUfgB8w4ZwR/yMy5 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="pkt-gen.diff" diff --git a/net/pkt-gen/files/patch-pkt-gen_GNUmakefile b/net/pkt-gen/files/patch-pkt-gen_GNUmakefile index 5237c3d4d3c7..e4a1d15abb4c 100644 --- a/net/pkt-gen/files/patch-pkt-gen_GNUmakefile +++ b/net/pkt-gen/files/patch-pkt-gen_GNUmakefile @@ -1,13 +1,14 @@ ---- pkt-gen/GNUmakefile.orig 2018-08-15 02:22:27 UTC +--- pkt-gen/GNUmakefile.orig 2017-08-06 18:26:36 UTC +++ pkt-gen/GNUmakefile @@ -10,9 +10,8 @@ VPATH = $(SRCDIR)/apps/pkt-gen NO_MAN= CFLAGS = -O2 -pipe -CFLAGS += -Werror -Wall -Wunused-function -+CFLAGS += -Wunused-function - CFLAGS += -I $(SRCDIR)/sys -I $(SRCDIR)/apps/include +-CFLAGS += -I $(SRCDIR)/sys -I $(SRCDIR)/apps/include -CFLAGS += -Wextra ++CFLAGS += -Wunused-function ++CFLAGS += -I $(SRCDIR)/apps/include LDLIBS += -lpthread -lm ifeq ($(shell uname),Linux) --CUfgB8w4ZwR/yMy5--