diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
| commit | 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch) | |
| tree | e1810a4b135afce04b34862ef0fab2bfaeb8aeca /net-analyzer/pmacct/files | |
| parent | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff) | |
gentoo resync : 15.01.2020
Diffstat (limited to 'net-analyzer/pmacct/files')
| -rw-r--r-- | net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch | 28 | ||||
| -rw-r--r-- | net-analyzer/pmacct/files/pmacct-1.7.4--Werror.patch | 14 |
2 files changed, 42 insertions, 0 deletions
diff --git a/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch b/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch new file mode 100644 index 000000000000..9e6c618fe443 --- /dev/null +++ b/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch @@ -0,0 +1,28 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -955,6 +955,7 @@ + CFLAGS="$_save_CFLAGS" + ]) + PKG_CHECK_MODULES([NDPI26], [libndpi >= 2.6], [AC_DEFINE(WITH_NDPI26, 1)], [AC_DEFINE(WITH_NDPI, 1)]) ++ PKG_CHECK_MODULES([NDPI30], [libndpi >= 3.0], [AC_DEFINE(WITH_NDPI30, 1)], [AC_DEFINE(WITH_NDPI, 1)]) + ;; + no) + AC_MSG_RESULT(no) +--- a/src/ndpi/ndpi.c ++++ b/src/ndpi/ndpi.c +@@ -374,10 +374,14 @@ + if (flow->detection_completed || flow->tcp_finished) { + if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN) + #ifdef WITH_NDPI26 ++#ifdef WITH_NDPI30 ++ flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, 1, workflow->prefs.protocol_guess); ++#else + flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, workflow->prefs.protocol_guess); ++#endif /* WITH_NDPI30 */ + #else + flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow); +-#endif ++#endif /* WITH_NDPI26 */ + + if (workflow->prefs.protocol_guess) { + if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN && !flow->guess_completed) { diff --git a/net-analyzer/pmacct/files/pmacct-1.7.4--Werror.patch b/net-analyzer/pmacct/files/pmacct-1.7.4--Werror.patch new file mode 100644 index 000000000000..e2e9685e1326 --- /dev/null +++ b/net-analyzer/pmacct/files/pmacct-1.7.4--Werror.patch @@ -0,0 +1,14 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1109,9 +1109,9 @@ + AC_MSG_RESULT(yes) + tmp_CFLAGS=`echo $CFLAGS | sed 's/O2/O0/g'` + CFLAGS="$tmp_CFLAGS" +- CFLAGS="$CFLAGS -g -Wall -Werror" ++ CFLAGS="$CFLAGS -g -Wall" + else +- CFLAGS="$CFLAGS -Wall -Werror" ++ CFLAGS="$CFLAGS -Wall" + AC_MSG_RESULT(no) + fi + ], |