From 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 20 Mar 2021 14:27:17 +0000 Subject: gentoo resync : 20.03.2021 --- net-analyzer/flow-tools/Manifest | 5 +- .../files/flow-tools-0.68.5.1-syslog.patch | 47 --------------- .../flow-tools/flow-tools-0.68.5.1-r11.ebuild | 68 ---------------------- .../flow-tools/flow-tools-0.68.6-r1.ebuild | 4 +- 4 files changed, 3 insertions(+), 121 deletions(-) delete mode 100644 net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch delete mode 100644 net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild (limited to 'net-analyzer/flow-tools') diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest index db2a7db25ea7..ceaeb20fea1f 100644 --- a/net-analyzer/flow-tools/Manifest +++ b/net-analyzer/flow-tools/Manifest @@ -1,13 +1,10 @@ AUX flow-tools-0.68.5.1-fno-common.patch 965 BLAKE2B f15d1d6fc60b9ba916ccefa44f30b683d93931770a3113b533b51a52146f63e56fe0db864a03a5df0fc1ecd5a58e464944c5df28cd929556d6615617f3b975d2 SHA512 ec26e4ea284e0b2aff3a73b6b76e0a87c336dbe81d0492db3b7809de17103c47d220d2d20bc9fce853bb10e7b11c35dd6943b6cb1ef305bd8ffe147bc7bec18c AUX flow-tools-0.68.5.1-openssl11.patch 1039 BLAKE2B 2787119195c98ad92260b282b60fbb2bfb56d09a0ae7c999238d61d3b1e25dfb7e02590f8f78910e5b85111899db72f7d3bb3ce96c6c357f7ab4e6b01a67f109 SHA512 03a48e6e297d701b04259bf354b5a032ed660d99fb6941054f8d02f215681561a152ed10411bc0fa93b27be223b874316f989dff779aac458db87b0118947590 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 flow-tools-0.68.6-mysql.patch 479 BLAKE2B 9c22f8aae5bc57c2d86e88d69bfcac438e8d1fc2f5d6bb4fe61612e3042709d46edc0e1a4159b54bf98e153ae1e0acf08b06b317b4029a9605933dfef41d40f7 SHA512 fbdbcf7a716375a70a6677d35aa81f0f07fbf67d3de7ace72cc4b0b548d5b7fed32d0f0f4420672a88ec60ea2f72e109f9c3a3903cd66be7dbec85fa445dd9ec 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 DIST flow-tools-0.68.6.tar.gz 1078778 BLAKE2B 8a6179e44f2efa90bb2c3ace73bfbb8a928c1d7aabc8f47a778ca7361a92c13f2df168194bdd9c489c175079c1bd977f6ad9852711a62d99649d1f44609d746b SHA512 fc3d0650ace93ec2180340624648b5967fd7f094900f8409e751b439eb659c9623e2ee55effeb74164ec6b15f0a1edd8ed7735ccfacfd72af08e9c5c0d65b740 -EBUILD flow-tools-0.68.5.1-r11.ebuild 1570 BLAKE2B 9777743a331cda77929b901175b8c9fce0f0619d28bbc6263bbbca6a22931de0bd7077176cbf27a0a5004f491d3dcb4878f7802a17a162016b8a7e9aa70621b1 SHA512 e95fb5cc31790bda2a7f3384ff76d2c140b359d9f321c09c8127ad77a995d07333bf18941ae54a29be1940fd411383c9cae8ad0a6c629b3d052ebb1429beaaaf -EBUILD flow-tools-0.68.6-r1.ebuild 1821 BLAKE2B 4c62192f40635eb9afcdc3eca578deebde35e5a28c5ee25e1eba927ef9d34131a42cf662a81debcd783394a407d79c7a0f17f2b566d066d092c40aed83a22efd SHA512 5aecaa30e76eda57314d959e90d78a4a87983f95fb9a3ca6c8d951a95d9948c2d6a3a6ef814965e08e997c3a06fa4adb21f26f3014d124b737583192f986a65d +EBUILD flow-tools-0.68.6-r1.ebuild 1818 BLAKE2B e7b5806a2eef33155305e65fddb654b985cb0c7c1d81c29a5e517c8a03cbb0bcd181ba444a83f8cae586ee2e071a465cc13afaf7d5e7d9f1bdec7b4032c7c0fa SHA512 23ebdeb9de9ab64fa3865100561373ce9a48f7ebc4a736bc1ac579b0d98ea61b2958cde5b63b1eb766746764b8f7bf9392d0e57aaec979e7a8d1526ce7b9b7ab MISC metadata.xml 902 BLAKE2B 16f4780c8fc2a803580d1ad9321e1db662c1c720f744f544b57a2eb65f9859c02dced677f3ea1732b05afe70abb55b4a9c349fb375ee24abf083b8376d521fb1 SHA512 45f900d25bc2b968ce9a04fd143106962c1a242b776840eb2c1b51f0e02d71000f9a2fdf19286f7873e07c25aa9d528597f1b1fe0e7e083c29de5304b87aeab3 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 cb17471072bc..000000000000 --- 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 d1f4fc95e62a..000000000000 --- 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 -} diff --git a/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild index d8ee002d2ccf..0f7a1e00b1eb 100644 --- a/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild +++ b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ 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" +KEYWORDS="amd64 ppc x86" IUSE="debug libressl mysql postgres ssl static-libs" RDEPEND=" -- cgit v1.2.3