Page MenuHomeFreeBSD
Files F160557713

D57836.diff
No OneTemporary
Actions

D57836.diff
View Options

diff --git a/net-mgmt/yaf/Makefile b/net-mgmt/yaf/Makefile
--- a/net-mgmt/yaf/Makefile
+++ b/net-mgmt/yaf/Makefile
@@ -1,6 +1,5 @@
PORTNAME= yaf
-DISTVERSION= 2.13.0
-PORTREVISION= 1
+DISTVERSION= 2.19.3
CATEGORIES= net-mgmt
MASTER_SITES= http://tools.netsa.cert.org/releases/
@@ -9,12 +8,12 @@
WWW= https://tools.netsa.cert.org/yaf/index.html
LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/COPYING
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
LIB_DEPENDS= libfixbuf.so:net/libfixbuf \
libltdl.so:devel/libltdl \
libpcap.so:net/libpcap \
- libpcre.so:devel/pcre
+ libpcre2-8.so:devel/pcre2
GNU_CONFIGURE= yes
GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
@@ -69,10 +68,13 @@
.endif
post-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/etc/yaf
-.for f in dhcp_fingerprints.conf yafApplabelRules.conf yafDPIRules.conf yaf.conf
- ${MV} ${STAGEDIR}${PREFIX}/etc/yaf/$f ${STAGEDIR}${PREFIX}/etc/yaf/$f.sample
+.for f in dhcp_fingerprints.conf yafApplabelRules.conf yafDPIRules.conf
+ ${MV} ${STAGEDIR}${ETCDIR}/$f ${STAGEDIR}${ETCDIR}/$f.sample
.endfor
- ${RM} ${STAGEDIR}${PREFIX}/etc/p0f.fp
+ ${MV} ${STAGEDIR}${DATADIR}/etc/yaf.conf ${STAGEDIR}${ETCDIR}/yaf.conf.sample
+ ${MV} ${STAGEDIR}${DATADIR}/yaf.init ${STAGEDIR}${DATADIR}/yaf.init.sample
+ ${RM} -r ${STAGEDIR}${DATADIR}/etc
+ ${RM} -r ${STAGEDIR}${DATADIR}/lib
+ ${RM} -r ${STAGEDIR}${DATADIR}/libexec
.include <bsd.port.mk>
diff --git a/net-mgmt/yaf/distinfo b/net-mgmt/yaf/distinfo
--- a/net-mgmt/yaf/distinfo
+++ b/net-mgmt/yaf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1683232182
-SHA256 (yaf-2.13.0.tar.gz) = a4c0a7cec4b3e78cde7a9bcd051e3e6bcb88c671494745ac506f1843756a61a3
-SIZE (yaf-2.13.0.tar.gz) = 2198696
+TIMESTAMP = 1782244965
+SHA256 (yaf-2.19.3.tar.gz) = 6b03bc3d25495c01d8d8020b00a908ef1ed28b6edf78f631618208d81e809b30
+SIZE (yaf-2.19.3.tar.gz) = 2299210
diff --git a/net-mgmt/yaf/files/patch-airframe_src_airdaemon.c b/net-mgmt/yaf/files/patch-airframe_src_airdaemon.c
--- a/net-mgmt/yaf/files/patch-airframe_src_airdaemon.c
+++ b/net-mgmt/yaf/files/patch-airframe_src_airdaemon.c
@@ -1,6 +1,6 @@
---- airframe/src/airdaemon.c.orig 2023-02-08 18:37:15 UTC
+--- airframe/src/airdaemon.c.orig 2026-03-19 20:13:51 UTC
+++ airframe/src/airdaemon.c
-@@ -61,6 +61,10 @@
+@@ -43,6 +43,10 @@
#include <airframe/airopt.h>
#include <airframe/logconfig.h>
diff --git a/net-mgmt/yaf/files/patch-airframe_src_filedaemon.c b/net-mgmt/yaf/files/patch-airframe_src_filedaemon.c
--- a/net-mgmt/yaf/files/patch-airframe_src_filedaemon.c
+++ b/net-mgmt/yaf/files/patch-airframe_src_filedaemon.c
@@ -1,6 +1,6 @@
---- airframe/src/filedaemon.c.orig 2023-02-08 18:37:15 UTC
+--- airframe/src/filedaemon.c.orig 2026-03-19 20:13:51 UTC
+++ airframe/src/filedaemon.c
-@@ -17,6 +17,10 @@
+@@ -43,6 +43,10 @@
#include <airframe/airopt.h>
#include <airframe/logconfig.h>
diff --git a/net-mgmt/yaf/files/patch-include_yaf_decode.h b/net-mgmt/yaf/files/patch-include_yaf_decode.h
--- a/net-mgmt/yaf/files/patch-include_yaf_decode.h
+++ b/net-mgmt/yaf/files/patch-include_yaf_decode.h
@@ -1,6 +1,6 @@
---- include/yaf/decode.h.orig 2023-02-08 18:37:15 UTC
+--- include/yaf/decode.h.orig 2026-03-19 20:13:51 UTC
+++ include/yaf/decode.h
-@@ -218,6 +218,8 @@ typedef struct yfDecodeCtx_st yfDecodeCtx_t;
+@@ -203,6 +203,8 @@ typedef struct yfDecodeCtx_st yfDecodeCtx_t;
#define YF_PROTO_TCP 6
/** IPv4 Protocol Identifier and IPv6 Next Header for UDP */
#define YF_PROTO_UDP 17
diff --git a/net-mgmt/yaf/files/patch-src_decode.c b/net-mgmt/yaf/files/patch-src_decode.c
--- a/net-mgmt/yaf/files/patch-src_decode.c
+++ b/net-mgmt/yaf/files/patch-src_decode.c
@@ -1,6 +1,6 @@
---- src/decode.c.orig 2023-02-08 18:37:15 UTC
+--- src/decode.c.orig 2026-03-19 20:13:51 UTC
+++ src/decode.c
-@@ -1653,6 +1653,12 @@ yfDecodeIP(
+@@ -1855,6 +1855,12 @@ yfDecodeIP(
key->dp = 0;
}
break;
diff --git a/net-mgmt/yaf/files/patch-src_yaf.pod b/net-mgmt/yaf/files/patch-src_yaf.pod
--- a/net-mgmt/yaf/files/patch-src_yaf.pod
+++ b/net-mgmt/yaf/files/patch-src_yaf.pod
@@ -1,21 +1,21 @@
---- src/yaf.pod.orig 2023-02-08 19:01:48 UTC
-+++ src/yaf.pod
-@@ -1633,7 +1633,8 @@ The UNIX timestamp of when the program interacted with
+--- src/yaf.pod.in.orig 2026-04-17 21:23:28 UTC
++++ src/yaf.pod.in
+@@ -2041,7 +2041,8 @@ flushing any pending flows to the current output, and
B<yaf> responds to B<SIGINT> or B<SIGTERM> by terminating input processing,
flushing any pending flows to the current output, and exiting. If B<--verbose>
--is given, B<yaf> responds to B<SIGUSR1> by printing present flow and fragment table
+-is given, B<yaf> responds to B<SIGUSR1> by printing present flow and fragment
+is given, B<yaf> responds to B<SIGUSR1> (and B<SIGINFO> where available)
-+by printing present flow and fragment table
- statistics to its log. All other signals are handled by the C runtimes in
- the default manner on the platform on which B<yaf> is currently operating.
++by printing present flow and fragment
+ table statistics to its log. All other signals are handled by the C runtimes
+ in the default manner on the platform on which B<yaf> is currently operating.
-@@ -1725,7 +1726,7 @@ See B<yafzcbalance(1)> for more information.
+@@ -2151,7 +2152,7 @@ packets is blocking so B<yaf> will not export statisti
- When running B<yaf> with --live=pfring or --live=zc, the call to receive
- packets is blocking so B<yaf> will not export statistics messages or
--respond to SIGUSR1 signals unless it is receiving data.
-+respond to B<SIGUSR1>/B<SIGINFO> signals unless it is receiving data.
+ When running B<yaf> with B<--live=pfring> or B<--live=zc>, the call to receive
+ packets is blocking so B<yaf> will not export statistics messages or respond
+-to SIGUSR1 signals unless it is receiving data.
++to B<SIGUSR1> / B<SIGINFO> signals unless it is receiving data.
- Presently, the B<destinationTransportPort> information element contains
- ICMP type and code information for ICMP or ICMP6 flows; this is nonstandard
+ Presently, the B<destinationTransportPort> information element contains ICMP
+ type and code information for ICMP or ICMP6 flows; this is nonstandard and may
diff --git a/net-mgmt/yaf/files/patch-src_yafstat.c b/net-mgmt/yaf/files/patch-src_yafstat.c
--- a/net-mgmt/yaf/files/patch-src_yafstat.c
+++ b/net-mgmt/yaf/files/patch-src_yafstat.c
@@ -1,6 +1,6 @@
---- src/yafstat.c.orig 2023-02-08 18:37:15 UTC
+--- src/yafstat.c.orig 2026-03-19 20:13:51 UTC
+++ src/yafstat.c
-@@ -75,7 +75,7 @@
+@@ -57,7 +57,7 @@
#include "yafdag.h"
#endif
@@ -9,7 +9,7 @@
static GTimer *yaf_fft = NULL;
static yfContext_t *statctx = NULL;
-@@ -84,7 +84,7 @@ yfSigUsr1(
+@@ -66,7 +66,7 @@ yfSigUsr1(
int s)
{
(void)s;
@@ -18,7 +18,7 @@
}
-@@ -101,6 +101,11 @@ yfStatInit(
+@@ -83,6 +83,11 @@ yfStatInit(
if (sigaction(SIGUSR1, &sa, &osa)) {
g_error("sigaction(SIGUSR1) failed: %s", strerror(errno));
}
@@ -30,7 +30,7 @@
/* stash statistics context */
statctx = ctx;
-@@ -147,7 +152,7 @@ yfStatDumpLoop(
+@@ -152,7 +157,7 @@ yfStatDumpLoop(
void)
{
if (yaf_do_stat) {
diff --git a/net-mgmt/yaf/pkg-plist b/net-mgmt/yaf/pkg-plist
--- a/net-mgmt/yaf/pkg-plist
+++ b/net-mgmt/yaf/pkg-plist
@@ -31,6 +31,7 @@
include/yaf/yafhooks.h
include/yaf/yafrag.h
include/yaf/yaftab.h
+include/yaf/yaftime.h
lib/libairframe-%%PORTVERSION%%.so.4
lib/libairframe-%%PORTVERSION%%.so.4.0.0
lib/libairframe.so
@@ -64,6 +65,12 @@
%%APPLABEL%%lib/yaf/ethipplugin.so
%%APPLABEL%%lib/yaf/ethipplugin.so.1
%%APPLABEL%%lib/yaf/ethipplugin.so.1.0.1
+%%APPLABEL%%lib/yaf/gh0stplugin.so
+%%APPLABEL%%lib/yaf/gh0stplugin.so.1
+%%APPLABEL%%lib/yaf/gh0stplugin.so.1.0.1
+%%APPLABEL%%lib/yaf/imapplugin.so
+%%APPLABEL%%lib/yaf/imapplugin.so.1
+%%APPLABEL%%lib/yaf/imapplugin.so.1.0.1
%%APPLABEL%%lib/yaf/ircplugin.so
%%APPLABEL%%lib/yaf/ircplugin.so.1
%%APPLABEL%%lib/yaf/ircplugin.so.1.0.1
@@ -73,12 +80,18 @@
%%APPLABEL%%lib/yaf/ldpplugin.so
%%APPLABEL%%lib/yaf/ldpplugin.so.1
%%APPLABEL%%lib/yaf/ldpplugin.so.1.0.1
+lib/yaf/libmidencryption.so
+lib/yaf/libmidencryption.so.1
+lib/yaf/libmidencryption.so.1.0.1
%%APPLABEL%%lib/yaf/modbusplugin.so
%%APPLABEL%%lib/yaf/modbusplugin.so.1
%%APPLABEL%%lib/yaf/modbusplugin.so.1.0.1
%%APPLABEL%%lib/yaf/mysqlplugin.so
%%APPLABEL%%lib/yaf/mysqlplugin.so.1
%%APPLABEL%%lib/yaf/mysqlplugin.so.1.0.1
+%%APPLABEL%%lib/yaf/netdgmplugin.so
+%%APPLABEL%%lib/yaf/netdgmplugin.so.1
+%%APPLABEL%%lib/yaf/netdgmplugin.so.1.0.1
%%APPLABEL%%lib/yaf/nntpplugin.so
%%APPLABEL%%lib/yaf/nntpplugin.so.1
%%APPLABEL%%lib/yaf/nntpplugin.so.1.0.1
@@ -118,6 +131,9 @@
%%APPLABEL%%lib/yaf/socksplugin.so
%%APPLABEL%%lib/yaf/socksplugin.so.1
%%APPLABEL%%lib/yaf/socksplugin.so.1.0.1
+%%APPLABEL%%lib/yaf/sshplugin.so
+%%APPLABEL%%lib/yaf/sshplugin.so.1
+%%APPLABEL%%lib/yaf/sshplugin.so.1.0.1
%%APPLABEL%%lib/yaf/teredoplugin.so
%%APPLABEL%%lib/yaf/teredoplugin.so.1
%%APPLABEL%%lib/yaf/teredoplugin.so.1.0.1
@@ -127,17 +143,11 @@
%%APPLABEL%%lib/yaf/tlsplugin.so
%%APPLABEL%%lib/yaf/tlsplugin.so.1
%%APPLABEL%%lib/yaf/tlsplugin.so.1.0.1
-%%APPLABEL%%lib/yaf/gh0stplugin.so
-%%APPLABEL%%lib/yaf/gh0stplugin.so.1
-%%APPLABEL%%lib/yaf/gh0stplugin.so.1.0.1
-%%APPLABEL%%lib/yaf/netdgmplugin.so
-%%APPLABEL%%lib/yaf/netdgmplugin.so.1
-%%APPLABEL%%lib/yaf/netdgmplugin.so.1.0.1
@sample %%ETCDIR%%/dhcp_fingerprints.conf.sample
@sample %%ETCDIR%%/yafApplabelRules.conf.sample
@sample %%ETCDIR%%/yafDPIRules.conf.sample
@sample %%ETCDIR%%/yaf.conf.sample
-%%DATADIR%%/yaf.init
+@sample %%DATADIR%%/yaf.init.sample
libdata/pkgconfig/libairframe.pc
libdata/pkgconfig/libyaf.pc
share/man/man1/airdaemon.1.gz
@@ -145,9 +155,8 @@
share/man/man1/filedaemon.1.gz
share/man/man1/getFlowKeyHash.1.gz
share/man/man1/yaf.1.gz
+share/man/man1/yaf.init.1.gz
share/man/man1/yafMeta2Pcap.1.gz
share/man/man1/yafdhcp.1.gz
share/man/man1/yafdpi.1.gz
share/man/man1/yafscii.1.gz
-share/man/man1/yaf.init.1.gz
-share/man/man1/yafzcbalance.1.gz

File Metadata

Mime Type
text/plain
Expires
Fri, Jun 26, 4:08 PM (9 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34362170
Default Alt Text
D57836.diff (9 KB)

Event Timeline