* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/flow-tools/files/, net-analyzer/flow-tools/
@ 2016-07-29 0:45 Robin H. Johnson
0 siblings, 0 replies; 6+ messages in thread
From: Robin H. Johnson @ 2016-07-29 0:45 UTC (permalink / raw
To: gentoo-commits
commit: a3508c8b9bced6ce2ae49816022b85e2dcd9af2e
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 00:45:27 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 00:45:44 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3508c8b
net-analyzer/flow-tools: get to the bottom of the weird pidfile behavior in the codebase, -p is not the full path!.
Package-Manager: portage-2.2.28
net-analyzer/flow-tools/files/flowcapture.confd | 9 ++-
net-analyzer/flow-tools/files/flowcapture.initd | 6 +-
.../flow-tools/flow-tools-0.68.5.1-r8.ebuild | 75 ++++++++++++++++++++++
3 files changed, 86 insertions(+), 4 deletions(-)
diff --git a/net-analyzer/flow-tools/files/flowcapture.confd b/net-analyzer/flow-tools/files/flowcapture.confd
index 20a2385..e926d64 100644
--- a/net-analyzer/flow-tools/files/flowcapture.confd
+++ b/net-analyzer/flow-tools/files/flowcapture.confd
@@ -39,10 +39,13 @@ WORKDIR=/var/lib/flows/ft
# user to run as
USER=flows
-# Pidfile
-PIDFILE=/run/flows/flowcapture.pid.${PORT}
+# Pidfile base
+# The daemon takes the pidfile argument and APPENDS .$PORT itself in writing.
+# It may have multiple children by original design, but this is not recommended
+# for Gentoo at this time.
+PIDFILE_BASE=${PIDFILE_BASE:=/run/flows/flowcapture.pid}
# This pulls in the options above
-FLOW_OPTS="-p $PIDFILE -w $WORKDIR $LOCALIP/$REMOTEIP/$PORT -V $FLOW_VER -E $SIZE -n $ROTATIONS -N $NEST -R $ROTATE_PROG"
+FLOW_OPTS="-p $PIDFILE_BASE -w $WORKDIR $LOCALIP/$REMOTEIP/$PORT -V $FLOW_VER -E $SIZE -n $ROTATIONS -N $NEST -R $ROTATE_PROG"
# Use below only if you have sorted out the STAT_INT problem
#FLOW_OPTS="-p /run/flows/flowcapture.pid.$PORT -w $WORKDIR $LOCALIP/$REMOTEIP/$PORT -S $STAT_INT -V $FLOW_VER -E $SIZE -n $ROTATIONS -N $NEST -R $ROTATE_PROG"
diff --git a/net-analyzer/flow-tools/files/flowcapture.initd b/net-analyzer/flow-tools/files/flowcapture.initd
index e03d493..a31ed5e 100644
--- a/net-analyzer/flow-tools/files/flowcapture.initd
+++ b/net-analyzer/flow-tools/files/flowcapture.initd
@@ -3,7 +3,11 @@
# Distributed under the terms of the GNU General Public License v2
PORT=${PORT:=2055}
-PIDFILE=${PIDFILE:=/run/flows/flowcapture.pid.${PORT}}
+# The daemon takes the pidfile argument and APPENDS .$PORT itself in writing.
+# It may have multiple children by original design, but this is not recommended
+# for Gentoo at this time.
+PIDFILE_BASE=${PIDFILE_BASE:=/run/flows/flowcapture.pid}
+PIDFILE=${PIDFILE:=${PIDFILE}.${PORT}}
depend() {
use net
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r8.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r8.ebuild
new file mode 100644
index 0000000..087e3c9
--- /dev/null
+++ b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r8.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="library and programs to process reports from NetFlow data"
+HOMEPAGE="https://code.google.com/p/flow-tools/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug libressl mysql postgres ssl static-libs"
+
+RDEPEND="sys-apps/tcp-wrappers
+ sys-libs/zlib
+ mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql:* )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ sys-devel/bison"
+
+DOCS=( ChangeLog README SECURITY TODO )
+
+pkg_setup() {
+ enewgroup flows
+ enewuser flows -1 -1 /var/lib/flows flows
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-run.patch
+ epatch "${FILESDIR}"/${P}-syslog.patch
+}
+
+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
+
+ prune_libtool_files
+
+ 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
+}
+
+pkg_preinst() {
+ enewgroup flows
+ enewuser flows -1 -1 /var/lib/flows flows
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/flow-tools/files/, net-analyzer/flow-tools/
@ 2016-08-01 17:45 Robin H. Johnson
0 siblings, 0 replies; 6+ messages in thread
From: Robin H. Johnson @ 2016-08-01 17:45 UTC (permalink / raw
To: gentoo-commits
commit: e037557258dfb9b46cc2c279bb4aba08d0bf7a3d
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 1 17:45:03 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Aug 1 17:45:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0375572
net-analyzer/flow-tools: import initd fix from infra.
Package-Manager: portage-2.2.28
net-analyzer/flow-tools/files/flowcapture.initd | 2 +-
.../flow-tools/flow-tools-0.68.5.1-r7.ebuild | 75 ----------------------
.../flow-tools/flow-tools-0.68.5.1-r8.ebuild | 75 ----------------------
...5.1-r6.ebuild => flow-tools-0.68.5.1-r9.ebuild} | 0
4 files changed, 1 insertion(+), 151 deletions(-)
diff --git a/net-analyzer/flow-tools/files/flowcapture.initd b/net-analyzer/flow-tools/files/flowcapture.initd
index a31ed5e..c6fc347 100644
--- a/net-analyzer/flow-tools/files/flowcapture.initd
+++ b/net-analyzer/flow-tools/files/flowcapture.initd
@@ -7,7 +7,7 @@ PORT=${PORT:=2055}
# It may have multiple children by original design, but this is not recommended
# for Gentoo at this time.
PIDFILE_BASE=${PIDFILE_BASE:=/run/flows/flowcapture.pid}
-PIDFILE=${PIDFILE:=${PIDFILE}.${PORT}}
+PIDFILE=${PIDFILE:=${PIDFILE_BASE}.${PORT}}
depend() {
use net
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r7.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r7.ebuild
deleted file mode 100644
index 087e3c9..0000000
--- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r7.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="library and programs to process reports from NetFlow data"
-HOMEPAGE="https://code.google.com/p/flow-tools/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug libressl mysql postgres ssl static-libs"
-
-RDEPEND="sys-apps/tcp-wrappers
- sys-libs/zlib
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql:* )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-
-DEPEND="${RDEPEND}
- sys-devel/flex
- sys-devel/bison"
-
-DOCS=( ChangeLog README SECURITY TODO )
-
-pkg_setup() {
- enewgroup flows
- enewuser flows -1 -1 /var/lib/flows flows
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-run.patch
- epatch "${FILESDIR}"/${P}-syslog.patch
-}
-
-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
-
- prune_libtool_files
-
- 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
-}
-
-pkg_preinst() {
- enewgroup flows
- enewuser flows -1 -1 /var/lib/flows flows
-}
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r8.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r8.ebuild
deleted file mode 100644
index 087e3c9..0000000
--- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r8.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="library and programs to process reports from NetFlow data"
-HOMEPAGE="https://code.google.com/p/flow-tools/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug libressl mysql postgres ssl static-libs"
-
-RDEPEND="sys-apps/tcp-wrappers
- sys-libs/zlib
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql:* )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-
-DEPEND="${RDEPEND}
- sys-devel/flex
- sys-devel/bison"
-
-DOCS=( ChangeLog README SECURITY TODO )
-
-pkg_setup() {
- enewgroup flows
- enewuser flows -1 -1 /var/lib/flows flows
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-run.patch
- epatch "${FILESDIR}"/${P}-syslog.patch
-}
-
-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
-
- prune_libtool_files
-
- 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
-}
-
-pkg_preinst() {
- enewgroup flows
- enewuser flows -1 -1 /var/lib/flows flows
-}
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r6.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r9.ebuild
similarity index 100%
rename from net-analyzer/flow-tools/flow-tools-0.68.5.1-r6.ebuild
rename to net-analyzer/flow-tools/flow-tools-0.68.5.1-r9.ebuild
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/flow-tools/files/, net-analyzer/flow-tools/
@ 2019-02-14 19:51 Brian Evans
0 siblings, 0 replies; 6+ messages in thread
From: Brian Evans @ 2019-02-14 19:51 UTC (permalink / raw
To: gentoo-commits
commit: 65092da067a661727d15db17bccd679d84baf10f
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 14 19:48:29 2019 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 19:50:49 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65092da0
net-analyzer/flow-tools: Revbump to fix compile and mysql dependency
Non-maintainer commit.
Original ebuild and patch by Robin Johnson <robbat2 <AT> gentoo.org>
Additional change for mysql dep by me
Bug: https://bugs.gentoo.org/674032
Bug: https://bugs.gentoo.org/665940
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
.../files/flow-tools-0.68.5.1-openssl11.patch | 47 +++++++++++++
.../flow-tools/flow-tools-0.68.5.1-r10.ebuild | 78 ++++++++++++++++++++++
2 files changed, 125 insertions(+)
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
new file mode 100644
index 00000000000..c6b17743ce9
--- /dev/null
+++ b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch
@@ -0,0 +1,47 @@
+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
+@@ -34,6 +34,14 @@
+ #include <openssl/ssl.h>
+ #include <openssl/evp.h>
+ #undef free_func
++
++/* fixup LibreSSL OpenSSL version numbering */
++#include <openssl/opensslv.h>
++#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
++#undef OPENSSL_VERSION_NUMBER
++#define OPENSSL_VERSION_NUMBER 0x1000107fL
++#endif
++
+ #endif /* HAVE_OPENSSL */
+
+ #include <sys/time.h>
+@@ -2040,11 +2048,13 @@
+
+
+ /* init crypto */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ if (!(cp->cipher_ctx = (EVP_CIPHER_CTX*) malloc(sizeof(EVP_CIPHER_CTX)))) {
+ return -1;
+ }
+
+ EVP_CIPHER_CTX_init(cp->cipher_ctx);
++#endif
+
+ /* disable padding */
+ if (!(EVP_CIPHER_CTX_set_padding(cp->cipher_ctx, 0))) {
+@@ -2083,10 +2093,14 @@
+ {
+
+ #ifdef HAVE_OPENSSL
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ EVP_CIPHER_CTX_cleanup(cp->cipher_ctx);
+
+ if (cp->cipher_ctx)
+ free (cp->cipher_ctx);
++#else
++ EVP_CIPHER_CTX_free(cp->cipher_ctx);
++#endif
+ #endif /* HAVE_OPENSSL */
+
+ return 0;
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild
new file mode 100644
index 00000000000..9d62c33981a
--- /dev/null
+++ b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit user
+
+DESCRIPTION="library and programs to process reports from NetFlow data"
+HOMEPAGE="https://code.google.com/p/flow-tools/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2"
+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}
+ sys-devel/flex
+ sys-devel/bison"
+
+DOCS=( ChangeLog README SECURITY TODO )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-run.patch
+ "${FILESDIR}"/${P}-syslog.patch
+ "${FILESDIR}"/${P}-openssl11.patch
+)
+
+pkg_setup() {
+ pkg_douser
+}
+
+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
+
+ find "${D}" -name '*.la' -delete || die
+
+ 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
+}
+
+pkg_preinst() {
+ pkg_douser
+}
+
+pkg_douser() {
+ enewgroup flows
+ enewuser flows -1 -1 /var/lib/flows flows
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/flow-tools/files/, net-analyzer/flow-tools/
@ 2020-02-03 19:28 Jeroen Roovers
0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2020-02-03 19:28 UTC (permalink / raw
To: gentoo-commits
commit: 78c775afa54f223bd01b2cb143ef36a32ec92aa8
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 3 19:28:04 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Feb 3 19:28:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78c775af
net-analyzer/flow-tools: Fix CFLAGS=-fno-common
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
Closes: https://bugs.gentoo.org/show_bug.cgi?id=708038
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
.../files/flow-tools-0.68.5.1-fno-common.patch | 42 ++++++++++++++++++++++
.../flow-tools/flow-tools-0.68.5.1-r10.ebuild | 3 +-
2 files changed, 44 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000000..14623fa93f3
--- /dev/null
+++ b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-fno-common.patch
@@ -0,0 +1,42 @@
+--- ./src/acl2.h
++++ ./src/acl2.h
+@@ -48,7 +48,7 @@
+ #define ACL_TYPE_STD 1
+ #define ACL_TYPE_EXT 2
+
+-struct acl_list {
++typedef struct acl_list {
+ int num; /* number of entries */
+ int num_std; /* number of standard acl entries */
+ int num_ext; /* number of extended acl entries */
+@@ -59,6 +59,8 @@
+ /* num_ext of these */
+ };
+
++extern struct acl_list acl_list;
++
+ struct acl_names {
+ int num; /* index into standard or extended list */
+ char *name; /* name of this acl */
+--- a/src/aclyacc.y
++++ b/src/aclyacc.y
+@@ -7,8 +7,6 @@
+ unsigned char fmt_buf[32];
+ unsigned char fmt_buf2[32];
+
+-extern struct acl_list acl_list;
+-
+ int x;
+
+ %}
+--- a/src/flow-filter.c
++++ b/src/flow-filter.c
+@@ -56,8 +56,6 @@
+ int debug;
+ int ip_net_only;
+
+-struct acl_list acl_list;
+-
+ int yyparse (void);
+ void usage(void);
+ void yyerror(const char *msg);
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild
index 4a048f0d81c..8656ded0568 100644
--- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -32,6 +32,7 @@ PATCHES=(
"${FILESDIR}"/${P}-run.patch
"${FILESDIR}"/${P}-syslog.patch
"${FILESDIR}"/${P}-openssl11.patch
+ "${FILESDIR}"/${P}-fno-common.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/flow-tools/files/, net-analyzer/flow-tools/
@ 2020-09-03 7:31 Jeroen Roovers
0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2020-09-03 7:31 UTC (permalink / raw
To: gentoo-commits
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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/flow-tools/files/, net-analyzer/flow-tools/
@ 2021-03-15 22:02 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-03-15 22:02 UTC (permalink / raw
To: gentoo-commits
commit: ba2bb6a122f97c46c4925fb9c73790f3d4ded388
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 21:58:53 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 22:01:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba2bb6a1
net-analyzer/flow-tools: drop 0.68.5.1-r11
Bug: https://bugs.gentoo.org/776526
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/flow-tools/Manifest | 1 -
.../files/flow-tools-0.68.5.1-syslog.patch | 47 ---------------
.../flow-tools/flow-tools-0.68.5.1-r11.ebuild | 68 ----------------------
3 files changed, 116 deletions(-)
diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index 11214dc160a..958d870d3dc 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -1,2 +1 @@
-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-syslog.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch
deleted file mode 100644
index cb17471072b..00000000000
--- a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/lib/fterr.c
-+++ b/lib/fterr.c
-@@ -112,7 +112,7 @@
- fprintf(((fterr_file) ? fterr_file : stderr), "%s\n", buf2);
-
- if (fterr_flags & FTERR_SYSLOG)
-- syslog(LOG_INFO, buf);
-+ syslog(LOG_INFO, "%s", buf);
-
- } /* fterr_info */
-
-@@ -134,7 +134,7 @@
-
- if (fterr_flags & FTERR_SYSLOG) {
- snprintf(buf2, 1024, "%s: %s", buf, strerror(errno));
-- syslog(LOG_INFO, buf2);
-+ syslog(LOG_INFO, "%s", buf2);
- }
-
- if (fterr_exit)
-@@ -159,7 +159,7 @@
- }
-
- if (fterr_flags & FTERR_SYSLOG)
-- syslog(LOG_INFO, buf);
-+ syslog(LOG_INFO, "%s", buf);
-
- if (fterr_exit)
- fterr_exit(code);
-@@ -183,7 +183,7 @@
- }
-
- if (fterr_flags & FTERR_SYSLOG)
-- syslog(LOG_INFO, buf);
-+ syslog(LOG_INFO, "%s", buf);
-
- } /* fterr_warnx */
-
-@@ -205,7 +205,7 @@
-
- if (fterr_flags & FTERR_SYSLOG) {
- snprintf(buf2, 1024, "%s: %s", buf, strerror(errno));
-- syslog(LOG_INFO, buf2);
-+ syslog(LOG_INFO, "%s", buf2);
- }
-
- } /* fterr_warn */
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild
deleted file mode 100644
index d1f4fc95e62..00000000000
--- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="library and programs to process reports from NetFlow data"
-HOMEPAGE="https://code.google.com/p/flow-tools/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug libressl mysql postgres ssl static-libs"
-
-RDEPEND="
- acct-group/flows
- acct-user/flows
- 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="
- sys-devel/flex
- sys-devel/bison"
-
-DOCS=( ChangeLog README SECURITY TODO )
-
-PATCHES=(
- "${FILESDIR}"/${P}-run.patch
- "${FILESDIR}"/${P}-syslog.patch
- "${FILESDIR}"/${P}-openssl11.patch
- "${FILESDIR}"/${P}-fno-common.patch
-)
-
-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
-
- find "${D}" -name '*.la' -delete || die
-
- 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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-03-15 22:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-03 19:28 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/flow-tools/files/, net-analyzer/flow-tools/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2021-03-15 22:02 Sam James
2020-09-03 7:31 Jeroen Roovers
2019-02-14 19:51 Brian Evans
2016-08-01 17:45 Robin H. Johnson
2016-07-29 0:45 Robin H. Johnson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox