From nobody Mon Mar 27 12:12:28 2023 X-Original-To: dev-commits-ports-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 4PlWsS3v3xz42C09; Mon, 27 Mar 2023 12:12:28 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PlWsS2xfjz3hWt; Mon, 27 Mar 2023 12:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679919148; 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=s+XzdFEbBn1EE4zq1FqQGNN5zIsQGMwXQS1DAk0erT8=; b=dMzIO2t2kEtf7UF+Hi0QZ1v/guIcp4YiEahjUQewYhIyR2LNivTfM0mpDhXnbthAXLuMHY atf6MOOIJN11j0zPXaihuyrnSgdRjG4XHSAmBruBftvE9J8UP6I3+I8x55CDeczGZXvDnV eyR8gOB2jSvcKTpFp9IPxU24fFPWLO1qkHRY5CbA+ualPY/f24O8BDfPRxKHD+a9gMMHZG EVaJA6POcVK83lTCdClnH7yAtGqbva4PZyR4YEaETi1wyq+vzs8sNFHnjYAmtGaPzo3vEJ MnsiAHv4O2emjN264Hb9Dn0eeZn4zYjt+SREawYpmj6lNqvecLTmJLtg/AME5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679919148; 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=s+XzdFEbBn1EE4zq1FqQGNN5zIsQGMwXQS1DAk0erT8=; b=Fc+aeyCbvi/skZqb88vXxQIEtX/b4KDALub4PEQAFkyxoH5faXbGbIVXQOu0AtUU124VBr UWG9FP6DziZqZ5lLUZ2z4bgxGOU7QVZ+pkSSNPEzDTFGQA8orL1cy6IIQh/RMZreQCj9Fg G8xHKpYY47PljNsuAC63x09riVBjG5UMr6+mJr9QN5yokadsHT+yLFwK2rg/YOBJLNsQwm NmQqMM6JLC1hAXqY+eharvo73Qolkv9HrEzeiMKtDjaNTDStp16p+HWZUg7Dx1e+VGqGdU V0jnelFblhuv4zugSvPXIqFIzUQFHHGZHKHduUY8EQgbIfIIfMrNYrssqiYO8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679919148; a=rsa-sha256; cv=none; b=oqL9mv2LFLVOjLRT1C26CjztkA1w3L2mM5B1OLXVZIRicRLE+7X9noNd5gqWK6eWqTJKmx SmyGhQC/strmsxWmNWpXlJvxufirWygISqfdhyhJIz/eWOWtggxqGCkviKiFEM7Nb4n8IN ZUEb6JlMjCxKiWhp5qD3rUTHPWOM8ngKfd+2iWeEFEN8c5qKis0YgcCOmwzVZ0ipgPI1/y mSC9gmXLE6jKA+SjYRZERBAIggzNXsHIMLOZDZWuIlxKvLafDRPsnW34uMkR4J552nlmnB zvqb+snqeeExP0iy+3J3byabyCDvY6L33rgdnYMf7BLEG1PhuWIMUPbnz0GCjw== 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 4PlWsS20WvzLyJ; Mon, 27 Mar 2023 12:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RCCSPd041070; Mon, 27 Mar 2023 12:12:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RCCSnZ041069; Mon, 27 Mar 2023 12:12:28 GMT (envelope-from git) Date: Mon, 27 Mar 2023 12:12:28 GMT Message-Id: <202303271212.32RCCSnZ041069@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Cochard Subject: git: 9305cd3f9321 - main - net/pkt-gen: Update to g2023.03.22 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9305cd3f9321bfba95479b2b2a15c7639a790383 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=9305cd3f9321bfba95479b2b2a15c7639a790383 commit 9305cd3f9321bfba95479b2b2a15c7639a790383 Author: Olivier Cochard AuthorDate: 2023-03-27 12:10:13 +0000 Commit: Olivier Cochard CommitDate: 2023-03-27 12:12:12 +0000 net/pkt-gen: Update to g2023.03.22 PR: 270440 Reported by: Jose Luis Duran --- net/pkt-gen/Makefile | 4 ++-- net/pkt-gen/distinfo | 6 +++--- net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile | 12 ------------ net/pkt-gen/files/patch-apps_nmreplay_nmreplay.c | 11 ----------- net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile | 12 ------------ net/pkt-gen/files/patch-apps_pkt-gen_pkt-gen.c | 13 ------------- net/pkt-gen/files/patch-libnetmap_GNUmakefile | 11 ----------- 7 files changed, 5 insertions(+), 64 deletions(-) diff --git a/net/pkt-gen/Makefile b/net/pkt-gen/Makefile index 04715383397c..c5e022560ced 100644 --- a/net/pkt-gen/Makefile +++ b/net/pkt-gen/Makefile @@ -1,5 +1,5 @@ PORTNAME= pkt-gen -PORTVERSION= g2022.02.10 +PORTVERSION= g2023.03.22 CATEGORIES= net MAINTAINER= olivier@FreeBSD.org @@ -12,7 +12,7 @@ USES= gmake USE_GITHUB= yes GH_ACCOUNT= luigirizzo GH_PROJECT= netmap -GH_TAGNAME= 278045b +GH_TAGNAME= 0a53f85 MAKEFILE= GNUmakefile OPTIONS_DEFINE= PCAP diff --git a/net/pkt-gen/distinfo b/net/pkt-gen/distinfo index 289aa5851c44..0dae43868930 100644 --- a/net/pkt-gen/distinfo +++ b/net/pkt-gen/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1644949020 -SHA256 (luigirizzo-netmap-g2022.02.10-278045b_GH0.tar.gz) = 96715bf359ad49ef4ee1b70559e6e268af07d6ed605b0074ca885a55211f8cec -SIZE (luigirizzo-netmap-g2022.02.10-278045b_GH0.tar.gz) = 746973 +TIMESTAMP = 1679702302 +SHA256 (luigirizzo-netmap-g2023.03.22-0a53f85_GH0.tar.gz) = 11af9db132407c39828b7dbf4906e01eedf8f70bac9dc178bd3d6a90aace8292 +SIZE (luigirizzo-netmap-g2023.03.22-0a53f85_GH0.tar.gz) = 758416 diff --git a/net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile b/net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile deleted file mode 100644 index 01f487791835..000000000000 --- a/net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ ---- apps/nmreplay/GNUmakefile.orig 2022-02-11 07:45:02 UTC -+++ apps/nmreplay/GNUmakefile -@@ -10,7 +10,8 @@ VPATH = $(SRCDIR)/apps/nmreplay - - NO_MAN= - CFLAGS = -O2 # -pipe -g --CFLAGS += -Werror -Wall -Wunused-function -+CFLAGS += -Wall -Wunused-function -+CFLAGS += -Wall -Wunused-function - CFLAGS += -I $(SRCDIR)/sys -I $(SRCDIR)/apps/include -I $(SRCDIR)/libnetmap - CFLAGS += -Wextra - diff --git a/net/pkt-gen/files/patch-apps_nmreplay_nmreplay.c b/net/pkt-gen/files/patch-apps_nmreplay_nmreplay.c deleted file mode 100644 index 7fa0b0b52463..000000000000 --- a/net/pkt-gen/files/patch-apps_nmreplay_nmreplay.c +++ /dev/null @@ -1,11 +0,0 @@ ---- apps/nmreplay/nmreplay.c.orig 2022-02-11 07:45:02 UTC -+++ apps/nmreplay/nmreplay.c -@@ -1273,7 +1273,7 @@ main(int argc, char **argv) - D("exiting on abort"); - sleep(1); - -- return (0); -+ return (err); - } - - /* conversion factor for numbers. diff --git a/net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile b/net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile deleted file mode 100644 index f401d30bd9e8..000000000000 --- a/net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ ---- apps/pkt-gen/GNUmakefile.orig 2022-02-11 07:45:02 UTC -+++ apps/pkt-gen/GNUmakefile -@@ -10,7 +10,8 @@ VPATH = $(SRCDIR)/apps/pkt-gen - - NO_MAN= - CFLAGS = -O2 -pipe --CFLAGS += -Werror -Wall -Wunused-function -+CFLAGS += -Wall -Wunused-function -+CFLAGS += -Wall -Wunused-function - CFLAGS += -I $(SRCDIR)/sys -I $(SRCDIR)/apps/include -I $(SRCDIR)/libnetmap - CFLAGS += -Wextra -Wno-address-of-packed-member - diff --git a/net/pkt-gen/files/patch-apps_pkt-gen_pkt-gen.c b/net/pkt-gen/files/patch-apps_pkt-gen_pkt-gen.c deleted file mode 100644 index b059e6c79370..000000000000 --- a/net/pkt-gen/files/patch-apps_pkt-gen_pkt-gen.c +++ /dev/null @@ -1,13 +0,0 @@ ---- apps/pkt-gen/pkt-gen.c.orig 2022-06-08 23:21:01 UTC -+++ apps/pkt-gen/pkt-gen.c -@@ -3251,8 +3251,8 @@ out: - g.tx_period.tv_nsec = g.tx_period.tv_nsec % 1000000000; - } - if (g.td_type == TD_TYPE_SENDER) -- D("Sending %d packets every %ld.%09ld s", -- g.burst, g.tx_period.tv_sec, g.tx_period.tv_nsec); -+ D("Sending %d packets every %lld.%09ld s", -+ g.burst, (long long)g.tx_period.tv_sec, g.tx_period.tv_nsec); - /* Install ^C handler. */ - global_nthreads = g.nthreads; - sigemptyset(&ss); diff --git a/net/pkt-gen/files/patch-libnetmap_GNUmakefile b/net/pkt-gen/files/patch-libnetmap_GNUmakefile deleted file mode 100644 index ba04a18d3b2d..000000000000 --- a/net/pkt-gen/files/patch-libnetmap_GNUmakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- libnetmap/GNUmakefile.orig 2022-02-11 07:45:02 UTC -+++ libnetmap/GNUmakefile -@@ -1,6 +1,7 @@ - SRCDIR ?= ../ - PREFIX ?= usr/local --CFLAGS=-O2 -pipe -Wall -Werror -+CFLAGS=-O2 -pipe -Wall -+CFLAGS=-O2 -pipe -Wall - CFLAGS +=-g - CFLAGS += -I $(SRCDIR)/sys - VPATH = $(SRCDIR)/libnetmap