gentoo resync : 16.02.1018

3 files changed, 127 insertions, 0 deletions

diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index 109c0671f052..d48fe90e6d26 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -1,9 +1,11 @@
+AUX flow-tools-0.68.5.1-openssl11.patch 1251 BLAKE2B 682c34b207517fc74e090c6aa04ba9acd7b4aa7bb2ea7b8cae45d608777b1a8760d6e22759dd10fcb4d5f3a9e258b34d07454efd2cc93134125d195b36714cd5 SHA512 c43cc2de4243b0567c07f66f0b674cb6974dee5689bbea50716ebc5cd49f4d66a739c39ff4ccadef23c7f84e26fe3a3cc4999b7db0bdda77035dbd5cfc678861
 AUX flow-tools-0.68.5.1-run.patch 493 BLAKE2B dc1ab3e5abd6a7d502aa2bc1150c97a569c0d6e55bdb96e2a3404966487f637fef064191a00ba1cfb63c62ecbbb9c0359e231381e193ae13340820418908b371 SHA512 90c9f8bc6aba4c31315294ba80ebc3f7a8b86796d6fc108ef9ebf7619df73474e1a97524b709964ba899f4569a0158d0cc0a2d5bb00e8b185186cf765b87ce9d
 AUX flow-tools-0.68.5.1-syslog.patch 979 BLAKE2B c3ae5017c5f2f7c6c69cbce88b38f95a8def62fb5e14a769262f3f62a32df50d5831d883935ec26e01ece35388855fce3855cfba44f72064e3115a46b4ea8920 SHA512 d2d37816f437c5546916ca53bd460707366b3675ac9e9105a9611ed436d322afd6ee56fa29b1d6e68f3a02c97a62ca009d392fdb63fca411ace851dc29419537
 AUX flowcapture.confd 1928 BLAKE2B db22630c3741867466c1292651364e41028dafeeaf10d1d18403fbd0bb95ec3a58faf04e164d97e6eefe4c1b2f526ed96ce44b7a410cd6e3efb0c3b98e15b3b0 SHA512 e9dcc5d66833e9bf2905273efcb6b7cab69050da50425256629bf12203c7bd9fed87ac33a772903d78f5fbab69045bc4e0f09d26ea1442cdc5c5bd0102a09c05
 AUX flowcapture.initd 816 BLAKE2B 6e27085fa0b8048f1b6f2d449d154a0fe9f2d7b8fa511de53d7eca684ef716b8ceeaaa3fedf9e0a01e76b1723e6646b6727bc76c3e9b2168060fe3bd7b363af7 SHA512 c3f62821efc94fb6305ba3c54415319c42a624a3c604c96497af0fdd7b4076e618a070006146346eb3de0549bc2bc36e3e3ffd9f7aba832dd18c29da0370463a
 AUX linkme 283 BLAKE2B 1c1e84a29f8fccc62dc84ba8ffbd182255a5bda7979132ff721fc537bb523e221b3963e3dce4f5700f53586ef4c4acccbab605099edf7e068bf6dd2e71882721 SHA512 a9db8dec8b6f2a83b8896951bf1711ec7c58dd18d2da7db7015c0a000114b3d1da9bee4dd64842c074b332a06a890b2eea1b8ffc0399ce0efa39bf6527466359
 DIST flow-tools-0.68.5.1.tar.bz2 914062 BLAKE2B 8a987c1aac53a1370045ab118888c51ce2de7b8db4074432e86e701153469163870cf1cf9da9e2267ed934d240de4b4bf2391b4681012b82db7e4205207b7fa4 SHA512 ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57
+EBUILD flow-tools-0.68.5.1-r10.ebuild 1640 BLAKE2B 1d7b5e006cea30d8bd874ac57e770622d6f7b94d3bd3d7c2f7e5891d77265919abf46fbf84dd4947b16d92d98857f01ab18e49d62591783431b52cb5708dab5b SHA512 76d38aeaa85a409926c51bcd3c8bb7c603f0f24507013fe70ca3ef919af72c9240a3d11e72068e983e7dce9e91f7709972feb489ed0b790b1d01b8fc2234bf41
 EBUILD flow-tools-0.68.5.1-r2.ebuild 1687 BLAKE2B 360f0d59242c3b4a9dd89fe6ce8282ef53f1ce168ced1e32660a87bb3de4576b1cfdf08c5be56f7b70f3f97bf0115bd345c4c434ce051d1ebfd81b577d1fde22 SHA512 19fab6d40f16607410ab530c2624e36a40e806bab2bcd9e336bbb03164020e9a84b376adaa9a3cabaca6441982b1effe4c4f5ccfa4f9c134888990aba6600293
 EBUILD flow-tools-0.68.5.1-r9.ebuild 1615 BLAKE2B f041ee019a4d4d70f4612f25c5904112a2c08e4868d727dcea9c370bb9461acc5d1eadbe2f452fec3d5f319e38ebcf0910a8217eef8ebcbc4b7ed9f7af2dc36d SHA512 c7d85fc7c617008977f8e9d151eb1765a416d8ad7edc011b870b9b1f6727dbc80b26f1a3ce527b661d5f4da68047c4910e007e467d006796523a6135689003d8
 MISC metadata.xml 902 BLAKE2B 16f4780c8fc2a803580d1ad9321e1db662c1c720f744f544b57a2eb65f9859c02dced677f3ea1732b05afe70abb55b4a9c349fb375ee24abf083b8376d521fb1 SHA512 45f900d25bc2b968ce9a04fd143106962c1a242b776840eb2c1b51f0e02d71000f9a2fdf19286f7873e07c25aa9d528597f1b1fe0e7e083c29de5304b87aeab3
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 000000000000..c6b17743ce91
--- /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 000000000000..9d62c33981ae
--- /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
+}