From nobody Thu Oct 05 14:56:19 2023 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 4S1ZPv674cz4wvns; Thu, 5 Oct 2023 14:56:19 +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 4S1ZPv5cbXz4Vgn; Thu, 5 Oct 2023 14:56:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696517779; 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=/qSvwOfWxgsBs9ZSJMO6ZEOlyFAmEDYnB2IOaytuk9o=; b=nhX8NxoDHr7ez85jbAgzWZyKo3+QBmXuBkysRf6PDS1yJkyLTjnannUP5LzG8JnuejcR6M hxh6hgObjc3Gs3La7paGKfG5xW6soAZajmI6LUphcvihrneuY4R9CvofFg5trrZ5Cvcr/Y QGq5yNBG2VOUSWm/rZKZd/6qw1AiCG2upkUGDCDlHKVMq0Mgp+nTcDMFY+RohKXbcihuPO /Qcy5Yx0MGsNURkxrJBVDGLI2051+tJof0MLyr6p6VhC20Db/XOoNri6/H7MccSFsyci+I hfmdwem+KVgome7hY9Dj3zqUp0hPjCLyj/sRmOgZKSDbJW2qHoXi5N7WOfBsAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696517779; a=rsa-sha256; cv=none; b=fKYfsd/TK7AFFoKAzrJvPEA11AdT0xqMJxbOO4OaFo8CwaKvBDgdiFbB0YZSKQFZ8/ZT1K KdQW9VUusOLMDGNMTK08r28J1QPVQv6luhJvWLq4PLbVNkcFtVyQXk4ku7b6Xh2bB0rGzs WV9mJWZYc8zvHJbA7GzeYHkx2rFiYa8ZUTQem/cxiLNC+y+nZCDe2SPOWXmpDSK+dx+xAF UjRMqAe0L2CniVB41/OawyWbiYG/CzPHvTrC43YFnTJcBs/HiqA8mBF4FbVXW52KMgzTqJ OsPvPjD9BkTuu//uNPhKgX+XMINHVXdSue/RpRsv8jjEueV0QWEZb2TvSvnFMQ== 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=1696517779; 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=/qSvwOfWxgsBs9ZSJMO6ZEOlyFAmEDYnB2IOaytuk9o=; b=bcjRM1UojddE41KSoKBqeV4Cr0CX/vPGw3Kd+kZYBDcEWcebv7KMF8hR7uJK04MCjP2zt+ wCQ3Z+m+nzt84JJBSkU4bwEsuk/D5LG8+JrWMAZrPv92U1lfJ2Ea5mSJOAza2hglrCrTAE yZKLJMX2400wdJJUa06DKH4xTebapK6QEuKE+MX1KUaiLHUowR7EWlrfcX7NGawBOCo2Wt btclrrq6AuVZbo/39b3EI3EPyGmVMakWUglV4ptLllgAhu3Nt6+CQt9i3NOxqrabgoCcY0 9UUZQVP9O8jdXtIMqmNQvAf+yBaDY0JZvjRgRylRL50UVF6rcFeN0vSTKZs2ZQ== 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 4S1ZPv4MCBz1NR9; Thu, 5 Oct 2023 14:56:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 395EuJgC044656; Thu, 5 Oct 2023 14:56:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 395EuJbG044653; Thu, 5 Oct 2023 14:56:19 GMT (envelope-from git) Date: Thu, 5 Oct 2023 14:56:19 GMT Message-Id: <202310051456.395EuJbG044653@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: 8bf95465fbd8 - main - net/pkt-gen: Update to 2023.04.22 and add man pages 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 8bf95465fbd86d2e91e4f9bb3bb776c12d2859f0 Auto-Submitted: auto-generated The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=8bf95465fbd86d2e91e4f9bb3bb776c12d2859f0 commit 8bf95465fbd86d2e91e4f9bb3bb776c12d2859f0 Author: Olivier Cochard AuthorDate: 2023-10-05 14:48:30 +0000 Commit: Olivier Cochard CommitDate: 2023-10-05 14:55:35 +0000 net/pkt-gen: Update to 2023.04.22 and add man pages PR: 271004 Reported by: Jose Luis Duran Event: Oslo Hackathon at Modirum --- net/pkt-gen/Makefile | 13 +++++++++---- net/pkt-gen/distinfo | 6 +++--- net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile | 5 ++--- net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile | 5 ++--- net/pkt-gen/files/patch-apps_pkt-gen_pkt-gen.c | 13 ------------- net/pkt-gen/files/patch-libnetmap_GNUmakefile | 5 ++--- 6 files changed, 18 insertions(+), 29 deletions(-) diff --git a/net/pkt-gen/Makefile b/net/pkt-gen/Makefile index 35bc8e6570a1..59edf653f94d 100644 --- a/net/pkt-gen/Makefile +++ b/net/pkt-gen/Makefile @@ -1,6 +1,5 @@ PORTNAME= pkt-gen -PORTVERSION= g2023.03.22 -PORTREVISION= 1 +PORTVERSION= g2023.04.22 CATEGORIES= net MAINTAINER= olivier@FreeBSD.org @@ -13,7 +12,7 @@ USES= gmake USE_GITHUB= yes GH_ACCOUNT= luigirizzo GH_PROJECT= netmap -GH_TAGNAME= 0a53f85 +GH_TAGNAME= eea4f11 MAKEFILE= GNUmakefile OPTIONS_DEFINE= PCAP @@ -22,7 +21,9 @@ OPTIONS_DEFAULT= PCAP PCAP_MAKE_ARGS= WITH_PCAP=1 PLIST_FILES= bin/pkt-gen \ - bin/nmreplay + bin/nmreplay \ + share/man/man8/nmreplay.8.gz \ + share/man/man8/pkt-gen.8.gz do-build: cd ${WRKSRC}/libnetmap && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} ${MAKE_FLAGS} ${MAKEFILE} @@ -34,5 +35,9 @@ do-install: ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/apps/nmreplay/nmreplay \ ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/apps/pkt-gen/pkt-gen.8 \ + ${STAGEDIR}${PREFIX}/share/man/man8 + ${INSTALL_MAN} ${WRKSRC}/apps/nmreplay/nmreplay.8 \ + ${STAGEDIR}${PREFIX}/share/man/man8 .include diff --git a/net/pkt-gen/distinfo b/net/pkt-gen/distinfo index 0dae43868930..718b5c0050f9 100644 --- a/net/pkt-gen/distinfo +++ b/net/pkt-gen/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1679702302 -SHA256 (luigirizzo-netmap-g2023.03.22-0a53f85_GH0.tar.gz) = 11af9db132407c39828b7dbf4906e01eedf8f70bac9dc178bd3d6a90aace8292 -SIZE (luigirizzo-netmap-g2023.03.22-0a53f85_GH0.tar.gz) = 758416 +TIMESTAMP = 1682172247 +SHA256 (luigirizzo-netmap-g2023.04.22-eea4f11_GH0.tar.gz) = 2713a07c8a6f1b4ff51c2a20c7b73637a97b78363ccf9741dc20f7737235ba27 +SIZE (luigirizzo-netmap-g2023.04.22-eea4f11_GH0.tar.gz) = 759487 diff --git a/net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile b/net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile index 01f487791835..3953cdab3ca8 100644 --- a/net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile +++ b/net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile @@ -1,11 +1,10 @@ ---- apps/nmreplay/GNUmakefile.orig 2022-02-11 07:45:02 UTC +--- apps/nmreplay/GNUmakefile.orig 2023-04-22 12:00:00 UTC +++ apps/nmreplay/GNUmakefile -@@ -10,7 +10,8 @@ VPATH = $(SRCDIR)/apps/nmreplay +@@ -10,7 +10,7 @@ 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_pkt-gen_GNUmakefile b/net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile index f401d30bd9e8..bf8152ff5894 100644 --- a/net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile +++ b/net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile @@ -1,11 +1,10 @@ ---- apps/pkt-gen/GNUmakefile.orig 2022-02-11 07:45:02 UTC +--- apps/pkt-gen/GNUmakefile.orig 2023-04-22 12:00:00 UTC +++ apps/pkt-gen/GNUmakefile -@@ -10,7 +10,8 @@ VPATH = $(SRCDIR)/apps/pkt-gen +@@ -10,7 +10,7 @@ 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 index ba04a18d3b2d..13bd39649afe 100644 --- a/net/pkt-gen/files/patch-libnetmap_GNUmakefile +++ b/net/pkt-gen/files/patch-libnetmap_GNUmakefile @@ -1,10 +1,9 @@ ---- libnetmap/GNUmakefile.orig 2022-02-11 07:45:02 UTC +--- libnetmap/GNUmakefile.orig 2023-04-22 12:00:00 UTC +++ libnetmap/GNUmakefile -@@ -1,6 +1,7 @@ +@@ -1,6 +1,6 @@ SRCDIR ?= ../ PREFIX ?= usr/local -CFLAGS=-O2 -pipe -Wall -Werror -+CFLAGS=-O2 -pipe -Wall +CFLAGS=-O2 -pipe -Wall CFLAGS +=-g CFLAGS += -I $(SRCDIR)/sys