summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2020-10-26 08:35:39 +0100
committerMichał Górny <mgorny@gentoo.org>2020-10-26 08:39:04 +0100
commit07151b2923151018c1ce068b0793fd120f3d8e4d (patch)
treecd3305018709039df4e784e364a7b043cbc96b10
parentdev-python/mysql-python: Remove last-rited pkg (diff)
downloadgentoo-07151b2923151018c1ce068b0793fd120f3d8e4d.tar.gz
gentoo-07151b2923151018c1ce068b0793fd120f3d8e4d.tar.bz2
gentoo-07151b2923151018c1ce068b0793fd120f3d8e4d.zip
net-analyzer/tcpflow: Remove last-rited pkg
Closes: https://bugs.gentoo.org/735392 Signed-off-by: Michał Górny <mgorny@gentoo.org>
-rw-r--r--net-analyzer/tcpflow/Manifest3
-rw-r--r--net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch13
-rw-r--r--net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch61
-rw-r--r--net-analyzer/tcpflow/metadata.xml11
-rw-r--r--net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild60
-rw-r--r--profiles/package.mask1
6 files changed, 0 insertions, 149 deletions
diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest
deleted file mode 100644
index fb353514e5a1..000000000000
--- a/net-analyzer/tcpflow/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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.2.tar.gz 788545 BLAKE2B b3995cf0f4bedce207dcac19de3d57920231cab75df030da1cf93fb815999de602fd1e3f0955c82effff88f9a3945a891c3b3f0e08449cf366de4bb8269a6452 SHA512 e060779c78f79ba6efdf5f9d8ff490823ff06051a7089247b8155c03f487776fa1896e487e8dca1d5842b617fc5d9056e043f01ac3276edeec1d394ed24bc7e9
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
deleted file mode 100644
index b56144324c09..000000000000
--- a/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/tcpflow.cpp
-+++ b/src/tcpflow.cpp
-@@ -30,6 +30,10 @@
- #include <grp.h>
- #endif
-
-+#ifdef HAVE_CAP_NG_H
-+#include <cap-ng.h>
-+#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
deleted file mode 100644
index de0864004a0c..000000000000
--- a/net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- 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/metadata.xml b/net-analyzer/tcpflow/metadata.xml
deleted file mode 100644
index d0b78340e0f1..000000000000
--- a/net-analyzer/tcpflow/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>netmon@gentoo.org</email>
- <name>Gentoo network monitoring and analysis project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">simsong/tcpflow</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild b/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild
deleted file mode 100644
index 1b29c9fe64b0..000000000000
--- a/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-inherit autotools flag-o-matic python-single-r1
-
-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"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- ${PYTHON_DEPS}
- 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}
- 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)
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index c590f0876d1f..3a68e7f4dc2b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -241,7 +241,6 @@ net-voip/telepathy-haze
games-arcade/diameter
games-board/gnome-hearts
net-analyzer/sguil-server
-net-analyzer/tcpflow
# Michał Górny <mgorny@gentoo.org> (2020-09-25)
# PyPy3.7 alpha. Known to break a few packages. Masked until it