Date: Fri, 20 Mar 2026 04:15:15 +0000 From: Craig Leres <leres@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 324235022207 - main - devel/p4: Update to 2024.2 release patch 2 (2907753) Message-ID: <69bcc9d3.2199e.6f158aa3@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=324235022207f875737d1f384daa75a09c1ffecc commit 324235022207f875737d1f384daa75a09c1ffecc Author: Craig Leres <leres@FreeBSD.org> AuthorDate: 2026-03-20 04:14:48 +0000 Commit: Craig Leres <leres@FreeBSD.org> CommitDate: 2026-03-20 04:14:48 +0000 devel/p4: Update to 2024.2 release patch 2 (2907753) Also, found that there is support to use tcp keepalive settings which perforce wants to set and which are configurable, but the implementation is Linux specific. Add code to fix this portability problem. Problem is being reported upstream. While we're here, freshen patch-Jamrules. PR: 293924 Approved by: antonfb@hesiod.org (maintainer) --- devel/p4/Makefile.inc | 2 +- devel/p4/distinfo | 6 +++--- devel/p4/files/patch-Jamrules | 6 +++--- devel/p4/files/patch-net_nettcptransport.cc | 13 +++++++++++++ 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/devel/p4/Makefile.inc b/devel/p4/Makefile.inc index f0d83ef6c1ee..f568ff87966a 100644 --- a/devel/p4/Makefile.inc +++ b/devel/p4/Makefile.inc @@ -1,7 +1,7 @@ P4VERSION?= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} YEAR= 2025 MAJOR= 2 -MINOR= 2852709 +MINOR= 2907753 JAM?= ${LOCALBASE}/bin/jam OSVER?= ${OSREL:S/.//} diff --git a/devel/p4/distinfo b/devel/p4/distinfo index 5610ecd76f89..b74a5ae1ea79 100644 --- a/devel/p4/distinfo +++ b/devel/p4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1765918477 -SHA256 (p4source-2852709.tgz) = e2f40e0a8ccf3d4f0f65df9147107ff0cff4d52937b33f342625a80f32ec83f5 -SIZE (p4source-2852709.tgz) = 7007314 +TIMESTAMP = 1773520963 +SHA256 (p4source-2907753.tgz) = c5c15a57612791ce833ae0e181d6234e85a8b175321e3b819d38f66e0c981803 +SIZE (p4source-2907753.tgz) = 7009506 diff --git a/devel/p4/files/patch-Jamrules b/devel/p4/files/patch-Jamrules index 466a1d46038f..7611cc625a7d 100644 --- a/devel/p4/files/patch-Jamrules +++ b/devel/p4/files/patch-Jamrules @@ -1,6 +1,6 @@ ---- Jamrules.orig 2024-05-24 15:48:33 UTC +--- Jamrules.orig 2025-05-19 13:45:05 UTC +++ Jamrules -@@ -690,12 +690,11 @@ +@@ -727,12 +727,11 @@ # P4BIN is set to ../p4-bin (relative to P4) SubDir AllP4 p4 ; # where we are @@ -14,7 +14,7 @@ $(BUILD) $(TYPE:L) ; -@@ -1301,11 +1300,6 @@ +@@ -1358,11 +1357,6 @@ OPTIM += -Wno-parentheses -Wno-switch -fwrapv ; _mflags = ; diff --git a/devel/p4/files/patch-net_nettcptransport.cc b/devel/p4/files/patch-net_nettcptransport.cc new file mode 100644 index 000000000000..00c5e4ac72db --- /dev/null +++ b/devel/p4/files/patch-net_nettcptransport.cc @@ -0,0 +1,13 @@ +--- net/nettcptransport.cc.orig 2025-05-14 10:21:01 UTC ++++ net/nettcptransport.cc +@@ -63,6 +63,10 @@ + + # define PEEK_TIMEOUT 200 /* 200 milliseconds */ + ++# if defined(IPPROTO_TCP) && !defined(SOL_TCP) ++# define SOL_TCP IPPROTO_TCP ++# endif ++ + /* + * Server: + * p4tunables::list[] has values from the defns in debug.cc + loaded byhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69bcc9d3.2199e.6f158aa3>