* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpflow/, net-analyzer/tcpflow/files/
@ 2019-06-10 19:40 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2019-06-10 19:40 UTC (permalink / raw
To: gentoo-commits
commit: 82bd7e0fc6d94f8fe78497c0efcc4bbf6103ae37
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 19:39:28 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 19:39:59 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82bd7e0f
net-analyzer/tcpflow: Version 1.5.2
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=687806
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/tcpflow/Manifest | 1 +
.../tcpflow/files/tcpflow-1.5.2-gentoo.patch | 61 ++++++++++++++++++++++
net-analyzer/tcpflow/tcpflow-1.5.2.ebuild | 57 ++++++++++++++++++++
3 files changed, 119 insertions(+)
diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest
index 142b9a25c85..941f219cef1 100644
--- a/net-analyzer/tcpflow/Manifest
+++ b/net-analyzer/tcpflow/Manifest
@@ -1,6 +1,7 @@
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 b3995cf0f4bedce207dcac19de3d57920231cab75df030da1cf93fb815999de602fd1e3f0955c82effff88f9a3945a891c3b3f0e08449cf366de4bb8269a6452 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
DIST tcpflow_1.4.5+repack1.orig.tar.gz 725962 BLAKE2B 282849bded34acc79ece4b06c72d5ed05ada07bb2e1a5e6e15dd7c6c46f8f1e57b5bfb018b1a23bdd543d0664b3bd5a3f756342fd657930a77c1ab8307358421 SHA512 fed8589957e3c790b5b6837b9b578d5dcbde316122ed6b3d4f908d1d73f23c6ed8a11720ee0510e878eaa7a6c559a2f35e7df2c77e3cb1f2810040adf7ac2b85
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 00000000000..de0864004a0
--- /dev/null
+++ b/net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch
@@ -0,0 +1,61 @@
+--- 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/Makefile.am
++++ b/src/Makefile.am
+@@ -90,20 +90,12 @@
+ scan_netviz.cpp \
+ pcap_writer.h \
+ iptree.h \
+- http-parser/http_parser.c \
+- http-parser/http_parser.h \
+ mime_map.cpp \
+ mime_map.h
+
+ 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 \
+--- 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/net-analyzer/tcpflow/tcpflow-1.5.2.ebuild b/net-analyzer/tcpflow/tcpflow-1.5.2.ebuild
new file mode 100644
index 00000000000..0271f130a3b
--- /dev/null
+++ b/net-analyzer/tcpflow/tcpflow-1.5.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic
+
+DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
+HOMEPAGE="https://github.com/simsong/tcpflow"
+SRC_URI="
+ https://api.github.com/repos/simsong/be13_api/tarball/c81521d768bb78499c069fcd7c47adc8eee0350c -> be13_api-20170924.tar.gz
+ https://api.github.com/repos/simsong/dfxml/tarball/7d11eaa7da8d31f588ce8aecb4b4f5e7e8169ba6 -> dfxml-20170921.tar.gz
+ https://dev.gentoo.org/~jer/be13_api-20170924.tar.gz
+ https://dev.gentoo.org/~jer/dfxml-20170921.tar.gz
+ https://github.com/simsong/${PN}/archive/${P/_/}.tar.gz
+"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+SLOT="0"
+IUSE="cairo test"
+
+RDEPEND="
+ dev-db/sqlite
+ dev-lang/python:2.7=
+ dev-libs/boost:=
+ dev-libs/openssl:=
+ net-libs/http-parser:=
+ net-libs/libpcap
+ sys-libs/libcap-ng
+ sys-libs/zlib:=
+ cairo? (
+ x11-libs/cairo
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( sys-apps/coreutils )
+"
+S=${WORKDIR}/${PN}-${P/_/}
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.0_alpha-libcapng.patch
+ "${FILESDIR}"/${PN}-1.5.2-gentoo.patch
+)
+
+src_prepare() {
+ mv "${WORKDIR}"/simsong-dfxml-7d11eaa/* src/dfxml/ || die
+ mv "${WORKDIR}"/simsong-be13_api-c81521d/* src/be13_api/ || die
+
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ append-cxxflags -fpermissive
+ econf $(usex cairo --enable-cairo=true --enable-cairo=false)
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpflow/, net-analyzer/tcpflow/files/
@ 2022-05-22 3:53 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-05-22 3:53 UTC (permalink / raw
To: gentoo-commits
commit: da3857c7f51b6e6241d705d1f9c0248d50b6043e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 03:48:05 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 22 03:49:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da3857c7
net-analyzer/tcpflow: update EAPI 7 -> 8; use release tarball; drop Python
- Port EAPI 7 -> EAPI 8
- Use release tarball
- Force Bash for now for configure given lots of activity since last release
- Drop Python bindings -- were (automagically) linking against Python 2.7! No
sign of fixing that upstream, so just forcefully disable them.
- Fix Wformat-security issue
Closes: https://bugs.gentoo.org/846122
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/tcpflow/Manifest | 1 +
.../files/tcpflow-1.6.1-wformat-security.patch | 24 ++++++++++
net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild | 56 ++++++++++++++++++++++
3 files changed, 81 insertions(+)
diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest
index 2ca13347df50..1ade1d691c3b 100644
--- a/net-analyzer/tcpflow/Manifest
+++ b/net-analyzer/tcpflow/Manifest
@@ -1,3 +1,4 @@
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-tag.tar.gz 915245 BLAKE2B 22a1540415d6321d4ba43035f386aaea177e9d3244ff1dcdedcb0c8a72f487a969372b76b85f6acec4f0f1430b51230ceb665466af388d2bfe123a57dcd4224b SHA512 9c0357ca816bf4316ce7a461e5d18c5043a6938828ce83a613a952d5804cc6b701028a666b352da922d69447ab7f5d4c9f66585872e7b116c0f1aebebc38682b
DIST tcpflow-1.6.1.tar.gz 915502 BLAKE2B 6560d11fe6a2b6bd77ddcffb47338e9af358a0f5ec07402ec81dae4cf87dd5cc26bf300df014927df8b8b6143e14553dd2a70cb63769dc4f2525cf9dd1967582 SHA512 ec5b9d5e5f0bc1d6582b9f2537c9ba6c8ae3d9c8f88fb0c67ef031146a515d19caa5ecd365492fb5daf8ddde77b58ea5190290b8e43b40abcdea5aaaef5e2e1c
diff --git a/net-analyzer/tcpflow/files/tcpflow-1.6.1-wformat-security.patch b/net-analyzer/tcpflow/files/tcpflow-1.6.1-wformat-security.patch
new file mode 100644
index 000000000000..092a08dd7664
--- /dev/null
+++ b/net-analyzer/tcpflow/files/tcpflow-1.6.1-wformat-security.patch
@@ -0,0 +1,24 @@
+https://github.com/simsong/tcpflow/issues/238
+https://github.com/simsong/tcpflow/commit/a0697509c4657e2fd94f941e43a2d4c86ddf9fe4
+
+From: "Simson L. Garfinkel" <simsong@acm.org>
+Date: Thu, 11 Mar 2021 19:30:54 -0500
+Subject: [PATCH] Update datalink.cpp (#239)
+
+per https://salsa.debian.org/debian/tcpflow/-/blob/master/debian/patches/fix-werror-format-security.patch
+Closes https://github.com/simsong/tcpflow/issues/238
+--- a/src/datalink.cpp
++++ b/src/datalink.cpp
+@@ -171,10 +171,7 @@ void dl_ethernet(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
+ break;
+ }
+ } catch( std::logic_error e){
+- std::string s(std::string("warning: caught std::logic_error ")
+- + e.what()
+- + std::string(" in packet"));
+- DEBUG(6)(s.c_str());
++ DEBUG(6)("Warning: caught std::logic_error %s in packet",e.what());
+ }
+ }
+
+
diff --git a/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild b/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..07306743ad75
--- /dev/null
+++ b/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
+HOMEPAGE="https://github.com/simsong/tcpflow"
+SRC_URI="
+ https://api.github.com/repos/simsong/be13_api/tarball/c81521d768bb78499c069fcd7c47adc8eee0350c -> be13_api-20170924.tar.gz
+ https://api.github.com/repos/simsong/dfxml/tarball/7d11eaa7da8d31f588ce8aecb4b4f5e7e8169ba6 -> dfxml-20170921.tar.gz
+ https://github.com/simsong/tcpflow/archive/refs/tags/${P}.tar.gz -> ${P}-tag.tar.gz
+"
+S="${WORKDIR}"/${PN}-${P}
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="cairo test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-db/sqlite
+ dev-libs/boost:=
+ dev-libs/openssl:=
+ net-libs/http-parser:=
+ net-libs/libpcap
+ sys-libs/libcap-ng
+ sys-libs/zlib:=
+ cairo? (
+ x11-libs/cairo
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( sys-apps/coreutils )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.0_alpha-libcapng.patch
+ "${FILESDIR}"/${PN}-1.5.2-gentoo.patch
+ "${FILESDIR}"/${PN}-1.6.1-wformat-security.patch
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ append-cxxflags -fpermissive
+
+ # Disable Python because it's Python 2.7 only, even as of 1.6.1!
+ export ac_cv_header_python2_7_Python_h=no
+ export ac_cv_lib_python2_7_Py_Initialize=no
+
+ CONFIG_SHELL="${BROOT}"/bin/bash econf $(usex cairo --enable-cairo=true --enable-cairo=false)
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpflow/, net-analyzer/tcpflow/files/
@ 2023-04-15 9:32 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-04-15 9:32 UTC (permalink / raw
To: gentoo-commits
commit: 898a04f72679015c6f82e5fd230c780a2249a63e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 15 08:56:15 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 09:32:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=898a04f7
net-analyzer/tcpflow: fix build w/ gcc 13
Closes: https://bugs.gentoo.org/895282
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../tcpflow/files/tcpflow-1.6.1-gcc13.patch | 22 ++++++++++++++++++++++
net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild | 3 ++-
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/net-analyzer/tcpflow/files/tcpflow-1.6.1-gcc13.patch b/net-analyzer/tcpflow/files/tcpflow-1.6.1-gcc13.patch
new file mode 100644
index 000000000000..d3b6b63920f1
--- /dev/null
+++ b/net-analyzer/tcpflow/files/tcpflow-1.6.1-gcc13.patch
@@ -0,0 +1,22 @@
+https://github.com/simsong/tcpflow/pull/252
+
+From 51973125e3961569b83bd4fdde65272a3843a6a3 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 15 Apr 2023 09:54:14 +0100
+Subject: [PATCH] Fix build with GCC 13
+
+GCC 13 (as usual for new compiler releases) shuffles around some internal includes and so etc is no longer transitively included.
+
+See https://gnu.org/software/gcc/gcc-13/porting_to.html.
+Bug: https://bugs.gentoo.org/895282
+--- a/src/netviz/plot_view.h
++++ b/src/netviz/plot_view.h
+@@ -23,6 +23,7 @@
+ #include <cairo/cairo-pdf.h>
+ #endif
+
++#include <cstdint>
+ #include <vector>
+ #include <string>
+ #include <math.h>
+
diff --git a/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild b/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild
index 07306743ad75..ab313f301712 100644
--- a/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild
+++ b/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -37,6 +37,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.5.0_alpha-libcapng.patch
"${FILESDIR}"/${PN}-1.5.2-gentoo.patch
"${FILESDIR}"/${PN}-1.6.1-wformat-security.patch
+ "${FILESDIR}"/${PN}-1.6.1-gcc13.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-04-15 9:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-15 9:32 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpflow/, net-analyzer/tcpflow/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-05-22 3:53 Sam James
2019-06-10 19:40 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox