commit: 8d6ed17600ee9557ea5393542419bd637d2585fd Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Thu Sep 3 07:29:24 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Thu Sep 3 07:31:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d6ed176
net-analyzer/flow-tools: Version 0.68.6 Package-Manager: Portage-3.0.5, Repoman-3.0.1 Closes: https://bugs.gentoo.org/665940 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> net-analyzer/flow-tools/Manifest | 1 + .../files/flow-tools-0.68.5.1-fno-common.patch | 4 +- .../files/flow-tools-0.68.5.1-openssl11.patch | 5 +- .../flow-tools/files/flow-tools-0.68.6-mysql.patch | 15 ++++ net-analyzer/flow-tools/flow-tools-0.68.6.ebuild | 89 ++++++++++++++++++++++ 5 files changed, 109 insertions(+), 5 deletions(-) diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest index 946ffc26dc2..11214dc160a 100644 --- a/net-analyzer/flow-tools/Manifest +++ b/net-analyzer/flow-tools/Manifest @@ -1 +1,2 @@ DIST flow-tools-0.68.5.1.tar.bz2 914062 BLAKE2B 8a987c1aac53a1370045ab118888c51ce2de7b8db4074432e86e701153469163870cf1cf9da9e2267ed934d240de4b4bf2391b4681012b82db7e4205207b7fa4 SHA512 ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57 +DIST flow-tools-0.68.6.tar.gz 1078778 BLAKE2B 8a6179e44f2efa90bb2c3ace73bfbb8a928c1d7aabc8f47a778ca7361a92c13f2df168194bdd9c489c175079c1bd977f6ad9852711a62d99649d1f44609d746b SHA512 fc3d0650ace93ec2180340624648b5967fd7f094900f8409e751b439eb659c9623e2ee55effeb74164ec6b15f0a1edd8ed7735ccfacfd72af08e9c5c0d65b740 diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-fno-common.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-fno-common.patch index 14623fa93f3..1f746491996 100644 --- a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-fno-common.patch +++ b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-fno-common.patch @@ -1,5 +1,5 @@ ---- ./src/acl2.h -+++ ./src/acl2.h +--- a/src/acl2.h ++++ b/src/acl2.h @@ -48,7 +48,7 @@ #define ACL_TYPE_STD 1 #define ACL_TYPE_EXT 2 diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch index c6b17743ce9..686d40ab807 100644 --- a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch +++ b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch @@ -1,6 +1,5 @@ -diff -Nuar --exclude '*~' flow-tools-0.68.5.1.orig/lib/ftxlate.c flow-tools-0.68.5.1/lib/ftxlate.c ---- flow-tools-0.68.5.1.orig/lib/ftxlate.c 2008-01-27 12:48:49.000000000 -0800 -+++ flow-tools-0.68.5.1/lib/ftxlate.c 2018-12-29 15:18:33.739062317 -0800 +--- a/lib/ftxlate.c ++++ b/lib/ftxlate.c @@ -34,6 +34,14 @@ #include <openssl/ssl.h> #include <openssl/evp.h> diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.6-mysql.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.6-mysql.patch new file mode 100644 index 00000000000..a270567fc20 --- /dev/null +++ b/net-analyzer/flow-tools/files/flow-tools-0.68.6-mysql.patch @@ -0,0 +1,15 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -62,11 +62,9 @@ + if test "x$WHERE_MYSQL" != "x"; then + old_LIBS="$LIBS" + old_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -L$WHERE_MYSQL/lib/mysql" +- AC_CHECK_LIB(mysqlclient, my_init, ++ AC_CHECK_LIB(mysqlclient, mysql_init, + [ + MYSQLCFLAGS="-I$WHERE_MYSQL/include/mysql" +- MYSQLLDFLAGS="-L$WHERE_MYSQL/lib/mysql" + MYSQLLIB="-lmysqlclient" + AC_DEFINE(HAVE_MYSQL, 1, [Do we have to build MySQL support]) + ] diff --git a/net-analyzer/flow-tools/flow-tools-0.68.6.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.6.ebuild new file mode 100644 index 00000000000..85002e28287 --- /dev/null +++ b/net-analyzer/flow-tools/flow-tools-0.68.6.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools user + +DESCRIPTION="library and programs to process reports from NetFlow data" +HOMEPAGE="https://github.com/5u623l20/flow-tools/"; +SRC_URI="https://github.com/5u623l20/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug libressl mysql postgres ssl static-libs" + +RDEPEND=" + sys-apps/tcp-wrappers + sys-libs/zlib + mysql? ( dev-db/mysql-connector-c:0= ) + postgres? ( dev-db/postgresql:* ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + app-text/docbook2X + sys-devel/bison + sys-devel/flex +" +DOCS=( ChangeLog.old README README.fork SECURITY TODO TODO.old ) +PATCHES=( + "${FILESDIR}"/${PN}-0.68.5.1-run.patch + "${FILESDIR}"/${PN}-0.68.5.1-openssl11.patch + "${FILESDIR}"/${PN}-0.68.5.1-fno-common.patch + "${FILESDIR}"/${PN}-0.68.6-mysql.patch +) + +pkg_douser() { + enewgroup flows + enewuser flows -1 -1 /var/lib/flows flows +} + +pkg_setup() { + pkg_douser +} + +src_prepare() { + default + sed -i -e 's|docbook-to-man|docbook2man|g' docs/Makefile.am || die + eautoreconf +} + +src_configure() { + econf \ + $(use_enable static-libs static) \ + $(usex mysql --with-mysql '') \ + $(usex postgres --with-postgresql=yes --with-postgresql=no) \ + $(usex ssl --with-openssl '') \ + --sysconfdir=/etc/flow-tools +} + +src_install() { + default + + exeinto /var/lib/flows/bin + doexe "${FILESDIR}"/linkme + + keepdir /var/lib/flows/ft + + newinitd "${FILESDIR}/flowcapture.initd" flowcapture + newconfd "${FILESDIR}/flowcapture.confd" flowcapture + + fowners flows:flows /var/lib/flows + fowners flows:flows /var/lib/flows/bin + fowners flows:flows /var/lib/flows/ft + + fperms 0755 /var/lib/flows + fperms 0755 /var/lib/flows/bin + + find "${ED}" -name '*.la' -delete || die +} + +pkg_preinst() { + pkg_douser +}
