diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile index cba2ecd65aeb..815e0d68f125 100644 --- a/sysutils/pftop/Makefile +++ b/sysutils/pftop/Makefile @@ -1,81 +1,81 @@ PORTNAME= pftop PORTVERSION= 0.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils net MAINTAINER= grembo@FreeBSD.org COMMENT= Utility for real-time display of statistics for pf WWW= https://github.com/araujobsd/pftop/ LICENSE= BSD2CLAUSE USE_GITHUB= yes GH_ACCOUNT= grembo OPTIONS_DEFINE= ALTQ ALTQ_DESC= ALTQ support for queue statistics .include EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bpf_dump.c \ ${FILESDIR}/extra-patch-sf-gencode.h MAKE_ARGS= LOCALBASE="${PREFIX}" \ .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 .if ${PORT_OPTIONS:MALTQ} CFLAGS+= -DHAVE_ALTQ=1 .endif EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cache.c ${FILESDIR}/extra-patch-cache.h \ ${FILESDIR}/extra-patch-config.h \ ${FILESDIR}/extra-patch-pftop.c \ ${FILESDIR}/extra-patch-sf-gencode.c EXTRA_PATCHES+= ${FILESDIR}/extra-patch-engine.c MAKE_ARGS+= CSTD=gnu89 MAKE_ENV+= __MAKE_CONF=/dev/null PLIST_FILES= sbin/pftop \ man/man8/pftop.8.gz post-patch: @${ECHO_MSG} "===> Applying FairQ/Codel patches to ${PORTNAME}." @${CAT} ${FILESDIR}/extra-patch-fairq_codel.diff | \ ${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} @${REINPLACE_CMD} -e 's||"${FILESDIR}/queue.h"|g' \ ${WRKSRC}/engine.c @${REINPLACE_CMD} -e 's|__dead|__dead2|g' \ ${WRKSRC}/sf-gencode.h @${REINPLACE_CMD} -e 's|__dead|__dead2|g' \ ${WRKSRC}/sf-gencode.c @${REINPLACE_CMD} -e 's|#include ||g' \ ${WRKSRC}/sf-gencode.c @${REINPLACE_CMD} -e 's|altq/|net/&|' \ ${WRKSRC}/pftop.c @${REINPLACE_CMD} -e 's|#include .pcap-int.h.|#include |g' \ ${WRKSRC}/bpf_image.c \ ${WRKSRC}/bpf_optimize.c \ ${WRKSRC}/pcap-nametoaddr.c \ ${WRKSRC}/sf-gencode.c \ ${WRKSRC}/sf-gencode.h \ ${WRKSRC}/sf-grammer.y \ ${WRKSRC}/sf-scanner.l do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pftop \ ${STAGEDIR}${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/pftop.8 \ ${STAGEDIR}${MANPREFIX}/man/man8 .include diff --git a/sysutils/pftop/files/extra-patch-config.h b/sysutils/pftop/files/extra-patch-config.h index d24f88179718..ecd30c862dad 100644 --- a/sysutils/pftop/files/extra-patch-config.h +++ b/sysutils/pftop/files/extra-patch-config.h @@ -1,28 +1,28 @@ $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,24 @@ #define HAVE_PFSYNC_STATE #endif +#if OS_LEVEL > 43 +#define HAVE_PFSYNC_KEY +#define HAVE_NETWORK_ORDER +#endif + #ifdef HAVE_PFSYNC_STATE +#if OS_LEVEL > 45 -+typedef struct pfsync_state_1400 pf_state_t; ++typedef struct pfsync_state_1301 pf_state_t; +#else typedef struct pfsync_state pf_state_t; +#endif typedef struct pfsync_state_host pf_state_host_t; typedef struct pfsync_state_peer pf_state_peer_t; +#ifdef HAVE_NETWORK_ORDER +#define COUNTER(c) ((((u_int64_t) ntohl(c[0]))<<32) + ntohl(c[1])) +#else #define COUNTER(c) ((((u_int64_t) c[0])<<32) + c[1]) +#endif #define pfs_ifname ifname #else typedef struct pf_state pf_state_t;