[gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpflow/files/, net-analyzer/tcpflow/
commit: 61e6ac60c4a99110f68f02dbc16556e1a493b3d3 Author: Sam James gentoo org> AuthorDate: Fri Feb 12 15:38:57 2021 + Commit: Sam James gentoo org> CommitDate: Fri Feb 12 15:39:02 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61e6ac60 net-analyzer/tcpflow: restore package with 1.6.1 (python 3) Closes: https://bugs.gentoo.org/735392 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> net-analyzer/tcpflow/Manifest | 3 + .../files/tcpflow-1.5.0_alpha-libcapng.patch | 13 + .../tcpflow/files/tcpflow-1.5.2-gentoo.patch | 64 ++ net-analyzer/tcpflow/metadata.xml | 11 net-analyzer/tcpflow/tcpflow-1.6.1.ebuild | 63 + 5 files changed, 154 insertions(+) diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest new file mode 100644 index 000..2ca13347df5 --- /dev/null +++ b/net-analyzer/tcpflow/Manifest @@ -0,0 +1,3 @@ +DIST be13_api-20170924.tar.gz 75724 BLAKE2B a5257346b9c0740d9758543fe7772c960e1941735abefe4d24d347631b35d1511fde8eb5a58dbb2824c54e78ee0d686a2549ceea2c1dc91e05ef92899c8b3c2d SHA512 5bf0d28f23df9436304245ccbdbf4af5b0f65e62b92e3039cfb9a70fe2056aa90dcce906db02f3df83fcf2a415c8a46f0f75468d48e13b15673d11c447a4c9c4 +DIST dfxml-20170921.tar.gz 163616 BLAKE2B 17214d15596a136efb2afc7246ee0f5696620b5aac7c2d78e37764f51487ff816de5a7c0f59e7484d358a8cd8eab34841716970cd859f0ce868ac29c8532754c SHA512 0885947aaf8efe639c13324413ef0cca49750027b48b434f226fb9fbfba494e84e245da879dc0d77b46bddc27798f7f5df12590fce47b096683034bbc61280e1 +DIST tcpflow-1.6.1.tar.gz 915502 BLAKE2B 6560d11fe6a2b6bd77ddcffb47338e9af358a0f5ec07402ec81dae4cf87dd5cc26bf300df014927df8b8b6143e14553dd2a70cb63769dc4f2525cf9dd1967582 SHA512 ec5b9d5e5f0bc1d6582b9f2537c9ba6c8ae3d9c8f88fb0c67ef031146a515d19caa5ecd365492fb5daf8ddde77b58ea5190290b8e43b40abcdea5aaaef5e2e1c diff --git a/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch b/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch new file mode 100644 index 000..b56144324c0 --- /dev/null +++ b/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch @@ -0,0 +1,13 @@ +--- a/src/tcpflow.cpp b/src/tcpflow.cpp +@@ -30,6 +30,10 @@ + #include + #endif + ++#ifdef HAVE_CAP_NG_H ++#include ++#endif ++ + /* bring in inet_ntop if it is not present */ + #define ETH_ALEN 6 + #ifndef HAVE_INET_NTOP diff --git a/net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch b/net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch new file mode 100644 index 000..e6748c01968 --- /dev/null +++ b/net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch @@ -0,0 +1,64 @@ +--- a/configure.ac b/configure.ac +@@ -30,7 +30,6 @@ + AC_PROG_INSTALL + + m4_include([m4/slg_searchdirs.m4]) +-m4_include([m4/slg_gcc_all_warnings.m4]) + + + # use C++11 mode if available; HAVE_CXX11 is defined in config.h if so. Don't +@@ -402,7 +402,12 @@ + AC_CHECK_HEADERS(cap-ng.h) + fi + +- ++ ++# http-parser ++ ++AC_CHECK_LIB(http_parser,http_parser_init,, ++ AC_MSG_ERROR([http-parser library not installed])) ++AC_CHECK_HEADERS(http_parser.h) + + + # Specify our other headers +--- a/src/scan_http.cpp b/src/scan_http.cpp +@@ -11,7 +11,11 @@ + #include "tcpip.h" + #include "tcpdemux.h" + ++#ifdef HAVE_HTTP_PARSER_H ++#include "http_parser.h" ++#else + #include "http-parser/http_parser.h" ++#endif + + #include "mime_map.h" + +diff --git a/src/Makefile.am b/src/Makefile.am +index 793ec1a..ecac7a9 100644 +--- a/src/Makefile.am b/src/Makefile.am +@@ -98,8 +98,6 @@ tcpflow_SOURCES = \ + scan_netviz.cpp \ + pcap_writer.h \ + iptree.h \ +- http-parser/http_parser.c \ +- http-parser/http_parser.h \ + mime_map.cpp \ + mime_map.h + +@@ -110,12 +108,6 @@ tcpflow_SOURCES = \ + EXTRA_DIST =\ + inet_ntop.c \ + inet_ntop.h \ +- http-parser/AUTHORS \ +- http-parser/CONTRIBUTIONS \ +- http-parser/LICENSE-MIT \ +- http-parser/Makefile \ +- http-parser/README.md \ +- http-parser/http_parser.gyp \ + wifipcap/README.txt \ + wifipcap/TimeVal.cpp \ + wifipcap/TimeVal.h \ diff --git a/net-analyzer/tcpflow/metadata.xml b/net-analyzer/tcpflow/metadata.xml new file mode 100644 index 000..d0b78340e0f --- /dev/null +++ b/net-analyzer/tcpflow/metadata.xml @@ -0,0 +1,11 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + net...@gentoo.org + Gentoo network monitoring and analysis project + + + simsong/tcpflow + + diff --git a/net-analyzer/tcpflow/tcpflow-1.6.1.ebuild b/net-analyzer/tcpflow/tcpflow-1.6.1.ebuild new file mode 100644 index 000..7bd4f40e888 --- /dev/null
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpflow/files/, net-analyzer/tcpflow/
commit: 6147b8e24d80abc46fb7a995aec4bc8a10867ef2 Author: Jeroen Roovers gentoo org> AuthorDate: Mon Jun 10 19:47:40 2019 + Commit: Jeroen Roovers gentoo org> CommitDate: Mon Jun 10 19:49:11 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6147b8e2 net-analyzer/tcpflow: Old Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Jeroen Roovers gentoo.org> net-analyzer/tcpflow/Manifest | 1 - .../tcpflow/files/tcpflow-1.5.0_alpha-gentoo.patch | 191 - net-analyzer/tcpflow/tcpflow-1.5.0_alpha.ebuild| 57 -- 3 files changed, 249 deletions(-) diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest index 941f219cef1..82bf15dbfca 100644 --- a/net-analyzer/tcpflow/Manifest +++ b/net-analyzer/tcpflow/Manifest @@ -1,6 +1,5 @@ DIST be13_api-20170924.tar.gz 75724 BLAKE2B a5257346b9c0740d9758543fe7772c960e1941735abefe4d24d347631b35d1511fde8eb5a58dbb2824c54e78ee0d686a2549ceea2c1dc91e05ef92899c8b3c2d SHA512 5bf0d28f23df9436304245ccbdbf4af5b0f65e62b92e3039cfb9a70fe2056aa90dcce906db02f3df83fcf2a415c8a46f0f75468d48e13b15673d11c447a4c9c4 DIST dfxml-20170921.tar.gz 163616 BLAKE2B 17214d15596a136efb2afc7246ee0f5696620b5aac7c2d78e37764f51487ff816de5a7c0f59e7484d358a8cd8eab34841716970cd859f0ce868ac29c8532754c SHA512 0885947aaf8efe639c13324413ef0cca49750027b48b434f226fb9fbfba494e84e245da879dc0d77b46bddc27798f7f5df12590fce47b096683034bbc61280e1 -DIST tcpflow-1.5.0alpha.tar.gz 763403 BLAKE2B 3010ba5dc039ee9ebeedf9fd453e9a36cc9adda26bc40dd93938dd56e7bc070a62de0c0fd61af976a866b2f50b3857606c0c962fd6194112392af18708fbfdcb SHA512 240ea6ccb39d13cc86fdaf8bb8284b796d2ceb070aee2dbb0364a6d9f572863159e79ad40259aa6e85c729e28f35c2f453df261490c09c321276686be4627b96 DIST tcpflow-1.5.2.tar.gz 788545 BLAKE2B b3995cf0f4bedce207dcac19de3d57920231cab75df030da1cf93fb815999de602fd1e3f0955c82e88f9a3945a891c3b3f0e08449cf366de4bb8269a6452 SHA512 e060779c78f79ba6efdf5f9d8ff490823ff06051a7089247b8155c03f487776fa1896e487e8dca1d5842b617fc5d9056e043f01ac3276edeec1d394ed24bc7e9 DIST tcpflow_1.4.5+repack1-1.debian.tar.xz 11144 BLAKE2B 1188e259406b5bf4feaa95b6a6805217564f71f377b6ae5baa707453da4f0d9bf15c7fdfe1fea0a9c4586e5c24f9b4cea8fd5226a97d762d9f5969d3381d4bbb SHA512 ed2c491595a3d5382ca79fe945467639af3d99658d002353f90e07aa6b1a955e57ab0fbbc3fadf964e9d6d3dba4fd327a02c1b07d6a239efdf90b365928b2a1e DIST tcpflow_1.4.5+repack1-4.debian.tar.xz 12228 BLAKE2B a7c1725d2a82a6ef63800c3bf8fe4d99fd81566fe3b1dbd77238337784954e3161fae868b2a915a9fa2ce580a81d726b6359f905953a952e500f811e9e38c4b5 SHA512 27d8a7a735b06c35cc2985cb26a129a490fc2236eedeede21977afe4c3096a6fde3ea18de1aaa3a1c6a56bc36d332b1e8bd4c7be933d5b031509a69cae189b18 diff --git a/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-gentoo.patch b/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-gentoo.patch deleted file mode 100644 index 6a2dc10cff9..000 --- a/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-gentoo.patch +++ /dev/null @@ -1,191 +0,0 @@ a/configure.ac -+++ b/configure.ac -@@ -29,7 +29,6 @@ - AC_PROG_INSTALL - - m4_include([m4/slg_searchdirs.m4]) --m4_include([m4/slg_gcc_all_warnings.m4]) - - - # use C++11 mode if available; HAVE_CXX11 is defined in config.h if so. Don't -@@ -96,96 +95,6 @@ - fi - - --# --# Enable all the compiler debugging we can find --# --# This is originally from PhotoRec, but modified substantially by Simson --# Figure out which flags we can use with the compiler. --# --# These I don't like: --# -Wdeclaration-after-statement -Wconversion --# doesn't work: -Wunreachable-code --# causes configure to crash on gcc-4.2.1: -Wsign-compare-Winline --# causes warnings with unistd.h: -Wnested-externs --# Just causes too much annoyance: -Wmissing-format-attribute --# Check GCC --WARNINGS_TO_TEST="-MD -D_FORTIFY_SOURCE=2 -Wpointer-arith -Wmissing-declarations -Wmissing-prototypes \ ---Wshadow -Wwrite-strings -Wcast-align -Waggregate-return \ ---Wbad-function-cast -Wcast-qual -Wundef -Wredundant-decls -Wdisabled-optimization \ ---Wfloat-equal -Wmultichar -Wc++-compat -Wmissing-noreturn " -- --if test $mingw = "no" ; then -- # add the warnings we do not want to do on mingw -- WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Wall -Wstrict-prototypes" --fi -- --echo "Warnings to test: $WARNINGS_TO_TEST" -- --for option in $WARNINGS_TO_TEST --do -- SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $option" -- AC_MSG_CHECKING([whether gcc understands $option]) -- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], -- [has_option=yes], -- [has_option=no; CFLAGS="$SAVE_CFLAGS"]) -- AC_MSG_RESULT($has_option) -- unset has_option -- unset SAVE_CFLAGS -- if test $option = "-Wmissing-format-attribute" ; then --AC_DEFINE(HAVE_MISSING_FORMAT_ATTRIBUTE_WARNING,1, -- [Indicates that we have the -Wmissing-format-attribute G++ warning]) -- fi --done
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpflow/files/, net-analyzer/tcpflow/
commit: 74f69824dfdf8dce95c971c0bfdb827e33bf3245 Author: Jeroen Roovers gentoo org> AuthorDate: Sun Sep 24 19:20:11 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Sun Sep 24 19:20:53 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74f69824 net-analyzer/tcpflow: Version bump. Package-Manager: Portage-2.3.10, Repoman-2.3.3 net-analyzer/tcpflow/Manifest | 3 + .../tcpflow/files/tcpflow-1.5.0_alpha-gentoo.patch | 191 + .../files/tcpflow-1.5.0_alpha-libcapng.patch | 13 ++ net-analyzer/tcpflow/tcpflow-1.5.0_alpha.ebuild| 54 ++ 4 files changed, 261 insertions(+) diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest index d8b44b27b57..27752cc44d2 100644 --- a/net-analyzer/tcpflow/Manifest +++ b/net-analyzer/tcpflow/Manifest @@ -1,3 +1,6 @@ +DIST be13_api-20170924.tar.gz 75724 SHA256 6dc9f0157ec56e50ae7831a2fef8d3ecb88d689f318317bf1c4cc7dcb0917ae5 SHA512 5bf0d28f23df9436304245ccbdbf4af5b0f65e62b92e3039cfb9a70fe2056aa90dcce906db02f3df83fcf2a415c8a46f0f75468d48e13b15673d11c447a4c9c4 WHIRLPOOL 6ab2f40d45a2b8f495e7c0df2fa977b24c2245fe1015c627d1674eff519c206d301e0558f97c0528eeb1fb939f514cd976ae7caae323f86bc2493b75b5b90fbd +DIST dfxml-20170921.tar.gz 163616 SHA256 f24bd6c149d07f9ed1089fc25afdab2451f6615e57d5f25529e8d2a59989bc18 SHA512 0885947aaf8efe639c13324413ef0cca49750027b48b434f226fb9fbfba494e84e245da879dc0d77b46bddc27798f7f5df12590fce47b096683034bbc61280e1 WHIRLPOOL b693966c0da1b228415b1416cd3a7a3c25212d0c29839054739aa3fb821a9b429166d8be3e1c58bdcacdacc25fc2c9664e3aadc8aa40c060ec11fc7ca865145d +DIST tcpflow-1.5.0alpha.tar.gz 763403 SHA256 ea5467880cd1ea56f2567f97db12bdcebcf5bfb722b6580a6d3ce3acf641a4f1 SHA512 240ea6ccb39d13cc86fdaf8bb8284b796d2ceb070aee2dbb0364a6d9f572863159e79ad40259aa6e85c729e28f35c2f453df261490c09c321276686be4627b96 WHIRLPOOL 733075c64ea6f10ed8cce4738514c2987fbb340f9765f180c2987c048fb481c5685f2d00d27b8ad903b77a670889223e71fb473fcbc9af4eb498580aabd1751e DIST tcpflow_1.4.5+repack1-1.debian.tar.xz 11144 SHA256 b917e994ac1cd64cb63f719700b0a9862359779286cab89c9c29f73e64ec2d5b SHA512 ed2c491595a3d5382ca79fe945467639af3d99658d002353f90e07aa6b1a955e57ab0fbbc3fadf964e9d6d3dba4fd327a02c1b07d6a239efdf90b365928b2a1e WHIRLPOOL 0854405a429bd2f7276b18acc204e5ac5cfde1bbd4a8f5308e6bf667355eb1ea8a98c52b30a5a24aacb4f8f7b8469e75c2c49fc5f187aa87b869fad9c91d025c DIST tcpflow_1.4.5+repack1-4.debian.tar.xz 12228 SHA256 f7207ea03e9aa1c96ec322835aed486a7fde2244d26ce4d9b23cb75d613a0e07 SHA512 27d8a7a735b06c35cc2985cb26a129a490fc2236eedeede21977afe4c3096a6fde3ea18de1aaa3a1c6a56bc36d332b1e8bd4c7be933d5b031509a69cae189b18 WHIRLPOOL 35817c9ca6cfec60d91d4809ae1661f26011c0f4fe020c15a168e82651a6dfa9c63a87188428675dbc7330ab43b0fcdc443b7d7ec954007fbbc8f4f5d9b7df3d DIST tcpflow_1.4.5+repack1.orig.tar.gz 725962 SHA256 1d9b4ce2dd85adc1c608f34ada576b7f5b6d51c686ae6b870c3c277049a24af0 SHA512 fed8589957e3c790b5b6837b9b578d5dcbde316122ed6b3d4f908d1d73f23c6ed8a11720ee0510e878eaa7a6c559a2f35e7df2c77e3cb1f2810040adf7ac2b85 WHIRLPOOL 8743e20cea0fbee37c9ee050e8bbe02871e8a32dba2bbed922b912de457aa4eaf5cd21e8828a08eb3eafbf8d3897541230fc37bc4a15f7126e6b8adfb9fea860 diff --git a/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-gentoo.patch b/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-gentoo.patch new file mode 100644 index 000..6a2dc10cff9 --- /dev/null +++ b/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-gentoo.patch @@ -0,0 +1,191 @@ +--- a/configure.ac b/configure.ac +@@ -29,7 +29,6 @@ + AC_PROG_INSTALL + + m4_include([m4/slg_searchdirs.m4]) +-m4_include([m4/slg_gcc_all_warnings.m4]) + + + # use C++11 mode if available; HAVE_CXX11 is defined in config.h if so. Don't +@@ -96,96 +95,6 @@ + fi + + +-# +-# Enable all the compiler debugging we can find +-# +-# This is originally from PhotoRec, but modified substantially by Simson +-# Figure out which flags we can use with the compiler. +-# +-# These I don't like: +-# -Wdeclaration-after-statement -Wconversion +-# doesn't work: -Wunreachable-code +-# causes configure to crash on gcc-4.2.1: -Wsign-compare-Winline +-# causes warnings with unistd.h: -Wnested-externs +-# Just causes too much annoyance: -Wmissing-format-attribute +-# Check GCC +-WARNINGS_TO_TEST="-MD -D_FORTIFY_SOURCE=2 -Wpointer-arith -Wmissing-declarations -Wmissing-prototypes \ +--Wshadow -Wwrite-strings -Wcast-align -Waggregate-return \ +--Wbad-function-cast -Wcast-qual -Wundef -Wredundant-decls -Wdisabled-optimization \ +--Wfloat-equal -Wmultichar -Wc++-compat -Wmissing-noreturn " +- +-if test $mingw = "no" ; then +- # add the warnings we do not want to do on mingw +- WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Wall -Wstrict-prototypes" +-fi +- +-echo "Warnings to test: $WARNINGS_TO_TEST" +- +-for option in $WARNINGS_TO_TEST +-do +- SAVE_CFLAGS="$CFLAGS" +-
