diff options
author | Jeroen Roovers <jer@gentoo.org> | 2019-06-10 21:47:40 +0200 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2019-06-10 21:49:11 +0200 |
commit | 6147b8e24d80abc46fb7a995aec4bc8a10867ef2 (patch) | |
tree | ab9c6748c07f7689874096f2ba6c91278fad1322 /net-analyzer/tcpflow | |
parent | net-analyzer/tcpflow: Version 1.5.2 (diff) | |
download | gentoo-6147b8e24d80abc46fb7a995aec4bc8a10867ef2.tar.gz gentoo-6147b8e24d80abc46fb7a995aec4bc8a10867ef2.tar.bz2 gentoo-6147b8e24d80abc46fb7a995aec4bc8a10867ef2.zip |
net-analyzer/tcpflow: Old
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
Diffstat (limited to 'net-analyzer/tcpflow')
-rw-r--r-- | net-analyzer/tcpflow/Manifest | 1 | ||||
-rw-r--r-- | net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-gentoo.patch | 191 | ||||
-rw-r--r-- | net-analyzer/tcpflow/tcpflow-1.5.0_alpha.ebuild | 57 |
3 files changed, 0 insertions, 249 deletions
diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest index 941f219cef15..82bf15dbfcaf 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 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 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 6a2dc10cff9e..000000000000 --- 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 --unset option -- -- --# C++ --# We don't use these warnings: --# -Waggregate-return -- aggregate returns are GOOD; they simplify code design --# We can use these warnings after ZLIB gets upgraded: --# -Wundef --- causes problems with zlib --# -Wcast-qual --# -Wmissing-format-attribute --- Just too annoying --AC_LANG_PUSH(C++) --WARNINGS_TO_TEST="-Wall -MD -D_FORTIFY_SOURCE=2 -Wpointer-arith \ -- -Wshadow -Wwrite-strings -Wcast-align \ -- -Wredundant-decls -Wdisabled-optimization \ -- -Wfloat-equal -Wmultichar -Wmissing-noreturn \ -- -Woverloaded-virtual -Wsign-promo \ -- -funit-at-a-time" -- --if $CXX -dM -E - < /dev/null | grep -q __clang__ ; then -- AC_MSG_RESULT([Using clang]) -- clang='yes' -- else -- AC_MSG_RESULT([not using clang]) -- clang='no' -- # -Wstrict-null-sentinel is not supported under clang or under Darwin's gcc -- WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Wstrict-null-sentinel" --fi -- --if test $mingw = "no" ; then -- # add the warnings we don't want to do on mingw -- WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Weffc++" --fi -- --for option in $WARNINGS_TO_TEST --do -- SAVE_CXXFLAGS="$CXXFLAGS" -- CXXFLAGS="$CXXFLAGS $option" -- AC_MSG_CHECKING([whether g++ understands $option]) -- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], -- [has_option=yes], -- [has_option=no; CXXFLAGS="$SAVE_CXXFLAGS"]) -- AC_MSG_RESULT($has_option) -- unset has_option -- unset SAVE_CXXFLAGS --done --unset option --AC_LANG_POP() -- --################################################################ - ## - - -@@ -396,7 +305,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 -@@ -603,35 +517,6 @@ - Mmissing_library="$Mmissing_library python27" # Not sure: https://github.com/macports/macports-ports/blob/master/lang/python27/Portfile - ]) - --############## drop optimization flags if requested ################ -- --# Should we disable optimization? --AC_ARG_WITH([opt], AC_HELP_STRING([--without-opt], [Drop all -O C flags])) --# Or maybe just tone it down a bit? --AC_ARG_WITH([o3], AC_HELP_STRING([--without-o3], [Do not force O3 optimization; use default level])) -- --if test x"${AFF_NOOPT}" != "x" ; then -- AC_MSG_NOTICE([Dropping optimization flags because AFF_NOOPT is set.]) -- with_opt="no"; --fi -- --if test "${with_opt}" = "no" ; then -- AC_MSG_NOTICE([Dropping optimization flags]) -- CFLAGS=`echo "$CFLAGS" | sed s/-O[[0-9]]//` # note the double quoting! -- CXXFLAGS=`echo "$CXXFLAGS" | sed s/-O[[0-9]]//` -- -- AC_MSG_NOTICE([Removing -D_FORTIFY_SOURCE=2]) -- CPPFLAGS=`echo $CPPFLAGS | sed s/-D_FORTIFY_SOURCE=2//` -- CXXFLAGS=`echo $CXXFLAGS | sed s/-D_FORTIFY_SOURCE=2//` -- CFLAGS=`echo $CFLAGS | sed s/-D_FORTIFY_SOURCE=2//` --else -- # and increase optimizer from -O2 to -O3 if not explicitly forbidden -- if test "${with_o3}" != "no" ; then -- CFLAGS=`echo -g "$CFLAGS" | sed s/-O2/-O3/` # note the double quoting! -- CXXFLAGS=`echo -g "$CXXFLAGS" | sed s/-O2/-O3/` -- fi --fi -- - AC_OUTPUT - - ## Finally, record the values of CFLAGS, CPPFLAGS, and CXXFLAGS for DFXML ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -90,18 +90,10 @@ - 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 =\ -- 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.0_alpha.ebuild b/net-analyzer/tcpflow/tcpflow-1.5.0_alpha.ebuild deleted file mode 100644 index 6c5c1bdafe13..000000000000 --- a/net-analyzer/tcpflow/tcpflow-1.5.0_alpha.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools flag-o-matic - -DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows" -HOMEPAGE="https://github.com/simsong/tcpflow https://packages.qa.debian.org/t/tcpflow.html" -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-gentoo.patch - "${FILESDIR}"/${PN}-1.5.0_alpha-libcapng.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) -} |