Date: Sun, 11 Jun 2023 12:00:26 +0200 From: "Herbert J. Skuhra" <herbert@gojira.at> To: Michael Gmelin <grembo@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 637c0bace261 - main - sysutils/pftop: Fix build on 14.0-CURRENT Message-ID: <87wn0afhdx.wl-herbert@gojira.at> In-Reply-To: <DB3CC509-0FB4-40EE-BCAB-CB28EF8E771D@freebsd.org> References: <87y1kqflpd.wl-herbert@gojira.at> <DB3CC509-0FB4-40EE-BCAB-CB28EF8E771D@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Multipart_Sun_Jun_11_12:00:26_2023-1 Content-Type: text/plain; charset=US-ASCII On Sun, 11 Jun 2023 11:25:45 +0200, Michael Gmelin wrote: > > > > > On 11. Jun 2023, at 10:27, Herbert J. Skuhra <herbert@gojira.at> wrote: > > > > On Sat, 10 Jun 2023 12:06:09 +0200, > > Michael Gmelin <grembo@FreeBSD.org> wrote: > >> > >> The branch main has been updated by grembo: > >> > >> URL: https://cgit.FreeBSD.org/ports/commit/?id=637c0bace26138529a36232e948549ad59342ba9 > >> > >> commit 637c0bace26138529a36232e948549ad59342ba9 > >> Author: Michael Gmelin <grembo@FreeBSD.org> > >> AuthorDate: 2023-06-10 10:03:39 +0000 > >> Commit: Michael Gmelin <grembo@FreeBSD.org> > >> CommitDate: 2023-06-10 10:03:39 +0000 > >> > >> sysutils/pftop: Fix build on 14.0-CURRENT > >> --- > >> sysutils/pftop/Makefile | 10 ++++++++-- > >> sysutils/pftop/files/extra-patch-config.h | 6 +++++- > >> 2 files changed, 13 insertions(+), 3 deletions(-) > >> > >> diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile > >> index f3c6d879f637..cba2ecd65aeb 100644 > >> --- a/sysutils/pftop/Makefile > >> +++ b/sysutils/pftop/Makefile > >> @@ -1,6 +1,6 @@ > >> PORTNAME= pftop > >> PORTVERSION= 0.8 > >> -PORTREVISION= 2 > >> +PORTREVISION= 3 > >> CATEGORIES= sysutils net > >> > >> MAINTAINER= grembo@FreeBSD.org > >> @@ -22,7 +22,13 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bpf_dump.c \ > >> ${FILESDIR}/extra-patch-sf-gencode.h > >> > >> MAKE_ARGS= LOCALBASE="${PREFIX}" \ > >> - OSLEVEL=45 > >> + > >> +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400090 > >> +MAKE_ARGS+= OSLEVEL=46 > >> +.else > >> +MAKE_ARGS+= OSLEVEL=45 > >> +.endif > >> + > >> CFLAGS+= -DHAVE_SNPRINTF=1 -DHAVE_VSNPRINTF=1 \ > >> -DHAVE_FINE_GRAINED_LOCKING=1 > >> > >> diff --git a/sysutils/pftop/files/extra-patch-config.h b/sysutils/pftop/files/extra-patch-config.h > >> index 6d2873c42ab1..d24f88179718 100644 > >> --- a/sysutils/pftop/files/extra-patch-config.h > >> +++ b/sysutils/pftop/files/extra-patch-config.h > >> @@ -1,7 +1,7 @@ > >> $OpenBSD: patch-config_h,v 1.4 2008/12/20 04:36:11 canacar Exp $ > >> --- config.h.orig Tue Nov 6 22:34:18 2007 > >> +++ config.h Fri Dec 19 20:28:01 2008 > >> -@@ -74,11 +74,20 @@ > >> +@@ -74,11 +74,24 @@ > >> #define HAVE_PFSYNC_STATE > >> #endif > >> > >> @@ -11,7 +11,11 @@ $OpenBSD: patch-config_h,v 1.4 2008/12/20 04:36:11 canacar Exp $ > >> +#endif > >> + > >> #ifdef HAVE_PFSYNC_STATE > >> ++#if OS_LEVEL > 45 > >> ++typedef struct pfsync_state_1400 pf_state_t; > > > > Are you sure that this is correct? > > > > If I replace pfsync_state_1400 with pfsync_state_1301 the port builds > > and the output looks sane. > > Hi, thanks for reporting, could you please add some details (like, > how the output differs)? With your change: sctp Out (null)[13715] (null)[0] 0:255 0 * * * 237 In (null)[0] (null)[0] NO_TRAFFIC:NO_TRAFFIC 0 0 * * ip In (null)[0] (null)[0] NO_TRAFFIC:NO_TRAFFIC 0 9324h * * ip In (null)[7185] (null)[512] NO_TRAFFIC:NO_TRAFFIC 0 53 * 2048G ip In (null)[4097] (null)[49408] NO_TRAFFIC:NO_TRAFFIC 0 0 0 1 ip In (null)[9732] (null)[4992] 9:0 0 0 42 73728M cpnx In (null)[0] (null)[0] 255:0 0 * * * ipenca In (null)[0] (null)[0] NO_TRAFFIC:NO_TRAFFIC 0 0 * * ip In (null)[0] (null)[0] 0:9 * * * * Garbage? With attached patch I see ipv[46] addresses and port numbers again. :-) I am running main-n263493-4e8d558c9d1c. -- Herbert --Multipart_Sun_Jun_11_12:00:26_2023-1 Content-Type: text/plain; type=patch; name="pftop.diff"; charset=US-ASCII Content-Disposition: attachment; filename="pftop.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL3N5c3V0aWxzL3BmdG9wL01ha2VmaWxlIGIvc3lzdXRpbHMvcGZ0b3AvTWFr ZWZpbGUKaW5kZXggY2JhMmVjZDY1YWViLi44MTVlMGQ2OGYxMjUgMTAwNjQ0Ci0tLSBhL3N5c3V0 aWxzL3BmdG9wL01ha2VmaWxlCisrKyBiL3N5c3V0aWxzL3BmdG9wL01ha2VmaWxlCkBAIC0xLDYg KzEsNiBAQAogUE9SVE5BTUU9CXBmdG9wCiBQT1JUVkVSU0lPTj0JMC44Ci1QT1JUUkVWSVNJT049 CTMKK1BPUlRSRVZJU0lPTj0JNAogQ0FURUdPUklFUz0Jc3lzdXRpbHMgbmV0CiAKIE1BSU5UQUlO RVI9CWdyZW1ib0BGcmVlQlNELm9yZwpkaWZmIC0tZ2l0IGEvc3lzdXRpbHMvcGZ0b3AvZmlsZXMv ZXh0cmEtcGF0Y2gtY29uZmlnLmggYi9zeXN1dGlscy9wZnRvcC9maWxlcy9leHRyYS1wYXRjaC1j b25maWcuaAppbmRleCBkMjRmODgxNzk3MTguLmVjZDMwYzg2MmRhZCAxMDA2NDQKLS0tIGEvc3lz dXRpbHMvcGZ0b3AvZmlsZXMvZXh0cmEtcGF0Y2gtY29uZmlnLmgKKysrIGIvc3lzdXRpbHMvcGZ0 b3AvZmlsZXMvZXh0cmEtcGF0Y2gtY29uZmlnLmgKQEAgLTEyLDcgKzEyLDcgQEAgJE9wZW5CU0Q6 IHBhdGNoLWNvbmZpZ19oLHYgMS40IDIwMDgvMTIvMjAgMDQ6MzY6MTEgY2FuYWNhciBFeHAgJAog KwogICNpZmRlZiBIQVZFX1BGU1lOQ19TVEFURQogKyNpZiBPU19MRVZFTCA+IDQ1Ci0rdHlwZWRl ZiBzdHJ1Y3QgcGZzeW5jX3N0YXRlXzE0MDAgcGZfc3RhdGVfdDsKKyt0eXBlZGVmIHN0cnVjdCBw ZnN5bmNfc3RhdGVfMTMwMSBwZl9zdGF0ZV90OwogKyNlbHNlCiAgdHlwZWRlZiBzdHJ1Y3QgcGZz eW5jX3N0YXRlIHBmX3N0YXRlX3Q7CiArI2VuZGlmCg== --Multipart_Sun_Jun_11_12:00:26_2023-1--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?87wn0afhdx.wl-herbert>