diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /net-analyzer | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'net-analyzer')
249 files changed, 4756 insertions, 1671 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz Binary files differindex 372cd3888ead..6adf09f438e2 100644 --- a/net-analyzer/Manifest.gz +++ b/net-analyzer/Manifest.gz diff --git a/net-analyzer/alive/Manifest b/net-analyzer/alive/Manifest index c12b05a8ea13..cef4d254e19b 100644 --- a/net-analyzer/alive/Manifest +++ b/net-analyzer/alive/Manifest @@ -2,5 +2,5 @@ AUX alive-2.0.2-ping-test.patch 378 BLAKE2B 1adb452bce76cd0dee69c52fc0432148ce7f DIST alive-2.0.2.tar.xz 174936 BLAKE2B f3998d1cbf81d77be449cf1157bc570837b87fd15a860041273059de69536ff9cab8d00b8cb1191b2d6d692b41fb3fa5863248267a86ad542326f48c8ab43730 SHA512 7e9c88f62ab5c0248d1e42b81e2106f43fc9587543782623e8a564ab99fd1d4a55058a175dc46d25520454c07f732101c7e62248ce992d1a8a615f531b1c090e DIST alive-2.0.3.tar.xz 187396 BLAKE2B 0614ae8d0707abf59dd1500d986ce21221092d118a40ae92e838bd11b81a2b5fd261a531843f99992746a86a31bbb494a9f35f9fa0ad5c0ea896d68edec17205 SHA512 3b2f14d84682466e02fc6678ba26eb4c0b9378f1c938a7463cc5736501cbf144baaeb7dea2c8343a916891ce4e2d580bac946c913c01d7c25e12bfa611c89422 EBUILD alive-2.0.2-r1.ebuild 534 BLAKE2B 373d867ca88524aafd8e90352eb11975543b5a39abd4d7092b6ba3565bf17d42772fa52875563d123ef65df69318e8d26335597d91557eaa6d6fa75504fdd603 SHA512 3a74d3aa466c820b9e6646dcd10ede837177eea419ec0be6bbdde3546f7f7391a6808c532b2bea4e8109c1484fc71e1bc7ec1491691514d181200f541ff63264 -EBUILD alive-2.0.3.ebuild 518 BLAKE2B 0c7e1a4f1816b54cbc699cd79ab83832af6f5dc6ce3718bd2eee0a24e64791c6004d274e330364df57529e8fb8ece2db56a3f73525d0a7902595851d61a956d0 SHA512 42e5124b1527247bb12ee74ab2549b90f9c0de6d212d0931b22d299ef95b0f74a5a683bddef81cf94e2d1dba61044e38d91780534b379098a937e93a37ebfcf7 +EBUILD alive-2.0.3.ebuild 529 BLAKE2B be00d4d145ae70804beef6c60ec39df973f1f9daa298faa29e5cef2aa02bfc05484639fe0e247dd5bba244a38af29c9d1514fff0f61107c0cba0a2b092382ea2 SHA512 34cdc3589a0bd34761770f047bb33e8fa69213c5c61113dedfcd4ca309b531c1099f68c4eda3a5b08fac274e73cf48fe64b9b3391c14511afa195be039351f01 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/alive/alive-2.0.3.ebuild b/net-analyzer/alive/alive-2.0.3.ebuild index 89a15d6ada23..34cb398fe14c 100644 --- a/net-analyzer/alive/alive-2.0.3.ebuild +++ b/net-analyzer/alive/alive-2.0.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~hppa ~x86" BDEPEND="app-arch/xz-utils" DEPEND=" diff --git a/net-analyzer/arp-sk/Manifest b/net-analyzer/arp-sk/Manifest index 36543cd98f09..59d9b07d63e1 100644 --- a/net-analyzer/arp-sk/Manifest +++ b/net-analyzer/arp-sk/Manifest @@ -1,4 +1,4 @@ AUX arp-sk-0.0.16-libnet1_2.patch 1362 BLAKE2B eb3f8387f9d43d957e6a2a111bce2ea336d705d74761f22d4d4adf92f00c00b4f81de66112b4134540aa86847874c8abca19af4bc62fc75635f149d62effa336 SHA512 04cd17513d19f0e70b54840148fb8d603c06385e601f352cfadc381de5109b547e204414830fa195cfac56e662ffdfb234f54b8fec9ab68316cfdd4220bdb922 DIST arp-sk-0.0.16.tgz 211636 BLAKE2B 9ba786829061161c0c38950a7c374968126d4cfb269b10b67b5a1dce2a7cb1016833a4a2adc9fef0f8fb61dbbdc8d959a7cf63379e69bff3fc4dc9a9201348af SHA512 d827ab5c701e1e3a6444dbe7e1e7c0a73ee2bfb2339a55fc7d3591ee8e9e9aadef4dfd4aaf331251fbe22d83c9b1135068e5afa6303eae934b3fd149ca0819a6 -EBUILD arp-sk-0.0.16-r2.ebuild 761 BLAKE2B e29ab3086c884d10ad033778dfd53c798dcf72ea5489afa1adce03440c997eb59805a652b35a384605c83ed1f3b9c302e95945df0234ab8eb706a5e00646d7af SHA512 68e39c4bd35973f696545bed0e4ad9499964190cf7b2cc6aae4131cbad63dafaee73af258ad26c0e5f26b60e2b64637a265e53e514bbdb662210c59d1854d3b1 +EBUILD arp-sk-0.0.16-r2.ebuild 760 BLAKE2B 9cc5f1a59cc69023bc4554e42bd4fe3ab0f784b4480663b305f28bf11291b507ade7aeb4a0ad9867656df6c00f35895b94e64003e948b847b2c16d4b84c59587 SHA512 140170f9044b36764c87ceed5db474335bf2489dca4f6b299f5b76aada3c0550961b8e1946de9e3c59bce9503abefadba1e75c01e0c6b64ff8c33712c1bc6091 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild b/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild index 773e349fc87b..dd4c76e5f827 100644 --- a/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild +++ b/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild @@ -1,12 +1,14 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit autotools eutils multilib + +inherit autotools epatch multilib DESCRIPTION="A swiss knife tool for ARP" HOMEPAGE="http://sid.rstack.org/arp-sk/" SRC_URI="http://sid.rstack.org/arp-sk/files/${P}.tgz" + LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" diff --git a/net-analyzer/bmon/Manifest b/net-analyzer/bmon/Manifest index e730e80219ca..22f60973c8bc 100644 --- a/net-analyzer/bmon/Manifest +++ b/net-analyzer/bmon/Manifest @@ -1,5 +1,5 @@ AUX bmon-3.6-docdir-examples.patch 235 BLAKE2B f187f4bbc8b7e4de5e9bb1f289ef201ed17e6a64e0062ad370f5dcce1160da1774590aa824f2adf9b73c058b95ac2428e24bf8c5e78a1c16b45f4f1f33a889ca SHA512 2b74637c6dacfa03e680774787d8287ae084ba426a3e0e178b74f1468179916509ee5de2e0c93f7abe04356d0146ad6dd8e191d9a66718ec8eaf50cb6126afc8 DIST bmon-4.0.tar.gz 61843 BLAKE2B d376cc6ca9f64c71cd7f8aa281e36e0f8717939c2ada3d9ed6d1231e1f6bc489146fa5f88a327abd6bc63803d2ed21eafff2888427bfd11d51156380ed6d6d1c SHA512 2a5b527a78cc1084c3b96d8d621b002ee86d377776d7e25f711dc2869e59bcd6277cc5f103549fe0b635b1368228a66941d5069fd1240cff678b308d7e17218d -EBUILD bmon-4.0.ebuild 936 BLAKE2B b2671f70efd71060f743630e2e14535b6e6c7b0965c03aca95fb528656e5e999e50a6566684c0c15298f376a82d44b1bee3d54fe6cede385c0fccf7f03749654 SHA512 b055b8fe965f501faff7f115d5a6ce29ae00d632275d716d2328b3d3561ae098828d1c60bea1a818d8874010ec155168fa7279d21fde31a9c629c48cef4b0d62 -EBUILD bmon-999.ebuild 858 BLAKE2B 82354eb979de0f0983e8651ce4aced9f837ca8dcada384abfc14a6a0ac69428182ea843bcf656dd9413f04f8e6b4467654d3323deea277f69e10c111cd1fa084 SHA512 e2f48435f8242d422e94811f5f9b952517ff12a7d26099c0bbc0279d9210b9aa8013d64b34a5599cb6d20293d72f3b552a85057dfe3d0f245206cbc97b0dc2ec +EBUILD bmon-4.0.ebuild 929 BLAKE2B 61446651eb9067c74cad0600a06f89dc18ed8af70575f0fe6a499581f2667a3cb77aaadfc1d0a032901e282d85085f6b9eb28923b20a370a93f3803ee0412bb3 SHA512 710bb706b73528474c23b200a6edf6f66c9dd8d023ee3d41e4d99de1eaf755e60830b7676ba833a84a227d303f908be7e2208180a7ec537a84d120695d679088 +EBUILD bmon-999.ebuild 853 BLAKE2B 4deb4540fd1df9306c8f80aa1d6e03565294465ad8764bc22d2c2ef27679da665b11b472f86462aa27df2889dea88789ce4f98737d7d81fd20664ee18001c590 SHA512 75cffd2603d9ea72ffdffd9bf0ba6f40eb6d275804cc45f228be44897b89aff2edb07997b931446302276c1723bc8009e50dde1e9713fd7a4f41d5d97d1a8a9c MISC metadata.xml 355 BLAKE2B 7d9ea44a97e5083c50bf60c34b30057ef90fd3263133f0600940747444d7485fccf3b47d988eb4cf968aee96bfff6b551b72adb003ca4fb6a2b58e31781fa936 SHA512 44b31fb1a2801c74cd4ba7260566447df31b9dd7bd55ed1ffdabc0bcfef8d5459e753cbbb0a2a31c5f2d87e7853972281cb9412b642e282be9a02be2f519fcef diff --git a/net-analyzer/bmon/bmon-4.0.ebuild b/net-analyzer/bmon/bmon-4.0.ebuild index ce39ebbf63e0..13ecfa5de9dd 100644 --- a/net-analyzer/bmon/bmon-4.0.ebuild +++ b/net-analyzer/bmon/bmon-4.0.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools eutils linux-info toolchain-funcs +EAPI=7 -DESCRIPTION="interface bandwidth monitor" +inherit autotools linux-info toolchain-funcs + +DESCRIPTION="Interface bandwidth monitor" HOMEPAGE="http://www.infradead.org/~tgr/bmon/ https://github.com/tgraf/bmon/" -SRC_URI=" - https://codeload.github.com/tgraf/${PN}/tar.gz/v${PV} -> ${P}.tar.gz -" +SRC_URI="https://codeload.github.com/tgraf/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" LICENSE="BSD-2 MIT" SLOT="0" @@ -19,10 +18,8 @@ RDEPEND=" dev-libs/confuse:= dev-libs/libnl:3 " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" DOCS=( ChangeLog ) @@ -32,12 +29,12 @@ ERROR_NET_SCHED=" Run ${PN} -i proc to use the deprecated proc interface instead. " -src_prepare() { - eapply \ - "${FILESDIR}"/${PN}-3.6-docdir-examples.patch - - eapply_user +PATCHES=( + "${FILESDIR}"/${PN}-3.6-docdir-examples.patch +) +src_prepare() { + default eautoreconf } diff --git a/net-analyzer/bmon/bmon-999.ebuild b/net-analyzer/bmon/bmon-999.ebuild index 1939b19057ed..c7b2e2c82e08 100644 --- a/net-analyzer/bmon/bmon-999.ebuild +++ b/net-analyzer/bmon/bmon-999.ebuild @@ -1,26 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools git-r3 linux-info toolchain-funcs -DESCRIPTION="interface bandwidth monitor" +DESCRIPTION="Interface bandwidth monitor" HOMEPAGE="http://www.infradead.org/~tgr/bmon/ https://github.com/tgraf/bmon/" EGIT_REPO_URI="https://github.com/tgraf/bmon/" LICENSE="BSD-2 MIT" SLOT="0" -KEYWORDS="" RDEPEND=" >=sys-libs/ncurses-5.3-r2:0= dev-libs/confuse:= dev-libs/libnl:3 " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" DOCS=( ChangeLog ) diff --git a/net-analyzer/bwbar/Manifest b/net-analyzer/bwbar/Manifest index dd24b3affbef..50ed80523acc 100644 --- a/net-analyzer/bwbar/Manifest +++ b/net-analyzer/bwbar/Manifest @@ -1,4 +1,4 @@ AUX bwbar-1.2.3-libpng15.patch 345 BLAKE2B 1c2e3733ee08d4203021f647072b7cce88a7526dd717f9cecf8912a0717e0531aa25c7eef304efab097a094020ff901c8ceca9db02cfd853a4f91bb5ebc4e916 SHA512 14c07dc56320a748b864c8c3ad8b3c9408838db8630930409f2f16f6bcfbf6fab14e6eb1ae803e4f6b33127220c53a51d01a4b981f3ddd8bc8fb1be2952192f8 DIST bwbar-1.2.3.tar.bz2 30202 BLAKE2B b7c0ed980e5af14e5e2fa2a3fafb8b7f75d96a0bac8b3effed2a7a54098bb00741b07f2ba32e6cb81dc4accd42a0f370c6bd95a5eec1301b1090e96d2e2ce80f SHA512 cb534f50007db6e39aa134d0d9a08ec6935c8a393f8dd5ab80f3c6ef94048821e065cd6c1be80657a2d6338fd16a73dcc0f89f5b15aba9e3bd38f0737a6d43c4 -EBUILD bwbar-1.2.3.ebuild 531 BLAKE2B 30d5c93b4279483bf028d07d4bcd9871e5a30ea85ab8d604289a74d00743ed82946818f9f2a10380a8f356f1505dbcd4ffb10f30239953f9f88b5c908a75f091 SHA512 f75015b4240784f0e5ef7a7a014821477056c222c505dea539c4d898466aed0436a79bf5d4e0242eb31aa0967c8089772dabe8f79e8866229fc42d49ac70bbc1 +EBUILD bwbar-1.2.3.ebuild 503 BLAKE2B 6613faac1d77fece440124a7567c0be21c4805265df7f925215a8ab161b952a5414d70b46ee8d95eb6dac8ffe836937a3c133edc08cec664577b610159674331 SHA512 0207df8f386c9869ef90d26372741ffd60295402b9e034b8c3dd9fe1ef929befab1fa10874abacdbe96d4f41be22fb93dfbeefa752c3fe7266676398e4708e53 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/bwbar/bwbar-1.2.3.ebuild b/net-analyzer/bwbar/bwbar-1.2.3.ebuild index 89b0d4b0da7e..6837e519f3ca 100644 --- a/net-analyzer/bwbar/bwbar-1.2.3.ebuild +++ b/net-analyzer/bwbar/bwbar-1.2.3.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=7 DESCRIPTION="The kernel.org \"Current bandwidth utilization\" bar" HOMEPAGE="https://www.kernel.org/pub/software/web/bwbar/" @@ -15,9 +14,9 @@ KEYWORDS="amd64 x86" RDEPEND=">=media-libs/libpng-1.2" DEPEND="${RDEPEND}" -src_prepare() { - epatch "${FILESDIR}"/${P}-libpng15.patch -} +PATCHES=( + "${FILESDIR}"/${P}-libpng15.patch +) src_install() { dobin bwbar diff --git a/net-analyzer/bwm-ng/Manifest b/net-analyzer/bwm-ng/Manifest index 8b85b52bd958..19e936b59e2d 100644 --- a/net-analyzer/bwm-ng/Manifest +++ b/net-analyzer/bwm-ng/Manifest @@ -2,5 +2,5 @@ AUX bwm-ng-0.6.2-tinfo.patch 274 BLAKE2B 9c4d5e5f94aab191fd6f68488a5ed48c08fec65 DIST bwm-ng-0.6.2.tar.gz 70079 BLAKE2B 4e0c5dd73bdcaabf5138ce842e5ce50709ba3bc0792f11ebee2640b6246f5bd740fcf8ad79b7dcffabdbc8f44c5ec2d925b20cf28609f8735e537f6920f92aba SHA512 4a7f141692f96dfab0c1729a7df36f5213a75ddb891b967b2cf951419daea7b84354c276705a0ee7c09f4ed26948ca068f65a04b8f9d18b2b8ed2df97b5e3b0a DIST bwm-ng-0.6.3.tar.gz 70094 BLAKE2B bfc5007470a2e4d7f50dc43dc33898f5bcb34a0eaeeb0f53ed74029299ac2b732d343eaf725144a05b778ad8a204c5d546f0ea0b6aaf997995e2e7a6bc3c6cf6 SHA512 85ce29e6ffa9643b4e7c1d731f4e928ddca8cfdc71c86b65ec4e55058b951eb8da9ab80139145300518223589d5fece5bdc11ede91a1ea394d569993ccdb0ab8 EBUILD bwm-ng-0.6.2.ebuild 699 BLAKE2B 6b4d4ba5ccc497d0193500eac4812a8927737f24c017a3e9e8de2ffa20e9bef87f10c06305d1712c4031653db870b04616f5c333244382dba8bb00d6184ae45d SHA512 3600129dc614250c3617f2c526605e9f8acabbd50d9bf03b8933f5325babdcaecaaeb8ed96b02838b082cbcbc13d5cbce638f45be50240bec8f664efcd8c6bd1 -EBUILD bwm-ng-0.6.3.ebuild 701 BLAKE2B 85e6fdb19c20230b7865e57399e8f247a9bf997ea9c80bb264b4155a9b22d04a8ce80d47e9d573d713f2820b5cce756e0a9f6a2801cc7fdf4edf9da7bb4064d0 SHA512 b1910b155acc1dc077e33aa395b10c0da314fd63dabe607596a7926073479568e147c75947760fbd0376c7aa4cffa7c5c9d20391a984d05132c5edc120ae1421 +EBUILD bwm-ng-0.6.3.ebuild 698 BLAKE2B 01712cdc0cb55b387d96a8842ed88044c135eede318062ecdbd543bf598536cc566c6d1f1d989af105b417a9d9f1886f2bbec5b23cbbddd27ebc6451130b0356 SHA512 68ad2747299244cf55b13128cf58dc5acc8c32bf7301408847bc2f148a55cd8f49d0e3730ec55f7876749e2f1d7fc5b850b7d8c3848425ed253f225c98849799 MISC metadata.xml 463 BLAKE2B 1bbaff010b068efc83f690257a28b0a57b564c353f525f9b62764d2f241f8ebf43a10afab26eb2d787af2f4e0fde956df4c02ffea1529e7ec0fc1ccb5faf0a77 SHA512 af0924dc4db40f48722b0ff91c605f978d59166d51c0e7550ea460bcc9f498e9d0ec432d0e546ebdec39c8204c8c30caf6e5dd85d868eedaf7e1bac253312d74 diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.3.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.3.ebuild index d7770f571f23..0e94224d5bbf 100644 --- a/net-analyzer/bwm-ng/bwm-ng-0.6.3.ebuild +++ b/net-analyzer/bwm-ng/bwm-ng-0.6.3.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth HOMEPAGE="http://www.gropp.org/" SRC_URI="https://github.com/vgropp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="amd64 ~arm ppc x86" LICENSE="GPL-2" SLOT="0" IUSE="+csv +html" diff --git a/net-analyzer/bwmon/Manifest b/net-analyzer/bwmon/Manifest index 8972d850ea46..49402481e65d 100644 --- a/net-analyzer/bwmon/Manifest +++ b/net-analyzer/bwmon/Manifest @@ -3,5 +3,5 @@ AUX bwmon-1.3-overflow.patch 543 BLAKE2B 31728572f5cb4f6d3eb78801c3aa99100b495b9 AUX bwmon-1.3-tinfo.patch 242 BLAKE2B 0f9b6625d10ca61f9728441122aa3db10e6a34c8c5e410231bd147a69aaee51378d2043f9eb7eef90994dd722462f579e0271b61ef3054a00da2e834eaac4ab1 SHA512 710f9cb4ff61b84f717603f5b814cfaed90af95c67cbc051eb9535084cb02c26711e3dd9f539165640ffb7bc770a15d77144de9c5ccb1235a6b11c3619b3d0ec AUX bwmon-1.3-typo-fix.patch 534 BLAKE2B 1037ebbf21c61ba71bd27b02311c8f8674dddda18fca227c285f91aa3a82315bbbc848f20d4dba54b78bd17bd6944c41f2c8688a068b4e511dfc49310d40efb6 SHA512 4c0a23a7b49a86e35239e1b7e0273d3ffafa4ea1a43918557ed26e4680eb2563aa1635670868ab7f39157118d140844a0706828d9f09f938d21e90f3fa5d6854 DIST bwmon-1.3.tar.gz 5668 BLAKE2B b73695ad56516e6134c6b6c6012bcfdf71ad51af99fadabf3af95cc7af745b8cd7ffbfd8c9ced6a13e9d05abb9d2ceebee3e0d7e3c54694ecbcd467be75d8b60 SHA512 6552ba03f0cfe7d2adebe7ae49379cc109b4f8da56dafec1264ac39c114809c7cde161f6321a67516b22b04abbad5d1ab3b4efb313479ad131fb20638c6871e8 -EBUILD bwmon-1.3-r2.ebuild 730 BLAKE2B 2ac7b1b8218a5a5d99494cf77c96a01c751512fd32195ea5483a44ba89987a263471602b4b1bffd1c22ed4fbec9c8e37af03d2b4680631c4d67e49769638ba65 SHA512 de5518bea1393264e780e8e17d6acf667f45f8cfaa56626c640ed300d1f1c69c80ae56e550ab8e1bf0e0e20a210c2f035018a824a9109d3fdfa290b6ea9a01f5 +EBUILD bwmon-1.3-r2.ebuild 708 BLAKE2B 7e9f7b00ad65612b26566106916c8892de9f8576245be53bc86faf8de66f4d581923321c17e0c091f8dc794a2b8af0e9d506da49e83bad098f63fed6206ddf76 SHA512 946a69261fd5339eb11f558e6e4558f74456db3b86be723906dedcc2053f245c2472575d4c5bd2bbced39da332a29c3b75fa8b02b0c4b67c4c41f0958f4342ce MISC metadata.xml 355 BLAKE2B 9a14c05ae8d113f1094ec3f8e9842b0cead05a4e779d4e001deebb3dfbd4694f2e4ff884439721e829e643b252732e24fe1703ae375f6cb695b7465e343c0462 SHA512 441e039d5d22d70155d6229a29d6ba3a0e0bc82498de7ec97014cdd830ecf3ba4c67a9ae3556a2a9f29a0ff48ce573e576efa48e99660a37a9a132ed9cd2c345 diff --git a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild index 56fb924c673c..7eaa4fd5b529 100644 --- a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild +++ b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild @@ -1,30 +1,28 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Simple ncurses bandwidth monitor" HOMEPAGE="http://bwmon.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +BDEPEND="virtual/pkgconfig" RDEPEND="sys-libs/ncurses" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" SLOT="0" LICENSE="GPL-2 public-domain" KEYWORDS="amd64 ~hppa ppc sparc x86" -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-build.patch \ - "${FILESDIR}"/${P}-typo-fix.patch \ - "${FILESDIR}"/${P}-overflow.patch \ +PATCHES=( + "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${P}-typo-fix.patch + "${FILESDIR}"/${P}-overflow.patch "${FILESDIR}"/${P}-tinfo.patch -} +) src_compile() { emake -C src CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" diff --git a/net-analyzer/carl/Manifest b/net-analyzer/carl/Manifest index 24fb67b46386..58f60e46c19e 100644 --- a/net-analyzer/carl/Manifest +++ b/net-analyzer/carl/Manifest @@ -1,4 +1,3 @@ DIST carl-0.9.tar.gz 11096 BLAKE2B 46298873f8fff62a965a7ec7a657522dd90d1a298814f537bb5b32582ea63d0bcb1d4988cd31e6918f16514c65dd3c6517e9079c3c78f6cb0a4bc6d8ece1614a SHA512 9876e30d171bf00c4e53c6e90c98181ac25aeda004bdb8a03060c45a99c55fa087062076ff3964a222d2981ed682ae7b8f4cbade13c69154198200d35e1a577e -EBUILD carl-0.9-r3.ebuild 407 BLAKE2B 0a49d8f2c7391e1cc3700696d4d255b8ba984b0fce85c3ae9b92090752c16c4c7fc6c348190ef37e1b3f9e6653f8230f555b55c00268b53f3922cf89d4ffc310 SHA512 8f97199354a176839ef86f77c50a3d4fd3f4dc02c39501ae5595e1672b54f5f40bc9980713b1c888b1255e7b4347f6f19bd93006bf20256deab87d2dc1188309 -EBUILD carl-0.9-r5.ebuild 494 BLAKE2B 474dcb9f7a5e7aa4d864e49da67ab4db2ed01ea4e10acb7dd511ebbc346c337d1bd0530e39f09c253408e2dc415e5cd5f6316f6f5af25f3cdd36b94065168c1f SHA512 f00e9094d438c729ee677f2e4bd0f4625bb519ddcc37a94ce74e990f947de0ef0336f279ed9ce960360bddb4967a0ec7d6e814939826d4e66609f83701602598 +EBUILD carl-0.9-r5.ebuild 492 BLAKE2B 56d52860da3864091e608f2714825c2ca291094dd6a9ffd2646efba4890bc96aa975ee7a1880848931fb1776ee7a2a3a5ad0db1cdc6489d35f37f31b7c988135 SHA512 345431f7fc2891834a828907c91db8e1fcfedccfa63780452c1ae1042e060dfa740cf23ec753694dc2851aae78fa6b84188d2058634c83fa52172e6d257d64b4 MISC metadata.xml 356 BLAKE2B bcdfa5dbbe63451ed8f27bfdcc926c60452ebf67fdcf486c487bb284b95c06f4baae460e7a6b607b698110175f2a21ad1fc702b3807ef53e2c6c40437bbdfb1b SHA512 e61b1bac117a325c4e96c7d8c594bd0de46379e573e8b89df72dfca572922807af29b2741c86be602d01856bed58bd369e72d65f0fef508d54001c00578d8637 diff --git a/net-analyzer/carl/carl-0.9-r3.ebuild b/net-analyzer/carl/carl-0.9-r3.ebuild deleted file mode 100644 index 2a41dd6667a7..000000000000 --- a/net-analyzer/carl/carl-0.9-r3.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_7 python3_8 pypy3) - -inherit distutils-r1 - -DESCRIPTION="An rsync logfile analyzer" -HOMEPAGE="http://www.schwarzvogel.de/software-misc.shtml" -SRC_URI="http://www.schwarzvogel.de/pkgs/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 x86" -IUSE="" - -DOCS="README" diff --git a/net-analyzer/carl/carl-0.9-r5.ebuild b/net-analyzer/carl/carl-0.9-r5.ebuild index 46201a6d42cd..a09144f6564f 100644 --- a/net-analyzer/carl/carl-0.9-r5.ebuild +++ b/net-analyzer/carl/carl-0.9-r5.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.schwarzvogel.de/pkgs/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~x86" +KEYWORDS="~alpha amd64 x86" DOCS="README" diff --git a/net-analyzer/cloudshark/Manifest b/net-analyzer/cloudshark/Manifest index e727ba47ae41..37cd228f629e 100644 --- a/net-analyzer/cloudshark/Manifest +++ b/net-analyzer/cloudshark/Manifest @@ -1,4 +1,4 @@ AUX cs_log_dir.patch 402 BLAKE2B 4605bc98eaa08729d8b622f212941dd7eb7b99654f2e74aa87460abbe4348b09e666fb6ec413f77fa9123ef22b00363d61610777824272758745f90c588dfd6e SHA512 2cd7fa2b25befeaa6ed2474ed8149e34e4115d7c0105501a9c27547a3dfff7fa4bb6dab60749b17b22f5d13bf247f3276d9217b4f2041db7ee9c0d734108d6a9 DIST cloudshark-1.0.4.tar.gz 24947 BLAKE2B e386d8cb2faf941ef97bd593c2d17566c5d97dce4d73af0d2f462d6e5c875a59e6598e5679bebf4c06be1dde8ebd37c05354dac46c6349c19b65ae0b57a1976b SHA512 5cb0e43e348d00c0ecc98f079a35f455865cbbe884e34101369b74429bb5bc14bb98acffa9749ce44a765e3653c0548e8b30cc658fb982b09dd61e2ec31b4f86 -EBUILD cloudshark-1.0.4.ebuild 1262 BLAKE2B e43313f5c67e64091bbb681f1ff13e4e10def9b80ed55df1ec0d462239efe67a27fb22a314118d22878b0cad13f8ca8891d2e7ac56d28a64bb2434860777e54a SHA512 7fa81e8be152c47922e249a247e959e3518c85ff4ef47192a337a2b7dae5c7db8cbc994e302286782f65c7897b2369f095786be19d89ab5fe65575a822510dc7 +EBUILD cloudshark-1.0.4.ebuild 1264 BLAKE2B 00868eeda28fd8e1975f18b947bc5b6141ee1b252f87420741a4888a8044ec723a11649e8ea1f14fc174d0f6e044cd2adf789a8b0e25d4e1ed68dc08572d1716 SHA512 0192f79963684e1f93fc9041360d57b6e6b6caa99a126fff90b4ef6e0fab7f6e0e73eecdd8e41624c07914d1e8f2a51ad47f82399f7c39c04a2b5d547c9756cd MISC metadata.xml 339 BLAKE2B 9cb074760517267c2a84e4c538b7cc645727acfd7b0d738b905d51e38be2bebdef41dbe689e6272af890ea898c8260da2ec96c5c72e175bbebc916f101f83d08 SHA512 9b0f0f90882087febab5d144d1bdbf93db3533369f54bd7213ac781cd2eed2d81dae345e965f5c31d4f9e8c4fdd2c66d0587c9bc53bab8d207a4e6dd16e0d9d3 diff --git a/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild b/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild index c25a86e3f199..e49d01d326c7 100644 --- a/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild +++ b/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils multilib +inherit multilib DESCRIPTION="Easily upload your wireshark captures to CloudShark" HOMEPAGE="https://cloudshark.io/articles/wireshark-plugin/ https://github.com/cloudshark/wireshark-plugin" @@ -27,12 +27,13 @@ get_PV() { src_prepare() { #cloudshark isn't meant to be installed systemwide, we fix that - epatch "${FILESDIR}"/cs_log_dir.patch + eapply "${FILESDIR}"/cs_log_dir.patch sed -i "s#%s/cloudshark_init.lua#/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/cloudshark_init.lua#" cloudshark.lua #this enables cloudshark by DEFAULT on tshark, not desired #sed -i 's#CLOUDSHARK_TSHARK = "n"#CLOUDSHARK_TSHARK = "y"#' cloudshark_init.default + default } src_install() { diff --git a/net-analyzer/cnet/Manifest b/net-analyzer/cnet/Manifest index e5b3955260da..1812b9625268 100644 --- a/net-analyzer/cnet/Manifest +++ b/net-analyzer/cnet/Manifest @@ -1,5 +1,5 @@ AUX cnet-3.3.1-tcl.patch 350 BLAKE2B 87816729c1705cb8d22676af3fe7172ae651fd565ba96f8fc0665c4e041c9f2844a6833b76f7a297d7b12ff94c4077ba4c337e374283619ae49c3c3a2a64a9d8 SHA512 c35ef7b83b161d258f75c61466aeccbb0ccfdadb839e6d7b9cd60cb4aaa6a5df9c5eb0a5067ee1e17fb46974b409220a4e5d35d3a490013eb270febdd0405fb1 AUX cnet-3.3.4-gentoo.patch 4898 BLAKE2B 5a50a13c33b83717ee73b3c7c70d1cce2b913c35819bb62ef14bea9131d1aebd8e122c8cae837b891025c0c0a3e6d0d151af499b9e2e777d332708ce9a1ff7ec SHA512 58efef31fdb88ed401ba1aa26e8afce506ab77da47207cf2730c2f2efe47efa8dd916578eab34c6c2dc38f499073e14bf16d3c7d03b4412d1fb1fab0eb26614c DIST cnet-3.3.4.tgz 2687235 BLAKE2B dec8b4510cfb9a39ade046dee56955d4ab39094d07acf373b056ce1917f3bbddcf22cf5feefe864b472be4c4a47da3147a3b977cdbf8b0295e0c3a8da95a8420 SHA512 51457541d1023e49bdad4df3502c51d11ea6d62e3e6ae857becfb60229626ba777226b2b42d313d95b982b2790c6b1f80b39e344d9d4bcd4c38ccc31b055d8f9 -EBUILD cnet-3.3.4.ebuild 941 BLAKE2B 888da30d1a962b0f8f30697e70dadc30f362feb3058d3c259ad2317505d92fadef8a7e12798266336b6d3f4e105e2cabe2bf2563e9a7a83cb7044b5d2b9c77ae SHA512 4737df21d2d7a891c53be4ed2cac8ceb72b4eb92d1ea37525a750c6105e85cddc4aa6028a2d9704f5ec4dc3334755f937db33df39ef95a1c3f283c0ee4e329ee +EBUILD cnet-3.3.4.ebuild 923 BLAKE2B 218c669fc7d05192fdcd72617c634402da1f2bc3a76f91f6c33a6e997bc091372bb5cf1f0df5aadc92690661f30e51f386d38b0ae250fb9df03b16db761188d9 SHA512 3a856014e2eb6abdfcd9beecfdf86d76a1908d1ca5bdfa7ddde4cbd14164477bcc7422ca3c7dd572b0fb7084fdfbf439689d581d4cc02695d631daaba6231d97 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/cnet/cnet-3.3.4.ebuild b/net-analyzer/cnet/cnet-3.3.4.ebuild index 252806110764..e5c251413259 100644 --- a/net-analyzer/cnet/cnet-3.3.4.ebuild +++ b/net-analyzer/cnet/cnet-3.3.4.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils multilib toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Network simulation tool" HOMEPAGE="https://www.csse.uwa.edu.au/cnet3/" @@ -18,13 +19,10 @@ RDEPEND=" dev-libs/elfutils x11-libs/libX11 " -DEPEND=" - ${RDEPEND} -" +DEPEND="${RDEPEND}" + +DOCS=( 1st.README ) -DOCS=( - 1st.README -) PATCHES=( "${FILESDIR}"/${PN}-3.3.4-gentoo.patch "${FILESDIR}"/${PN}-3.3.1-tcl.patch diff --git a/net-analyzer/cryptcat/Manifest b/net-analyzer/cryptcat/Manifest index 53d95addbdd9..7666e51a0115 100644 --- a/net-analyzer/cryptcat/Manifest +++ b/net-analyzer/cryptcat/Manifest @@ -1,5 +1,5 @@ -AUX cryptcat-1.2.1-build.patch 1092 BLAKE2B d90db2081b9ff87272d52e8188436ca4f72b31a972ad90eea4a7e8bc22a43439e52efa9c4a18ca17b99ae5ccb30f0b86c002b7125bf9069e837d489085f80098 SHA512 2c591122844c76fd43b18468b11e268315c9173431eab1bc992bba3e175387aed38ad4d4135aeabe261d2625bacf2ba8061dd57c43b1bfe945cf93be43f5284a +AUX cryptcat-1.2.1-build.patch 1082 BLAKE2B ba38d0b2c3f8e45b771c9f71839411415e22fa92f8cba945cf091034a3fef882941e5f5cb9925d5c31bbd6ca17fdba9bc4721edbea3e62b80bd7ad3a07abf897 SHA512 d2c8e4a4fe12a020d6792527f28ff6d9fa3356ec747d1b16759cf1908456ca5e229ddde04c7d599a544cf7b00d52e72a960688583e0ecc17ffe9018a57dc008b AUX cryptcat-1.2.1-misc.patch 1596 BLAKE2B 6ba6b09de2a98311559f23681aa478dda6204525645b9963532bc876fa3789ffab74527d9a48667bd9c698a3c3589514f9c7d02a5e5a10600228c02ece627f94 SHA512 e0a71361d5e8033f221402661310dfad18c9c040e78920db8376388dc41cb8d7e4bb0127b2575634628be80be8e604e089b41e729ae30ec983f9a17f38239a6b DIST cryptcat-unix-1.2.1.tar 190464 BLAKE2B 8029962a3dca21c981a4adaa4e5f347219ac0da7d5b5997101e8c20ac88b2c6e397120018672646a38c58313ad04fad96e930c20a0e2404293679f2fab29fe6a SHA512 2de6521903e489bc6d4f242aaac7f35a3a7fb226e1812ef5f1c3554420fce4378427e94b3e90eca5476d1068f1a9b44d9c5dbd0362888ad893cf66be106deb17 -EBUILD cryptcat-1.2.1-r2.ebuild 605 BLAKE2B 3f1a5a1f293a04029a25c2dad248ad7c562388bf73c2d924ccf862c60b15dfda6791c9080ce5c7ed27d9985e024533742b7de8f91a63bc12beb7d5fc6a89b34f SHA512 8b27ee24e02e8c30de8bcdccc0edd1775d11c5f5b37a4b5d97c2688dc1ab49fa21d10d23c84cc6e071f37da8e279bf1189a0fca0b4b46f7f2b88e29caeb5f3a2 +EBUILD cryptcat-1.2.1-r2.ebuild 605 BLAKE2B 1a5175727e3b5c7e4c5a7cebbecef91b3b72ff3a200a5004dfea4859d8fe23d44d3ed5ebd1a0188e1dd393b992f1dcb0ae956c560c64cf77ba729890d46b2efe SHA512 dbc5902c6e9e0abc21234a1e6bb5d52e98bbbd5af1392a3a12d63de36e2d0bfb7392061c11f6919e63fe319da9f59d5851318758aede3495869fc2ab3c3a8d5c MISC metadata.xml 358 BLAKE2B 595f61b36922129176b386392d2de4c2941126c3eabb70ef3041ffa2083d05016afa915ded2df2340c9aa13a7777dbc046938b49945ae92a6a31aa811389ad4c SHA512 0deed41b2d8d5f038f7d61622230e5db913303a5419790127e300c65aa6603b79f0c1ce7adcd560550a0cdef577b360da9c53ba1569c141d850c7f92b607c8f4 diff --git a/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild b/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild index 0c94c1940d9e..a3d959ea9cbe 100644 --- a/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild +++ b/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild @@ -1,22 +1,26 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="netcat clone extended with twofish encryption" HOMEPAGE="http://cryptcat.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${PN}-unix-${PV}.tar" +S="${WORKDIR}"/unix LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -S=${WORKDIR}/unix +PATCHES=( + "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${P}-misc.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-build.patch - epatch "${FILESDIR}"/${P}-misc.patch + default tc-export CC CXX } diff --git a/net-analyzer/cryptcat/files/cryptcat-1.2.1-build.patch b/net-analyzer/cryptcat/files/cryptcat-1.2.1-build.patch index 17ec33489c89..0b9c62b597f0 100644 --- a/net-analyzer/cryptcat/files/cryptcat-1.2.1-build.patch +++ b/net-analyzer/cryptcat/files/cryptcat-1.2.1-build.patch @@ -1,5 +1,5 @@ ---- a/unix/Makefile -+++ b/unix/Makefile +--- a/Makefile ++++ b/Makefile @@ -10,16 +10,14 @@ # debugging # DFLAGS = -DTEST -DDEBUG diff --git a/net-analyzer/dhcpdump/Manifest b/net-analyzer/dhcpdump/Manifest index f580a00ea69f..2efd0e7f16c3 100644 --- a/net-analyzer/dhcpdump/Manifest +++ b/net-analyzer/dhcpdump/Manifest @@ -2,5 +2,5 @@ AUX dhcpdump-1.8-Makefile.patch 483 BLAKE2B 3da53d6ad4d1e6808ddb4abd9af7aafa8a7c AUX dhcpdump-1.8-debian.patch 2850 BLAKE2B d7e381388af48a8e0f1ffb78dddf4fb3652907569a84072fbd4efacec18051cce20891f270ae6857a8cf07e698381bb10604821eadcf35b963cd413e24df7143 SHA512 ccc97bb8c8f6dfa09d22407c8a9dec249860118ff9fc09af9488f1d4c8679f94ef6850040535048ba0bdde273a2a8c7759f02742ece0e409a020277349bedbac AUX dhcpdump-1.8-endianness.patch 259 BLAKE2B 65b402fa9c0969887cd0e9802e7736bb6becfcef9a4a0577e865402b6413d92cdabaf8f869eee27d27749fadae42ee70485ac078f9b789596e034d9616c3f281 SHA512 7a04bb0933fe6d54f696f18d7d1cbc1090a6f2bb92061bca0e52311264e35ec3884a2ddbdef2b31de7f81a652189fa9617de754d02aaaf17c1212c92106f07d2 DIST dhcpdump-1.8.tar.gz 10740 BLAKE2B f87f1db539b06cffd68395982476bd7bfcad4e41d86aea7f3be357a07d597cdb34e8888eaf90e6dc11db0252dce418a3b1ad8a00b0d3a7c7faab48f14c6aec85 SHA512 52cd63d581a3c530c2f5baa66808d5b0241853651c720bd513b769b8301b4dff9c87243787014aea98a5b3ebed86ec317b58d262bf5031015141a4da50fb76e6 -EBUILD dhcpdump-1.8.ebuild 687 BLAKE2B 54e35e85fcfc7173f88bde7623446525d4052ef5890947c6d5b8b034df80db01dead15b34c7e8e24d3dc7a558d1756bf0c6add848bf296f23bc7f329a1b7fdf0 SHA512 13dff958bf5ef60d79a98008c8ec05fd72b748f81a9b663f06d86c4c14c9675a5a7edc73677476c0290bd7e9a61df878b065ab2d6cd9314b19b8ad3e4857e468 +EBUILD dhcpdump-1.8.ebuild 676 BLAKE2B 0c3ed315c6ecf6c3b9e0040b7f97e9ba1b40f43d24e250f35cbb626c10210ac3d176e29bdeb4b9c35b431b964d59cb917237450623f407f6c0e1ae83316e5c6b SHA512 5e19848a2038d545046d079ec1b0f5652e4d1b201092c6ea009b4fd61ad986f86bca1da2ca38564a98909bd1d73563ce20c34a4e47a07ab4d75f2951a427da00 MISC metadata.xml 418 BLAKE2B 93c3d8a35aab2e549f4129e3b0ac1f23c479017c1fdc0ff7d92fc31a14567383d5859621e65fbc3e1975cbaf201470cf19e6d92a35a9ac35dfb47cedb6208157 SHA512 776319938dbf31831e5b8655726ee04d2c8cbd3d43163c2ba9d3d9126608de9ca6e49df2c0f9fedfffacdbd2149f792b592d5d5e1881c226f0cb2eaba00a1fa4 diff --git a/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild b/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild index f846b315d95e..b7647756faa3 100644 --- a/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild +++ b/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="DHCP Packet Analyzer/tcpdump postprocessor" HOMEPAGE="https://www.mavetju.org/unix/general.php" @@ -12,20 +13,19 @@ LICENSE="BSD-2" SLOT="0" KEYWORDS="amd64 arm ~mips x86" +# for pod2man +BDEPEND="dev-lang/perl" RDEPEND="net-libs/libpcap" -DEPEND=" - ${RDEPEND} - dev-lang/perl -" - -src_prepare() { - epatch "${FILESDIR}"/${P}-Makefile.patch - epatch "${FILESDIR}"/${P}-debian.patch - epatch "${FILESDIR}"/${P}-endianness.patch -} +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-Makefile.patch + "${FILESDIR}"/${P}-debian.patch + "${FILESDIR}"/${P}-endianness.patch +) src_compile() { - emake CC=$(tc-getCC) + emake CC="$(tc-getCC)" } src_install() { diff --git a/net-analyzer/dnstracer/Manifest b/net-analyzer/dnstracer/Manifest index ae50650b8354..0c5dd21ca73f 100644 --- a/net-analyzer/dnstracer/Manifest +++ b/net-analyzer/dnstracer/Manifest @@ -1,6 +1,6 @@ AUX dnstracer-1.9-argv0.patch 343 BLAKE2B d3a1fe5b9aec3099ef2e385fdbd4e638cd8877bf533e59abbbfdf46bb80d6c0a64f4d3ad6ebc96e83bb007bc3bd22a1c26815fc7a7e98e63d8ef7a975f0307f4 SHA512 6871b93a4ebf1d307c4ef56ca134d8e39c152fe22564e6845ead6d7d97c96ff21982649808618d098b7105159a9bf09a201c4147c61be0b98676a69a9f4bfaa2 DIST dnstracer-1.10.tar.gz 19169 BLAKE2B 8d549f7968b313778f4ee28a5dae0d782b23ff6ce874d343c079c178e9e7516d37af61c14ac6d4f00888dffa98f50768acd2d3fa2d221358d4db8aea82bc830f SHA512 8174f92c5c1b300c1011a24f0cf2f16dc2b52a082729e52d1033a047e20d132d6005b89618ecbbd25cbdc1c95cdc0748cf666bdc56b769b240d8885469bc6e05 DIST dnstracer-1.9.tar.gz 130884 BLAKE2B cf08795eed59851c6da5d5c0ecc1a0b8445584ab10a9adf3cc526f5f831ceef9ed8deee8728ec964c35808a71e865f841f698403bcc0f16346e3abd5e13cac8b SHA512 e69fe772062ff315ff3148c26df78bd41c75d11dcfa6431f1e9374e6069182bd80826b22dc116011d975838d9527913d46edd78de049edd25e3ac9247d5f3473 -EBUILD dnstracer-1.10.ebuild 676 BLAKE2B cc96e42210ed468bc289a9d9571dd4a0fbe8b9253c5d23e0196dc5e8144ff07afe65c25a1808a5143e2d06afc411a8ca75f47b313c5860397c90e1c03af75f6c SHA512 326e24d8cdb98acd4a2eb878b29b4c417f9eed2664c8465c135b05325e6ad63aba76f62567d22a4f2865be8988b47b34de4f85fb6f81791d7ad64e79da23088a +EBUILD dnstracer-1.10.ebuild 675 BLAKE2B c4e49a5bc538522d53c0c9fac97c4419c39233517a789f70e0a8b61dcf5e9f0a7a61cce69a14b444754b477d1b27324ae057d4d3e0291ae32b2de2705e326347 SHA512 d580c852362aa700653bd065fa5f794dd44c0986e231cb2cd4d6acce09ccacd646dfa62bde31598fea1f957d962a21c36a3ad205218d55dc4d770d967304f525 EBUILD dnstracer-1.9-r2.ebuild 530 BLAKE2B c4008d5c48dbfe6bd0a7a6ecc23913fe4a21e6d0287ddd55c7d5f8fdd8b018e0d376457ee2d9349e2fa3d477d3d8b106fe3535b6b92a95904ec12d6678441f19 SHA512 b361a72cf4e5d04031799a0d7e7be1e2f138b71229800a93fdbf17ca205bf2f241f85f588ae439fc7a50bde2c3beaa02bf930b0f6aa96e0e1272a7d0c3e71301 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/dnstracer/dnstracer-1.10.ebuild b/net-analyzer/dnstracer/dnstracer-1.10.ebuild index c989ddeffa15..6635e2f464c2 100644 --- a/net-analyzer/dnstracer/dnstracer-1.10.ebuild +++ b/net-analyzer/dnstracer/dnstracer-1.10.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}" LICENSE="BSD-2" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux" +KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux" BDEPEND="dev-lang/perl" diff --git a/net-analyzer/driftnet/Manifest b/net-analyzer/driftnet/Manifest index 01b4336b7808..3dcf8d177926 100644 --- a/net-analyzer/driftnet/Manifest +++ b/net-analyzer/driftnet/Manifest @@ -1,5 +1,5 @@ AUX driftnet-1.3.0-CFLAGS.patch 451 BLAKE2B 80e4a2dd8afe6b82e95926e28c4c616b04c098c6d7ad637fd4301a9d34b77985c4ad2eead7fbfa9e565ea9983e0afe51312b756f9917260aeac5b366c7bb1af2 SHA512 2b0e50e2db056247ed83b2a8bef3116a8f9880f8539a33b4a696f312c5872098ac50c20f5a3de8ba07dffb935d450ea55ed3d1f291752de45983b85a62f55c04 AUX driftnet-1.3.0-gtk.patch 298 BLAKE2B 1ccfbe96a69e21f18fa55535996704bd441247f9b109ddc2afd8c826102a0c3a246115c5178276f770b668ca1d8e191fe46858715987fe72f84b20a24f9be1ab SHA512 a43a926d5c289c75b7e942be6d1226a939e0e22e6da8640ebfa2ffd3d08c34fe3dfa525c425831d200bd5e536c73fec02c2c48fd0a6bfaf64f9cb92c9e62b95b DIST driftnet-1.3.0.tar.gz 4971618 BLAKE2B 1cf0a46caac2267c093bf21a0d8e150518dbfe0e76acbe21ef87cd760ccbe964313116ee24d25ad7759b3eeba19ef7925200caee4fd06bb28f9836217d889256 SHA512 45f1016a850cf9e5e294756e47e40eccb13f57a316ae7fa885eac2d5e53f68b9d9ef86868415eca76b108f7aa1f4080c550a91f789265edb0f6e3a55e05f5f0c -EBUILD driftnet-1.3.0.ebuild 1347 BLAKE2B 78790e24d9d41ad91cedb98a2e0b5ad6e00e051afa6eeb38599c062d8345bf4222cbcba70240bcfad2b7d3b6c157304e570436d5a2314a97328683e6ea058c01 SHA512 a60128b7b1e3f380c2f566490def7f84b72a7c5013252b109c6fd925d0d05fe923f65525ac9b93b1d35e29794dc93d1924ceb45f415769d497cfcfd57069d7eb +EBUILD driftnet-1.3.0.ebuild 1332 BLAKE2B 1b71ed5c7af207ac8f3db6f90c1f344c4eb1fa9c68fb154c122b5137e73303c4174ae87bdab2c2c6bc4944e82425e49b8db60ab59c99e8892c3b15a286491001 SHA512 132da1a4eba7f52abe898dddf06d7cdde1989f96da9b011de38380f352b0433df12d068102e70c0597dbbb2684c0b88662e32bae1719d0d5cf95a191fa314ce6 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/driftnet/driftnet-1.3.0.ebuild b/net-analyzer/driftnet/driftnet-1.3.0.ebuild index e286126f8a0c..9134806f0c99 100644 --- a/net-analyzer/driftnet/driftnet-1.3.0.ebuild +++ b/net-analyzer/driftnet/driftnet-1.3.0.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools fcaps toolchain-funcs + +inherit autotools fcaps DESCRIPTION="Watches network traffic and displays media from TCP streams observed" HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/" diff --git a/net-analyzer/egressor/Manifest b/net-analyzer/egressor/Manifest index 73fc6a3e3f30..f94351a19f78 100644 --- a/net-analyzer/egressor/Manifest +++ b/net-analyzer/egressor/Manifest @@ -1,5 +1,5 @@ AUX 1.0-flags.patch 578 BLAKE2B 18df2e1acd88224555288e23f1c21dbab799b92f442a66b5f879668a10a93c42854573bba136718586a4bc5d7cdcc8fc6ba53b34a2117bb87016c9e5d1b57f51 SHA512 aecc7970d9a9e877adf750e29813ad6a685370dc9ea72f34b86a5ddbafcf616db0636b4173e4ba445ac9c3d6a21e2aae26cce1889ba901ac9dea6af79243657a AUX 1.0-libnet-1.0.patch 250 BLAKE2B e7790e2d6a92517e2a3ffee68aa98b894a965458f065fb5854f4b7b018c759f444c2590cd227bc139816f891d5c731409f49cc68489f9f2258a62df131ba0a01 SHA512 eff978e5c4a9a99073b1280aa5369ecbb6100364332cb810bacb3bc4ddd316638ff6a8968923b51e4f72a79ddd994646d03000b3fa3f576ad8d898eea493e089 DIST egressor_release1.0.tar.gz 28746 BLAKE2B 224ffd1fb56d9088a66367bbd88ecaab83c2316b2614a2b5211e03c4ff07683f8584c46d6ab7f0b26cbcb87a3321d0d3789a22cfee994aca3df8c488c9a297e5 SHA512 dfb1ee553ccfb92429fe68df06db031e5cbca41fe4fda36961ba8121d79de03a7dc36febc5a58561c3de9b1412cc90811f5ddc8b156aab8282b0dc3c14cd7aec -EBUILD egressor-1.0-r2.ebuild 817 BLAKE2B 070ebaa82aaef8ffb9e8a4d395df67da524e37281ccb0ffb41dcef5512a592c333c8fe59f9cc6c0fc81e96432b4134ee208e6d271c1019286495ae110fbcda37 SHA512 5ec5726386f3f50035c7c1b25286b37add020cef067af5d259ae2b21cf52fa341f67fb7513a2550a20f212e8bcc7dea9afef1418487ec9c73aa8ad0fd075ed35 +EBUILD egressor-1.0-r2.ebuild 797 BLAKE2B 715267f9afc94103661f8172f1575f97d1a5c9d8f07afa8a15772979d88ab72bf8c9c2b76bbc7d2c8590d9f8d09b672e4095a5a452a4e4fc5a577ba996d21d6a SHA512 fc85611405cec5c27a23986c108cd5e3a991f55bf100f1be263dce4013cb085b2d2b5bff05373cebe9459cf376a2b7e94907dce69211b7308a22c4bf645fccd6 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/egressor/egressor-1.0-r2.ebuild b/net-analyzer/egressor/egressor-1.0-r2.ebuild index 528e269b5891..6a3ea8056e36 100644 --- a/net-analyzer/egressor/egressor-1.0-r2.ebuild +++ b/net-analyzer/egressor/egressor-1.0-r2.ebuild @@ -1,30 +1,32 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="tool for checking router configuration" HOMEPAGE="http://packetfactory.openwall.net/projects/egressor/" SRC_URI="http://packetfactory.openwall.net/projects/egressor/${PN}_release${PV}.tar.gz" +S="${WORKDIR}" LICENSE="egressor" SLOT="0" KEYWORDS="amd64 ppc x86" -DEPEND="<net-libs/libnet-1.1 - >=net-libs/libnet-1.0.2a-r3" -RDEPEND="net-libs/libpcap +DEPEND=" + <net-libs/libnet-1.1 + >=net-libs/libnet-1.0.2a-r3 +" +RDEPEND=" + net-libs/libpcap dev-perl/Net-RawIP - dev-lang/perl" - -S=${WORKDIR} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PV}-libnet-1.0.patch \ - "${FILESDIR}"/${PV}-flags.patch -} + dev-lang/perl +" +PATCHES=( + "${FILESDIR}"/${PV}-libnet-1.0.patch + "${FILESDIR}"/${PV}-flags.patch +) src_compile() { tc-export CC diff --git a/net-analyzer/fwlogwatch/Manifest b/net-analyzer/fwlogwatch/Manifest index 6cf778d1bac6..6f17cc1d2c33 100644 --- a/net-analyzer/fwlogwatch/Manifest +++ b/net-analyzer/fwlogwatch/Manifest @@ -1,3 +1,3 @@ DIST fwlogwatch-1.5.tar.bz2 94451 BLAKE2B c0456931dc425df4ec190f1c8bcba21e0784009dae66869a5f5c0371b68d0bdb1bf57c788468f7c9fd32abf8b676a4029bcde7d348c37e4b7f5771bc48f04297 SHA512 d4890596859929ddc6adfd7f9e735e0c414bad40eff6732120a522a8bd4fb8d1442c7d1026f0f3c6ac5c4d51b76a2bac486d04f0fbceae67395c585098afef85 -EBUILD fwlogwatch-1.5.ebuild 1778 BLAKE2B db89bf6716b60763d6fe07cf7ef3bf37766b00fda87e3adb9c198810bb99c8b13b0eb2c0925007fc712f0d8f976db4b875b43b8fc65fc91bd1a90e0374e0d3de SHA512 e1551363a1f65fdaf559c0d4805fbc6da9b6912344c4eb818f9e5144e30384ea35dabb423d4f74fc4e8e0545d30d1a4933d911c88c18f4987e8ee1d77f78fc28 +EBUILD fwlogwatch-1.5.ebuild 1783 BLAKE2B da8bf0f9990d004843c7cca2b40501c8c0519bae6b44c580a4fab133d66c774a8ee41d682c98df6fe057768260c6d901f91252c68a926f24a346a9df7e23b262 SHA512 aa339650db36a128a281c235d18eb7c87aef2b57f23fc1b46c7ce1d2d3ac7a603447b9baa41bfbafe9709e787407a77eae85d49a216a70548990e008903d36e0 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild index 1f4f953ecd59..990518943e3b 100644 --- a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild +++ b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic toolchain-funcs +inherit flag-o-matic l10n toolchain-funcs DESCRIPTION="A packet filter and firewall log analyzer" HOMEPAGE="http://fwlogwatch.inside-security.de/" diff --git a/net-analyzer/gnome-nettool/Manifest b/net-analyzer/gnome-nettool/Manifest index d58fd250fc21..cb9f46c07dd3 100644 --- a/net-analyzer/gnome-nettool/Manifest +++ b/net-analyzer/gnome-nettool/Manifest @@ -1,3 +1,3 @@ DIST gnome-nettool-3.8.1.tar.xz 589024 BLAKE2B f12c43b713ae81a2460b12c150e2c52baf98900b14ce0ff188b3fb1a55aa636391fb62d9c20b40d3a60ff322d4af9744d072c2727a77bced056ef0df042e21cf SHA512 c1c90fa727ebbf21442c4d0f5f4e98acf91fdd68a476f5f378167f92c3d7938ef33598525b62b838dc9b485abeb40171bdffb0fe3cb060fd3982db013a30bbed -EBUILD gnome-nettool-3.8.1.ebuild 947 BLAKE2B 6b5d2140df3b0a92bd8a9038765c162d2ad14c9c9bbacc5ff52d99b2fb864242114d54c0d7f4e091360d1b2b50decadb79dea977ba1ecf4e1e3fdc2ce232519e SHA512 4412117a893483897a242ba4e685b474df2def9251599e96d8efbec82acc37086a20341dca7ddf9e60951ec47925d005df4816f0febdadb809def57cca4611ba +EBUILD gnome-nettool-3.8.1.ebuild 940 BLAKE2B 1037c242a494b93139fbc02882afbbbec4be72114e1161d12b4c671ffeb5f20a6b7361debc6433355c4cc908a45e4d8283a231760c359be47daa473128409800 SHA512 2e5f353adc80f7476957498846faae8db5c36732d5f2039a8ba453b0072d70e67699feeb9909255096f93a3cf2f1d32e5a27b23c878c8efa87be0971fe452f27 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild index 9d215a641c88..2505084a7f4d 100644 --- a/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild +++ b/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" GCONF_DEBUG="yes" -inherit eutils gnome2 +inherit gnome2 DESCRIPTION="Graphical front-ends to various networking command-line" HOMEPAGE="https://git.gnome.org/browse/gnome-nettool/" diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest index e3b48a9e4de9..45cc7cd29434 100644 --- a/net-analyzer/greenbone-security-assistant/Manifest +++ b/net-analyzer/greenbone-security-assistant/Manifest @@ -11,6 +11,6 @@ DIST greenbone-security-assistant-20.8.1-node_modules.tar.gz 56048261 BLAKE2B fe DIST greenbone-security-assistant-20.8.1.tar.gz 2136158 BLAKE2B 769b9fc10879f866bc6c17cecf35a33d1a8813fbfacac16f1a97f1f58f1545c4e3997880642e5306b782c74c5515a11f527d31526ae4224d037a6c5e06fb0241 SHA512 85a96d59317bedfbe748b02b71fcf5f931f049d1ca688e3d4e87e701f14cd39ec4320621689f3a9f6b91fc1cf4e25c422df4d9b4675a7bcfed330b431b64d3ef DIST greenbone-security-assistant-9.0.1-node_modules.tar.gz 44176347 BLAKE2B c8d1195ddc8167ff7a228a4e013c6139524e8527310c65529d37de8fe5e984379ba783e10544caf81ac801ceb1199ad7249c96a0e6032ade8a519068e6cefb42 SHA512 1718f97d330f7868afe34bf172699b8aa8ce795dc2e4a6f20b28135434623a68022c36310e381bd55bacbb621fd9bf5c8595c8030f5d3dc32bb427cc2febd028 DIST greenbone-security-assistant-9.0.1.tar.gz 1936391 BLAKE2B 22b9020a97e79b31555d66826740ca49d1eba5d55324f0e80349dc571a7b45bcf2c6403ac311e78f742c51900921f3e61ef0740f11fd794069242e2ab21b1c3e SHA512 688bde97722f31416406e43230253c05dc8d05eb9fea6d8fd084ec4e748b67bab238f78cc11534e4fc948d911e468d43b5be0b224f17959db5e59faae7f5d086 -EBUILD greenbone-security-assistant-20.8.1.ebuild 3092 BLAKE2B 386a7f034ce9d4399c7d8b58b34aedd859ce80575149c1a0bc87385f05771a2b3d40b13a09e7af458cf50746a2bf34457507fd2f24414fe7268d8fbc8324ed18 SHA512 826b94ed14454072d1dbfa826ea8a0dbde30f92ae8bb3c3c349135ec532fc1a96e76655d12eb3def52295fdebfebb28c4d0ddca63d91866f30769837089f9b24 -EBUILD greenbone-security-assistant-9.0.1.ebuild 3168 BLAKE2B ff7eccf999d89c8894579050728f999ab60d6e94e1f976d597652dba151b7f2129143349952386f8fb323e744afea4cd931755561e2722d44194e643d6545d36 SHA512 b78193863dc3e290b6a29cc0a429ec6bec13f3224a3b53e81e2b8deedf923b92fe075c19ad36bc51950123984ef489df99e54249435c6e0c77b5653c3ed9a9bd +EBUILD greenbone-security-assistant-20.8.1.ebuild 3084 BLAKE2B 11fd553ecaacf73c2612999c49763fa66a5df0bc4943fc9151fc51de8289a64c4c2fbd966b16acec1a36ce4dd0ef85a0863e9e2b21e65e1843d03c8ae5a5d230 SHA512 6f3c64a6d00a9d98c29a9f35daa795d1da0a2f30d232db1720e58a16c2c4a79ae26ee6860949ae49f48810dfadc0437b23b01693ea1bc2bd2d6e6ebf0e2cb6da +EBUILD greenbone-security-assistant-9.0.1.ebuild 3160 BLAKE2B ff923bda01467e784e190bf88997fae7c5f401aa0b1d4795db1e77e47bed1e6b3dd9ec80b024903c3f65b6c3c6e99638540288125e27703c7d15bb7d828b13b8 SHA512 5f658b2cbfb545585f67b4fb5e27e5538c882dc6a6f2b5fbfacd7cdd3cb4d5ea3a621e3955cf44622a70809d130a08d8ceb1096df06a73497d73bb5f277cf524 MISC metadata.xml 983 BLAKE2B 64406a37c0938a62b929cbedf6c16425dd999633cbf8a068afac38fa48de7e6cc05a5dcd03371c57c6f5c5a46c7de266c1e815fd97494bd8bf25ac3820904956 SHA512 c10b98354c2e9015086df0abd3961b006709104dee4f6f6eff682bc1ef4fdaabd35e8e8cb9454e966111c867bbc88a08dca0993545bd18cac02e4113b5225307 diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-20.8.1.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-20.8.1.ebuild index 2d64966d2e09..a513fc165a4f 100644 --- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-20.8.1.ebuild +++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-20.8.1.ebuild @@ -4,7 +4,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic systemd toolchain-funcs +inherit cmake systemd toolchain-funcs MY_PN="gsa" MY_DN="gsad" @@ -37,7 +37,7 @@ RDEPEND=" BDEPEND=" dev-python/polib - >=net-libs/nodejs-8.12.0 + >=net-libs/nodejs-10.0.0[ssl] >=sys-apps/yarn-1.15.2 virtual/pkgconfig extras? ( diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.1.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.1.ebuild index a0621ef26527..9bb270be4e3f 100644 --- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.1.ebuild +++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.1.ebuild @@ -4,7 +4,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic systemd toolchain-funcs +inherit cmake systemd toolchain-funcs MY_PN="gsa" MY_DN="gsad" @@ -35,7 +35,7 @@ RDEPEND=" BDEPEND=" dev-python/polib - >=net-libs/nodejs-8.12.0 + >=net-libs/nodejs-8.12.0[ssl] >=sys-apps/yarn-1.15.2 virtual/pkgconfig extras? ( diff --git a/net-analyzer/gvm-libs/Manifest b/net-analyzer/gvm-libs/Manifest index 837f87c0a932..bb86b2464657 100644 --- a/net-analyzer/gvm-libs/Manifest +++ b/net-analyzer/gvm-libs/Manifest @@ -4,6 +4,6 @@ DIST gvm-libs-10.0.1.tar.gz 198483 BLAKE2B 4f4ddc7a3a1b4d45a51868cf03844365a9c4d DIST gvm-libs-11.0.1.tar.gz 213553 BLAKE2B b7c8ffeca8682fcfe68afe0992632fac18a01fc9b0016fcbaf27c0340b5150337784caac2368a22789073714808ce2c0471efde668e6911dcd0cfceaf862b671 SHA512 159acbe8e24f172398a6396988b87676a214fa15c2985e67845dcad1ebcb92ba5e2a19cee2994dc7cd0cac706992e81e8c6a793e99216aaac87a91c1c72c9a46 DIST gvm-libs-20.8.1.tar.gz 267872 BLAKE2B ec0979bba5e88692375fcdcdbd1c1b47c2d93e1d1c911884b77e0d81028bd6b587dac5f8aaae7439cbd1f594ec3c5708510bc2e356cadaefee221a11a1982efa SHA512 846b062b849688019715cbff1d6c4f6a1b4dd8c58cfdef78ea08df3cd104810e9091385cca3c49618538a28c42c0fe78a38fb934fbde604aef86e84c4f2dda94 EBUILD gvm-libs-10.0.1.ebuild 2274 BLAKE2B 59cf5e18a5a5cdb0fbcfed7ef8772abf9c33e86e1051c12dd3450993e6a4778967197e8bffdeaf7fdb8d4928bdb112889c7f7265cead065dea656e41113ca507 SHA512 0896c4be88d76dd7a08bfd79a5c5b185035779238545c8f0cdbb3ef207b8d537e0c086cba25c6c6a048696bdcb28d4c5362f3b312240c600ade1708436315428 -EBUILD gvm-libs-11.0.1.ebuild 2025 BLAKE2B 5dd6df6ecd1ae6bc3440c79af86a9adcd44c24bee7b1fccb560ae1ef0bde0f0c2bb432b3d6d370b02105e292df901681bc29f740444969fee3f27f9152b97622 SHA512 04d2a392e9f7e684838c7ae0a5159a62378c444559d64ad210b6c124891f991b8fb6af2d4f3f95f79450a807d76f8754c98942a2f8f1577b6ede08f051f487cd -EBUILD gvm-libs-20.8.1.ebuild 2499 BLAKE2B 77f6cb8b90ad5e90d0a190667cba78e6828e35c13d0ef5aef7b1580cf983e046a9eb018c5911afd1264b7d928b98ad28173c8db371517f7171e3c74013765b37 SHA512 c2f86b4d2e78f138f85b7fcebfae32511c2a2fcdd5d1fb799f95b81c748c313d02a4f56ab44aa05f714e958501e10464c2a0271d57c3ec6b8db7e72c24e2a251 +EBUILD gvm-libs-11.0.1.ebuild 2012 BLAKE2B f06bd1453f0331ed32404ea69a07187cffa26ebdc1a0a4844ef9a0b9ee9dff237356968062a343ab25e531fc0b4265835cac43f8038881f00f7eeb4e66ddcf79 SHA512 761366c5a35346856af9d4afee8d3899581c4e47662d8a7321cd207cc989e42eb424f8817adbdc2dadb760e9f596d532af7cbc3c3ac4701483eb5624b6eafa91 +EBUILD gvm-libs-20.8.1.ebuild 2486 BLAKE2B 19d767651ba4a0f250fd317847b75f52581c15bf0ac60c6e7bce425893a353b54e5b26143444aac480d89c0131e2eb44a8e048a29badb6aa54a4992870ad8c22 SHA512 56c1c38c7cf5be19ea672904c5351958d701e652fd20ba8ab2425520b25531653e3423a009af39392532110c8c8c0a65539ffd1bf2948bbfb05e264620cc18da MISC metadata.xml 812 BLAKE2B 2af4a17e02930d1cf034a60b0300366e8a5ad2948a5c9627b644f543560254a99b52b9153f0a7cb2ae2a93e8f1d0462579778ff822b414ebea787e24683a0498 SHA512 d5a3accce742736336dd7af6722cb093ab58218bedb0cc8d244269234eef330a5f87bd42759298e57139b5796a648227d7c21ae517282d508d00832d2365269c diff --git a/net-analyzer/gvm-libs/gvm-libs-11.0.1.ebuild b/net-analyzer/gvm-libs/gvm-libs-11.0.1.ebuild index be84a74a2762..07801678f816 100644 --- a/net-analyzer/gvm-libs/gvm-libs-11.0.1.ebuild +++ b/net-analyzer/gvm-libs/gvm-libs-11.0.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic toolchain-funcs +inherit cmake toolchain-funcs DESCRIPTION="Greenbone vulnerability management libraries, previously named openvas-libraries" HOMEPAGE="https://www.greenbone.net/en/" diff --git a/net-analyzer/gvm-libs/gvm-libs-20.8.1.ebuild b/net-analyzer/gvm-libs/gvm-libs-20.8.1.ebuild index abe25f2f9180..fed39cbb5ac0 100644 --- a/net-analyzer/gvm-libs/gvm-libs-20.8.1.ebuild +++ b/net-analyzer/gvm-libs/gvm-libs-20.8.1.ebuild @@ -4,7 +4,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic toolchain-funcs +inherit cmake toolchain-funcs DESCRIPTION="Greenbone vulnerability management libraries, previously named openvas-libraries" HOMEPAGE="https://www.greenbone.net/en/ https://github.com/greenbone/gvm-libs/" diff --git a/net-analyzer/gvm/Manifest b/net-analyzer/gvm/Manifest index 84d40ab0bbaa..58b8da4e4846 100644 --- a/net-analyzer/gvm/Manifest +++ b/net-analyzer/gvm/Manifest @@ -1,4 +1,4 @@ -EBUILD gvm-10.0.1.ebuild 1222 BLAKE2B 49236ebc5f656b95cd549cf8c15b01cd8bce729c3fbafe8adbbcb58ef6e24645c6a746dbea267b0514e5519300cd5433c0f6743ef222ad94bb8f7e428528d8f3 SHA512 383ddfaf9af2d4df7f4751b466299a8c25ba204ce96ec11f5436ff1e7ab34190f63a7809849cc0cb8e17f5d77177cd9c0250494108c1030776c38eb94a69bb3c -EBUILD gvm-11.0.0.ebuild 1222 BLAKE2B da5b755c260012f0001a1fca72b83bfb394f7fef5189efed3e46ea1fcd414f32ebadc33f2773781aab4fc5c7c18a7c7448ceb03f4ca15b641a93db922d24362c SHA512 bb53a87e9b1b6f8fe3e28113a2ae24070cceab6a86356a55a89c5bec47e4513dfaccda094ff4d157b9030b82b6a4a20604fc9c934fddb519c6401adbef8f3bc9 -EBUILD gvm-20.8.0.ebuild 1160 BLAKE2B 0f9eafb66c7e4a179e751f156282707d2f23ebea2ee404c9e2dbaf27105e4e9cc6f38aee146261384cc3c301b3c581b8f6486b0cffde8e6d805b10c549b4cdfc SHA512 19c052377bb1bdf14ca210a045da2a887f75ce2ee129bf4199dde6b3f5f602534abc6eaa640cc488c167422adb181f6706080b1a86dc74f5372c8654aec99d26 +EBUILD gvm-10.0.1.ebuild 1156 BLAKE2B 9179e6920cb3512dd5366a08e0d0e7f24732f1d9187640bcc17b9cc8d030fdb2fda318b763cad98bff5b3d6c5fda919b93d7fa207bcf389c38482c3ed886fd15 SHA512 90201123905ab3893582998d3c3124f2448bbfd84e82f7f398d9144ce2f8e39b4d24a7d4942cd71edf9c9206e31248c71eaf7fad114f46c58065839b0a2911b0 +EBUILD gvm-11.0.0.ebuild 1156 BLAKE2B 1355b40d167cce89e872467872564decb9f38b680fcfaf530f4979d55918df0b5c1d0a149ca72e87fae2dccb3cbc42781077efba78679879a46ccad4bc94a196 SHA512 101bd5d7e01a371de0b8406094203f92a627b0c02c2d047a83fd4be3c9af0ed402de9304801890fcea555c0cb1f0ca95f21ce46082b8c778af57cf1dc6e7aad4 +EBUILD gvm-20.8.0.ebuild 1094 BLAKE2B 02d3d065343df60a838497de5bd68dc57a5a0e9c4e22ae189169e2eedc3f7e38f0122d30948619a34a2792f3431987ebc34fc7a249eac7532f7aeb42251ad463 SHA512 be8b7c12f3f29fabf98ea36fab3086111ebc7ff03e13d23c908c647a521a0fb6b8d71b42417cf501a75ad59c7d2c6a320c573c7cf1231a8f0e9f0926f54bd787 MISC metadata.xml 1200 BLAKE2B 4773a833f5e00f25615c7cd169a79368299f1583a3d363c37d2b4255382945016fb7927c29e63e5c92049a342841a6d3be4524542dab8a391b566d26387c9da3 SHA512 965cb0f141434702e7f3cfd385bf3270437fa36d13de473c8229094dd7ee049f2d75186e9ff41811932f9ba4ffb3883a603f18abf584b9055813a43983054b8c diff --git a/net-analyzer/gvm/gvm-10.0.1.ebuild b/net-analyzer/gvm/gvm-10.0.1.ebuild index a72c4460164f..4587ac214cf7 100644 --- a/net-analyzer/gvm/gvm-10.0.1.ebuild +++ b/net-analyzer/gvm/gvm-10.0.1.ebuild @@ -22,12 +22,11 @@ RDEPEND=" ospd? ( >=net-analyzer/ospd-2.0.0[extras?] )" pkg_postinst() { - elog "Additional support for extra checks can be get from" - optfeature "Web server scanning and testing tool" net-analyzer/nikto - optfeature "Portscanner" net-analyzer/nmap + optfeature "web server scanning and testing tool" net-analyzer/nikto + optfeature "port scanner" net-analyzer/nmap optfeature "IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan - optfeature "Application protocol detection tool" net-analyzer/amap - optfeature "ovaldi (OVAL) — an OVAL Interpreter" app-forensics/ovaldi + optfeature "application protocol detection tool" net-analyzer/amap + optfeature "OVALdi — an OVAL Interpreter" app-forensics/ovaldi optfeature "Linux-kernel-based portscanner" net-analyzer/portbunny - optfeature "Web application attack and audit framework" net-analyzer/w3af + optfeature "web application attack and audit framework" net-analyzer/w3af } diff --git a/net-analyzer/gvm/gvm-11.0.0.ebuild b/net-analyzer/gvm/gvm-11.0.0.ebuild index 01f284b6ef8a..d8f63107e62a 100644 --- a/net-analyzer/gvm/gvm-11.0.0.ebuild +++ b/net-analyzer/gvm/gvm-11.0.0.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 @@ -22,12 +22,11 @@ RDEPEND=" ospd? ( >=net-analyzer/ospd-2.0.0[extras?] )" pkg_postinst() { - elog "Additional support for extra checks can be get from" - optfeature "Web server scanning and testing tool" net-analyzer/nikto - optfeature "Portscanner" net-analyzer/nmap + optfeature "web server scanning and testing tool" net-analyzer/nikto + optfeature "port scanner" net-analyzer/nmap optfeature "IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan - optfeature "Application protocol detection tool" net-analyzer/amap - optfeature "ovaldi (OVAL) — an OVAL Interpreter" app-forensics/ovaldi + optfeature "application protocol detection tool" net-analyzer/amap + optfeature "OVALdi — an OVAL Interpreter" app-forensics/ovaldi optfeature "Linux-kernel-based portscanner" net-analyzer/portbunny - optfeature "Web application attack and audit framework" net-analyzer/w3af + optfeature "web application attack and audit framework" net-analyzer/w3af } diff --git a/net-analyzer/gvm/gvm-20.8.0.ebuild b/net-analyzer/gvm/gvm-20.8.0.ebuild index 7685fdffc1bc..d0b25e297509 100644 --- a/net-analyzer/gvm/gvm-20.8.0.ebuild +++ b/net-analyzer/gvm/gvm-20.8.0.ebuild @@ -22,11 +22,10 @@ RDEPEND=" ospd? ( >=net-analyzer/ospd-20.8.0[extras?] )" pkg_postinst() { - elog "Additional support for extra checks can be get from" - optfeature "Web server scanning and testing tool" net-analyzer/nikto - optfeature "Portscanner" net-analyzer/nmap + optfeature "web server scanning and testing tool" net-analyzer/nikto + optfeature "port scanner" net-analyzer/nmap optfeature "IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan - optfeature "ovaldi (OVAL) — an OVAL Interpreter" app-forensics/ovaldi + optfeature "OVALdi — an OVAL Interpreter" app-forensics/ovaldi optfeature "Linux-kernel-based portscanner" net-analyzer/portbunny - optfeature "Web application attack and audit framework" net-analyzer/w3af + optfeature "web application attack and audit framework" net-analyzer/w3af } diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest index e4cd18d7b8da..d742a659cf99 100644 --- a/net-analyzer/gvmd/Manifest +++ b/net-analyzer/gvmd/Manifest @@ -10,6 +10,6 @@ AUX gvmd.service 505 BLAKE2B 32736b0f8f45b87e1e2c6f578d6f6b891b3642dab3bba6c5665 DIST gvm-report-formats-0.1.tar.gz 58962 BLAKE2B 45cb5a7b81b68524254947503921f871577b86c2d7696758b365205b5ed8e4516840f704d3bcb8da6925a536db8e01fb9f0d922a3a2233dd4d4fa21e4308dc1b SHA512 8ae128ca087b7d1ecd2b84cb43e67b8f920001699268b9ce70d1f703f1dac68d8905354f5a8203808982291fdeb80fb11569a0bb559df0263296c603c691b422 DIST gvmd-20.8.1.tar.gz 1024660 BLAKE2B c2981d73efe4bb32008c82ba9a017f58ade18efe00d85c1876a872ae9c6260e801697ef7c7bc9c0862e92043167ecd58d082b97c746308d983ffac7991146d83 SHA512 e946be6c67970fdb0e4e6fbb2ac9445576c280c3ac7503ff42aac2c079e817ee587a37477956917b576bafab3e7caa281da5befa6502b044562051ae976889b2 DIST gvmd-9.0.1.tar.gz 1446748 BLAKE2B 7b7b4e8e4224e7a24964f39157bd0535fb4e6405b2813da7c827f4705c4b5df4d953783a3e21950c9196aa5878a09ce6eec7b4d906cc13730e508b0aa5d4be61 SHA512 4c4f0e1fdd2255be1a96967d61d9066d8860aecc5959f04c559b1a248bcc54d9cb75facd0156e223d674f038718f1e8ba0ee6b36cdc8ed88efe480acd1aa54cf -EBUILD gvmd-20.8.1.ebuild 2961 BLAKE2B bc840350137799e9a354281894af488e7d8813cd58ae7ac59eab3dfbea44a7a0b80d2dfcebb5e2b692aab0724c4345ab06f711027a35579bf564fb9b96bd641c SHA512 b87173563562809b6c9e9619876799e1dc9e71a16fa819a5d77d8dd4062993ed800659bc1fced54fe8c83f6fcf2a58b87877bd000da5d5a555559b9f750d7e67 -EBUILD gvmd-9.0.1.ebuild 2741 BLAKE2B 92c859474ada5794afa51de3c7f99fb4ff22644e92eb1c95c6315d10fa0769c84a88f6a86250eee1fdfda9850600a4e63e8a5f3c405ea3e434fb5499c2ca8a10 SHA512 cfbf7baa4098723dacadba15f57edeb67209bd3256840d9feac0791f62eafbbc592ceab993da75ca8866c972476a9746ced13a6b17ba7f33a839d24a7478ab43 +EBUILD gvmd-20.8.1.ebuild 2948 BLAKE2B b3f1fba8a6a363a1535d4cd1228ed325582c4586fc0c2924a334283a310ce4251ac2af783828ccd26458ee4ce647be791ca548c1df02577770c6e85efbec7332 SHA512 5d5773687743bd112eb701eb1a83f5c89c71263864854cb5be9cd428be006499a8a313c8aeafdccfd4c21675e3d5fa137aae60332577e1ca026cbdfb8ea343a7 +EBUILD gvmd-9.0.1.ebuild 2732 BLAKE2B 9b683384b52b0fee3660bf8866c469cadac0e013911059aae9cb433d15336ab58befeb8f78083bde539ad6ea48d80ed0e43e9d9338e8b527086d4eaf91ca7b79 SHA512 61c3718c93745689322236e4570b0ea1c1bb6cd40a6f7c17d433d0534d0406a3c2a7f01325e08f4a6ba7af6a6e427faf913d65cd03dfa76903921dca788576fd MISC metadata.xml 1073 BLAKE2B 7f2ab5c71762e48fa92cdd15a009961d5302d44a3b39f5e936b1b2eb190141d3136b617c451c2ccaf028813a85db0aa21470546de44e37709f0e21b6cbd28361 SHA512 3b980f843d6e8ea1472b951334a6bf528eb077e718d9a75ed7a07d6857754686611f088f001a77d6b7e5bed3e28fd670dc50f47d3b6c62baa477a80ba6777b67 diff --git a/net-analyzer/gvmd/gvmd-20.8.1.ebuild b/net-analyzer/gvmd/gvmd-20.8.1.ebuild index 545dc420d400..87213ec32152 100644 --- a/net-analyzer/gvmd/gvmd-20.8.1.ebuild +++ b/net-analyzer/gvmd/gvmd-20.8.1.ebuild @@ -4,7 +4,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic systemd toolchain-funcs +inherit cmake systemd toolchain-funcs DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager" HOMEPAGE="https://www.greenbone.net/en/ https://github.com/greenbone/gvmd/" diff --git a/net-analyzer/gvmd/gvmd-9.0.1.ebuild b/net-analyzer/gvmd/gvmd-9.0.1.ebuild index 6ea48c70cccb..2e848ce6b59a 100644 --- a/net-analyzer/gvmd/gvmd-9.0.1.ebuild +++ b/net-analyzer/gvmd/gvmd-9.0.1.ebuild @@ -4,7 +4,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic systemd toolchain-funcs +inherit cmake systemd toolchain-funcs DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager" HOMEPAGE="https://www.greenbone.net/en/" @@ -51,8 +51,8 @@ PATCHES=( src_prepare() { cmake_src_prepare # QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0 - sed -i -e "s*share/doc/gvm/html/*share/doc/gvmd-${PV}/html/*g" "$S"/doc/CMakeLists.txt || die - sed -i -e "s*/doc/gvm/*/doc/gvmd-${PV}/*g" "$S"/CMakeLists.txt || die + sed -i -e "s*share/doc/gvm/html/*share/doc/gvmd-${PV}/html/*g" "${S}"/doc/CMakeLists.txt || die + sed -i -e "s*/doc/gvm/*/doc/gvmd-${PV}/*g" "${S}"/CMakeLists.txt || die # QA-Fix | Remove !CLANG Doxygen warnings for 9.0.0 if use extras; then if ! tc-is-clang; then diff --git a/net-analyzer/ifstatus/Manifest b/net-analyzer/ifstatus/Manifest index 111b114f7cc3..1d766ec1611d 100644 --- a/net-analyzer/ifstatus/Manifest +++ b/net-analyzer/ifstatus/Manifest @@ -4,6 +4,6 @@ AUX ifstatus-1.1.0-tinfo.patch 472 BLAKE2B 180f38fbeb7c820db4e25204e60719eb66acd AUX ifstatus-2.0.0-tinfo.patch 191 BLAKE2B 3294763f55f0219c9f19d317b931470aaa15b2463f3acf309475d88a4d30d2fe88839d3f41e250a80dc45c5c37022be2edd31b0e82db3c64bcc2e7b626408846 SHA512 febc844be240323844fc0b7f29b4c00ef4c0cfb29b50cad8501be05271d21733529f1725b0e5980f2c973663f9953e242b4f6bd4bb567d9a13701f0c7cca30ea DIST ifstatus-v1.1.0.tar.gz 25233 BLAKE2B de9d088bf7001799c3a54775c0c63d5dcf4f1f3f4998ce02b82a11bea7a6dabb1263829ff42ba1cd05ebd6b202827196757727c24db022ffa7d06ece38db6616 SHA512 2660310be7186067315414218e3d3d269499e391c7ffa12022ac53a0456ddbe0f7d5562b788fe6b2569b7d0eba7acf5699e0386769a91606a3e14b51239a2766 DIST ifstatus-v2.0.0.tar.gz 24058 BLAKE2B 09a2b0af26cb05dfc24eefdbb6ac52b0ac289a687301f5fa67f0fcaf2622da96e149af3f7c08257e0ef8418f4f08b5ca1b77af71ba7c00dabddcb87cc95ddce7 SHA512 e1720f5dcc26788149cc72ccb72b85fffc72b367f2268e1e4f06a8fe4d80685146d310746c0b1a913e24995f6e93011d7d75ea5b4f9ca479af2d79264b89e27d -EBUILD ifstatus-1.1.0-r2.ebuild 928 BLAKE2B 9646aaa3eeb56fa383563286a786142efeb0381552423eb4916671c6cc00d87fde4ea45427c70a484951ab2cce17b07d229d5ed4e6eedff375b325ecc1a5dabc SHA512 20882c2ebe3e23bedb9ba8ebcc83d5c37be9d9940fe3c51d71fe5f9041f3b6b56e44764134bbb76c696d682bf156a9e923c8dd3854ba4a5b4b1e45a5a1921a7b -EBUILD ifstatus-2.0.0.ebuild 891 BLAKE2B c4e496921cbc02785583c4925b480216239fc3009dca26f921da2fd0ce2fa8ae9a0c5220594fd6cf3aa66bafa28cb04cb138bbc0ad6907eb2437e43754d51ff5 SHA512 66dca0c1d8fc07ba210d0be1e648ca550cef24d89b1b56186ba2ddcc4c335902e2c94848c966acf1f122357d3d6857f6a0fa338d6b8cdeeb5af8d2815105614b +EBUILD ifstatus-1.1.0-r2.ebuild 923 BLAKE2B 94fbf50de6b256cf4752b7aa589004d8b2f740e0f7a6b0c9809a7368a129fd3015bb0430a448787f2ffb01e77ba6402e9d4ecdee5263bc3b832cbecb7c582007 SHA512 f83e52bf3eeebbd30b7a50dd7b88d0c659bce4515d93481ec9349c03fe251a7a209a7ee9d5839e08bbeb807d47309de324189cc2aa684c483c8247ef62204ce4 +EBUILD ifstatus-2.0.0.ebuild 897 BLAKE2B 54a12fd4efefd2a57b95b813e7fd781b549b71fb54109afd11b675a1995b7ef7a815cfe1c83e3ac4aaa44fb7f5a63d488215332b269e43d34ca48812e9e55c2a SHA512 ffdb8ca33899b719854ce7aac7ede18d140713fa3d2337850d893b1513af2723dee4bdc81c77bc185892f484d345750d1c8ce9b9d4885b8d98b746536eb1453d MISC metadata.xml 358 BLAKE2B e6d48885bc56f4b4057509378e2f84fe2468c417805bcaca14686a250420762c76bd3a656612019d5784a65df12e85b4dbaf89265d9b91d9455190d234f28813 SHA512 b23a7f0e009c71d86cd145b033b4bc7f77e7a316f048d8236e9bb2bf9cd34671ec24af37b11ef934791c6f046e1a761087c7f5e570bac80b09e30862e162d005 diff --git a/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild b/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild index 10f512067d0b..986b1e4ad565 100644 --- a/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild +++ b/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild @@ -1,29 +1,27 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils toolchain-funcs +EAPI=7 -KEYWORDS="amd64 arm ~ppc x86" +inherit toolchain-funcs DESCRIPTION="A simple CLI program for displaying network statistics in real time" HOMEPAGE="http://ifstatus.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${PN}-v${PV}.tar.gz" +S="${WORKDIR}/${PN}" + LICENSE="GPL-2" SLOT="0" +KEYWORDS="amd64 arm ~ppc x86" RDEPEND=">=sys-libs/ncurses-4.2:0=" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -S="${WORKDIR}/${PN}" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}/${P}-gcc43.patch" - "${FILESDIR}/${P}-tinfo.patch" - "${FILESDIR}/${P}-gcc6.patch" + "${FILESDIR}"/${P}-gcc43.patch + "${FILESDIR}"/${P}-tinfo.patch + "${FILESDIR}"/${P}-gcc6.patch ) src_prepare() { @@ -37,8 +35,8 @@ src_install() { } pkg_postinst() { - elog "You may want to configure ~/.ifstatus/ifstatus.cfg" - elog "before running ifstatus. For example, you may add" - elog "Interfaces = eth0 there. Read the README file for" - elog "more information." + elog "You may want to configure ~/.ifstatus/ifstatus.cfg" + elog "before running ifstatus. For example, you may add" + elog "Interfaces = eth0 there. Read the README file for" + elog "more information." } diff --git a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild index 0b58e01792d6..400d6a60c000 100644 --- a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild +++ b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild @@ -2,31 +2,29 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit toolchain-funcs -KEYWORDS="amd64 ~arm ~ppc x86" +inherit toolchain-funcs DESCRIPTION="A simple CLI program for displaying network statistics in real time" HOMEPAGE="http://ifstatus.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${PN}-v${PV}.tar.gz" +S="${WORKDIR}/${PN}-v${PV}" + LICENSE="GPL-2" SLOT="0" +KEYWORDS="amd64 arm ~ppc x86" + +RDEPEND=">=sys-libs/ncurses-4.2:0=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -RDEPEND=" - >=sys-libs/ncurses-4.2:0= -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" PATCHES=( "${FILESDIR}"/${PN}-2.0.0-tinfo.patch ) -S="${WORKDIR}/${PN}-v${PV}" src_compile() { tc-export CXX PKG_CONFIG - emake GCC=$(tc-getCXX) ${PN} + emake GCC="$(tc-getCXX)" ${PN} } src_install() { @@ -35,8 +33,8 @@ src_install() { } pkg_postinst() { - elog "You may want to configure ~/.ifstatus/ifstatus.cfg" - elog "before running ifstatus. For example, you may add" - elog "Interfaces = eth0 there. Read the README file for" - elog "more information." + elog "You may want to configure ~/.ifstatus/ifstatus.cfg" + elog "before running ifstatus. For example, you may add" + elog "Interfaces = eth0 there. Read the README file for" + elog "more information." } diff --git a/net-analyzer/ipcad/Manifest b/net-analyzer/ipcad/Manifest index 44258992ace8..17a226b051b6 100644 --- a/net-analyzer/ipcad/Manifest +++ b/net-analyzer/ipcad/Manifest @@ -4,5 +4,5 @@ AUX ipcad-3.7.3-signal_h.patch 480 BLAKE2B 01aaca726279c0b16da451cfb880e27a2569a AUX ipcad.conf.d 320 BLAKE2B a2a71e5ac427cc9b37521c3369f48197f6d08ce1ef23f8f96f38906e015f9bb50e689e9ff259d2a1e35335dd4e885d1e11beafff6c2aef60ad7eafb1b45949a5 SHA512 bfe0c3b988cbe1442c5637728ef2f51e58cb8f8d6752a94eb9ce42ec1ba4a1ed7129c65e11971ab227901a91e23872eb38ee47ff1bb539b04948d91d227a8944 AUX ipcad.init 818 BLAKE2B 22a4c75a552f148bc0ffffbf2c8d4cef2a07259fadafa8d9c7b7ac83ed40873c4b9e0b3a74234860685991b0e99e8c4dde750d36b0ae37d217ae0b93bb3186d1 SHA512 638c527ea723cd1cbadf24dcafe84803575251ee465b8e0cdf4a3a8e76302190694f75153ef33086fdf47a17be335d136b9fc38dc962fbeb143c784d1e2caa3a DIST ipcad-3.7.3.tar.gz 172457 BLAKE2B 900f71fae715b4a18ae9d4f0aacc2eaf2cf08f727460c6a1d3baf0d3622f19c042387272a7e943ec08933ad79a05f426d21496e32e42322ae6f16558b9c3a2a2 SHA512 a25a2551bd88727c20f969b780e09d2776bf1fe4f684b0a7a6e571bb7b5684743ade0571b7993849b65c58def4550aa88bcb52a91d5cc6c21e562627fb3b80b6 -EBUILD ipcad-3.7.3.ebuild 1136 BLAKE2B 9e031d945cec9efe4762928d7c89443a61bde60d88ac3a0753b469bf5b4dd394f0fb9ff412214aad8a50478a1f3c2fbce6947817a7c56cee807495b77fb32457 SHA512 0d158a37e82d8bf1061513c191ae19d34b076526ca8cae24aca62524c8649cd3bdf4c5027b88718a770a5a69d60476f02622dc5b938b9cc02de3b0f0b534d873 +EBUILD ipcad-3.7.3.ebuild 1134 BLAKE2B bbedfaba2eb1d2e65540fdab1da6053866621d8fb05d324a94ffa398101f7211cba46b3465fa0efdae48175c359b4ce77d48c3256d81e9be158a554491046a34 SHA512 21c43f8be9c5242a1a4c8b622db2d8681c408d31a7c86055853351359ff4e80e5ce6469dc6b1c79a365a2be7c8e11fb2d235d8f9d27ad6e7c92c1a04ea3330bd MISC metadata.xml 355 BLAKE2B 522527fee103703b4386cdcc8c191680d341d920f6f2001d47e29322fef09a3c778257a17bea8368e26ab8ca9380a286a8dce572211cbbb9465ed6d0c3e817b2 SHA512 265b51217a391504e299fd40b971ab964c740a88e49dd06c45ffca5378241eefc6dc3dfe3bb5561c2b8d7beebe75703a8375cf6cc0b3763487f3d33cca24ddf2 diff --git a/net-analyzer/ipcad/ipcad-3.7.3.ebuild b/net-analyzer/ipcad/ipcad-3.7.3.ebuild index e9723ab496af..bc87f905d363 100644 --- a/net-analyzer/ipcad/ipcad-3.7.3.ebuild +++ b/net-analyzer/ipcad/ipcad-3.7.3.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit autotools eutils + +inherit autotools epatch DESCRIPTION="IP Cisco Accounting Daemon" HOMEPAGE="https://sourceforge.net/projects/ipcad/ http://lionet.info/ipcad/" diff --git a/net-analyzer/ipguard/Manifest b/net-analyzer/ipguard/Manifest index 7d75b07717a6..d8f52164ccbe 100644 --- a/net-analyzer/ipguard/Manifest +++ b/net-analyzer/ipguard/Manifest @@ -4,5 +4,5 @@ AUX ipguard-1.04-init.d.patch 931 BLAKE2B e18d1a5d9058f34a47262c0033e9a93118ee9c AUX ipguard-1.04-runpath.patch 288 BLAKE2B 45658be6e0478b1d4e29f27f9b6e39999368202b985b2ebc9ff4fd20c71388974250f555b9c9790b985095190d12df13625b83200636cbb31c1f6de2d0acb353 SHA512 49b07785bbf188ed1fd522591f3ee1af7a4001bf9baffabe63de6a27738a365f79ffc268d039ae9567622c26898cc68ffee61cb8ecf31bddd207f69897ed5a7c AUX ipguard.confd 186 BLAKE2B cd3e58efb088134c2ff340360be06ab0f9159b14c766b159dcb546d0136ccd65807b7c33bb89d45565179ead01d43f8da29bfdb19dfe59ba5e0008dc81dc2e82 SHA512 efb47689d944ce77863b7cd1722bba974fbf573af2e1051c08166a535dd8284f2cc820a624531d1c60e099e6da06d59f3659ab52b4b3557f3e1f4bf5c572f58d DIST ipguard-1.04.tar.gz 24566 BLAKE2B c9d543e6f7886c3b6377fbfe95e91e2d786da6a92fe445c9500c8b7ea6fb859bf8550daf9c83de425494376d0ed7197158e5ff9499a97417793b439e82004326 SHA512 c29c3f594e09ad1c06ca7297f794ddfada48da7ec2b98786694cd6af7508cbff232889e0c90718d96519297870b93132b7b0f9f310a0e4d7a7c2d54a30ca893c -EBUILD ipguard-1.04-r1.ebuild 956 BLAKE2B 5a0e60ae2a7ffe1e483c9c946a52ad77034f894e658ed2e93f4f6196ec9170b352d9cbfdcf96e1dab97e857aa3de2e62277f52484ddea2d88329b3869ddfc45a SHA512 bdc54abe0e7304b68171f41de9a3dc401f4679873b867fdfba866c4d0cbfd149366eb98d96379ec23d706daf0eb48275ac8a418a5e58c1240b28b1975b6403c0 +EBUILD ipguard-1.04-r1.ebuild 983 BLAKE2B 1b8abdbecab8d800c8b5e2319e810ef85511ae6366ea4b8455c4e188b0ac4393809b53d9513fcae4233d830ec29b5290652ee3b5b241a09901afa045ca327731 SHA512 456df71355c7c8d5939558c3233dbaf3a4f7c1b033a49606cab825a8627c2f3f390ecb46b134eb31ecc0fd94ea499b87643f7cc1fc8221b01dd49f4d43153185 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/ipguard/ipguard-1.04-r1.ebuild b/net-analyzer/ipguard/ipguard-1.04-r1.ebuild index 73efd0b68720..cbd0d12934c6 100644 --- a/net-analyzer/ipguard/ipguard-1.04-r1.ebuild +++ b/net-analyzer/ipguard/ipguard-1.04-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit toolchain-funcs DESCRIPTION="Tool designed to protect LAN IP adress space by ARP spoofing" @@ -16,9 +17,9 @@ DEPEND=" net-libs/libnet:1.1 net-libs/libpcap " -RDEPEND=" - ${DEPEND} -" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-init.d.patch diff --git a/net-analyzer/iplog/Manifest b/net-analyzer/iplog/Manifest index 9e6d21f3f56e..97d7dcc672cb 100644 --- a/net-analyzer/iplog/Manifest +++ b/net-analyzer/iplog/Manifest @@ -1,5 +1,5 @@ AUX 2.2.3-DLT_LINUX_SSL.patch 7265 BLAKE2B a20edebe47d65d066b1b3e214d8365b4a5811a7be4f600028edc11fc4c17e48f8396c34335a855299da17534a52dc89c916c890ae50a147620988b5f3c6ca8d9 SHA512 de93d97688e1079e480c138abc1a25572c47f2e045f70c98b7ba2c2098bcfffdb36997aab0a4272cbe908bead503b2531543368ac35624527cb8c0640594ad4b AUX iplog.rc6 776 BLAKE2B fba34208b2d16ba508cc9c3592e21eb7f0a479a89bf4617320bd9627047024f0cadde7fef55304baf25f7ccc56836e899b71801141b1802facc8b885b9b121ad SHA512 f0c3965810f7005e1ae183a2f3ed66ba06c054fcfd78da6277eaa364518ebffb9f44a0c99200b0d3042a63d4c57141d5b29823e8bc1d3f030e00d8e913021a34 DIST iplog-2.2.3.tar.gz 133639 BLAKE2B f8108259f3f9b662297785988c40711d9d4ce6381377ed9a797f441c84fd1dcd9f0c3832e07ed9a660ddcc41bc52777136204274de873b72bce151327738ec2d SHA512 d7669e39b728af366b5199c58d396c6907496b4895ffb1ba0cba54fae0646f9792170f932de1eae9634b5ac356644a5d6d0ccaf7bc77a62641695992245c9aed -EBUILD iplog-2.2.3-r2.ebuild 710 BLAKE2B 5c867df9e41ff7c4c6b9014bbfd5a23eba291a2edefdf3150d10856a78b06e0b497ea4d85b04f7582bdd59e0c8eae90494d793f024c1cbe6ab1eab4869f27b6b SHA512 968447d044d796d131f6de89b3ae77fec5ffb8ff7f4d0da5471dc59679a35144dcd350dff18523b06fc7fb42cbd1fac96fecbc11e3985a2c5644371365f76a66 +EBUILD iplog-2.2.3-r2.ebuild 711 BLAKE2B d316c3319b05b81dc972e9bbfaa9b995de0d8efc184d4452ad9d88391f62a115db5f3ab9efee212dd2fd20d99f4fec7f41cfd14b03cfb455274dbe5bd9e2761a SHA512 bd905fd7a0a16565c57fc1e127756deef649c3b5ac8ff9f362bc305190070be9aab391db1bde97b4f7f8d5c8a9687d05aa611222d0bde46b1d992ded2022d106 MISC metadata.xml 354 BLAKE2B df8c5f493f148b6744299baaaa5aba3f014c69968c7db943873938efaee876b21c85049573a2c0371bb5c525d89e060256616c15d381876b1e9942b5d39b8577 SHA512 fd3b53459e130f0350e47e4e677afaa53773c45a22963c22cb61aa2fc14401867eeb07efb09ff17db75814aeb65dff8715719209d74706a0ec616ec817a3d648 diff --git a/net-analyzer/iplog/iplog-2.2.3-r2.ebuild b/net-analyzer/iplog/iplog-2.2.3-r2.ebuild index a21f01029226..c0be1311cc7b 100644 --- a/net-analyzer/iplog/iplog-2.2.3-r2.ebuild +++ b/net-analyzer/iplog/iplog-2.2.3-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils + +inherit epatch DESCRIPTION="iplog is a TCP/IP traffic logger" HOMEPAGE="http://ojnk.sourceforge.net/" diff --git a/net-analyzer/jnettop/Manifest b/net-analyzer/jnettop/Manifest index dceeb80e9bf4..1387fadc58d2 100644 --- a/net-analyzer/jnettop/Manifest +++ b/net-analyzer/jnettop/Manifest @@ -1,5 +1,5 @@ AUX jnettop-0.13.0-asneeded.patch 253 BLAKE2B 2d6275aaabcf5a305a4647025e462ca13d1ef022c826f450f0922c668b08dd278980ab5053b80c4ce12234e0f908c0381ebc497f33280168a41f23662bedc1de SHA512 68084c207c6154a86bb65913c523264ceb83e349d21de9ed7184aafaa21f63d9739154b69fd3f55023d89947ae70727dbdecd6dc8483854f1f2e5bc5565b52e7 AUX jnettop-0.13.0-tinfo.patch 375 BLAKE2B 9145af5175ce963f7ecb9a95b70ad315d0694de99e15694f68b6a594540c8bfbdaa5c055c3b9a76e8942374ffa2b053cc972a3aba999075affeb331d15cda55c SHA512 07f6ad5cf44648925d64277f2e74d4a70c1770d192a7b6e6f39c1fc3e28748de1e959cb95d841a9a3b0afee337bb1a8a6c342a698115c44ad76969cf6c095189 DIST jnettop-0.13.0.tar.gz 131009 BLAKE2B b787d6876199c56af5daeeda55cdd5145ed64268db9066dd2c64c96511ef7bd1c08eb826407d1e488cbd72172fdfc5a2aaaebf81203fb27d2b14c60c3cd3b2ca SHA512 304293cd011ce8556aabf69e91b2e831ac61aa43016bb5b616d24b45805315a815dfba37dfe9f7cd3c637931043d4123b2f46a7637ba1a0b9d30267fe6dcb051 -EBUILD jnettop-0.13.0-r1.ebuild 901 BLAKE2B 105f00421eddab9f20cc19af2da481a2c22b005539b4719681ee237cb5a82842e1aa051aeb64d4a99bf5276ea1e164754c70b8bdd05427e3a63cab195e5aa7a3 SHA512 04c74b3e1e7fbdf8a564bd5c7c76449b01da0cbe5354b93b241de2710498b22aedfeb5b83f4201d630ff75c3c29d32411f673421eb29fe10e7d027e53a7537ce +EBUILD jnettop-0.13.0-r1.ebuild 898 BLAKE2B 01c09975d941df1202a0c0df9146fe3eab3ad3028361f4da1f6a2da1c808f41dfd055e2ca78e80e5c57cf1147cbc0354fe095a14665efc138d3c58c0f8348fae SHA512 e7d7b8867f9871de71cec148b55da833a4318c1c0ad6020c706e0a79629a5dc6eebfd738449f16dbfc3962559f0732bd01872646f387008a5aa2974ce3a7dbc6 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild b/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild index e0c718000574..df4d41386c21 100644 --- a/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild +++ b/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit autotools eutils + +inherit autotools epatch DESCRIPTION="A top like console network traffic visualiser" HOMEPAGE="http://jnettop.kubs.info/" @@ -20,7 +21,6 @@ RDEPEND=" ncurses? ( sys-libs/ncurses ) syslog? ( virtual/logger ) " - DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/net-analyzer/knocker/Manifest b/net-analyzer/knocker/Manifest index 64200f3d734e..c7f6e2270a4d 100644 --- a/net-analyzer/knocker/Manifest +++ b/net-analyzer/knocker/Manifest @@ -6,5 +6,5 @@ AUX knocker-0.8.0-fency.patch 5847 BLAKE2B 29e630a560255f28fc0130639e50b30c5016c DIST knocker-0.7.1.tar.gz 72132 BLAKE2B a6eb8e37354df630481f809c77e98f1c9dab3290b8a34e1a3c7bbfc5f3d0f41b9a1f97a8f5a8afef7e1ec0c5afa444e908b8d50eeaedf08a384e86cda1c7b182 SHA512 e65d615235328c027e1c6179a11bee186fa3d173205850e8b9fac591819e344de770d968c2667f1a18bef88cf90422c357bf76b9d05a8915629977cb8e334cc2 DIST knocker-0.8.0.tar.gz 117380 BLAKE2B bb6b344efc0c7b22266b59430eff3b7982d328b54277085cef9709f9f41b7e6e40b1cc22944b36f927db00cd7f15afc1774be20df504e1f3f4eb2b2b1c293973 SHA512 127fde05f2f331e7a4489c4612852fe841f0981b737be1d871de33355a0b55f2ab50d2c083ef857420b4af81909d5cc8fbe6c89174e141f77e6bf25719b6bf47 EBUILD knocker-0.7.1-r3.ebuild 608 BLAKE2B 3175166968725797d46f00947f67485e616436527926cd9dc1bbee4a04795c9af92f6cc1389a11d2bc1cdc7cdc39d64dfe62328e4956824510750b48ec2278b5 SHA512 72e82125db8319e9bcf183502a77c36f4f0bee383154e92e256f10d96b1f2d4ad46d8b4dc41e8bc8ec382db97d85eab192c27f6c6eeacd191346916f6d9ca0d8 -EBUILD knocker-0.8.0.ebuild 560 BLAKE2B 7b5a04f022e206d50a1e6ee83c66e9386d54b91fa822ff03d87928373059a5d17f7141e7be0f0488d54dafb92a237495776da65596d175d96cf2ca29441af66f SHA512 62cc1204e0bfe4298d73a17060803afab0c87b568f1b812b394d559378a3f8549017da7220b3a4c9a2bfb3f5e3c3316528549b54585b093e9723d57d8da821f3 +EBUILD knocker-0.8.0.ebuild 557 BLAKE2B 8b6580607c57516c25cfa8fe4be0844a3a85ed4c1dc3db5d9b92a0a5a6e8c8adc647178c2e633934ef03bff5b840988612867877375c4ab5596c92513103b161 SHA512 4b71c05a073c6e8ccede04cf457a99977b74c7163432ceba755652cafd40ce933975709e8886618d4cf34c4546310130fd78e9a97f32fdbf4013f91ab2345cc8 MISC metadata.xml 411 BLAKE2B 29b26c42040690bf3cc36a84cc37bdaa8de46d819bd0e020ce6ebb73434773286a0033c7e30a8c9d1a8d92bd22fb04cc34ca521dc91b6894304faed4b268a324 SHA512 0cde314018cea789b41958eae169290fa3c50662df7c1c72593c4fe6f40f78d1cb27d6e539d4c58dd74ff13b6b51874a5ad767aff8f69f73e23af3f36dd7f2d5 diff --git a/net-analyzer/knocker/knocker-0.8.0.ebuild b/net-analyzer/knocker/knocker-0.8.0.ebuild index 5d60ddc49dcd..e321e9635e5d 100644 --- a/net-analyzer/knocker/knocker-0.8.0.ebuild +++ b/net-analyzer/knocker/knocker-0.8.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" PATCHES=( "${FILESDIR}"/${PN}-0.8.0-fency.patch diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest index 8a9e84ff1eae..d110d867129b 100644 --- a/net-analyzer/monitoring-plugins/Manifest +++ b/net-analyzer/monitoring-plugins/Manifest @@ -1,6 +1,6 @@ AUX define-own-mysql-port-constant.patch 3296 BLAKE2B 7a7c88c6f2c71bc1fc2f802ad202c2d2dbf3ede5af55dbe46cc15a064d37178b27670e30aa7bea07147456ce4d3e1ce9f495fa6df9deb4095367a7427e217719 SHA512 3ead6340800ac15fbe76e223599a5b3dbc6b6b13b72b684919aa43487838564ad7117b4e67fa7f36f0f58554fd8b8d6233efbcb82e6927a0c31f22c6a9ab5dbb DIST monitoring-plugins-2.2.tar.gz 2461548 BLAKE2B 0f68b492e089c6dfd09db6aab78ab4490f2e8983677c70dda4c3800a06380c066865587536a44f135d0e314006ed81a757cbfbd918f53e009f9d2c50b8e58db0 SHA512 5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27 DIST monitoring-plugins-2.3.tar.gz 2528556 BLAKE2B d8c8886aea900a172e5693de766edb6b7ef7aac5ee94fec1f5c14cb0e9873623b14a965cc8852abb4ed44934d5111a86e130e7c37201a03de42bc996797302de SHA512 926065667dff6c608ae5b7da39f6416bfc2443b9e1cdef68cd5d19be99da1b6fc6f23ef87b05731312b5d7ad76d01f0242fc9e544dbb4dd00dbafa0e27434d2e -EBUILD monitoring-plugins-2.2-r4.ebuild 3026 BLAKE2B 5dcedf383de5985195d90e1d01194dd3414bc05f54b98a058d45bee42dfbcb3238b66d079d968e3912ef203a636182b11ff21c5328fd80359d56ccac965908ce SHA512 664b07c16bc3aae7b76202b4e446633c0df1832306bc315fffcad2f830a7b001a6829d9457b9d9cccf3230e9f49921229f4167b6ae3a407e23052468d4b2445f -EBUILD monitoring-plugins-2.3.ebuild 3114 BLAKE2B 5d883fe08214a0bc3b41287b9c78f362d2e82c0938c9aff4c468e7eb78b237ee99b0bacd9ff99433c823bc7e964015984a0520267bc43c175715aa5d7583a26f SHA512 be04871537b6ded83dec3deae1dbd21381debdcdc35f9112ca25d9d58201a1443b8cbbce3851fd134d4c01e8347cd0f33a0fc76692724e0e546cf57c7981cb89 +EBUILD monitoring-plugins-2.2-r4.ebuild 3010 BLAKE2B b3b335f53fa2d166b3fade96fcadc4cb2bc515f7a0d8693ef6314412ccd3ef2b9b28f32f1b1840184aa9b0260354e99a9af0a4877852a49722ede6b128dc3392 SHA512 8ca6380b0eee919f9d426066d6851318d0030043d65941f1299f662b43e91d3603d07e149e819726f010fc331d052484b4d3c15102da439b8172d42c2eedb101 +EBUILD monitoring-plugins-2.3.ebuild 3098 BLAKE2B 8aaccf0878da17a633a6806b00b0da3d9e8cb44e5fdef246491c361a9e9251a641e8c0e1c931d0c58fa203ddb67ae27e4a9d064108a20b7ee335ede4f55c6596 SHA512 e7b2e6ba381e015a0119b1b5a78da131505208020cf223d90cc58b935842372ae1321f330d3436e212f0cab5347dccfa6196569bab78883dd1a23a095aad3924 MISC metadata.xml 1434 BLAKE2B 0d6304a4cc6f3d5b9ea268d7c6613f4613ac68ee1ae9d40079796716eb845ea97a1d8d6418d5dbaccdb7686754913f06dee8255ea12d91d3d8dc94e12fb55970 SHA512 0a9e64da453edddc864fc8b1c0fb13c63976f99968060a9ef2dc1d5e36b84dda9a79ac7dbe795401ef0680b35e397b08920a9a5ea4f861575bc61a76e89cde42 diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild index 405873b347c7..5396099961db 100644 --- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild +++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils flag-o-matic multilib user +inherit flag-o-matic user DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu" HOMEPAGE="https://www.monitoring-plugins.org/" diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild index b91919ddf889..42c658307a6e 100644 --- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild +++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit eutils flag-o-matic multilib +inherit flag-o-matic DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu" HOMEPAGE="https://www.monitoring-plugins.org/" diff --git a/net-analyzer/mping/Manifest b/net-analyzer/mping/Manifest index eaebb67a7f9b..4557dadcbbed 100644 --- a/net-analyzer/mping/Manifest +++ b/net-analyzer/mping/Manifest @@ -1,4 +1,4 @@ AUX mping-2.01-RFC3542.patch 1893 BLAKE2B a4645c29505129dbf29ce008ab66d6d53a4f6b3855f173facf5720b78d60e8a2e1c3d4922d994cd8bf753481beaa4d1bedee43a7f73458b5040ff758937ad58f SHA512 286126b7abf147a7dd216082a967349e5850c23995a9e0481b31ff29c1c27f6be5da7b61dbc50593a437d460e9a2d48852c3003091876757f4478c4ed1f2b8c9 DIST mping-2.01.tar.gz 159203 BLAKE2B 5bf284ccc098d9555ae2e5e2ec406031dfa193ae4d8724a9fff84a7d1e19609e744b18d9a4a5fcfb4b8a8a73e77c58df8cc363f117914a4c1ec28c8da3901034 SHA512 9e1c243013f74a69d3014c11503ad9ff9b8992dcb3eb252a85a1958e8d63dadeab79b6937b76ddce9cc0d22c50a19ec90d40a68d3efc303c48a631f316f5b167 -EBUILD mping-2.01.ebuild 430 BLAKE2B 4e5464d0070fae47e63f959a214512be366b4b1ca5d84c8c49fe693e98056abfc850d512226aef5392666a24a3d4d38d8c3f760a992461c6488caf101deeef77 SHA512 4cde24296e6f288bba6ce24c049fdd2303deeef010104be92d0ec919ad72de0ebc2c835118811827d4190f4635c8107dae1b8c4251fa91de87874e589a482437 +EBUILD mping-2.01.ebuild 354 BLAKE2B 71b134d172145a46d44689a9b2d806199f043bf418f25fb5620870a635efea578224e7c910f924109d56b799e34ac740953017d289b67c83bc1735f9274168b8 SHA512 e18c985489d5a151fde1944e0143825431d87e70da74f109bdd8e0f14826ce1d9c142b8d77569d87bbdad7af86d68012ff7b7e8cbcc00ebfdb4ed7dd3f26c448 MISC metadata.xml 651 BLAKE2B e9ce28c88c200facd0ae996f06c9c9778dbb1be960f24e553ff00e12a11457185427390f022690a1162f88d7bdb04b3d5efb7e5f21ecc76b5ab4a74b96eaf848 SHA512 7b9161a3fd66ce7aec220e57186f20b2085d4771784bfc26837695335440fecc9f1c2555404ff6d1b2f7ce3a49adec2b0925cd2b68ed2fa47cdc8d6b87b59271 diff --git a/net-analyzer/mping/mping-2.01.ebuild b/net-analyzer/mping/mping-2.01.ebuild index 3133eb907421..7a8b952a08c5 100644 --- a/net-analyzer/mping/mping-2.01.ebuild +++ b/net-analyzer/mping/mping-2.01.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=7 DESCRIPTION="IPv4/6 round-robin multiping client" HOMEPAGE="http://mping.uninett.no" @@ -12,8 +11,6 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ppc64 sparc x86" -DOCS=( AUTHORS ChangeLog NEWS README TODO ) - -src_prepare() { - epatch "${FILESDIR}"/${P}-RFC3542.patch -} +PATCHES=( + "${FILESDIR}"/${P}-RFC3542.patch +) diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest index 0466c71e1245..b82c0bd4de36 100644 --- a/net-analyzer/mrtg/Manifest +++ b/net-analyzer/mrtg/Manifest @@ -2,5 +2,5 @@ AUX mrtg-2.17.4-socket6.patch 481 BLAKE2B 2294221471be6b9db0a5676a3f819684b0bdac AUX mrtg.confd 402 BLAKE2B 8a06370eeb0b31e435eb93be8e625a8ba151278462576c0f3f600747cef9f043b66c4f5142900f515a12dd1c38a7fe27f04dcdc832d050e980ee08ccb6e7739f SHA512 18066805d2fea3090a3165a15f963310a94b4e4ee5e9fa88617eb246b1a1a4e91e3faabe4f4a2fe2ebd8f7a69acae82f1b51e3830bdab04da64f03d84c2e7e7c AUX mrtg.rc 1275 BLAKE2B 180e9070e8648e05ff02b24a642c9e4f1b22d3a952385ab58c70411c1ed2fde4bef3f9ae61b35808049a1451d82822f7bfc2e3c222a3689dabafcd83a49ee00c SHA512 bcf5d95130e2e8ec4df9b3d97e99e2a36e65ed41b23ca8b249e3507e61ac0945945a0576e80efae9efaca9deca4d1a64ead95e05c285fd62fb0ea914864b6d51 DIST mrtg-2.17.7.tar.gz 1098650 BLAKE2B f8191296fc163b950792b8ecee773cfe643a7390d49444ce8b5012b2dbd932093cb4f71745ba2c86bda579fbcd3c73a4f9cebc1fa4e7f791a7b4461ae92ac191 SHA512 b25ab38416213bc5128612724530f36f4a855bb66a65f8bbe4bdafef05d2688eed68f5c3df1e13193102507a4114e71ec226ad32dd6b4d3ae2e2291320d8e768 -EBUILD mrtg-2.17.7.ebuild 1016 BLAKE2B 2097931fe97d50d9fc4acbe205dc5f2628a2c41a8b36d90ca592fab019844edc75c09723129f691b5a68e281c3cefa326460fdcc57d6d4372481a484e8cadf70 SHA512 4cfef68802b76230010c8624ee8e5bbd2490b6bfacb0b4b518639ec6293faf12b6a16a1f96a64fa1987c7ae743488e7a163d210b6e717171f10488d4847ed9c6 +EBUILD mrtg-2.17.7.ebuild 1000 BLAKE2B eb96514a135aa3f18b71031ce515dfdfa940c0e0119fe85e6b270ea8eae246b1c6bed9ccd96fadc6109e08c57e1d51618291425a71fc7e0af8c264e49794cb42 SHA512 0d0b189cb3be46b6bbb849d9aa7708848f33f38b9a6ca51140313526a9d79334dbddd3f5d7b58faec726f317e615eade15fe3e59debc3e42b638b6d35468be07 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/mrtg/mrtg-2.17.7.ebuild b/net-analyzer/mrtg/mrtg-2.17.7.ebuild index 0f9883018fc0..e63814c2ef96 100644 --- a/net-analyzer/mrtg/mrtg-2.17.7.ebuild +++ b/net-analyzer/mrtg/mrtg-2.17.7.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit multilib DESCRIPTION="A tool to monitor the traffic load on network-links" HOMEPAGE="https://oss.oetiker.ch/mrtg/" @@ -23,6 +22,7 @@ RDEPEND=" ${DEPEND} selinux? ( sec-policy/selinux-mrtg ) " + PATCHES=( "${FILESDIR}"/${PN}-2.17.4-socket6.patch ) diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest index 2ffa3a20230c..3383fa35e58a 100644 --- a/net-analyzer/munin/Manifest +++ b/net-analyzer/munin/Manifest @@ -19,5 +19,6 @@ DIST munin-2.0.67-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051 DIST munin-2.0.67.tar.gz 2258670 BLAKE2B 374b336403433d612b7998c77e6eb4f0eb68ffda4204ae6bc3c303f7667154c2ce606ffa27226c5644f3e6f71655c939b749da925136f59be4762891af49e2b1 SHA512 a8381491dfa15572438d9acda7a09feb0c3918ebe49e7bcfce5c172b36b4a5a0472bd6d06f5fad41270af0510b3fe115509d146f372df7fa47ed4aa1ec5f95d4 EBUILD munin-2.0.59.ebuild 12267 BLAKE2B d4fb2b1f62a4c1a3d1d69fa61e841c17ad6716fa824df49352ad2e5c5ddc39a035c828830302cd6414750c72e2b52198a76efd936d2300dd76529dc2994054ce SHA512 c306d35fe98c0dd9668068fcad1830cf1c5fd45839187b0a91cde40f075a7a042a737e4cc53cdbb27da5049f52021a63cb925040f5b2e54f91155811f7413252 EBUILD munin-2.0.66.ebuild 12267 BLAKE2B 05ee840753229d97e2b1d5914191950bece83b6575cffa2a7ee50de4dfc3a16f892d8f660288315faccc570166e58fd391795a90fa3aa24531a5fd13752636e1 SHA512 b5ad10e6752dce09b925e05d42db944b5a8f25820b9fbfbfd0272b053539f2b70655ffaf745395f920f5d601ab65d1c0efeb27a3dc353f60b3d8c617f5949b2b +EBUILD munin-2.0.67-r1.ebuild 12272 BLAKE2B 34a9bc056f46378c2da463caddff1f9ac778f93fa323d0245277a77e1873a4339bc8e1263af9346c3bbf6207349b6515bd0fa6d2a50a1ac6ab0e24b29ec275ec SHA512 486c73f7d3662d436ceedea9a4bd4c2e9cfd04c2c8914534bfba30db15c0c72103e2ea9df01ce4c93e2c9cbdc668e173ec958c1eb7af9e4b85e0b50497127e3a EBUILD munin-2.0.67.ebuild 12270 BLAKE2B a74e5cf89c8d8b313470d50ae2f291752d9bce83cb0be6342b0284387cc1d4b6eb35434d381f7a699df0468f4dadfc7626604b5fbebd60ed2d8da6baa225574b SHA512 a415f74e29caa56bf07a85d0c7886963bfcced603a05664d86e9af5a24b123e3242d048ad9f3f88b4d760a2da7cdfaa0f0ccffc844b337f6ee2a96a8c5c02437 MISC metadata.xml 3920 BLAKE2B cb28e1a3e95ffcc305975d7edc26a5cf852a2a29f8c56376c9bbc90fd2b2850bfeb614d750e7700870aa0c10c8dcfcd2b845c210a5518f591ccfbb7571971cda SHA512 9d12c61750f5ee42cfcb6672facf3b46a024872d918c7acb26631c1b9bab29802a6ac9f4d895b9f4ef18a6f283ad64d4bd6e313df0489a6ed82185c660c42083 diff --git a/net-analyzer/munin/munin-2.0.67-r1.ebuild b/net-analyzer/munin/munin-2.0.67-r1.ebuild new file mode 100644 index 000000000000..8c12a08f9e6a --- /dev/null +++ b/net-analyzer/munin/munin-2.0.67-r1.ebuild @@ -0,0 +1,417 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PATCHSET=1 + +inherit java-pkg-opt-2 systemd + +MY_P=${P/_/-} + +DESCRIPTION="Munin Server Monitoring Tool" +HOMEPAGE="http://munin-monitoring.org/" +SRC_URI=" + https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2" +REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )" +RESTRICT="!test? ( test )" + +# Upstream's listing of required modules is NOT correct! +# Some of the postgres plugins use DBD::Pg, while others call psql directly. +# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly. +# We replace the original ipmi plugins with the freeipmi_ plugin which at least works. +DEPEND_COM=" + acct-user/munin + acct-user/munin-async + acct-group/munin + dev-lang/perl:=[berkdb] + dev-perl/DBI + dev-perl/Date-Manip + dev-perl/File-Copy-Recursive + dev-perl/List-MoreUtils + dev-perl/Log-Log4perl + dev-perl/Net-CIDR + dev-perl/Net-DNS + dev-perl/Net-Netmask + dev-perl/Net-SNMP + dev-perl/Net-Server[ipv6(-)?] + virtual/perl-Digest-MD5 + virtual/perl-Getopt-Long + virtual/perl-MIME-Base64 + virtual/perl-Storable + virtual/perl-Text-Balanced + virtual/perl-Time-HiRes + apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) + asterisk? ( dev-perl/Net-Telnet ) + cgi? ( + dev-perl/FCGI + dev-perl/CGI-Fast + ) + dhcpd? ( + >=net-misc/dhcp-3[server] + dev-perl/Net-IP + dev-perl/HTTP-Date + ) + doc? ( dev-python/sphinx ) + http? ( dev-perl/libwww-perl ) + irc? ( dev-perl/Net-IRC ) + ldap? ( dev-perl/perl-ldap ) + kernel_linux? ( sys-process/procps ) + memcached? ( dev-perl/Cache-Memcached ) + mysql? ( + virtual/mysql + dev-perl/Cache-Cache + dev-perl/DBD-mysql + ) + postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) + ssl? ( dev-perl/Net-SSLeay ) + syslog? ( virtual/perl-Sys-Syslog ) + !minimal? ( + dev-perl/HTML-Template + dev-perl/IO-Socket-INET6 + dev-perl/URI + >=net-analyzer/rrdtool-1.3[graph,perl] + virtual/ssh + ) + " + +# Keep this seperate, as previous versions have had other deps here +DEPEND="${DEPEND_COM} + dev-perl/Module-Build + java? ( >=virtual/jdk-1.8 ) + test? ( + dev-perl/Test-Deep + dev-perl/Test-Exception + dev-perl/Test-LongString + dev-perl/Test-Differences + dev-perl/Test-MockModule + dev-perl/Test-MockObject + dev-perl/File-Slurp + dev-perl/IO-stringy + dev-perl/IO-Socket-INET6 + )" +RDEPEND="${DEPEND_COM} + virtual/awk + ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) + java? ( + >=virtual/jre-1.8:* + || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) + ) + !minimal? ( + virtual/cron + media-fonts/dejavu + ) + selinux? ( sec-policy/selinux-munin )" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + echo ${PV} > RELEASE || die + + eapply "${WORKDIR}"/patches/*.patch + + eapply_user + + java-pkg-opt-2_src_prepare +} + +src_configure() { + local cgidir='$(DESTDIR)/usr/libexec/munin/cgi' + use cgi || cgidir="${T}/useless/cgi-bin" + + local cgiuser=$(usex apache2 apache munin) + + cat >> "${S}"/Makefile.config <<- EOF + PREFIX=\$(DESTDIR)/usr + CONFDIR=\$(DESTDIR)/etc/munin + DOCDIR=${T}/useless/doc + MANDIR=\$(PREFIX)/share/man + LIBDIR=\$(PREFIX)/libexec/munin + HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin + CGIDIR=${cgidir} + CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi + CGIUSER=${cgiuser} + DBDIR=\$(DESTDIR)/var/lib/munin + DBDIRNODE=\$(DESTDIR)/var/lib/munin-node + SPOOLDIR=\$(DESTDIR)/var/spool/munin-async + LOGDIR=\$(DESTDIR)/var/log/munin + PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2) + JCVALID=$(usex java yes no) + STATEDIR=\$(DESTDIR)/run/munin + EOF +} + +# parallel make and install need to be fixed before, and I haven't +# gotten around to do so yet. +src_compile() { + emake -j1 + use doc && emake -C doc html +} + +src_test() { + if [[ ${EUID} == 0 ]]; then + eerror "You cannot run tests as root." + eerror "Please enable FEATURES=userpriv before proceeding." + return 1 + fi + + local testtargets="test-common test-node test-plugins" + use minimal || testtargets+=" test-master" + + LC_ALL=C emake -j1 ${testtargets} +} + +src_install() { + local dirs=" + /var/log/munin + /var/lib/munin/plugin-state + /var/lib/munin-node/plugin-state + /var/www/localhost/htdocs/munin + /etc/munin/plugin-conf.d + /etc/munin/plugins" + use minimal || dirs+=" /etc/munin/munin-conf.d/" + + keepdir ${dirs} + fowners munin:munin ${dirs} + + # parallel install doesn't work and it's also pointless to have this + # run in parallel for now (because it uses internal loops). + emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install) + + # we remove /run from the install, as it's not the package's to deal + # with. + rm -rf "${D}"/run || die + + # remove the plugins for non-Gentoo package managers; use -f so that + # it doesn't fail when installing on non-Linux platforms. + rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die + + insinto /etc/munin/plugin-conf.d/ + newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node + + newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node + newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node + + newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd + + dodir /usr/lib/tmpfiles.d + cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF + d /run/munin 0700 munin munin - - + EOF + + systemd_dounit "${FILESDIR}"/munin-async.service + systemd_dounit "${FILESDIR}"/munin-graph.{service,socket} + systemd_dounit "${FILESDIR}"/munin-html.{service,socket} + systemd_dounit "${FILESDIR}"/munin-node.service + + cat >> "${T}"/munin.env <<- EOF + CONFIG_PROTECT=/var/spool/munin-async/.ssh + EOF + newenvd "${T}"/munin.env 50munin + + dodoc README ChangeLog INSTALL + if use doc; then + cd "${S}"/doc/_build/html || die + docinto html + dodoc -r * + cd "${S}" || die + fi + + dodir /etc/logrotate.d/ + sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \ + "${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin + + dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_ + + if use syslog; then + sed -i -e '/log_file/s| .*| Sys::Syslog|' \ + "${D}"/etc/munin/munin-node.conf || die + fi + + # Use a simpler pid file to avoid trouble with /run in tmpfs. The + # munin-node service is ran as user root, and only later drops + # privileges. + sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \ + "${D}"/etc/munin/munin-node.conf || die + + keepdir /var/spool/munin-async/.ssh + touch "${D}"/var/spool/munin-async/.ssh/authorized_keys + fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}} + fperms 0750 /var/spool/munin-async{,/.ssh} + fperms 0600 /var/spool/munin-async/.ssh/authorized_keys + + if use minimal; then + # This requires the presence of munin-update, which is part of + # the non-minimal install... + rm "${D}"/usr/libexec/munin/plugins/munin_stats + else + # remove font files so that we don't have to keep them around + rm "${D}"/usr/libexec/${PN}/*.ttf || die + + if use cgi; then + sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die + + keepdir /var/cache/munin-cgi + touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log + fowners $(usex apache2 apache munin) \ + /var/cache/munin-cgi \ + /var/log/munin/munin-cgi-{graph,html}.log + + if use apache2; then + insinto /etc/apache2/vhosts.d + newins "${FILESDIR}"/munin.apache.include munin.include + newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include + fi + else + sed \ + -e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \ + -i "${D}"/etc/munin/munin.conf || die + fi + + keepdir /var/lib/munin/.ssh + cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF + IdentityFile /var/lib/munin/.ssh/id_ecdsa + IdentityFile /var/lib/munin/.ssh/id_rsa + EOF + + fowners munin:munin /var/lib/munin/.ssh/{,config} + fperms go-rwx /var/lib/munin/.ssh/{,config} + + dodir /usr/share/${PN} + cat >> "${D}"/usr/share/${PN}/crontab <<- EOF + # Force the shell to bash + SHELL=/bin/bash + # Mail reports to root@, not munin@ + MAILTO=root + + # This runs the munin task every 5 minutes. + */5 * * * * /usr/bin/munin-cron + + # Alternatively, this route works differently + # Update once a minute (for busy sites) + #*/1 * * * * /usr/libexec/munin/munin-update + ## Check for limit excess every 2 minutes + #*/2 * * * * /usr/libexec/munin/munin-limits + ## Update graphs every 5 minutes + #*/5 * * * * nice /usr/libexec/munin/munin-graph + ## Update HTML pages every 15 minutes + #*/15 * * * * nice /usr/libexec/munin/munin-html + EOF + + cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF + # Mail reports to root@, not munin@, only execute one at a time + !mailto(root),serial(true) + + # This runs the munin task every 5 minutes. + @ 5 /usr/bin/munin-cron + + # Alternatively, this route works differently + # Update once a minute (for busy sites) + #@ 1 /usr/libexec/munin/munin-update + ## Check for limit excess every 2 minutes + #@ 2 /usr/libexec/munin/munin-limits + ## Update graphs every 5 minutes + #@ 5 nice /usr/libexec/munin/munin-graph + ## Update HTML pages every 15 minutes + #@ 15 nice /usr/libexec/munin/munin-html + EOF + + # remove .htaccess file + find "${D}" -name .htaccess -delete || die + fi +} + +pkg_config() { + if use minimal; then + einfo "Nothing to do." + return 0 + fi + + einfo "Press enter to install the default crontab for the munin master" + einfo "installation from /usr/share/${PN}/f?crontab" + einfo "If you have a large site, you may wish to customize it." + read + + ebegin "Setting up cron ..." + if has_version sys-process/fcron; then + fcrontab - -u munin < /usr/share/${PN}/fcrontab + else + # dcron is very fussy about syntax + # the following is the only form that works in BOTH dcron and vixie-cron + crontab - -u munin < /usr/share/${PN}/crontab + fi + eend $? + + einfo "Press enter to set up the SSH keys used for SSH transport" + read + + # generate one rsa (for legacy) and one ecdsa (for new systems) + ssh-keygen -t rsa \ + -f /var/lib/munin/.ssh/id_rsa -N '' \ + -C "created by portage for ${CATEGORY}/${PN}" || die + ssh-keygen -t ecdsa \ + -f /var/lib/munin/.ssh/id_ecdsa -N '' \ + -C "created by portage for ${CATEGORY}/${PN}" || die + chown -R munin:munin /var/lib/munin/.ssh || die + chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die + + einfo "Your public keys are available in " + einfo " /var/lib/munin/.ssh/id_rsa.pub" + einfo " /var/lib/munin/.ssh/id_ecdsa.pub" + einfo "and follows for convenience" + echo + cat /var/lib/munin/.ssh/id_*.pub +} + +pkg_postinst() { + elog "Please follow the munin documentation to set up the plugins you" + elog "need, afterwards start munin-node." + elog "" + elog "To make use of munin-async, make sure to set up the corresponding" + elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys" + elog "" + if ! use minimal; then + elog "Please run" + elog " emerge --config net-analyzer/munin" + elog "to automatically configure munin's cronjobs as well as generate" + elog "passwordless SSH keys to be used with munin-async." + fi + elog "" + elog "Further information about setting up Munin in Gentoo can be found" + elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin" + + if use cgi; then + chown $(usex apache2 apache munin) \ + "${ROOT}"/var/cache/munin-cgi \ + "${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log + + if use apache2; then + elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include" + elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual" + elog "host you want it to be served." + elog "If you want to enable CGI-based HTML as well, you have to add to" + elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI." + else + elog "Effective CGI support has just been added in 2.0.7-r6." + elog "Documentation on how to use it is still sparse." + fi + fi + + # we create this here as we don't want Portage to check /run + # symlinks but we still need this to be present before the reboot. + if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then + mkdir "${ROOT}"/run/munin + chown munin:munin "${ROOT}"/run/munin + chmod 0700 "${ROOT}"/run/munin + fi +} diff --git a/net-analyzer/nagios-check_fail2ban/Manifest b/net-analyzer/nagios-check_fail2ban/Manifest index db52206879bf..549be6d9a3b7 100644 --- a/net-analyzer/nagios-check_fail2ban/Manifest +++ b/net-analyzer/nagios-check_fail2ban/Manifest @@ -1,3 +1,3 @@ DIST nagios-check_fail2ban-3.tar.gz 1848 BLAKE2B 61c1683bfa1e41ea27caa58ce9491d531751d96c4646e1d618a0f92bef2fe65b31c1d4bcebfe9c9c0b2498f7ad810d4dcabaf723e34bbde7e229020789e7b538 SHA512 a032042f8588575ef70c6644c5d385a18b25b89d71b067cdfe78230e5e53c2fb5bf88de1d97aa9411bfec00b213f6e1eae800e9545f0d8d4bad4e3c878927f9c -EBUILD nagios-check_fail2ban-3.ebuild 759 BLAKE2B 33842011f49d4c57cbd90e1c7b9585eaf07344f49900db8696d8d581cd12f6862a7bfcee63fd2bf2b6a925d8a686289c361dfb1b3d5c5019fc87113f7a6a4a68 SHA512 82cb01b657824528a0e865277288d317fd93fbc566f76261a83b5d3e4214ea50e2387a0a316d2d0f085f203f5873897c0e480c2102b283ac011e330dc7c4b9c3 +EBUILD nagios-check_fail2ban-3.ebuild 747 BLAKE2B 8a8ea10deac2cbba35b8fd15efe64ebdc74b822741ccf774e8139dde9c55eefd10c6cc95d59dbd7792b30658d291c3019bdf85dab2a7ebd6a56118d9834885aa SHA512 9e070837c248bfcade1d1f5dc42e7981c6c7ff3b4b6f9b5f1595ff2bbb867f95aab52cfe91fdcee477ed47345bb0d66e5f4db8fbea3c59519ceb493a42388ae6 MISC metadata.xml 256 BLAKE2B aeb7a81a8cee936011354768ad49dede2e8005ad3b0f8d67868a91d9d38a26507b5bb1f822aa77da2fbc2bba8d55df7115585579eef07926fdf162ff4e2bb6f1 SHA512 5bfc0e0335cd942fe93eabf7ed1102c34a82e76a05bcf7662aa35fbdaf92f5667f445c9706833615160b237357f28524af886bc387a032b30286ae74834250bd diff --git a/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-3.ebuild b/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-3.ebuild index ac86c2830797..42376a9fbab7 100644 --- a/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-3.ebuild +++ b/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit multilib autotools +inherit autotools GITHUB_AUTHOR="hollow" GITHUB_PROJECT="check_fail2ban" @@ -12,18 +12,17 @@ GITHUB_COMMIT="c554837" DESCRIPTION="A nagios plugin for checking the fail2ban daemon" HOMEPAGE="https://github.com/hollow/check_fail2ban" SRC_URI="https://nodeload.github.com/${GITHUB_AUTHOR}/${GITHUB_PROJECT}/tarball/v${PV} -> ${P}.tar.gz" +S="${WORKDIR}"/${GITHUB_AUTHOR}-${GITHUB_PROJECT}-${GITHUB_COMMIT} LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND="|| ( >=net-analyzer/nagios-plugins-1.4.13-r1 >=net-analyzer/monitoring-plugins-2 )" RDEPEND="${DEPEND}" -S="${WORKDIR}"/${GITHUB_AUTHOR}-${GITHUB_PROJECT}-${GITHUB_COMMIT} - src_prepare() { + default eautoreconf } diff --git a/net-analyzer/nagios-plugin-check_raid/Manifest b/net-analyzer/nagios-plugin-check_raid/Manifest index 8c225a01e149..dfe6080173d9 100644 --- a/net-analyzer/nagios-plugin-check_raid/Manifest +++ b/net-analyzer/nagios-plugin-check_raid/Manifest @@ -1,5 +1,5 @@ DIST nagios-plugin-check_raid-4.0.10.tar.gz 54895 BLAKE2B 6432624de419fca2d376362e5d13031272b6feeccdc6202b8a7eec92ab1f6c362ab88f9c912b10695c34347388dd154b12757a8b4268d30c0436589da060d5cc SHA512 1b8c353fbd0dff6fea5311c4149af16b1e1a5778794ef0085dcd8ee18f196579cca0b9f8c1ecef51f3ee36665aec6069f64ebe4d2e565bf7223bed59f2de5ee1 DIST nagios-plugin-check_raid-4.0.8.tar.gz 53803 BLAKE2B debc312ccf688c6ed4c4d89d77efbf454ae030260741277f1f10966d28348a317255a69a932ceba69300c37b98448ebb3ca3a0b463d64814a4ca11043bdc5850 SHA512 237cbe798aa6c65b4bd6b9c9e24923e172d3d62c50afd7df23e2b6c8888041368025860edf5f826a77c6858e6312bba05225f0e20787e1bb579d833950b324ee -EBUILD nagios-plugin-check_raid-4.0.10.ebuild 2094 BLAKE2B 838d73ed7925b12d587d1204547b7226bca49f9c1325878752bab420b31db6f518ad1fe30aba9e6b759f8ceea12d1240949e5f965fad7b10a19e74afc24a1158 SHA512 eff99686a02e649eee731dc311bc3ba6ab0ea0c6424ea221fdd1863a87600ffc7c397df194f9018c6befe81adefcfbe31b87d81c411cb9b6b4fbc3ebd8b27ef4 -EBUILD nagios-plugin-check_raid-4.0.8.ebuild 2094 BLAKE2B 838d73ed7925b12d587d1204547b7226bca49f9c1325878752bab420b31db6f518ad1fe30aba9e6b759f8ceea12d1240949e5f965fad7b10a19e74afc24a1158 SHA512 eff99686a02e649eee731dc311bc3ba6ab0ea0c6424ea221fdd1863a87600ffc7c397df194f9018c6befe81adefcfbe31b87d81c411cb9b6b4fbc3ebd8b27ef4 +EBUILD nagios-plugin-check_raid-4.0.10-r1.ebuild 2113 BLAKE2B 0bf596a1978d34cddea5449116c67b9e1bd9203e76c334822291ba03e43eac07c5183367ec5e73d3a5fa8202cf41d37130958485bed0817b2748c24bbd70279b SHA512 4304baf949bf1b87ee9ae3cb277bb93dab06f21673f5926a01656f34e4eec94a3df5818c6865942feae0dbba1ebb4a89034ad1878e02cd276686106336342726 +EBUILD nagios-plugin-check_raid-4.0.8-r1.ebuild 2113 BLAKE2B 0bf596a1978d34cddea5449116c67b9e1bd9203e76c334822291ba03e43eac07c5183367ec5e73d3a5fa8202cf41d37130958485bed0817b2748c24bbd70279b SHA512 4304baf949bf1b87ee9ae3cb277bb93dab06f21673f5926a01656f34e4eec94a3df5818c6865942feae0dbba1ebb4a89034ad1878e02cd276686106336342726 MISC metadata.xml 1134 BLAKE2B aca2fafdfea4d29d99185b09c4e701d6aacd8871d65ef50ea9b9eb4cc9c1c76c9bd70703307bfe1926816bb77319dcc28cf899333fe75a892e32e24467dded20 SHA512 d0bacddb2750f5da8a274d7d44669cfa83152419499fbf89f7abf1505d1f54249531967ec5cb2f95233fea3bf13dd61e276e9dfc4457ce290e86c6f9f6e07681 diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r1.ebuild index 26049ac2dfbc..eaf055e9fadc 100644 --- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10.ebuild +++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r1.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils perl-module +inherit perl-module DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status" HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid" #COMMIT="" -MY_PV="${COMMIT:-$PV}" +MY_PV="${COMMIT:-${PV}}" MY_P="${PN}-${MY_PV}" SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" @@ -31,22 +31,22 @@ RDEPEND="${DEPEND} megaraid-scsi? ( sys-block/megarc ) mpt-sas2? ( sys-block/sas2ircu ) mpt? ( sys-block/mpt-status ) - " +" S="${WORKDIR}/${MY_P}" src_prepare() { # Upstream has a custom Makefile that is meant to build bundles. - mv -f Makefile Makefile.upstream - sed -i '/CPANfile/d' Makefile.PL + #mv -f Makefile Makefile.upstream || die + sed -i '/CPANfile/d' Makefile.PL || die default } src_install() { default plugindir="/usr/$(get_libdir)/nagios/plugins" - dodir "$plugindir" - mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}" + dodir "${plugindir}" + mv -f "${ED}"/usr/bin/check_raid.pl "${ED}"/"${plugindir}" || die dodoc README.md CHANGELOG.md CONTRIBUTING.md check_raid.cfg } diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8-r1.ebuild index 26049ac2dfbc..eaf055e9fadc 100644 --- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8.ebuild +++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8-r1.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils perl-module +inherit perl-module DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status" HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid" #COMMIT="" -MY_PV="${COMMIT:-$PV}" +MY_PV="${COMMIT:-${PV}}" MY_P="${PN}-${MY_PV}" SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" @@ -31,22 +31,22 @@ RDEPEND="${DEPEND} megaraid-scsi? ( sys-block/megarc ) mpt-sas2? ( sys-block/sas2ircu ) mpt? ( sys-block/mpt-status ) - " +" S="${WORKDIR}/${MY_P}" src_prepare() { # Upstream has a custom Makefile that is meant to build bundles. - mv -f Makefile Makefile.upstream - sed -i '/CPANfile/d' Makefile.PL + #mv -f Makefile Makefile.upstream || die + sed -i '/CPANfile/d' Makefile.PL || die default } src_install() { default plugindir="/usr/$(get_libdir)/nagios/plugins" - dodir "$plugindir" - mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}" + dodir "${plugindir}" + mv -f "${ED}"/usr/bin/check_raid.pl "${ED}"/"${plugindir}" || die dodoc README.md CHANGELOG.md CONTRIBUTING.md check_raid.cfg } diff --git a/net-analyzer/nagircbot/Manifest b/net-analyzer/nagircbot/Manifest index c9ba93b22794..9171e4e7c96d 100644 --- a/net-analyzer/nagircbot/Manifest +++ b/net-analyzer/nagircbot/Manifest @@ -1,5 +1,5 @@ AUX conf 125 BLAKE2B 9577a1460d92434f7ed46654557b3113ae5b592b89285e0af3cc18708cf961e6ade4633750ddff9272c31afd8f46f9c3cf71b234bc51e7f13dfb460b23d52808 SHA512 4bcf5127e8c8b8b23fc1268ee67f2bfe1f803f9ca552fd8f74dd41c2ebfdaa5f1445a51cb2c56df4f1b83059e94277ea25993dc2496266ac763b0ea30da951fc AUX init 435 BLAKE2B 8815caebe680209174eb693b968a44b0c376fa839db65da21bff89d67ebf38fcd6f8a8ec3a0232733feda99800cea3f4e0d574bd5d756c9b8e6c62ff1c4e4867 SHA512 5fb4711b20a85811be2932e961a5192f5f6a13311c3299c45d125bb7d7aa9fa564488085408e4ee3c4d01c7051d8ac693b1ac9555164cb635dba1562f47f1930 DIST nagircbot-0.0.33.tgz 20085 BLAKE2B d419d1a7bcad1164c74490db4fb8a66ccbb0c9fbc761fe2807fe12d74d05297af3f307f9686971f246c9308a1f9e02c879f4461c116c68f4f403bf59c3836f63 SHA512 1e4d69cef4a425e8540ff408688cf7899c04098ec47acbd6da601f48e01f808958982e7d8a1519934bd5aa895fe0f8dedc51d80460f85097355d5bdea79fd708 -EBUILD nagircbot-0.0.33.ebuild 886 BLAKE2B 74f2353cf6c2f8b5112795370cac2f159bfa4d0c0d0705cf585f3525760f822ce2d7d98741d2fa3687675e226f48efa164373b70ee37a16c934e0d884959c718 SHA512 4d0d1536295546a677016da1350bab878263900cf3e2ff4215ff70ed91a81a1d7f112c243879bef9d38a6eac119b5aa7b4c06ed42bc2784f78ac9c806b59c538 +EBUILD nagircbot-0.0.33.ebuild 910 BLAKE2B e88f7e4ede375701df7e421ab817f7d42646246c69cec4abfec24a12beb2cfb4d17d3584d7f57832fa76adbbb332fcfd3673e647737462704a221b1f3c1b6407 SHA512 6bb68acc17619ec2131538c090334549ad2a53f624b32fad895b0a476ab11850f26a0eb8de3afdb8af34e99bd41280f5fb0608098ea3b2351da4b0ed25d8f08b MISC metadata.xml 265 BLAKE2B 4703e7aa7883dbfd869885c73b9ea11679c918d4ecb4f01d0531377b01de03b83753c5fad9246629cef2bbb537de7bac62778c924b2d800d542fdb55e7f8ce49 SHA512 f37fc4a2e155bc8ef9ef4107341e024691079bafe8da5c090ec19bc571da23297074b57ece45f436fddf0f2f7e34435a3b09e2bfa4993f2188ece9d748e6fa99 diff --git a/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild b/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild index 6d748bc63809..02bca18241bb 100644 --- a/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild +++ b/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -23,14 +23,16 @@ RDEPEND="net-analyzer/nagios-core ${CDEPEND}" src_prepare() { -cp -av Makefile{,.org} + cp -av Makefile{,.org} + sed -i Makefile \ - -e 's:-lcrypto -lssl:$(shell pkg-config --libs openssl):g' \ + -e 's:-lcrypto -lssl:$(shell ${PKG_CONFIG} --libs openssl):g' \ -e 's:-O2::g;s:-g::g' \ || die } src_compile() { + tc-export PKG_CONFIG emake CC=$(tc-getCC) CXX=$(tc-getCXX) } diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest index 0d5440fbe817..e4341ddf0150 100644 --- a/net-analyzer/nagstamon/Manifest +++ b/net-analyzer/nagstamon/Manifest @@ -1,5 +1,7 @@ AUX nagstamon-3.0-setup.patch 1139 BLAKE2B f399c6c600785629c7c90b1de396c17805882554f3d4d9e0932cbf0c8761496cccac57b068b7a7c161bcde11223db2ed4a0c5563a15267f13d3553147044ca0f SHA512 7ec4f621e1dc91cb941811aaacb6322fee8024d39dfa65e39b3a19631a3ef7c78d4fcd4d8df5630b76904e3c415290b35ac777c4d0e863ce83e15832d061ea4d AUX nagstamon-3.4.1-unknown-version-id.patch 745 BLAKE2B 9e9f4619f98cfdea4a0f90fbf5d0b3c34c9e940449752110018a9b72a5817e0445f79cc30a9f720a390d40f09e0a28d491f692c6cd7515eb42f4035af54d483d SHA512 d4100c8f334309fd8711e2113c8e00d00fde124328e0ecd3c50762ff2be1b53b3832995922924170f7c695cdcfb48ba0100fda93a046ea802c56a4a917f77d43 DIST Nagstamon-3.4.1.tar.gz 563745 BLAKE2B 3ac35c90757eb525e7e7953f63a8798a0087470e4a94161987f3c382b6be43240aa8b5c44f279d23d841dbf9e4536f38d3f5e2f63234538a00fe6b6e0ee9c680 SHA512 68f8a7345c606b8ad4511b34e2d76383faf8831202c9429ab24eeb215073984f00f580c83a7f5e348f7d4104d3c82bd6f4661939801444e463c3fcf64c8240bd +DIST nagstamon-3.6.0.tar.gz 573998 BLAKE2B 6cc1e7918d8a7a53255fbd1661b8a41c0f3f414341da64724e566ceb95378590ed325fea757fffcdccf33533c8e34ca235036b47323f89bfcb3d06007a0cf43e SHA512 4da9b20c518129857ff86fa4aa4aa7507fce6c5b43fc917a4b8681d36e69f267045ab35c2f6922bde55536bf55e753f61b4fc184165e2f6d9eb6cb9b00703c69 EBUILD nagstamon-3.4.1-r1.ebuild 1512 BLAKE2B 7fe6865eead7c00dc0f448e41db14d68cff860b082f4812725ad56a7a6c9f3461d446b7a7f8afc3c2f8ad9921a2dbf9fefecf3cf6f2810059318916ac5aa607e SHA512 3c927df28645e15138302e2ef55ca13d8201322e25aafb64b70386418e31699d2b6243a48df6edb4e2c4df81221d3d04962c3643ed082549c1d4aace87b51c44 +EBUILD nagstamon-3.6.0.ebuild 1549 BLAKE2B 6e425d291462f475ee648e06bef01aa14ff78302614fba6d84475953233c0cd7d79673015ea072eae1278d52102f274b05c2008545b33678edac7c54dc94c607 SHA512 4b6edbd52d5ae0c9e8402e74ab7cce1e0856bab25d7259515f16bff0c421f117aef422833782c1805e0df8aaa8661f29000ccbbb0bbf0fbab6566fc65ab6fc35 MISC metadata.xml 639 BLAKE2B e0a9b21009ad9110cea206a357a2c8ee91190f9d36b3ce4bdfb4333ad085a88aea62f64e189859a4b217434959703607d7a812f2537f0a95d83b5b1aebe9acee SHA512 3f31d45f7e1e3a2e8d20e9cfe989f07fb79d5852a70709ff18b6eea9556fa03f2aa4d106fda459a5397da9160b29e56fd760e7ac9675dde04ee67dec4303d869 diff --git a/net-analyzer/nagstamon/nagstamon-3.6.0.ebuild b/net-analyzer/nagstamon/nagstamon-3.6.0.ebuild new file mode 100644 index 000000000000..04d03cf4b9de --- /dev/null +++ b/net-analyzer/nagstamon/nagstamon-3.6.0.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit python-r1 distutils-r1 + +MY_PN="Nagstamon" +MY_P="${MY_PN}-${PV/_p/-}" + +DESCRIPTION="status monitor for the desktop" +DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems" +HOMEPAGE="https://nagstamon.de" +SRC_URI="https://github.com/HenriWahl/Nagstamon/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] + dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/beautifulsoup:4[${PYTHON_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/keyring[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/secretstorage[${PYTHON_USEDEP}] + >=dev-python/python-xlib-0.19[${PYTHON_USEDEP}] + dev-python/requests-kerberos[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( "${FILESDIR}/${PN}-3.0-setup.patch" ) + +src_prepare() { + default_src_prepare + + # pre-compressed already + rm Nagstamon/resources/nagstamon.1.gz || die + sed -i -e 's:\(nagstamon\.1\)\.gz:\1:' setup.py || die + + mv ${PN}.py ${PN} || die + + rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die +} diff --git a/net-analyzer/nagtrap/Manifest b/net-analyzer/nagtrap/Manifest index 7900d513b55d..7d933d4cea38 100644 --- a/net-analyzer/nagtrap/Manifest +++ b/net-analyzer/nagtrap/Manifest @@ -1,3 +1,3 @@ DIST nagtrap-0.1.3.tar.gz 141934 BLAKE2B 296f6688fd973adb7e8ff5879cbeccc17ae9acb685f55a2fb20c49281909f60270f66eff5083260c1bb8717762ad0cf9994134e165c2859251cbab97c3e2d188 SHA512 4603157beb35850a6f8b69919cd0ce8f108e6de8e85711b9c18665b69f91082d6703da396b1170633172cef630c2f3d73b717f1893cb4da6b6d15a3f577d445a -EBUILD nagtrap-0.1.3-r1.ebuild 1303 BLAKE2B 023e3d8fe7a98d2f95300b043436495639d6a2ebb9a4546bb523ad58d8f837c7bd4cb2bb56be545f1d4cfcb33f5c89748e218a4a2d806b59ee083479193d6a7e SHA512 b4958316fd55bfea88cc129b2f151150d6dc32fecf8c5e0a354ef87174a5f5cb2b6c2e0684f4e08c2eb4268672ceeeec1f228a9a0e9ae00e389e52880b28f532 +EBUILD nagtrap-0.1.3-r1.ebuild 1326 BLAKE2B 50c44de1569f0d3db20b81a5ee66814188a6f18c8a5a0f4a4627a9aaf90dca9fe7c1266435cc1953cc981d93df2bfb4581976505188f4090d9a75e58e064bf0f SHA512 7952d561cb368d2d2b4f6de59fe4d4b95726973f42b369cb1f6ef6f7cbafa3729231e7245092429f3a2a62d18bf1d638de051bafd6972f3c7ac565296539c4a0 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild b/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild index 203d35be9af9..8f20f2c81674 100644 --- a/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild +++ b/net-analyzer/nagtrap/nagtrap-0.1.3-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 @@ -22,8 +22,8 @@ src_install() { dodoc ChangeLog THANKS dodir /usr/share/nagtrap - cp -r {db,nagtrap} "${D}"/usr/share/nagtrap/ - fperms 640 "${D}"/usr/share/nagtrap/nagtrap/etc/config.ini.php-dist + cp -r {db,nagtrap} "${ED}"/usr/share/nagtrap/ || die + fperms 640 /usr/share/nagtrap/nagtrap/etc/config.ini.php-dist sed -i -e 's#use lib.*#use lib "/usr/lib/nagios/plugins";#g' \ plugin/check_snmptraps.pl || die "sed failed" @@ -35,10 +35,10 @@ src_install() { pkg_postinst() { elog "Before running NagTrap for the first time, you will need setup its configuration" - elog "/usr/share/nagtrap/nagtrap/etc/config.ini.php" + elog "${EROOT}/usr/share/nagtrap/nagtrap/etc/config.ini.php" elog "A sample is installed in" - elog "/usr/share/nagtrap/nagtrap/etc/config.ini.php-sample" + elog "${EROOT}/usr/share/nagtrap/nagtrap/etc/config.ini.php-sample" elog elog "NagTrap requires snmptt to write traps into a MySQL database." - elog "A database schema is available in {$D}usr/share/nagtrap/db" + elog "A database schema is available in ${EROOT}/usr/share/nagtrap/db" } diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest index 6954b2f6def1..98b4081457af 100644 --- a/net-analyzer/nessus-agent-bin/Manifest +++ b/net-analyzer/nessus-agent-bin/Manifest @@ -1,4 +1,4 @@ AUX nessusagent.initd 563 BLAKE2B 63820368c95dc2358ff73843e239a084e21cea48bd4dfd170e486f0c702e7ec6be1581478f7c37dd12868dd3648dfd8f44b8ff47c85fdab0276a0c84b78eb7d1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718 -DIST NessusAgent-8.2.3-es8.x86_64.rpm 14554872 BLAKE2B 532a2d26b8aeb2d185da059e14eda1de0a48dddccbefcbccc3ed6636e8679dd13a8c55f12dd2bc4f8e49794f7da0a2c0db13007fa6390254a3ca276df9083184 SHA512 c6bb315c30723a292968254bd5616d71bc07ba5b30a71ad4f57d395535ebcf16d42df393ab30d63fb8929fd7edc09d1d79bcccaafd7fb2f9762e147f63ee90e3 -EBUILD nessus-agent-bin-8.2.3.ebuild 2358 BLAKE2B 2375f9957e2109648af925374701ae2303d428cd59aa913e16eb6ddb81bd0793866d39606da4bb054e5c42f0701caccb20121401a73b76284bf2f22e6a8023dc SHA512 a10eab141c37e7895be64a627bd8a44b7027c0129dfad90dbd0b3bde68b99b075b29609764498ccf58a9376a5f4cea7dceb7f0bfbc4623c2e8620c12040b892f +DIST NessusAgent-8.2.4-es8.x86_64.rpm 14630416 BLAKE2B 00a2f180da2864426654c4cf9afaef4d4c5a517984a942acf877e82f782d4d1532a18cd797864282389161819513e3e2b8a3b6fbe0244d1d3dae4868534320a9 SHA512 6c4c17f3c2bcf7018794b11a81fc0e3d5adfa7af52a2e6b97b0f77ee88d82fab890de12c7c7ab046a7183e3571934bb9e6c3ccf90e53eceba7e77fa94770eba0 +EBUILD nessus-agent-bin-8.2.4.ebuild 2358 BLAKE2B 2375f9957e2109648af925374701ae2303d428cd59aa913e16eb6ddb81bd0793866d39606da4bb054e5c42f0701caccb20121401a73b76284bf2f22e6a8023dc SHA512 a10eab141c37e7895be64a627bd8a44b7027c0129dfad90dbd0b3bde68b99b075b29609764498ccf58a9376a5f4cea7dceb7f0bfbc4623c2e8620c12040b892f MISC metadata.xml 353 BLAKE2B e3ba298accb9a0618eb7340652a32cc166702f8873b49de734f6c117e2aeadbd9c31a76f231574ee04159454633191d4d3480925c05c993be174bf4efd3cc994 SHA512 81bc629de5c0367706b7b3259b3bb68edff6260dd47de345153af292a81fb6df23771b0f4974617f1fdef7b446dc17ab3c485d44d3dcb376e93c69173503a348 diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.2.3.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.2.4.ebuild index 9436416d89df..9436416d89df 100644 --- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.2.3.ebuild +++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.2.4.ebuild diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest index db775c2c17ff..1179ccf66192 100644 --- a/net-analyzer/nessus-bin/Manifest +++ b/net-analyzer/nessus-bin/Manifest @@ -1,4 +1,4 @@ AUX nessusd-initd 582 BLAKE2B 67c5e73262512c590b5b4fc0668297a504677aa3d771fdeee2809c921d988faef19cbf10a7fb26d52114e1a67d33ef197e32c561cd5b2003c8abbde2dfe5cb4f SHA512 f825fad89564303aeff423f3c32a1544ee4b063ef57702cd54220aebed8e01e7b178ff5bd10b48b654ebdee78657a9bc41caf779a23968d008916fd51e88b2f4 -DIST Nessus-8.13.1-es8.x86_64.rpm 41186604 BLAKE2B 462cc6bd9c2f5b50fce330fa5919e9b6e5c93285361c385d06d6f0377ecb9fa8ce349714b71d0f97604c4e755d54e510edb5561c9dccfdb1fad3e35a7e6504d6 SHA512 d2a2b3a94b78bbf6261ae0ad4f66475cf0aea14316de1f2133795767c14048cb12b9857e497182770b04e006c00f65a7fe592f4fce0c480d08efafb2c17ad7a2 -EBUILD nessus-bin-8.13.1.ebuild 1986 BLAKE2B 382d860d6249b1f637dff9ae84b899d38bacd165cd63edf4e5b667f1a46b8c23ad2baaf642a48d3616c0328d5eaddea2c0e56b2aa904aba958af7cdf7973458c SHA512 010f19e6f5d169bba67e03a157c4f4c5b2b634e086820cf61c2601c3689f9fc8a8f9c71700efc2d33cede6590d5244e62f229a67cda4c354a685f1be24ee3f5f +DIST Nessus-8.14.0-es8.x86_64.rpm 42769924 BLAKE2B ad0136b8c74d6e4cbd4b77aaac73c7d7ebaa9e26d41c964c63e28086429ea4571378439b3578a728a28c73e1f4a094d1030fe636896cd94b6f788e9db8370981 SHA512 6705dc7e036211c5aa5662713a5bd4a502674de3d53c9a79df1fe77adeacbc3d36afbcef0129189582c1f3a9399efc5d7e7885ae54ab1ddbc3096e99f00345f7 +EBUILD nessus-bin-8.14.0.ebuild 1986 BLAKE2B 382d860d6249b1f637dff9ae84b899d38bacd165cd63edf4e5b667f1a46b8c23ad2baaf642a48d3616c0328d5eaddea2c0e56b2aa904aba958af7cdf7973458c SHA512 010f19e6f5d169bba67e03a157c4f4c5b2b634e086820cf61c2601c3689f9fc8a8f9c71700efc2d33cede6590d5244e62f229a67cda4c354a685f1be24ee3f5f MISC metadata.xml 345 BLAKE2B 05fdd17a4decd9a096175a59991a6df8260591c09193fef114895d7d29e0f08210aacd4517678410813d06a27b1032889c529e2966427c5a9ad454f9534d25f5 SHA512 3535519b1c621f6df120e6aa39f9a11ec132b68499a029915650218c16e9ca1a07cb30409ace95b2aa0204194a61c7b4743051e1f4ffc94cb5ba3372cac72e8c diff --git a/net-analyzer/nessus-bin/nessus-bin-8.13.1.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.14.0.ebuild index 1e569f0e0f10..1e569f0e0f10 100644 --- a/net-analyzer/nessus-bin/nessus-bin-8.13.1.ebuild +++ b/net-analyzer/nessus-bin/nessus-bin-8.14.0.ebuild diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest index e119c460756d..b12a2f67df2b 100644 --- a/net-analyzer/net-snmp/Manifest +++ b/net-analyzer/net-snmp/Manifest @@ -16,7 +16,7 @@ AUX snmptrapd.init.2 338 BLAKE2B 893a510af4cb7f4115c5995ecd40c6ac3c5d2fd4cf92524 AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c5976394c04bfd8da30917395b1a752f8e66502259d271ccf264c3e99f99e95df62b80447d4099d1dd7 SHA512 763682e3926fd1e7f28a013be2ad56cc53eed26a0415770906968e07a183128c9d5fb70d76513244ba0cc95fc2526b68c32207b5fda83b8f53c256549cfa1b1d DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636 DIST net-snmp-5.9.tar.xz 4082580 BLAKE2B 9dfd5a7dfe4ca18b16c71c9f5cb70c540d16aa36a0b2dacd3ddc465934f96ac473f77490af78d202bf6dad4eddea5d75665a770df74132aafda39f5f3a87d835 SHA512 3f1e27caa8e5306d451b61b08c2daf007929a850661962fcd29b528a80332a980184303a7e87c96d8d2774181758889dc825cb08e3c3b353c5e7ca1ebcc09173 -EBUILD net-snmp-5.9-r2.ebuild 5667 BLAKE2B 002d2abbfe7c999dd14df3f36d2068cb846498fa582116c5ae7656a494dd69fb208f0d52590e47aaa3ab96edc3635cc3942f6be3d2881ff62b7b28e28cdb3cc0 SHA512 f39979dabbb37cac0d6c318c3205ed8b6fafba80ef392a2f21ab31cdd931e708287b6f38f2220f6c105ece8073e6f0d11e2c585d6ca27a0edc089bbadd26dd2e -EBUILD net-snmp-5.9-r3.ebuild 5702 BLAKE2B 5f85c9eb2eb0e2fec3bff02f7aa822ab9c2b5bdd12a4305ce582b3de383b7944b5b48ba2b3b1f8434870e4401eda360cd20da281e12ff6e9f7e83a0952decf39 SHA512 c28204e6bb8831cd2ac5bbe5718799251fb18d5d573a55aded2ab4c6682e7551b622e53fdbc93c1fdb9f30b2c276fc055b01167bfc2ebc0e3af1d2dbd31a9566 +EBUILD net-snmp-5.9-r2.ebuild 5668 BLAKE2B f8c2c3290b875a59111375c5c3d0e207e8bfe6beccccbe42b5fb61399b71ffa9e677a50a11368347fde106d9862dbd20c0fd19b07e4f57e12a91dbf55b81d624 SHA512 749a7fdc95cc6e03e90a48c60ba17c3be05a2a0ff49480ea8bb773297dc0f11148ebd71b5e0d876e3f62ba0ee7ba91fa4ec0c3ee5031143f8f0ff644857302d1 +EBUILD net-snmp-5.9-r3.ebuild 5695 BLAKE2B c5c2ab30494747561efdd120b6cacf4464fbb18f8186e32145671fc53e56642e553345374f56da51929fd8b1a79ca4a3e759603a085e0d1a669ead3953581087 SHA512 316bc74aaee5035c2a63c058ad080fe9aed3093cc471f130d0b81a5a9d543240ea3a0b97fd77055c363a7c8220227d8fd41f7d51aa25d693b98112e6e256377e EBUILD net-snmp-99999999.ebuild 5642 BLAKE2B c42d9d6d4fb53bccf863a4d6a7fe0882c3ae28365ac55e2de52e211d4aa7dcb0460e385fa5faff980dbee1bc0048f225828ec3409825c30ea1d69b37befb2d06 SHA512 816497802a2b8f07edc0307b0a31dfddac946c23bbd1861357306e2aa13aefab181d2f2250970299bcfb446b03db72b1d745d0d318103af294d230c3a1de2601 MISC metadata.xml 1296 BLAKE2B 76a0264baf629293eac4127e3dbaf167b5af236e53e0de9cb1c65869242d13e6d5f3c90d47856d5f8c63eba34661698637dd7da56b307d9e6e07403bf91df320 SHA512 ff45396992b1804f3774bd532438b8e64327dfa71c109cde9073f6a5a17f6c3dcc2ba1278359fa10d5eb00c3ead0368706d29178466e9b8586b66e0219d7e4b0 diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild index e7d8ef4f773d..85157b99bc89 100644 --- a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild @@ -20,7 +20,7 @@ SRC_URI=" # GPL-2 for the init scripts LICENSE="HPND BSD GPL-2" SLOT="0/40" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" IUSE=" X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r3.ebuild index 2ded43695310..ca0a3152b0dd 100644 --- a/net-analyzer/net-snmp/net-snmp-5.9-r3.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.9-r3.ebuild @@ -21,7 +21,7 @@ SRC_URI=" # GPL-2 for the init scripts LICENSE="HPND BSD GPL-2" SLOT="0/40" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" IUSE=" X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib diff --git a/net-analyzer/netcat/Manifest b/net-analyzer/netcat/Manifest index 2f1e2f65f839..f1fdd52fdd34 100644 --- a/net-analyzer/netcat/Manifest +++ b/net-analyzer/netcat/Manifest @@ -2,6 +2,6 @@ DIST nc-v6-20000918.patch.gz 8740 BLAKE2B 56274ee32a77f335c31b5593ae92afdb1758ee DIST nc110.20180111.tar.xz 69984 BLAKE2B cb345db31d8857fc1c3973eba45c7a45ec0c5721829a19c46f1ec91a792d9d6309930b3bba5df1180989025f7a04ec8c85cf4832ac6f4199d13f15764f000420 SHA512 4413849c07c6ec5aae07c6e2baa1ba9a99721fa6ac08cf9e7d15379937a207246eb4f4299dd8c049445a72eac9cfe0a3633a87e4e01e21036db1217ea7a1e330 DIST nc110.tgz 75267 BLAKE2B 203b5f54805ddef2c3e9627300dfb6d14f098e88433ca807c8db01f009dec1ccc329925025238dae00b5e82e91c0787ef25536d08310ac127cda1775cfb2afb3 SHA512 c9a7f5045f76d9ffef4e83fcc3e82f69ac4eb05e061686db51e9367949bfe0b90226b290a059dc68dcf3bf2040b95b5c78545199674da57a7c73e2f9145cf812 DIST netcat-110-patches-1.0.tar.bz2 25751 BLAKE2B c0be51a057981ad1df932f7317a1c317c8788efa670778a4f5bbf67c9d983754bd20188a15e7ced3d849a25244926afc54129e0a2df07bc34932d15a3efbf302 SHA512 b9e7e35aa7e26d30f0115d87aff34fd0cadfad99fdb77cc5aa3ba51bec331f632e180484927c4368172ee9cc6c996b8691bd19bad8806912d8820158a98eab46 -EBUILD netcat-110-r9.ebuild 1660 BLAKE2B c586d3452b9198abf0b9bac20c57043c24f8d4f047413a299d05a78a64774ec547b602fe361913c523bfbf4ad1c774adb8e53d6a5aeb4691649b15873e0c3b60 SHA512 30d2b453a73abcca44b89af888be7ce20f3e9de604d8a397863fdc86944b19506dba652100c6d8d70918b0f5bdca2afdf1a7ddf7a4eb882c96454293cb51df6a +EBUILD netcat-110-r9.ebuild 1648 BLAKE2B fa3fc6c694fc056d1f55d96855784ff492a40d312639820519a786b24549e9031e43016ea791d99fdc82c06fd7c4e0d2ffa59d85e9159948d4f1fd830ae53645 SHA512 2d35b812bafa2865c55370c4825e78e53a5c9f2bb7add8f64194713312856872ac2a37de4b5aa69a23fc45fa96c413ee77e450c2e93c750c8f01c0ca93be956c EBUILD netcat-110.20180111-r1.ebuild 1313 BLAKE2B 0a8c5670241d928d62dc4bd180fc32f368b158cd983a59b84bcd41c6a89fe3d4dcbeec067dd28fb506f1cc9e6771d350d7390cf412d9ef920173b36c9204106e SHA512 73b1be505bfccfa2e150cb9618f69c27db596ed1ca6f845ee187c864b8ef153ddc3bf835eb31522308fc0894cabc96240999be24e8f906ab898435efc67b6f34 MISC metadata.xml 520 BLAKE2B 554d3e1e5b791ebc008ad728157d01fd711b4e57d96ef0294c55e43bb21d6b0bd6a606aa9e5b5cfd6b768d362f260dea119f662bd31b24594a55652a1c5ddd22 SHA512 1b5f4d4aa398bbe08e2bb73c609624e6ed320d39e96531a328fb0547e6a0dda5bbf72aaee358948e2f06c60d578f91a51965fc268601b044c16cc62a2829a3e9 diff --git a/net-analyzer/netcat/netcat-110-r9.ebuild b/net-analyzer/netcat/netcat-110-r9.ebuild index 2653de68f200..89afaec191e1 100644 --- a/net-analyzer/netcat/netcat-110-r9.ebuild +++ b/net-analyzer/netcat/netcat-110-r9.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit toolchain-funcs flag-o-matic +inherit toolchain-funcs PATCH_VER="1.0" MY_P=nc${PV} @@ -17,7 +17,7 @@ S="${WORKDIR}" LICENSE="netcat" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris" IUSE="crypt ipv6 static" LIB_DEPEND="crypt? ( dev-libs/libmix[static-libs(+)] )" diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest index 31fbd2c45be4..d924d690a392 100644 --- a/net-analyzer/netdata/Manifest +++ b/net-analyzer/netdata/Manifest @@ -2,9 +2,11 @@ DIST netdata-1.29.0.tar.gz 6233326 BLAKE2B b177fba4d6560b289e5a9fbedffe7f3eae530 DIST netdata-1.29.1.tar.gz 6233282 BLAKE2B 53fd82c0b904b6d29eac1534e46d856c9b13460fec7b739cb5e93596961753d978dff0a5e08c88f10d974838809d4266b715e442b54e507ae744122d0345297f SHA512 252efece4501d9cd3c71536b96f9487c618f9a2a3445d0bf0d49f0bfd399b80115b0f57f22fddc5567763a9f41e95f24c8ed64b6e1c29f0d7d121d844d8d1176 DIST netdata-1.29.2.tar.gz 6234502 BLAKE2B b34314114c41e1fd80cfb1c495f34b2dbcc5449189d12215c2af4a5c543fb0be9314842430da75547db0bc5f1027fec313703cbc98d21435807d2105d6761372 SHA512 3046fa99725c9ec9b5cac695d2ab66dbad999fc7b1242722592521b0e270fbb32756a7de4aac9ac8fa4ef5dbf455034f7fdbe84f8e281c12471de61e79a0eacd DIST netdata-1.29.3.tar.gz 6234406 BLAKE2B 975b27e8cb66c174d7cf01de0e5b76d57b0eac8005d5da19aa308df530edd8fcacc97b1ba5956ac38ffb9fcd55b2c58f4a1dec3bc691a5b898e886de19b365df SHA512 67e661328d76b3b9d4837e5acae16937300f1b91bc37bafc3ee606aeda88d2775c606126b9f072c682a1b24f5610b7993fedb808fd9032b240702d12cf063b54 +DIST netdata-1.30.1.tar.gz 7153879 BLAKE2B 68553c000ee3a63cbd79cce5fe4daf75239cd76572160e1903f8325548d0cc4222f0c5e43f1488c31087b40de5222115bbe491cc00e36aea331992fc87b9f1ec SHA512 c3d116bf3459ca6224f5cd8341933c2696581178262a37887c532e09e98e5d075217fcd66574e00cc644fc16ec583b7e2fe54be95c98c477fb20fbe7ad9ed1a9 EBUILD netdata-1.29.0.ebuild 3418 BLAKE2B 294e7bf5dc19a8f40a16fb7bf8f726868ae72bb1d3005d8efe5f915f81c2b0949078d3cc1a228ddcddf78939c8302cb58919fe3d3db56c7cec8c8db513dc74e1 SHA512 60ffc62fafaa1bc89d290b09877c632c72e7712f46644f799b9b9fdefc7020c5239063b824f4c1941b5875c72866c95a0aaeb2634fa7f699139eac43ab2808fc EBUILD netdata-1.29.1.ebuild 3418 BLAKE2B 294e7bf5dc19a8f40a16fb7bf8f726868ae72bb1d3005d8efe5f915f81c2b0949078d3cc1a228ddcddf78939c8302cb58919fe3d3db56c7cec8c8db513dc74e1 SHA512 60ffc62fafaa1bc89d290b09877c632c72e7712f46644f799b9b9fdefc7020c5239063b824f4c1941b5875c72866c95a0aaeb2634fa7f699139eac43ab2808fc EBUILD netdata-1.29.2.ebuild 3418 BLAKE2B 294e7bf5dc19a8f40a16fb7bf8f726868ae72bb1d3005d8efe5f915f81c2b0949078d3cc1a228ddcddf78939c8302cb58919fe3d3db56c7cec8c8db513dc74e1 SHA512 60ffc62fafaa1bc89d290b09877c632c72e7712f46644f799b9b9fdefc7020c5239063b824f4c1941b5875c72866c95a0aaeb2634fa7f699139eac43ab2808fc EBUILD netdata-1.29.3.ebuild 3418 BLAKE2B 294e7bf5dc19a8f40a16fb7bf8f726868ae72bb1d3005d8efe5f915f81c2b0949078d3cc1a228ddcddf78939c8302cb58919fe3d3db56c7cec8c8db513dc74e1 SHA512 60ffc62fafaa1bc89d290b09877c632c72e7712f46644f799b9b9fdefc7020c5239063b824f4c1941b5875c72866c95a0aaeb2634fa7f699139eac43ab2808fc -EBUILD netdata-9999.ebuild 3418 BLAKE2B 6c063a2a8110311dbc32e4787dc75bcea98240d0f607ffc032a132107a907693452e5317da8efff30684ca5f56ff2e6cc63899b1635e69e267670818986951df SHA512 1501c5272ea5ecb7fb4deabd9e50e505f1aa4a4fb21a86090f3ee4b78138e0ea2b492c350139d93875c853c6ae5351ac868fd7d4d2c92461fe09a13eaa4c3805 -MISC metadata.xml 1229 BLAKE2B 4247be48b9fc7f1e16f9a145d5c5fa6036d7721fd829d3e515903043a29397e29d9ef550ce21bb17bb3c4da012b41ef2961d4772f99b37169bc25b79e840696a SHA512 264dda2113eec7e86976c09bb0074a21c3255344be635131d737bda61ba8f95e103882d44957e92a7a44d73473448ada0041c80e63fa221b72c8d19d2953447e +EBUILD netdata-1.30.1-r1.ebuild 3484 BLAKE2B 564d1c7b417dbf3456a8b6a87666dc734bfcf77b23f5a067b368e87952dce2608816b7a1bd7e8cbf772590110eb8018d285a2b81601a671af9be58f16322fbac SHA512 ea4a69ebde4d634a77485a1d3c6a30d6b91beb813f449448ad75a7c34423f9c0f6c7e4a8dbe2ad52e8c8b0e737c839bea230b5ece0068e9544431638ed98cd4c +EBUILD netdata-9999.ebuild 3484 BLAKE2B 564d1c7b417dbf3456a8b6a87666dc734bfcf77b23f5a067b368e87952dce2608816b7a1bd7e8cbf772590110eb8018d285a2b81601a671af9be58f16322fbac SHA512 ea4a69ebde4d634a77485a1d3c6a30d6b91beb813f449448ad75a7c34423f9c0f6c7e4a8dbe2ad52e8c8b0e737c839bea230b5ece0068e9544431638ed98cd4c +MISC metadata.xml 1288 BLAKE2B 33251404c09ccdd7ba653dae7204cf262201fdfc058766eb6b12bd4eacd99be5482867110726ced371a89db6ff022f0c89cf62425ef14f5a2e13734ad1caf70d SHA512 27087ff277f6bec908d23a66183344dfed06761a9b344a3c0d8ec2048e56ac0cb542c3d30bc22fa71cd91aee5d396b4786b546556ce7d64ea394781e05644220 diff --git a/net-analyzer/netdata/metadata.xml b/net-analyzer/netdata/metadata.xml index 7eb822608727..1625cf362e81 100644 --- a/net-analyzer/netdata/metadata.xml +++ b/net-analyzer/netdata/metadata.xml @@ -6,6 +6,7 @@ <name>Craig Andrews</name> </maintainer> <use> + <flag name="cloud">Enable Netdata Cloud support</flag> <flag name="compression">Enable compression via zlib</flag> <flag name="dbengine">Enable the Netdata database engine</flag> <flag name="ipmi">Install <pkg>sys-apps/ipmitool</pkg> required for monitoring IPMI sensors.</flag> diff --git a/net-analyzer/netdata/netdata-1.30.1-r1.ebuild b/net-analyzer/netdata/netdata-1.30.1-r1.ebuild new file mode 100644 index 000000000000..64c8c68c5aa7 --- /dev/null +++ b/net-analyzer/netdata/netdata-1.30.1-r1.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{3_7,3_8,3_9} ) + +inherit autotools fcaps linux-info python-single-r1 systemd + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/netdata/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-v${PV}" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Linux real time system monitoring, done right!" +HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/" + +LICENSE="GPL-3+ MIT BSD" +SLOT="0" +IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen" +REQUIRED_USE=" + mysql? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) + tor? ( python )" + +# most unconditional dependencies are for plugins.d/charts.d.plugin: +RDEPEND=" + acct-group/netdata + acct-user/netdata + app-misc/jq + >=app-shells/bash-4:0 + || ( + net-analyzer/openbsd-netcat + net-analyzer/netcat + ) + net-libs/libwebsockets + net-misc/curl + net-misc/wget + sys-apps/util-linux + virtual/awk + caps? ( sys-libs/libcap ) + cups? ( net-print/cups ) + dbengine? ( + app-arch/lz4 + dev-libs/judy + dev-libs/openssl:= + ) + dev-libs/libuv + compression? ( sys-libs/zlib ) + ipmi? ( sys-libs/freeipmi ) + jsonc? ( dev-libs/json-c:= ) + kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) + mongodb? ( dev-libs/mongo-c-driver ) + nfacct? ( + net-firewall/nfacct + net-libs/libmnl + ) + nodejs? ( net-libs/nodejs ) + prometheus? ( + dev-libs/protobuf:= + app-arch/snappy + ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]') + mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') ) + postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') ) + tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') ) + ) + xen? ( + app-emulation/xen-tools + dev-libs/yajl + )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +FILECAPS=( + 'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin' +) + +pkg_setup() { + use python && python-single-r1_pkg_setup + linux-info_pkg_setup +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --localstatedir="${EPREFIX}"/var \ + --with-user=netdata \ + $(use_enable cloud) \ + $(use_with cloud aclk-ng) \ + $(use_enable jsonc) \ + $(use_enable cups plugin-cups) \ + $(use_enable dbengine) \ + $(use_enable nfacct plugin-nfacct) \ + $(use_enable ipmi plugin-freeipmi) \ + $(use_enable kinesis backend-kinesis) \ + $(use_enable lto lto) \ + $(use_enable mongodb backend-mongodb) \ + $(use_enable prometheus backend-prometheus-remote-write) \ + $(use_enable xen plugin-xenstat) \ + $(use_enable cpu_flags_x86_sse2 x86-sse) \ + $(use_with compression zlib) +} + +src_compile() { + emake clean + default +} + +src_install() { + default + + rm -rf "${D}/var/cache" || die + + keepdir /var/log/netdata + fowners -Rc netdata:netdata /var/log/netdata + keepdir /var/lib/netdata + keepdir /var/lib/netdata/registry + fowners -Rc netdata:netdata /var/lib/netdata + + fowners -Rc root:netdata /usr/share/${PN} + + newinitd system/netdata-openrc ${PN} + systemd_dounit system/netdata.service + insinto /etc/netdata + doins system/netdata.conf +} + +pkg_postinst() { + fcaps_pkg_postinst + + if use xen ; then + fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin' + fi +} diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild index 256ee9f3417a..64c8c68c5aa7 100644 --- a/net-analyzer/netdata/netdata-9999.ebuild +++ b/net-analyzer/netdata/netdata-9999.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 @@ -10,7 +10,8 @@ if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/netdata/${PN}.git" inherit git-r3 else - SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-v${PV}" KEYWORDS="~amd64 ~x86" fi @@ -19,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/" LICENSE="GPL-3+ MIT BSD" SLOT="0" -IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen" +IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen" REQUIRED_USE=" mysql? ( python ) python? ( ${PYTHON_REQUIRED_USE} ) @@ -91,11 +92,11 @@ src_prepare() { } src_configure() { - # --disable-cloud: https://github.com/netdata/netdata/issues/8961 econf \ --localstatedir="${EPREFIX}"/var \ --with-user=netdata \ - --disable-cloud \ + $(use_enable cloud) \ + $(use_with cloud aclk-ng) \ $(use_enable jsonc) \ $(use_enable cups plugin-cups) \ $(use_enable dbengine) \ @@ -110,6 +111,11 @@ src_configure() { $(use_with compression zlib) } +src_compile() { + emake clean + default +} + src_install() { default diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest index 9ba9a9f69c6c..d37121cccec6 100644 --- a/net-analyzer/netperf/Manifest +++ b/net-analyzer/netperf/Manifest @@ -2,9 +2,9 @@ AUX netperf-2.2-conf 103 BLAKE2B 330afd42dc9d4ecacf6d0a4e2d5fdb620100c5d664df423 AUX netperf-2.6.0-log-dir.patch 261 BLAKE2B a0d4aeb9137bd9d33ee63e0a7eb704b0a18d3f50add352e9bfc2c483ecffbd4749c37412b17f8f9d84b8f59a0b6afd647a01d415e3ffe6f018a7bffdd706466f SHA512 108ab43c36041df5051cb1a130d33e42589c020dac296230a325ee4e1805ea2b3bbcb5cd1438cd4abe4d922ff5536410be9364eaad9044a3181c9acdc7b91bb6 AUX netperf-2.7.0-includes.patch 468 BLAKE2B 5e566c665d2d95b11015c9d38f10ec2b849251c8be321edf6decda7052b315e60d4525ab421373751f0966cbca970bfafd31ddeee8ec398cdf051a41eec1d0ff SHA512 aec77b7a97e83a93d847f0935bd599d7497b3b749bb0cdb722d96cb49535b3eef9b7b9f60388f5cb2de726b4084abd9cd48614d73bc63b34c7bc0fcfffb0fd3f AUX netperf-2.7.0-init 440 BLAKE2B 368f56d7b2d7b2648368ba745add3dd98dd43ee028897cd6cb324affcbaf16a8637615a1ac416d32f035a23d7510a0ca962285292c5bb935ec8abdde259b0d0e SHA512 ed5a56d77f47aa01545be64104decc2893179c80094c50bb023b96b751cb5aa34ec8f18d606b0570bef47037bedf415250d9b55157f5e24c97e246f6f9643a36 -AUX netperf-2.7.0-inline.patch 974 BLAKE2B 4e3174761db0b72656e22e361841bbb887da6f26fa8e48d14934e658c42e3cf36b4e237d6a9e89f659258dae539879482d90727cb5a6aefb957c118af26c1a0c SHA512 9b9c542724456b49ea51c29d6b807edf938db105adfff57a06a9fdc76c5259019450d9ee674ea4e797b973542ea43377ee83332d391bcf14913e395a76a3d76c +AUX netperf-2.7.0-inline.patch 902 BLAKE2B d31b677da87044cc87779013e3c12b88ea82e93e7bc7c06d113acf785207861ae84c2ac232b6731d65a623b1b5d8b6f41477d40951030a84b996e3029abb5970 SHA512 0defbdc27edbd32a615f335f79380d8f9bdc03a400b8f18a12e1c61a5c7b2d05449c2ec040b80dece7f337e9a447f270b34b85fb81ed49b16d3277531bda0bbf AUX netperf-2.7.0-space.patch 455 BLAKE2B aa4fae48102f2d767a0c72a13b20820d9e42f782455876766399e7edc5625cd6ff0c740c3268aee4443d844ef6b28da69144c039bfdc63519a7279d2cc1ad433 SHA512 e39bfcec70da00fa886b1f8389f54eca6bac83fc8ff48a72427fcd30c3f605e4ec2d01d2f7161ae0fa26bd56283c03593caf756db7d808f0e3e4d3a90d50f1fc AUX netperf-fix-scripts.patch 819 BLAKE2B 59779076ad1e3315712f7db54451256dcbd04c2712020d0b39c0fb1969fbfec0cbf8a3f1b6203ce5622b45a2cc6877b1c1448b0d505aa98a034c2a7fd2f285e3 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad -EBUILD netperf-2.7.0-r2.ebuild 1943 BLAKE2B 09ab67995b1b46e7d1295aad62e05765c84ccde2bbd8cda9b24794942719b41f0c56a1167a2c2f3330186f53b23e4a33ac0bb34bc4874677d72d3534f5344026 SHA512 b1dacc7084488ca34af4771d9d6c3b07c43b003625c66108df54ef775410e2ec9fbbf452572c0920fa13e4b9b6aba3e0ed3dd24e78e12de8390a3aa3571caaf3 +EBUILD netperf-2.7.0-r2.ebuild 1898 BLAKE2B 6910a1658dc4576594b8df29a0fc4280cde378832330afe791fec3c1b50c58b0669a2a29f1c08a39573ca0d27076b4b5bdfac79b3b89b7238f43929add57873c SHA512 1e7bf240e650e62a2b7e59570a1aa04ea67e79e6895a9b88b6ae1ad24df44c44d224dac6456e2ab4ffa43efe511c8329ceb127574343a655587ca0e31aba8f47 MISC metadata.xml 855 BLAKE2B 20c4b64a1abe9e4f83a56e759b9d7cfb161886dd06a4672dc96828a80d3f91c064665138a87c263815c217091a869e7ced811fca059405bf047de337814c52a5 SHA512 628efc289da10094d7fab1c0c47e8acd67260fffc036e2d4eaa1430e1b91fd2610d681134211cff4dcd5f84858199a4bbf36aaaa73f3e507bef1114a64b4e588 diff --git a/net-analyzer/netperf/files/netperf-2.7.0-inline.patch b/net-analyzer/netperf/files/netperf-2.7.0-inline.patch index eb8c09b84695..eb89d34f3e8b 100644 --- a/net-analyzer/netperf/files/netperf-2.7.0-inline.patch +++ b/net-analyzer/netperf/files/netperf-2.7.0-inline.patch @@ -1,6 +1,6 @@ # Copyright Seblu 2015 ---- a/src/netlib.c 2015-08-04 20:30:43.449468815 +0200 -+++ b/src/netlib.c 2015-08-04 20:31:40.317792002 +0200 +--- a/src/netlib.c ++++ b/src/netlib.c @@ -3997,11 +3997,7 @@ } } diff --git a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild index ac656a889e76..6a56ebb79e3c 100644 --- a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild +++ b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils flag-o-matic user +EAPI=7 + +inherit flag-o-matic user DESCRIPTION="Network performance benchmark" SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2" @@ -13,7 +14,13 @@ LICENSE="netperf" SLOT="0" IUSE="demo sctp" -DEPEND=">=sys-apps/sed-4" +PATCHES=( + "${FILESDIR}"/${PN}-fix-scripts.patch + "${FILESDIR}"/${PN}-2.6.0-log-dir.patch + "${FILESDIR}"/${PN}-2.7.0-includes.patch + "${FILESDIR}"/${PN}-2.7.0-space.patch + "${FILESDIR}"/${PN}-2.7.0-inline.patch +) pkg_setup() { enewuser netperf @@ -21,13 +28,6 @@ pkg_setup() { } src_prepare() { - eapply \ - "${FILESDIR}"/${PN}-fix-scripts.patch \ - "${FILESDIR}"/${PN}-2.6.0-log-dir.patch \ - "${FILESDIR}"/${PN}-2.7.0-includes.patch \ - "${FILESDIR}"/${PN}-2.7.0-space.patch \ - "${FILESDIR}"/${PN}-2.7.0-inline.patch - # Fixing paths in scripts sed -i \ -e 's:^\(NETHOME=\).*:\1"/usr/bin":' \ @@ -39,7 +39,7 @@ src_prepare() { doc/examples/udp_stream_script \ || die - eapply_user + default } src_configure() { @@ -57,10 +57,10 @@ src_configure() { src_install() { default - # move netserver into sbin as we had it before 2.4 was released with its + # Move netserver into sbin as we had it before 2.4 was released with its # autoconf goodness dodir /usr/sbin - mv "${D}"/usr/{bin,sbin}/netserver || die + mv "${ED}"/usr/{bin,sbin}/netserver || die # init.d / conf.d newinitd "${FILESDIR}"/${PN}-2.7.0-init netperf @@ -73,6 +73,6 @@ src_install() { # documentation and example scripts dodoc AUTHORS ChangeLog NEWS README Release_Notes dodir /usr/share/doc/${PF}/examples - #Scripts no longer get installed by einstall - cp doc/examples/*_script "${D}"/usr/share/doc/${PF}/examples || die + # Scripts no longer get installed by einstall + cp doc/examples/*_script "${ED}"/usr/share/doc/${PF}/examples || die } diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest index 52aec3b3d6f0..4ada7d742b8e 100644 --- a/net-analyzer/netselect/Manifest +++ b/net-analyzer/netselect/Manifest @@ -2,7 +2,7 @@ AUX netselect-0.4-bsd.patch 1573 BLAKE2B 62405aa2962ffe74fce014341433d114f6785fd AUX netselect-0.4-flags.patch 172 BLAKE2B 17acc10b64404c9d8525147f5ca526f661a2b2c2b7e7ae31b19186784ef4b4714b14e43ccb77d318016b60c6ff80e381acf9b006487f0d9ebed06e70cb026a3a SHA512 3f665743859e243126de95340da5b9dd42ff671d82f3809e294b752a568b7ede96b13f6a63e18cc522ce19d1537b137d5c05e0e49ce533e8fc337922e18ea74a DIST netselect-0.4-ipv6.patch.xz 18272 BLAKE2B 6197057085e892c156a9fb3a82ac0030a2ff1b4276dde48405de2d2bcfdcef066c4f3eeff174f766af23d2807085f97e459dbffc87b2a2950a472e7964f2e3fc SHA512 422b54df5be45379fe7d6776b6e653a8e49df6fb77421527f2eb6c687597f36cccc7ab5cc5206e9823c318f6facd84fb4e8c0dbffbf9641cee593401cb73abea DIST netselect-0.4.tar.gz 22095 BLAKE2B 1dd83c4dcd38ab7b987ead76f4e7e727980bbad91b59c56948e13540307e685984cc11ea94292d38959c8253f1f6ec2e6e6e044302f26b09153717d6e29e96be SHA512 eee9639122b7cc89218c610794d090582aecb3df138bcef41472c8d40c0f7e998b2c4b04aace13795fda5c710ee28cc2c0784a680ad6d1aa6a14eb441a408bfa -EBUILD netselect-0.4-r1.ebuild 958 BLAKE2B de3233fbf07f2fb59d4361deb7fe16bb6355817f509b765a68a3e2c626b2ba66ee7a798e6fd4d31d044f04854888af9ca17e46dad1b6f2d0eeadf1375accf2a0 SHA512 54d574ba626ef2f7c23348d58ba8863cd504854e06a0bd230dee0de2983a0b93f07f7738e2428859cf2332a787645f09e87241861be68dc07191b2c0231165cd -EBUILD netselect-0.4-r2.ebuild 1204 BLAKE2B 996310fb895d32a007b1008c84953a68a281f424685865d5996fbae678a0950b87ef957c191d139e80b59c9cd78d5bacca15fbd93404287b07f060f298f3fe40 SHA512 06bedc8708ced787284f8f092d982b2c7c9d1683069307df73867d2ba868f27222f1fd1bbe7d55d965145a813a530eb8beb6c32eea00ba957232a558e57c9ca6 +EBUILD netselect-0.4-r1.ebuild 953 BLAKE2B 4fec5029b683d5c90616c2fd162a604984634f97e43b50b529d2fdcb01a557633fe63650bbedc796714e1accb9bd0743b9f69fcb3a459f1e8eb8f8c6a8e5f1c4 SHA512 4452e6d1342bc9456e023bd6e43d9ba0ce67af855e8d685a921cd111d19970d95481e22ab7159b636216a8d756e2264ff6f5037397cfba76068032bf9233f13d +EBUILD netselect-0.4-r2.ebuild 1197 BLAKE2B 12d1aa00f4366c0f36a2fd959aa43c9577be6702b4bac00099529957b2cb5b39c382594b0fd2ba099f96eb0df72678b4a851e5bf01412827d5e695f2db4a6a63 SHA512 4bb713d2be6a713d06f5dc7abfa65e11a4dbe96a61e3e8ed67df78eea490dc2f6f313f224df0a36950ae24b7bdc5456726053a731713a2eb96b20818e9fbc473 EBUILD netselect-9999.ebuild 1144 BLAKE2B 56afffb99197144cfa811f79b15bcff52992ea6bb539e4eb51a7fc45330f5662476c9ddb14db54e2ebe868ea32ddf0c319eb8b6514dce089b0ef23f6586f32f3 SHA512 5478562b06da2080c5aebecaa267318afa19abd5b2dae30db2ccff0d329e8e0ecf55d548d1b4eb878cd35592f715154f6d958cf080bbfa91f9fb31d9c44e0bb9 -MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 +MISC metadata.xml 363 BLAKE2B d51e252ce31b33b3c8beabeb42fd8b7a03570b9f789fda186cbcbc49fd8edb68f673956f1fe263f9d8f30285c617ba62569ccd7e41468d62b2a4e7db56249a7f SHA512 19886317e0d0d4c5088291a2d0d5bacc6f31c16e4880267a347bd23d74c392f9bf0fd51e171fb3c3e40215d1a3c754c05d8bb269b407021be3c087530c5cbbfb diff --git a/net-analyzer/netselect/metadata.xml b/net-analyzer/netselect/metadata.xml index 74c2baebb4ec..0c2c61169992 100644 --- a/net-analyzer/netselect/metadata.xml +++ b/net-analyzer/netselect/metadata.xml @@ -1,8 +1,11 @@ <?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> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <upstream> + <remote-id type="github">apenwarr/netselect</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/netselect/netselect-0.4-r1.ebuild b/net-analyzer/netselect/netselect-0.4-r1.ebuild index 11fd0ab2cae5..cf688a073401 100644 --- a/net-analyzer/netselect/netselect-0.4-r1.ebuild +++ b/net-analyzer/netselect/netselect-0.4-r1.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils toolchain-funcs + +inherit toolchain-funcs DESCRIPTION="Ultrafast implementation of ping" HOMEPAGE="http://apenwarr.ca/netselect/" @@ -13,7 +14,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="ipv6" PATCHES=( diff --git a/net-analyzer/netselect/netselect-0.4-r2.ebuild b/net-analyzer/netselect/netselect-0.4-r2.ebuild index c0eb61494801..19134d444ee9 100644 --- a/net-analyzer/netselect/netselect-0.4-r2.ebuild +++ b/net-analyzer/netselect/netselect-0.4-r2.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P}" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="ipv6" PATCHES=( diff --git a/net-analyzer/nettop/Manifest b/net-analyzer/nettop/Manifest index 099cc4e502a1..067fbd1f2851 100644 --- a/net-analyzer/nettop/Manifest +++ b/net-analyzer/nettop/Manifest @@ -1,5 +1,5 @@ AUX nettop-0.2.3-gcc411.patch 1020 BLAKE2B 29699366491b47c933cf363a85f7590e9c74ba1a4794a0dafcf367ed679caee4167f8e4d1d3774eace65ca71b540f7131509dd3b6923fcc2c37fd11c1af2358c SHA512 e661519449e707260645a6890206dbfb7ebed0134bc87bf58517b913257003b55ad9c2e44a2e96d8313efc5138b7a5a815b2437bfb56ce44ae5cbff50579f48e AUX nettop-0.2.3-offbyone.patch 705 BLAKE2B 4bd382d74fe125b5ee8f28c8af9342b7b3349a8e8c58d757c7c7f9f0cbd435cdafa805f73f0960d9cf0b4b5e6c00a4305bdd89088660f3380afbce009744e5e7 SHA512 4c5c13dfb1eb96639c6e8fcd9236f4fd295424a856e1885a0fe1cce9bbad9fca7c77b291d5cada99aa23eda0ad02f2cc62d67220a410d3a42b8326efa92c648e DIST nettop-0.2.3.tar.gz 22797 BLAKE2B fd8753dac6d4c3c43d3af7d01f85336db97af35e9f63a39c03defb20266a4782ed3169b0545ae09f02c077b193c565d3f78299a93afc0854163a4ae79af4461c SHA512 96e0bff2b0c317636a303c5eb1e27b5ee862e94dad507ce756ef24e2cad7bbe2ebb5fcb46294b790c32b5fd6189381d1c1d0835a522a06b02522d093c15c6ece -EBUILD nettop-0.2.3-r2.ebuild 590 BLAKE2B 293077f9aaf409e02c1326fa3e4ad1f8ca8450104420ea0281fca3f1dbf7db87e20d0508249ecdb4c6000ed732f8d5e3f068b2063636b324e993fcfe1e930f78 SHA512 c1f407cb79f1aee22b579f306074b50387b9a5d054e59c0499c056b16e9ca92e1b97fd988e790f0b5848e1a01887ee27576480e29a566c27eb5a7ecb087ca060 +EBUILD nettop-0.2.3-r2.ebuild 588 BLAKE2B d9a5177599ef7cf7c185221452625f37a41a5738c80eabb49ec5ce7c1de274732b1942c2fa2db6a06a1293c497c9e0ed9e419091161ed3ca70ed990eac63c36b SHA512 e1f3e8a767df0290646af5b1a044f17f547b4a0e2934a8aca8316619bee1c088c8148a371364fc5a1409eef8b8c0944b433fd16d091724576d1f17ab0fb82e8b MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/nettop/nettop-0.2.3-r2.ebuild b/net-analyzer/nettop/nettop-0.2.3-r2.ebuild index 9f5605fa16a6..7128eaac5191 100644 --- a/net-analyzer/nettop/nettop-0.2.3-r2.ebuild +++ b/net-analyzer/nettop/nettop-0.2.3-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs -DESCRIPTION="top like program for network activity" +DESCRIPTION="top-like program for network activity" SRC_URI="mirror://gentoo/${P}.tar.gz" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" @@ -19,10 +19,13 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-gcc411.patch + "${FILESDIR}"/${P}-offbyone.patch +) + src_prepare() { - epatch \ - "${FILESDIR}"/${P}-gcc411.patch \ - "${FILESDIR}"/${P}-offbyone.patch + default tc-export CC } diff --git a/net-analyzer/netwox/Manifest b/net-analyzer/netwox/Manifest index 06ae61fc3325..35958b4a746b 100644 --- a/net-analyzer/netwox/Manifest +++ b/net-analyzer/netwox/Manifest @@ -1,4 +1,4 @@ DIST netwox-5.39.0-doc_html.tgz 146301 BLAKE2B 5d65cce6dc36f7fb682a7ab3d51b04366a9e43541837a07ff82e7dba29367adad92fcefcd68eb68a7f30c36adbce7765ee0cbd1d77a6a873a53c0b03ee9f0f1c SHA512 1bb6c87f2aeea8b10e9bec0725ed82b21c41290d2f2626024b13525fd92596e7aa9f91788d966a51900c0e1b346ac9fb30000344fa5b1450fe9ceb724df4be56 DIST netwox-5.39.0-src.tgz 771942 BLAKE2B f6115e799404f420fdcee4551b78f3aeb5a3db5b5d528425fd4a68f0a5509bcace2f7d66cbbd56ae380d466425791b0a0b74325967dc2248ba25b1b55b70438b SHA512 3781c1c860d1545c269b27a702c59f1cb6b12af2e66fb3cbe776f3e085681a75ed3096d64cfdf92f65eff7213ceaab474b7e15c169c12e2c05220790ce337e37 -EBUILD netwox-5.39.0.ebuild 1339 BLAKE2B 5f2da4341929469eb5ec4ffab51502041c1a742c345feb59c5d0e69b89f15c622c088cd932f531a4cb7e1afc43ec3ab3dde82060b6956c4210b2d8d2c059a5a0 SHA512 17a620c9634b4c497cd954a52bf47c7b111859e68c5b881d2bf27df66e0109c2804064653821ef57c1922c6d3b78e097f163a13cd978b7e6ec42f5ea218a1462 +EBUILD netwox-5.39.0.ebuild 1366 BLAKE2B 1bd1f70c29bae5ddc3a5702186cf35dc42b0e70b2559ac043538b275843685fb50bd2ce077a8e32f134a22496290012be2c911584ef54a5b243e592700506f53 SHA512 003a77b5e6a5b22ba99cde65bf8a273395d2c4010ed4481e77b2ffbe985127a24ac7866f59ac793143ed1b78f1f055313daee871e674f4c2b128fa95f0c24ee7 MISC metadata.xml 355 BLAKE2B 1c2cb9136ba1071dafced9abbcfad510c05a3b1487e6629aa179911d1c68f8c444fd1cbe9c934c59d898ded671386de0bef26df4f8b3578faa76012b3fe01846 SHA512 0df03bd538fd4e5705d3ca9b0c5df667f74d63439f49740face0f090ec69880091fb99928037c95625c4be6765b0c45aadc7c4d52325f7cdd271129610cd6218 diff --git a/net-analyzer/netwox/netwox-5.39.0.ebuild b/net-analyzer/netwox/netwox-5.39.0.ebuild index 962009bd0fde..60405d17bda4 100644 --- a/net-analyzer/netwox/netwox-5.39.0.ebuild +++ b/net-analyzer/netwox/netwox-5.39.0.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # NOTE: netwib, netwox and netwag go together, bump all or bump none -EAPI=5 -inherit multilib toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Toolbox of 217 utilities for testing Ethernet/IP networks" HOMEPAGE=" @@ -13,6 +14,7 @@ HOMEPAGE=" " SRC_URI="mirror://sourceforge/ntwox/${P}-src.tgz doc? ( mirror://sourceforge/ntwox/${P}-doc_html.tgz )" +S="${WORKDIR}"/${P}-src/src LICENSE="GPL-3" SLOT="0" @@ -26,9 +28,9 @@ DEPEND=" " RDEPEND="${DEPEND}" -S=${WORKDIR}/${P}-src/src - src_prepare() { + default + sed -i \ -e 's:/man$:/share/man:g' \ -e "s:/lib:/$(get_libdir):" \ @@ -57,5 +59,8 @@ DOCS=( src_install() { default - use doc && dohtml -r "${WORKDIR}"/${P}-doc_html/* + if use doc ; then + docinto html + dodoc -r "${WORKDIR}"/${P}-doc_html/* + fi } diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest index 6cf66145f33c..ea5c9efc03eb 100644 --- a/net-analyzer/nfdump/Manifest +++ b/net-analyzer/nfdump/Manifest @@ -3,10 +3,9 @@ AUX nfcapd.initd 1261 BLAKE2B 092b65523720ab0f4790650764e758da8504234dc888aadf8e AUX nfdump-1.6.19-compiler.patch 528 BLAKE2B b289f32a18a03b2725360b84314b294ebe6843f3ecaf3eb6ddffb9ba4e85641167c705682a8fc90560e0ce5d41dfeed7a739d011569361c31107dec9c98bf213 SHA512 300e79fdf994bd6a75c9595417d4e3e12b7e4030d6b1fa685b1b352404f36cfe2f1d8f31796a62f2a465a93dfeab0ab81caaf63a4de56a7851aea255b4607dc8 AUX nfdump-1.6.19-libft.patch 815 BLAKE2B 8b82ce3c93214e016b63fa593e7e8d3c8960e1d2636a9ad0cebd75e9945c73d9d42ebfcf5afe82ec10d62ed3d4bc8334670aaf46f543782b5c86ac2f60d57db1 SHA512 884458ac127497e9c3c7b5f8ed4eca60278d052ba2749efad1d267446c6a62da4417a018aca758bac6633d09ab08e699b54163300ed176510271aabf0769d3c4 AUX nfdump-1.6.21-remove-strict-rfc-7011-handling.patch 1726 BLAKE2B 6f2d2c0ebb336eafba60aabec9bc2eb120c61b67401704786ed105eaeba090d893004ea4c8be4e40b360cf91c2b306c4cbb9ef9f60dc6b5c3b92fe1c5c5d904f SHA512 e7ca0512b01a0838ec9a6d52710da23ce6db5021af19a354bc59cbaf7c6b246fee50e7c3ae9b71eb34e94396cffba7f1069140c0f476c8a2b61fa9a06113f425 -DIST nfdump-1.6.19.tar.gz 561923 BLAKE2B 458cf0e23f433c7c1c27450712a2f9f8f75a990eeaf079bac9a74bf5abf4bc22c930294494424fd8e7f7d03ffc1e5f1e35ba50e29ba4f3528f63e1739524c9ed SHA512 577c23ca3aae8ab035c734c137d3a338e09f46b5f8551946fd84b9a03fae1ef2aa80e2ab9657eb226defcd753bb63503eeb85316ca1df18d95b85270df8f379e +AUX nfdump-1.6.22-libtool-archives-slibtool.patch 3503 BLAKE2B 1118f50a17b134dfbd93cbb66e54c3228906782fabc6e0df174c912569120c588a03170a8bfd715389611b0dcc5b469415d2932f610f8b5398b8424f6e0c5342 SHA512 646606077ef1771b8f4c776939773ab7b2875c4f28710f44df826b7d8d5e5b8a163fff60eb6869ee4dfab8a7edc0f277e19ed88511719d2455b9bc5133e81124 DIST nfdump-1.6.21.tar.gz 561617 BLAKE2B 61a52cb7ee724c47f93e0ce8dd0515306c16b94d8b351f9543deecc2b28c813f09f0e4ba621f2561760924af683ffd527d00936fbc5f91f83d6f727d6cf9e5d9 SHA512 c9162b7a6653267cd4d66a2d75bb2c3d65c431bb29ee549bac2a208fe7f2bc871bb91dfa6d89d6f18cd69f1d435dd25ba1c5dfe6e10b0efc4a582f2e67913a34 DIST nfdump-1.6.22.tar.gz 563266 BLAKE2B f985a8f8bcbb7ff3ab98d4f01449b121e92914bc47ec7fa07c1a7a068f6722447228b0166d0f2e966c0bab2c93e34133743e8dff7d8dc41a1c70ffac64fbbf6e SHA512 3508e54b4c4785a79118147779300eebd9485532e157b37ed6487255dacaa49959d425c8fc489caa98ff559a4859b9e456e97a6c8a06a1029eb904aa1f9efb61 -EBUILD nfdump-1.6.19.ebuild 1390 BLAKE2B ccd3bc87b5f005bd5e5767090f41b7380bfb39224c1f5d31007004e171483e18bb293f9cc157f887f30749a8f694fbc25418a883ebeace04f4a3dbf90a88c662 SHA512 e0e772dae0a2550fd14808e2132a83587508684fe57136754db314add1c55857e5b8d6787eadcb066c73f48522157c2bf414b6cfbd028977adc63c99a6f42035 -EBUILD nfdump-1.6.21-r1.ebuild 1536 BLAKE2B 6174400853f6e976b9092b99610ef4b7795e1edad71b43b1a302390fdf94767d8616342ecd055278d329cc5f9a81ca1dca908a1720b34842bb159feff986b75c SHA512 f75118237418884d494e4c3ad3e6accef30a004c4688c2b2b303776fc0ec59459e4ca8e7918682dea7787706758481e9b1bb997a8cfdf5f2ed9c2574de874c80 -EBUILD nfdump-1.6.22-r1.ebuild 1682 BLAKE2B f55767f172e9d8dc112079f2a3aef7df3ed9f824c19438ee2c33634fd7882f3b3ca154c9de7aad3b04a922f87efcf0034c55b45a6a76c293778b50ea90591219 SHA512 fb4438500d299741164ca77004db9bb8bfed3a4a16225b8e835870b5fa8f8a76523f4b091dda393742c8e905899aad3a3e73dc27c569cb97faa98b591450b605 +EBUILD nfdump-1.6.21-r1.ebuild 1534 BLAKE2B c56602c05b7dcf8bc53076a140bda37026f85377f43ceec13447a240a3bfe45cb0bdc060eac7d0b6d0ba6c3c5b79bac04f7cd138650f8231e1ab895b6c23b69c SHA512 23e2444d93ff39358fd3647fd10ea8efcb15e83b317149bdc6e006cdc04d150678bf9049120affb7faa36b36f1525ec0d61cf4512e340d482d49f0692699f4b6 +EBUILD nfdump-1.6.22-r1.ebuild 1720 BLAKE2B e0d274c34ddf13ea1c7de9e6010641f11a564ca3cd35c87cc4a2557f7beae27e183de37734d51f1e785053acd7ba729eeda55fc83c0ffa949cee17cd7740890d SHA512 426138c255976b081d91fc0640974e4fff47b0438acb617bc7bc469f84a1b1f54d3fa6b1b562e0efe8fbe556d839cb3633c9801eeac8eed2a5c4c768c1534829 MISC metadata.xml 1277 BLAKE2B 627dfd7acef2f5734027131342b29bfc3307fa8e462896b9a08870768aa3c452c41e32289cde6aa84967ae64ffafba8a0390d342e0363d30ccd0a81fb536575e SHA512 bd88e71c62abaf83eea07bf97441f9d66061d459c44785e382ea760fd4f8a706b6bd089ead6ade13a381066355c12070839ec2c9a6d6477397055e7fb3b1b089 diff --git a/net-analyzer/nfdump/files/nfdump-1.6.22-libtool-archives-slibtool.patch b/net-analyzer/nfdump/files/nfdump-1.6.22-libtool-archives-slibtool.patch new file mode 100644 index 000000000000..0a0048120ea4 --- /dev/null +++ b/net-analyzer/nfdump/files/nfdump-1.6.22-libtool-archives-slibtool.patch @@ -0,0 +1,111 @@ +https://bugs.gentoo.org/778704 +https://github.com/phaag/nfdump/pull/282 + +From 44b6854a7e67bec438659452993a517b9ec3e753 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Sat, 27 Mar 2021 07:23:12 -0700 +Subject: [PATCH] bin: Use the libtool archives to link. + +Signed-off-by: orbea <orbea@riseup.net> +--- + bin/Makefile.am | 40 ++++++++++++++-------------------------- + 1 file changed, 14 insertions(+), 26 deletions(-) + +diff --git a/bin/Makefile.am b/bin/Makefile.am +index 0f8e787..456cda4 100755 +--- a/bin/Makefile.am ++++ b/bin/Makefile.am +@@ -68,37 +68,31 @@ libnfdump_la_LDFLAGS = -release 1.6.22 + + nfdump_SOURCES = nfdump.c nfdump.h nfstat.c nfstat.h nfexport.c nfexport.h \ + $(nflowcache) $(nfprof) +-nfdump_LDADD = -lnfdump +-nfdump_DEPENDENCIES = libnfdump.la ++nfdump_LDADD = libnfdump.la + + nfreplay_SOURCES = nfreplay.c $(nfprof) \ + $(nfnet) $(collector) $(nfv1) $(nfv9) $(nfv5v7) $(ipfix) +-nfreplay_LDADD = -lnfdump +-nfreplay_DEPENDENCIES = libnfdump.la ++nfreplay_LDADD = libnfdump.la + + nfprofile_SOURCES = nfprofile.c profile.c profile.h $(nfstatfile) +-nfprofile_LDADD = -lnfdump -lrrd +-nfprofile_DEPENDENCIES = libnfdump.la ++nfprofile_LDADD = libnfdump.la -lrrd + + nftrack_SOURCES = ../extra/nftrack/nftrack.c \ + ../extra/nftrack/nftrack_rrd.c ../extra/nftrack/nftrack_rrd.h \ + ../extra/nftrack/nftrack_stat.c ../extra/nftrack/nftrack_stat.h + nftrack_CFLAGS = -I ../extra/nftrack +-nftrack_LDADD = -lnfdump -lrrd +-nftrack_DEPENDENCIES = libnfdump.la ++nftrack_LDADD = libnfdump.la -lrrd + + nfcapd_SOURCES = nfcapd.c \ + $(nfstatfile) $(launch) \ + $(nfnet) $(collector) $(nfv1) $(nfv5v7) $(nfv9) $(ipfix) $(bookkeeper) $(expire) +-nfcapd_LDADD = -lnfdump +-nfcapd_DEPENDENCIES = libnfdump.la ++nfcapd_LDADD = libnfdump.la + + nfpcapd_SOURCES = nfpcapd.c \ + $(pcaproc) $(netflow_pcap) \ + $(nfstatfile) $(launch) \ + $(nfnet) $(collector) $(bookkeeper) $(expire) $(content) +-nfpcapd_LDADD = -lnfdump +-nfpcapd_DEPENDENCIES = libnfdump.la ++nfpcapd_LDADD = libnfdump.la + + if READPCAP + nfcapd_CFLAGS = -DPCAP +@@ -116,8 +110,7 @@ endif + sfcapd_SOURCES = sfcapd.c sflow_nfdump.c sflow_nfdump.h sflow.h sflow_v2v4.h sflow_process.c sflow_process.h\ + $(nfstatfile) $(launch) \ + $(nfnet) $(collector) $(bookkeeper) $(expire) +-sfcapd_LDADD = -lnfdump +-sfcapd_DEPENDENCIES = libnfdump.la ++sfcapd_LDADD = libnfdump.la + + if READPCAP + sfcapd_CFLAGS = -DPCAP +@@ -126,32 +119,27 @@ sfcapd_LDADD += -lpcap + endif + + nfreader_SOURCES = nfreader.c +-nfreader_LDADD = -lnfdump +-nfreader_DEPENDENCIES = libnfdump.la ++nfreader_LDADD = libnfdump.la + + nfanon_SOURCES = nfanon.c $(anon) +-nfanon_LDADD = -lnfdump +-nfanon_DEPENDENCIES = libnfdump.la ++nfanon_LDADD = libnfdump.la + + nfgen_SOURCES = nfgen.c +-nfgen_LDADD = -lnfdump +-nfgen_DEPENDENCIES = libnfdump.la ++nfgen_LDADD = libnfdump.la + + nfexpire_SOURCES = nfexpire.c \ + $(bookkeeper) $(expire) $(nfstatfile) +-nfexpire_LDADD = -lnfdump @FTS_OBJ@ +-nfexpire_DEPENDENCIES = libnfdump.la ++nfexpire_LDADD = libnfdump.la @FTS_OBJ@ + + nftest_SOURCES = nftest.c +-nftest_LDADD = -lnfdump +-nftest_DEPENDENCIES = nfgen libnfdump.la ++nftest_LDADD = libnfdump.la ++nftest_DEPENDENCIES = nfgen + + if FT2NFDUMP + ft2nfdump_SOURCES = ft2nfdump.c + ft2nfdump_CFLAGS = @FT_INCLUDES@ +-ft2nfdump_LDADD = -lnfdump -lft -lz ++ft2nfdump_LDADD = libnfdump.la -lft -lz + ft2nfdump_LDADD += @FT_LDFLAGS@ +-ft2nfdump_DEPENDENCIES = libnfdump.la + endif + + check_DIST = inline.c collector_inline.c nffile_inline.c nfdump_inline.c heapsort_inline.c applybits_inline.c diff --git a/net-analyzer/nfdump/nfdump-1.6.19.ebuild b/net-analyzer/nfdump/nfdump-1.6.19.ebuild deleted file mode 100644 index 3c3245ff7c29..000000000000 --- a/net-analyzer/nfdump/nfdump-1.6.19.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="A set of tools to collect and process netflow data" -HOMEPAGE="https://github.com/phaag/nfdump" -SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/1.6.15" -KEYWORDS="amd64 x86" -IUSE="debug ftconv nfprofile nftrack readpcap sflow static-libs" - -COMMON_DEPEND=" - app-arch/bzip2 - sys-libs/zlib - ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) - nfprofile? ( net-analyzer/rrdtool ) - nftrack? ( net-analyzer/rrdtool ) - readpcap? ( net-libs/libpcap ) -" -DEPEND=" - ${COMMON_DEPEND} - app-doc/doxygen - sys-devel/flex - virtual/yacc -" -RDEPEND=" - ${COMMON_DEPEND} - dev-lang/perl -" -PATCHES=( - "${FILESDIR}"/${PN}-1.6.19-compiler.patch - "${FILESDIR}"/${PN}-1.6.19-libft.patch -) -DOCS=( AUTHORS ChangeLog README.md ) - -src_prepare() { - default - - eautoreconf - - doxygen -u doc/Doxyfile.in || die -} - -src_configure() { - # --without-ftconf is not handled well #322201 - econf \ - $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \ - $(use nfprofile && echo --enable-nfprofile) \ - $(use nftrack && echo --enable-nftrack) \ - $(use_enable debug devel) \ - $(use_enable readpcap) \ - $(use_enable sflow) \ - $(use_enable static-libs static) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild index f6000c763cbd..84ebe03aee28 100644 --- a/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild +++ b/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0/1.6.15" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug doc ftconv nfprofile nftrack readpcap sflow static-libs" COMMON_DEPEND=" diff --git a/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild index 67db70201342..4b6ed40bdb2a 100644 --- a/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild +++ b/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild @@ -11,9 +11,9 @@ SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0/1.6.22" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow - static-libs" +KEYWORDS="amd64 x86" +IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow" + REQUIRED_USE="?? ( jnat nsel )" RDEPEND=" @@ -38,6 +38,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.6.19-compiler.patch "${FILESDIR}"/${PN}-1.6.19-libft.patch + "${FILESDIR}"/${P}-libtool-archives-slibtool.patch ) DOCS=( AUTHORS ChangeLog README.md ) diff --git a/net-analyzer/ngrep/Manifest b/net-analyzer/ngrep/Manifest index 6500597b17c3..d9055a54efed 100644 --- a/net-analyzer/ngrep/Manifest +++ b/net-analyzer/ngrep/Manifest @@ -1,4 +1,4 @@ AUX ngrep-1.47-regex.patch 683 BLAKE2B 5eaed7398a140dee747664ce05c3f9afb9f57f827ef96efd4ad284be313dd234c15603bcd842c7d2c96a46900de46205cec1d0270cc83d36b5e9feedf1f3b2b3 SHA512 e435f1e4fb35fbed0eeef414da2fd19c09311287b466e667c9150d53a1ae52abbe31173758192c9638eaecf54e4c3be99020e9831a2543b2e4d0c61f5b9f55de DIST ngrep-1.47.tar.gz 187067 BLAKE2B 4fa47ed343b88e84fb5a3ab6e4dc8139cb008ffcbea901a67664335ad76d36e975e037620cebb1b204ba22e5b139e822c7cfbc74a061fc6cacae631be3f87a52 SHA512 47ba65878df6b555701c866721a8a935eabdcce636d398284cbfe5f63baf68c62d994a2f373ea4fc8f44fbed3eecee149f2ee48d39c71c04d34e5a088db8c657 -EBUILD ngrep-1.47.ebuild 977 BLAKE2B d21dfa617c287895d12884125ddd71c7120f4927ae272144d51ee219b939511c19869a59911339d0ed72991abf4e8814ce7909d714353959c1857dc8dde872fe SHA512 46b2fbbef2f0471cd0c72f2daf7e7bd655c98fd4ca397cfffbacdb6b094a7a3d22c28ab553a72936d3abe6a2cef3fcc8e5dd587e1f0b4602e750c197c230889d +EBUILD ngrep-1.47.ebuild 978 BLAKE2B a9937b5e183427f3c2289d9a5c371e05bbf6f6bfa3ad888f89b0e214044cf62aae42d361bac826bc727e08bc5c0689ae452a9ee3161ca51d0c7bde02354a92f0 SHA512 43894201e71134b422b189339046a40df5aab4ebe0690c5c253bcbcb6201f32a73249076e48f89edb6445b8c2bfed27bab297cfb746af465f9d9e305d12be32a MISC metadata.xml 699 BLAKE2B a0c81b2cce47cc8c15bc81f24b3f85bac0bb6e33c1bad000946fe66f1508e32e5f314410255d0b0f43c7ec662d339f3b3c0c5e56e4bedc3ea5c311071ca01ee4 SHA512 4967443bea3dc14cbf9bf4fd7d10842adb49b9ed61c1a09e622983beb078e14acff01f7d2f4aaa8933a89dffac6b679976e09b6399dafe05dde9678404dd0ccc diff --git a/net-analyzer/ngrep/ngrep-1.47.ebuild b/net-analyzer/ngrep/ngrep-1.47.ebuild index 6ca8a342aa3a..768d8053525b 100644 --- a/net-analyzer/ngrep/ngrep-1.47.ebuild +++ b/net-analyzer/ngrep/ngrep-1.47.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 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/jpr5/ngrep/archive/V${PV/./_}.tar.gz -> ${P}.tar.gz" LICENSE="ngrep" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="ipv6" DEPEND=" diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index fc12a1e376e5..187da688a745 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -14,8 +14,8 @@ AUX nmap-7.91-no-FORTIFY_SOURCE.patch 2007 BLAKE2B 708b85b655592e919fde46d2f3e39 AUX nmap-9999-netutil-else.patch 373 BLAKE2B 39f28e3b6a8ddf55029f1db1444200ee475e9351105c7348fe9fd48156e452d8f9697b83a7860ffb188a7f8089c3696c8eef49322a7b029496a334972ae1a180 SHA512 1e062a571eaefbea55f8c4164d8c2b7da177f7c5dd7e846bea5515f81847248bfcaffdb58433fee5f2e08cba387c1ddda21bacbd86efc32a6cdea486cac57cd1 DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b DIST nmap-7.91.tar.bz2 10503500 BLAKE2B a758e0a20f8243b33b000c23e025b87bdb712390b82982a1aca219c9b98cd55c6ababb810328c7d0cdb5c884ef9bd5b187b9e4929454278342d7ee5ef441cded SHA512 9d59f031b5f748311e9f9a0b9d05ad4a7a70fc6ac17598d7c4c81a4825c95d53817d74435d839e67b9379a052f2d37889fd634f9c75301a851f465d60fb9974d -EBUILD nmap-7.80-r2.ebuild 3386 BLAKE2B fd3b88003aaab420a29745a407f07ec1a295eb47def0843a16acd3e6202068a4b3d32cb6129ee4c969c4c5c0791213e8b220e8f21332efab6425c68ae2a35e2e SHA512 df22d7061dec12102a3e3b42aac686144dc43d1a5208e5712af03e247b50d91a71c24caffe951d6ab8ff8d309443dd3f2a143d3007ecab3155a352df494a011b -EBUILD nmap-7.91-r1.ebuild 2800 BLAKE2B 593cdae269404efedf60ba475a0e9ad5d66bfd9310345daefad33bb7ac426bcab47528bcd514a5c2fce2c3aa2bc993d261dcbbb70f12d5d7106d1468722d9ee2 SHA512 74ad16d193833aa98abea4e236b8a684aabf5ad79945b0c3c9770f573531186d544a499582f2a12774a17f0e46850a711e7a1ce6e04887fc8b6a0233d31e32ae -EBUILD nmap-7.91-r2.ebuild 2888 BLAKE2B f4f835da004889bcb8de59411cb8eadd04f495ff7140fe3b6c11fbb243684139bf8a30c1aa12629c47e8a77938d11d5886b60cabc066d7779184bf2bbed517be SHA512 ebf3a616faf1e43d8b9494d2e74dd87223a0b66b9adde04e5c1b4b6ff448f15ccbd9dacd706f4155f3373a952869bc7a6ce66aaafac39204b66b74fcb2676cbf -EBUILD nmap-9999.ebuild 2716 BLAKE2B 6be7210726dc27a44345a78cd182fdd9ac6ead652bc0e0f0408d52ee267c1698588fac9e987da1c1d1a4965d0d41dd3ce03dcc2912c53e1d19ee4687df7fcff4 SHA512 807f71d9fe04ab3a535eea8d7f9e160ba4cae2d580ffad680fb36ba0f1e82697da76aaaf228813de610ce0fcf294f1caa9793ea88ce9142529e08deb660ac824 +DIST nmap-7.91.tar.bz2.asc 195 BLAKE2B 16c4bad309c4652128a67f00c6b89f6552f432166733cac45756c20df0f48bdd0b8b9edbcce3df8f25d0a8e422be2494d9d5639fa74fc3f1e2c13489c52387c1 SHA512 376b74fc15896a1008709dac45b5af5d35ca00a1753994aba3ee6cffe2c2f0d67619fab45d57e83b454cfb376defe965f2bf881ef4cb8d5f8f2215979ad8ee96 +EBUILD nmap-7.80-r2.ebuild 3365 BLAKE2B fb4cc9da0de282010524e41e12c52b75a50f39beda01e89a03208dc6e8f66125f2aa2fd8def3b12e39cadca8de13b76bd3a3c9c6d0d9614b598540b61997a7d6 SHA512 e6633ae059aec1bf20f54a867c0862f1f2c1bff3e780f5d0eb45751fbce06d5db1eb6fa1b9c65a8453bcc58354b7d1a33396926106ac5885b2f30302cf8856ff +EBUILD nmap-7.91-r2.ebuild 3290 BLAKE2B 7b67a0803b4a30c5376d81eee86ab93e24dba1ebd947c083a05606a46ed2330607d5ebdae43d9d09d0d6124a6467b436b11182bbb46d56d31fb19ce17d05bd94 SHA512 f7da86d6f8e1c50214ab1e6bcff21f1dbe08a54ee9b9003a438243421db01d2f6f72417eabcb42993c43c6227de4da920e35c2f716b21807edec4529ecb4c543 +EBUILD nmap-9999.ebuild 3254 BLAKE2B 398739112039043145f8e4588e5ff722ad4858580bb0a309bc91f8f68748cf0be2060d3f5b0c3e6d1adbb62706ca45fb7115b944008625f76b70586ad5fdb154 SHA512 fc5d4573415551330e597c56a5b5264490d6931f9bb78d78815574346043eb1647266370383fe21be8c46e06f59174ae47a395a252e5c4276cb12b1d409c64cb MISC metadata.xml 979 BLAKE2B d77a475cc6bb5be93382dd712d5cee9b4a358a0cab70a0b13b40dd78cd6c5ccdc1802eaa58814ef3868281b2129c907cd22d480b4667ba9c162c0c0ac1ef2aa4 SHA512 c97db5c77b309a940b3307ef35edd202feb0cc5778d4d4ef9a624458012b473fb0a96c6d9460c3d42cc1fe3c5c9009c29aabff058c1dff818b6901d068f47e48 diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild index 5f48909bca01..4ce4485f5c7f 100644 --- a/net-analyzer/nmap/nmap-7.80-r2.ebuild +++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild @@ -6,7 +6,7 @@ EAPI=7 LUA_COMPAT=( lua5-3 ) LUA_REQ_USE="deprecated" -inherit autotools desktop flag-o-matic lua-single toolchain-funcs +inherit autotools lua-single toolchain-funcs DESCRIPTION="Network exploration tool and security / port scanner" HOMEPAGE="https://nmap.org/" diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild deleted file mode 100644 index 8b08d910d677..000000000000 --- a/net-analyzer/nmap/nmap-7.91-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-3 ) -LUA_REQ_USE="deprecated" - -inherit autotools flag-o-matic lua-single toolchain-funcs - -DESCRIPTION="Network exploration tool and security / port scanner" -HOMEPAGE="https://nmap.org/" -SRC_URI="https://nmap.org/dist/${P}.tar.bz2" - -LICENSE="|| ( NPSL GPL-2 )" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua" -REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )" - -RDEPEND=" - dev-libs/liblinear:= - dev-libs/libpcre - net-libs/libpcap - libssh2? ( - net-libs/libssh2[zlib] - sys-libs/zlib - ) - nse? ( sys-libs/zlib ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - system-lua? ( ${LUA_DEPS} ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-5.10_beta1-string.patch - "${FILESDIR}"/${PN}-5.21-python.patch - "${FILESDIR}"/${PN}-6.46-uninstaller.patch - "${FILESDIR}"/${PN}-6.25-liblua-ar.patch - "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch - "${FILESDIR}"/${PN}-7.25-libpcre.patch - "${FILESDIR}"/${PN}-7.31-libnl.patch - "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch - "${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch -) - -pkg_setup() { - use system-lua && lua-single_pkg_setup -} - -src_prepare() { - rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die - - cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die - - default - - sed -i \ - -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ - Makefile.in || die - - cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die - - eautoreconf - - if [[ ${CHOST} == *-darwin* ]] ; then - # we need the original for a Darwin-specific fix, bug #604432 - mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die - fi -} - -src_configure() { - # The bundled libdnet is incompatible with the version available in the - # tree, so we cannot use the system library here. - econf \ - $(use_enable ipv6) \ - $(use_with libssh2) \ - $(use_with ncat) \ - $(use_with nping) \ - $(use_with ssl openssl) \ - $(usex libssh2 --with-zlib) \ - $(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \ - $(usex nse --with-zlib) \ - --cache-file="${S}"/config.cache \ - --with-libdnet=included \ - --with-pcre=/usr \ - --without-ndiff \ - --without-zenmap -} - -src_compile() { - local directory - for directory in . libnetutil nsock/src \ - $(usex ncat ncat '') \ - $(usex nping nping '') - do - emake -C "${directory}" makefile.dep - done - - emake \ - AR=$(tc-getAR) \ - RANLIB=$(tc-getRANLIB) -} - -src_install() { - LC_ALL=C emake -j1 \ - DESTDIR="${D}" \ - STRIP=: \ - nmapdatadir="${EPREFIX}"/usr/share/nmap \ - install - - dodoc CHANGELOG HACKING docs/README docs/*.txt -} diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild index 09c622523f36..492355ccf044 100644 --- a/net-analyzer/nmap/nmap-7.91-r2.ebuild +++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild @@ -5,16 +5,29 @@ EAPI=7 LUA_COMPAT=( lua5-3 ) LUA_REQ_USE="deprecated" - -inherit autotools flag-o-matic lua-single toolchain-funcs +inherit autotools lua-single toolchain-funcs DESCRIPTION="Network exploration tool and security / port scanner" HOMEPAGE="https://nmap.org/" -SRC_URI="https://nmap.org/dist/${P}.tar.bz2" +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/nmap/nmap" + + # Just in case for now as future seems undecided. + LICENSE="NPSL" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc + inherit verify-sig + + SRC_URI="https://nmap.org/dist/${P}.tar.bz2" + SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )" + + LICENSE="|| ( NPSL GPL-2 )" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +fi -LICENSE="|| ( NPSL GPL-2 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua" REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )" @@ -35,6 +48,10 @@ RDEPEND=" " DEPEND="${RDEPEND}" +if [[ ${PV} != *9999* ]] ; then + BDEPEND+="verify-sig? ( app-crypt/openpgp-keys-nmap )" +fi + PATCHES=( "${FILESDIR}"/${PN}-5.10_beta1-string.patch "${FILESDIR}"/${PN}-5.21-python.patch diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index 782f91bf13e1..fa6114906f22 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -1,19 +1,32 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 LUA_COMPAT=( lua5-3 ) LUA_REQ_USE="deprecated" - -inherit autotools flag-o-matic git-r3 lua-single toolchain-funcs +inherit autotools lua-single toolchain-funcs DESCRIPTION="Network exploration tool and security / port scanner" HOMEPAGE="https://nmap.org/" +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/nmap/nmap" + + # Just in case for now as future seems undecided. + LICENSE="NPSL" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc + inherit verify-sig -EGIT_REPO_URI="https://github.com/nmap/nmap" + SRC_URI="https://nmap.org/dist/${P}.tar.bz2" + SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )" + + LICENSE="|| ( NPSL GPL-2 )" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +fi -LICENSE="NPSL" SLOT="0" IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua" REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )" @@ -35,6 +48,10 @@ RDEPEND=" " DEPEND="${RDEPEND}" +if [[ ${PV} != *9999* ]] ; then + BDEPEND+="verify-sig? ( app-crypt/openpgp-keys-nmap )" +fi + PATCHES=( "${FILESDIR}"/${PN}-5.10_beta1-string.patch "${FILESDIR}"/${PN}-5.21-python.patch diff --git a/net-analyzer/nmbscan/Manifest b/net-analyzer/nmbscan/Manifest index 3315cc3209ff..81cfe4950dd8 100644 --- a/net-analyzer/nmbscan/Manifest +++ b/net-analyzer/nmbscan/Manifest @@ -1,4 +1,4 @@ AUX nmbscan-1.2.5-head.diff 442 BLAKE2B e97b6359f9479b76eae7cddc837df06a02b5adf886ee142f5e0b6dfe27debda30d49197c0184e802686d00df510ed0f6a47ea90c294ee1e124fb980b379121e9 SHA512 6fd79b7b9462700245df3c91345a197cbadafb30f60737b2426285f9a4bff969c752bd68bdde4f305cdd8079a5c89fa1be75360a2e35caf495489c01081b0ceb DIST nmbscan-1.2.5.tar.gz 44749 BLAKE2B be49afa46c6ed1533f3e3d7b5c6fbe54b83802385ed9b670f1cdc0105eae99135000be5e98a693ad2adca54f9948ebacc8cd4fc677828a61a5fa85667d584fcd SHA512 37030c6759cc8b257356274b54ec7474e49ddc523be20180c509064f9238da3350f0f0e73e84f2e89201405e93a350a7a7cdc24ef890e638b62648ee2fc4feb9 -EBUILD nmbscan-1.2.5-r1.ebuild 559 BLAKE2B b2d742fb8ed4e3de9a5bda9f8ee2111b92d05d900e50e6548b9d7726daadcbe7b71b5b8f4f42ac63c367b681c2f8541d6b38353f781084a2b1e2d4b26d750cce SHA512 adcba7e680bc53268ac7e64e3cefd60095c7ba737f5eae312ab8151c3c3647d466ed27633d672a98c652cdfae850a88a2a1d773e576e20500479ffaf9c8eb0ab +EBUILD nmbscan-1.2.5-r1.ebuild 560 BLAKE2B 2d53267f937da54268d9f91868ff8a6e648cd62af23657acb377384f0d37307a033b39dc4a8b7429fd7453e76738e60b1d48c922eee344ed0cef9344061dbfdd SHA512 111fc651465be33b8b7f59c105f7fb810b2ab411fcc7ce71ae92aa26dfffdc5ba76aa4091624b255defba67a03e95b5818c848ff05a88ed9106b114f7f863061 MISC metadata.xml 683 BLAKE2B 8a9b8ad3c95bf0889477f9f8bb0a5f150f24e6d1cdc796a870c8f315497c1383c585b51b18c43dbf2f66122cd0db332c4f10da05ec62647573ba02fe2b450f16 SHA512 f0bb01d9be906681f1e7bf349e776b7cfc15a61be7a3e944e7291dac9f42a3fe151b05e20c6a13b98c8bad598d56811699a8365ba9227419bea4e2373de26b19 diff --git a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild index d47b82ff6739..4381c801ab89 100644 --- a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild +++ b/net-analyzer/nmbscan/nmbscan-1.2.5-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 @@ -9,7 +9,7 @@ SRC_URI="http://nmbscan.g76r.eu/down/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86" RDEPEND="net-dns/bind-tools net-fs/samba diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest index 5095364f0639..009d143914a0 100644 --- a/net-analyzer/ntopng/Manifest +++ b/net-analyzer/ntopng/Manifest @@ -1,13 +1,10 @@ -AUX ntopng-3.8-mysqltool.patch 437 BLAKE2B 13df7c163168b59917843a2c7dee13f41c6d3b95e16a0967c849771dbb552c72f1d5e8d16dd76ed6b51c149a1143707d432761abd907bec3d7b6257a099debca SHA512 f13a6d529e2e2d659763c2ec013ebdb61f3b741d242f375345e60e66d7cf4adeefdff6876d3a15497fc9b2f1966268665e550719f7bd86ca1b44252f459c9029 -AUX ntopng-3.8-ndpi-includes.patch 456 BLAKE2B 517864615e89088aafdd21c50d550e8991387120252126a9bde7531bc0ac6f9691e69e8ae38db4a623e0f6d6161b2f780dd304be377c90c2cf8a1caf20100e0e SHA512 5033c87fdf3fc32539db886a9675bf69dd71aab22ee8d3357f8f700198ba15a69bf4d4f633941b2c806dcf7ad866b9d18373d02a76ffcfea56b6ebe6e22a82ee -AUX ntopng-3.8.1-PKG_CONFIG.patch 2994 BLAKE2B 4ff178522c28f93d19550080e1338970413fa5a25dfcd4745fc3ab8a8ccb27166771285e68ee1b47353b610121630cd62c1c1c9b8672e5b59d13957185ca7ffc SHA512 77516304306ac66e6d691679209a9a93ef481c38a6eab4681430cf5864387664389e016ccab6106f576c90dfbd398b9f8711be61783c05017bf3c1dd1e99905c -AUX ntopng-3.8.1-parallel-make.patch 267 BLAKE2B f68ab75b32b3275b5513039f947f1dc8ca1f4b3642730cba5ff461ebaa6c9114fe238574087bf4a4f1be91b31954e1d17dcaf535709714c2fc5a04ef10bfd0b1 SHA512 ade7e22747cb750bc5f7d4a3480c003414f99d39401e0bcfe1c3d0b58cb2c409f962d58becc3c6c40a5b95d057fe5b4dfeb9cfd0855a30b4c5be1d26ba3c0e62 -AUX ntopng-4.0-PKG_CONFIG.patch 4288 BLAKE2B acd842c113cb340becd5515ab47a8f0c3eef5d9051dcbc4a6dc17063b12ff28a8b4d4d46a83bf58b0dcdf6f75eba06fbd7dec7e194ce596832e767ddb5fa77e6 SHA512 9bab76e36e560c0ee4488d5c9402cb1c9aac2b9e443b1202ea71a0bfc99e754943c05303b8b50ff5092be747065a493472b303edc984d30e7c68b6e0c0c59b3f AUX ntopng-4.0-ndpi-includes.patch 388 BLAKE2B 59ad343a40c9a0034c4d3fdaf16b0e5f1e5ca010e76b80867ed73afa710798bfb9950144ec2549741262ac234e2bae193b9d751f3a511f7335861ae6e2fd5095 SHA512 80fecb323bbd2d5ad06f77b2d35d162e09d47b2a7cfe611b625883c7e70842700e491b52a654eb97ee14221cd54646706f6b6038be8bd35240717a47010c1346 +AUX ntopng-4.2-PKG_CONFIG.patch 4622 BLAKE2B b88f0d52ce1784b03caa2929b31bc2165d8a6da9e21a036c8f77efa4545187de508a4023308f9869657840849d61cdff01d5e8663631f4c5aafa165d82f8b0b4 SHA512 84c1070fa190f464b4dbb3d8597a1ae1c0ab488fbfaadf38a65c121de662f669b3198b0db926d12aeb29f7e48218ddab013824e31b6b8dc5a6ecd91990c507b4 +AUX ntopng-4.2-mysqltool.patch 567 BLAKE2B b788a433213c2b29cc27869649fcc60cb8e88542b4797fe20a4641f560067cbbdd578e6fb02172365bbdbf31490dacd9324af1dc53ffa473a6bb55a8eb245687 SHA512 378fd97264c9f7c4e997e7f2319ec9e8e7c359393b8ac333b23a7406e2756de49b4adfecb1baa0d340a2f2cf86c164a41341fbb6f4450fae786acce168ebc2df +AUX ntopng-4.2-nogit.patch 1522 BLAKE2B c6d445a4b8ba2b4229073f6ab3b0bac1dc7cfa805ec75ce7addcf08a7963bb5028a6f0a36650194199def5ef7b885f04817a0dfbfe014156e7d2cb54d9cb1588 SHA512 d33feb7c6109ff5728ff21b704d6e08d2ae6ea70563b1ac4d89d8f69123c77989bdb764d99ce2c9b36690bed07486b9f3b7e0d7ff6059b3cb75965343695b778 +AUX ntopng-4.2-parallel-make.patch 352 BLAKE2B e2411060d85820b0808c735cabdeb1f4e372dbd199e2308b3cac463c706b4a8c255bb838a0ba160f80d600ad8e569401fb5de57637737be3485df301862fb06f SHA512 2c6987006ea2f60a9f46e5b2cd7e94e55ad93e866a8ef935ebb40067cc4082f96c4918e4a13c618f2a2d0e7274ccf741457c198f0dd65dfa76c172a222f60b2e AUX ntopng.conf.d 117 BLAKE2B 67e2962fcb0303ab465b3d8def04192992e3e7306c5e76084a58cca5bdf1a797b08193f2a3512f876ff9c5300b0f3504055e7166afcbb4cbc527658c74b0616b SHA512 bb66d11245ce099f9e09f97d830da60df910682242db0c5c7d17bcd800e84cf3bce6288fb75fc3a8f3e214a580dc0d076f7f69aa924d9ad3e4c8bff093252061 AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d855746509c0e6861df7ed9c356abe6bc066df65524c340d05c072e7c4de0864c250164b8a1509b34d508c0 SHA512 1fbcc46fe10dcef82a1310d74c4351c72752cdd2a9b9908705c8c645698430e456f1ba14b77fd7c1f374a237a508c2d33324de61f5f1f8255ed75a384e874d84 -DIST ntopng-3.8.1.tar.gz 33914341 BLAKE2B 3b0df382e938af78d10e71282e863ccb7ba1da3dc7e2bf90b45f1e6e4670052a8c61a16cb8547f119f0dc753a2e31273b41f40aa26919480cbaecf43b6d59742 SHA512 4cb613881e36b435f97dcc25dfaa505d9c552f63ad8334d5c9d47ec06376d47124c65e6d782546d36f6d27b34b037cc73df7129f459f290ac51e270bb7453970 -DIST ntopng-4.0.tar.gz 43239175 BLAKE2B 689883685d46d339d61c338607e2164e36903313cdc0e0e2b649acd7468505f72fce75118a2c3ef55e54d942fc5cc3c312efbd46f8e2603bbcfaf206908bce82 SHA512 a278cc5f304e3040b31c691286650a54d61b5587033724c4513dd7372168477d5b0b471a1d2a5c5682034464b022b88e971567a38d836216431ea77bf1ed90c9 -EBUILD ntopng-3.8.1-r4.ebuild 1918 BLAKE2B de068e1989232534eb853d274bbb8993d6a31b8366ca6e36b6a0b0ea512cfa2d235dd5e44fc37bd84ea6508d480656ab68e40805a0a17f15c0ed62b6e8b955a3 SHA512 b29c347de506cfd771392dd1548651a7c1ac6429ef954b6d56cd94262e929cb41c710a160e8e408c8c193d58f7b84ecb64a70a322405b4ebd12cd1beb0e8fcc3 -EBUILD ntopng-4.0.ebuild 1916 BLAKE2B d288cc2f2b096a377a00a8814541e79a5328589f43963e118ccfd42c938fca1a7c684b769a81b2753ee2ab9c6431ee425d4d190444767a4b9059ceb6ebb64278 SHA512 37d3c01d11f761d2baec2047e52186a96ba7157cd11857eb7c1198bd6952994e6f1c37d12a20718d4319ac4b294a65dbb2bb96b3c7da0bc351d929769fc1e118 +DIST ntopng-4.2.tar.gz 57554819 BLAKE2B a9eaf7ea670dbd9c830696a4b017330e25a82307852a0a85d95ddbb4e32a3123d43eda1b686c359da1fef77e601cd3791dcdf257141e2e1d3ed7974b92edaac8 SHA512 e89ec3f35644ae8bc570d9802ecfadbf0067145e23a589df2032e8781e9c954f4166d3abb650ddafc65e4fbad656730ee1abf9c5273d3e09f8173d423436b8ff +EBUILD ntopng-4.2.ebuild 2005 BLAKE2B 806cfa0f72aac5ee4077bb991b50c9ca7bf00128af4fdd04bd829518defc82e6d41ba72d506cfbe3150056660b45a06bb09c82e4461bdfa85c5438aa280b997f SHA512 fa211e29eee9a9df9db6b1a52342719d40c74881e711fc799eec3599b994b1e47100f349bdd04d028429ceab51cf939266593ac5d8e33f5429d0a54d3ef8f3b4 MISC metadata.xml 294 BLAKE2B 81c505fe10f4b55e7a2bf6a01959efd75f9a8bea62afa2ff31f036ef3d999ad6f88d8c4fa7ccbc1852c51c63354cf02cb023a562997f06b8b58699d76bb6761b SHA512 e98be1164a275f023b7f96d6ca2c37fa44733b776c39a2e45839e60881b3ce5bd2f81dd50af97340afcaaa0da0bcc32e144f72e968b1a7e6c06755ea9eb471ac diff --git a/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch deleted file mode 100644 index 62c328a3505e..000000000000 --- a/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/configure.seed -+++ b/configure.seed -@@ -355,13 +355,7 @@ - if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then - MYSQLTOOL="mariadb_config" - else -- PATH=$PATH:/usr/local/mysql/bin -- AC_CHECK_TOOL(MYSQL, mysql_config) -- if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then -- MYSQLTOOL="mysql_config" -- else -- MYSQLTOOL="" -- fi -+ MYSQLTOOL="mysql_config" - fi - - if test -n "$MYSQLTOOL"; then diff --git a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch deleted file mode 100644 index cdd5e827147c..000000000000 --- a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/configure.seed -+++ b/configure.seed -@@ -129,9 +129,9 @@ - fi - - PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [ -- NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"`/libndpi -+ NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` - # Use static libndpi library as building against the dynamic library fails -- NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic" -+ NDPI_LIB="$NDPI_LIBS" - NDPI_LIB_DEP= - ], [ - AC_MSG_CHECKING(for nDPI source) diff --git a/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch b/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch deleted file mode 100644 index 12117d791bcd..000000000000 --- a/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- a/configure.seed -+++ b/configure.seed -@@ -6,6 +6,8 @@ - - AC_PROG_CXX - -+PKG_PROG_PKG_CONFIG -+ - dnl> Add /usr/local/ /opt/local - CFLAGS="-I${PWD} -I${PWD}/include" - CPPFLAGS="${CPPFLAGS} -I${PWD} -I${PWD}/include" -@@ -179,10 +179,10 @@ - fi - dnl finish: nDPI handling - --if test -z `pkg-config --exists libssl`; then -+if ${PKG_CONFIG} --exists libssl; then - AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) -- SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl" -- SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto" -+ SSL_INC="`${PKG_CONFIG} --cflags libssl` -I/usr/include/openssl" -+ SSL_LIB="`${PKG_CONFIG} --libs libssl` -lssl -lcrypto" - fi - - AC_MSG_CHECKING(for ntopng professional edition) ---- a/Makefile.in -+++ b/Makefile.in -@@ -44,10 +44,10 @@ - - ###### - LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8 --HAS_LIBRRDTOOL=$(shell pkg-config --atleast-version=1.4.8 librrd; echo $$?) -+HAS_LIBRRDTOOL=$(shell $(PKG_CONFIG) --atleast-version=1.4.8 librrd; echo $$?) - ifeq ($(HAS_LIBRRDTOOL), 0) -- LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd) -- LIBRRDTOOL_LIB = $(shell pkg-config --libs librrd) # -lrrd_th -+ LIBRRDTOOL_INC = $(shell $(PKG_CONFIG) --cflags librrd) -+ LIBRRDTOOL_LIB = $(shell $(PKG_CONFIG) --libs librrd) # -lrrd_th - else - LIBRRDTOOL_INC=-I$(LIBRRDTOOL_HOME)/src/ - ifeq ($(OS), $(filter $(OS), OpenBSD FreeBSD)) -@@ -70,10 +70,10 @@ - - ###### - --HAS_JSON=$(shell pkg-config --exists json-c; echo $$?) -+HAS_JSON=$(shell $(PKG_CONFIG) --exists json-c; echo $$?) - ifeq ($(HAS_JSON), 0) -- JSON_INC = $(shell pkg-config --cflags json-c) -- JSON_LIB = $(shell pkg-config --libs json-c) -+ JSON_INC = $(shell $(PKG_CONFIG) --cflags json-c) -+ JSON_LIB = $(shell $(PKG_CONFIG) --libs json-c) - else - JSON_HOME=${PWD}/third-party/json-c - JSON_INC=-I$(JSON_HOME) -@@ -83,21 +83,21 @@ - ###### - - ifeq (@NEDGE@, 0) -- HAS_SODIUM=$(shell pkg-config --exists libsodium; echo $$?) -+ HAS_SODIUM=$(shell $(PKG_CONFIG) --exists libsodium; echo $$?) - ifeq ($(HAS_SODIUM), 0) -- SODIUM_INC = $(shell pkg-config --cflags libsodium) -- SODIUM_LIB = $(shell pkg-config --libs libsodium) -+ SODIUM_INC = $(shell $(PKG_CONFIG) --cflags libsodium) -+ SODIUM_LIB = $(shell $(PKG_CONFIG) --libs libsodium) - else - SODIUM_INC= - SODIUM_LIB= - endif - -- HAS_ZEROMQ=$(shell pkg-config --exists libzmq; echo $$?) -+ HAS_ZEROMQ=$(shell $(PKG_CONFIG) --exists libzmq; echo $$?) - ifeq ($(HAS_ZEROMQ), 0) -- ZEROMQ_INC = $(shell pkg-config --cflags libzmq) -+ ZEROMQ_INC = $(shell $(PKG_CONFIG) --cflags libzmq) - ZMQ_STATIC=/usr/local/lib/libzmq.a - ifeq ($(wildcard $(ZMQ_STATIC)),) -- ZEROMQ_LIB = $(shell pkg-config --libs libzmq) -+ ZEROMQ_LIB = $(shell $(PKG_CONFIG) --libs libzmq) - else - ZEROMQ_LIB = $(ZMQ_STATIC) - endif -@@ -106,11 +106,6 @@ - ZEROMQ_INC=-I$(ZEROMQ_HOME)/include - ZEROMQ_LIB=$(ZEROMQ_HOME)/.libs/libzmq.a - endif -- -- HAS_ZSTD=$(shell pkg-config --exists libzstd; echo $$?) -- ifeq ($(HAS_ZSTD), 0) -- ZSTD_LIB = $(shell pkg-config --libs libzstd) -- endif - endif - - ###### diff --git a/net-analyzer/ntopng/files/ntopng-4.0-PKG_CONFIG.patch b/net-analyzer/ntopng/files/ntopng-4.2-PKG_CONFIG.patch index cc97d3875676..8218c948b178 100644 --- a/net-analyzer/ntopng/files/ntopng-4.0-PKG_CONFIG.patch +++ b/net-analyzer/ntopng/files/ntopng-4.2-PKG_CONFIG.patch @@ -1,76 +1,6 @@ ---- a/configure.seed -+++ b/configure.seed -@@ -182,21 +182,21 @@ - fi - dnl finish: nDPI handling - --pkg-config --exists json-c -+${PKG_CONFIG} --exists json-c - if test "$?" -ne 1; then -- JSON_INC=`pkg-config --cflags json-c` -- JSON_LIB=`pkg-config --libs json-c` -+ JSON_INC=`${PKG_CONFIG} --cflags json-c` -+ JSON_LIB=`${PKG_CONFIG} --libs json-c` - else - echo "Please install libjson-c-dev package prerequisite" - exit -1 - fi - - --pkg-config --exists libssl -+${PKG_CONFIG} --exists libssl - if test "$?" -ne 1; then - AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) -- SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl" -- SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto" -+ SSL_INC="`${PKG_CONFIG} --cflags libssl` -I/usr/include/openssl" -+ SSL_LIB="`${PKG_CONFIG} --libs libssl` -lssl -lcrypto" - else - dnl Workaround for MacOS Brew - if test -d "/usr/local/opt/openssl/lib"; then -@@ -303,8 +303,8 @@ - AC_DEFINE_UNQUOTED(NTOPNG_GIT_RELEASE, "${GIT_BRANCH}:${GIT_RELEASE}", [GIT Release]) - AC_DEFINE_UNQUOTED(NTOPNG_GIT_DATE, "${GIT_DATE}", [Last GIT change]) - --if test -z `which pkg-config`; then -- echo "#!/bin/sh\n" > pkg-config -+if test -z `which ${PKG_CONFIG}`; then -+ echo "#!/bin/sh\n" > ${PKG_CONFIG} - fi - - if test -f ".git/index"; then -@@ -336,8 +336,8 @@ - - if test -d "/usr/include/hiredis"; then - AC_DEFINE_UNQUOTED(HAVE_HIREDIS, 1, [Local hiredis package present]) -- HIREDIS_INC="`pkg-config --cflags hiredis` -I/usr/include/hiredis" -- HIREDIS_LIB="`pkg-config --libs hiredis` -lhiredis" -+ HIREDIS_INC="`${PKG_CONFIG} --cflags hiredis` -I/usr/include/hiredis" -+ HIREDIS_LIB="`${PKG_CONFIG} --libs hiredis` -lhiredis" - else - HIREDIS_INC="-I ${PWD}/third-party/hiredis" - fi -@@ -433,7 +433,7 @@ - UGLIFYJS_MAJOR_VERSION="${UGLIFYJS_VERSION%%.*}" - fi - --AC_CHECK_LIB([rrd_th], [rrd_update_r], [LIBRRD_LD_FLAGS=-lrrd_th], [LIBRRD_LD_FLAGS=`pkg-config --libs librrd`]) -+AC_CHECK_LIB([rrd_th], [rrd_update_r], [LIBRRD_LD_FLAGS=-lrrd_th], [LIBRRD_LD_FLAGS=`${PKG_CONFIG} --libs librrd`]) - - AC_CHECK_LIB([nl], [nl_handle_alloc], [LDFLAGS="${LDFLAGS} -lnl"]) - AC_CHECK_LIB([rt], [clock_gettime], [LDFLAGS="${LDFLAGS} -lrt"]) -@@ -452,7 +452,7 @@ - dnl> https://github.com/curl/curl/blob/curl-7_20_0/TODO-RELEASE - - AC_MSG_CHECKING(for curl SMTP support) -- if `pkg-config --atleast-version="7.20.0" libcurl` ; then -+ if `${PKG_CONFIG} --atleast-version="7.20.0" libcurl` ; then - AC_DEFINE_UNQUOTED(HAVE_CURL_SMTP, 1, [curl supports SMTP]) - AC_MSG_RESULT(yes) - else --- a/Makefile.in +++ b/Makefile.in -@@ -45,9 +45,9 @@ +@@ -44,9 +44,9 @@ LUA_LIB=$(LUA_HOME)/src/liblua.a ###### LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8 @@ -82,7 +12,7 @@ LIBRRDTOOL_LIB = @LIBRRD_LD_FLAGS@ else LIBRRDTOOL_INC=-I$(LIBRRDTOOL_HOME)/src/ -@@ -77,21 +77,21 @@ +@@ -74,21 +74,21 @@ SNMP_LIB=@SNMP_LIB@ ###### ifeq (@NEDGE@, 0) @@ -110,7 +40,7 @@ else ZEROMQ_LIB = $(ZMQ_STATIC) endif -@@ -101,9 +101,9 @@ +@@ -98,9 +98,9 @@ ifeq (@NEDGE@, 0) ZEROMQ_LIB=$(ZEROMQ_HOME)/.libs/libzmq.a endif @@ -122,3 +52,74 @@ endif endif +--- a/configure.seed ++++ b/configure.seed +@@ -190,10 +190,10 @@ if test -z "$NDPI_INC" || test -z "$NDPI_LIB" ; then : + fi + dnl finish: nDPI handling + +-pkg-config --exists json-c ++${PKG_CONFIG} --exists json-c + if test "$?" -ne 1; then +- JSON_INC=`pkg-config --cflags json-c` +- JSON_LIB=`pkg-config --libs json-c` ++ JSON_INC=`${PKG_CONFIG} --cflags json-c` ++ JSON_LIB=`${PKG_CONFIG} --libs json-c` + else + echo "Please install libjson-c-dev package prerequisite" + exit -1 +@@ -211,11 +211,11 @@ dnl> JSON_LIB=$JSON_HOME/libjson-c.a + dnl> fi + dnl> fi + +-pkg-config --exists libssl ++${PKG_CONFIG} --exists libssl + if test "$?" -ne 1; then + AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) +- SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl" +- SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto" ++ SSL_INC="`${PKG_CONFIG} --cflags libssl` -I/usr/include/openssl" ++ SSL_LIB="`${PKG_CONFIG} --libs libssl` -lssl -lcrypto" + else + dnl Workaround for MacOS Brew + if test -d "/usr/local/opt/openssl/lib"; then +@@ -329,8 +329,8 @@ AC_DEFINE_UNQUOTED(PACKAGE_REVISION, "${GIT_COMMITS}", [Package Revision]) + AC_DEFINE_UNQUOTED(NTOPNG_GIT_RELEASE, "${GIT_BRANCH}:${GIT_RELEASE}", [GIT Release]) + AC_DEFINE_UNQUOTED(NTOPNG_GIT_DATE, "${GIT_DATE}", [Last GIT change]) + +-if test -z `which pkg-config`; then +- echo "#!/bin/sh\n" > pkg-config ++if test -z `which ${PKG_CONFIG}`; then ++ echo "#!/bin/sh\n" > ${PKG_CONFIG} + fi + + if test -f ".git/index"; then +@@ -362,8 +362,8 @@ DATE=`date +"%Y-%m-%d"` + + if test -d "/usr/include/hiredis"; then + AC_DEFINE_UNQUOTED(HAVE_HIREDIS, 1, [Local hiredis package present]) +- HIREDIS_INC="`pkg-config --cflags hiredis` -I/usr/include/hiredis" +- HIREDIS_LIB="`pkg-config --libs hiredis` -lhiredis" ++ HIREDIS_INC="`${PKG_CONFIG} --cflags hiredis` -I/usr/include/hiredis" ++ HIREDIS_LIB="`${PKG_CONFIG} --libs hiredis` -lhiredis" + else + HIREDIS_INC="-I ${PWD}/third-party/hiredis" + fi +@@ -490,7 +490,7 @@ if test x$UGLIFYJS != x; then + UGLIFYJS_MAJOR_VERSION="${UGLIFYJS_VERSION%%.*}" + fi + +-AC_CHECK_LIB([rrd_th], [rrd_update_r], [LIBRRD_LD_FLAGS=-lrrd_th], [LIBRRD_LD_FLAGS=`pkg-config --libs librrd`]) ++AC_CHECK_LIB([rrd_th], [rrd_update_r], [LIBRRD_LD_FLAGS=-lrrd_th], [LIBRRD_LD_FLAGS=`${PKG_CONFIG} --libs librrd`]) + + AC_CHECK_LIB([nl], [nl_handle_alloc], [LDFLAGS="${LDFLAGS} -lnl"]) + AC_CHECK_LIB([rt], [clock_gettime], [LDFLAGS="${LDFLAGS} -lrt"]) +@@ -509,7 +509,7 @@ else + dnl> https://github.com/curl/curl/blob/curl-7_20_0/TODO-RELEASE + + AC_MSG_CHECKING(for curl SMTP support) +- if `pkg-config --atleast-version="7.20.0" libcurl` ; then ++ if `${PKG_CONFIG} --atleast-version="7.20.0" libcurl` ; then + AC_DEFINE_UNQUOTED(HAVE_CURL_SMTP, 1, [curl supports SMTP]) + AC_MSG_RESULT(yes) + else diff --git a/net-analyzer/ntopng/files/ntopng-4.2-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-4.2-mysqltool.patch new file mode 100644 index 000000000000..a961bc28902f --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-4.2-mysqltool.patch @@ -0,0 +1,19 @@ +diff --git a/configure.seed b/configure.seed +index a321f9b..9f0f1cc 100644 +--- a/configure.seed ++++ b/configure.seed +@@ -596,13 +596,7 @@ if test "${with_nedge+set}" != set; then + if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then + MYSQLTOOL="mariadb_config" + else +- PATH=$PATH:/usr/local/mysql/bin +- AC_CHECK_TOOL(MYSQL, mysql_config) +- if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then +- MYSQLTOOL="mysql_config" +- else +- MYSQLTOOL="" +- fi ++ MYSQLTOOL="mysql_config" + fi + + if test -n "$MYSQLTOOL"; then diff --git a/net-analyzer/ntopng/files/ntopng-4.2-nogit.patch b/net-analyzer/ntopng/files/ntopng-4.2-nogit.patch new file mode 100644 index 000000000000..17b68f0918fb --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-4.2-nogit.patch @@ -0,0 +1,44 @@ +diff --git a/Makefile.in b/Makefile.in +index 38209c7..6945ce7 100755 +--- a/Makefile.in ++++ b/Makefile.in +@@ -171,7 +171,6 @@ $(LIBRRDTOOL_LIB): + cd $(LIBRRDTOOL_HOME); ./configure --disable-libdbi --disable-libwrap --disable-rrdcgi --disable-libtool-lock --disable-nls --disable-rpath --disable-perl --disable-ruby --disable-lua --disable-tcl --disable-python --disable-dependency-tracking --disable-rrd_graph ; cd src; @GMAKE@ librrd_th.la + + hooks/.enabled: +- git config core.hooksPath hooks || true + touch hooks/.enabled + + clean: +diff --git a/configure.seed b/configure.seed +index 7e2eced..dd3257d 100644 +--- a/configure.seed ++++ b/configure.seed +@@ -77,7 +77,6 @@ fi + # On CentOS 6 `git rev-list HEAD --count` does not work + # + # +-REVISION=`git log --pretty=oneline | wc -l` + + if test -d "/usr/local/include"; then + CFLAGS="${CFLAGS} -I/usr/local/include" +@@ -323,7 +322,6 @@ else + AC_MSG_RESULT(not found) + fi + +-GIT_COMMITS=`git rev-list --all |wc -l | tr -d '[[:space:]]'` + AC_DEFINE_UNQUOTED(PACKAGE_REVISION, "${GIT_COMMITS}", [Package Revision]) + + AC_DEFINE_UNQUOTED(NTOPNG_GIT_RELEASE, "${GIT_BRANCH}:${GIT_RELEASE}", [GIT Release]) +@@ -671,11 +669,6 @@ AC_DEFINE_UNQUOTED(_CRT_SECURE_NO_WARNINGS, 1, [Disable warning on windows]) + + GMAKE='$(MAKE)' + +-GIT=`which git` +-if test x$GIT = x; then +- AC_MSG_RESULT(FATAL ERROR: git is not installed on your host) +-fi +- + WGET=`which wget` + if test x$WGET = x; then + AC_MSG_RESULT(ERROR. wget is not installed on your host: you cannot download GeoIP data) diff --git a/net-analyzer/ntopng/files/ntopng-3.8.1-parallel-make.patch b/net-analyzer/ntopng/files/ntopng-4.2-parallel-make.patch index 9089c0a9b04d..b3086284a5a9 100644 --- a/net-analyzer/ntopng/files/ntopng-3.8.1-parallel-make.patch +++ b/net-analyzer/ntopng/files/ntopng-4.2-parallel-make.patch @@ -1,15 +1,16 @@ +diff --git a/configure.seed b/configure.seed +index a321f9b..d27d35d 100644 --- a/configure.seed +++ b/configure.seed -@@ -526,11 +520,7 @@ +@@ -675,10 +675,7 @@ fi AC_DEFINE_UNQUOTED(_CRT_SECURE_NO_WARNINGS, 1, [Disable warning on windows]) -GMAKE=`which gmake` --if test x$GMAKE = x --then -- GMAKE="make" +-if test x$GMAKE = x; then +- GMAKE="make" -fi +GMAKE='$(MAKE)' GIT=`which git` - if test x$GIT = x + if test x$GIT = x; then diff --git a/net-analyzer/ntopng/ntopng-4.0.ebuild b/net-analyzer/ntopng/ntopng-4.0.ebuild deleted file mode 100644 index 45fcb2be47c3..000000000000 --- a/net-analyzer/ntopng/ntopng-4.0.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools user toolchain-funcs - -DESCRIPTION="Network traffic analyzer with web interface" -HOMEPAGE="https://www.ntop.org/" -SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - >=net-libs/nDPI-3.0:= - dev-db/mysql-connector-c:= - dev-db/sqlite:3 - dev-libs/hiredis:= - dev-libs/json-c:= - dev-libs/libmaxminddb - dev-libs/libsodium:= - dev-libs/openssl - net-analyzer/rrdtool - net-libs/libpcap - >=net-libs/zeromq-3:= - net-misc/curl - sys-libs/libcap - sys-libs/zlib -" -RDEPEND=" - ${DEPEND} - dev-db/redis -" -BDEPEND=" - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-3.8-mysqltool.patch - "${FILESDIR}"/${PN}-3.8.1-parallel-make.patch - "${FILESDIR}"/${PN}-4.0-ndpi-includes.patch - "${FILESDIR}"/${PN}-4.0-PKG_CONFIG.patch -) -RESTRICT="test" - -pkg_setup() { - enewuser ntopng -} - -src_prepare() { - default - - sed \ - -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \ - -e "s/@SHORT_VERSION@/${PV}/g" \ - < "${S}/configure.seed" \ - > "${S}/configure.ac" || die - - eautoreconf -} - -src_configure() { - tc-export PKG_CONFIG - default -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - MYCFLAGS="${CFLAGS}" \ - MYLDFLAGS="${LDFLAGS}" -} - -src_install() { - SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" - dodir ${SHARE_NTOPNG_DIR} - insinto ${SHARE_NTOPNG_DIR} - doins -r httpdocs - doins -r scripts - - dodir ${SHARE_NTOPNG_DIR}/third-party - insinto ${SHARE_NTOPNG_DIR}/third-party - doins -r third-party/i18n.lua-master - doins -r third-party/lua-resty-template-master - - exeinto /usr/bin - doexe ${PN} - doman ${PN}.8 - - newinitd "${FILESDIR}"/ntopng.init.d ntopng - newconfd "${FILESDIR}"/ntopng.conf.d ntopng - - keepdir /var/lib/ntopng - fowners ntopng /var/lib/ntopng -} - -pkg_postinst() { - elog "ntopng default credentials are user='admin' password='admin'" -} diff --git a/net-analyzer/ntopng/ntopng-3.8.1-r4.ebuild b/net-analyzer/ntopng/ntopng-4.2.ebuild index b4562c2a6b21..de038c42e391 100644 --- a/net-analyzer/ntopng/ntopng-3.8.1-r4.ebuild +++ b/net-analyzer/ntopng/ntopng-4.2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools user toolchain-funcs + +inherit autotools toolchain-funcs DESCRIPTION="Network traffic analyzer with web interface" HOMEPAGE="https://www.ntop.org/" @@ -12,9 +13,7 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND=" - >=net-libs/nDPI-3.0:= - dev-db/mysql-connector-c:= +DEPEND="dev-db/mysql-connector-c:= dev-db/sqlite:3 dev-libs/hiredis:= dev-libs/json-c:= @@ -23,37 +22,35 @@ DEPEND=" dev-libs/openssl net-analyzer/rrdtool net-libs/libpcap + >=net-libs/nDPI-3.0:= >=net-libs/zeromq-3:= net-misc/curl sys-libs/libcap - sys-libs/zlib -" -RDEPEND=" - ${DEPEND} - dev-db/redis -" -BDEPEND=" - virtual/pkgconfig -" + sys-libs/zlib" +RDEPEND="${DEPEND} + acct-user/ntopng + acct-group/ntopng + dev-db/redis" +BDEPEND="virtual/pkgconfig" + PATCHES=( - "${FILESDIR}"/${PN}-3.8-mysqltool.patch - "${FILESDIR}"/${PN}-3.8-ndpi-includes.patch - "${FILESDIR}"/${PN}-3.8.1-PKG_CONFIG.patch - "${FILESDIR}"/${PN}-3.8.1-parallel-make.patch + "${FILESDIR}/${PN}-4.2-mysqltool.patch" + "${FILESDIR}/${PN}-4.2-parallel-make.patch" + "${FILESDIR}/${PN}-4.0-ndpi-includes.patch" + "${FILESDIR}/${PN}-4.2-PKG_CONFIG.patch" + "${FILESDIR}/${PN}-4.2-nogit.patch" ) -RESTRICT="test" - -pkg_setup() { - enewuser ntopng -} src_prepare() { default + # Follows upstream's autogen.sh sed \ -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \ -e "s/@SHORT_VERSION@/${PV}/g" \ - < "${S}/configure.seed" \ + -e "s/@GIT_DATE@/$(date)/g" \ + -e "s/@GIT_RELEASE@/${PV}.$(date +%y%m%d)/g" \ + -e "s/@GIT_BRANCH@//g" < "${S}/configure.seed" \ > "${S}/configure.ac" || die eautoreconf @@ -73,19 +70,17 @@ src_compile() { src_install() { SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" - dodir ${SHARE_NTOPNG_DIR} - insinto ${SHARE_NTOPNG_DIR} + insinto "${SHARE_NTOPNG_DIR}" doins -r httpdocs doins -r scripts - dodir ${SHARE_NTOPNG_DIR}/third-party - insinto ${SHARE_NTOPNG_DIR}/third-party + insinto "${SHARE_NTOPNG_DIR}/third-party" doins -r third-party/i18n.lua-master doins -r third-party/lua-resty-template-master exeinto /usr/bin - doexe ${PN} - doman ${PN}.8 + doexe "${PN}" + doman "${PN}.8" newinitd "${FILESDIR}"/ntopng.init.d ntopng newconfd "${FILESDIR}"/ntopng.conf.d ntopng diff --git a/net-analyzer/nttcp/Manifest b/net-analyzer/nttcp/Manifest index 650feef6531c..99b328f7b4dd 100644 --- a/net-analyzer/nttcp/Manifest +++ b/net-analyzer/nttcp/Manifest @@ -1,4 +1,4 @@ AUX nttcp-1.47-format-security.patch 3620 BLAKE2B c7244ea75abf91297b682ba4a585e463098ab21f54544b67d67ca43b687410ed5bbf4126b2a26b54c2fe1dec25374b23f05e677783f25150907f26c2c1717150 SHA512 7976fb58cbc6f15d93f0e4485cf9477bf03b3794dcebe9b0905c12250279d23ff3f34a6dee30e961d38cbeb85e4a97daaecdffe89adc7136ccabecf31bb794ea DIST nttcp-1.47.tar.gz 25693 BLAKE2B d15ae863bc49d2a26ff4b07de0d0dcfd94213126aae5be79fde51df8744316d4a4116ebc13e9cc5be81a87e11730b6e45b65002caa43160c698520756b6f9ca6 SHA512 eb0a5aa0633555a6e4c3834e99666cd0e00d41da5d82fdfd2644a9f59727236f1b24fbe810272cf9cfb96d76361b028bcf57025008570dbd6b0d761df5cce625 -EBUILD nttcp-1.47-r3.ebuild 577 BLAKE2B 37ebff0d6b719aa1f619615df708dd64a7e4db7cf46510a945439bd85ff3711b538d9b94819cec4e8878e71abd44e1fb9c1b5db22b21b0c4dc74e12857267593 SHA512 58e74de3d225a95a6523014d32dd631fdc795c19e6d32238305fb8d4d6f9556f12de1c22df3dc7bd5cbe8d3f5cbd1867a34fd46e88fc2b535151106cf03d6469 +EBUILD nttcp-1.47-r3.ebuild 555 BLAKE2B c3165cbbf0a961c28c0a8e621abd0c4fc2e6a8d624d29fb5d14238299e1f4426b2848bff594d0613f815e1351bb3845fd026aabc4054fd468601abb4466fb382 SHA512 0232684ec70b8ed83f1711d1ff30d13451a45b99d720c88b58eb13ee5f02921cc666f434bab639f135e252a0551420b67e39d558fe22801d3d83079bbe2d5382 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/nttcp/nttcp-1.47-r3.ebuild b/net-analyzer/nttcp/nttcp-1.47-r3.ebuild index f502164771a3..4203113e8853 100644 --- a/net-analyzer/nttcp/nttcp-1.47-r3.ebuild +++ b/net-analyzer/nttcp/nttcp-1.47-r3.ebuild @@ -1,20 +1,21 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 -DESCRIPTION="tool to test TCP and UDP throughput" +inherit toolchain-funcs + +DESCRIPTION="Tool to test TCP and UDP throughput" HOMEPAGE="http://www.leo.org/~elmar/nttcp/" SRC_URI="http://www.leo.org/~elmar/nttcp/${P}.tar.gz" -LICENSE="public-domain" +LICENSE="public-domain" SLOT="0" KEYWORDS="amd64 ~mips ~ppc x86" -src_prepare() { - epatch "${FILESDIR}"/${P}-format-security.patch -} +PATCHES=( + "${FILESDIR}"/${P}-format-security.patch +) src_compile() { emake \ diff --git a/net-analyzer/oinkmaster/Manifest b/net-analyzer/oinkmaster/Manifest index 7b1e58f405e8..bf42cb7f3463 100644 --- a/net-analyzer/oinkmaster/Manifest +++ b/net-analyzer/oinkmaster/Manifest @@ -1,3 +1,3 @@ DIST oinkmaster-2.0.tar.gz 80111 BLAKE2B 486eecc69f046bafc056266f4329bc645dbec0aa46b0703b2ebec760db49146fec1e2d151075a7bf76fab158be6f93876ad4862a2de1ae29a35acf0e4410944e SHA512 03874462cff71e558d4383fef9e757eb4260b20f4b1de4741edcd49fec6effe32669e95edb637962b77b12c519deeb74adc3c15427d0e054e1b96e2f03ffdb3b -EBUILD oinkmaster-2.0.ebuild 744 BLAKE2B 6b8b21a0edc1a4b1c642097aadc57c618abcf5344d31017159abf7526c3ecf1205284809e976a9f58061a56f070d50995b43415687513844feb45878507b9ec8 SHA512 e899c2bc8447c16f68cbb70c5045e3209fc465053f5169befbf0ce3c6ffbf8b2a64616be98a6f60fb0d2ea69dac135f4fa7a3483517db3280fd77d2eeb709b4f +EBUILD oinkmaster-2.0.ebuild 726 BLAKE2B d75822e449fa6079a7f3401e84698d404427596fc974d0e2d6577e2f3a1a36f9e4c51694523dc7ccfa69437aaad68a7a4db773ca77948f0779541e5a13e08027 SHA512 ffede314d24211e4351d1b86799d43a5a1261d3f28cd521b20d127992d0faf16c953e42572fbf30070136ab8ca113a13c238daeb8c0a5356a21d64c1ff012543 MISC metadata.xml 360 BLAKE2B eb837a84a546716cf277d9de65b9b2d1517db74065e457c903d86d8096daeb05fe796b0fe225f8846c0ff636f72fb8cfe4e350838a7f59b2ca88c8740d021cc9 SHA512 97150af5c7f0f4e55c75a36ff3613206ac188b266cc5e97eac505e7a1f314f63357b2b99ab7a3e57de66c00eac5150f6329549edb2cb38acd26d92a36e8bc1c2 diff --git a/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild b/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild index 35f0ef818c0b..c09b2be81e20 100644 --- a/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild +++ b/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=7 DESCRIPTION="Rule management for SNORT" SRC_URI="mirror://sourceforge/oinkmaster/${P}.tar.gz" @@ -14,11 +13,11 @@ KEYWORDS="amd64 ~arm ppc sparc x86" IUSE="X" RDEPEND=" + app-arch/gzip + app-arch/tar >=dev-lang/perl-5.6.1 - X? ( dev-perl/Tk ) net-misc/wget - app-arch/tar - app-arch/gzip + X? ( dev-perl/Tk ) " src_install() { diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest index 4865004ea387..477218678d64 100644 --- a/net-analyzer/openbsd-netcat/Manifest +++ b/net-analyzer/openbsd-netcat/Manifest @@ -1,4 +1,4 @@ -AUX openbsd-netcat-1.105-darwin.patch 1591 BLAKE2B 9df26c2efec9d234fa3bc8d1d20438b8bb5a1dce85e0d1c2636ffa7b79467af1b228f2a347bdc7795865784c3ce9d98b5e9801887bc1a4a7fbe9da0ce649463b SHA512 12a36f277b5a88491bcd8b3cb1c564bf9e3251c2a2b0f113ee425aa554bbb29b5cd2a87cdf0f67ad6b9cf3bc9a56d8a175d73ce4cb86fb4c531fd146b85b0ee9 +AUX openbsd-netcat-1.105-darwin.patch 1570 BLAKE2B 543d1ed6cfb7c899423586647afbe1e87ff36d96531101458c90de43631fbd456f23125991558df395170369b624fb168162beb0851213530fb85874d62ba310 SHA512 dab238783cd2b67c42670c470bd02016049b73f447c19626f1df42739577296cad273cc20f6162e23d9e9ab0be3d09865356ec22323922275283b223497b6522 AUX openbsd-netcat-1.190-darwin.patch 2806 BLAKE2B dcd54e828f78f038f00b8626c964e454bab3707f642450dc1118dd21e25cb79c993e6897b534f123a6d9eeda7f724e27c992f94c23ae8843eeb7457f687914aa SHA512 2d13d6541151adc045624c383ca8def21d067da28587fc7f55969205e18d9039b01e0c1b9c31cba3eaede4fe42fad95aa6c75445faa831379849b7b74910d663 DIST netcat-openbsd_1.105-7.debian.tar.gz 31843 BLAKE2B 115eb2d0c0f35055eb26608746806ba97d15b9320954b5d531a73f3f76ed22238395797e90bc3e60dd9cf5b31e696eec59843f37001093013ed0ef82ae590126 SHA512 ec507c858a9f0e75f5a8d6ee8e60eef5200428e55091e831a7acba6c61d70f97af01103c9b65354b0ce773214b0758d957852af793debb70be8aab5b5900b3f6 DIST netcat-openbsd_1.105.orig.tar.gz 14891 BLAKE2B 65119a4e2cb3d9cd7b2d7d346b827ff1c175cc3255f40d70bbd45213b438635d6b063b3cf210d27595e38b0d67339788221ae5c3737e6096782245fb573bca3a SHA512 1e515b5af83a12c6f270d6e8bede6406cc7c9f83ca0e316816508dfe2e2c49cda3fffb6b24a3922bf9908dc8b70d540eb8cc49e9cbfe867e49133c004d3f4703 @@ -6,8 +6,8 @@ DIST netcat-openbsd_1.190-2.debian.tar.xz 34836 BLAKE2B 3ff4390c07d05e8d1a19c869 DIST netcat-openbsd_1.190.orig.tar.gz 22384 BLAKE2B c3e83106f53a0214f71c805b1dfe6b66718dfca217f713a0d7016cb0a3c75c78580fbdd277bd7b5324371145c4b986ebb867e6f779cd61ffecb8e732ebabcb84 SHA512 32310813391f63b8283dc4a63e52821e464ecbfcd0ea995e8e15047c6252a86b31eb4725dc69b778594c43d6ce0cc081aa0f00d7cda0587c91941f20b93a33fe DIST netcat-openbsd_1.195-2.debian.tar.xz 35984 BLAKE2B eedac24eedc243ad1d58576be76f4f98392e1f455863fa3cdc06bde2714612819b7dfa98dd45c1739a65680469460410f5e4b2f4144f4c24fea04b59dda4d0da SHA512 2a5cc6d04112fdde007be4b9adb3aee44060570c0cb2ae0e33e54af3d37c0b2ff4d6c96edf1f16047365106c7c3720195b38417af3c332226c9be81d49caa552 DIST netcat-openbsd_1.195.orig.tar.gz 22480 BLAKE2B 53c750c168d7ea5dc2ca653598e42700e2b3ee888d946a09503a22fa3bcbc2c73658f38787314bef628d609ad370223f6889b7019760bf51817f73fc570e1dcc SHA512 ea95cda028f2759835ea8832db0174c178b002d5a917f4c51594445a5377a30d6114ac261071eea98d3d0b60ae1ec72102609db1625dbc5a6e57c67e28d2ff51 -EBUILD openbsd-netcat-1.105-r1.ebuild 1423 BLAKE2B 75f4fd8f925ab192dd5e4f8ea279bf9c18d443b6d7b48f824da78f88c3847410912e7ffbccff734c7b7b29cbfc22ed125524bd4be0a7347dddefa78058453ad2 SHA512 337b622157df344fa2430815f5087480b1c87c3c807a0ab0c079d1c43831bd1f6c74d8188b4bf2badb85f85d3789c8853f72aeeed7680c33c92d660c1d5eae03 +EBUILD openbsd-netcat-1.105-r1.ebuild 1413 BLAKE2B da35a8c6a4dc193a967b8a4d506a160fbe3719fa60025478c5f3b6cb1de1a71ba542ada14d35b246c7df46f351b961cd565b297083403ca54930672a14bd03ec SHA512 14f79edc17ffeecf6533e30d9e8577e9d615b6b1903bbae241f75239cc0d115597448c35b90c05995a95010a10ce9a79e2b26d7402db2cda00367bb576d0bf90 EBUILD openbsd-netcat-1.105.ebuild 1134 BLAKE2B c425b0d279ad20feb27a802264128cea191d8863a177f1844b467438110b6741611da891aae0ac6696f9bcbb187589176aac46c4539871462ab27fa7df7a4d30 SHA512 e589f9d09d36eed49ef88cffa0363f8244a0ade60710a043eed891d6c31c008e597b2df5ece4cd87e8ddc4d5078222aa8cff608d51c5ae02be0dccefca1b3a9b -EBUILD openbsd-netcat-1.190.ebuild 1535 BLAKE2B 2c11da018defad27a26f330eb2ba5da7154fea24a318390df095140d3a32516321f0326615608448cf844234c3b645ff61f2cc9665b8aaa265be68067dc0831a SHA512 bc5262850ed5bc33efeaf94a8f540eaefc58341e410b93ccf0d3b53d946985dce352c7a5484921203976060040ac79b6fd58002c0ac27f9987ea9995549d5192 -EBUILD openbsd-netcat-1.195.ebuild 1542 BLAKE2B 1854b0dd8cff8a0d73d14ab5154b51b51b890ca1d51ca6420bfdda8eb38b59987cebb0334ade87a8dbbc754ac6d949b14e892994881690a2c7e5b4d62c0b4751 SHA512 2c3d2ca937983331fddb5f699825ad1c7abb9e82e9f08e24ab4faf5f903b303b520b1592ad32cec52fcf874d34ece89192c6c6401faa1b36b7315003f38f37fe +EBUILD openbsd-netcat-1.190.ebuild 1536 BLAKE2B 37424499cff6a5e1dc811f96e1677f4efdb996be069f4474726387dd33bff2305c1cac3127a3330621bbd1cf111f181c4b0a7f47f4a7773d78ff4448f57f4c6e SHA512 b0f937130dacca550c89314f599c32bc6b36747bc90e884a58b4cfbda2a1f28fb2fd1fc66e5507b3412b26ce7c9039fa562cf53d123f92fb5cabe48fa7f24573 +EBUILD openbsd-netcat-1.195.ebuild 1542 BLAKE2B 97c48f8f148eed200429efa52e13ef924d92be828bcbd0045e5ecde9664e0c71951254b0bef38bd9f738be2f59e49893218635c92e752ac45d9ab13f54a5fcff SHA512 a5696d2915e8dc5d11d9756917717420ac08fbb319aedee66171299290c13f4ac3e55775d9072cc24b31e15df01d7f9374b98cc2a9c22b6ffc7cd5d83b6a57d2 MISC metadata.xml 244 BLAKE2B 469b378b5a64e098c2f091fba31658d2193fbb4272f21d40e404757623bbe614474336eb8ef7d7820be4299cfdb6eb41d30fab05327993bafaaf52f9965dfafe SHA512 a8f913706b597ddb605f7e9ad505417dc7422a64037ba11e3a1826e60b882b9b5fac56ce9afd0a6c84380f2984e4079803d10ddc13e686025f65d7228063b59c diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch index 8c68a66ad548..a6f805af1a66 100644 --- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch +++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch @@ -1,7 +1,5 @@ -Allow compilation on Darwin - ---- netcat.c -+++ netcat.c +--- a/netcat.c ++++ b/netcat.c @@ -43,11 +43,13 @@ #include <arpa/telnet.h> #include <arpa/inet.h> @@ -73,8 +71,8 @@ Allow compilation on Darwin int main(int argc, char *argv[]) { ---- socks.c -+++ socks.c +--- a/socks.c ++++ b/socks.c @@ -38,7 +38,7 @@ #include <string.h> #include <unistd.h> diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild index 298a47420fd0..9b84922f8b78 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit toolchain-funcs eutils +inherit toolchain-funcs DESCRIPTION="The OpenBSD network swiss army knife" HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/" @@ -29,7 +29,7 @@ src_prepare() { default if [[ ${CHOST} == *-darwin* ]] ; then # this undoes some of the Debian/Linux changes - epatch "${FILESDIR}"/${P}-darwin.patch + eapply "${FILESDIR}"/${P}-darwin.patch fi } diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild index 7994e7f7ba34..1c797beed02f 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.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 @@ -16,7 +16,7 @@ IUSE="elibc_Darwin" KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x64-macos" -DEPEND="virtual/pkgconfig" +BDEPEND="virtual/pkgconfig" RDEPEND="!elibc_Darwin? ( dev-libs/libbsd ) !net-analyzer/netcat !net-analyzer/netcat6 diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild index 9e669ea4b2af..ee806c763af0 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild @@ -14,9 +14,9 @@ LICENSE="BSD" SLOT="0" IUSE="elibc_Darwin" -KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x64-macos" +KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x64-macos" -DEPEND="virtual/pkgconfig" +BDEPEND="virtual/pkgconfig" RDEPEND="!elibc_Darwin? ( dev-libs/libbsd ) !net-analyzer/netcat !net-analyzer/netcat6 diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest index 622b99feefd6..e2c164cf79ce 100644 --- a/net-analyzer/openvas-scanner/Manifest +++ b/net-analyzer/openvas-scanner/Manifest @@ -4,6 +4,7 @@ AUX gvm-feed-sync.sh 1037 BLAKE2B 6ef8a375a06c0ce5a6181ee26eccdfaba09a5d935c56b9 AUX openvas-scanner-20.8.1-rpath-qa-fix.patch 350 BLAKE2B f4179757f30a43da6fbff329f776a8173c95848f749052429804a4680d26740c6727f918b23517b2dea68a08a55294c9455bbc437f4bb44d0f06dcd056dd82bd SHA512 f873bed2df048fb60dc21665817f99cea6fa1e377f0a7d5c5163831dddbebd2b0ca4e5c94f1ca22ab54f3079ebd230882fc8a269ead21550780aea81b9c01476 AUX openvas-scanner-6.0.1-sbin.patch 716 BLAKE2B 41883486bfa0cb27c4a05ae7290b69227b166c9179546434aece15d1aa2b380f6f9da9afdbfb684ffc68a93f4dd63093b7ce2308d67ca8f806d2cd8e12433819 SHA512 66e2a99f6c7a6d0053bbb4fa797818681983a07ad66814ae0c577b27b37d41054f6241ddd3c017a0928eddef3f2d342480b4a668402c68d28bbf48c357e65b05 AUX openvas-scanner-7.0.1-disable-automagic-dep.patch 1100 BLAKE2B e5fe847c43636b883af91b34386a7d94bb1b088cddc3c95d8314c03dec25c1d071ed7562019abb5d31a75bb2c4fded63644552b411091889612ef6c5c1a837f4 SHA512 b6d678413ca2a4771dcd6833e19d754745f3a7530f227befdad745d30bf23862120cb18359c1088552db18fb13bf491ed4a47523f7326e628101c5ade4156c58 +AUX openvas-scanner-7.0.1-fix-linking-with-lld.patch 1074 BLAKE2B de151d837cf188e398ff2c193e8df056377c2fbd2597b0a98991f38fc48802e323d6f617ceacaa82845ab385335a722416a30723878bfc700a45b44de779cc62 SHA512 7ed1bf3560a5c5cca0acc22845fdc370d677c773477f5006a3223225b63c2cf41709dcb883c38e152d97419733e62731598560a6b4aed2e4ab12a6cdb51446b7 AUX openvas.conf 29 BLAKE2B 0cb02f4b349d996b07ca19a531b64a35692ce5afb0d1fd4b58b6c80ccce3caf82055b396b23fa14f561eb9b732afba0fdfccade4c33c5e300fa1aca41b3995b7 SHA512 7ae3c5eff9a63a5eaadee5886c80baa46ff123695a55e92f21178421bd69322b4c1c06615fd81ea461b61da12ff0e03f523ea3110105a58e709900a0e2d4eebc AUX openvassd-daemon.conf 394 BLAKE2B 9dd55e29004d6d55f0cd44568b3b22aab21cb4ed88969934e5b1905cdfb05017843ee46f59297f8cba5d7b9db35a0b9c906d1f00075c4361d57e039d7d0cf601 SHA512 c8076ecaa04824e45d7b9b90e63c530d8bbcec6ca22b4ac4d3f2b661f05b8a684f6bef340f9f4524a311c19efa85013199f2de5088efe799969bde301ebe1e82 AUX openvassd.gvm.conf 3577 BLAKE2B dd7452f0c9e63e431cf03553e221f802f7f7463ba36ad64fe18db12a44c3e7c0c4ded80cf4b7ab346a877e95271e5b10b7811d431be533eea2bb98eab53a9cee SHA512 dde7b0fe72e5dd551afdd3817562d785c95a03bbc109465490d65f81dc02a546e9d499a0c937828d2e38d357b9a7deadde12b2408307ea02a47c651c9fff4181 @@ -14,7 +15,7 @@ AUX redis.conf.example 1351 BLAKE2B ad1a99404360b76144944793b2994554799bcc6624ab DIST openvas-scanner-20.8.1.tar.gz 431985 BLAKE2B 60b328dc261bf48f37aa2727f4b63904c898467f989abef8f05e29329a24d0d98c13690005c5c7a8c93f899db709771ea60832927f169f6779707a1fac602368 SHA512 6114f37a91a3dd42c3693f10548a7727fb88fbe535ce511b164a440d5ace1c736d4c8a45db9a7e83b9abbd376c4d6b13afd3d23a995a5d089329a2bb8bd71cec DIST openvas-scanner-6.0.1.tar.gz 522100 BLAKE2B af82b41736329bd90ba1ea73a0ace36d4115375f81a7aaff5d3bd50f21cfa3195cdf4012aa952da52c4103a31475de5c5790ef3e2e36180aa06737371fa0e5a0 SHA512 db4087fffe1d50e232fa1e51325cf7f142237e2bd3cc5dcaa1e7058a4871300f352f2c0e700eae72ea9412c347b072e9d1f2eca508b27cb30f36c6895ec95147 DIST openvas-scanner-7.0.1.tar.gz 429012 BLAKE2B 13fd0fef2ce88f6789da9f00e8f35329e915ebc74a29b3bd52af93c6b70292d055fa1159aec4041d79a785971a583eb514e8700d1d38a76775446e40af9b2fac SHA512 201ea02b25bf247320437ae5c82bdc95db981cc6bd99fdece9403573434db122cdc8db7b82a08cba34b6d67d5794b2364f798847c79b421495666adc95a02571 -EBUILD openvas-scanner-20.8.1.ebuild 2984 BLAKE2B b3c5cd56b0e09f2cebf14b8cfa1cb0bede455af2dc36ad7d5f8b21c88931af20b86d6a7c1804ca0cb56926af2f4c97f48bcd77f7bac461aff71e178d8b72e1c5 SHA512 18d830098b3dfd0893896a8d44853213457cf848306e2d88bd20707923cf5db07a3fcdb89a4e2225ef1d1e0f0fd46ad480bf742edca33ea2e8f0b9391a247464 -EBUILD openvas-scanner-6.0.1.ebuild 3158 BLAKE2B f5f2c45f60642ccbcec6aa7ba4c8bb6f2078f4112cfed12f797a3e9883dd150fe01ffcceed52aaa34ce261671b37f0f7bc5652d480b5e1023db8b7739f12f8ff SHA512 9de0594e29d9e0d73a18ddd06f3a7f5d7247f5a721d62bd01555dadb69a914f0a31aadec6f834e01446c21d76584865a8c5807afb61ae87e8ce5dc0929904b86 -EBUILD openvas-scanner-7.0.1.ebuild 2753 BLAKE2B 6ccc736e47055f30eae052476e378a0777bfd6e074e032c95b093b50fbb202d07ab9ef0fbfa627a02aa875d1954771b6fdbf7e9e93262357df9a41f739704a64 SHA512 c90bcf71dc7d36e9a9f610e294c5d907a2bdd21258f35190fd72cde4fd1f626ddb5c08b8f7e7ee726c6683ecd65e6e538a01558e135da806c49a9abcebeedc4d +EBUILD openvas-scanner-20.8.1.ebuild 3027 BLAKE2B 4391f902889c2935c2cf6e140da2e7f686d590905c2cb3c41954dc7483ef65406004a49d8cf6b660449163ede80289895dbdc17c4303817f9a33f3c80e68c4e3 SHA512 60f6e4ca3d5c9f2bc4e61f3a439828748ab4b9a82820ca03d4d01cc1d242a4483d57d1a52f3ddad7fd1b7feee0222fe52e0537e1aeec7835ee175727c9dd71f4 +EBUILD openvas-scanner-6.0.1.ebuild 3160 BLAKE2B 046fcf9a74b706e162c8cf2c739c62a2dd59ea7a410985d5db19217a7d83eafb124e88b84d827dc8cbf1332faec92318cab14ca3fee5ddbe3fb23b52954d3b33 SHA512 a303d13721c6af6bd0cb3b56ffe1b60aff72571fd8f74169e0a84667a579b9967d30207fdd6801217e5858297ec9168e29a533b248a8385a72857e99d765f3c3 +EBUILD openvas-scanner-7.0.1.ebuild 2789 BLAKE2B 55558fd817c1a799ae32c5a39b49c37a7f5ee76988a202ab16c04821873a9a67a89598b80d69612ea81b7e52ff330b323e17168dee4edfff33159aec80fedbce SHA512 16173c4b363fa0fef2fa7fba99f81ddc2736e39fac742840e8faa5dace797c2d63ffdbf14ff066d715ca80938f22c64fdcf4e4f2df0fc05accc197d565c4a009 MISC metadata.xml 1064 BLAKE2B 4e41d122b933afb399f5e92933949b26010e62fa7ee8c7412f8c09bbdbe11a57cf21519069831e9f2414e51235c9756ca50a5700e0ba4eccb2e2b4009c9ac0f3 SHA512 00c74508df23503b717b1ca966203aa1904b48f1b08463219832436ed91d57a55aea34ba77189940cead04db01eef1db9ccc5d9eba52e00807e93414b260b25b diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-fix-linking-with-lld.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-fix-linking-with-lld.patch new file mode 100644 index 000000000000..2b31a7c7d22a --- /dev/null +++ b/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-fix-linking-with-lld.patch @@ -0,0 +1,33 @@ +diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt +index b594679c..adf9a221 100644 +--- a/nasl/CMakeLists.txt ++++ b/nasl/CMakeLists.txt +@@ -87,6 +87,28 @@ endif (NOT KSBA) + message (STATUS "Looking for pcap...") + find_library (PCAP pcap) + ++message (STATUS "Looking for pcap... ${PCAP}") ++if (NOT PCAP) ++ message (SEND_ERROR "The pcap library is required.") ++endif (NOT PCAP) ++ ++message (STATUS "Looking for pcap-config...") ++find_program (PCAP_CONFIG pcap-config) ++ ++if (PCAP_CONFIG) ++ message (STATUS "Looking for pcap-config... ${PCAP_CONFIG}") ++ execute_process (COMMAND pcap-config --libs ++ OUTPUT_VARIABLE PCAP_LDFLAGS ++ OUTPUT_STRIP_TRAILING_WHITESPACE) ++ execute_process (COMMAND pcap-config --cflags ++ OUTPUT_VARIABLE PCAP_CFLAGS ++ OUTPUT_STRIP_TRAILING_WHITESPACE) ++else (PCAP_CONFIG) ++ message (STATUS "pcap-config not found, using defaults...") ++ set (PCAP_LDFLAGS "-L/usr/lib -lpcap") ++ set (PCAP_CFLAGS "-I/usr/include") ++endif (PCAP_CONFIG) ++ + find_library (GPGME gpgme) + message (STATUS "Looking for gpgme... ${GPGME}") + if (NOT GPGME) diff --git a/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild index 22bdb9fec932..9dbdf06bee94 100644 --- a/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild +++ b/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild @@ -4,7 +4,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic toolchain-funcs +inherit cmake toolchain-funcs MY_PN="openvas" MY_DN="openvassd" @@ -51,6 +51,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-7.0.1-disable-automagic-dep.patch + "${FILESDIR}"/${PN}-7.0.1-fix-linking-with-lld.patch #qa fix for rpath "${FILESDIR}"/${P}-rpath-qa-fix.patch ) @@ -58,7 +59,7 @@ PATCHES=( src_prepare() { cmake_src_prepare # QA-Fix | Correct FHS/Gentoo policy paths for 7.0.0 - sed -i -e "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" "$S"/src/CMakeLists.txt || die + sed -i -e "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" "${S}"/src/CMakeLists.txt || die # QA-Fix | Remove !CLANG doxygen warnings for 7.0.0 if use extras; then if ! tc-is-clang; then diff --git a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild index a1e0d34ebf61..cabd334cd52f 100644 --- a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild +++ b/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.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 @@ -55,7 +55,7 @@ PATCHES=( src_prepare() { cmake_src_prepare # QA-Fix | Correct FHS/Gentoo policy paths for 6.0.1 - sed -i -e "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" "$S"/src/CMakeLists.txt || die + sed -i -e "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" "${S}"/src/CMakeLists.txt || die # QA-Fix | Remove !CLANG doxygen warnings for 6.0.1 if use extras; then if ! tc-is-clang; then diff --git a/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild index 1fc5a9111794..6aae6a5c5fe1 100644 --- a/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild +++ b/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild @@ -4,7 +4,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic toolchain-funcs +inherit cmake toolchain-funcs MY_PN="openvas" MY_DN="openvassd" @@ -50,6 +50,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${P}-disable-automagic-dep.patch + "${FILESDIR}"/${P}-fix-linking-with-lld.patch ) BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build" @@ -58,7 +59,7 @@ S="${WORKDIR}/${MY_PN}-${PV}" src_prepare() { cmake_src_prepare # QA-Fix | Correct FHS/Gentoo policy paths for 7.0.0 - sed -i -e "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" "$S"/src/CMakeLists.txt || die + sed -i -e "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" "${S}"/src/CMakeLists.txt || die # QA-Fix | Remove !CLANG doxygen warnings for 7.0.0 if use extras; then if ! tc-is-clang; then diff --git a/net-analyzer/pinger/Manifest b/net-analyzer/pinger/Manifest index d5089d2332e9..d39ca6c40108 100644 --- a/net-analyzer/pinger/Manifest +++ b/net-analyzer/pinger/Manifest @@ -1,4 +1,4 @@ AUX pinger-0.33-gentoo.patch 2488 BLAKE2B a94bf31ad31089f5a8686cc316437984c570677ce60cff01a4ce517f1557256cdc3c440049c68aebd642c4d92d76b29cd56ef18da1d9161e06dac20504ce4207 SHA512 7ebda41ab5caf068476e82f181893b688a0c211cc3e26750517e2cdd4db872bfba4b8d389708bb39fedf103d29cb5b98be3ba0064cd73453735ece3a68776730 DIST pinger-0.33.tar.gz 247827 BLAKE2B 6139044be634438945c92a431b97276b5556b513a948a675d6d70c73e4e22d08a58b9cf6607170f804354c18371af54a222b0e064cc1c8275ba77f67ddbd6699 SHA512 fff07599ef91fbdcff9be7806eca57a71e8e6fac7e9afc67c4147e6246b0bcdadf379de28f87054dbe7c409955c0e0ddeae7f529e954231bea0cfb39e4e29bc1 -EBUILD pinger-0.33.ebuild 1078 BLAKE2B 06914b03d4a01a297ab2076a2339acc5c2fae072f48594a1d19803ef3861c8e9250576e7843724806b1c0bd8ab1bc5d7d36c301fbedb3e92e1a3db4bb6f1216c SHA512 f51daabcbb7e8781955b9232b51d3bd5589be2ce0c724b30f75f9ddd9012168879a51813c93b52a1b185e63c2389027c1483a76078582d9691a1e1e7b6aa9bf9 +EBUILD pinger-0.33.ebuild 1078 BLAKE2B b51e13232fef4c311cedec158290c71def8f25e41cdb5a0b89038028b347cd969dd0ff261a9192363b314d9944181f14f99e345315b82a5353db72891430089f SHA512 2794d2e2c077dfbc2cedfcb31789fa2a1afc6f122fec008027d0e28fd661f8f772e80cc12740dc40ca137a4aaef72ca8407ff9259b946bd88608cd2081104576 MISC metadata.xml 477 BLAKE2B 63658143ec172ecc577c273faae8655ca0e12b4c2e4b518ed7a046875189485904955c4313e69d63bf158a0092b6338fd9673461ccfc358f716e3446e207f04a SHA512 ee9a6e27f4467c86d4f3b2069cc0202f249d2c1d4aa027b6c0a87dad61f7d6b9097faf64848a5d4b5d88300fb5c29cdb7532cb1288bca017d178f3d1e4cd95f0 diff --git a/net-analyzer/pinger/pinger-0.33.ebuild b/net-analyzer/pinger/pinger-0.33.ebuild index 74c25eb05be6..4c401876eb65 100644 --- a/net-analyzer/pinger/pinger-0.33.ebuild +++ b/net-analyzer/pinger/pinger-0.33.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit autotools eutils flag-o-matic +inherit autotools epatch flag-o-matic DESCRIPTION="Cyclic multi ping utility for selected adresses using GTK/ncurses" HOMEPAGE="http://aa.vslib.cz/silk/projekty/pinger/" diff --git a/net-analyzer/pktstat/Manifest b/net-analyzer/pktstat/Manifest index 0723574664ae..3afa2aa1b452 100644 --- a/net-analyzer/pktstat/Manifest +++ b/net-analyzer/pktstat/Manifest @@ -1,5 +1,5 @@ AUX pktstat-1.8.5-smtp_line.patch 1265 BLAKE2B abf9cd8e3ad60b0a44391d1338bc769c1c6a7bed9146c128198c29b1471965671e37c44a4b63efe76d7c3123106c4c3f0a61fd610fdc3c38868a9e7a9fbf27da SHA512 8c72da90f29e29cd138537e25fe1cfbd104b4944161b2a05a9bbf9c12b04c0ac5c322c355a8e93c2ef9f92fd2c6fb173a794a6f1dce3ac6fe3bd572cbaf10142 AUX pktstat-1.8.5-tinfo.patch 426 BLAKE2B 9ec7b6996fba1f06a10f3b30f0e1b85e78a7aececa812f0368a93aec60aad0bc8d5dcec7cc6c6a2cc1ffc93c14bb33e2572c091b6431f08758aad81090ec3d55 SHA512 7d537d540fce9d19bcfd7b223b17dce63295d76d16234d2b078afcd72cc3a10be133f6ae36411618c6ca90534a8a3ce619cc76e15985524e5fd01dfc31cf4ece DIST pktstat-1.8.5.tar.gz 133404 BLAKE2B 8aa533bf2570a56ed99812e3216c653a625e8ee89b9a4fe1dbe1bb12c68c00ce2ae1252de65bec147f0373f3627944c38ab1d76541a1a63d77bac430a825e2da SHA512 0401b34646b3e6238a9fe032fa4c2afb70a3a009850bc85c043ff4bba7da6fab0dcf20b963c62ba4db5ba15a7508241dba4f4789ea59b12193928b4c4ec7f0c7 -EBUILD pktstat-1.8.5-r1.ebuild 717 BLAKE2B 2357527096da1cf71cc3bcf705c1dddbd466116da76c0e0a3e055b006bba7da0bb24b4d93aa61d542cd09959b773dba3cc2d479ef1d15db43a5ad356a0c54e86 SHA512 983eea9354a2aa65a123bc3bf37f508434ada10a6b6a4966c63806e9f4cb5a16fd62640a8d795bbe571f2a3e53e7194d3fe17ea6a49296a0debfa2acf338181d +EBUILD pktstat-1.8.5-r1.ebuild 723 BLAKE2B 5d93f5303021097605c3269f062c8b6c393e15523f3fc809002e487424370d8ccd79eb1feab3653833e4292bcc962fe0bb1630affa12f59a570e70dba88c3144 SHA512 edd5ae0091b578b754c4f926dd0f049830b606bdaa37adaef87aa86ca0c98f6019c212f4f98bd317cfb6da9c01bef5592da1644b3c9a6c44f78ca7dfd670fe93 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild b/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild index 38568044a9f1..c3266ee8f631 100644 --- a/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild +++ b/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils +EAPI=7 + +inherit autotools DESCRIPTION="A network monitoring tool with bandwidth tracking" HOMEPAGE="http://www.adaptive-enterprises.com.au/~d/software/pktstat/" @@ -12,18 +13,21 @@ LICENSE="public-domain" SLOT="0" KEYWORDS="amd64 ~ppc x86" +BDEPEND="virtual/pkgconfig" RDEPEND=" net-libs/libpcap >=sys-libs/ncurses-5.3-r1 " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-tinfo.patch + "${FILESDIR}"/${P}-smtp_line.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-tinfo.patch - epatch "${FILESDIR}"/${P}-smtp_line.patch + default + eautoreconf } diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest index 4d08aa71b1e8..93ea9f42dc78 100644 --- a/net-analyzer/pmacct/Manifest +++ b/net-analyzer/pmacct/Manifest @@ -1,7 +1,10 @@ AUX pmacct-1.7.4--Werror.patch 327 BLAKE2B 1b77ca15ef64a48ca6b477be9f37fa7b88d79e7fedb47895648b6637e9af9e38c959b8838d28d1370dd11b4c722d2b18adabcdd72c8e074dbc10467b770ea6de SHA512 06e1cce962022e51c960881c6f169c91605c5ed597960085f38b5c9fffa4056813014c08070ba7f016cb0f6c449038df9666e5f0d7ab7879563d2dfdc53d2b0a +AUX pmacct-1.7.6-fix-mysql-crash.patch 1018 BLAKE2B dc8f53581007e068b96af57595bb2cd4b63638118087f088e7f7a2c4c74f528616cbfecd47062e23ff1a653e0bb80732f3703c07ec47e2060084cdea03405aa4 SHA512 706098dc5f9e1f265369039e27489e67c930eba3f711d81d70d85d5d33f75b2b9d5f81879bfe69159934f8c662fa4558916bd34338d765a45ff164d4512911fe +AUX pmacct-1.7.6-nogit.patch 617 BLAKE2B 2e8d0874bf97ceeb0be43ecea9be9bb29094a4a663a688503520166e0807478b14256b89e8828bfb877fa1e3f70eb4e0cab52e2d40307506cfd833815b77f2f8 SHA512 383d95027b79f1eddd16d8e9490c3d324ea84b65a74fe0bcc15cbf231063f84ce0d5d2114b4cc35a50d6c46c9be1a53f52a4c16f555a3ebe144fa7a22993ee45 AUX pmacctd-conf.d 153 BLAKE2B 10329deaac64fb5e03bf673c806ad691fb00579d16c77b05aa73662b5e187a31c25da38afb3be853434900ad65103bef3b9d1d9c3b24e0f241a98e4c9b6696b8 SHA512 1637316833db6e2a7c2d531deb4d68d647948bc03da8aecf0c6a34dd2f0c58d58d8473270e6096cf232e98c07946bac265161d4a8577def6cb72a4e8c9778c31 AUX pmacctd-init.d 834 BLAKE2B 15b66c0495690bd42069abed21962db93edc798650cd23944206eddebe1f4baa3086537620c58fa0e63f83336bf2956318eb5ac7521235555ce3f67b2d54eca8 SHA512 eb87cafae945c13a5eff12c1140e0943bed59d46ca91d46a9fe71e1269549064d04980b04ce78f6a87eeacb7253d1d59f32461ee68734e7cac6510d187fb7f3c -DIST pmacct-1.7.5.tar.gz 3219384 BLAKE2B 9a9feb8a11222e54a018b37eaa387cfa43efcb6aa3da175ea6c367bc7b42d816cbe106431c8b8f69b17c8d0286514a80250bf28b15fcaad12a2ac5fb7af6ff27 SHA512 d52e3d749cf0e8a412a82051531c63f37aa6cf4e7cc435ebd185195040819d65dc2cf4d4b1aa64bae620a9f8d3d1b1a505992044fe45d57b91ba056cfa67609c -EBUILD pmacct-1.7.5.ebuild 2112 BLAKE2B 9cd161a5985445c2b4f80ea83f8d253f8768d05fc14ff43743d118fa36c3e63dabbdf210bdef15c6ad14d3f2affec424af861aaf8d20c0de160cdaed76330661 SHA512 7be7c18a3d7dd9949fbb82d3725e81302b5846176d5ad3b6e006e4d1cd3cc1b69eff51de7ddecee91285859d56f300e444bb8953a97ce0133efe2d88273ef751 -EBUILD pmacct-999999.ebuild 2073 BLAKE2B b9e1405cfb4694ef08bc16b477169345155ecc83fe18eebfc51c34eb4cb365d021aa306ab3ac75a6f998e38515988cc6da4b8b9c4128c45c640d86a0fd0b85ce SHA512 aad2e1e6cffc1fc28997fdf2dc7bed7ba4c40eb109417325244179e7e55a236e4ee33e6c8991697b0868a754ef3892cc0e3c715591dddcdcc241ea2bc10f9b32 -MISC metadata.xml 1293 BLAKE2B 102bb4be653f429b9b20ebe66e121ee1fa1f95e2133b81ee9b6741e9a3aaf7e2c2ce4862845c35ef2a1a9f83ad5112a914a0db4153e67ad61435ed6ce3a74125 SHA512 e68e3c42adfe2dc8287f5e06caa1e14fabcba7601605512024524e00c82a09100bd5af75a863fa7027508f792d0e446e66f27c19d1abd2ae0e14e8cecf201732 +DIST pmacct-1.7.6.tar.gz 2126837 BLAKE2B df04822e88f9409d335457031fb26ce4ae8b5da13cf2f55f8d6c78eb50dade62ef763d389ac81a509d9351e12844446ac73171e9966a5aeeecc0e5fb10219c73 SHA512 b370d20f8b8d49b9114db3ab74c66cd16962dee5e7c3642fab0b2787c4ea924a249ff4d8d770c0ccc8ca81366b9a5e557dcfb7cdddf878b99b719d0accdb949a +EBUILD pmacct-1.7.6-r1.ebuild 2194 BLAKE2B 2598855ea314c214037533c41d15fb5dff436108bc755b05081420642c5474e2808c325f2dfd4d5520f3e4204f7a4b802dee2b807b401f79c415bdb07c244480 SHA512 b8a4168a1dca39fbb7fa3d743a54dcc535531656b583eb30bbe078a98a4d96163bf5a381e0bccd072d1726adcdd3dfe442910b54081a1aee8f4cda2aa388d091 +EBUILD pmacct-1.7.6.ebuild 2152 BLAKE2B cbf85e7d3c361e47956a7a0bdbbb1817f8269daf01518c2987beea2188877614c72a3f90071d1bf4e1bc8db00e46771c0431136ca6b9a9a1c2aa6cff6ee2d443 SHA512 d5542361095a1eccb7ba29f085d8b643eed7707e82dfa5c332bcb1ef2342555e88d46c3e78c53ad71442af668211936c923f8f6b84683c44560494c2e6e15102 +EBUILD pmacct-999999.ebuild 2107 BLAKE2B d27f89b663cf9e76e5d63b624b11becaf4e04a30a5c2abcd4328fb59b653caae32d2dc547ac4a2a47a06d2cd1c9c0dfbb0283801a7df820ded13f44d56b8c944 SHA512 3f9170823a7e3fd0e56bee0da6e92b51dc8ea0b270c240ea4f6b0a1aeb0a5bc0360d042518620fefb48769a0096e66d1e23e038e935950ac18e54ce7e735ff55 +MISC metadata.xml 1240 BLAKE2B 2982b5c52a0f8acaef15db66f67ba99eaff775a82f14448d92b9e6db55fc8cee2962e2ebb32a15bf21a3f25e0520204d928c258f345d69e1ac93e3100a68c425 SHA512 758b52fae778753c56660698b1261b7df140875343d3a9d2c65e9aa1974143a75d199eed8abe3e2d095162ff1a73a601a53b008786f3755dee6c15b62985e8ce diff --git a/net-analyzer/pmacct/files/pmacct-1.7.6-fix-mysql-crash.patch b/net-analyzer/pmacct/files/pmacct-1.7.6-fix-mysql-crash.patch new file mode 100644 index 000000000000..b76ce8761326 --- /dev/null +++ b/net-analyzer/pmacct/files/pmacct-1.7.6-fix-mysql-crash.patch @@ -0,0 +1,26 @@ +From 1922062277d87da024938cc3057df9a4c3725e76 Mon Sep 17 00:00:00 2001 +From: Paolo Lucente <pl+github@pmacct.net> +Date: Sun, 28 Feb 2021 02:51:10 +0000 +Subject: [PATCH] * fix, MySQL plugin: check for 'unix:' string only if + sql_host is supplied + +--- + src/mysql_plugin.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/mysql_plugin.c b/src/mysql_plugin.c +index 7f5179abd..dce117732 100644 +--- a/src/mysql_plugin.c ++++ b/src/mysql_plugin.c +@@ -695,7 +695,10 @@ void MY_DB_Connect(struct DBdesc *db, char *host) + mysql_options(db->desc, MYSQL_OPT_RECONNECT, &reconnect); + if (config.sql_conn_ca_file) mysql_ssl_set(db->desc, NULL, NULL, config.sql_conn_ca_file, NULL, NULL); + +- usp = strstr(host, "unix:"); ++ if (host) { ++ usp = strstr(host, "unix:"); ++ } ++ + if (usp && usp == host) { + usp += 5; /* go right past the 'unix:' string */ + mysql_ret = mysql_real_connect(db->desc, NULL, config.sql_user, config.sql_passwd, config.sql_db, FALSE, usp, 0); diff --git a/net-analyzer/pmacct/files/pmacct-1.7.6-nogit.patch b/net-analyzer/pmacct/files/pmacct-1.7.6-nogit.patch new file mode 100644 index 000000000000..7381408d4489 --- /dev/null +++ b/net-analyzer/pmacct/files/pmacct-1.7.6-nogit.patch @@ -0,0 +1,16 @@ +diff --git a/configure.ac b/configure.ac +index 34269bd9..c6dbe8ba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1140,10 +1140,7 @@ dnl Git submodule Dependencies buid system + dnl -------------------------------------- + + dnl First check whether to build git submodule deps +-WITH_EXTERNAL_DEPS_DEFAULT=yes +-if [ test ! -f "$srcdir/src/external_libs/libcdada/include/cdada.h" ] && [ test -z `git rev-parse HEAD 2> /dev/null` ]; then +- WITH_EXTERNAL_DEPS_DEFAULT=no +-fi ++WITH_EXTERNAL_DEPS_DEFAULT=no + + AC_MSG_CHECKING([whether external dependencies (git submodules) should be compiled]) + AC_ARG_WITH(external-deps, diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml index ee7d2e55c726..0e5767a74ad6 100644 --- a/net-analyzer/pmacct/metadata.xml +++ b/net-analyzer/pmacct/metadata.xml @@ -14,7 +14,6 @@ <flag name="l2">Enable Layer-2 features and support</flag> <flag name="ndpi">Enable support for nDPI through <pkg>net-libs/nDPI</pkg></flag> <flag name="nflog">Enable support for NFLOG through uacctd</flag> - <flag name="plabel">Enable IP prefix labels</flag> <flag name="rabbitmq">Enable support for RabbitMQ through <pkg>net-libs/rabbitmq-c</pkg></flag> <flag name="st-bins">Link Streaming Telemetry daemon binaries</flag> <flag name="traffic-bins">Link IPv4/IPv6 traffic accounting binaries</flag> diff --git a/net-analyzer/pmacct/pmacct-1.7.6-r1.ebuild b/net-analyzer/pmacct/pmacct-1.7.6-r1.ebuild new file mode 100644 index 000000000000..2f066465acba --- /dev/null +++ b/net-analyzer/pmacct/pmacct-1.7.6-r1.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="A network tool to gather IP traffic information" +HOMEPAGE="http://www.pmacct.net/" +SRC_URI="http://www.pmacct.net/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE=" + +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog + postgres rabbitmq sqlite +st-bins +traffic-bins zmq +" +REQUIRED_USE=" + ?? ( geoip geoipv2 ) + kafka? ( jansson ) + rabbitmq? ( jansson ) +" + +RDEPEND="dev-libs/libcdada + net-libs/libpcap + geoip? ( dev-libs/geoip ) + geoipv2? ( dev-libs/libmaxminddb ) + jansson? ( dev-libs/jansson ) + kafka? ( dev-libs/librdkafka ) + mysql? ( + dev-db/mysql-connector-c:0= + sys-process/numactl + ) + ndpi? ( >=net-libs/nDPI-3.2:= ) + nflog? ( net-libs/libnetfilter_log ) + postgres? ( dev-db/postgresql:* ) + rabbitmq? ( net-libs/rabbitmq-c ) + sqlite? ( =dev-db/sqlite-3* ) + zmq? ( >=net-libs/zeromq-4.2.0:= )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-1.7.4--Werror.patch" + "${FILESDIR}/${PN}-1.7.6-nogit.patch" + "${FILESDIR}/${P}-fix-mysql-crash.patch" +) + +DOCS=( + CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE + docs/INTERNALS docs/PLUGINS docs/SIGNALS +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + tc-export CC AR RANLIB + append-cflags -fcommon + + econf \ + $(use_enable bgp-bins) \ + $(use_enable bmp-bins) \ + $(use_enable geoip) \ + $(use_enable geoipv2) \ + $(use_enable jansson) \ + $(use_enable kafka) \ + $(use_enable l2) \ + $(use_enable mysql) \ + $(use_enable ndpi) \ + $(use_enable nflog) \ + $(use_enable postgres pgsql) \ + $(use_enable rabbitmq) \ + $(use_enable sqlite sqlite3) \ + $(use_enable st-bins) \ + $(use_enable traffic-bins) \ + $(use_enable zmq) \ + --without-external-deps \ + --disable-debug \ + --disable-mongodb +} + +src_install() { + default + + for dirname in examples sql telemetry; do + docinto ${dirname} + dodoc -r ${dirname}/* + done + + newinitd "${FILESDIR}"/pmacctd-init.d pmacctd + newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd + + insinto /etc/pmacctd + newins examples/pmacctd-imt.conf.example pmacctd.conf +} diff --git a/net-analyzer/pmacct/pmacct-1.7.5.ebuild b/net-analyzer/pmacct/pmacct-1.7.6.ebuild index b6cef6d81f80..3cebdfe03e0a 100644 --- a/net-analyzer/pmacct/pmacct-1.7.5.ebuild +++ b/net-analyzer/pmacct/pmacct-1.7.6.ebuild @@ -7,13 +7,13 @@ inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="A network tool to gather IP traffic information" HOMEPAGE="http://www.pmacct.net/" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="http://www.pmacct.net/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE=" - +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog plabel + +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog postgres rabbitmq sqlite +st-bins +traffic-bins zmq " REQUIRED_USE=" @@ -22,26 +22,28 @@ REQUIRED_USE=" rabbitmq? ( jansson ) " -RDEPEND=" +RDEPEND="dev-libs/libcdada net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson ) kafka? ( dev-libs/librdkafka ) - mysql? ( dev-db/mysql-connector-c:0= ) + mysql? ( + dev-db/mysql-connector-c:0= + sys-process/numactl + ) ndpi? ( >=net-libs/nDPI-3.2:= ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) - zmq? ( >=net-libs/zeromq-4.2.0:= ) -" + zmq? ( >=net-libs/zeromq-4.2.0:= )" DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" +BDEPEND="virtual/pkgconfig" + PATCHES=( - "${FILESDIR}"/${PN}-1.7.4--Werror.patch + "${FILESDIR}/${PN}-1.7.4--Werror.patch" + "${FILESDIR}/${PN}-1.7.6-nogit.patch" ) DOCS=( @@ -69,13 +71,13 @@ src_configure() { $(use_enable mysql) \ $(use_enable ndpi) \ $(use_enable nflog) \ - $(use_enable plabel) \ $(use_enable postgres pgsql) \ $(use_enable rabbitmq) \ $(use_enable sqlite sqlite3) \ $(use_enable st-bins) \ $(use_enable traffic-bins) \ $(use_enable zmq) \ + --without-external-deps \ --disable-debug \ --disable-mongodb } diff --git a/net-analyzer/pmacct/pmacct-999999.ebuild b/net-analyzer/pmacct/pmacct-999999.ebuild index 88a7b0b03c6c..4e643ff1e80e 100644 --- a/net-analyzer/pmacct/pmacct-999999.ebuild +++ b/net-analyzer/pmacct/pmacct-999999.ebuild @@ -13,7 +13,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="" IUSE=" - +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog plabel + +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog postgres rabbitmq sqlite +st-bins +traffic-bins zmq " REQUIRED_USE=" @@ -22,24 +22,24 @@ REQUIRED_USE=" rabbitmq? ( jansson ) " -RDEPEND=" +RDEPEND="dev-libs/libcdada net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson ) kafka? ( dev-libs/librdkafka ) - mysql? ( dev-db/mysql-connector-c:0= ) + mysql? ( + dev-db/mysql-connector-c:0= + sys-process/numactl + ) ndpi? ( >=net-libs/nDPI-3.2:= ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) - zmq? ( >=net-libs/zeromq-4.2.0:= ) -" + zmq? ( >=net-libs/zeromq-4.2.0:= )" DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" +BDEPEND="virtual/pkgconfig" DOCS=( CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE @@ -67,13 +67,13 @@ src_configure() { $(use_enable mysql) \ $(use_enable ndpi) \ $(use_enable nflog) \ - $(use_enable plabel) \ $(use_enable postgres pgsql) \ $(use_enable rabbitmq) \ $(use_enable sqlite sqlite3) \ $(use_enable st-bins) \ $(use_enable traffic-bins) \ $(use_enable zmq) \ + --without-external-deps \ --disable-debug \ --disable-mongodb } diff --git a/net-analyzer/portsentry/Manifest b/net-analyzer/portsentry/Manifest index 5a782f37cd24..0fc28f94d99a 100644 --- a/net-analyzer/portsentry/Manifest +++ b/net-analyzer/portsentry/Manifest @@ -7,5 +7,5 @@ AUX portsentry.conf.5 8385 BLAKE2B dd9bca53db9f80cdee8f3b180f71aedcf641ae297406d AUX portsentry.confd 361 BLAKE2B 08d56d2b3dad6c6fea6a05d129889f6095f1dcd74acb315a1694e211f8c3c79b5ec9fa9ee36fa81628f6369cb1223136c81271548c0c504199e31d80175b5882 SHA512 a3a7f1f6b74d7d0dd3f33b0f1a787ab013d2aae8b46e41993b4589cf8b75299a18ac2542e67d448edfdcb32e264e5c45e136ef27e039b160da0d77c7e4a2a255 AUX portsentry.rc6 842 BLAKE2B d8aad34dedffd6dff750eaf39e009ece4a05bcfbc5849ae372242c66d52046402173d44acddc54427d46a0ab748f5c8ff9c6d6fc967843301b4b3f9fa34e5af5 SHA512 85695ccf2fee0fb056c3c8e56682787adb808bd7e72450319cc19a88a26f681c1b6aaa90e39d288afaec34904923115ed24884af244fdfe177e82f7def822d7e DIST portsentry-1.2.tar.gz 48054 BLAKE2B e7baf49ed02fe0100a789737c263ca9bd4d2122f59f00fbffa5fc6fac6215926ee46d7fbcb1424a1ace76a8c2845ff915550695509d7bd6b7892a746d05f2ec1 SHA512 bcbea576816c654a9e165897ea51de3a4dde2940b05e26e785315fae5a5c7a0f697abfa2ace14d16e687e4a26f37c75cdaffefa1c5f98681f858dda22bcf3dae -EBUILD portsentry-1.2-r1.ebuild 1153 BLAKE2B 21f1d7c8705b8a9f6ac1171e9a0bb1dc6600e802181e8739e24ec167998e2fd743cc72486ca5321e9775c4acd492e54699f05d34537a0d1778e66189d45009a8 SHA512 0706e2636c4ddc0240d63ab3307493714f6e2536ec0063b63210570ea8089787c62929504dd1fb49697e6845ad6d0111a05441f62e506768f52e1d6432d4ff21 +EBUILD portsentry-1.2-r1.ebuild 1634 BLAKE2B 74de1c2de523cb3c3db3b4de70e02836f6b9c8a4a1480af7f2f1d1dbc1c5faf1a7e9cde3a57402ea679fb482a3ec4f7fa4999a1fee8cb66c255d079031a6bf19 SHA512 89ddcadff1d3ac67b61596a7a3ca7ba9187ed7673ec6d51311df310fe3687b60e03fe02cb44d8ce75b5a655f891ebf4abe3bc197c42c5cdabe3b27249416cc7e MISC metadata.xml 361 BLAKE2B 1f9967f744b4fd2c3b7ca94df404b92fe2347aae753c2d7aab006879aab2c00ce77ab6cc699352b8a2da21ee46429b16d423c1d85deec4f92396e44bc1a4db93 SHA512 91dd94a52a85cf7d62f5ae1ccb5783b3c7c3b4ad513c1a2c9324bb3b79116504d1a59039d85c0c2adef55a9fe3ace9b533ce97f677c38cf19846e98c5df4abfb diff --git a/net-analyzer/portsentry/portsentry-1.2-r1.ebuild b/net-analyzer/portsentry/portsentry-1.2-r1.ebuild index 29e14b375300..362756f86a4d 100644 --- a/net-analyzer/portsentry/portsentry-1.2-r1.ebuild +++ b/net-analyzer/portsentry/portsentry-1.2-r1.ebuild @@ -1,29 +1,51 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Automated port scan detector and response tool" # Seems like CISCO took the site down? HOMEPAGE="https://sourceforge.net/projects/sentrytools/" SRC_URI="mirror://sourceforge/sentrytools/${P}.tar.gz" +S="${WORKDIR}"/${PN}_beta SLOT="0" LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc x86 ~x64-macos" +IUSE="kernel_Darwin kernel_linux kernel_FreeBSD kernel_SunOS" -S="${WORKDIR}"/${PN}_beta +RDEPEND="kernel_Darwin? ( app-shells/tcsh )" -src_prepare() { - epatch "${FILESDIR}"/${P}-conf.patch - epatch "${FILESDIR}"/${P}-config.h.patch - epatch "${FILESDIR}"/${P}-gcc.patch - epatch "${FILESDIR}"/${P}-ignore.csh.patch -} +PATCHES=( + "${FILESDIR}"/${P}-conf.patch + "${FILESDIR}"/${P}-config.h.patch + "${FILESDIR}"/${P}-gcc.patch + "${FILESDIR}"/${P}-ignore.csh.patch +) src_compile() { - emake CC=$(tc-getCC) CFLAGS="${CFLAGS} ${LDFLAGS}" linux + local target + + if use kernel_Darwin ; then + target="osx" + elif use kernel_linux ; then + target="linux" + elif use kernel_FreeBSD ; then + target="freebsd" + elif use kernel_SunOS ; then + target="solaris" + fi + + if [[ -z "${target}" ]] ; then + elog "Using 'generic' target for your platform" + target="generic" + else + elog "Using '${target}' (detected) target for your platform" + fi + + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" "${target}" } src_install() { diff --git a/net-analyzer/python-gvm/Manifest b/net-analyzer/python-gvm/Manifest index 6f75f2d66e04..8ee95feeeb39 100644 --- a/net-analyzer/python-gvm/Manifest +++ b/net-analyzer/python-gvm/Manifest @@ -3,9 +3,9 @@ DIST python-gvm-1.2.0.tar.gz 160700 BLAKE2B 40ef2d6e01dee7a93796c5d2f29db06e2a53 DIST python-gvm-1.5.0.tar.gz 171471 BLAKE2B 57fa3cc8dfa74a16c56fb4fee0f2c47ede441892a19865271e8c034cb853751f38b3f90cbca6d538d8e59866cd45d0fd8e783a62719c523c6fc9723f4c183a79 SHA512 7c1717dd8f724566232cca50997494012d0364975151afcca8aa483f9fd85d47343f1a2af0124cb762e16d42a057b06d8f8a5e637280e14541a270b14be188e1 DIST python-gvm-1.6.0.tar.gz 175162 BLAKE2B 2c2f9d96911533734807b1aa3e6a56c758122755284a4808ac4e7f974847a12ac8d148e1c8604307965422f311231d721cbbaf09207e85d4425afc5d9534b2e5 SHA512 135ae95d6b5d5226a5ed3e4a7c14e03831005e745039bca86d532cb852a41a973ea1559b1c17b6564787f9448e20c932445dfec0ec8ecf1b39366edc205ea934 DIST python-gvm-21.1.3.tar.gz 244785 BLAKE2B 7f0a63651a01a914359ea683cf52fe2e1ced22aba0bb90d232c4e5a13f25bb0a9d76a647c2bbe34f0be9615c0ce4d7fb938eee3fbe3a2389b7483b4d55069fee SHA512 eb92be77e69303e0ece54efb5bceaefb469ab1c3f4a2714ec1c839d43584e5760618c39a133aaaeb436c9f62d6deec8f40608e792f408e8cae7c083db857183f -EBUILD python-gvm-1.1.0.ebuild 821 BLAKE2B eec8d2684f24c0b11c66ad8d3afc65f3c9f9fb6c4f8df2a2c0f2e7231bd70bc7c5c3b08f3cb778eaf8df2b7980e0650f76be872c27dfd95c973f8b7842106c26 SHA512 a6aa5e251f22686e6bc0adba3bd2926857c57c33f3018f18e5da43b6294080fb3d5978e2cdb69a60bdbf926f01158bf6281e374a0b382e39eded8d9120c5eeda -EBUILD python-gvm-1.2.0.ebuild 825 BLAKE2B 79c71f462dcf069f628694a7fa57e6627d1fda48dafbfaff7f2d0aba855580ec4a3ca0e9e039bb0a001d80739e43ae5ea5c70c4f833482d783c0c132cd7867fe SHA512 ff33e31f548afc8aaeea46bee13c728a0bf7ae12ab04fcd0588dd0249cb9098a9557d71af1f5eae9b744d3afaf293cf555eeaf341b07812239cacf8994a22039 -EBUILD python-gvm-1.5.0.ebuild 866 BLAKE2B 4d6612fad898cf44901b57a77abef0d066112748138c11dc8d170527baf00755373b3d87832a11157a1ab07680b5bb251829253d1f679ff207f95f729b5a3d9e SHA512 4738c70b7316e824249610f52039f8c216d1a3fbfaebe81e3209d39a548b9e5f09bb9f4ea12c2b05d18ef7d34662a49d7399b98bc3670bb8dceaacac1cb3b014 +EBUILD python-gvm-1.1.0.ebuild 823 BLAKE2B a8dd82fac5e358849e6ef6385c757b289cbeb225f1e2e8b35724c100f1e9a637e819903ab434172506cb397479a713fdac0f70c0a7d1226d52af778cd0707d7d SHA512 fcab2ae66527c73c0e7edaa4cacb41cd057a4b9e1aae0e4b9a55e4cf8b369e7cb0c456954ea48e0c8555a8ec4363c302ec3526d35c04e3a354adc617613bb06a +EBUILD python-gvm-1.2.0.ebuild 827 BLAKE2B 006cfb008d9b6d62b184d7b15196bb3f34fc2a066cbb130fa0e527d9f883104d23a78ef05f758bc9f7ddf1fc48d4c5b16539385b04cc62b473092a7ac6cd7676 SHA512 75125b4a0eeca85bf5b930b1d321da9d7a5f4f3dfda7a7175ba8faf94023ee2b41dc13439266519744ac6e819a3c720623e51244aede3d254b8be8cd79cf6586 +EBUILD python-gvm-1.5.0.ebuild 868 BLAKE2B 7309c7017fffa64247aa06f5d0c91326824f53c76cd77b95e5bbf638ed6d27b7e770051ce2c87ca92b120937a8f03d577fbaf9867a5aa9724acb1ac13e895946 SHA512 aa6a7656dbe5d7b5c5689e3647c6d1f4c460737aa5aec989d29388254d07f2adb60d7952e4c9368480b16ae631e2a7b2f7fc1eeea1fdaa1289c2f91286fd077e EBUILD python-gvm-1.6.0.ebuild 642 BLAKE2B 0f04c9a050cbc0e1f767565ebaa58027b44ccab3d89c09b97993c5669451cca4682397d8c2fe00d9f3a5af821871d3cedcd6e02d30dcdcb266571410f48948ff SHA512 9e487c89bde3ac104e28ab61cd469938dd3ebf8b883eb01726fdb9d1479811a3fedb6ed3302438ebcbc5e4255af189c9a8ef39a701670073bb846117994a8247 EBUILD python-gvm-21.1.3.ebuild 683 BLAKE2B a85505205965fefdca9f5ce263a96c9abafe00596ff9df0a4a01907b8b5462147ef0ccfd4311bfd16114d7814999b3d9cf878c4d7342ee0ead122766e7478ebd SHA512 467ec1bcc05b1bdf00d74c2df29efa053a98428b668cbf65406e4e5dc258025ae708723d982caf9f8b87e517d0bb43e2ca602c9884aa563b2b2be535f9625c6a MISC metadata.xml 909 BLAKE2B b77ff599081198f1d21399f9909fe8005cfa26c4755943caef76136b6570ca510df9354efa4feccb3eb47b0bbaaf97880851ce2cc0184cd81a47ea30e0c4b5dd SHA512 f949284469a19629a0d9f542c40d2d366de6dbddc946ac3a69ef0366d9a2dcc1e419402da37e56ee51977816b47a7826c90fb4e31d871c0e6f23fb2e1d8ac45e diff --git a/net-analyzer/python-gvm/python-gvm-1.1.0.ebuild b/net-analyzer/python-gvm/python-gvm-1.1.0.ebuild index 0fe7c72c9a91..88f993c947ee 100644 --- a/net-analyzer/python-gvm/python-gvm-1.1.0.ebuild +++ b/net-analyzer/python-gvm/python-gvm-1.1.0.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 @@ -30,5 +30,5 @@ src_prepare() { # Exlude tests & docs to fix build issue sed \ -e "s/packages=find_packages(exclude=.*/packages=find_packages(exclude=['tests*', 'docs']),/g" \ - -i "$S"/setup.py || die + -i "${S}"/setup.py || die } diff --git a/net-analyzer/python-gvm/python-gvm-1.2.0.ebuild b/net-analyzer/python-gvm/python-gvm-1.2.0.ebuild index 940c6ebd495a..fc107e0b153e 100644 --- a/net-analyzer/python-gvm/python-gvm-1.2.0.ebuild +++ b/net-analyzer/python-gvm/python-gvm-1.2.0.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 @@ -30,5 +30,5 @@ src_prepare() { # Exlude tests & docs to fix build issue sed \ -e "s/packages=find_packages(exclude=.*/packages=find_packages(exclude=['tests*', 'docs']),/g" \ - -i "$S"/setup.py || die + -i "${S}"/setup.py || die } diff --git a/net-analyzer/python-gvm/python-gvm-1.5.0.ebuild b/net-analyzer/python-gvm/python-gvm-1.5.0.ebuild index 9bb049760a2a..48cb4f75b4fa 100644 --- a/net-analyzer/python-gvm/python-gvm-1.5.0.ebuild +++ b/net-analyzer/python-gvm/python-gvm-1.5.0.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 @@ -32,5 +32,5 @@ src_prepare() { # Exlude tests & docs to fix build issue sed \ -e "s/packages=find_packages(exclude=.*/packages=find_packages(exclude=['tests*', 'docs']),/g" \ - -i "$S"/setup.py || die + -i "${S}"/setup.py || die } diff --git a/net-analyzer/quidscor/Manifest b/net-analyzer/quidscor/Manifest index 0a507a8f5bff..91de3eb52ed8 100644 --- a/net-analyzer/quidscor/Manifest +++ b/net-analyzer/quidscor/Manifest @@ -2,5 +2,5 @@ AUX quidscor-1.2.48-curl-types.h.patch 226 BLAKE2B e569686e8c61152c3d2488718ea04 AUX quidscor-1.2.48-paths.patch 1170 BLAKE2B 26c7b2d329bca3c08bc5cabc6e51709d8af669cad635fff10072d39b732554bcf39dce8a8d158bd357d768f0086ddc8358304d24a13221e0aa821a4fd762e1d1 SHA512 b96b376b9645b7d10860a8f0228c827c400c09e7d1a6e087d10ac093e26311b4beb82457456dd8575f597594153ba0a1f0f63cc1517b3faf0d32d095b87c7adb AUX quidscor-1.2.48-strip.patch 225 BLAKE2B fbcae9a756e57ba64b99d5e60dd00e44fdff44fca0ce215811a2d7e8d7d24e1d362020c17cdb5ff2b655509e1edbe31aaf1a19a4f62d4f269366fb1339c3b447 SHA512 aa74a95847acf7064cdd264da611f7d63b84f2c8d60f48facc77b0100a89412f93f9630841afd944681a780ff4a0f44526730fd30c860a60869e4869bf597965 DIST quidscor-1.2.48-src.tar.gz 77843 BLAKE2B 4f9feffb67acc8f32c4f922ce882a0799549ecce8e439dffeee5d0e4ec967739646a0ee4912a189e99c9f39743a74ae1f5528050daa82689f35ba498b2bad87f SHA512 8272a1a4ed406d3429f0438dabddd15092be0a33a8fce3c5b0af0ae13422c8918f1a5971b2c2ea639fb87ffdeb1bc89085f07f89856e732f0b270b57eabb7010 -EBUILD quidscor-1.2.48-r1.ebuild 979 BLAKE2B 3c1233a613471c446da52fba6e999dc71f45f964ca0b6396482078c15de213f59c42ebaf0b20143165af0e7b7379605f98f6b9e7ab923978bc87b92545e0cc0d SHA512 2d23ab73c4da553c536dfe8dd5e21d70aefa0f7e5dc6e3a6c2b2d134a22ecc6888464cb3b0eab3ec26442251a239874404fa2034aa7e44210b8f8ef59c58a75d +EBUILD quidscor-1.2.48-r1.ebuild 978 BLAKE2B 47d15bb48fb06869c3cab09e5a0f8a5fcadcc95561c9574e1c48d3fe73d78f800c94134ffeb8091ea777a8246eba24901865eb08ae663837fab5b78cbfb1a001 SHA512 35b0512d93ada9b291d3232307550bed46ec3181887d36267dd3084218cb3c6d1c81b3848a30e46ebe47f7b33f27cf61d1bda6a7b2590a8d3474dd0913f5c95a MISC metadata.xml 358 BLAKE2B 21f6f867008c9a5e31b4b2ee70c53d73ca2456ad3221e2473fb4b05d63fa0d097c84f0f361b5f25ef03d7df14540c6df3b400fea23b9393ec86377fc5f790048 SHA512 be88c15adc53d883a35fa6ef7ed9f7d7fc442d9f4ca76b097c8c93f126d75bfb447a65c36f9c72022063b8336f26a045a29ec6b68d3da8591738c0e8017ae6bb diff --git a/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild b/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild index 9c118b6762a3..15a6af1294c1 100644 --- a/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild +++ b/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils toolchain-funcs + +inherit epatch toolchain-funcs DESCRIPTION="Qualys IDS Correlation Daemon" HOMEPAGE="http://quidscor.sourceforge.net/" @@ -37,6 +38,7 @@ src_compile() { src_install() { emake PREFIX=/usr STAGING_PREFIX="${D}" install dodoc ChangeLog FAQ MANIFEST README TODO + # fix ugly install cd "${D}"/usr || die mv etc .. || die diff --git a/net-analyzer/rtpbreak/Manifest b/net-analyzer/rtpbreak/Manifest index 0a8e170561bb..e60ce8ae5e50 100644 --- a/net-analyzer/rtpbreak/Manifest +++ b/net-analyzer/rtpbreak/Manifest @@ -1,5 +1,5 @@ AUX rtpbreak-1.3a-limits.patch 256 BLAKE2B bcc4767b877098778761f68d3c8dd645d17ad667a03e704e8f210b014cd2ec428db746a054a0e5d1cececea2626a065e22e4c93c787e49b0ffb3bb547afa6156 SHA512 b3e8a4cde8ea18dae571791550fcb39936da6108df7b657aad0f61288e2f2636218e403de86f4cfc99d59ef6ca635da184f7a00dbcb13399d23b043e5a0630bc AUX rtpbreak-1.3a-missing-headers.patch 402 BLAKE2B 60fba92b1540c8a4cec584c26247f83df46fe0865d1b3ebbb763356a7633cd1bd1e90610d6e9f9c83a9ed6096cef509b75ba07b602b7cddd7394bda1997df140 SHA512 742ec5ec41b45ab816fcbfc6e5ef8976567ccaa250eba496bda267cab2842504f10fb99e973ab0870f6989f575e31645c07fa8e9d734adeaa879585322e92d94 DIST rtpbreak-1.3a.tgz 41355 BLAKE2B 8e0d91569a009bc67c13de2a3db5731b4e9f14717e0f3c9fd0d98593780def4aa9d6046c0f48e2f99280d4a235d37f9f7c86d7647803f2f4dce454fa303047a3 SHA512 abe0329f91a8c76d4fab5589d834e19615457fe1c5cdb410ce2f6fbf871b750cf917a92a979b92aaf5f0a2644fa4f4dc4ca7e53fb46d71c8fa016a7f41efe5ad -EBUILD rtpbreak-1.3a-r1.ebuild 763 BLAKE2B 7709cf7bded2364943e0ca0100f439a7ebe0c80b06d0c07021c0df12dddf86dfbd03a79cb3e4b52551db72b743ad7b5f48cd62d62e73be4bc674a6bd95271938 SHA512 aaebbc455e4842003b0c8bdde69ef0fe0c6bc76d24509a0ff7ec85e3b2a6e559f0ff1e16b5bda661a7e07cf14217fc6e8b71625ff420ba129dc32dd1487bfac9 +EBUILD rtpbreak-1.3a-r1.ebuild 751 BLAKE2B 5fe2f329fdb3a41ba2ac17259a919bf4114d36d6f38b28bb6e0e885c5826348b1f254ccba49ed903d06bec22ffc034d06b89d1cbc15db5354c9171fff1101537 SHA512 88af087c14860e7b658ab5006fe2213fd7405b4f0516fcd9015d9942fbf83a7f16380bafa135761927061c113fd69c9b0f3d31c7617de5843e6557da27ac0e10 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-analyzer/rtpbreak/rtpbreak-1.3a-r1.ebuild b/net-analyzer/rtpbreak/rtpbreak-1.3a-r1.ebuild index c10b7bd76cc0..557c98956942 100644 --- a/net-analyzer/rtpbreak/rtpbreak-1.3a-r1.ebuild +++ b/net-analyzer/rtpbreak/rtpbreak-1.3a-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils toolchain-funcs +inherit epatch toolchain-funcs DESCRIPTION="Analyze any RTP session through heuristics over UDP network traffic" HOMEPAGE="http://xenion.reactive-search.com/?page_id=7" @@ -12,11 +12,9 @@ SRC_URI="http://xenion.antifork.org/rtpbreak/${P}.tgz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND="net-libs/libnet:1.1 >=net-libs/libpcap-0.7" - RDEPEND="${DEPEND}" src_prepare() { diff --git a/net-analyzer/scanlogd/Manifest b/net-analyzer/scanlogd/Manifest index 71fd67627d57..3df640647b33 100644 --- a/net-analyzer/scanlogd/Manifest +++ b/net-analyzer/scanlogd/Manifest @@ -1,5 +1,5 @@ AUX scanlogd-2.2.7-gentoo.patch 407 BLAKE2B e859b5d31f0a599f7a7a10863b1a883440551db1fd7a46613ce1c16229f9245f3312ee1a8577e98623850264e6e338d80c78e579a337b9387607577432a011c9 SHA512 e395e5b7ad59b57959060a1a4abc4cd2f3245a127975d3e780f8af9849df109b4e34d68594dbe6d2978ca62d0676c06dc6fb185effa734b958fa5c8b96e332c5 AUX scanlogd.rc 382 BLAKE2B 086a833826e21d94c5e8d8bca522dcd69f8a1d42164094b0bcbf9141353e9b3dcb09d718a6c0b4e2b3c4ba7a2dda1fe01700085a3c910b7b169cda79382ce1d2 SHA512 d4f5a640fa9a6a44370fafb621ee8fd91357b0870d04d6852017ca4c108a50a1d76a6e1ac09dcf76f3238893c6084fb998e69b5f5f227b72b8307c8e1d6dc170 DIST scanlogd-2.2.7.tar.gz 11352 BLAKE2B 480e1ef78ac35ff04fb44961aa501f997786e20a3501f54f74b9e5761edba4736341d364a9a10772d795cb6025b88399bf3b56b0a980a0d2d0787f7a66eeeb22 SHA512 56238cb91a33524a9512914568984ed0d066eb84bea1c08551fbc4e02c9643a3f9535d59b364db00d538e4d9bcd9650ac24f2042584d3a9c639f99eb77ba1a7b -EBUILD scanlogd-2.2.7.ebuild 941 BLAKE2B e2fed1952e14ed60d30802ed34d59d9fa6d84860b618a6329acd3a4247f6262be7a9d3da434a096dedb4f869859f1f0c67a10bbc5fe915b12d73351d52b7c440 SHA512 366fe30ef10f7e8af7e3598c452e8a7081351222e825d04f209edb8ee615dcb80f7f26cac74d553c651f9e91f5d158f6f206943dcdf26001320e299810e78c7d +EBUILD scanlogd-2.2.7.ebuild 947 BLAKE2B 20bef542281a5979bb04919116210524eef1d4115013f645d6eb9514f70ca4d70dbc691036f2a14cf68b1a6aa501e99ab1c749931921ed658b015f62b679ef78 SHA512 fbb3e20a7d7e91fff05c0093593a599f76393635518dc1313ff520a392e4238f199de538400a2ede78a30a4ae9956f14d59b70e18833b654b0ac15c783b58208 MISC metadata.xml 443 BLAKE2B d202f0eaa045670664aaf485c576200a334ba1345a0b03f551e2aa6501e489fbbbd76a9e2fb848a5e8a8e1f8817997c0a00ee41dd048d7a3786d1db90506f92c SHA512 85a26f92ab115fb66fe3d6658ec35891b7a2a45a27e44aa02bf0524e61ee3b517cc3cefa2ffb72c7c1ba8ca306e209e8c411da0e5071b3fc6781747e407f7526 diff --git a/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild index b7c18a9d4cd0..7fb4b5b2a9d4 100644 --- a/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild +++ b/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils savedconfig toolchain-funcs user +EAPI=7 -DESCRIPTION="a port scan detection tool" +inherit savedconfig toolchain-funcs user + +DESCRIPTION="A port scan detection tool" SRC_URI="http://www.openwall.com/scanlogd/${P}.tar.gz" HOMEPAGE="http://www.openwall.com/scanlogd/" @@ -20,8 +21,12 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch +) + src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch + default restore_config params.h tc-export CC } diff --git a/net-analyzer/scli/Manifest b/net-analyzer/scli/Manifest index 89239429f154..51f400d76591 100644 --- a/net-analyzer/scli/Manifest +++ b/net-analyzer/scli/Manifest @@ -1,4 +1,4 @@ AUX scli-0.4.0-configure.patch 1545 BLAKE2B 4e95bf9b1723228a2c946170314246a713c4ddb9dde3d6e103f54633ab2172c9e5618d319527c336027c990d5c1f4e4abb799a3a609898d10689abe5858549b1 SHA512 423daf0251bc65f84c430638f235ff30cd75257c221394332f4fd51b8c5deabb02fc97751b77e4571305107fe2ac66062c27cdf74a2d3d46f2f278d7983cf622 DIST scli-0.4.0.tar.gz 953401 BLAKE2B b6f3ccd1dbc69df882e3dbd73f8a686af76e370a5785cb475b9122a200cc9a01ae364d50fd391499cd88856ebb1e1a1869c8545b36eaecf73b45d46d47282b9b SHA512 ceb81e51049def64cb6f2428263709802380f7f712575e327a71d8cc120d284a7d9c57679d76e22cfcaf5b160d0d46af0cefa1133c56972b43002cb94f120dcc -EBUILD scli-0.4.0-r1.ebuild 649 BLAKE2B 9e96bc6ac72516d6cfd69a2645ad62cf809dc0c8cb978d19f1eac566a5e2ce3fd60b1e692361a4a1ca69de273f9c1b031617f284a09b837cf5a3bc37e0bd803c SHA512 822ccfe3fcfb13851ef7a5db609ecc95e5dc11da194861f3dd4c549f651dcd8eab8014fcb3a180d9ec63830a34a37615071013c7fd21e9be347a7a8dfd049b26 -MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef +EBUILD scli-0.4.0-r1.ebuild 650 BLAKE2B 13df7d02efb6e9bac8bd9ecc8eefb752cc6e81557fbc74800184eeb45a7b41c3ea9cb9121b507e37b868df70be565ed3fb1c3d20547b867b3f3d6b197dc426e8 SHA512 b8543d255025b19fa59a392a9816b0275a1eec1bf032b3b91f62fb8e3ab387ecd616ecb7e302029c733c8ae5b4d701918cc4fa08853928f7844588e71d8efe69 +MISC metadata.xml 357 BLAKE2B 16a6caced907af4a400f1313b36e5c9e39d12fd9743d3d8cbb8fc752d435b76e5db3ca4e78641ce2ce903c7e694ef5c4461acba14c9fb53a3b787b7cf230f5d0 SHA512 a35c706a759da39818f536b517acf1600a1c6be33319f22815f7ce4124e501148bf5582bc83efa39d3cb198f713d4e7ba88d6df86c563204d5f3b551bbd57cbe diff --git a/net-analyzer/scli/metadata.xml b/net-analyzer/scli/metadata.xml index 2c2a7923cfc8..60756e3c4e9f 100644 --- a/net-analyzer/scli/metadata.xml +++ b/net-analyzer/scli/metadata.xml @@ -5,4 +5,7 @@ <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> + <upstream> + <remote-id type="github">schoenw/scli</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/scli/scli-0.4.0-r1.ebuild b/net-analyzer/scli/scli-0.4.0-r1.ebuild index 200f73836851..07dc0a5b43b7 100644 --- a/net-analyzer/scli/scli-0.4.0-r1.ebuild +++ b/net-analyzer/scli/scli-0.4.0-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit autotools eutils + +inherit autotools epatch DESCRIPTION="SNMP Command Line Interface" HOMEPAGE="https://github.com/schoenw/scli" diff --git a/net-analyzer/sinfo/Manifest b/net-analyzer/sinfo/Manifest index ca877edd8f87..21d4b2a367cb 100644 --- a/net-analyzer/sinfo/Manifest +++ b/net-analyzer/sinfo/Manifest @@ -4,5 +4,5 @@ AUX sinfo-0.0.48-gcc6.patch 858 BLAKE2B 992c9b4e6546983ef8392afa846e3ef9d5eeaea9 AUX sinfod.confd 105 BLAKE2B 3e031b8f0f7aafd1ff8ac7efb97bd87ed7a301fdd82b0de148e85a23a76ca77d0ddf770d13626ddfe1e41d5bc5e4f83b5b646a6f5b88a0941708fd3a13460a52 SHA512 c9ec8ad6dd6126bc9f2860cf6fe54b2119dda428d8eda8cea283b9755c4d64fdb933d81aa2da194b8453dbc6386d6b2306766eecc627dbd1bd8b226b4520ac88 AUX sinfod.initd 212 BLAKE2B 137067cd9ef3a6f8dcef9997f3ba355bcc55aa6973533fdf9af7bf600c0c5e80f02f0374c15a630d30611302306a19be937f02f13bc41a9fa21e34c03daa642d SHA512 a26e3e1d8dae8a158299a214a7de569051bcfd3ab9dc3d92515767f896c5081efe886bc55b1d1d028547d8ed3d2a747408089f8de34712100e19a06cf5f07577 DIST sinfo-0.0.48.tar.gz 703237 BLAKE2B b404aef3be802ecf00685b5fc36e8c53bdbfa7afcb4fe1f6339126c7d696ddcd19ea61cb611f94892cbf5ed12f50fe67f66a21c3727d9734d6d656e2b699c5c5 SHA512 9cbc790883dfd78970a5943599128f1af34a82362fa33e7d6f23d560806dce5955c45f7e82e79adcf7696166d1f39fd1856bae76087a3ba46d54e3e4963d4067 -EBUILD sinfo-0.0.48.ebuild 899 BLAKE2B 5004fa7c3aacbe0258c02590cc9555db28e423327256bb4fc83488fd0a4a53935fe4e6ccf4240b8026d2d96f5be480bc0a5adc390cf9eac668dcefc7dc882a79 SHA512 ad29f2a590bf476e2fa98b963a553240b473a8b3d001618a67a82c822294fa0a058dbd0fe62260fd51d6d205810465a53d7a595a46726c9ece8ca8e7c64697d9 +EBUILD sinfo-0.0.48-r1.ebuild 908 BLAKE2B a66117f70f135a2ea5d1ba21d0af523287e436de03d7ab7c4fd3791bdf19cb3f6e93c9ba3181b1351597ed453522e82c777b2ef7918a3d1b7008193faefaab9e SHA512 021206411cf2ce8da8e6756d376f63fd7a92380aeaa43a74db0d8894606f1370edf1bde6a865d571d79eabdb40f5fe5fdf19e24a5e14253bb67f6503c2e0be63 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/sinfo/sinfo-0.0.48.ebuild b/net-analyzer/sinfo/sinfo-0.0.48-r1.ebuild index 441f23d854dd..ebc65efd14bf 100644 --- a/net-analyzer/sinfo/sinfo-0.0.48.ebuild +++ b/net-analyzer/sinfo/sinfo-0.0.48-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils +EAPI=7 + +inherit autotools DESCRIPTION="A monitoring tool for networked computers" HOMEPAGE="http://www.ant.uni-bremen.de/whomes/rinas/sinfo/" @@ -18,15 +19,18 @@ RDEPEND=" dev-libs/boost sys-libs/ncurses:= " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-0.0.47-tinfo.patch + "${FILESDIR}"/${P}-gcc6.patch +) src_prepare() { + default + cp "${FILESDIR}"/${P}-acinclude.m4 acinclude.m4 || die - epatch "${FILESDIR}"/${PN}-0.0.47-tinfo.patch - epatch "${FILESDIR}"/${P}-gcc6.patch eautoreconf } diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest index e9fbcadaed83..52d564d41520 100644 --- a/net-analyzer/smokeping/Manifest +++ b/net-analyzer/smokeping/Manifest @@ -3,5 +3,5 @@ AUX smokeping.conf 32 BLAKE2B ea64af0cebbb847c89503b3d893c902ab2d761afbce6594731 AUX smokeping.init.5 1360 BLAKE2B 4213a42dcd43c1166c5f10d287c9e50be37265f8be6db3a8b9e18351dfbe7259a8ca98eff044cd1c7ef657356e3960e60745aea63a79bdc73fd009b3bd746bd7 SHA512 64adf577c9d7d79c268cf46c40ed7db23c93cbd49897070d9028ee6636794b1c101d1a9d1ff6f92c24512e18bf0f06b10b67117090918920fb8b8189dec85d4f AUX smokeping.service 200 BLAKE2B 77110386e5d304c04d00114800c1f42bb5e8b5ce1eab419afd2fa7c59c1a569fe244c7f7c18e01519d82389bf66f5b6935dd212b3bf68ace9b480e981c311001 SHA512 2f8824143b8283ad02274107c5ed0e84f0c1465fc089823e36ef44a42fec68564d8cc4ff5fb0ad6dc0443e21fac5a8cbcbb0a9bea151b57efaff2a082d15f344 DIST smokeping-2.7.3.tar.gz 6614710 BLAKE2B 7fa10c19487427a3092a1e5591422cb37f66a6eab86b8b43eebbc8af441d5426b99f3c7b54040660f6f150ade99b1ea2555b4fcd6f80d8306d6f86ac9f95974e SHA512 d46d61539ffdd9cac41391aa813364260f90f84443c328b1c9233ab6ba3a0c157861694614e6c33e18b153f6a6afc0769c5fc7752b3ab52f114d984e53232830 -EBUILD smokeping-2.7.3.ebuild 4124 BLAKE2B 3ef8badf51fe0bd58e7bccba59b4358d79d14e31e1f96de5bbbe8ecdd6387a2d8d11da5bf66f44e3b8fa6751e105951e04457cc8fb4cdfa0b33f8dc25ac21c41 SHA512 526d5a13df1a00b91634b307c1260648dff83363920942ad6ebf97149cfd151b215e3ee3b1aa98128f1c0a430cd459bad95c41d7869d3ce2d27a282ad062934d +EBUILD smokeping-2.7.3.ebuild 4197 BLAKE2B ba54d0bbf60fdf40623a98015425bac299c8b864cc8c60ecd2f377089c6cd9b7c1708afd6b1525bb426b427b9259e37dff15ec5935554424fb0f9d570cbeb983 SHA512 0d405286984f37e95c2d51a9a19b0223097dd9b06489c65ef00a612bc1df0b2cdca21d91a055f0520d1c354a6fa392d37506d94079a0ba866c9a69440a74f18a MISC metadata.xml 468 BLAKE2B d219af56f99fd891f8990b2298c9daa86d8fa3f8433b04eeabab1d47492a4ba186906a265612422517f9fb373217473fd047412dc08b7b1bf3f2aaccc92ec2d9 SHA512 0ca877d24981625a5d601cd19fc18fe37b48526c7266c248ee0ba955ecc873b31ea5f06d3feb692566d228a481193fab1f70c53aaa0be089aee490d80f80e815 diff --git a/net-analyzer/smokeping/smokeping-2.7.3.ebuild b/net-analyzer/smokeping/smokeping-2.7.3.ebuild index 1e78c5958201..ec3971888746 100644 --- a/net-analyzer/smokeping/smokeping-2.7.3.ebuild +++ b/net-analyzer/smokeping/smokeping-2.7.3.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools eutils multilib user systemd tmpfiles + +inherit autotools systemd tmpfiles user DESCRIPTION="A powerful latency measurement tool" HOMEPAGE="https://oss.oetiker.ch/smokeping/" @@ -11,7 +12,6 @@ SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" - IUSE="apache2 curl dig echoping ipv6 radius" DEPEND=" @@ -45,7 +45,6 @@ DEPEND=" ipv6? ( >=dev-perl/Socket6-0.20 ) radius? ( dev-perl/Authen-Radius ) " - RDEPEND="${DEPEND}" pkg_setup() { @@ -58,8 +57,9 @@ src_prepare() { sed -i -e '/^SUBDIRS = / s|thirdparty||g' Makefile.am || die sed -i -e '/^perllibdir = / s|= .*|= $(libdir)|g' lib/Makefile.am || die - rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die # dev-perl/SNMP_Session - echo ${PV} > VERSION + # bundled(?) dev-perl/SNMP_Session + rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die + echo ${PV} > VERSION || die eautoreconf } @@ -79,14 +79,14 @@ src_install() { default newinitd "${FILESDIR}"/${PN}.init.5 ${PN} - dotmpfiles "${FILESDIR}"/"${PN}".conf - systemd_dounit "${FILESDIR}"/"${PN}".service + dotmpfiles "${FILESDIR}"/${PN}.conf + systemd_dounit "${FILESDIR}"/${PN}.service - mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html" - mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config" - mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail" - mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets" - mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail" + mv "${ED}/etc/smokeping/basepage.html.dist" "${ED}/etc/smokeping/basepage.html" || die + mv "${ED}/etc/smokeping/config.dist" "${ED}/etc/smokeping/config" || die + mv "${ED}/etc/smokeping/smokemail.dist" "${ED}/etc/smokeping/smokemail" || die + mv "${ED}/etc/smokeping/smokeping_secrets.dist" "${ED}/etc/smokeping/smokeping_secrets" || die + mv "${ED}/etc/smokeping/tmail.dist" "${ED}/etc/smokeping/tmail" || die sed -i \ -e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \ @@ -98,27 +98,27 @@ src_install() { -e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \ -e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \ -e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \ - "${D}/etc/${PN}/config" || die + "${ED}/etc/${PN}/config" || die sed -i \ -e '/^<script/{s:cropper/:/cropper/:}' \ - "${D}/etc/${PN}/basepage.html" || die + "${ED}/etc/${PN}/basepage.html" || die sed -i \ -e 's/$FindBin::RealBin\/..\/etc\/config/\/etc\/smokeping\/config/g' \ - "${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die + "${ED}/usr/bin/smokeping" "${ED}/usr/bin/smokeping_cgi" || die sed -i \ -e 's:etc/config.dist:/etc/smokeping/config:' \ - "${D}/usr/bin/tSmoke" || die + "${ED}/usr/bin/tSmoke" || die sed -i \ -e 's:/usr/etc/config:/etc/smokeping/config:' \ - "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die + "${ED}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die dodir /var/www/localhost/cgi-bin - mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \ - "${D}/var/www/localhost/cgi-bin/smokeping.fcgi" + mv "${ED}/var/www/localhost/smokeping/smokeping.fcgi.dist" \ + "${ED}/var/www/localhost/cgi-bin/smokeping.fcgi" || die fperms 700 /etc/${PN}/smokeping_secrets @@ -142,6 +142,6 @@ src_install() { } pkg_postinst() { - chown smokeping:smokeping "${ROOT}/var/lib/${PN}" - chmod 755 "${ROOT}/var/lib/${PN}" + chown smokeping:smokeping "${EROOT}"/var/lib/${PN} || die + chmod 755 "${EROOT}"/var/lib/${PN} || die } diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest index cb703d3093a4..5dde368969d5 100644 --- a/net-analyzer/snort/Manifest +++ b/net-analyzer/snort/Manifest @@ -6,9 +6,9 @@ AUX snort.confd.2 420 BLAKE2B 984bc3a1b4f9fea044b150d1362950cc2bc0fae07a92351a88 AUX snort.rc12 1469 BLAKE2B 6238dfc0f9e178fca864ee9485b8cf59c3056d8b047ee5fd62087f55e8a4627a903aff854827175fc80aaa6ecafa924d9ca57cd9fdba5a185d1e31814db69280 SHA512 ec398f06db147bc8ddf98b0d6a200af40c082053062b56a3fe78b1de6629cd7bf0b188e9baf44c1634f5f9f8ce8494a8a71be63c1e3f71838b77de58dbb45c71 AUX snort.tmpfiles 32 BLAKE2B 39e4f2491f52d2a369b1c4747468ea3a9d5f2c05a85adb4666e733929be16b9cf868ea6878d3d71271dd8ee05ad8e8fac52c4f4ebfd17da873a3dc64c5368810 SHA512 705e49c172ba7bc0afee9910dcbf7b4ee96f05e6d3030c7928bbeb0df658aefb5f61fddd0da078b257ee9a0c86d1750e7b44d6f61d8e56ab799044cd141964b5 AUX snort_at.service 327 BLAKE2B 36039657ae5a5b7a37585baebc3de15f32f457b3df6313621eea6bafe3e8a34626960bd4adafe110f36f75a15bae8fc045a6e3267b960249536a0f10ac05b88f SHA512 af48018d232eec181eff2f3aa240e11744911874ee08a0311474d73bffcf1e567102ea6d42a26520dd5a1a3c66530d8d3f19fc4b4753b6ac0ae55eb3200747e0 -DIST snort-2.9.15.1.tar.gz 6618999 BLAKE2B d9f661b036afa2130d406f8bcfa8d33fca482983e0e4785218e08899104c9069809b089631940109ee31e8d197783d994c58417d94f4b5282702e51466f828fa SHA512 9940f5bcdcf04823f9cb5c3f8efda72f98f6a47bce9f40399dec9ec41d23a386c7f7e44861d82368de31546123b920f9fc617197bbf9c5e750724bf8b9e19590 DIST snort-2.9.16.tar.gz 6948498 BLAKE2B b089f1caef44cd5243c38eba44e7449b1111b397e42eb1722f64530206532edb413003e6af06d18bc6051ef1ce8cbcf42955d823a56abe061081e99c6492dea7 SHA512 7e4e772d351890cb6ad6db4210e1f302fbb600b3b25182800ffd7e73061a044c2cf6fa927e542a1d20cea4fa3eed522f022b394a9286ada7694309d0c8c3bb75 -EBUILD snort-2.9.15.1.ebuild 8296 BLAKE2B a85504c132e629fd023de19a6fb95ded3194fe23ce2af9e1fc1284b50cc7a736735a79961bce06ec86ea82072ba2148970ebe28d171218eb1bb40ff7fef37f54 SHA512 caa6697e0725bdfb7d5dc51f3f0cce02fc0dd83af67793a8e7930cd84e7b14535bcb12b09dd8d4e67da178e8e48b7590377d484f1c2bd54e25cbb2346062584b -EBUILD snort-2.9.16-r100.ebuild 8409 BLAKE2B 8235121f2f81c53aa7b2d58ecb15647062a7cb391ef6aced8351572348b5ef2e9036c9190a29a1ca3e3d2dfc08ed7624de6b15ac03d254b8b748f778c87426ea SHA512 e7ae4bf8fa7b1898c2686664f2993be906ec9e3ccecac34251cc9a8b7099e1633ba20e662d18ab5b4902b595ac491bda5e8c3efc5f546322d3f126d730a2d58d -EBUILD snort-2.9.16.ebuild 8296 BLAKE2B 11cd245301793f6a4da6d98cb194cac7c2927817eeea81343b86b7f42562cba24950cf9327bb945321c0c21e535f286fe33d09296b6bb3e1c0a00cea7f98e075 SHA512 a75bae48d4aab6f9b3970be191383f575c431459b8b6933ec65ffe01040d75c628f0da191f4593b9140f45f7454e7683a03b3d0a6da0b12c8fc11afc5538c2e4 +DIST snort-2.9.17.tar.gz 6983018 BLAKE2B 8a6d5f4311e304b141f705fdcd3f570e88540dc5ce5882887b6fa52ea16e41daac384012badcbbc087693ee631e30477b8af2a6c49efa8230c71b80937597355 SHA512 c1a69e697298b4e85b8b8898e29077f5e74d8e2a8e42c2164a5597b3739204d856a74f30bc7c30b1907ec7b3bd3c6c6d798ead890656386b0c2a2da2c201d006 +EBUILD snort-2.9.16-r100.ebuild 8400 BLAKE2B 7f4ea0f30d7221171295ae513551543341b5e2f81c01d2694b45fa5c98550a18fa9b63a5c36915f3c0a17a09ac3acb09c58c6cde953f9efa2b81f7854400838d SHA512 e019602b0b6dc6ec5a022286bfe0291d02b8fb2efdfcdb9f28c864661d6475124176905debee553333763119731dcaa109f43abb771b2bd01ada6dda59cb0967 +EBUILD snort-2.9.16.ebuild 8288 BLAKE2B fb37f64c66a6d9487f513fc6b07b380cbafd7fa3d1bf9b984a0344c5c298e9be20e8bb0a9992724c3789254428c61597e61146957c0e4a55b751d0d67d2e436f SHA512 2806d400ab816104fbe41e50056f7463e7cd595611f1d300c8c0287d2206b308062900ac1b57ceb77ac580c24894600218ad39cba874fe2596b95b1976d75305 +EBUILD snort-2.9.17.ebuild 8196 BLAKE2B 4b484d9f4f03ce988795fd17c690611531bc15514838096a1bd055432cdf4860f7a823bbef9701248cb3903170c06f395b3e90ef8cb99cb133b58ade07058ff2 SHA512 9a611e49f6f853f841c6904db1a6c00232aa4ec274c6708ee4bf5604022aa329156edc11f37966a7c5e35903e4a775d5020a371ac00cba99a4057d23a0753092 MISC metadata.xml 4035 BLAKE2B edf91433724efd997deba7081e0d33247da16fd1f660fc7acf3d37e9f1eef188786a89eb6e8f9ef4ad5f288f71e5ceef2e9bcedc67b17bb74dc9a14f42306b4c SHA512 b0fe8a69ea492a65b89bcc0563a1b88583d8a80d3883944c4a52a0b10b8d9743160667afcb647c92e54eb12d51f8bc5cb8638151f17cb0f06ae74185db83acba diff --git a/net-analyzer/snort/snort-2.9.16-r100.ebuild b/net-analyzer/snort/snort-2.9.16-r100.ebuild index 66b2b845e872..91f49430d6f0 100644 --- a/net-analyzer/snort/snort-2.9.16-r100.ebuild +++ b/net-analyzer/snort/snort-2.9.16-r100.ebuild @@ -5,7 +5,7 @@ EAPI=7 LUA_COMPAT=( luajit ) -inherit autotools lua-single user systemd tmpfiles multilib +inherit autotools lua-single user systemd tmpfiles DESCRIPTION="The de facto standard for intrusion detection/prevention" HOMEPAGE="https://www.snort.org" diff --git a/net-analyzer/snort/snort-2.9.16.ebuild b/net-analyzer/snort/snort-2.9.16.ebuild index 4a3f0392b5c1..328947af8555 100644 --- a/net-analyzer/snort/snort-2.9.16.ebuild +++ b/net-analyzer/snort/snort-2.9.16.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools user systemd tmpfiles multilib + +inherit autotools user systemd tmpfiles DESCRIPTION="The de facto standard for intrusion detection/prevention" HOMEPAGE="https://www.snort.org" diff --git a/net-analyzer/snort/snort-2.9.15.1.ebuild b/net-analyzer/snort/snort-2.9.17.ebuild index 440d87d8359a..ba2c56393269 100644 --- a/net-analyzer/snort/snort-2.9.15.1.ebuild +++ b/net-analyzer/snort/snort-2.9.17.ebuild @@ -2,49 +2,49 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools user systemd tmpfiles multilib + +LUA_COMPAT=( luajit ) + +inherit autotools lua-single systemd tmpfiles DESCRIPTION="The de facto standard for intrusion detection/prevention" HOMEPAGE="https://www.snort.org" SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz" + LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="static +gre +ppm +perfprofiling -+non-ether-decoders control-socket file-inspect high-availability -shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen -+threads debug +active-response reload-error-restart open-appid -+react +flexresp3 large-pcap-64bit selinux +libtirpc" - -DEPEND=">=net-libs/libpcap-1.3.0 - >=net-libs/daq-2.0.2 - >=dev-libs/libpcre-8.33 + +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="+active-response control-socket debug file-inspect +flexresp3 +gre +high-availability inline-init-failopen large-pcap-64bit +libtirpc +linux-smp-stats +non-ether-decoders open-appid +perfprofiling +ppm +react +reload-error-restart selinux shared-rep side-channel sourcefire +threads" + +DEPEND="acct-user/snort + acct-group/snort dev-libs/libdnet + >=dev-libs/libpcre-8.33 net-libs/libnsl:0= + >=net-libs/libpcap-1.3.0 sys-libs/zlib !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) - open-appid? ( dev-lang/luajit:= ) -" - + open-appid? ( ${LUA_DEPS} )" +BDEPEND=">=net-libs/daq-2.0.2" RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-snort )" -REQUIRED_USE="!kernel_linux? ( !shared-rep )" +REQUIRED_USE="!kernel_linux? ( !shared-rep ) + open-appid? ( ${LUA_REQUIRED_USE} )" PATCHES=( - "${FILESDIR}"/${PN}-2.9.8.3-no-implicit.patch - "${FILESDIR}"/${PN}-2.9.8.3-rpc.patch - "${FILESDIR}"/${PN}-2.9.12-snort.pc.patch - "${FILESDIR}"/${PN}-2.9.15.1-fno-common.patch + "${FILESDIR}/${PN}-2.9.8.3-no-implicit.patch" + "${FILESDIR}/${PN}-2.9.8.3-rpc.patch" + "${FILESDIR}/${PN}-2.9.12-snort.pc.patch" ) pkg_setup() { - # pre_inst() is a better place to put this - # but we need it here for the 'fowners' statements in src_install() - enewgroup snort - enewuser snort -1 -1 /dev/null snort - + use open-appid && lua-single_pkg_setup } src_prepare() { @@ -52,14 +52,15 @@ src_prepare() { mv configure.{in,ac} || die + # USE=debug exposes a macro whose name apparently wasn't changed + sed -i -e 's/BEFORE_SRV_FAIL/BEFORE_SERVICE_FAIL/' \ + src/dynamic-preprocessors/appid/appInfoTable.c || die + AT_M4DIR=m4 eautoreconf } src_configure() { econf \ - $(use_enable !static shared) \ - $(use_enable static) \ - $(use_enable static so-with-static-lib) \ $(use_enable gre) \ $(use_enable control-socket) \ $(use_enable file-inspect) \ @@ -92,7 +93,9 @@ src_configure() { --disable-profile \ --disable-ppm-test \ --disable-intel-soft-cpm \ - --disable-static-daq + --disable-static-daq \ + --disable-static \ + --disable-so-with-static-lib } src_install() { @@ -154,8 +157,7 @@ src_install() { rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files" # Remove unneeded .la files (Bug #382863) - rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die - rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la" + find "${ED}" -name '*.la' -type f -delete || die # Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \ diff --git a/net-analyzer/snortalog/Manifest b/net-analyzer/snortalog/Manifest index 6cd13ebb9dd9..4654f8244c85 100644 --- a/net-analyzer/snortalog/Manifest +++ b/net-analyzer/snortalog/Manifest @@ -1,3 +1,3 @@ DIST snortalog_v2.4.3.tar 1324032 BLAKE2B dae81fe861c7d85ce5fce63ffe773cccb8b643654a861e1b9cc91db22e5683c4a5d2c83ee6a1895386777c600b004978f91e3ed8a333397139bfe6f9644a79ce SHA512 b4b8558865ae4d1ef932114f2a2fb5af7fb069f1b587955d9d489a31635e890fb0ed36ebcde19322ab0c0cae49734da08602e283bd731c769de527abf7d74d06 -EBUILD snortalog-2.4.3-r1.ebuild 1439 BLAKE2B d8bc3709fec9b09e1273b1b638a922a7ea63fb7a6bf373a457151301d4c0a827fb8cea4c5b7c0075715d1158280127e30c8ce5b236738a78715bc069b4f1783a SHA512 57b4291d92d321e72c57941a2a9d74b104afd8662d0f679ebb44ab428b2c96fb01785cf8218d84739bef90ed7b88a4ad92c504abcf024303789128068a5d37fa +EBUILD snortalog-2.4.3-r1.ebuild 1552 BLAKE2B 464b9276a173de2be490da6dfd6a039c6a13bd250e4306977b84983ed8126eb7eceb8cc72288c5ebce439ba94013e2287e7d56e6b9d69ab9e7baf08394729b30 SHA512 a1ef4a92bdf7806ef534ffc6cbe0e7500c313d13819f04ed28ccfb78792bb8c7f353c86af237e41f46003c7d3ee59591ff7c573fe8022726b04e6f33b43dcb1e MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild b/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild index 18e2cd14b905..960612b2f88f 100644 --- a/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild +++ b/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild @@ -1,17 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=7 MY_P="${PN}_v${PV}" -DESCRIPTION="a powerful perl script that summarizes snort logs" +inherit edos2unix + +DESCRIPTION="A powerful perl script that summarizes snort logs" HOMEPAGE="http://jeremy.chartier.free.fr/snortalog/" SRC_URI="http://jeremy.chartier.free.fr/snortalog/downloads/${PN}/${MY_P}.tar" +S="${WORKDIR}" + LICENSE="GPL-2" SLOT="0" - KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86" IUSE="tk" @@ -24,10 +26,16 @@ RDEPEND=" tk? ( dev-perl/Tk ) " -S=${WORKDIR} - src_prepare() { - edos2unix $(find conf/ modules/ -type f) ${PN}.* CHANGES + default + + local convert=$(find conf/ modules/ -type f || die) + convert+=( ${PN}.* CHANGES ) + + local item + for item in ${convert[@]} ; do + edos2unix "${item}" + done # fix paths, erroneous can access message sed -i \ diff --git a/net-analyzer/snortsam/Manifest b/net-analyzer/snortsam/Manifest index c7e25ff1f059..2279f6cc7476 100644 --- a/net-analyzer/snortsam/Manifest +++ b/net-analyzer/snortsam/Manifest @@ -1,4 +1,4 @@ AUX snortsam-2.70-gentoo.patch 8979 BLAKE2B 7df4e769ed440b5bd595b6a62a414d9172ec283ab6f48bd00f5ede432c7430c1c936a9915ca40857216e926ccf7354cf45743e97fdbd945374efe01e403a928c SHA512 17f5b03820491ffbd8eda4b5cc99230ab358788194eb07221a303e98cc0ef5855d347804b30bd21f38d2a6f0e370f2433a691a33db0599c50887857bdadb53b6 DIST snortsam-src-2.70.tar.gz 1971624 BLAKE2B 10f26afb8addffb52db099e0c376a9adb884b625503233b72203070cadc79a688c7a6950014759d6fb58c8844899482057d9701e9eaa5e9d12066f10e88d6421 SHA512 e0b6d53dfc0963e5a0012e25c1cd15f76263cc0d0158f6a50eab3876f1ae40c47eeafb7309113d27f1ca92d5491a19e32748c3bf51754be9320346ebbf26e5b1 -EBUILD snortsam-2.70.ebuild 1023 BLAKE2B c3a96adfd8c6e7e738a621958773229ef03a6dd921742728aa4c9c891098490e931c08cc7a5f6d601e74b6c5ab643a78e9c0efbe0cdcb9d6c238854be566588f SHA512 9e09fc3ffbb58be77e83f30b5306b1ce1a5fc84e17113ba63cffc2ec553cbacb959ccd2d142a2e9bd7da15a23d9439420f8130ca9a2f76bbcfd6faad0a886784 +EBUILD snortsam-2.70.ebuild 1024 BLAKE2B 1caa788ed5182079c86f0c22e6387bd0fe3f94eec3b1928259a339d2fdcbb2f035eb0d5c54a97c47d997804acb0edbc0b6285761f99ed4f61fb2e982166e562c SHA512 a3cd84c06d551f9eb179ab6f629ccff178c6e1f5f150fbe4eb2a528340b96402124f06f72edb0121c0cb8d6fb4235e9242d90cbf1cb53f6245977c86e0cc66f3 MISC metadata.xml 286 BLAKE2B a278f67a760b977849da10dfbc6f2da19da66b553e51f6a7f32403dbb8eca85432dcec745815bc9b55596bf5eece7916ddd7657360d110d91a83b6077eec2619 SHA512 cfd1ca7999686b831b0b459f5b06ea80fd28b4f24d3404a8ad90bb4d6461a011f6a2b338ebbf45c2eac621ec828dcc397b26c2ae82068e5b703271a85c76e760 diff --git a/net-analyzer/snortsam/snortsam-2.70.ebuild b/net-analyzer/snortsam/snortsam-2.70.ebuild index 800c7f6f08ec..f32b3f6db2ed 100644 --- a/net-analyzer/snortsam/snortsam-2.70.ebuild +++ b/net-analyzer/snortsam/snortsam-2.70.ebuild @@ -1,21 +1,20 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils flag-o-matic toolchain-funcs vcs-clean +inherit epatch flag-o-matic toolchain-funcs vcs-clean DESCRIPTION="Snort plugin that allows automated blocking of IP addresses on several firewalls" HOMEPAGE="http://www.snortsam.net/" SRC_URI="http://www.snortsam.net/files/snortsam/${PN}-src-${PV}.tar.gz" +S="${WORKDIR}"/${PN} LICENSE="BSD-2" SLOT="0" KEYWORDS="~alpha amd64 ppc ppc64 sparc x86" IUSE="debug" -S=${WORKDIR}/${PN} - src_prepare() { epatch "${FILESDIR}"/${P}-gentoo.patch ecvs_clean diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest index 89b5e4266a56..b70698e7eb80 100644 --- a/net-analyzer/speedtest-cli/Manifest +++ b/net-analyzer/speedtest-cli/Manifest @@ -1,3 +1,3 @@ -DIST speedtest-cli-2.1.2.tar.gz 24741 BLAKE2B 09418e34d92e0f91d7482ba4cc46cf812b43f25118c71a8e5127265f62ef93bb428ebfe5cc65a73ea8284fb7bfe1a99cc670d5d186f9e82284a11390f6e66960 SHA512 f2eb125116f42075d3248e1c0590cce4f822f383ff7c54c158504b16de72bf35b35d55a78014413a95a5f5bafa98c71c3ea011f20f480f1db272d6e8800c40bd -EBUILD speedtest-cli-2.1.2-r1.ebuild 682 BLAKE2B ff6e6916375f0e349bf2061a9fed91d198dd314c6457db5f3f4291d4165fb68f1cb5345017c0fb2e03ec599f1300153dfc2df39c73e29dbc10edeb3b1fb0ebdb SHA512 fd99a5dfa95b51b952a3b6ffcf52a336c53feb90883db3c32d03b8f1d223ddca341c2458202eb3c3092665fae60e6cdd7fdd36e2c62f74e65f1ac1dbaf0ab5f7 +DIST speedtest-cli-2.1.3.tar.gz 24771 BLAKE2B 70c604848ffa29ae0a28a636a40ffdd278000c865b243038f773d20a4f6f1c668704505c8bae302d84a0957b2a6ad9d4b303e2e9371b351348d7147ff9a5a67d SHA512 e2ecd9b4eea95e3641045c3da217ec5a39846b26c1f773fdd31c6ffe3cb5e35341320fc1992f865af48afd1a704c4d4224f9ec4048abb69131ee2f32385ae94c +EBUILD speedtest-cli-2.1.3.ebuild 682 BLAKE2B ff6e6916375f0e349bf2061a9fed91d198dd314c6457db5f3f4291d4165fb68f1cb5345017c0fb2e03ec599f1300153dfc2df39c73e29dbc10edeb3b1fb0ebdb SHA512 fd99a5dfa95b51b952a3b6ffcf52a336c53feb90883db3c32d03b8f1d223ddca341c2458202eb3c3092665fae60e6cdd7fdd36e2c62f74e65f1ac1dbaf0ab5f7 MISC metadata.xml 334 BLAKE2B f478e9bd7fb6fabecf2fa2aedcd21ee834fed3d0f8be4c1b6e5244f66a4c347f8df04d0ee8375394e632d6652bd360d51830e2b8d9c2757b1323f8f46b2a5567 SHA512 b51e761e451165b6a1dd898e59892e0bb1b8c53b36af40af0f036e8accfa1335a893b9dd6a1002a148a7b695181a714e2baa79b64968d37b93babdd8b2207509 diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.1.2-r1.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.1.3.ebuild index adbeae7674b3..adbeae7674b3 100644 --- a/net-analyzer/speedtest-cli/speedtest-cli-2.1.2-r1.ebuild +++ b/net-analyzer/speedtest-cli/speedtest-cli-2.1.3.ebuild diff --git a/net-analyzer/squid-graph/Manifest b/net-analyzer/squid-graph/Manifest index 23f64309b325..468cd0521a42 100644 --- a/net-analyzer/squid-graph/Manifest +++ b/net-analyzer/squid-graph/Manifest @@ -1,3 +1,3 @@ DIST squid-graph-3.2.tar.gz 20066 BLAKE2B 16c4b9621ad45eefe7be8c83d7339fb832516241e8eb17c7f0906b6dc7cddf06b2ed32d00e84ab390f95f7a57798f7af75a36af940605ce186513c09611c2152 SHA512 ab2529b0b67fb6549dd0837f2208ae712460ad19876baee8000a51c91ab31c464b83b360dfc93690ad6f4b3feb969cc95ca38a179ddefb6e0aa54b0cff866bfd -EBUILD squid-graph-3.2-r1.ebuild 474 BLAKE2B b205640cab28ff1cb47fd32eb65709f174f35f8431062dc30b7ede918454b049bc79be23f6509d749380eab42761780e4179c90fdc9764602aed5ace754bd533 SHA512 d400c6e7250e111aa607e5e848e7b22a043fe7986bd24cdf16db4a33ba7245f47eb1fc80b622847ad58757b8ffe59a8efa6d90511c302aa0db394113183da5c5 +EBUILD squid-graph-3.2-r1.ebuild 460 BLAKE2B 7cb7ef94700fca92421f35db350e6c381814767fe63ab61dfb0be34cf6f0cc889170c1ffaaa4477da6d88fbc7c91176c663dcd5bf7897ae4aa0c2a7cfdcfa839 SHA512 bba7f92e2a1b0378b6389ca0a317daa85650d148f293e99ef678968eb0b747a3697b82b6ca7def9a3bdac99c8c7de8847fcea698d05f2678fa571a790bf9b86a MISC metadata.xml 361 BLAKE2B 23cf811e7aff63c338124488e31676ee0f8aa907d614ad15ed0eff3d53a0b7778e4c071f9ba0ce86f71c67b1318752db43871afc23493fd5e3165e1f096d5b40 SHA512 9fef2c0f70a83adf4924ee1bdfa053e23ec65f4ec0d832c5dcd0fdd8e0994be02fd1e2ae859b698fa39fba297a4a8c9b4f3f133c052e5b7d7a65c4d31d155c1b diff --git a/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild b/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild index 4c5d34c145d1..87ae7040083b 100644 --- a/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild +++ b/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild @@ -1,21 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=7 DESCRIPTION="Squid logfile analyzer and traffic grapher" HOMEPAGE="http://squid-graph.sourceforge.net/" -LICENSE="GPL-2" SRC_URI="mirror://sourceforge/squid-graph/${P}.tar.gz" +S="${WORKDIR}"/${PN} +LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" RDEPEND="dev-perl/GD[png]" -S=${WORKDIR}/${PN} - src_install() { dobin apacheconv generate.cgi squid-graph timeconv dodoc README diff --git a/net-analyzer/squidsites/Manifest b/net-analyzer/squidsites/Manifest index b146fa606107..862275d34faf 100644 --- a/net-analyzer/squidsites/Manifest +++ b/net-analyzer/squidsites/Manifest @@ -1,4 +1,4 @@ -AUX squidsites-1.01-format-security.patch 210 BLAKE2B 27d40d5919f6e94babd32e04c3faf4ab864a0ba8edc6f6138979ef26083f1894561208827d7173948755fb2b9ce4ed0c3e176363ee20c71c1fe21b9f64ce0a09 SHA512 0e5d42ccf3a0ff75b630ae82b4db34d4e04df1e3336a701168df2ceb7194ce64d22f442dd523f7a3e37a74255a71cad162026e43121d0f4d06861cd0f5e8ac5f +AUX squidsites-1.01-format-security.patch 202 BLAKE2B 7c943932b2220599d15b3ceadff05c0cec2994dcd11511d0cf589aa8abbe316e3fd0058a1e1a99f7ef4adb047b2c54901007fe75196ce9aec0a0883ad3af000c SHA512 730bb76dff5ce69b9b5fe0671b09028adbff67fc6648a051c5f019d0157ecec8235b5c1111ffffd56c734fb2b8163c10da030bcdfb9a0d5fa149cf2ac9c38a98 DIST squidsites-1.01.tar.gz 23646 BLAKE2B 89f236c83cbaffd6671c3d22b51c8325e8224259b2902a6b3d70f5bfd3bd4bd5391434ae4672d7c57165636ba4263da397ed187c3f2bdfe7f3d62512e0e5faff SHA512 ecd6caf4ffbb531de1de85b2d8548e4256603909b1d1bc8c368516b644298803bc0cf3036a370ad679a763b94494bd755043df8a806dcca16990024c515cfed9 -EBUILD squidsites-1.01-r2.ebuild 761 BLAKE2B 1a5e13ef73a6864724f2cc82231b4c9faf5c66ff070eddf2941f809f96b8da0ed07cc9a0083fc569812b04cc10beba87a067059c107c83656418be89ffb68ef0 SHA512 1ea6c60bc3ee84aa2a90546139ac0583b5b4393b34b2bac3dc0a49ffc631a8305a1b9ba345fde37b0a8f44bb186f983597b19eb1e54321c58188fb536fc97f72 +EBUILD squidsites-1.01-r2.ebuild 770 BLAKE2B c6861e2114738b6a3c72def952c137d949bf642310d2c0336aabddf75b8f8995e4e6d099ac34aa077e8207e21fa668c3a5ce1506c96b31c80cd0c95ffb42989a SHA512 2c070ec96c30eb849b26c1414e62a6b2137cc0855217a74d007b89f849e31af0955a20169e23273813121574fc168f5258980f4c018530934d06d8614800d6cb MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch b/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch index 3dd72203c309..0efa4d0817ec 100644 --- a/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch +++ b/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch @@ -1,5 +1,5 @@ ---- a/src/squidsites.c -+++ b/src/squidsites.c +--- a/squidsites.c ++++ b/squidsites.c @@ -286,7 +286,7 @@ static
void print_help()
diff --git a/net-analyzer/squidsites/squidsites-1.01-r2.ebuild b/net-analyzer/squidsites/squidsites-1.01-r2.ebuild index 01f56bf30cc3..c165a7e043dd 100644 --- a/net-analyzer/squidsites/squidsites-1.01-r2.ebuild +++ b/net-analyzer/squidsites/squidsites-1.01-r2.ebuild @@ -1,25 +1,30 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="A tool that parses Squid access log file and generates a report of the most visited sites" -LICENSE="GPL-2" HOMEPAGE="http://www.stefanopassiglia.com/misc.htm" SRC_URI="http://www.stefanopassiglia.com/downloads/${P}.tar.gz" +S="${WORKDIR}/src" + +LICENSE="GPL-2" SLOT="1" KEYWORDS="amd64 ppc x86" -S="${WORKDIR}/src" +PATCHES=( + "${FILESDIR}"/${P}-format-security.patch +) src_prepare() { + default + # Respect CFLAGS sed -i Makefile \ -e '/^CCFLAGS=/s|-g| $(CFLAGS) $(LDFLAGS)|' \ || die - epatch "${FILESDIR}"/${P}-format-security.patch } src_compile() { diff --git a/net-analyzer/ssldump/Manifest b/net-analyzer/ssldump/Manifest index c3b37fa93113..577260a3d52a 100644 --- a/net-analyzer/ssldump/Manifest +++ b/net-analyzer/ssldump/Manifest @@ -1,5 +1,5 @@ DIST ssldump-1.1.tar.gz 187436 BLAKE2B 3cafd7263762a7a326fb30722a918bcfaae5b43eedca37a0b5c341efc510e935671dc7ebf71eb807fcacbfce5f77896f310b634028713deb5516390fcfc21f65 SHA512 00ff449d3818a27fbcb46316733428f6a623488e758a67fcb7ee4390835e3279e7242aa0134ddc158740cb8323f5fd9869bd50efb35189dce977d4768d9636c2 DIST ssldump-1.3.tar.gz 122819 BLAKE2B 8a96746939eb8d9ba33340ff112b1bc5b436a7eb5756fda494065c8f8fd7d6ec9c1c28d8f7f880d25856f24749fd8a8a98d4104753bb68772b2583dafef099b8 SHA512 6da4db890a30673278b17eb00201b6c2535ba476b769bed6ed4e31c06744f32e299d0f0dd6420aa7255e2c982a378cd721d7bf51dd0aeb23211ab678d1e5f26e EBUILD ssldump-1.1.ebuild 937 BLAKE2B cb9e7f84168680586b01f3d7392e92782476684a50f507be370ba5da0cc93fba4410dbb85d172cc2985560c8f4516c893b88a9aae0596ffd78590b481e78a7b7 SHA512 7e2d32d38e73c1768778d54f9357b5da7000ee7e794e74ea05304fef283ccf945643a336ed380cf3098d968649e6ee2f2599bb173a18cb0a7dc7f1af82813314 -EBUILD ssldump-1.3-r1.ebuild 671 BLAKE2B a671056fbf79208e795c53ccc693ddc97530cb27af6439739cc80f69c85436e8f7ffd3bf539426f5c252241f600cc8b90413150692403bfaa12afef4b7047761 SHA512 adbb68839511cc2f66dc46fbe4077c46db8a2386f08fdb69edf2f66a83d0494c246c41e5618d218815086d6872ac45f9c8c87e3246ab64cb6226bd8f367aaf22 +EBUILD ssldump-1.3-r2.ebuild 664 BLAKE2B 980c1543152f135728821e0af76f3e62ab3fd30dcbd1d8cd9d2cbd0ca435628e56a26d8cf674bd994fc4077f3786deec28ba58731f20ff1e79212c1538ee00bb SHA512 f28b2394bad4f9f8278236838edaad70e05e44f28aabf6457f45298e2b0ba365870b6fffc79d4a16b7fb721c7fbb0bf3af616432f2e49ec8fa2136c02be382a0 MISC metadata.xml 359 BLAKE2B 6cfa34e7b48e628a649c1e0775e8fde048226ba01436a3c275844089fbbe14f0588be44a2fc9ee6a4e89cc16ad1e479a53c926a4c3ba9edabe910bfb7d19bccd SHA512 e3eadb3bc57cdd5909cd93907f9d12a6541d303070a860bed60b10f5e018b6571d89f5100be0ff3800b2da5c58c40e3095cdfa43105273c389714c182ff33fe1 diff --git a/net-analyzer/ssldump/ssldump-1.3-r1.ebuild b/net-analyzer/ssldump/ssldump-1.3-r2.ebuild index ddd41125cefe..d64768e844a8 100644 --- a/net-analyzer/ssldump/ssldump-1.3-r1.ebuild +++ b/net-analyzer/ssldump/ssldump-1.3-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools toolchain-funcs +inherit autotools DESCRIPTION="An SSLv3/TLS network protocol analyzer" HOMEPAGE="https://github.com/adulau/ssldump/" @@ -11,7 +11,7 @@ SRC_URI="https://github.com/adulau/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="openssl" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~amd64 ~arm ~ppc sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND=" dev-libs/json-c:= @@ -30,5 +30,5 @@ src_prepare() { src_install() { dosbin ssldump doman ssldump.1 - dodoc ChangeLog CREDITS README + dodoc ChangeLog CREDITS README README.md } diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest index 538f6814cd77..9027d733f488 100644 --- a/net-analyzer/sslscan/Manifest +++ b/net-analyzer/sslscan/Manifest @@ -1,10 +1,12 @@ +DIST sslscan-2.0.10.tar.gz 110417 BLAKE2B 88c095096dd615b13e3c68e6ece7eff8588e7debe65c5c6b228392d78c806029a2bc18a6c42bee480e2bb669b39753b39de160917eafbb654f5d8b64ba50d309 SHA512 d6adc76579dd99648359e9694b615bf1d9be90d71736e49305fefa0c0e1e386af2457c534136d8da2219c080b1119873f54a4cdf1b82675f0ce24f4e6ae068ee DIST sslscan-2.0.6.tar.gz 109597 BLAKE2B 30c0dc329d252fbb91800e470cad84214fbe30694c33fa388040838da24ca73b0857f19603ca7e71dc84fe4ca10977b2d4c0145a752718225f5225540184dee5 SHA512 2f7236f101e1ab75a6fb2efc8fed2949a410b4c67156e88865724e0f399a6e749218253d49c122f1e046022634ef62dcc2b4f97833fd33f90a3ba5a2b7e06c6c DIST sslscan-2.0.8.tar.gz 109713 BLAKE2B 3c28eda337145556a968be66bb7924f95cd7ad8eb9bab04531cad7d3a274f5e337804d3223903369df63c97884b6373f0b207e3691857a6b65591e7d067f51dc SHA512 5260e8da881b7757d69b1f8a9640a9c1593c6537a9f66e9250c9183697e7768488d24bab1eef713a1907a773689587bd1b2856caebe6d8df3cf509273a2cf7fd DIST sslscan-2.0.9.tar.gz 109501 BLAKE2B a979d6da6fee9e206ce2676aeceaa224affd26b216a67caabe8ba5ec3959b0aa27e005ad79f067bee5c4801d292a35ce4fc061a94f58125437e64bbe8ef2c2d8 SHA512 968b55ec34320784983cfddc796fb798871534c5561661b1691dc3516537763fdb0541c2f89fae1ef1dd586b213d743f01e1b040907434191713af981a2fc495 DIST sslscan-OpenSSL_1_1_1h.tar.gz 9985614 BLAKE2B 78f8bcf04a5a03636efe4ea2f82cfbbf6528ed1b02f64b7b7cf773809f5bed11974fd6d2f9f9bddb7fc31e986997f0987a0a773da2bd10b842f3ace977c5c56a SHA512 619dc7b28151571e4410844263a6727c9883701c11a064a2df55368659a63d548179165c9b96910b0e739cec1142f109eae9503b688cbade7abd6b4f3a7563aa DIST sslscan-OpenSSL_1_1_1j.tar.gz 9994760 BLAKE2B 749886716739dcb909bd79b29cf714640b64039917f64f6cfc4bee9861e797380d0df9ff11d7f6bb084508b322cb0db4ef7a2f871ee304548ec919d387cdb2c5 SHA512 f94ef129514e69b70f800a599ae726eff6a2fac0dfa8e42982973d1328f6fac6b1da1124e1a7b8aa3d579b720ecf9c71a8bae45db6b1630c052b0c3a22b9360e DIST sslscan-OpenSSL_1_1_1k.tar.gz 9996510 BLAKE2B 755bbdfa5738e2f2d0a72b0e01861acb2df33f499e140b46a40562b0d6035992f5aae084c480d9fe4e82e4a4f74929e686c31b04f126859375357a0f9c207b5b SHA512 b963e24f598d4c95455733a1b06f73b802ccf18c3a4aa8e1436ef597aba3daa6020d032051439b35f72bd566e9e62d24aaacce770567e2b9e5c82958698d3d97 -EBUILD sslscan-2.0.6.ebuild 1016 BLAKE2B 55289328d999c1af28b5cb9ed42ce6f6e2ff672cb6b974623b5f02c81227ab3de39cb8730d7a1568de970170e15eb5ec0c16a757f45585c41f1c8d76332c47e2 SHA512 b55cb759acf7f8aa0d5a78c54620d3375d4b89bdd6c1c23d162d5dfb68a879dc60f2237d16c1cbcdcd248f63a3f2edd27e93e7db9dde9982152aaa19650d5a6c -EBUILD sslscan-2.0.8.ebuild 1018 BLAKE2B 78ef0d602717064b9405bf69b73e42dea04fe5015525a8d772af14ebc9e715137f5b43335381eb6f5be27f401530160996f7f31ef79e5afc8235a0193e42792b SHA512 fb0024161aa41a3a0c70499037d18a90e294f0154b2f093b462cfd8932b09fa40a37ef6bcb60c1d7e176c3b4c8622af05daae9885c65c8115c15650a349de0dc -EBUILD sslscan-2.0.9.ebuild 1018 BLAKE2B 949bbd7e711675f7549654865fc338db1b6c7ae3c9ddb4fcad98e1c40229476a914902ba97d2cb895b7e98ba85f3227223e84356808b26ae902ca4968a404909 SHA512 8939c02b7db8decc14c503e4ce3928f3c90caf2ecc32abd8f82ec8f37a8a3c9b8b51d4c164bc1e535eebe4458c367ffea60b38b04e5146e58f2d980e05448fb1 +EBUILD sslscan-2.0.10.ebuild 985 BLAKE2B 03b334c4b0dff0ec57f2d37f5c659ed190b9dc8da0d171e6d83ba3700e1bb1e960a6d2178d4b5cbd4fcd382dd61dc4889c7b5d5b823c88b998027cd34aeba774 SHA512 0e0a7a9de0bb42598130ead2ec982c331d08daa4cfec1142c9158c9928fcf33e6c367b89e888df103c0acc66faf837f0bb7769c9f948b029d534e1654e494659 +EBUILD sslscan-2.0.6.ebuild 983 BLAKE2B e77a70c644b03756523a436f7db37b79c486bfb23bbacd8392e59706f8fa351e8142c30f5136338112ea0aa52292c8289f0cb9bb4c8b6449a084429ee9934a3b SHA512 7371a4939df9f33352baf7c8916b76fd57749c6b6f928aab74e098a6ae4f827e279f759c398f3296983c5cf701a6a6499d9a1f85a6349cb47066508d3d2ef7f2 +EBUILD sslscan-2.0.8.ebuild 985 BLAKE2B 9149d38f1bfe75175a85e5ec04a1f3e64f2d111784b91e4fd04076b7ea6a6ba9ff062582c14301aadfa567c0b65901ce222108e72732d18d9ff27d1abd1a4d40 SHA512 45e47a2dc0d68bcc7ec26242c8250957c40da6845af8ec984ede6cb5689122a2e315c71f2bf3afe4520ed31791dba7bdafdcf0e39ac67b7a67c466393eddc8a1 +EBUILD sslscan-2.0.9.ebuild 985 BLAKE2B 03b334c4b0dff0ec57f2d37f5c659ed190b9dc8da0d171e6d83ba3700e1bb1e960a6d2178d4b5cbd4fcd382dd61dc4889c7b5d5b823c88b998027cd34aeba774 SHA512 0e0a7a9de0bb42598130ead2ec982c331d08daa4cfec1142c9158c9928fcf33e6c367b89e888df103c0acc66faf837f0bb7769c9f948b029d534e1654e494659 MISC metadata.xml 295 BLAKE2B 4aed9a7658ee65ef0630a49abe71b2ab860377365b040ea0e19dfd8069f05e64cdab2c93fdf95276ad4087c247a18c195d05c81d90226ab6e753950fafce846e SHA512 561d272316db60726db149ffd3f77a59ed4fd7d16dd96e8064e1994666812d5056180965ef93939904ae653e0aa2cbc04621f5700464d5115490d56c24354bb4 diff --git a/net-analyzer/sslscan/sslscan-2.0.10.ebuild b/net-analyzer/sslscan/sslscan-2.0.10.ebuild new file mode 100644 index 000000000000..01672701213e --- /dev/null +++ b/net-analyzer/sslscan/sslscan-2.0.10.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# sslscan builds against a static openssl library to allow weak ciphers +# to be enabled so that they can be tested. +OPENSSL_RELEASE_TAG="OpenSSL_1_1_1k" + +DESCRIPTION="Fast SSL configuration scanner" +HOMEPAGE="https://github.com/rbsec/sslscan" +SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +# Requires a docker environment +RESTRICT="test" + +# S="${WORKDIR}/${P}-${MY_FORK}" + +src_prepare() { + ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die + touch .openssl_is_fresh || die + sed -i -e '/openssl\/.git/,/fi/d' \ + -e '/openssl test/d' Makefile || die + + default +} + +src_compile() { + emake static +} + +src_install() { + DESTDIR="${D}" emake install + + dodoc Changelog README.md +} diff --git a/net-analyzer/sslscan/sslscan-2.0.6.ebuild b/net-analyzer/sslscan/sslscan-2.0.6.ebuild index 92a3a89625bf..0cade5bca7fd 100644 --- a/net-analyzer/sslscan/sslscan-2.0.6.ebuild +++ b/net-analyzer/sslscan/sslscan-2.0.6.ebuild @@ -7,8 +7,6 @@ EAPI=7 # to be enabled so that they can be tested. OPENSSL_RELEASE_TAG="OpenSSL_1_1_1h" -inherit toolchain-funcs - DESCRIPTION="Fast SSL configuration scanner" HOMEPAGE="https://github.com/rbsec/sslscan" SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz @@ -17,7 +15,6 @@ SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" # Requires a docker environment RESTRICT="test" diff --git a/net-analyzer/sslscan/sslscan-2.0.8.ebuild b/net-analyzer/sslscan/sslscan-2.0.8.ebuild index 5093e3ee48ab..d7a03ebe0b4d 100644 --- a/net-analyzer/sslscan/sslscan-2.0.8.ebuild +++ b/net-analyzer/sslscan/sslscan-2.0.8.ebuild @@ -7,8 +7,6 @@ EAPI=7 # to be enabled so that they can be tested. OPENSSL_RELEASE_TAG="OpenSSL_1_1_1j" -inherit toolchain-funcs - DESCRIPTION="Fast SSL configuration scanner" HOMEPAGE="https://github.com/rbsec/sslscan" SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz @@ -17,7 +15,6 @@ SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" # Requires a docker environment RESTRICT="test" diff --git a/net-analyzer/sslscan/sslscan-2.0.9.ebuild b/net-analyzer/sslscan/sslscan-2.0.9.ebuild index 5e25d50fb227..01672701213e 100644 --- a/net-analyzer/sslscan/sslscan-2.0.9.ebuild +++ b/net-analyzer/sslscan/sslscan-2.0.9.ebuild @@ -7,8 +7,6 @@ EAPI=7 # to be enabled so that they can be tested. OPENSSL_RELEASE_TAG="OpenSSL_1_1_1k" -inherit toolchain-funcs - DESCRIPTION="Fast SSL configuration scanner" HOMEPAGE="https://github.com/rbsec/sslscan" SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz @@ -17,7 +15,6 @@ SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" # Requires a docker environment RESTRICT="test" diff --git a/net-analyzer/ssmping/Manifest b/net-analyzer/ssmping/Manifest index 02034810c3a9..7cc967c38359 100644 --- a/net-analyzer/ssmping/Manifest +++ b/net-analyzer/ssmping/Manifest @@ -1,4 +1,4 @@ AUX ssmping-0.9-build.patch 461 BLAKE2B 5a8955ac770ec5f69d9756d0644e5599e7235e25de1cf77664cd113a0d8ae337b25af63d4f2e5023def7071e4c2eb1a8ca24379d18f83f06ac8ff2ccb1ea6157 SHA512 5072d9e02e987a3f48fdcd4b89c9f4129f50fbb5781c2b234415f8b6bef4ed4682b3e7176e8dc629a080ffb7ccdf4e49864917c8c8d63dddb7e384e7522a98cd DIST ssmping-0.9.1.tar.gz 16863 BLAKE2B f3ebb2940197feb8f280369d3d217c8335c64265e001d24b6e75b10dff5df0fced29b005267eb57abfd8b6aa41c2071aba69a766a85877aefe3c765134ae1454 SHA512 7929b43867f29ac7f93298820149fd326d8540187a59e4f28f226e1c0dbfcdc60dc3da437de250e4082a2d6bd845ae9e619bf3b592b824dd8d529bf093cdedff -EBUILD ssmping-0.9.1.ebuild 548 BLAKE2B cf3d4c69c11c4be8cf02973604c2d844154a7e1b4ec1b6a6a0f2fd03e1fd50933843f18b6cea90263461df5f2090ed80cadc18ec7a7a063946c0c63b8526e053 SHA512 e3e08fd80eab78138fc8c6a44aa4cb636a2c732166bbdd222c9de3ee09dbe470cf982d3e8f60ce711f0c656c250ba2c0c92c1f4bb6b5b4011c2c22176d496e59 +EBUILD ssmping-0.9.1.ebuild 555 BLAKE2B 1737c44eed2d6d63893a52c5752c2e35b56acffb7a8747d868fcad1bdb10a3d34dd1f26e2d798edd79499fd5c19c7d326c34e5e5378f6d18b8ea430678dc37fe SHA512 fd6559fedcb3698c17c6c4df0bec4c746fdd0280f0516b3b963ac0490018d9389d3830c1f4bfa95f717c4fd17d8480d9ae19943a2699fa4c2dbfcb0f90c4a2bb MISC metadata.xml 278 BLAKE2B 4b161aefaab798d06f5632eb0e0575b8c0b6530df84858c38d9f7fd91bc55ffe0f31779ce09abf0e006c402108db01e07ca4ef4d3986a606b37ac467555a72bc SHA512 2cd4384755f79ae9de8d40810923782a5c961f1899adca71ced586bd05993f8c30d36db62018fecc7abcf2181c3278409b36c1a8618516721a3f5abb9f9da45e diff --git a/net-analyzer/ssmping/ssmping-0.9.1.ebuild b/net-analyzer/ssmping/ssmping-0.9.1.ebuild index a9dc609c45f5..09a3d41b512c 100644 --- a/net-analyzer/ssmping/ssmping-0.9.1.ebuild +++ b/net-analyzer/ssmping/ssmping-0.9.1.ebuild @@ -1,18 +1,24 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Tool for testing multicast connectivity" HOMEPAGE="http://www.venaas.no/multicast/ssmping/" -LICENSE="public-domain" SRC_URI="http://www.venaas.no/multicast/ssmping/${P}.tar.gz" + +LICENSE="public-domain" SLOT="0" KEYWORDS="amd64 x86" +PATCHES=( + "${FILESDIR}"/${PN}-0.9-build.patch +) + src_prepare() { - epatch "${FILESDIR}"/${PN}-0.9-build.patch + default tc-export CC } diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest index 8257efc0983e..80b5d160f248 100644 --- a/net-analyzer/suricata/Manifest +++ b/net-analyzer/suricata/Manifest @@ -7,6 +7,6 @@ AUX suricata.service 501 BLAKE2B 00631ada0d2993eae97a028ef950b031b91bb3af346ee35 AUX suricata.tmpfiles 24 BLAKE2B 150b74a6775137704915015871ab4455b8d0b9204a75c398ea746e9194b0c0a787904f9015b98f36a685fac0dbb0fcb43746096dd403bf882afa5dfef12af94d SHA512 1530aed4efb35f988e2f0134388ea11ffc3ba1f217845a2c5dd47f947983ed4d343126e49d66a86ca7894ff60b5134464ddbe07509dcc80c001131f09cb7e2dd DIST suricata-5.0.6.tar.gz 29136659 BLAKE2B 97d95cadd54d44bd82424322c08ad04be2122cdae5763995f7aefe4a75872091dd7d289e89e47a5ad9fbce570964f11331d848db7fe7ec4c2be9a0f8b62fadff SHA512 73580721683f929a90b6b59673842c051fe44ee7b8d8d890106aad09952d5b8a8f3716f168c41b33feb5c32e0106f5926125313cc11b27bc5a9c65e90b21888f DIST suricata-6.0.2.tar.gz 30514801 BLAKE2B 20604fa3332a9d99a1a30db55a0ccd689af0e08e686cd6739d6c4390456acc28d34702704f7e25537463b0c23600d123de361a227f9ef2420ee5c2b11df2866a SHA512 230a74a5442cfa066c56528036b64c173702238c5075161119eaad08d320e528d3510c51095297f120030177fed9c84076d00f567f7a3a4cbdb23d382966cf00 -EBUILD suricata-5.0.6.ebuild 6314 BLAKE2B 9decccc442333c5eca6a31db51e9809f06ce7f4113039a3571d062b17e8c46f156b5271b822890cb32bcee208561a48400e8fbdb0157e020a7afb03d4ac175e7 SHA512 4b2006410d6543ff3f80246ba6f0b33672140b175119d17c5d1577348bf313c3f33712a2763bb5dde26245f0460bf2185847ce7e347edb271be9ef8fda5f5bcf -EBUILD suricata-6.0.2.ebuild 6590 BLAKE2B c42a41525b41b3395cc622184a356e150b168aadc8a6246bc52338300ea85f9f98c2ef4bd093ef434d0bb3b0c166c817ba125fce2e4b9a21c5497f0ca8af3619 SHA512 d797707e90ed896ac7b0cdd1653303dbfe99b8bbc4041e1348d1df815cc3c55486574abde86d32f083ee689e2279f65f156c16f60d77ba820d394189c164d4dd +EBUILD suricata-5.0.6.ebuild 6308 BLAKE2B 983a16f52ef856c1a032f9f6b77733fa8119be01f2d9a73d7d34c0715e820d0e45cdca2216a057a82a27b7587890c4db053d402dc930d25cdd6c50749b810d9b SHA512 d8752071b5e14e1e43d08fbf3e999c39669a00d283c35bdfd21ce14e6fc545a8158f8b1be076f933735bc85b8a4b001b38aa636851ccdf92294f67c1252dffb9 +EBUILD suricata-6.0.2.ebuild 6584 BLAKE2B 99f0293db4a5ba8cb76861ccc8a788853be335d70feb895ed63806d1bb0e5038e62b67dd7b4db5e1a821a118c0d1922451e8b72d23d8cc60a709db80a56826f9 SHA512 3ad71d0f084e37de8efc2fc9f517dc7c2b829a5e827588d79c60eac9832498c2367be1ca81df29673354948cb14d8dfca3893cf65cff27e14993c171f9ebeefc MISC metadata.xml 1015 BLAKE2B 355c550ad2fe7a37d69b92f0bd710824d68a3353be687876449ad5b7d8e2c98b06b833e59ebcf479410aff09dce71e1f7f64be860c348f3d6c3519cd8fe2acf2 SHA512 0837e07a0130baff435e684b47a6b463991aec73b4f570672d0091a70adf163c5e83d19887e1575f12db783d6246050777011d25dc658fe4767cd3fe8fc1d4a5 diff --git a/net-analyzer/suricata/suricata-5.0.6.ebuild b/net-analyzer/suricata/suricata-5.0.6.ebuild index b3efab9fb841..46d1458df40e 100644 --- a/net-analyzer/suricata/suricata-5.0.6.ebuild +++ b/net-analyzer/suricata/suricata-5.0.6.ebuild @@ -6,7 +6,7 @@ EAPI=7 LUA_COMPAT=( lua5-1 luajit ) PYTHON_COMPAT=( python3_{7..9} ) -inherit autotools flag-o-matic linux-info lua-single python-single-r1 systemd tmpfiles +inherit autotools linux-info lua-single python-single-r1 systemd tmpfiles DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine" HOMEPAGE="https://suricata-ids.org/" @@ -121,7 +121,7 @@ src_install() { python_optimize if use bpf; then - rm -f ebpf/Makefile.{am,in} + rm -f ebpf/Makefile.{am,in} || die dodoc -r ebpf/ keepdir /usr/libexec/suricata/ebpf fi diff --git a/net-analyzer/suricata/suricata-6.0.2.ebuild b/net-analyzer/suricata/suricata-6.0.2.ebuild index 18b52aaae039..7171dc94415d 100644 --- a/net-analyzer/suricata/suricata-6.0.2.ebuild +++ b/net-analyzer/suricata/suricata-6.0.2.ebuild @@ -6,7 +6,7 @@ EAPI=7 LUA_COMPAT=( lua5-1 luajit ) PYTHON_COMPAT=( python3_{7..9} ) -inherit autotools flag-o-matic linux-info lua-single python-single-r1 systemd tmpfiles +inherit autotools linux-info lua-single python-single-r1 systemd tmpfiles DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine" HOMEPAGE="https://suricata-ids.org/" @@ -121,7 +121,7 @@ src_install() { python_optimize if use bpf; then - rm -f ebpf/Makefile.{am,in} + rm -f ebpf/Makefile.{am,in} || die dodoc -r ebpf/ keepdir /usr/libexec/suricata/ebpf fi diff --git a/net-analyzer/symon/Manifest b/net-analyzer/symon/Manifest index 0c017e4227fc..5e4bfa8620ed 100644 --- a/net-analyzer/symon/Manifest +++ b/net-analyzer/symon/Manifest @@ -3,5 +3,5 @@ AUX symon.conf 313 BLAKE2B ab28f18000d5c20b2d2f690d2b77ed1d43339582bf5c7bb44c5b3 AUX symux-init.d 548 BLAKE2B 2affcdfeddc941aa1220e00aa5e88fc673f494f591afb3b40d6e67235df2423b4dfdebdb0f389dc4e370c33d379d9c16bc98eb2421036640c2a37efdbb5da16a SHA512 0f494d3d141cfcc800d33dc0ed364fafaf713811ec8a8ccec7a77b421888aff42546ad742bdaf3928c49bf61d76b97fd3f2fc8992fadf1d1c499c9a1aeada11d AUX symux.conf 952 BLAKE2B cbe1effaf2b9678575a2ef938432e6bc6aa7f2b13248a111ff2f821e10f6d70d4894d1682dccb2f55a702435d07bf93751f0d1417334fd77bf8bda878f2752da SHA512 5f7aa2d069ed6cb58dfc6ce7ab192f1486256551c1315b86b0216c56d4ee93d84101168c5ee8c1507729136dcd05c7a09cc9c901f132c5fc8015b2502bc15272 DIST symon-2.88.tar.gz 110149 BLAKE2B 918ecf6c87a363e85ce67f9890b2ff6d326f14f896cb85ee6e501b962cb4e476b8fab9d6a96857e63e34aa2ebd2036fbb507c52d74b66b59ff7d77c7bc571474 SHA512 d2079caefcde4cf017460560826c7bf9e97aee9dcce886cd0a85d671bdad877c513889c9b7cd67844dbb4161ce6b6e6f99709475dd2591141f1bc61ee11e8173 -EBUILD symon-2.88.ebuild 2246 BLAKE2B 71d95481acaa47a4f1b6a9b3efd3076acf8c265cb3029afce4f738c58a95abb07011f0254037a577389271b5bfce21507abc2fe2f4c51215bd2a8958592c6c2d SHA512 7e0c78340e188faade6a2dccb95c0c77475663d960ec325ac6bcc873b0389cd8e29a6fc62df5bcbf775d2068d92243d72be608aa13fe22bd12d3c78e193e18f7 +EBUILD symon-2.88.ebuild 2216 BLAKE2B 8eaff87fecb5e6ab564533437fc7d58a91f1eb469dda54ab7f641dfd249de722167ed312fae63539bdf7388885c6b763c15848026da29f2b18faebee5f4bec82 SHA512 448095467f7d2969f331e8d62c921c73ce226aeaa8094e7f04af13cb3ba124470b668c83a5a7181c5c790cb4a28ab31cdb470ce9af88341968d883f636351bfe MISC metadata.xml 632 BLAKE2B 2f2eef2301dea13d1714bfa3f092298c90712a8e4d0b0afdf56ac378c4aa3bed952d70ac56793c3b3b71217a9ba999e8491db5549afa2ebb141b12c22757f9bb SHA512 57e46a4106feab37a2f1c4cf5b9260bdcdfe8fa9f06fe850ca03cc3f9f80439e0f2db26c9cf41b2e7a10954241a4fbed68a16b5f8f33a6ed1b2c9ed31ea6edb7 diff --git a/net-analyzer/symon/symon-2.88.ebuild b/net-analyzer/symon/symon-2.88.ebuild index 0250b6eec39b..521fcb00eb67 100644 --- a/net-analyzer/symon/symon-2.88.ebuild +++ b/net-analyzer/symon/symon-2.88.ebuild @@ -1,31 +1,27 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils perl-module toolchain-funcs +EAPI=7 + +inherit perl-module toolchain-funcs DESCRIPTION="Performance and information monitoring tool" HOMEPAGE="https://wpd.home.xs4all.nl/symon/" SRC_URI="https://wpd.home.xs4all.nl/symon/philes/${P}.tar.gz" +S="${WORKDIR}"/${PN} LICENSE="BSD-2" SLOT="0" KEYWORDS="~amd64 ~sparc ~x86" IUSE="perl +symon symux" -REQUIRED_USE=" - || ( perl symon symux ) -" +REQUIRED_USE="|| ( perl symon symux )" +BDEPEND="sys-devel/pmake" RDEPEND=" perl? ( dev-lang/perl ) symux? ( net-analyzer/rrdtool ) " -DEPEND=" - ${RDEPEND} - sys-devel/pmake -" - -S=${WORKDIR}/${PN} +DEPEND="${RDEPEND}" # Deletes the directory passed as an argument from the internal pmake # variable SUBDIR. @@ -84,7 +80,6 @@ src_install() { doman symux/symux.8 dosbin symux/symux - dodir /usr/share/symon insinto /usr/share/symon doins symux/c_smrrds.sh fperms a+x /usr/share/symon/c_smrrds.sh diff --git a/net-analyzer/synscan/Manifest b/net-analyzer/synscan/Manifest index ecd2e7ddf8e4..6e759e60bd30 100644 --- a/net-analyzer/synscan/Manifest +++ b/net-analyzer/synscan/Manifest @@ -1,4 +1,4 @@ AUX synscan-5.02-destdir.patch 436 BLAKE2B 8ce7e5a365f2769431864d116a42780b12d68df8247e3a9644f6b9a19bd4c3f1c92e8e6938baf2f532d9de109fb1911d69c9bea0a407e6d986705fdc9f0fcdd0 SHA512 4441e97a177d918b221569046115fdae729f96319abe90c42e94a5bcc04a56f20057923057314c7d61e1d06ab2325d70409765c129db8093d27e8541498e8567 DIST synscan-5.02.tar.gz 60651 BLAKE2B 0ad083d6751234b60ec0428cb3752ba1207a5be5e305a0d26950343c7a7f0572aa9ad5cb16831d862ac43c35a051514bd8fefce4abadbf4c120e4e9add7fa433 SHA512 40ec616e169d0d4150e2213fbdcb985e55dcceefef521b0bf85d8964f5b82892b8abeffcbe9c5e38314c22b86553dae56fb082d546e83efa65755a4d345ea7b0 -EBUILD synscan-5.02.ebuild 775 BLAKE2B 4d549d8f8090082e5daacdc0b78dd914685829c22cfff94942ba273c7983e80054a3f9fc9e9fad3364864337b4adb12e641bf4b702af18950ac722ae35234da4 SHA512 97ab032246b39a8a7e0eab8f20f797b2306e971f7d8c7f43802fb70eee70c55d34afade0368e00219bd6d01170310e644fdc6b827dbc8f08bda5430a352cf90a +EBUILD synscan-5.02.ebuild 822 BLAKE2B ae871bf0627addf335c864c0d7b2dcd1a3829129e44bb877030ed18498a0db35b4a24376792a42c03d1db0a9b0c361799b100436835f975a2a3f9fcf9a64c0c0 SHA512 e44b45ec97dc3722fed0f5df4c445fb198d3987fe73c1e6fcb43fa44cc2cbc3ae74b91d987267b48c5ab1ce0908f6c21c1ac97c213359c186eccdbdc772f8ca9 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/net-analyzer/synscan/synscan-5.02.ebuild b/net-analyzer/synscan/synscan-5.02.ebuild index d91e0b3141dd..020b4811326d 100644 --- a/net-analyzer/synscan/synscan-5.02.ebuild +++ b/net-analyzer/synscan/synscan-5.02.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools eutils + +inherit autotools DESCRIPTION="A fast asynchronous half-open TCP portscanner" HOMEPAGE="http://www.digit-labs.org/files/tools/synscan/" @@ -10,30 +11,30 @@ SRC_URI="http://www.digit-labs.org/files/tools/${PN}/releases/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" -IUSE="kernel_FreeBSD kernel_linux" +KEYWORDS="amd64 x86 ~x64-macos" +IUSE="kernel_Darwin kernel_FreeBSD kernel_linux kernel_SunOS" RDEPEND="net-libs/libpcap" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/${P}-destdir.patch" + "${FILESDIR}"/${P}-destdir.patch ) src_prepare() { default - mv "$S"/configure.in "$S"/configure.ac || die - eautoconf -} -src_configure() { - econf --prefix="${EPREFIX}"/usr + mv configure.{in,ac} || die + eautoreconf } src_compile() { local _target + use kernel_FreeBSD && _target=freebsd use kernel_linux && _target=linux + use kernel_SunOS && _target=solaris-sparc-gcc + use kernel_Darwin && _target=macos emake ${_target} } diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest index 9a3b306fc7da..6a2eee6c0a9d 100644 --- a/net-analyzer/tcpdump/Manifest +++ b/net-analyzer/tcpdump/Manifest @@ -1,8 +1,9 @@ AUX tcpdump-4.9.3-CVE-2020-8037.patch 1732 BLAKE2B f9ebe8862e6316443bec5b3103882eca6298104e64a7e121c81129367a984c6580e1be480e7aa263dfdf664d04547ea6cead7e16866978dffa33c2dba7c13dcb SHA512 f53b5557ad2c68c28bbd6121b637ade43937ce4956fa9c2c8b187e8c62726c018509eb728f7f7479d078c9018f091f64114944b2d6106e6214662899f880445a AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a45da05d0b47894368d39d2c8432f68ff47740d30c34868a60e6e300e08a1a1b5b8e17bb9519c945e39f81014a6 SHA512 eb12b115c8c6f0a2b7bb84712fe3dda5ddde3e6acb56d00000e97abc007b26a1411ddf6be793205bf7c76ccecc3915c417124870326745e3896ae6963bb42341 DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22 -DIST tcpdump-4.99.0.tar.gz 1876161 BLAKE2B 5ad7e7f888f56fac92ef3c01229ba03b45cfd706d7a904a10118b65c73aa6c5c1d39f54b7139c72116b67ed2971566596ae51d65de8528116b3a81bbcc7f52ab SHA512 921c27bdd803de9ecebe735a3efc82ac87c4efbd47949119241b8290ed1a015c25d252e428d5bf3b8e275e5b084d19bafb31020b1b3e241202cbc42f1f1d4801 -EBUILD tcpdump-4.9.3-r4.ebuild 1759 BLAKE2B 9de2877989906aa1d870f6d450040da8e6586ee5ecd77c66ff11dfb7848f9538b3739c5c458e4d1bbf8fb811f646909b4b9bc2956c1656c11fc64010355510d8 SHA512 b131e963b567a24763c85b5696e3b633aef1be2ea22d03c3a76c4867bd72aab9bf42d2eba9c2ec2c0d1c151aff016199fcd4085d78f14db0b7b25240793ea684 -EBUILD tcpdump-4.99.0.ebuild 1864 BLAKE2B 88937ff7ca63caea3a9c84a2ca5e97bd11623de064cf385b28ee33a4200fef8fcfdb8283a33ed4978155d79f3df3c0d6ba0d074289650ea7cf226f9684c36fd0 SHA512 82989ef5c40bb17a4d1efc4df929921044dfc3abfd0fad74934a26fc7608765f0559f055f1d51f1e86ed3a2c8218087c822ed39eac7241117adbec90dc7d5b50 -EBUILD tcpdump-9999.ebuild 1710 BLAKE2B cce77f9bcef21eeb2f6360b2b7d0cca85e4f3f5568c39cb8b3ac2c69fcc8aff2942715d70958d847e7425be2da49a353260287488273a1ebf51c5b0d8238ceb2 SHA512 73a88872fcc171ba0aa074e96742aa937a5b988b3f0c7196b2dec02d566e60201c6b050548175fdc2f30cd0e829dc28e82e21f8ea07c58fda7815814c651708b +DIST tcpdump-4.99.0-upstream.tar.gz 2008080 BLAKE2B 389939ea501edf66b7bb809c835feffebf15f30fbba559ce40963733a79ca271982336884acd7ff3d078decb1aaea0616d98091199918b520ef3d1fe0f194431 SHA512 03a434ec41c0026f237bc1e7a928b7ce67dbc342a8d982caded93d987bd356faf706a9d884231bd94f5e2a8580499fe95a28728e37a6672e371a1501ec5d6f79 +DIST tcpdump-4.99.0-upstream.tar.gz.sig 442 BLAKE2B a6cafbccdc1ecfb236a643b72114411e173cc898cda41edeac0c9755e48980f2d44f54c1f52b23dd992890b5aaa57e19430a600662e623832ccc62bfb7ac6fb4 SHA512 545770f09bec2f4ab3e723ab8582f1256eb0cb774ac2f329de17a45ee8256faea49469b796e17250d10c0455b305d39283c9b1d8b3c5a06c47a0d8088c874803 +EBUILD tcpdump-4.9.3-r4.ebuild 1760 BLAKE2B dda41e8b026d7121c30c6a53280d4908bdeefa9e1d3c8e22fc444a8bf509d0a25efeb012781e06e8ce409091687bfb081b4aa232902d36b5c9780f325f53659f SHA512 037a2342cc37920be4d0a8d7aff9172c47ee5ac1f312f3cd1fa8d3aeb1ae0440f9f0445170f2199983a763bd3afaffa3949de278f40c2e864f6957ac7ed892da +EBUILD tcpdump-4.99.0.ebuild 2360 BLAKE2B a2d53ec444175556138dc435ced542adf27828a1bb793b67ea0cb09d1d243e15d22e2be80914c3d8921462ea771127a07ca06a64f9f2dc1939be9e820b985173 SHA512 ebb033cbac5869c26efd8cd860148bc70240e1e90c00deddd80052342766b71f578ae48c0f971c8667140bbe8a79c298abc50e4535e0a1ff66f11a76eda1437d +EBUILD tcpdump-9999.ebuild 2204 BLAKE2B 07c96334989ad029da284b913dfb24175d66a3a22bfca1a891b0a5da8788e2a8be89ede5b9ca403f8dc8331ece340884607ccef783fae48aa0832c7c8adae78f SHA512 cdc6c55c3afde64296d96524869c86dcb170520a7962a1da63c2a8c65f1453d54682d71b9917ab450544f3a51f23da5f795bb7fa9da393f7ce3fe7c84c37a13d MISC metadata.xml 700 BLAKE2B 75eb9e5a825df6e9f4d4ef871e18eeaf6960ee25bbb42d5cb4bcd78775a7ead3ca45c76dd54ccee34c30e56d39303ee4d374a13bbaf449cbcf72242b7c9306f0 SHA512 c248231c288d69b2f71e86054095b599d72e971b9f8e67bacd851907b70b6a252fbf85a47f2b7f0cd3422ec7ef69410e2b3dbbe6de6b96320718dd5400900c74 diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild index 217b3f570c80..d0a366b2b4b6 100644 --- a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild +++ b/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="+drop-root libressl smi ssl samba suid test" RESTRICT="!test? ( test )" diff --git a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild index 2edd75502e32..d06df7164dbd 100644 --- a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild +++ b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild @@ -7,18 +7,31 @@ inherit autotools DESCRIPTION="A tool for network monitoring and data acquisition" HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump" -SRC_URI="https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz" -S="${WORKDIR}/${PN}-${P/_}" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc + inherit verify-sig + + # Note: drop -upstream on bump, this is just because we switched to the official + # distfiles for verify-sig + SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz" + SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )" + + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" +fi LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="+drop-root libressl +smi +ssl +samba suid test" +REQUIRED_USE="test? ( samba )" + # Assorted failures: bug #768498 RESTRICT="test" -REQUIRED_USE="test? ( samba )" -BDEPEND="drop-root? ( virtual/pkgconfig )" RDEPEND=" net-libs/libpcap drop-root? ( @@ -43,6 +56,11 @@ DEPEND=" dev-lang/perl ) " +BDEPEND="drop-root? ( virtual/pkgconfig )" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )" +fi PATCHES=( "${FILESDIR}"/${PN}-9999-libdir.patch diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild index 17c0eed4bfee..3e4c338aca2d 100644 --- a/net-analyzer/tcpdump/tcpdump-9999.ebuild +++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild @@ -3,22 +3,33 @@ EAPI=7 -inherit autotools git-r3 +inherit autotools DESCRIPTION="A tool for network monitoring and data acquisition" -HOMEPAGE=" - https://www.tcpdump.org/ - https://github.com/the-tcpdump-group/tcpdump -" -EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump" +HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc + inherit verify-sig + + SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz" + SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi LICENSE="BSD" SLOT="0" IUSE="+drop-root libressl +smi +ssl +samba suid test" - -RESTRICT="!test? ( test )" REQUIRED_USE="test? ( samba )" +# Assorted failures: bug #768498 +RESTRICT="test" + RDEPEND=" net-libs/libpcap drop-root? ( @@ -36,9 +47,6 @@ RDEPEND=" acct-user/pcap ) " -BDEPEND=" - drop-root? ( virtual/pkgconfig ) -" DEPEND=" ${RDEPEND} test? ( @@ -46,13 +54,18 @@ DEPEND=" dev-lang/perl ) " +BDEPEND="drop-root? ( virtual/pkgconfig )" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )" +fi + PATCHES=( "${FILESDIR}"/${PN}-9999-libdir.patch ) src_prepare() { default - eautoreconf } @@ -67,7 +80,7 @@ src_configure() { } src_test() { - if [[ ${EUID} -ne 0 ]] || ! use drop-root; then + if [[ ${EUID} -ne 0 ]] || ! use drop-root ; then emake check else ewarn "If you want to run the test suite, make sure you either" @@ -81,7 +94,7 @@ src_install() { dodoc *.awk dodoc CHANGES CREDITS README.md - if use suid; then + if use suid ; then fowners root:pcap /usr/sbin/tcpdump fperms 4110 /usr/sbin/tcpdump fi diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest index 839499f0a541..fefde39b6731 100644 --- a/net-analyzer/tcpreplay/Manifest +++ b/net-analyzer/tcpreplay/Manifest @@ -1,5 +1,5 @@ AUX tcpreplay-4.3.0-enable-pcap_findalldevs.patch 333 BLAKE2B 1beb39a7263bf8491998760e4a62ac8908300e28c43500812d37d2512f9d63fcd175b93c1b384e03e9570e741dd95dea09ead017a014a4b62b3449833fe9b248 SHA512 3d035736c0656f6ace85b45af595866e06c8464641023e9d1606c288e598cde18eb96b1be8300514f6f31bc83756ae76b436402666036456571201ca38fe5026 DIST tcpreplay-4.3.3.tar.xz 748220 BLAKE2B 2de09f75e6bb6035fc25f34f41d9ce2ccbb961d7464a9a6dae16ec417d629e4819593fd781d95075293ffa3a3db7c4a50ae8667c4e7d07c0b425361027c8df06 SHA512 110d7768a176d2126766829466a209cdd983afcf0c988f7e128baa5057b3ac1dc918fcaeb168a2e6654429100a146afcbdafcda8c3d67adf6b17892a48689a02 -EBUILD tcpreplay-4.3.3.ebuild 1847 BLAKE2B d438b6303817d166b800843f3d5f137d69cac8229e37b71d9ff863d9e800c6191284c1bef9d4ad35187864897ad08d8c0a7d96022b55dea909c8164bb918d23a SHA512 e45fa5f14b253b14aba41edf70ea3108ea0be0d6fc17b6a601a7131f247071bfa7001518c78e95cb73203aef0758140e30e11d81e7821f94961cf1e7dfe287c9 -EBUILD tcpreplay-999999.ebuild 1809 BLAKE2B 196a27e64b132ffa5440aa7b540c4939d62dda5191ddc169a85b198f87d84cfcb15f26404e1c335ead442efa8a0cd70f795bceb3fa25736d525accaa42b448dd SHA512 2690427a1bcec51a564bf8dd6bac157a5bfa2dd27fe9c884c37b89b23963fe791a720c703cc4421d9955e8697f2209152e041302aeb767b40dfb052e7b0cfffd +EBUILD tcpreplay-4.3.3.ebuild 1924 BLAKE2B 0eec7595c24499e9d2dd603d097613f3b1ca59a28c096d7ec8a9231be16ddd1e5d2ce8a56cb41086c6baf3fb08ff56d890b8aec553082e0c7272b49f8dd32285 SHA512 521491bb8e182f93ffa83bc50448e45f178881889af50371f6a770a9815b572d48721ba6b480c64d81fad2f8d2f90e772ea055adc990b98fbd99cc681e86afd9 +EBUILD tcpreplay-999999.ebuild 1875 BLAKE2B acf0bc3fb3e2d84f598d8ed6e13c42bfc642da1aedf8036362e52ab0bc7709beb81d9e57517d26b2b9507ec1cf89c577b0c40993f8faa63babcfaa2d11dbdc6e SHA512 be4c895b20ee5898dc182fdf8f45de64bb9c28fb4b581c07ad29a1f03d3ed953f6bc2e6b596fac66a6290a83dcdfdab17fb01de0042b82cdae86deefcf6be062 MISC metadata.xml 1116 BLAKE2B 23c8b7009a77b68831affc57432a87a31fde213d7e7ee88f68ced4a4e21a56c55f97497e610fc486a42c699759ef1edf1904fa9b0fe976df4fc9930535f97037 SHA512 58cb13a648ba7b9f9fd8c7a7cdfd37d56f0d7b957824a55d63001a8708f93d529b29e52df051bdce0c87eb672d24c7b2c35ee8a1e94ba062e2a1e12dd0d0ee1b diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.3.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.3.ebuild index a5ce8388372c..3df344d41601 100644 --- a/net-analyzer/tcpreplay/tcpreplay-4.3.3.ebuild +++ b/net-analyzer/tcpreplay/tcpreplay-4.3.3.ebuild @@ -1,36 +1,39 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools flag-o-matic -DESCRIPTION="utilities for editing and replaying previously captured network traffic" +inherit autotools + +DESCRIPTION="Utilities for editing and replaying previously captured network traffic" HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay" -LICENSE="BSD GPL-3" SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.xz" +S="${WORKDIR}"/${P/_/-} +LICENSE="BSD GPL-3" SLOT="0" KEYWORDS="amd64 ~arm ~sparc x86" IUSE="debug pcapnav +tcpdump" -DEPEND=" +# libpcapnav for pcapnav-config +BDEPEND=" + net-libs/libpcapnav >=sys-devel/autogen-5.18.4[libopts] +" +DEPEND=" dev-libs/libdnet >=net-libs/libpcap-0.9 - tcpdump? ( net-analyzer/tcpdump ) pcapnav? ( net-libs/libpcapnav ) + tcpdump? ( net-analyzer/tcpdump ) " RDEPEND="${DEPEND}" -DOCS=( - docs/{CHANGELOG,CREDIT,HACKING,TODO} -) +DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} ) + PATCHES=( "${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch ) -S=${WORKDIR}/${P/_/-} - src_prepare() { default @@ -50,8 +53,8 @@ src_configure() { # By default it uses static linking. Avoid that, bug 252940 econf \ $(use_enable debug) \ - $(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \ - $(use_with tcpdump tcpdump /usr/sbin/tcpdump) \ + $(use_with pcapnav pcapnav-config "${BROOT}"/usr/bin/pcapnav-config) \ + $(use_with tcpdump tcpdump "${ESYSROOT}"/usr/sbin/tcpdump) \ --enable-dynamic-link \ --enable-local-libopts \ --enable-shared \ diff --git a/net-analyzer/tcpreplay/tcpreplay-999999.ebuild b/net-analyzer/tcpreplay/tcpreplay-999999.ebuild index 9e2776949df2..52407c59ac72 100644 --- a/net-analyzer/tcpreplay/tcpreplay-999999.ebuild +++ b/net-analyzer/tcpreplay/tcpreplay-999999.ebuild @@ -1,35 +1,38 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools flag-o-matic git-r3 -DESCRIPTION="utilities for editing and replaying previously captured network traffic" +inherit autotools git-r3 + +DESCRIPTION="Utilities for editing and replaying previously captured network traffic" HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay" -LICENSE="BSD GPL-3" EGIT_REPO_URI="https://github.com/appneta/tcpreplay" +S="${WORKDIR}"/${P/_/-} +LICENSE="BSD GPL-3" SLOT="0" -KEYWORDS="" IUSE="debug pcapnav +tcpdump" -DEPEND=" +# libpcapnav for pcapnav-config +BDEPEND=" + net-libs/libpcapnav >=sys-devel/autogen-5.18.4[libopts] +" +DEPEND=" dev-libs/libdnet >=net-libs/libpcap-0.9 - tcpdump? ( net-analyzer/tcpdump ) pcapnav? ( net-libs/libpcapnav ) + tcpdump? ( net-analyzer/tcpdump ) " RDEPEND="${DEPEND}" -DOCS=( - docs/{CHANGELOG,CREDIT,HACKING,TODO} -) + +DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} ) + PATCHES=( "${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch ) -S=${WORKDIR}/${P/_/-} - src_prepare() { default @@ -49,8 +52,8 @@ src_configure() { # By default it uses static linking. Avoid that, bug 252940 econf \ $(use_enable debug) \ - $(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \ - $(use_with tcpdump tcpdump /usr/sbin/tcpdump) \ + $(use_with pcapnav pcapnav-config "${BROOT}"/usr/bin/pcapnav-config) \ + $(use_with tcpdump tcpdump "${ESYSROOT}"/usr/sbin/tcpdump) \ --disable-local-libopts \ --enable-dynamic-link \ --enable-shared \ diff --git a/net-analyzer/tcpslice/Manifest b/net-analyzer/tcpslice/Manifest index 05d1537de52d..2a908ad24adf 100644 --- a/net-analyzer/tcpslice/Manifest +++ b/net-analyzer/tcpslice/Manifest @@ -1,5 +1,5 @@ AUX tcpslice-1.2a_p3-exit.patch 148 BLAKE2B 630ab0a2f57eda36d148c9338bc1a6b95feb4867f27bef5bc0ba4144a7778ab3a080bc13dce964c56fed8fd723f6ba3247aafd1d878cbb276f3d17ed58ba724f SHA512 7506ce229cc1e0d44570c62a77e0e96adc3936d8464af6c79abbd9b1fd09559b627fa4f27f905cc5e7fd39f246e818a445406ac9439b6792223671f0f1f77864 DIST tcpslice_1.2a3-4.debian.tar.gz 5784 BLAKE2B c85beab03b494984d721ca64fb75ccb29746dee4184e4daecf2703e80f3b3d3e4330b911831960caa17d631a4760a21d17368cd7017e61c05766fd1f50c66e0e SHA512 43a0ad5811c84639be0c6d162ea92101e73240e9689e4b647ee060697382062ec0e22dcb951ca000e05bac829455b7aa37f8dd73c5b1dd87f55e6d61a8a9b59b DIST tcpslice_1.2a3.orig.tar.gz 76879 BLAKE2B 38b20ef09c2c0fc2c956c421d131ce27748bea684bb459da13f0d29b008a4561b7f61381cfbdb9c1dbdf53478c55b412efa9af689d5425f7fbfc9f0ee32016d5 SHA512 04e12d592807022c78eb4941580ed103995680c69af885bb8f13828a12ec570f7fe93c34c1b20a01d3d99f445d5da17a1fcfbe25b2e3b41abe28304c034654c5 -EBUILD tcpslice-1.2a_p3_p4.ebuild 867 BLAKE2B 1365b82ec2286882a4d569883705aa1cf6f43eae57146a980802f759a539c6273b76c7fe222698424df0b53c6139231f5b5f17f51e1b01b591765c188239264e SHA512 98bb83e716d15d7ad79316da7c74d45404ea99c0167af8369e87a1294b537ffb6b91f06d583fb5ccc39895fe1f3f38f484fa1c9a8d6e7448cca94682ffac9944 +EBUILD tcpslice-1.2a_p3_p4.ebuild 882 BLAKE2B 6c4cb82b914f111c4fdeb5c28a33d40e52427817cdec12cab8c60a28b90d3ecebdef276db8f3af2203fd20a48a9cf7160898d6c7cc9a796c2663aacffa1f51bc SHA512 724644057f7c5e9f7970b5c8dbd4958182c9b9cf2e51cd1b7926f6483b95959f33b2c8b3cda16ae870ab3783c6bd1364d6e7a12c69e3d43568abb08e6cf23212 MISC metadata.xml 371 BLAKE2B 072028b30fa16126531152222e9589f8ab1060c71124d1f582edd44b3ee3bd28a051a7115237e0dc05fba064b1a1755459736b296523b5d5472b7d1468408053 SHA512 3bd72b08f16ee7ae7c8fb8787de22923118d3a6b311328f4d7819003455312cf47002f9e41c00f68bf8c88f9e6d74abc4d1f8d24fb5ea41c038e4c46cf8b8bfa diff --git a/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild b/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild index e988b2260bdb..eca9e30b0bd3 100644 --- a/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild +++ b/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild @@ -1,36 +1,37 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools flag-o-matic + +inherit autotools MY_P="${PN}_$(ver_cut 1).$(ver_cut 2-3)$(ver_cut 5)" DESCRIPTION="Extract and concatenate portions of pcap files" HOMEPAGE="http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpslice" -LICENSE="BSD" -SLOT="0" SRC_URI=" mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}.orig.tar.gz mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}-$(ver_cut 7).debian.tar.gz " +S="${WORKDIR}"/${MY_P/_/-} + +LICENSE="BSD" +SLOT="0" KEYWORDS="~amd64 ~ppc x86" -RDEPEND=" - net-libs/libpcap -" -DEPEND=" - ${RDEPEND} -" -S=${WORKDIR}/${MY_P/_/-} +RDEPEND="net-libs/libpcap" +DEPEND="${RDEPEND}" src_prepare() { - eapply \ - "${WORKDIR}"/debian/patches/[0-]* \ - "${FILESDIR}"/${PN}-1.2a_p3-exit.patch - eapply_user + eapply "${WORKDIR}"/debian/patches/[0-]* + eapply "${FILESDIR}"/${PN}-1.2a_p3-exit.patch + + default + sed -i -e 's|ifndef lint|if 0|g' *.c || die - eautoconf + + mv configure.{in,ac} || die + eautoreconf } src_install() { diff --git a/net-analyzer/tcpstat/Manifest b/net-analyzer/tcpstat/Manifest index c55bfa620cf1..45ce032fd0d0 100644 --- a/net-analyzer/tcpstat/Manifest +++ b/net-analyzer/tcpstat/Manifest @@ -5,5 +5,5 @@ AUX tcpstat-1.5_p8-off-by-one.patch 1299 BLAKE2B 651fddce0312ecf6c7c6d55f1bf7d65 AUX tcpstat-1.5_p8-unused.patch 2731 BLAKE2B d1d120953a68cd5fa1dddaf3b6521c953fcf3772fd5d52cafca2fbbceffa0c1245a4e882b6cad17464ecc003642efd54fe00413eade52cf16adc1985c0c0431a SHA512 5c9a058dc299b04e8cd7b875643200efbcdfa99cfbd33b5527bf4b0960cdeb44767bd3da3df91c4ba8b4ec9dcbd1d5a313c880c7d32ed5ded9201432ff871c09 DIST tcpstat-1.5.tar.gz 93102 BLAKE2B 39a570fe6176fda0e8a6539417ece268183a1ebed6fa956b8ec5556b8bbd2508829e7d0861ef39b551bd6070df70cfdaf3dbf694a42ad00be4ea0f3e5c757ce5 SHA512 f1399365e754e4d9e19657c455a580294a7b4002a0d02ff05791a45574dcb1d0e75dc492157ef595066502b1553702481c67b20ad24267a50d7293766c39a5ab DIST tcpstat_1.5-8.debian.tar.xz 7844 BLAKE2B d74e3fd6a274d5e4e0963741bcfe870cfa300281706f965ac1c61ab7e6eb9aa2ea06566649fb3ae8d6071464cfa4bc037e58f64bf32f71ad8b3006976a515417 SHA512 f54546a9191feddc5410c7abb6764533ce89de4bd93fdc480e1a8f7473b405ca914482e6b950ead39d78d235caf093aaa663c683df346417070b97fc3e4f5c41 -EBUILD tcpstat-1.5_p8.ebuild 1283 BLAKE2B 7b5798d2771f6b0f34c60c7d9191dbe055e7c130e3e11617cd8a06540bde1840a343daca1d1d9572d6845ca58b1e8ff773928e14dbcff9709b4a72f09b385466 SHA512 b9e52660890f99819507afbc82df71265e8dead3737c69f964bab96297169f91cb9398be1553e88cd8ae26715e0ffd6d86a73e83440dee803c1db364acdea2c0 +EBUILD tcpstat-1.5_p8.ebuild 1313 BLAKE2B 5f212aa07644013757d4d4e8aee48aadb18ff8bbddddfe9b91ab57615867ceb8f83d8e074121b105f67cbbd40bd63b32653fb8a676417b2e1e8c668231419369 SHA512 89dc150e76cf4425a6018d659d54624c165f1cb2ac13adec38eaf5debdad3162a1484e7575c3bccc82cdf9590f0fae1e53a5f9ce5e8f00163bfb2e87fa9c9a49 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild b/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild index 859524d5c260..6be8bb24a4b0 100644 --- a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild +++ b/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="Reports network interface statistics" @@ -10,6 +11,7 @@ SRC_URI=" https://www.frenchfries.net/paul/tcpstat/${P/_p*}.tar.gz mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-$(ver_cut 4).debian.tar.xz " +S="${WORKDIR}"/${P/_p*} LICENSE="BSD-2" SLOT="0" @@ -20,10 +22,11 @@ DEPEND=" net-libs/libpcap sys-libs/db:* " -RDEPEND=" - ${DEPEND} -" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + DOCS=( AUTHORS ChangeLog NEWS README doc/Tips_and_Tricks.txt ) + PATCHES=( "${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch "${FILESDIR}"/${P}-ipv6.patch @@ -31,7 +34,6 @@ PATCHES=( "${FILESDIR}"/${P}-off-by-one.patch "${FILESDIR}"/${P}-unused.patch ) -S=${WORKDIR}/${P/_p*} src_prepare() { eapply $( @@ -39,8 +41,8 @@ src_prepare() { do echo "${WORKDIR}"/debian/patches/${patch} done ) ${PATCHES[@]} - eapply_user + eapply_user eautoreconf } diff --git a/net-analyzer/tcptrack/Manifest b/net-analyzer/tcptrack/Manifest index e15ed20e84b1..0cbf930b1d55 100644 --- a/net-analyzer/tcptrack/Manifest +++ b/net-analyzer/tcptrack/Manifest @@ -1,4 +1,4 @@ AUX tcptrack-1.4.2-tinfo.patch 389 BLAKE2B 93d5c3d8448b05b5507a6f0c9ed38588b096f1191a0300fa0994a19647680b9c70fc06138f5971e39832ea25eb50ea20ce264d91483c07ae0636d53e7a99adf0 SHA512 d10afdbeba9ebe5af6521a349fa557634ccd8f57a85bfa797fccc6e6b07188b67c200c9a75d0556d8ad54b18153e3b004d07f418a0b771867fcd097f4fad09fd DIST tcptrack-1.4.2.tar.gz 120569 BLAKE2B f6693225de09a9e9b1bf8984c328b54833a39ff87551119c0eca5197cb1a28de182205499e11c6e04fb63f04ad17188d46b2fb2ca6ff0a73a8ba404e5826db47 SHA512 a15e22b2d7cc144b2f3c662b6e289fe28b538188d234b262d801d4212027446534c9981ef9f2a48125657fa87a367c748a9d98e86b5f38f865a47dd24d478f89 -EBUILD tcptrack-1.4.2.ebuild 608 BLAKE2B 7a22fbdacbeddbb6fcb43bac4c1eaf712ef5bbfff081242bd909b47c16a52694c53caa0a0562b1a1f247ec416fe2f639926f1eb34f12df4a92222b5f2255d659 SHA512 279c36f11821cada854acd08adfa70a10e280d29602db9d0fb1846eb4e1605fc9d9ec5dc63e9eae8efc9b43152d5c5ad1c48714c97d63ffe0dc12b2a5c6d0a2d +EBUILD tcptrack-1.4.2.ebuild 652 BLAKE2B 2b8c37fb8e5ed218b1f7d062a80db56d96c51e013fda0f07a8e0369a2f2fb9e4ae0d786fc294a51d4697db71ed7ea102ed7e1952e9af7c8321f43544157b81c4 SHA512 428dcc39b8060aa4e7873456e0718e7d65b0ba969fef45d93274f5b76fd81294a4b94754ff914f22c2ee2687f630223692e05d945ad4d308349d5dc63119765f MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild b/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild index 235ac5dff8d2..30fbb10604a6 100644 --- a/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild +++ b/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils +EAPI=7 + +inherit autotools DESCRIPTION="Passive per-connection tcp bandwidth monitor" HOMEPAGE="http://www.rhythm.cx/~steve/devel/tcptrack/" @@ -12,17 +13,23 @@ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~ppc x86" +BDEPEND="virtual/pkgconfig" DEPEND=" net-libs/libpcap sys-libs/ncurses " -RDEPEND=" - ${DEPEND} - virtual/pkgconfig -" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-tinfo.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-tinfo.patch + default + sed -i src/Makefile.am -e 's| -Werror||g' || die + + mv configure.{in,ac} || die + eautoreconf } diff --git a/net-analyzer/telegraf/Manifest b/net-analyzer/telegraf/Manifest index 825eb426355e..27e1b05cae14 100644 --- a/net-analyzer/telegraf/Manifest +++ b/net-analyzer/telegraf/Manifest @@ -1182,22 +1182,15 @@ DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b20 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863 DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod 74 BLAKE2B c2d88e59e640cf540f7547fa0b67caeecd7424a1dc243681a020d233fab5126dc11f73c18032e0eb8edc7bf9d32dc2902183bf76af255f60f186f16c97055e2d SHA512 94785a6d41763ef86959d6ba291cfb34eb7b35f6599042299604fe6f35a666fa388e9d7bcac282d1370dcc5f99c6ac22f2b677ff9b9920aae8f0d9097ea224c5 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0 -DIST telegraf-1.10.4-vendor.tar.gz 69744868 BLAKE2B 97123bb14b89d28519c73426491189a9245450c72bd59e6745a76c61730a730cd5b2c59c7f205c0dfd058b3d5fce4d331a3e39ecc1a5da1ac439c8946e634fab SHA512 53f5bc9fc60ccae3a9549ab38cb4b558a331524351b70b83deb483090a45edf8868856c1311893d9d8e091e649769ccb580bb32cc46a16da1deb8390704a6c84 -DIST telegraf-1.10.4.tar.gz 1372505 BLAKE2B f3064cd71b1b6f9a8aae8e5425813386bd6d4e4f06c2e95f35c09d055aef6b811867bb1fe1724e88311f82e8214a1c7ae23a0b5ab8461cfa6b0adebe3b86cb28 SHA512 7e6c27bb5b94382f00f48ce98906f7e505abe734b47e29c2c07f245c2c5c12c522eb3f59be2773bfea78316b7b808d0d425d07fa7c247af7cd280a041759cc34 -DIST telegraf-1.11.5-vendor.tar.gz 70214304 BLAKE2B 64cfaa9f207835e043f5df002d140d572a95dc58b9310c860fc682f8cc3a02c77f8d2035576d296d89c3da30ebca2e6e3ce27b514419a60d6a82f3b9645bae3a SHA512 00e143110126c18bbe45ad0b14e6e688030c3f15366ae0e59ac157b49090644cbf96a4b95fa46eaa3fbbd1eb68c09c3747172585a42f65876e0d78a505b07363 -DIST telegraf-1.11.5.tar.gz 1471311 BLAKE2B 7c5b7c2b835ee8c943baf01bb3515fb724b10b04682254e0fd501c7f066fe67a4ef18c0d3442b676448ccb8cd0430099e56ad0cc3970eee3f9d80d540271f4df SHA512 1e6001981693e4612ba34a680f1c3349c2f203d8ba2983f3841fad08b68251a942beef6cc462cb64b95eba1412ea6a35a863ff9426270896c50c83e6f177ca5d -DIST telegraf-1.12.1-vendor.tar.gz 128021524 BLAKE2B f4db3e4d2998959c850a82ea77c1c02c5195e6bd5eef4d55521bbaa0e3355b21554e1a179585d57d8fce1fd061d8f157fddb2dde5091c15062811902c014b835 SHA512 2a501d9456a3a130a4202e87e2c0b44c9b2d5fefca12601f0a3fea6073c97fb7b40dd86546fe291b740b38ecf57843fff18a6f4280482af915b3be9e7270b597 -DIST telegraf-1.12.1.tar.gz 1561005 BLAKE2B 997e3deddc13acb6c0af41d5f622353facfd1c09e76640965c8ebe447e06a7cf5bb25753b8c67b2c7c1af7c3d50f787acc23e5b5a45253db943031a130c33d39 SHA512 8018d48482ec1cdada9d57bb6b8068a0758d58908a4c88deb089645282fde662191bd356e0081178b0e7bc1be6bb19cb2c29bba0039398b7d64f53de9fbf87d6 DIST telegraf-1.13.3-vendor.tar.gz 142151740 BLAKE2B 9068835a6b75721732998ed50f23a6e6e90d92eee32c3ff1bb07fb19942e6f808289b459b34a6b83920c323c00063a91d2bb2e38d457a7a512b43715bc7d7dc0 SHA512 db56f4ecf1802a21405ae7db80281b5155b6f4922dd8e49aa48b554ff3bf179810fae3de3f6ea0e6ee661683e0e9f0536919fd912ea3de827f7c85aa314fff36 DIST telegraf-1.13.3.tar.gz 1640358 BLAKE2B eda968676b42ddfd1f447326463feaabe0860425ea1688ccf19a248f652ec4828c5cae1c302a7129a62a6557eb2c0a206476bfc7082a89d4bffcd3113bad0e81 SHA512 ac71f054ffccf5f1d27db6e68989a2440b975087f91cce487b58df2bd6984378d86fb992f7a7f11aabf7b20937258d05893b74fb5d6f83a8db8449e80cf1d2fd DIST telegraf-1.14.5.tar.gz 1754310 BLAKE2B c1c09712e0c5731019e9ea1a5ddb0d2300acb0d334e2ecb0804b7d94c7ee3fbd23f1c0a6c7a0c863ca7eb78f7f9d150f9918dd990c0b27f2dca97fb82517ce12 SHA512 4edd3c852d4091a1a4bc93983bc99164384b2722860ff256cf9c560242d68221fc5f7b253e58ed7a2383ce4343ddac236e586da00927dc6b5bab0bf1124837a2 DIST telegraf-1.15.2.tar.gz 1874762 BLAKE2B 13ee4ce3fb20fb5b86fdeb6666ae41571053e2c9847e305f11969e29a19e429ae6a7c8331977c2da14b134989fb9dec9d54384526d1d154883aaee8ea8df3ec7 SHA512 96f344573af5c5a575e56895bffa70e9701278d9e32f5ba63b39e7a0153d1a7d9e9ab9f304e9db872b029dcd137ed199ba42757c6f365823955cc2cb04e154d9 DIST telegraf-1.18.0.tar.gz 2636533 BLAKE2B fc8d39b6017b324f7130c400f98345eef34b7f01d72d81c1f5b424fd156db4ad070ceb819e245dbbbe67733336d162fd98cb27abb77eb5dcd69d8cb43ae40ab9 SHA512 9e7ca3ce0ea10308d04ee7d99e69727c7ead9e3a91e2d7b479610845a12b9c2b3ffae70c7700a19ea84a41391a2b09898fe461bda2b6ad8803997a289a2db00d -EBUILD telegraf-1.10.4.ebuild 1351 BLAKE2B 8a92849edcf59f249aff7bf6ea6604bbc1fbd7f93d74f3ea8faaca81856d2cbb62225fc428d5d2910c70dce764b9096df0502d5110456a533f65977b22e6c6e0 SHA512 630e34510133fe367523d29f6cab3b35de29fa3dc56b011c0033317d2e441814a593761490cab7eb0522781d113fec42b2707ba168ba367ea560e7bcd2a2a9ff -EBUILD telegraf-1.11.5.ebuild 1323 BLAKE2B cfa42f8e27b7a341d6e10570e886126dea1d3e49f65bbe6937c04d19ae661cf25c97f04c71e7acb891a5e159470aba029e59d7d91c366ee6e20072299b8cae1b SHA512 c01c3d13ee08b46a2641530f396003048a57fa81c671080049e02bbcd638adede1f77056480de2ed7bc50e3b85650f796b425e6ee7ecc182053e338a7f660a2c -EBUILD telegraf-1.12.1.ebuild 1323 BLAKE2B b843b611e8093342040594e71f1d9973342436a7fe8be97b1326a91c2a96d77986fe1b60cf6be636551c14ad8b88cba3915e588fbbcd7e1647b4e8b1a9519459 SHA512 173b86feac1b18bd8f893be759b4c1a55e43578fd97fc432b18eb889724646c3d96346ef6dcb5e9768410270bfbd2620e1cad8a0063f3989e1707b17ea5fe455 +DIST telegraf-1.18.1.tar.gz 2638925 BLAKE2B a2ca00926c065d6b543f960db1279bb9eb28a5528a184edb202280f7d9bdbfec1bc3352c6b4d7f4be44d3138921089369ad8671cc7827a20217876acb68caed8 SHA512 8ce30c6af3699883f3c6db574398eb6860674b8f0c8d38ed9678ac225ef1cd2a6f25c1cdd72137fb3e8e602582112bd1a3c758b36b67279e6de8012f3e17b01b EBUILD telegraf-1.13.3.ebuild 1316 BLAKE2B edc121d2ef55b546ede558cf4e6a7d8c4e7a709e3198d17546c19f557dcde1163ab56176978291fca03cd9282b9d3835b2e4c4ae1bd60d821530de3d2b7a275a SHA512 3c1dbdf4947a888644586edd8c2cca9d1a3358e3f863092222b672ca2f8948ce4af3ce1854105aa92e84696d937a62785325db464b7d1b084062ecd58b8f118e EBUILD telegraf-1.14.5.ebuild 49530 BLAKE2B 0090b17b0464d408b862a410fbce8f98c4aa8a54d6a5deb17e2aa84bb46a2b2c27cce68f75601cab1150effa96076437f2621339d778a2fe20cb805d9dd3b2b7 SHA512 4a3c034a3de3325d10bf2702fe4e38a66d32fa6613caf43f381e932779576ae1f27e00a86e11a1d16a9316c3bddde9d32b610fa14c45fa5d86b1365e4624a767 EBUILD telegraf-1.15.2.ebuild 50151 BLAKE2B f0e1a514ad2e6e611154f3965ac75ef6e78d6481257d71077794efc2dc5f08526a10a10ac33185419c35f7ee5f364ed395ab4cecba28b74d3e0b7135906e75ef SHA512 b3877e1616d6f08787febdcabe5dd8a0cac6d7457599ab817656f52925098840fdecb6ebb72618d713e48ff53cf0c91f207c3e1eebc5f3eda78086fd645c136c EBUILD telegraf-1.18.0.ebuild 57854 BLAKE2B db06c94c2076da1054c25ca416097f063cc70451de22d5e5feecb6e892dec26f4adb7faaca8a600ce2473d1ddb5b92867072a06137eb7b2b913e99a55c3e886c SHA512 571db326fb17fd9e3be35e5b533d3ded8e5c4cb54bf49c665d75da1f88ed8911c1badbef288915b3a5bb1ec57c670241c6b9dc871f8cdd932c3f406ed9d5aa8d +EBUILD telegraf-1.18.1.ebuild 57854 BLAKE2B db06c94c2076da1054c25ca416097f063cc70451de22d5e5feecb6e892dec26f4adb7faaca8a600ce2473d1ddb5b92867072a06137eb7b2b913e99a55c3e886c SHA512 571db326fb17fd9e3be35e5b533d3ded8e5c4cb54bf49c665d75da1f88ed8911c1badbef288915b3a5bb1ec57c670241c6b9dc871f8cdd932c3f406ed9d5aa8d MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0 diff --git a/net-analyzer/telegraf/telegraf-1.10.4.ebuild b/net-analyzer/telegraf/telegraf-1.10.4.ebuild deleted file mode 100644 index fb95813bea2d..000000000000 --- a/net-analyzer/telegraf/telegraf-1.10.4.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -EGO_PN=github.com/influxdata/telegraf - -inherit systemd user - -MY_PV="${PV/_rc/-rc.}" -COMMIT=3548ce47 -DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics." -HOMEPAGE="https://github.com/influxdata/telegraf" -VENDOR_URI="https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz" -SRC_URI="https://github.com/influxdata/telegraf/archive/${MY_PV}.tar.gz -> ${P}.tar.gz - ${VENDOR_URI}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="strip" - -DEPEND="dev-lang/go" - -pkg_setup() { - enewgroup telegraf - enewuser telegraf -1 -1 -1 telegraf -} - -src_prepare() { - default - ln -s ../vendor -} - -src_compile() { - echo module ${EGO_PN} > go.mod - set -- env GO111MODULE=on go build -mod vendor -v -x -o telegraf \ - -ldflags="-X main.commit=${COMMIT} -X main.version=${PV}" \ - cmd/telegraf/telegraf.go - echo "$@" - "$@" || die -} - -src_install() { - dobin telegraf - insinto /etc/telegraf - doins etc/telegraf.conf - keepdir /etc/telegraf/telegraf.d - - insinto /etc/logrotate.d - doins etc/logrotate.d/telegraf - - systemd_dounit scripts/telegraf.service - newconfd "${FILESDIR}"/telegraf.confd telegraf - newinitd "${FILESDIR}"/telegraf.rc telegraf - - dodoc -r docs/* - - keepdir /var/log/telegraf - fowners telegraf:telegraf /var/log/telegraf -} diff --git a/net-analyzer/telegraf/telegraf-1.11.5.ebuild b/net-analyzer/telegraf/telegraf-1.11.5.ebuild deleted file mode 100644 index ab13d1ecb677..000000000000 --- a/net-analyzer/telegraf/telegraf-1.11.5.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -EGO_PN=github.com/influxdata/telegraf - -inherit systemd user - -MY_PV="${PV/_rc/-rc.}" -COMMIT=0ea49ea9 -DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics." -HOMEPAGE="https://github.com/influxdata/telegraf" -SRC_URI="https://github.com/influxdata/telegraf/archive/${MY_PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="strip" - -DEPEND="dev-lang/go" - -pkg_setup() { - enewgroup telegraf - enewuser telegraf -1 -1 -1 telegraf -} - -src_prepare() { - default - mv ../vendor . -} - -src_compile() { - echo module ${EGO_PN} > go.mod - set -- env GO111MODULE=on go build -mod vendor -v -x -o telegraf \ - -ldflags="-X main.commit=${COMMIT} -X main.version=${PV}" \ - cmd/telegraf/telegraf.go - echo "$@" - "$@" || die -} - -src_install() { - dobin telegraf - insinto /etc/telegraf - doins etc/telegraf.conf - keepdir /etc/telegraf/telegraf.d - - insinto /etc/logrotate.d - doins etc/logrotate.d/telegraf - - systemd_dounit scripts/telegraf.service - newconfd "${FILESDIR}"/telegraf.confd telegraf - newinitd "${FILESDIR}"/telegraf.rc telegraf - - dodoc -r docs/* - - keepdir /var/log/telegraf - fowners telegraf:telegraf /var/log/telegraf -} diff --git a/net-analyzer/telegraf/telegraf-1.12.1.ebuild b/net-analyzer/telegraf/telegraf-1.12.1.ebuild deleted file mode 100644 index 849340237b19..000000000000 --- a/net-analyzer/telegraf/telegraf-1.12.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -EGO_PN=github.com/influxdata/telegraf - -inherit systemd user - -MY_PV="${PV/_rc/-rc.}" -COMMIT=8de41160 -DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics." -HOMEPAGE="https://github.com/influxdata/telegraf" -SRC_URI="https://github.com/influxdata/telegraf/archive/${MY_PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="strip" - -DEPEND="dev-lang/go" - -pkg_setup() { - enewgroup telegraf - enewuser telegraf -1 -1 -1 telegraf -} - -src_prepare() { - default - mv ../vendor . -} - -src_compile() { - echo module ${EGO_PN} > go.mod - set -- env GO111MODULE=on go build -mod vendor -v -x -o telegraf \ - -ldflags="-X main.commit=${COMMIT} -X main.version=${PV}" \ - cmd/telegraf/telegraf.go - echo "$@" - "$@" || die -} - -src_install() { - dobin telegraf - insinto /etc/telegraf - doins etc/telegraf.conf - keepdir /etc/telegraf/telegraf.d - - insinto /etc/logrotate.d - doins etc/logrotate.d/telegraf - - systemd_dounit scripts/telegraf.service - newconfd "${FILESDIR}"/telegraf.confd telegraf - newinitd "${FILESDIR}"/telegraf.rc telegraf - - dodoc -r docs/* - - keepdir /var/log/telegraf - fowners telegraf:telegraf /var/log/telegraf -} diff --git a/net-analyzer/telegraf/telegraf-1.18.1.ebuild b/net-analyzer/telegraf/telegraf-1.18.1.ebuild new file mode 100644 index 000000000000..77781ee5d76b --- /dev/null +++ b/net-analyzer/telegraf/telegraf-1.18.1.ebuild @@ -0,0 +1,1103 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit go-module systemd +MY_PV="${PV/_rc/-rc.}" +COMMIT=cd037b49 +BRANCH=release-1.18 +VERSION=v${MY_PV} + +DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics." +HOMEPAGE="https://github.com/influxdata/telegraf" + +EGO_SUM=( + "cloud.google.com/go v0.26.0/go.mod" + "cloud.google.com/go v0.34.0/go.mod" + "cloud.google.com/go v0.37.4/go.mod" + "cloud.google.com/go v0.38.0/go.mod" + "cloud.google.com/go v0.44.1/go.mod" + "cloud.google.com/go v0.44.2/go.mod" + "cloud.google.com/go v0.45.1/go.mod" + "cloud.google.com/go v0.46.3/go.mod" + "cloud.google.com/go v0.50.0/go.mod" + "cloud.google.com/go v0.53.0" + "cloud.google.com/go v0.53.0/go.mod" + "cloud.google.com/go/bigquery v1.0.1/go.mod" + "cloud.google.com/go/bigquery v1.3.0" + "cloud.google.com/go/bigquery v1.3.0/go.mod" + "cloud.google.com/go/datastore v1.0.0" + "cloud.google.com/go/datastore v1.0.0/go.mod" + "cloud.google.com/go/pubsub v1.0.1/go.mod" + "cloud.google.com/go/pubsub v1.1.0" + "cloud.google.com/go/pubsub v1.1.0/go.mod" + "cloud.google.com/go/storage v1.0.0/go.mod" + "cloud.google.com/go/storage v1.5.0" + "cloud.google.com/go/storage v1.5.0/go.mod" + "code.cloudfoundry.org/clock v1.0.0" + "code.cloudfoundry.org/clock v1.0.0/go.mod" + "collectd.org v0.3.0" + "collectd.org v0.3.0/go.mod" + "dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod" + "github.com/Azure/azure-amqp-common-go/v3 v3.0.0" + "github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod" + "github.com/Azure/azure-event-hubs-go/v3 v3.2.0" + "github.com/Azure/azure-event-hubs-go/v3 v3.2.0/go.mod" + "github.com/Azure/azure-pipeline-go v0.1.8/go.mod" + "github.com/Azure/azure-pipeline-go v0.1.9" + "github.com/Azure/azure-pipeline-go v0.1.9/go.mod" + "github.com/Azure/azure-sdk-for-go v37.1.0+incompatible" + "github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod" + "github.com/Azure/azure-storage-blob-go v0.6.0/go.mod" + "github.com/Azure/azure-storage-queue-go v0.0.0-20181215014128-6ed74e755687" + "github.com/Azure/azure-storage-queue-go v0.0.0-20181215014128-6ed74e755687/go.mod" + "github.com/Azure/go-amqp v0.12.6" + "github.com/Azure/go-amqp v0.12.6/go.mod" + "github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78" + "github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod" + "github.com/Azure/go-autorest/autorest v0.9.0/go.mod" + "github.com/Azure/go-autorest/autorest v0.9.3" + "github.com/Azure/go-autorest/autorest v0.9.3/go.mod" + "github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod" + "github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod" + "github.com/Azure/go-autorest/autorest/adal v0.8.1" + "github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod" + "github.com/Azure/go-autorest/autorest/azure/auth v0.4.2" + "github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod" + "github.com/Azure/go-autorest/autorest/azure/cli v0.3.1" + "github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod" + "github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod" + "github.com/Azure/go-autorest/autorest/date v0.2.0" + "github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod" + "github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod" + "github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod" + "github.com/Azure/go-autorest/autorest/mocks v0.3.0" + "github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod" + "github.com/Azure/go-autorest/autorest/to v0.3.0" + "github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod" + "github.com/Azure/go-autorest/autorest/validation v0.2.0" + "github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod" + "github.com/Azure/go-autorest/logger v0.1.0" + "github.com/Azure/go-autorest/logger v0.1.0/go.mod" + "github.com/Azure/go-autorest/tracing v0.5.0" + "github.com/Azure/go-autorest/tracing v0.5.0/go.mod" + "github.com/BurntSushi/toml v0.3.1" + "github.com/BurntSushi/toml v0.3.1/go.mod" + "github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod" + "github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod" + "github.com/Mellanox/rdmamap v0.0.0-20191106181932-7c3c4763a6ee" + "github.com/Mellanox/rdmamap v0.0.0-20191106181932-7c3c4763a6ee/go.mod" + "github.com/Microsoft/ApplicationInsights-Go v0.4.2" + "github.com/Microsoft/ApplicationInsights-Go v0.4.2/go.mod" + "github.com/Microsoft/go-winio v0.4.9" + "github.com/Microsoft/go-winio v0.4.9/go.mod" + "github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod" + "github.com/PuerkitoBio/purell v1.0.0/go.mod" + "github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod" + "github.com/Shopify/sarama v1.19.0/go.mod" + "github.com/Shopify/sarama v1.27.2" + "github.com/Shopify/sarama v1.27.2/go.mod" + "github.com/Shopify/toxiproxy v2.1.4+incompatible" + "github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod" + "github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d" + "github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod" + "github.com/aerospike/aerospike-client-go v1.27.0" + "github.com/aerospike/aerospike-client-go v1.27.0/go.mod" + "github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod" + "github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod" + "github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod" + "github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod" + "github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4" + "github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod" + "github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9" + "github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9/go.mod" + "github.com/antchfx/xmlquery v1.3.3" + "github.com/antchfx/xmlquery v1.3.3/go.mod" + "github.com/antchfx/xpath v1.1.10/go.mod" + "github.com/antchfx/xpath v1.1.11" + "github.com/antchfx/xpath v1.1.11/go.mod" + "github.com/antihax/optional v1.0.0/go.mod" + "github.com/apache/thrift v0.12.0" + "github.com/apache/thrift v0.12.0/go.mod" + "github.com/aristanetworks/glog v0.0.0-20191112221043-67e8567f59f3" + "github.com/aristanetworks/glog v0.0.0-20191112221043-67e8567f59f3/go.mod" + "github.com/aristanetworks/goarista v0.0.0-20190325233358-a123909ec740" + "github.com/aristanetworks/goarista v0.0.0-20190325233358-a123909ec740/go.mod" + "github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod" + "github.com/armon/go-metrics v0.3.0" + "github.com/armon/go-metrics v0.3.0/go.mod" + "github.com/aws/aws-sdk-go v1.34.34" + "github.com/aws/aws-sdk-go v1.34.34/go.mod" + "github.com/aws/aws-sdk-go-v2 v1.1.0" + "github.com/aws/aws-sdk-go-v2 v1.1.0/go.mod" + "github.com/aws/aws-sdk-go-v2/config v1.1.0" + "github.com/aws/aws-sdk-go-v2/config v1.1.0/go.mod" + "github.com/aws/aws-sdk-go-v2/credentials v1.1.0" + "github.com/aws/aws-sdk-go-v2/credentials v1.1.0/go.mod" + "github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.1" + "github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.1/go.mod" + "github.com/aws/aws-sdk-go-v2/service/ec2 v1.1.0" + "github.com/aws/aws-sdk-go-v2/service/ec2 v1.1.0/go.mod" + "github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.1" + "github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.1/go.mod" + "github.com/aws/aws-sdk-go-v2/service/sso v1.1.0" + "github.com/aws/aws-sdk-go-v2/service/sso v1.1.0/go.mod" + "github.com/aws/aws-sdk-go-v2/service/sts v1.1.0" + "github.com/aws/aws-sdk-go-v2/service/sts v1.1.0/go.mod" + "github.com/aws/smithy-go v1.0.0" + "github.com/aws/smithy-go v1.0.0/go.mod" + "github.com/benbjohnson/clock v1.0.3" + "github.com/benbjohnson/clock v1.0.3/go.mod" + "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod" + "github.com/beorn7/perks v1.0.0/go.mod" + "github.com/beorn7/perks v1.0.1" + "github.com/beorn7/perks v1.0.1/go.mod" + "github.com/bitly/go-hostpool v0.1.0" + "github.com/bitly/go-hostpool v0.1.0/go.mod" + "github.com/bmatcuk/doublestar/v3 v3.0.0" + "github.com/bmatcuk/doublestar/v3 v3.0.0/go.mod" + "github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869" + "github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod" + "github.com/boltdb/bolt v1.3.1/go.mod" + "github.com/caio/go-tdigest v3.1.0+incompatible" + "github.com/caio/go-tdigest v3.1.0+incompatible/go.mod" + "github.com/cenkalti/backoff v2.0.0+incompatible" + "github.com/cenkalti/backoff v2.0.0+incompatible/go.mod" + "github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod" + "github.com/cespare/xxhash/v2 v2.1.1" + "github.com/cespare/xxhash/v2 v2.1.1/go.mod" + "github.com/chzyer/logex v1.1.10/go.mod" + "github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod" + "github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod" + "github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod" + "github.com/circonus-labs/circonusllhist v0.1.3/go.mod" + "github.com/cisco-ie/nx-telemetry-proto v0.0.0-20190531143454-82441e232cf6" + "github.com/cisco-ie/nx-telemetry-proto v0.0.0-20190531143454-82441e232cf6/go.mod" + "github.com/client9/misspell v0.3.4/go.mod" + "github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod" + "github.com/cockroachdb/apd v1.1.0" + "github.com/cockroachdb/apd v1.1.0/go.mod" + "github.com/containerd/containerd v1.4.1" + "github.com/containerd/containerd v1.4.1/go.mod" + "github.com/coreos/etcd v3.3.22+incompatible" + "github.com/coreos/etcd v3.3.22+incompatible/go.mod" + "github.com/coreos/go-semver v0.3.0" + "github.com/coreos/go-semver v0.3.0/go.mod" + "github.com/couchbase/go-couchbase v0.0.0-20180501122049-16db1f1fe037" + "github.com/couchbase/go-couchbase v0.0.0-20180501122049-16db1f1fe037/go.mod" + "github.com/couchbase/gomemcached v0.0.0-20180502221210-0da75df14530" + "github.com/couchbase/gomemcached v0.0.0-20180502221210-0da75df14530/go.mod" + "github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a" + "github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a/go.mod" + "github.com/creack/pty v1.1.9/go.mod" + "github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod" + "github.com/davecgh/go-spew v1.1.0/go.mod" + "github.com/davecgh/go-spew v1.1.1" + "github.com/davecgh/go-spew v1.1.1/go.mod" + "github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4" + "github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod" + "github.com/devigned/tab v0.1.1" + "github.com/devigned/tab v0.1.1/go.mod" + "github.com/dgrijalva/jwt-go v3.2.0+incompatible" + "github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod" + "github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1" + "github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1/go.mod" + "github.com/dimchansky/utfbom v1.1.0" + "github.com/dimchansky/utfbom v1.1.0/go.mod" + "github.com/docker/distribution v2.6.0-rc.1.0.20170726174610-edc3ab29cdff+incompatible" + "github.com/docker/distribution v2.6.0-rc.1.0.20170726174610-edc3ab29cdff+incompatible/go.mod" + "github.com/docker/docker v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible" + "github.com/docker/docker v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible/go.mod" + "github.com/docker/go-connections v0.3.0" + "github.com/docker/go-connections v0.3.0/go.mod" + "github.com/docker/go-units v0.3.3" + "github.com/docker/go-units v0.3.3/go.mod" + "github.com/docker/libnetwork v0.8.0-dev.2.0.20181012153825-d7b61745d166" + "github.com/docker/libnetwork v0.8.0-dev.2.0.20181012153825-d7b61745d166/go.mod" + "github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod" + "github.com/dropbox/godropbox v0.0.0-20180512210157-31879d3884b9" + "github.com/dropbox/godropbox v0.0.0-20180512210157-31879d3884b9/go.mod" + "github.com/eapache/go-resiliency v1.1.0/go.mod" + "github.com/eapache/go-resiliency v1.2.0" + "github.com/eapache/go-resiliency v1.2.0/go.mod" + "github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21" + "github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod" + "github.com/eapache/queue v1.1.0" + "github.com/eapache/queue v1.1.0/go.mod" + "github.com/echlebek/crock v1.0.1" + "github.com/echlebek/crock v1.0.1/go.mod" + "github.com/echlebek/timeproxy v1.0.0" + "github.com/echlebek/timeproxy v1.0.0/go.mod" + "github.com/eclipse/paho.mqtt.golang v1.3.0" + "github.com/eclipse/paho.mqtt.golang v1.3.0/go.mod" + "github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod" + "github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod" + "github.com/envoyproxy/go-control-plane v0.9.0/go.mod" + "github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod" + "github.com/envoyproxy/go-control-plane v0.9.4/go.mod" + "github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod" + "github.com/ericchiang/k8s v1.2.0" + "github.com/ericchiang/k8s v1.2.0/go.mod" + "github.com/evanphx/json-patch v4.2.0+incompatible/go.mod" + "github.com/facebookgo/stack v0.0.0-20160209184415-751773369052" + "github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod" + "github.com/facebookgo/stackerr v0.0.0-20150612192056-c2fcf88613f4" + "github.com/facebookgo/stackerr v0.0.0-20150612192056-c2fcf88613f4/go.mod" + "github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod" + "github.com/fortytw2/leaktest v1.3.0" + "github.com/fortytw2/leaktest v1.3.0/go.mod" + "github.com/frankban/quicktest v1.10.2" + "github.com/frankban/quicktest v1.10.2/go.mod" + "github.com/fsnotify/fsnotify v1.4.7" + "github.com/fsnotify/fsnotify v1.4.7/go.mod" + "github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod" + "github.com/ghodss/yaml v1.0.0/go.mod" + "github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32" + "github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod" + "github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod" + "github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod" + "github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod" + "github.com/go-kit/kit v0.8.0/go.mod" + "github.com/go-kit/kit v0.9.0" + "github.com/go-kit/kit v0.9.0/go.mod" + "github.com/go-kit/kit v0.9.0/go.mod" + "github.com/go-logfmt/logfmt v0.3.0/go.mod" + "github.com/go-logfmt/logfmt v0.4.0" + "github.com/go-logfmt/logfmt v0.4.0/go.mod" + "github.com/go-logr/logr v0.1.0/go.mod" + "github.com/go-ole/go-ole v1.2.4" + "github.com/go-ole/go-ole v1.2.4/go.mod" + "github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod" + "github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod" + "github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod" + "github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod" + "github.com/go-ping/ping v0.0.0-20210201095549-52eed920f98c" + "github.com/go-ping/ping v0.0.0-20210201095549-52eed920f98c/go.mod" + "github.com/go-redis/redis v6.15.9+incompatible" + "github.com/go-redis/redis v6.15.9+incompatible/go.mod" + "github.com/go-sql-driver/mysql v1.5.0" + "github.com/go-sql-driver/mysql v1.5.0/go.mod" + "github.com/go-stack/stack v1.8.0" + "github.com/go-stack/stack v1.8.0/go.mod" + "github.com/goburrow/modbus v0.1.0" + "github.com/goburrow/modbus v0.1.0/go.mod" + "github.com/goburrow/serial v0.1.0" + "github.com/goburrow/serial v0.1.0/go.mod" + "github.com/gobwas/glob v0.2.3" + "github.com/gobwas/glob v0.2.3/go.mod" + "github.com/gofrs/uuid v2.1.0+incompatible" + "github.com/gofrs/uuid v2.1.0+incompatible/go.mod" + "github.com/gofrs/uuid v3.2.0+incompatible" + "github.com/gofrs/uuid v3.2.0+incompatible/go.mod" + "github.com/gogo/googleapis v1.3.1" + "github.com/gogo/googleapis v1.3.1/go.mod" + "github.com/gogo/protobuf v1.1.1/go.mod" + "github.com/gogo/protobuf v1.2.0/go.mod" + "github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod" + "github.com/gogo/protobuf v1.3.0/go.mod" + "github.com/gogo/protobuf v1.3.1" + "github.com/gogo/protobuf v1.3.1/go.mod" + "github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod" + "github.com/golang/geo v0.0.0-20190916061304-5b978397cfec" + "github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod" + "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod" + "github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod" + "github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod" + "github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod" + "github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod" + "github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e" + "github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod" + "github.com/golang/mock v1.1.1/go.mod" + "github.com/golang/mock v1.2.0/go.mod" + "github.com/golang/mock v1.3.1/go.mod" + "github.com/golang/mock v1.4.0/go.mod" + "github.com/golang/mock v1.4.4/go.mod" + "github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod" + "github.com/golang/protobuf v0.0.0-20170307001533-c9c7427a2a70/go.mod" + "github.com/golang/protobuf v1.2.0/go.mod" + "github.com/golang/protobuf v1.3.1/go.mod" + "github.com/golang/protobuf v1.3.2/go.mod" + "github.com/golang/protobuf v1.3.3/go.mod" + "github.com/golang/protobuf v1.3.5" + "github.com/golang/protobuf v1.3.5/go.mod" + "github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod" + "github.com/golang/snappy v0.0.1" + "github.com/golang/snappy v0.0.1/go.mod" + "github.com/google/addlicense v0.0.0-20190510175307-22550fa7c1b0/go.mod" + "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod" + "github.com/google/btree v1.0.0" + "github.com/google/btree v1.0.0/go.mod" + "github.com/google/go-cmp v0.2.0/go.mod" + "github.com/google/go-cmp v0.3.0/go.mod" + "github.com/google/go-cmp v0.3.1/go.mod" + "github.com/google/go-cmp v0.3.1/go.mod" + "github.com/google/go-cmp v0.3.1/go.mod" + "github.com/google/go-cmp v0.4.0/go.mod" + "github.com/google/go-cmp v0.4.0/go.mod" + "github.com/google/go-cmp v0.4.1/go.mod" + "github.com/google/go-cmp v0.5.2/go.mod" + "github.com/google/go-cmp v0.5.4" + "github.com/google/go-cmp v0.5.4/go.mod" + "github.com/google/go-github/v32 v32.1.0" + "github.com/google/go-github/v32 v32.1.0/go.mod" + "github.com/google/go-querystring v1.0.0" + "github.com/google/go-querystring v1.0.0/go.mod" + "github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod" + "github.com/google/gofuzz v1.0.0" + "github.com/google/gofuzz v1.0.0/go.mod" + "github.com/google/martian v2.1.0+incompatible" + "github.com/google/martian v2.1.0+incompatible/go.mod" + "github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod" + "github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod" + "github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod" + "github.com/google/renameio v0.1.0/go.mod" + "github.com/google/renameio v0.1.0/go.mod" + "github.com/google/uuid v1.1.1/go.mod" + "github.com/google/uuid v1.1.2" + "github.com/google/uuid v1.1.2/go.mod" + "github.com/googleapis/gax-go/v2 v2.0.4/go.mod" + "github.com/googleapis/gax-go/v2 v2.0.5" + "github.com/googleapis/gax-go/v2 v2.0.5/go.mod" + "github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod" + "github.com/gopcua/opcua v0.1.13" + "github.com/gopcua/opcua v0.1.13/go.mod" + "github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1" + "github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod" + "github.com/gorilla/context v1.1.1" + "github.com/gorilla/context v1.1.1/go.mod" + "github.com/gorilla/mux v1.6.2" + "github.com/gorilla/mux v1.6.2/go.mod" + "github.com/gorilla/websocket v1.4.2" + "github.com/gorilla/websocket v1.4.2/go.mod" + "github.com/gosnmp/gosnmp v1.30.0" + "github.com/gosnmp/gosnmp v1.30.0/go.mod" + "github.com/grpc-ecosystem/grpc-gateway v1.16.0" + "github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod" + "github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed" + "github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod" + "github.com/harlow/kinesis-consumer v0.3.1-0.20181230152818-2f58b136fee0" + "github.com/harlow/kinesis-consumer v0.3.1-0.20181230152818-2f58b136fee0/go.mod" + "github.com/hashicorp/consul v1.2.1" + "github.com/hashicorp/consul v1.2.1/go.mod" + "github.com/hashicorp/errwrap v1.0.0" + "github.com/hashicorp/errwrap v1.0.0/go.mod" + "github.com/hashicorp/go-cleanhttp v0.5.0" + "github.com/hashicorp/go-cleanhttp v0.5.0/go.mod" + "github.com/hashicorp/go-immutable-radix v1.0.0" + "github.com/hashicorp/go-immutable-radix v1.0.0/go.mod" + "github.com/hashicorp/go-msgpack v0.5.3/go.mod" + "github.com/hashicorp/go-msgpack v0.5.5" + "github.com/hashicorp/go-msgpack v0.5.5/go.mod" + "github.com/hashicorp/go-multierror v1.0.0" + "github.com/hashicorp/go-multierror v1.0.0/go.mod" + "github.com/hashicorp/go-retryablehttp v0.5.3/go.mod" + "github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90" + "github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90/go.mod" + "github.com/hashicorp/go-sockaddr v1.0.0" + "github.com/hashicorp/go-sockaddr v1.0.0/go.mod" + "github.com/hashicorp/go-uuid v1.0.0/go.mod" + "github.com/hashicorp/go-uuid v1.0.2" + "github.com/hashicorp/go-uuid v1.0.2/go.mod" + "github.com/hashicorp/golang-lru v0.5.0/go.mod" + "github.com/hashicorp/golang-lru v0.5.1" + "github.com/hashicorp/golang-lru v0.5.1/go.mod" + "github.com/hashicorp/memberlist v0.1.5" + "github.com/hashicorp/memberlist v0.1.5/go.mod" + "github.com/hashicorp/serf v0.8.1" + "github.com/hashicorp/serf v0.8.1/go.mod" + "github.com/hpcloud/tail v1.0.0" + "github.com/hpcloud/tail v1.0.0/go.mod" + "github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod" + "github.com/influxdata/go-syslog/v2 v2.0.1" + "github.com/influxdata/go-syslog/v2 v2.0.1/go.mod" + "github.com/influxdata/tail v1.0.1-0.20200707181643-03a791b270e4" + "github.com/influxdata/tail v1.0.1-0.20200707181643-03a791b270e4/go.mod" + "github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65" + "github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65/go.mod" + "github.com/influxdata/wlog v0.0.0-20160411224016-7c63b0a71ef8" + "github.com/influxdata/wlog v0.0.0-20160411224016-7c63b0a71ef8/go.mod" + "github.com/jackc/fake v0.0.0-20150926172116-812a484cc733" + "github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod" + "github.com/jackc/pgx v3.6.0+incompatible" + "github.com/jackc/pgx v3.6.0+incompatible/go.mod" + "github.com/jaegertracing/jaeger v1.15.1" + "github.com/jaegertracing/jaeger v1.15.1/go.mod" + "github.com/james4k/rcon v0.0.0-20120923215419-8fbb8268b60a" + "github.com/james4k/rcon v0.0.0-20120923215419-8fbb8268b60a/go.mod" + "github.com/jcmturner/gofork v1.0.0" + "github.com/jcmturner/gofork v1.0.0/go.mod" + "github.com/jmespath/go-jmespath v0.4.0" + "github.com/jmespath/go-jmespath v0.4.0/go.mod" + "github.com/jmespath/go-jmespath/internal/testify v1.5.1" + "github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod" + "github.com/joho/godotenv v1.3.0" + "github.com/joho/godotenv v1.3.0/go.mod" + "github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7" + "github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod" + "github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod" + "github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4" + "github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod" + "github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod" + "github.com/json-iterator/go v1.1.6/go.mod" + "github.com/json-iterator/go v1.1.8/go.mod" + "github.com/json-iterator/go v1.1.9" + "github.com/json-iterator/go v1.1.9/go.mod" + "github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod" + "github.com/jstemmer/go-junit-report v0.9.1" + "github.com/jstemmer/go-junit-report v0.9.1/go.mod" + "github.com/jtolds/gls v4.20.0+incompatible" + "github.com/jtolds/gls v4.20.0+incompatible/go.mod" + "github.com/juju/errors v0.0.0-20181012004132-a4583d0a56ea" + "github.com/juju/errors v0.0.0-20181012004132-a4583d0a56ea/go.mod" + "github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8/go.mod" + "github.com/juju/testing v0.0.0-20191001232224-ce9dec17d28b/go.mod" + "github.com/julienschmidt/httprouter v1.2.0/go.mod" + "github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod" + "github.com/kardianos/service v1.0.0" + "github.com/kardianos/service v1.0.0/go.mod" + "github.com/karrick/godirwalk v1.16.1" + "github.com/karrick/godirwalk v1.16.1/go.mod" + "github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51" + "github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod" + "github.com/kisielk/errcheck v1.2.0/go.mod" + "github.com/kisielk/gotool v1.0.0/go.mod" + "github.com/klauspost/compress v1.11.0" + "github.com/klauspost/compress v1.11.0/go.mod" + "github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod" + "github.com/konsorten/go-windows-terminal-sequences v1.0.3" + "github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod" + "github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515" + "github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod" + "github.com/kr/pretty v0.1.0/go.mod" + "github.com/kr/pretty v0.2.1" + "github.com/kr/pretty v0.2.1/go.mod" + "github.com/kr/pty v1.1.1/go.mod" + "github.com/kr/text v0.1.0/go.mod" + "github.com/kr/text v0.2.0" + "github.com/kr/text v0.2.0/go.mod" + "github.com/kubernetes/apimachinery v0.0.0-20190119020841-d41becfba9ee" + "github.com/kubernetes/apimachinery v0.0.0-20190119020841-d41becfba9ee/go.mod" + "github.com/kylelemons/godebug v1.1.0" + "github.com/kylelemons/godebug v1.1.0/go.mod" + "github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353" + "github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353/go.mod" + "github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165" + "github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165/go.mod" + "github.com/lib/pq v1.3.0" + "github.com/lib/pq v1.3.0/go.mod" + "github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod" + "github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e" + "github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod" + "github.com/mattn/go-isatty v0.0.12" + "github.com/mattn/go-isatty v0.0.12/go.mod" + "github.com/matttproud/golang_protobuf_extensions v1.0.1" + "github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod" + "github.com/mdlayher/apcupsd v0.0.0-20200608131503-2bf01da7bf1b" + "github.com/mdlayher/apcupsd v0.0.0-20200608131503-2bf01da7bf1b/go.mod" + "github.com/mdlayher/genetlink v1.0.0" + "github.com/mdlayher/genetlink v1.0.0/go.mod" + "github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod" + "github.com/mdlayher/netlink v1.0.0/go.mod" + "github.com/mdlayher/netlink v1.1.0" + "github.com/mdlayher/netlink v1.1.0/go.mod" + "github.com/miekg/dns v1.0.14" + "github.com/miekg/dns v1.0.14/go.mod" + "github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721" + "github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod" + "github.com/mitchellh/go-homedir v1.1.0" + "github.com/mitchellh/go-homedir v1.1.0/go.mod" + "github.com/mitchellh/go-testing-interface v1.0.0" + "github.com/mitchellh/go-testing-interface v1.0.0/go.mod" + "github.com/mitchellh/mapstructure v1.1.2" + "github.com/mitchellh/mapstructure v1.1.2/go.mod" + "github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod" + "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd" + "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod" + "github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod" + "github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod" + "github.com/modern-go/reflect2 v1.0.1" + "github.com/modern-go/reflect2 v1.0.1/go.mod" + "github.com/morikuni/aec v1.0.0" + "github.com/morikuni/aec v1.0.0/go.mod" + "github.com/multiplay/go-ts3 v1.0.0" + "github.com/multiplay/go-ts3 v1.0.0/go.mod" + "github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod" + "github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod" + "github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod" + "github.com/naoina/go-stringutil v0.1.0" + "github.com/naoina/go-stringutil v0.1.0/go.mod" + "github.com/nats-io/jwt v0.3.0/go.mod" + "github.com/nats-io/jwt v0.3.2" + "github.com/nats-io/jwt v0.3.2/go.mod" + "github.com/nats-io/nats-server/v2 v2.1.4" + "github.com/nats-io/nats-server/v2 v2.1.4/go.mod" + "github.com/nats-io/nats.go v1.9.1" + "github.com/nats-io/nats.go v1.9.1/go.mod" + "github.com/nats-io/nkeys v0.1.0/go.mod" + "github.com/nats-io/nkeys v0.1.3" + "github.com/nats-io/nkeys v0.1.3/go.mod" + "github.com/nats-io/nuid v1.0.1" + "github.com/nats-io/nuid v1.0.1/go.mod" + "github.com/newrelic/newrelic-telemetry-sdk-go v0.5.1" + "github.com/newrelic/newrelic-telemetry-sdk-go v0.5.1/go.mod" + "github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e" + "github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod" + "github.com/nsqio/go-nsq v1.0.8" + "github.com/nsqio/go-nsq v1.0.8/go.mod" + "github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod" + "github.com/onsi/ginkgo v1.6.0/go.mod" + "github.com/onsi/ginkgo v1.7.0/go.mod" + "github.com/onsi/ginkgo v1.10.1" + "github.com/onsi/ginkgo v1.10.1/go.mod" + "github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod" + "github.com/onsi/gomega v1.4.3/go.mod" + "github.com/onsi/gomega v1.7.0" + "github.com/onsi/gomega v1.7.0/go.mod" + "github.com/openconfig/gnmi v0.0.0-20180912164834-33a1865c3029" + "github.com/openconfig/gnmi v0.0.0-20180912164834-33a1865c3029/go.mod" + "github.com/opencontainers/go-digest v1.0.0-rc1" + "github.com/opencontainers/go-digest v1.0.0-rc1/go.mod" + "github.com/opencontainers/image-spec v1.0.1" + "github.com/opencontainers/image-spec v1.0.1/go.mod" + "github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492" + "github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod" + "github.com/opentracing/opentracing-go v1.1.0" + "github.com/opentracing/opentracing-go v1.1.0/go.mod" + "github.com/openzipkin/zipkin-go v0.1.6/go.mod" + "github.com/openzipkin/zipkin-go-opentracing v0.3.4" + "github.com/openzipkin/zipkin-go-opentracing v0.3.4/go.mod" + "github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod" + "github.com/pascaldekloe/goe v0.1.0" + "github.com/pascaldekloe/goe v0.1.0/go.mod" + "github.com/pavius/impi v0.0.0-20180302134524-c1cbdcb8df2b/go.mod" + "github.com/philhofer/fwd v1.1.1" + "github.com/philhofer/fwd v1.1.1/go.mod" + "github.com/pierrec/lz4 v2.0.5+incompatible/go.mod" + "github.com/pierrec/lz4 v2.5.2+incompatible" + "github.com/pierrec/lz4 v2.5.2+incompatible/go.mod" + "github.com/pkg/errors v0.8.0/go.mod" + "github.com/pkg/errors v0.8.1/go.mod" + "github.com/pkg/errors v0.9.1" + "github.com/pkg/errors v0.9.1/go.mod" + "github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod" + "github.com/pmezard/go-difflib v1.0.0" + "github.com/pmezard/go-difflib v1.0.0/go.mod" + "github.com/prometheus/client_golang v0.9.1/go.mod" + "github.com/prometheus/client_golang v0.9.2/go.mod" + "github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod" + "github.com/prometheus/client_golang v1.0.0/go.mod" + "github.com/prometheus/client_golang v1.5.1" + "github.com/prometheus/client_golang v1.5.1/go.mod" + "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod" + "github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod" + "github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod" + "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod" + "github.com/prometheus/client_model v0.2.0" + "github.com/prometheus/client_model v0.2.0/go.mod" + "github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod" + "github.com/prometheus/common v0.2.0/go.mod" + "github.com/prometheus/common v0.4.1/go.mod" + "github.com/prometheus/common v0.9.1" + "github.com/prometheus/common v0.9.1/go.mod" + "github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod" + "github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod" + "github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod" + "github.com/prometheus/procfs v0.0.2/go.mod" + "github.com/prometheus/procfs v0.0.8" + "github.com/prometheus/procfs v0.0.8/go.mod" + "github.com/prometheus/prometheus v2.5.0+incompatible" + "github.com/prometheus/prometheus v2.5.0+incompatible/go.mod" + "github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod" + "github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0" + "github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod" + "github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0" + "github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod" + "github.com/riemann/riemann-go-client v0.5.0" + "github.com/riemann/riemann-go-client v0.5.0/go.mod" + "github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff" + "github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff/go.mod" + "github.com/robfig/cron/v3 v3.0.1" + "github.com/robfig/cron/v3 v3.0.1/go.mod" + "github.com/rogpeppe/fastuuid v1.2.0/go.mod" + "github.com/rogpeppe/go-internal v1.3.0/go.mod" + "github.com/safchain/ethtool v0.0.0-20200218184317-f459e2d13664" + "github.com/safchain/ethtool v0.0.0-20200218184317-f459e2d13664/go.mod" + "github.com/samuel/go-zookeeper v0.0.0-20190810000440-0ceca61e4d75" + "github.com/samuel/go-zookeeper v0.0.0-20190810000440-0ceca61e4d75/go.mod" + "github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529" + "github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod" + "github.com/sensu/sensu-go/api/core/v2 v2.6.0" + "github.com/sensu/sensu-go/api/core/v2 v2.6.0/go.mod" + "github.com/shirou/gopsutil v2.18.10+incompatible/go.mod" + "github.com/shirou/gopsutil v3.20.11+incompatible" + "github.com/shirou/gopsutil v3.20.11+incompatible/go.mod" + "github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod" + "github.com/shopspring/decimal v0.0.0-20200105231215-408a2507e114" + "github.com/shopspring/decimal v0.0.0-20200105231215-408a2507e114/go.mod" + "github.com/signalfx/com_signalfx_metrics_protobuf v0.0.0-20190222193949-1fb69526e884" + "github.com/signalfx/com_signalfx_metrics_protobuf v0.0.0-20190222193949-1fb69526e884/go.mod" + "github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083" + "github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083/go.mod" + "github.com/signalfx/golib/v3 v3.3.0" + "github.com/signalfx/golib/v3 v3.3.0/go.mod" + "github.com/signalfx/gomemcache v0.0.0-20180823214636-4f7ef64c72a9/go.mod" + "github.com/signalfx/sapm-proto v0.4.0" + "github.com/signalfx/sapm-proto v0.4.0/go.mod" + "github.com/sirupsen/logrus v1.2.0/go.mod" + "github.com/sirupsen/logrus v1.4.2/go.mod" + "github.com/sirupsen/logrus v1.6.0" + "github.com/sirupsen/logrus v1.6.0/go.mod" + "github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d" + "github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod" + "github.com/smartystreets/goconvey v1.6.4-0.20190306220146-200a235640ff" + "github.com/smartystreets/goconvey v1.6.4-0.20190306220146-200a235640ff/go.mod" + "github.com/soniah/gosnmp v1.25.0" + "github.com/soniah/gosnmp v1.25.0/go.mod" + "github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod" + "github.com/spf13/pflag v1.0.5/go.mod" + "github.com/streadway/amqp v0.0.0-20180528204448-e5adc2ada8b8" + "github.com/streadway/amqp v0.0.0-20180528204448-e5adc2ada8b8/go.mod" + "github.com/stretchr/objx v0.1.0/go.mod" + "github.com/stretchr/objx v0.1.1" + "github.com/stretchr/objx v0.1.1/go.mod" + "github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod" + "github.com/stretchr/testify v1.2.2/go.mod" + "github.com/stretchr/testify v1.3.0/go.mod" + "github.com/stretchr/testify v1.4.0/go.mod" + "github.com/stretchr/testify v1.5.1/go.mod" + "github.com/stretchr/testify v1.6.0/go.mod" + "github.com/stretchr/testify v1.6.1/go.mod" + "github.com/stretchr/testify v1.7.0" + "github.com/stretchr/testify v1.7.0/go.mod" + "github.com/tbrandon/mbserver v0.0.0-20170611213546-993e1772cc62" + "github.com/tbrandon/mbserver v0.0.0-20170611213546-993e1772cc62/go.mod" + "github.com/tidwall/gjson v1.6.0" + "github.com/tidwall/gjson v1.6.0/go.mod" + "github.com/tidwall/match v1.0.1" + "github.com/tidwall/match v1.0.1/go.mod" + "github.com/tidwall/pretty v1.0.0" + "github.com/tidwall/pretty v1.0.0/go.mod" + "github.com/tinylib/msgp v1.1.5" + "github.com/tinylib/msgp v1.1.5/go.mod" + "github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod" + "github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod" + "github.com/vaughan0/go-ini v0.0.0-20130923145212-a98ad7ee00ec/go.mod" + "github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e" + "github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e/go.mod" + "github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc" + "github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod" + "github.com/vjeantet/grok v1.0.1" + "github.com/vjeantet/grok v1.0.1/go.mod" + "github.com/vmware/govmomi v0.19.0" + "github.com/vmware/govmomi v0.19.0/go.mod" + "github.com/wavefronthq/wavefront-sdk-go v0.9.7" + "github.com/wavefronthq/wavefront-sdk-go v0.9.7/go.mod" + "github.com/wvanbergen/kafka v0.0.0-20171203153745-e2edea948ddf" + "github.com/wvanbergen/kafka v0.0.0-20171203153745-e2edea948ddf/go.mod" + "github.com/wvanbergen/kazoo-go v0.0.0-20180202103751-f72d8611297a" + "github.com/wvanbergen/kazoo-go v0.0.0-20180202103751-f72d8611297a/go.mod" + "github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c" + "github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod" + "github.com/xdg/stringprep v1.0.0" + "github.com/xdg/stringprep v1.0.0/go.mod" + "github.com/yuin/goldmark v1.2.1/go.mod" + "github.com/yuin/gopher-lua v0.0.0-20180630135845-46796da1b0b4" + "github.com/yuin/gopher-lua v0.0.0-20180630135845-46796da1b0b4/go.mod" + "go.opencensus.io v0.20.1/go.mod" + "go.opencensus.io v0.21.0/go.mod" + "go.opencensus.io v0.22.0/go.mod" + "go.opencensus.io v0.22.2/go.mod" + "go.opencensus.io v0.22.2/go.mod" + "go.opencensus.io v0.22.3" + "go.opencensus.io v0.22.3/go.mod" + "go.starlark.net v0.0.0-20200901195727-6e684ef5eeee" + "go.starlark.net v0.0.0-20200901195727-6e684ef5eeee/go.mod" + "golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod" + "golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod" + "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" + "golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod" + "golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod" + "golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod" + "golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod" + "golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod" + "golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod" + "golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod" + "golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod" + "golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod" + "golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod" + "golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a" + "golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod" + "golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod" + "golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod" + "golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod" + "golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod" + "golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod" + "golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod" + "golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod" + "golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod" + "golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod" + "golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod" + "golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod" + "golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6" + "golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod" + "golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod" + "golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod" + "golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod" + "golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod" + "golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod" + "golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod" + "golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod" + "golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod" + "golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod" + "golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod" + "golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod" + "golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod" + "golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod" + "golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod" + "golang.org/x/lint v0.0.0-20200302205851-738671d3881b" + "golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod" + "golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod" + "golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod" + "golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod" + "golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod" + "golang.org/x/mod v0.1.0/go.mod" + "golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod" + "golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod" + "golang.org/x/mod v0.2.0/go.mod" + "golang.org/x/mod v0.3.0" + "golang.org/x/mod v0.3.0/go.mod" + "golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod" + "golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod" + "golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod" + "golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod" + "golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod" + "golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod" + "golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod" + "golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod" + "golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod" + "golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod" + "golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod" + "golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod" + "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod" + "golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod" + "golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod" + "golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod" + "golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod" + "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod" + "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod" + "golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod" + "golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod" + "golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod" + "golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod" + "golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod" + "golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod" + "golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod" + "golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0/go.mod" + "golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod" + "golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod" + "golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod" + "golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod" + "golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod" + "golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod" + "golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod" + "golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod" + "golang.org/x/net v0.0.0-20201209123823-ac852fbbde11" + "golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod" + "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod" + "golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod" + "golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod" + "golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod" + "golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d" + "golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod" + "golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod" + "golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod" + "golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod" + "golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod" + "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod" + "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod" + "golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9" + "golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod" + "golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod" + "golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod" + "golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod" + "golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod" + "golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod" + "golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod" + "golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod" + "golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod" + "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" + "golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod" + "golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod" + "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod" + "golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod" + "golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod" + "golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod" + "golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod" + "golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod" + "golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod" + "golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod" + "golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod" + "golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod" + "golang.org/x/sys v0.0.0-20191003212358-c178f38b412c/go.mod" + "golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod" + "golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod" + "golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod" + "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod" + "golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod" + "golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod" + "golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod" + "golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod" + "golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod" + "golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod" + "golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod" + "golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod" + "golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod" + "golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod" + "golang.org/x/sys v0.0.0-20201119102817-f84b799fce68" + "golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod" + "golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod" + "golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod" + "golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod" + "golang.org/x/text v0.3.0/go.mod" + "golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod" + "golang.org/x/text v0.3.2/go.mod" + "golang.org/x/text v0.3.3/go.mod" + "golang.org/x/text v0.3.4" + "golang.org/x/text v0.3.4/go.mod" + "golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod" + "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4" + "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod" + "golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod" + "golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod" + "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" + "golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod" + "golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod" + "golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod" + "golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod" + "golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod" + "golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod" + "golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod" + "golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod" + "golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod" + "golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod" + "golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod" + "golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod" + "golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod" + "golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod" + "golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod" + "golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod" + "golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod" + "golang.org/x/tools v0.0.0-20190906203814-12febf440ab1/go.mod" + "golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod" + "golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod" + "golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod" + "golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod" + "golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod" + "golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod" + "golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod" + "golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod" + "golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod" + "golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod" + "golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod" + "golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod" + "golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9" + "golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod" + "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod" + "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod" + "golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod" + "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod" + "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod" + "golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1" + "golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod" + "golang.zx2c4.com/wireguard v0.0.20200121" + "golang.zx2c4.com/wireguard v0.0.20200121/go.mod" + "golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200205215550-e35592f146e4" + "golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200205215550-e35592f146e4/go.mod" + "gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod" + "gonum.org/v1/gonum v0.7.0" + "gonum.org/v1/gonum v0.7.0/go.mod" + "gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod" + "gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod" + "google.golang.org/api v0.3.1/go.mod" + "google.golang.org/api v0.4.0/go.mod" + "google.golang.org/api v0.7.0/go.mod" + "google.golang.org/api v0.8.0/go.mod" + "google.golang.org/api v0.9.0/go.mod" + "google.golang.org/api v0.13.0/go.mod" + "google.golang.org/api v0.14.0/go.mod" + "google.golang.org/api v0.15.0/go.mod" + "google.golang.org/api v0.17.0/go.mod" + "google.golang.org/api v0.20.0" + "google.golang.org/api v0.20.0/go.mod" + "google.golang.org/appengine v1.1.0/go.mod" + "google.golang.org/appengine v1.4.0/go.mod" + "google.golang.org/appengine v1.5.0/go.mod" + "google.golang.org/appengine v1.6.1/go.mod" + "google.golang.org/appengine v1.6.5" + "google.golang.org/appengine v1.6.5/go.mod" + "google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod" + "google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod" + "google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod" + "google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod" + "google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod" + "google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod" + "google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod" + "google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod" + "google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod" + "google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod" + "google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod" + "google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod" + "google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod" + "google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod" + "google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod" + "google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884" + "google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod" + "google.golang.org/grpc v1.17.0/go.mod" + "google.golang.org/grpc v1.19.0/go.mod" + "google.golang.org/grpc v1.20.1/go.mod" + "google.golang.org/grpc v1.20.1/go.mod" + "google.golang.org/grpc v1.21.1/go.mod" + "google.golang.org/grpc v1.23.0/go.mod" + "google.golang.org/grpc v1.25.1/go.mod" + "google.golang.org/grpc v1.26.0/go.mod" + "google.golang.org/grpc v1.27.0/go.mod" + "google.golang.org/grpc v1.27.1/go.mod" + "google.golang.org/grpc v1.33.1" + "google.golang.org/grpc v1.33.1/go.mod" + "gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod" + "gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d" + "gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod" + "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" + "gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod" + "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod" + "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" + "gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b" + "gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod" + "gopkg.in/djherbis/times.v1 v1.2.0" + "gopkg.in/djherbis/times.v1 v1.2.0/go.mod" + "gopkg.in/errgo.v2 v2.1.0/go.mod" + "gopkg.in/fatih/pool.v2 v2.0.0" + "gopkg.in/fatih/pool.v2 v2.0.0/go.mod" + "gopkg.in/fsnotify.v1 v1.2.1/go.mod" + "gopkg.in/fsnotify.v1 v1.4.7" + "gopkg.in/fsnotify.v1 v1.4.7/go.mod" + "gopkg.in/gorethink/gorethink.v3 v3.0.5" + "gopkg.in/gorethink/gorethink.v3 v3.0.5/go.mod" + "gopkg.in/inf.v0 v0.9.1" + "gopkg.in/inf.v0 v0.9.1/go.mod" + "gopkg.in/jcmturner/aescts.v1 v1.0.1" + "gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod" + "gopkg.in/jcmturner/dnsutils.v1 v1.0.1" + "gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod" + "gopkg.in/jcmturner/goidentity.v3 v3.0.0" + "gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod" + "gopkg.in/jcmturner/gokrb5.v7 v7.5.0" + "gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod" + "gopkg.in/jcmturner/rpc.v1 v1.1.0" + "gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod" + "gopkg.in/ldap.v3 v3.1.0" + "gopkg.in/ldap.v3 v3.1.0/go.mod" + "gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22" + "gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod" + "gopkg.in/olivere/elastic.v5 v5.0.70" + "gopkg.in/olivere/elastic.v5 v5.0.70/go.mod" + "gopkg.in/sourcemap.v1 v1.0.5" + "gopkg.in/sourcemap.v1 v1.0.5/go.mod" + "gopkg.in/tomb.v1 v1.0.0-20140529071818-c131134a1947/go.mod" + "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7" + "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod" + "gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637" + "gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637/go.mod" + "gopkg.in/yaml.v2 v2.2.1/go.mod" + "gopkg.in/yaml.v2 v2.2.2/go.mod" + "gopkg.in/yaml.v2 v2.2.3/go.mod" + "gopkg.in/yaml.v2 v2.2.4/go.mod" + "gopkg.in/yaml.v2 v2.2.5/go.mod" + "gopkg.in/yaml.v2 v2.2.8/go.mod" + "gopkg.in/yaml.v2 v2.3.0" + "gopkg.in/yaml.v2 v2.3.0/go.mod" + "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod" + "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod" + "gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776" + "gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod" + "gotest.tools v2.2.0+incompatible" + "gotest.tools v2.2.0+incompatible/go.mod" + "honnef.co/go/netdb v0.0.0-20150201073656-a416d700ae39/go.mod" + "honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod" + "honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod" + "honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod" + "honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod" + "honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod" + "honnef.co/go/tools v0.0.1-2019.2.3/go.mod" + "honnef.co/go/tools v0.0.1-2019.2.3/go.mod" + "honnef.co/go/tools v0.0.1-2020.1.3" + "honnef.co/go/tools v0.0.1-2020.1.3/go.mod" + "k8s.io/apimachinery v0.17.1" + "k8s.io/apimachinery v0.17.1/go.mod" + "k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod" + "k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod" + "k8s.io/klog v1.0.0" + "k8s.io/klog v1.0.0/go.mod" + "k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod" + "modernc.org/httpfs v1.0.0" + "modernc.org/httpfs v1.0.0/go.mod" + "modernc.org/libc v1.3.1" + "modernc.org/libc v1.3.1/go.mod" + "modernc.org/mathutil v1.1.1" + "modernc.org/mathutil v1.1.1/go.mod" + "modernc.org/memory v1.0.1" + "modernc.org/memory v1.0.1/go.mod" + "modernc.org/sqlite v1.7.4" + "modernc.org/sqlite v1.7.4/go.mod" + "modernc.org/tcl v1.4.1" + "modernc.org/tcl v1.4.1/go.mod" + "rsc.io/binaryregexp v0.2.0/go.mod" + "rsc.io/pdf v0.1.1/go.mod" + "rsc.io/quote/v3 v3.1.0/go.mod" + "rsc.io/sampler v1.3.0/go.mod" + "sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod" + "sigs.k8s.io/yaml v1.1.0/go.mod" +) + +go-module_set_globals + +SRC_URI="https://github.com/influxdata/telegraf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz + ${EGO_SUM_SRC_URI}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +RESTRICT+=" test" + +DEPEND="acct-group/telegraf + acct-user/telegraf" + RDEPEND="${DEPEND}" + +src_compile() { + unset LDFLAGS + emake \ + COMMIT=${COMMIT} \ + BRANCH=${BRANCH} \ + VERSION=v${MY_PV} \ + telegraf +} + +src_install() { + dobin telegraf + insinto /etc/telegraf + doins etc/telegraf.conf + keepdir /etc/telegraf/telegraf.d + + insinto /etc/logrotate.d + doins etc/logrotate.d/telegraf + + systemd_dounit scripts/telegraf.service + newconfd "${FILESDIR}"/telegraf.confd telegraf + newinitd "${FILESDIR}"/telegraf.rc telegraf + + dodoc -r docs/* + + keepdir /var/log/telegraf + fowners telegraf:telegraf /var/log/telegraf +} diff --git a/net-analyzer/thc-ipv6/Manifest b/net-analyzer/thc-ipv6/Manifest index e8cad99c6425..efcc5934c92e 100644 --- a/net-analyzer/thc-ipv6/Manifest +++ b/net-analyzer/thc-ipv6/Manifest @@ -1,5 +1,5 @@ AUX thc-ipv6-3.2-stdint.patch 208 BLAKE2B 639a1ceec32ab48b886d721b7ea197dd39efe4ab5f62f8f1fffe04e68560336269e9b3b021c90ef635948bfbbbc0c60e0cb2c56e60e7bca3dfdc7c0d823dfdd9 SHA512 635438ba4a64eb63d51130643afd73e87e83313532f351e1f124cd0f34d719a67d77e592595707e65c8fd5b69a00cf04942688668e5a9c921807934ca602fd8e DIST thc-ipv6-3.2.tar.gz 1595453 BLAKE2B f1bb1cdc31f4cf4d067b39997ca3cc2d6d8c15e7a8c585c7c494f03e229fccbcd65677e382a65f0e650d79278f5ede89173db1cdf313ade7c48dff1566856afa SHA512 648db4618ebb83572e2e318cdbb284fe96a86adf335f7dd9b26fd010c76d12e9137ed7367207c66c93c1961c868d3917d706db9f597289ac47ea3f9b83c03441 -EBUILD thc-ipv6-3.2-r1.ebuild 1165 BLAKE2B b2571fbf1a6e0fd1da35c328ed4a9c4989bcbe919115733603ee94200c13d357005fb0c48f16db71c4609a8d71a49c4e44cf0c8b41ab12b1f7aea2e58c451c16 SHA512 fe8fe27aec9b335632ca22e498e14c5cfae2f2bb559d04f77ae7af632cae1a3eec7074484d2be5d62bfa943a438a98b2f89a341dd3ca75cf204437d50a0f49e5 -EBUILD thc-ipv6-9999.ebuild 1165 BLAKE2B b2571fbf1a6e0fd1da35c328ed4a9c4989bcbe919115733603ee94200c13d357005fb0c48f16db71c4609a8d71a49c4e44cf0c8b41ab12b1f7aea2e58c451c16 SHA512 fe8fe27aec9b335632ca22e498e14c5cfae2f2bb559d04f77ae7af632cae1a3eec7074484d2be5d62bfa943a438a98b2f89a341dd3ca75cf204437d50a0f49e5 +EBUILD thc-ipv6-3.2-r1.ebuild 1049 BLAKE2B 06d840fb5de47ccc7feeeb3f93764f08b4752caf2e93274aca98a3c90e46b31f358e6b741cc078815187e4bb26a50215603558114c51d6f9e7466bbb1cb7c20b SHA512 cd045cd455076f9e44a1343dc6763ee9e02b7661a07a4f42f7baafd89d61797fd9eb1089b2c7438bc27d47df5ce64676ffd26bcf495f26b70366d90903773262 +EBUILD thc-ipv6-9999.ebuild 1049 BLAKE2B 06d840fb5de47ccc7feeeb3f93764f08b4752caf2e93274aca98a3c90e46b31f358e6b741cc078815187e4bb26a50215603558114c51d6f9e7466bbb1cb7c20b SHA512 cd045cd455076f9e44a1343dc6763ee9e02b7661a07a4f42f7baafd89d61797fd9eb1089b2c7438bc27d47df5ce64676ffd26bcf495f26b70366d90903773262 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild index 71f98da3f733..b5817554f26c 100644 --- a/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild +++ b/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild @@ -1,46 +1,44 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -[[ ${PV} == *9999 ]] && SCM="git-r3" -EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git" -EGIT_BRANCH=master +EAPI=7 -inherit eutils toolchain-funcs ${SCM} +inherit toolchain-funcs -DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" +DESCRIPTION="Complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" HOMEPAGE="https://www.thc.org/thc-ipv6/" -LICENSE="AGPL-3 openssl" -SLOT="0" -IUSE="ssl" -if [[ ${PV} != *9999 ]]; then +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git" + EGIT_BRANCH=master + inherit git-r3 +else SRC_URI="https://github.com/vanhauser-thc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi -DEPEND="net-libs/libpcap +LICENSE="AGPL-3 openssl" +SLOT="0" +IUSE="ssl" + +DEPEND=" net-libs/libnetfilter_queue - ssl? ( dev-libs/openssl:0= )" + net-libs/libpcap + ssl? ( dev-libs/openssl:0= ) +" RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch" ) -src_unpack() { - if [[ ${PV} != *9999 ]]; then - default_src_unpack - else - git-r3_src_unpack - fi -} - src_prepare() { sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \ -i Makefile || die - if ! use ssl ; then + + if ! use ssl; then sed -e '/^HAVE_SSL/s:^:#:' \ - -i Makefile + -i Makefile || die fi + default } diff --git a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild index 71f98da3f733..b5817554f26c 100644 --- a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild +++ b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild @@ -1,46 +1,44 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -[[ ${PV} == *9999 ]] && SCM="git-r3" -EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git" -EGIT_BRANCH=master +EAPI=7 -inherit eutils toolchain-funcs ${SCM} +inherit toolchain-funcs -DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" +DESCRIPTION="Complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" HOMEPAGE="https://www.thc.org/thc-ipv6/" -LICENSE="AGPL-3 openssl" -SLOT="0" -IUSE="ssl" -if [[ ${PV} != *9999 ]]; then +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git" + EGIT_BRANCH=master + inherit git-r3 +else SRC_URI="https://github.com/vanhauser-thc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi -DEPEND="net-libs/libpcap +LICENSE="AGPL-3 openssl" +SLOT="0" +IUSE="ssl" + +DEPEND=" net-libs/libnetfilter_queue - ssl? ( dev-libs/openssl:0= )" + net-libs/libpcap + ssl? ( dev-libs/openssl:0= ) +" RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch" ) -src_unpack() { - if [[ ${PV} != *9999 ]]; then - default_src_unpack - else - git-r3_src_unpack - fi -} - src_prepare() { sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \ -i Makefile || die - if ! use ssl ; then + + if ! use ssl; then sed -e '/^HAVE_SSL/s:^:#:' \ - -i Makefile + -i Makefile || die fi + default } diff --git a/net-analyzer/tleds/Manifest b/net-analyzer/tleds/Manifest index ca08e1446171..a4fee710eff7 100644 --- a/net-analyzer/tleds/Manifest +++ b/net-analyzer/tleds/Manifest @@ -1,7 +1,7 @@ AUX tleds-1.05_beta11-gentoo.patch 1450 BLAKE2B 8ed0264c09ddd8f69de0e235e83ef3d43b8e1e272a1f2ffd1467bcbab32d35bb88947c01cfed88fb15444276679ab81ad4b08707f6e11f27b3dd7ce277003fcc SHA512 12140be169027edc77353ba0c2c66854fac099b17e46fedf368bdcb69147beae1b0a1e1ffb9de9f3172fd0f809b1de146ed29b5c730baf4b8459d4068ddf0918 -AUX tleds.conf.d 145 BLAKE2B 123da315f4fa537fa09c47fd41e931fc43672910ddcaea78f766e465f3da457d20a14d48d82d9d4c70459b84abc362b5e1235689fd0a923b6aaae7785510288e SHA512 7eb1b97802199b06b498f7ff7c0017417d75877f84ff639b6b878890dbfe4d6a474583c0412a9b85139247dee08aa745665e3df8501863509cae8788b1dc9771 +AUX tleds.conf.d 141 BLAKE2B 75b09687dba067ed9a85fa70bc278c818e0a9c61e445a57e2d7eb922df604fc9d3830dc5dd1c19813d3535cf493f27ef49ca85456f7f1b0cf3d0899975c2bc1e SHA512 74a8b503e5fd0b25e2e5a9b0ee603bc92594bc2f01d4c1b31cb8ad6edcb9dde98d7ddc6c6641c8f25a70a9bc8d6f56ca8976f72d3c60f65e3395035d52b3d627 AUX tleds.init.d 341 BLAKE2B b14a1d22b5adfe2edc2b71ba3d94f6a521198fa57746059a5f89c4030e5fcf4f94a7c0071a1b30d6f2271a1985ac225c29c3ed9e64cfc3fd44f51bbf4ac9e03a SHA512 45e39bfc3e769f86432bb251e221f22a5e4640281713ed1e39ca372dd46343b56ab3ab257aca6b012be533daec2c559d987e9447e807c6df6406520d63ea60dd DIST tleds-1.05beta10.tgz 28640 BLAKE2B d51104cc4f6341e383582edbb65bd4e7057807fbca33fe9c6d6daca519f804c6e5170c547b6a42e629d000eb3243c0c64e6ab0517293f12b34744b7eca8b19b0 SHA512 661ac8749c85ce20ffc2851a62ee7691e6cddf3700f4a388465bbdf2faa117d8bd6e316541bc5e2fa81d18f74d47bdd78010b8490124f39b6a1c085c4d345d3a DIST tleds-1.05beta11.patch.bz2 5540 BLAKE2B 91da2fbcd339be7d313645f63b3daf9404a82a9678e1f562aae357ed16c6d3d47d8d38f021cf367b0038987e8a5d667cf650c4ca5e2184cdb1f4f1c1f67b1b45 SHA512 8c6e5b28e055fd546af97244230560cb22d7def65a8c16e0257d9f41b789394f744a056a95bf7d9f6fb9dcf8ab0bcacfc8fce7c91d0e8be798ae2af4817ce1a4 -EBUILD tleds-1.05_beta11-r2.ebuild 960 BLAKE2B 6a742b6148e5976c995127bc7058d8ff6566fe33d6b1fa5d69163d7e6a2ef6a963d64027c25f7a6661c962c6f78f5cd80ef7952feb69f0f450801d741fb603ef SHA512 9b456a4b2d96d41224a6ebd3bae83f3e8995053f3170d71f5d4a3c131fdd0dfc9ca08f8b1a177bc0af313d327bff693325d6a9d9f787ab8d89a34ff0bdf2a91f +EBUILD tleds-1.05_beta11-r2.ebuild 925 BLAKE2B cb2dd377d1c24c4951a4fcf4a4ed5025fd6fa6cedb61b9ee3f49268c3324304472ef889c86c99ce9b5039b536918aacffea86665d37e348fcb444d357691c58b SHA512 6472def4940dea2624b6cef278a6e136e439c6c44c56a46f89798947e383c4c768261b1d9e5ffaafb97def24a09d1bf6eecfb6fc356083d6af0529a9336d46c5 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/tleds/files/tleds.conf.d b/net-analyzer/tleds/files/tleds.conf.d index 477408d30ed0..cfca606342c9 100644 --- a/net-analyzer/tleds/files/tleds.conf.d +++ b/net-analyzer/tleds/files/tleds.conf.d @@ -1,4 +1,4 @@ -# Copyright 2003-2004 Gentoo Foundation +# Copyright 2003-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 IFACE="eth0" diff --git a/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild b/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild index 56abdfd1f3cd..bda787fe72f7 100644 --- a/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild +++ b/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs MY_P="${P/_/}" -S="${WORKDIR}/${MY_P/eta11/}" DESCRIPTION="Blinks keyboard LEDs indicating outgoing and incoming network packets on selected network interface" HOMEPAGE="http://www.hut.fi/~jlohikos/tleds_orig.html" SRC_URI=" http://www.hut.fi/~jlohikos/tleds/public/${MY_P/11/10}.tgz http://www.hut.fi/~jlohikos/tleds/public/${MY_P}.patch.bz2 " +S="${WORKDIR}/${MY_P/eta11/}" LICENSE="GPL-2" SLOT="0" @@ -21,15 +22,15 @@ IUSE="X" DEPEND="X? ( x11-libs/libX11 )" RDEPEND="${DEPEND}" -src_prepare() { - # code patches - epatch \ - "${WORKDIR}"/${MY_P}.patch \ - "${FILESDIR}"/${P}-gentoo.patch -} +PATCHES=( + "${WORKDIR}"/${MY_P}.patch + "${FILESDIR}"/${P}-gentoo.patch +) src_compile() { - emake CC=$(tc-getCC) $(usex X all tleds) + emake \ + CC="$(tc-getCC)" \ + $(usex X all tleds) } src_install() { diff --git a/net-analyzer/tptest/Manifest b/net-analyzer/tptest/Manifest index 99e1b2a84764..8289f6db741e 100644 --- a/net-analyzer/tptest/Manifest +++ b/net-analyzer/tptest/Manifest @@ -1,4 +1,4 @@ AUX tptest-3.1.7-getstatsfromlinevuln.patch 5727 BLAKE2B 65fb90b6557317571fde1be18c608bdadfd379d9c0be7d110bfd2d15a028ecf35a0a6cc2e66cf69c2435cdab4d947a173cf9fec7c2521483a8f3d1dbe6cd9909 SHA512 3d0135d382adbbb58fc359d021313b4eef319d96c46cfdee06def06273dce259d0027a4dd043ccb08c5382dc543c6ec5ba05b536e685f41b946c8048711dc883 DIST tptest-3.1.7.tar.gz 313801 BLAKE2B cf4cc6e1e76dbaee8925d9432335ec0a28fcf790dba5c85568ea538fe442c55c8a3ad7ac4fbf4cb1c4ed967cc18dab50212ab26915232bd7fc284dc4e6f0278b SHA512 c78fdbc561adbe109be9fc45a2dbd5c452235525ac4d5f24e39fd8824825fd02c35853411c3f4ae1870f98b576df37f3f1f1266de7c40edcb8f35c69b9063c59 -EBUILD tptest-3.1.7-r2.ebuild 878 BLAKE2B e6f6ec3f9a51f2e3eee971658585dae3cf10732f0790c02c83ffb4965bff228845c3cd493ac296f678407b369bd01228df09f5cdf8bf9a2aa15d0f584c3dc1f6 SHA512 66fb9a730648e6320145009044fb619073caeb804d676574e0ce83a28c775409aeb0e690969f0973c7df978a6d251517166ccb515484b42a403fb7cc1871459c +EBUILD tptest-3.1.7-r2.ebuild 904 BLAKE2B 2f3b67862522fd3f93e05433c97e9fcf6b5197eab84493b74d77b9d940e6b999ac9a1ee31d356bc8ea9d3879ac11699c73b8f75ec268abb7752a809d55b0e104 SHA512 91b6df4f70e62db824533ad93198f9d49d083e910bd76d0288fb59df73b702882ff8f5644aab5a87486a55850265fbc551f0db84405e2938149a4d3f37171ed1 MISC metadata.xml 356 BLAKE2B 601b177e39d12ed70fedc182e52730c62b720bc0d8a61b3087a12519d56146b7ddb3f8e69375c62e50e1d5722223481100b47262313c7cd727a0fa10fae7aa98 SHA512 df040b3a61401e1ca7ff513904875c135b48d03dbbe8ee4bd83f2faa8e8ba448bed670a44b6ff04b24cace44d8308ca64c29dfb32b2f0dac602e3d6d62234956 diff --git a/net-analyzer/tptest/tptest-3.1.7-r2.ebuild b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild index 709ad3a89a3e..6187c9661381 100644 --- a/net-analyzer/tptest/tptest-3.1.7-r2.ebuild +++ b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild @@ -1,35 +1,42 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit toolchain-funcs eutils +EAPI=7 + +inherit toolchain-funcs MY_PV="${PV/./_}" DESCRIPTION="Internet bandwidth tester" HOMEPAGE="http://tptest.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + LICENSE="GPL-2" SLOT="0" - KEYWORDS="amd64 ppc sparc x86" +PATCHES=( + "${FILESDIR}"/${PN}-3.1.7-getstatsfromlinevuln.patch +) + src_prepare() { + default + sed -i apps/unix/{client,server}/Makefile \ -e "s:^CFLAGS[[:space:]]*=:CFLAGS+=:" \ || die - epatch "${FILESDIR}/${PN}-3.1.7-getstatsfromlinevuln.patch" - cp -f os-dep/unix/* . - cp -f engine/* . + + cp -f os-dep/unix/* . || die + cp -f engine/* . || die } src_compile() { emake -C apps/unix/client \ - CC=$(tc-getCC) \ + CC="$(tc-getCC)" \ LDFLAGS="${LDFLAGS}" emake -C apps/unix/server \ - CC=$(tc-getCC) \ + CC="$(tc-getCC)" \ LDFLAGS="${LDFLAGS}" } diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest index 441f71c9bc21..1dfa1c9ebd06 100644 --- a/net-analyzer/traceroute/Manifest +++ b/net-analyzer/traceroute/Manifest @@ -1,3 +1,3 @@ DIST traceroute-2.1.0.tar.gz 71460 BLAKE2B 4c2126fa98625d525d0a1b0075d16a6ff37836e18d2ce8319f58c89bfa22a6a5e3bbe2ded22fa98d5128c7bb58578327db08120a5b78c1c4ff5673dcc0dea7e6 SHA512 3578007c734091ea0c906637c03fd133a8b0154fbf2e6b5c0c881184947918196bc03aeaf872d3bd53777b9b771cba5cf97f73fb5916bb53b75037f429b40ed3 -EBUILD traceroute-2.1.0.ebuild 872 BLAKE2B 349e4c4bd432cdb473ec06df345716c9b40dc0fd59e46d400b483a730da9b14858a95da7436c366e13432dddd6936b69ba88f32af8ec38721d46257516a0c70d SHA512 941bc1a5c5e7d8abe56da431fa480c00a8d34c855f9b0f3a0fd0c5d991519f4fa5aca7bc1b95bb9474b9ba1c798eb184a87756b4b2ad46df432613a475787274 +EBUILD traceroute-2.1.0.ebuild 873 BLAKE2B 7c263a7bc0158c287d4f0669ddeca20ddace934eb80617fcbe3aa45fd6a5ab13774cbc537796a1dfe5e9e8c7b5f360cae04c525a4fe9815a76d43f2e21cf9f8c SHA512 6b22f08031b842653d6da87d875894da775908495eae5b0146f4ba836d47c11b8ebcf5c9aedabb640a421202d6cfaeb03be572401b970d80ea73d5ff948a8fd8 MISC metadata.xml 360 BLAKE2B ddaa20a837ed3daa2311c49dc988b9bd60e6a1dcb8a0a45d007ad78854d4e105a7303e816d5b13e12071ce264ab6b1f4df79f552d4920b9406117b0ca51e1384 SHA512 2114a7680804da45f09166e88f811d0b9088bbdedb0d3b587737bc3f4d723dfafe78e6ccf6c5f2b2c4c69838c9412dba3d9af682376b05bf1f4065f2a7c51bf5 diff --git a/net-analyzer/traceroute/traceroute-2.1.0.ebuild b/net-analyzer/traceroute/traceroute-2.1.0.ebuild index f84fb8817101..08c8de8deef6 100644 --- a/net-analyzer/traceroute/traceroute-2.1.0.ebuild +++ b/net-analyzer/traceroute/traceroute-2.1.0.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=6 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="static" RDEPEND="!<net-misc/iputils-20121221-r1 diff --git a/net-analyzer/tsung/Manifest b/net-analyzer/tsung/Manifest index 62e4c2b8dde2..d03444e37cc8 100644 --- a/net-analyzer/tsung/Manifest +++ b/net-analyzer/tsung/Manifest @@ -1,3 +1,3 @@ DIST tsung-1.7.0.tar.gz 1572265 BLAKE2B 8227e14106943071e7a3759b2bd06a92af55889ecf22b1a74432fd2f6d03196a9e321d16f1e291dcd71d4af560f4f2b38193326a9a87fec671dcda23ab0ecb1b SHA512 67490a95fb54f5196ae0302190190a6b8e79bbeba9a7c1932d83a949504489d4cc3ce048380c0cb09c6cae4c1e203d52de9ea0e2f4e7c3d7438b836aef532dac -EBUILD tsung-1.7.0.ebuild 686 BLAKE2B 40f3daba1d7732516f4ca9ba7ae9519df0e1196d92d704f039bafa255def139a4b31af45a91fdb5f52bfe1cc3dd81b70219665340f47ff4b12d57730026a2562 SHA512 974dcac79135ef5734889d796d9d0556582e46e4bd22ecb08a2494151c65d936336cab25fb45fa71c3c3b192181cd77909fdf043deff835ce3acc001c1a0dc99 +EBUILD tsung-1.7.0.ebuild 667 BLAKE2B 2c0f56071e70bf82e4aabdc97a60065e12d712fac80ca923546a50c2eaf2a24a888908b2d84078556ebb869a152e1d65907755af23044784bb71bb4895aa6b0b SHA512 36bd544969709a570d019a1a9e5f758f5761e95c13d4a474b71a682f0d76581a0b004e076512c7c078bed1f6250411f0069816226e22eb83937779372ab7c2d8 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7 diff --git a/net-analyzer/tsung/tsung-1.7.0.ebuild b/net-analyzer/tsung/tsung-1.7.0.ebuild index 80940ea2f4aa..41ed75113af1 100644 --- a/net-analyzer/tsung/tsung-1.7.0.ebuild +++ b/net-analyzer/tsung/tsung-1.7.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -6,8 +6,6 @@ EAPI="6" # Seems to be misconfigured RESTRICT="test" -inherit eutils - DESCRIPTION="Erlang's multi-protocol distributed load testing tool" HOMEPAGE="http://tsung.erlang-projects.org/" SRC_URI="http://tsung.erlang-projects.org/dist/${P}.tar.gz" diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest index 6828d3f0151b..2378c1053feb 100644 --- a/net-analyzer/vnstat/Manifest +++ b/net-analyzer/vnstat/Manifest @@ -10,8 +10,10 @@ AUX vnstatd.initd-r2 874 BLAKE2B 4ce5936af3a375d30bc8ab1b5ea1ddf1c2b4910394b8a9e AUX vnstatd.systemd 262 BLAKE2B e54c30a1bfa6c7a8bba32fa93c3d2417506c55e9499754419b24179147a5b35f0c51cf61a3f7c4840c88f81d09101c427ba64b41f0922303b8c353caafb883db SHA512 35f9714641d1b3288bed659bd010ef1b8f0316f915622dcf5d3250e1acdd3b438762ae934fab2f6cd350274c7ec0f70a7d8946448bbc6db67be6f91cd86aa47c AUX vnstatd.tmpfile 35 BLAKE2B c56373ebe1abe1111f6927839d79094b6ffd11527ce4e21016c31fc227f9564218ca479455b7cf4eb697d18d8389ba65266b91d71c5bf22c83a9337ae1d861d9 SHA512 e13b52e3c4fe8743074ab2704b6a6cbe0c855589fe19e05bba98f0193473437f350dfdc9675689172c54ed83491d9caef0cbb842f6c2533b98366cd78a4f0bac DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7964aad90fb76c407c5f7fb0085e6f9f54408e8ebc667475c15f260d701c5924737f20921ebc0a35affd52be SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3 +DIST vnstat-1.17.tar.gz.asc 819 BLAKE2B 3186e28dc29edb37eb0bbef9b29f1ea682e4a9de208b69b83a8bc99c81f272eb6865176aaa30e415bf8423d94f385e0725e1256eeb822c3152638eaace23b749 SHA512 c26af29daefe6431c1769812d04ba5bff92ac1241a6a49df11e28f0e51b21d4eb84ff1f1fb133a388fd8ac59967162bc5d60d5f02c409d34be5414acd34f7818 DIST vnstat-2.6.tar.gz 275751 BLAKE2B 7351b265d66e42d1e5450dae6f5eaa973a9cdc171b865689540b5838ddeb2629da968bc2ba655cb6ff909227a859f0334900a1597c78b772124a993343a4cf23 SHA512 1a62fc9c2379b050208945e85bad04f602a0f2c71e6bd069d241c1df77c76ec6258948fc3fdf633b15c52665782cae4f995a916103d330bfb46cab0291d3a1ea -EBUILD vnstat-1.17.ebuild 1425 BLAKE2B 13d7096fa03fd28c39a211fa261bdd6bedace4d1cef1bfd614c26dc63d0a988838de339a1a4b19b09605791a0ab1f279be40c39ca5218c44a09d05ad24bb54bb SHA512 8bef70d7837e76272fedfad2fc00edb48bf9c56d6ccf6fb75430add66919254be9073bf95cacbb9c87b1428b86079618f404813cb2853a451445ed1b7dedd55a -EBUILD vnstat-2.6.ebuild 1529 BLAKE2B 790c85573a76c6ec9d6ce9632c25094a5e61b0403cbac89c5831a846c2949c609209883148e5a50765fee2f55bfc8b5db1cf0ad0e85b3101e8e6c6dcf1847688 SHA512 026157cb62aed814f7291901f2ea82695b2242c7311dec3181024163f2882f2368beb475531d8c9262064fa20d69cf17fe18e551ca715ebb4b0db4a40752f547 -EBUILD vnstat-9999.ebuild 1488 BLAKE2B 11f18a3b2fcaf87fbffc266e55fdc87f05274ba7fa88e5327b8155c4a35de6d25cd21325c2755d67e92c74920c6aff69ca63c74c72d8e1410f5e4a7b194a99f9 SHA512 50d488474af7616b17fcc555c15ded4ec07d1c173c59edf8c5120ebe826218993e86845e7146090bdf9cb0178aa4534fdd1e8a6559c63a045fa87dbd6bb97926 +DIST vnstat-2.6.tar.gz.asc 833 BLAKE2B 5e79d1b622dd4d37603a209b78018a3e88f2c404c700e1f439e4b98e2c2dd5bdf26e8ecd3b1b1242e14a725d7839c5a8b3b5448dc27e1f917cbeaf6012546656 SHA512 c643152bec14b70317465f8adc2256b41b8686e106b35ce492ad5030c2d5b32162441ac5fb2f309071da855efdf444076288cf075d8073bad0c0907067366e7f +EBUILD vnstat-1.17.ebuild 1636 BLAKE2B 105d76a84e9dbfa5faf872a040815fb48a1579a52d9c6e11b83575bd19005211d6cb607f194d243cad11924e1ec32d7d699b8b506a053e92ee7075941bdce8d0 SHA512 2158ca138388c4e26e2e91d32163cfd8fe4be3b1c42926725b7a74c364140e7b65ba6667669ec874df36b4ee19aeebcdf0470d2e8d93425b266ae2584471bb4e +EBUILD vnstat-2.6.ebuild 1864 BLAKE2B 1a39357dafe09afb2d7a9786adf30c8e1da186449853cb6d1ac0882c23ce206eca94955fb73c9be90ccd127f7ad6221d709a1742afe9e990af5c8907f95dd820 SHA512 ec17931121e4a52db571c2ca38a3d39ff51429e6e442f319b9b53e317f4c3c2586ba4402639fb3cc71126b724d9fadd7030ae7c7fd0ec447a3c7efcd14bc7e9d +EBUILD vnstat-9999.ebuild 1880 BLAKE2B a861f7251830efe7e2d6714bf8ed828f0b09d1d6167a0e9e7ba34aca2682ca42ae92c8c73c2bb8bb17ba3a604c3d1d767eb92da2a3b2f80e890c866b2e65c1ff SHA512 01304ab549cfb81fdbf5895bce42d62e609b5291e944a9a003b452be01156a32c53ba24f40b11ef02797f61be825e551f795570ec128cf30f003c30c1b599344 MISC metadata.xml 835 BLAKE2B 4798aa86fd444665d135f7b2ede84889049113260c965b01999a2f9000c826fefa6877e8d3267a813421df97b2a0076f0718278ad3e0cf376bfc91babaaf87f3 SHA512 1c51f11ba3524329dec2101494c89d26859eab16e862e36e49df9240ee3fddf0380bfd929ec1719fc0e21808fc26f381b3be06f5fc89127f4c7e2fd188b3e886 diff --git a/net-analyzer/vnstat/vnstat-1.17.ebuild b/net-analyzer/vnstat/vnstat-1.17.ebuild index 9207b1560e11..5a1f12b3e07d 100644 --- a/net-analyzer/vnstat/vnstat-1.17.ebuild +++ b/net-analyzer/vnstat/vnstat-1.17.ebuild @@ -3,11 +3,13 @@ EAPI=7 -inherit toolchain-funcs user +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc +inherit toolchain-funcs user verify-sig DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" HOMEPAGE="https://humdi.net/vnstat/" SRC_URI="https://humdi.net/vnstat/${P}.tar.gz" +SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )" LICENSE="GPL-2" SLOT="0" @@ -21,6 +23,7 @@ DEPEND=" test? ( dev-libs/check ) " RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )" +BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )" pkg_setup() { enewgroup vnstat diff --git a/net-analyzer/vnstat/vnstat-2.6.ebuild b/net-analyzer/vnstat/vnstat-2.6.ebuild index bf03bc30dc4a..e1ce66f909cb 100644 --- a/net-analyzer/vnstat/vnstat-2.6.ebuild +++ b/net-analyzer/vnstat/vnstat-2.6.ebuild @@ -7,11 +7,24 @@ inherit systemd user tmpfiles DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" HOMEPAGE="https://humdi.net/vnstat/" -SRC_URI="https://humdi.net/vnstat/${P}.tar.gz" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/vergoh/vnstat" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc + inherit verify-sig + + SRC_URI="https://humdi.net/vnstat/${P}.tar.gz" + SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )" + + KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86" + + BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )" +fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86" IUSE="gd selinux test" RESTRICT="!test? ( test )" @@ -61,6 +74,7 @@ src_install() { newtmpfiles "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf use gd && doman man/vnstati.1 + doman man/vnstat.1 man/vnstatd.8 newdoc INSTALL README.setup diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild index ff0d5392bc37..ef79532e70ff 100644 --- a/net-analyzer/vnstat/vnstat-9999.ebuild +++ b/net-analyzer/vnstat/vnstat-9999.ebuild @@ -3,11 +3,25 @@ EAPI=7 -inherit git-r3 systemd user tmpfiles +inherit systemd user tmpfiles DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" HOMEPAGE="https://humdi.net/vnstat/" -EGIT_REPO_URI="https://github.com/vergoh/vnstat" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/vergoh/vnstat" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc + inherit verify-sig + + SRC_URI="https://humdi.net/vnstat/${P}.tar.gz" + SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )" + + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" + + BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )" +fi LICENSE="GPL-2" SLOT="0" @@ -60,6 +74,7 @@ src_install() { newtmpfiles "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf use gd && doman man/vnstati.1 + doman man/vnstat.1 man/vnstatd.1 newdoc INSTALL.md README.setup diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 30f0daf49494..565bc0185f6c 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -3,8 +3,11 @@ AUX wireshark-3.4.2-cmake-lua-version.patch 304 BLAKE2B 438bd2ee1e0e0121cc673709 AUX wireshark-3.4.4-cmake-3.20.patch 1081 BLAKE2B f45b08a9ec1510d4bc18ecca581bc9508eb30b748d8e84b68e872acd20baf8373c78cfeaca9caffcb27467094c71de1c7c1c43e075937cdccbbb2a157b1b4ea0 SHA512 17cbd1805a03c12d55d2f3310ff433b43a27fcfc28e58d14810126a0e5c093f1b7e7fd89290ea231b4f13de158ee5bf3eee9c46773c980490556f9fd153996d5 AUX wireshark-9999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3 DIST wireshark-3.4.3.tar.xz 32287304 BLAKE2B 076d681c5f980ba6a0f25076c4631a119fb72d2b59a0cd70062d3a4c997c8959162157e46a6f59b5474c07263c84e0e660f1fa33f9339cc6a1141425d394cde2 SHA512 6cfea9432cd6fcecbfc551e059ca60a0c38084074bf130b4cc5378aac2221c1233e2ddafa1ffd6bc6b76297c2303b931dadf6ec518f35595caf5229af4d93859 +DIST wireshark-3.4.4-glib-2.68-patches.tar.gz 8059 BLAKE2B d4f773be856bdf56d369b0de51e4a7458d69e08ab345e62cca55b4451be8c58f07add9156149380e1ff5707599f1363a53811eebea927b60c6debd28bed6c047 SHA512 4b5beb62f7d77d8ecfd97aff3f728a02331efe2807ac7f74e19a81f6eb547c9932b33d5f9d78c52d08e5fcbca6e7b158617a22a74cfb80b092ea75da8d43df7f DIST wireshark-3.4.4.tar.xz 32290424 BLAKE2B 85930709ab666794ba6f4a00a895d41b25c6e61f7951a33f511b4981fac3e2ad579d8f52fee5b8f04334f9e1ef8721b1de62d0ab5b0029b0ed32b9f69ff2f5dd SHA512 388b5634894f08bb1a0052f989133c2a8457fbf6525d1bb557f3ffce73da8063fd9fe82b50b5ababc30fa36ce154bf9d2a3d91d76e03913d6516ca61b4b6b172 +DIST wireshark-3.4.5.tar.xz 32300144 BLAKE2B 061da39322627ff49c0c7320049e4f5d795cf4def623efbab9a62107e6a19322049e39ed95519479e6e3a4283b2e53cfc31a5549a109ced74fea7deeef794399 SHA512 f54d9287a48f09bbc085170791b5ca2dcc84cda55040f45f2c4a6abbe828548391e4a931536163c781e69843765a598bd29a240ad43276d0d1bb42d1cd23972a EBUILD wireshark-3.4.3.ebuild 7060 BLAKE2B a1fbc00d217ce8ad232dfe2f3ca53dd78f5b12927af0bfa87d65cddc48a861fffe94d706e93d13e168ff89abc30593e215bc03663ec491dfadd321fc6ee517a0 SHA512 7e2944802986fffaabafd0f10eb9a504505c896ccc0b612d583eb2bca3bcca67560a31e4b23f6b765da975c2485b627f090bf0f82b3335e91e7884572af3fcd1 -EBUILD wireshark-3.4.4.ebuild 7098 BLAKE2B f656a967464c94e1f5d88f936720197fefcd6c569b74a86fb6604d7c114fd3d73051760c98df70befdf3a919190b78a4a81118c0fa620661962c9867f64769ee SHA512 60dbb299e0a09770587407b9fc6f2536a3563ab2c1e0cdac52a423598e6039233219d60d6f6e4056fe7d184d1f063cb00ba1ee2381b398ad1fd6a9c6234e644e -EBUILD wireshark-9999.ebuild 6996 BLAKE2B c5e8c2938682bd4798bf4e89105abebe479efa1e2d6f10a992b8f7da3f0b81a5f790e3902eb1cdf54f7e59cddc1e489c3525c1d3efd839a6603926b43739e841 SHA512 07ba086d124909c54a5bbad139888e4dd0e0a19cd02d76c25d93b52db9c3e25fa0163d9ff72334d3dffb18af3cb660522787304063bf0010543a53ef5f309d13 +EBUILD wireshark-3.4.4.ebuild 7405 BLAKE2B cbf335dc1ddcf90eee9df1b7ebf0693401b7c932592afab7e2fc3d2a9ac3c7bdc207876691159d0d3946d927af2acd2979af5c6c557be2ab97b0b8dbaa8e46b1 SHA512 6d8ab483ba6b8af4bcee06fa903123fb6a349af300552dda662795a319e97933101fc9e6e4a83eb02ba4c8fe6e597608193d4ae274c002347e906d61f4063b1e +EBUILD wireshark-3.4.5.ebuild 7211 BLAKE2B 1777dc913003253d12da947db992439d02897edc59de2a1fcc05d0504d6c72ff8d4a7db8912e8d6cf02498b0f7dc9525cf111d837252a14c0c55c0be96a35af2 SHA512 a7e50a1464efa1160e9927798b059796529f8b32e6da6762f20f3e582f1a0bf43746f1f5af3bd95bcc33b9f77e52b2557d32ed99f7784c59d04ed2035e0598bb +EBUILD wireshark-9999.ebuild 7211 BLAKE2B 1777dc913003253d12da947db992439d02897edc59de2a1fcc05d0504d6c72ff8d4a7db8912e8d6cf02498b0f7dc9525cf111d837252a14c0c55c0be96a35af2 SHA512 a7e50a1464efa1160e9927798b059796529f8b32e6da6762f20f3e582f1a0bf43746f1f5af3bd95bcc33b9f77e52b2557d32ed99f7784c59d04ed2035e0598bb MISC metadata.xml 5327 BLAKE2B f3e047c03a849bfdfded710eccb1e05fbcf00407bbe3eb2a2b63b562e7d583a3ca66de214c17350bec56451f69453fc819921119c7954ef6ea01cfe134ac4783 SHA512 9e514634a6017be1e5c2752c107c33f231e019ce9ffd239042d8f3d426263aea88052748749b7359a9c4c2e591d379c8faf895192358cea20601887b784529ba diff --git a/net-analyzer/wireshark/wireshark-3.4.4.ebuild b/net-analyzer/wireshark/wireshark-3.4.4.ebuild index c37f3c484d2a..9b251700aaf1 100644 --- a/net-analyzer/wireshark/wireshark-3.4.4.ebuild +++ b/net-analyzer/wireshark/wireshark-3.4.4.ebuild @@ -10,19 +10,25 @@ inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake DESCRIPTION="A network protocol analyzer formerly known as ethereal" HOMEPAGE="https://www.wireshark.org/" -SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" -S="${WORKDIR}/${P/_/}" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark" + inherit git-r3 +else + SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" + SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-glib-2.68-patches.tar.gz" + S="${WORKDIR}/${P/_/}" + + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86" +fi LICENSE="GPL-2" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 x86" -IUSE=" - androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon - +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb - +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt - +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl - sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd -" +IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon" +IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb" +IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt" +IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl" +IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd" CDEPEND=" acct-group/pcap @@ -102,6 +108,8 @@ PATCHES=( "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch "${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch "${FILESDIR}"/${P}-cmake-3.20.patch + # Temporary, bug #777690 + "${WORKDIR}"/${P}-glib-2.68-patches ) pkg_setup() { diff --git a/net-analyzer/wireshark/wireshark-3.4.5.ebuild b/net-analyzer/wireshark/wireshark-3.4.5.ebuild new file mode 100644 index 000000000000..32f8fdef83b9 --- /dev/null +++ b/net-analyzer/wireshark/wireshark-3.4.5.ebuild @@ -0,0 +1,278 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..2} ) +PYTHON_COMPAT=( python3_{7..9} ) + +inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake + +DESCRIPTION="A network protocol analyzer formerly known as ethereal" +HOMEPAGE="https://www.wireshark.org/" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark" + inherit git-r3 +else + SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" + S="${WORKDIR}/${P/_/}" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0/${PV}" +IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon" +IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb" +IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt" +IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl" +IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd" + +CDEPEND=" + acct-group/pcap + >=dev-libs/glib-2.32:2 + >=net-dns/c-ares-1.5 + dev-libs/libgcrypt:0 + bcg729? ( media-libs/bcg729 ) + brotli? ( app-arch/brotli ) + ciscodump? ( >=net-libs/libssh-0.6 ) + filecaps? ( sys-libs/libcap ) + http2? ( net-libs/nghttp2 ) + ilbc? ( media-libs/libilbc ) + kerberos? ( virtual/krb5 ) + libxml2? ( dev-libs/libxml2 ) + lua? ( ${LUA_DEPS} ) + lz4? ( app-arch/lz4 ) + maxminddb? ( dev-libs/libmaxminddb ) + minizip? ( sys-libs/zlib[minizip] ) + netlink? ( dev-libs/libnl:3 ) + opus? ( media-libs/opus ) + pcap? ( net-libs/libpcap ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + x11-misc/xdg-utils + ) + sbc? ( media-libs/sbc ) + sdjournal? ( sys-apps/systemd ) + smi? ( net-libs/libsmi ) + snappy? ( app-arch/snappy ) + spandsp? ( media-libs/spandsp ) + sshdump? ( >=net-libs/libssh-0.6 ) + ssl? ( net-libs/gnutls:= ) + zlib? ( sys-libs/zlib ) + zstd? ( app-arch/zstd ) +" +# We need perl for `pod2html`. The rest of the perl stuff is to block older +# and broken installs. #455122 +DEPEND=" + ${CDEPEND} + ${PYTHON_DEPS} +" +BDEPEND=" + dev-lang/perl + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + doc? ( + app-doc/doxygen + dev-ruby/asciidoctor + ) + qt5? ( + dev-qt/linguist-tools:5 + ) + test? ( + dev-python/pytest + dev-python/pytest-xdist + ) +" +RDEPEND=" + ${CDEPEND} + qt5? ( virtual/freedesktop-icon-theme ) + selinux? ( sec-policy/selinux-wireshark ) +" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) + plugin-ifdemo? ( plugins ) +" + +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/${PN}-2.6.0-redhat.patch + "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch + "${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch +) + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_configure() { + local mycmakeargs + + # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass + # --with-ssl to ./configure. (Mimics code from acinclude.m4). + if use kerberos; then + case $(krb5-config --libs) in + *-lcrypto*) + ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." + ewarn "Note there are annoying license incompatibilities between the OpenSSL" + ewarn "license and the GPL, so do your check before distributing such package." + mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) + ;; + esac + fi + + if use qt5; then + export QT_MIN_VERSION=5.3.0 + append-cxxflags -fPIC -DPIC + fi + + python_setup + + mycmakeargs+=( + $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) + $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') + $(usex qt5 MOC=$(qt5_get_bindir)/moc '') + $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') + $(usex qt5 UIC=$(qt5_get_bindir)/uic '') + -DBUILD_androiddump=$(usex androiddump) + -DBUILD_capinfos=$(usex capinfos) + -DBUILD_captype=$(usex captype) + -DBUILD_ciscodump=$(usex ciscodump) + -DBUILD_dftest=$(usex dftest) + -DBUILD_dpauxmon=$(usex dpauxmon) + -DBUILD_dumpcap=$(usex dumpcap) + -DBUILD_editcap=$(usex editcap) + -DBUILD_mergecap=$(usex mergecap) + -DBUILD_mmdbresolve=$(usex maxminddb) + -DBUILD_randpkt=$(usex randpkt) + -DBUILD_randpktdump=$(usex randpktdump) + -DBUILD_reordercap=$(usex reordercap) + -DBUILD_sdjournal=$(usex sdjournal) + -DBUILD_sharkd=$(usex sharkd) + -DBUILD_sshdump=$(usex sshdump) + -DBUILD_text2pcap=$(usex text2pcap) + -DBUILD_tfshark=$(usex tfshark) + -DBUILD_tshark=$(usex tshark) + -DBUILD_udpdump=$(usex udpdump) + -DBUILD_wireshark=$(usex qt5) + -DDISABLE_WERROR=yes + -DENABLE_BCG729=$(usex bcg729) + -DENABLE_BROTLI=$(usex brotli) + -DENABLE_CAP=$(usex filecaps caps) + -DENABLE_GNUTLS=$(usex ssl) + -DENABLE_ILBC=$(usex ilbc) + -DENABLE_KERBEROS=$(usex kerberos) + -DENABLE_LIBXML2=$(usex libxml2) + -DENABLE_LTO=$(usex lto) + -DENABLE_LUA=$(usex lua) + -DENABLE_LZ4=$(usex lz4) + -DENABLE_MINIZIP=$(usex minizip) + -DENABLE_NETLINK=$(usex netlink) + -DENABLE_NGHTTP2=$(usex http2) + -DENABLE_OPUS=$(usex opus) + -DENABLE_PCAP=$(usex pcap) + -DENABLE_PLUGINS=$(usex plugins) + -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo) + -DENABLE_SBC=$(usex sbc) + -DENABLE_SMI=$(usex smi) + -DENABLE_SNAPPY=$(usex snappy) + -DENABLE_SPANDSP=$(usex spandsp) + -DENABLE_ZLIB=$(usex zlib) + -DENABLE_ZSTD=$(usex zstd) + ) + + cmake_src_configure +} + +src_test() { + cmake_build test-programs + + myctestargs=( + --disable-capture + --skip-missing-programs=all + --verbose + ) + + cmake_src_test +} + +src_install() { + cmake_src_install + + # FAQ is not required as is installed from help/faq.txt + dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* + + # install headers + insinto /usr/include/wireshark + doins ws_diag_control.h ws_symbol_export.h \ + "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h + + local dir dirs=( + epan + epan/crypt + epan/dfilter + epan/dissectors + epan/ftypes + epan/wmem + wiretap + wsutil + ) + + for dir in "${dirs[@]}" ; do + insinto /usr/include/wireshark/${dir} + doins ${dir}/*.h + done + + #with the above this really shouldn't be needed, but things may be looking + # in wiretap/ instead of wireshark/wiretap/ + insinto /usr/include/wiretap + doins wiretap/wtap.h + + if use qt5; then + local s + for s in 16 32 48 64 128 256 512 1024; do + insinto /usr/share/icons/hicolor/${s}x${s}/apps + newins image/wsicon${s}.png wireshark.png + done + for s in 16 24 32 48 64 128 256 ; do + insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes + newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png + done + fi + + if [[ -d "${ED}"/usr/share/appdata ]]; then + rm -r "${ED}"/usr/share/appdata || die + fi +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update + + # Add group for users allowed to sniff. + chgrp pcap "${EROOT}"/usr/bin/dumpcap + + if use dumpcap && use pcap; then + fcaps -o 0 -g pcap -m 4710 -M 0710 \ + cap_dac_read_search,cap_net_raw,cap_net_admin \ + "${EROOT}"/usr/bin/dumpcap + fi + + ewarn "NOTE: To capture traffic with wireshark as normal user you have to" + ewarn "add yourself to the pcap group. This security measure ensures" + ewarn "that only trusted users are allowed to sniff your traffic." +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update +} diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild index 0854e2e82548..32f8fdef83b9 100644 --- a/net-analyzer/wireshark/wireshark-9999.ebuild +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -6,23 +6,28 @@ EAPI=7 LUA_COMPAT=( lua5-{1..2} ) PYTHON_COMPAT=( python3_{7..9} ) -inherit fcaps flag-o-matic git-r3 lua-single python-any-r1 qmake-utils xdg-utils cmake +inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake DESCRIPTION="A network protocol analyzer formerly known as ethereal" HOMEPAGE="https://www.wireshark.org/" -EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark" -LICENSE="GPL-2" +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark" + inherit git-r3 +else + SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" + S="${WORKDIR}/${P/_/}" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" +fi + +LICENSE="GPL-2" SLOT="0/${PV}" -KEYWORDS="" -IUSE=" - androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon - +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb - +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt - +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl - sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd -" -S=${WORKDIR}/${P/_/} +IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon" +IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb" +IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt" +IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl" +IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd" CDEPEND=" acct-group/pcap @@ -94,7 +99,9 @@ REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) plugin-ifdemo? ( plugins ) " -RESTRICT="!test? ( test )" + +RESTRICT="test" + PATCHES=( "${FILESDIR}"/${PN}-2.6.0-redhat.patch "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch @@ -187,7 +194,12 @@ src_configure() { src_test() { cmake_build test-programs - myctestargs=( --disable-capture --skip-missing-programs=all --verbose ) + myctestargs=( + --disable-capture + --skip-missing-programs=all + --verbose + ) + cmake_src_test } @@ -212,8 +224,8 @@ src_install() { wiretap wsutil ) - for dir in "${dirs[@]}" - do + + for dir in "${dirs[@]}" ; do insinto /usr/include/wireshark/${dir} doins ${dir}/*.h done @@ -235,8 +247,8 @@ src_install() { done fi - if [[ -d "${D}"/usr/share/appdata ]]; then - rm -r "${D}"/usr/share/appdata || die + if [[ -d "${ED}"/usr/share/appdata ]]; then + rm -r "${ED}"/usr/share/appdata || die fi } diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index 83509983ea57..4e3bebceda8b 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -1,6 +1,4 @@ -AUX zabbix-3.0.30-mysql8.patch 608 BLAKE2B 56e2cb893269cdeefbc6ca7c40e73b9af2012e4075d997369c516253211d6de6266a1f565ecbf39cd4520fe76f65968d43320ea8e5b2cd59d2a0eb9f8febc9f4 SHA512 13e95e0f3fd1aff4f2546ce5b3cb48c59e117984192a2574d799ca062ce763982d2984e5fa94b49f077aaebbbb3442a06a0d9982a38a21f5ea739fd0fed87148 AUX zabbix-3.0.30-security-disable-PidFile.patch 1378 BLAKE2B c1efdfd0b223987c9d9bf1a3f7731f0bdfeb42d1641bbf4387d70ece757f5cb2fb88bafb87f6938a5efbec091f73d5fde0450e8aa0edc3143d589df5efbe5d19 SHA512 854b198b980e4b58dc6149e285bfa6361ab2a10b83a6d8f07b46754316d6764669e68da8018b402b59317ed95b50a13d25f68f28c4c33d76f0ef1e8dedc8da99 -AUX zabbix-3.0.31-fix-cve-2020-15803.patch 3081 BLAKE2B 269b3efedf4f2f4c5365f2119ae166a0bee673841ab0eeae1f3e6311d7015fd35b11330a62c705a567775429319bd440adff48f92c689d35104893eab82a86ec SHA512 950dfe3311dc74fc9068b1c51d22f2a9b2ff20c9011e551151b1aed8212ab26cd5ec369317ec5ad9b52193f59d5f79298205996dd9f2aec48608759769c63c85 AUX zabbix-4.0.18-modulepathfix.patch 330 BLAKE2B 99b3f1082e220ff842e4c4c86e8fcf57666443dd1e124412f167548ab886352077e1f0548e49cf77f28a51d20cc37dc980448eb87c9e7814ac73dcbfe43388e0 SHA512 75330dddde2f47553ac6a6f71d6f2383ab34c0d64ac5dbe45dd31707d8797d1400215d698072df3a0f0eaf862f00509791a6a0eaa43a0f686657d885c03465b5 AUX zabbix-agent2.init 507 BLAKE2B 6235831aca66cb2b097c0260ba8c0151c4a98fadc836cff14a248a77f5a0d013b5e6cf56605f63c9b41541daad4f842da74d80658f0a20b38be507909605af77 SHA512 91eaac170c9234229f2969b0d899dc7ffc21aa99aa8b3593b91f52afe786f6cc81c1279bf78b4456c8e462cea924630ee87e4ce7d6f2128c42e778907751e98e AUX zabbix-agent2.service 277 BLAKE2B 46ec792441c57c6fb7cad391d736672a3d93cbb9c92c5e3d90de3a5c7502a789359bd9752b8740fd73a626e4ed96272231730a87b179a4e0d13f8fb48571f606 SHA512 8f467e9d7a4ce82dc387ef1ef6ac8c39e943d0bbce938e186bdfa7e207959d9159a9d446b30d39d627b7400ceeb9c4d322b06ad063b42d0edc5bbef4043230f7 @@ -241,26 +239,32 @@ DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178 DIST gopkg.in%2Finconshreveable%2Flog15.v2%2F@v%2Fv2.0.0-20180818164646-67afb5ed74ec.mod 41 BLAKE2B 84dac6dbd718957e06ba2c36360eaaccc86f0a0db203a4cacb293e4800aeb6bcc8377adc2e5661beedc3603fe6e92fb89c1fb725ddd7c9c865de6c313efd73a5 SHA512 2d447c13907cef9554ddc06503f75daa7d37309bfc030a6dc94ed5393859572d5a18ef481689b2eda40a016fbee1dcaa1459ecc4d25128db2c0d5ec3e24fc548 +DIST gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.mod 23 BLAKE2B 43e4570f039747c5b2ecef5c736a4316d8517a202a587de55165960ba41b79431b8f1d3544b02581c224c5cffaf13e2ddefca0b67e14b9227ab136f285a183d0 SHA512 28d79dd9430ce03c7f67d3c798b1dff21019fb5fe588cffa5003fcad5fc1fe5d7c19c8bd7fd4f132acd59f6c24df7aefd4f1b72eb5b7cd45f2d11302f1560c36 +DIST gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.zip 443068 BLAKE2B 58bf0a619bb1724e9ea683ee2348e187aa02d9a7bad94e92d221058cc80dfd87177cf2f61c0b7d6f7b17a316a82e85cf9fc058a9a0e9ba13f3a651a14dbb8271 SHA512 22d184230f718bbd6462806aeb43ef3a505c6508bb6e45ed18de5aafa1fb363c21a3c4889d61735277e5b4b26a5590bbc0d6d170dfdd6e8011c7abbb3d8cdd93 DIST gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.mod 35 BLAKE2B 03f24b13567c0faf0d888017255d86ba73bb88559116639b057137070cad56a13b28a3a0ac4526eee5a8347df068c3e4641a7c159ad39c212d49a592b9255933 SHA512 b790b8b07af1e7c32311e4ccf30977e1822995b501ad14be4930c812704e0272335313b77d0c1128791efb60ab8a9e74417ce9bd5f602bdb71f2376c34a148f6 DIST gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.zip 17217 BLAKE2B 628e6d5215a7d6433b488a45e0bf7779af2e1550550343e5d92f2cb3a66848c54d086fce54acfa8c70b1be5902a1b46c04359e55ae467cdadb2819f38dad4a36 SHA512 390b3d93bc1d0e9d186e97e9fe2dcc6bedd7b81dd49177a69b5c004359fbc3491fe48df82b85e42df1f3b4c674071c175f19f34cc9e3090db66d63b05d1c1172 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb -DIST zabbix-3.0.31.tar.gz 14698394 BLAKE2B b8b5f94fe7fe08385b1b358c628b2047b437e6068dab8c3dbdab03e55e95e27f1b77ede4a1a57c4f79bf4a629d9dc5671bd144c002ace7c915f2fed382ac13b2 SHA512 35fec45667cdf217c2be21a164181f92f8f11ef9bcfb0c8dad914726e7c436bae5f8a97aebc3af82499e37125f4d1896ef74ad061a1ee3cbb674562c22a832b1 DIST zabbix-4.0.28.tar.gz 17424006 BLAKE2B f45af54d1e54ff6945f13cc684fbe0506dab4d554f65018fc30758d7b8be6814ca3661655778abb7c24dcbb241b8e6c21f0ea72a01a886392cadc917e699a957 SHA512 1f40c7316f92474beecc9470d4ad6c093a3a005180514307eb3d7aa206fa36d1a8decc20628b1fc0e62bc7a2ff0e508d694da0fe05911314de6f6d7aa726f425 DIST zabbix-4.0.29.tar.gz 17411987 BLAKE2B 187b6de17403c656c2faa93c8e0952be06ca4fc60e8fe62c48dd9f96371bd26b53f333b93de5805d7333b849f93ff7db6cf1f0cf256cea438afeea5d314e0e83 SHA512 778fe43c2394c572b0f1a6d426897bf24391ebda25cce5bfa0dad63827f5d3457776ecd8186c0b783d400a0d87778d9243fdfedd875136383282e56f542eafca +DIST zabbix-4.0.30.tar.gz 17599032 BLAKE2B 1084ad3e680fff7798c803492d9e719c6c6fd2503db30d4a60a000c9dfac057bb1d5bb947dfac580947ce3d8f051aeb6a8183642808120d2795722c39b8e1a85 SHA512 b26c532e3b1b3402af0433ab29a36efaa1a34e8541797bcb37118ff352d4c29548765ebd10fa8da6b3371b1e3cbdcfb4b1cdb5c6a143b3ce9301db47d425fa36 +DIST zabbix-5.0.10.tar.gz 20100268 BLAKE2B 6a1c1c687b8f9e3f494a94cfd3f7877006947135c7989e1531c051c9f732c46b5c60940159df2e5d8cc52d32d61164cd0ffcd3fbc23a03b051f2ecd3ba1b9e95 SHA512 5e18845ddb5ad213c7fdbf98b3338f1e9335206b473c7ffa6fd0d37acc487b3e8d547abfe87d3190c8f8b1ea55fe5b8b6c44a431cc6c879b277c6ebb05f744bd DIST zabbix-5.0.8.tar.gz 19474050 BLAKE2B 1043efca2f373553728206837949bce5f5ea32328c6289e4028f65e6f1ed76560c1ffbd610eec9855f050d0330bcd3b364a983db896285729f30a693d5ae6c6f SHA512 19601ace704c8a887ffc9b57da8825d8a28a5d064aac3e59480994bee4156db186d37ecf4bee2208bbafc0cb76c0c7f47de964f99953ce78d0187457255d92e9 DIST zabbix-5.0.9.tar.gz 19513312 BLAKE2B e60fcf300c3fcd9595e9fa8465403e906672fdc908d9a15646e2ac9e88684999184acb3a0b8226dff1966554769930b0ae6d692ee4569441714912c2eb93540f SHA512 7306afce482b8b8222d46c25d91cdd8df2d5bbbeb755bd54b4bf747dc78031cc24167a954e4de5933f33f59772838ff0b4c66d0bf19c28dc1a27276da9bb0b38 DIST zabbix-5.2.4.tar.gz 19916307 BLAKE2B 17d0f5dc1d4a8b79d2a5e741a0fa18ecf584ddfb45afbe816721d0e69bae4b5e11b44fe5031c8a34562c30fd2818f7b4a8bfb1442489be3ec23a27a70e789f56 SHA512 e218de9a8b9445401e769c14a9efd0b3d1b7e9610ce021cdbfc9db159801a4033b8f1c1a808c853bfa3aeb66db8a6dd0cbb5b44fc1421fa0f54c28589d7314b4 DIST zabbix-5.2.5.tar.gz 20039761 BLAKE2B 27510c462947a7dedb16d029799aa1c7b38d68199aae47b4b3e5a757120bd74ddf87c7dade0bf339ff2165111345d79119718ade2fe39fd088971be6dcef2bda SHA512 5014a5a510e9ea4a39aa30bdbe3ee82dc1d0a139f32151bb7739df7442ea707b91446ce1cefb61007b603ccedfb0353c628b043db3e90cfe8fc3d67588f2dfd5 -EBUILD zabbix-3.0.31-r2.ebuild 9280 BLAKE2B 5a5d2f6fe3b6a804777ea6c04a3bacdcc6e338581c070c1c2c619469a4a4792e81becb64f27053aa0e5e794aadf5a16afd88144653bb167f5159d5c196c8d17b SHA512 22627db27b4d41703188548eff73481d89e79ffbc6049d59b2947c08c68873b5c78d4301d01a3e2cdc9e4951efc38c5c35788e73f02c8f394d61e8c33e6d8c72 +DIST zabbix-5.2.6.tar.gz 20602665 BLAKE2B 656645ece453564f2f2c58b50e9bfb3df86aeb74fdfef88cc4b597268ebaf9a9db41e1acdcd1253871dbd9a0032f973bbb1b25139ee1a083bef779a1b66ac2fc SHA512 be48fd46bf151ad2618f5136559c7027e64e178001921adefc66a0597b24b6929e52d4b0f575e8bddec1e9db01276dd5993d4500f4df4a1716a1a008e09b41f1 EBUILD zabbix-4.0.28.ebuild 9254 BLAKE2B c74d64e5da10a78b4a15fef31cc42a15ba2cd5c5c28d09abb4e9370bb4f0fc7817e13d32362609b406fc4b5036578ffff4488c3ce618216674678990f8a78f61 SHA512 9ceb803671abd14019e1db9aa7b15f52f56b97204f50b1cc703786f624b12b289e038f1abe7c1cb53072f5cfdd29e54df0201ff20bb95adf06430c33c73fb4e2 EBUILD zabbix-4.0.29.ebuild 9256 BLAKE2B 752cb3883f7f9acecc4cf63d3f39bc7b669d26234e072053825782d7cd5e7eb8c12b5deecfafa829874eb654e5f0d79ba7ab8e88b0ef3c3890e82ebead189f81 SHA512 9ae895069cebf9fdbab49533736f83e52f5984ab9620114072a72023da7af719e0fa2a0f13c6c03f9809890d91f2dea4e5707100fd02c7ba66f61491c399474c +EBUILD zabbix-4.0.30.ebuild 9255 BLAKE2B 93b837855adf373866feb50737dcacf53e9741001aa1ee4a6bbcf9f7b76c4e90011a8c820988a7caf64e5a828e15bfbf6400bb075a4c37c4ad72b6c8b0987448 SHA512 02b9d1ead7ef9c08da6340d4a45d235710fc489e3d393c62fbbece3b70c0792899c926ba1d307dffa02621f2655daef75dad41b385fe42927bde6495c4fd32c5 +EBUILD zabbix-5.0.10.ebuild 32541 BLAKE2B d63196438eff036e12d3dc2b84dec5efdff1331d04f214f06e62419466b6deab7f6d70a7a61ad2e0dc3e34651a4878e6db967f36666750e3f9d2d2dbeb744bc6 SHA512 3d7052f96b63a645f51d2614a11adf294569c3942f74f7e018ccd0fa8e52cca6dec50a8609299d76d606421db6acba30a31fd4fd46420670c29e20ec2f191a99 EBUILD zabbix-5.0.8.ebuild 9123 BLAKE2B fc3c6ad9c543ddb0eb2d15df7ba7bd732fd6001b70d9e520e989b7d42669d67f438e2c4adf242e8cc914ec2777fead7e83a6b7de1f7fd978b1e96766945a5e04 SHA512 eaea26c03a539316d08528713d5499c5ee97973a19b9fcbeecc54d8bd34d62def246010d6d99b0e05613b196ea84861c090c6b88c4c9b4b9e5147936642caa9c EBUILD zabbix-5.0.9-r1.ebuild 32331 BLAKE2B 0a07cf6659e88bf96f066c4cdaf5b2ff0974cf8a8043b88c6d6faafa1800b507cfa21eb10eda2dd55b0ed34a313fd13fab6dabdfaa60875be85fc6772f2b447b SHA512 905907bccd8dc121f97e6f23425f6b897fbd1118195ee744307a24bab4514cd40556aaa30b5c16661c2c8a6e31993e93aa4838f77a6a08e808a9a71451e48371 EBUILD zabbix-5.0.9.ebuild 9125 BLAKE2B 4e9d381b8cb54ec8dedfafebd29e6ba53a06621f838c475ac20d1b58105b49cf508e5bfbf35ee3bb2c008b9ddd251c28bc1f6724fbe194c127664d51c4f448bf SHA512 711ca7d05ded35481c697846d4086c836ee41703b0fedd648ee5183cb80d5acd0aaab700a50471f4dd16322351b9bdaf6e234a017325e85dea80935a1414a773 EBUILD zabbix-5.2.4.ebuild 9123 BLAKE2B fc3c6ad9c543ddb0eb2d15df7ba7bd732fd6001b70d9e520e989b7d42669d67f438e2c4adf242e8cc914ec2777fead7e83a6b7de1f7fd978b1e96766945a5e04 SHA512 eaea26c03a539316d08528713d5499c5ee97973a19b9fcbeecc54d8bd34d62def246010d6d99b0e05613b196ea84861c090c6b88c4c9b4b9e5147936642caa9c EBUILD zabbix-5.2.5-r1.ebuild 32917 BLAKE2B 08ddb3e3e2963b2ebd6193866fbb7e85abb6a958c3631c00295c3cd0641e5dcccc9a6532851a7ef10666173a509b423a7ae7147635cf9564c62b07d1cf1bdfaa SHA512 3252082c8917155a02bc76f409c228f276bd04ca877b7c9fe9cbc94554fcac201a8b6ed451face4c61068cbcb216ed721a020679d63044de60546b3026d39a18 EBUILD zabbix-5.2.5.ebuild 9125 BLAKE2B 4e9d381b8cb54ec8dedfafebd29e6ba53a06621f838c475ac20d1b58105b49cf508e5bfbf35ee3bb2c008b9ddd251c28bc1f6724fbe194c127664d51c4f448bf SHA512 711ca7d05ded35481c697846d4086c836ee41703b0fedd648ee5183cb80d5acd0aaab700a50471f4dd16322351b9bdaf6e234a017325e85dea80935a1414a773 +EBUILD zabbix-5.2.6.ebuild 33154 BLAKE2B d98021e9b88ab3a4dd66ff88b6d42dc3a72673619a3d98a38582c7c9c3fa855be7b3766debe28f4472ca967b4a7cd7af4d359aaa4211be6feda9619a53ca984d SHA512 dd866d7a9d833123eb9469339577edd8ab42cce492e520e1fc54629b676ff00fc6057c38c6f0d0e7bbe7a019990dd93c660d3d93a18f7fd28b72a1e7c7038aed MISC metadata.xml 1497 BLAKE2B a8288bd5ec772d1f54db12727cc9b6659ca7563ce054f8cb63d8f8d2373ef4081e391656eb1178ff06bdc64a5ca420d2c56376e5b1207e9baed17a9766406f43 SHA512 042f4daf2f70de1cbbf7ece57a3d5704878b33257002c8a1d9987e8a9249e8af475e24577069ad315d406ae5c29994881c76638c5bccb2e57d3f8ce3b0b1c381 diff --git a/net-analyzer/zabbix/files/zabbix-3.0.30-mysql8.patch b/net-analyzer/zabbix/files/zabbix-3.0.30-mysql8.patch deleted file mode 100644 index 7c3694a776ee..000000000000 --- a/net-analyzer/zabbix/files/zabbix-3.0.30-mysql8.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/libs/zbxdb/db.c b/src/libs/zbxdb/db.c -index a65b9c4..e011c51 100644 ---- a/src/libs/zbxdb/db.c -+++ b/src/libs/zbxdb/db.c -@@ -285,7 +285,11 @@ int zbx_db_connect(char *host, char *user, char *password, char *dbname, char *d - #if defined(HAVE_IBM_DB2) - char *connect = NULL; - #elif defined(HAVE_MYSQL) -- my_bool mysql_reconnect = 1; -+#if LIBMYSQL_VERSION_ID >= 80000 /* my_bool type is removed in MySQL 8.0 */ -+ bool mysql_reconnect = 1; -+#else -+ my_bool mysql_reconnect = 1; -+#endif - #elif defined(HAVE_ORACLE) - char *connect = NULL; - sword err = OCI_SUCCESS; diff --git a/net-analyzer/zabbix/files/zabbix-3.0.31-fix-cve-2020-15803.patch b/net-analyzer/zabbix/files/zabbix-3.0.31-fix-cve-2020-15803.patch deleted file mode 100644 index 0cca60315581..000000000000 --- a/net-analyzer/zabbix/files/zabbix-3.0.31-fix-cve-2020-15803.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git a/frontends/php/include/classes/screens/CScreenUrl.php b/frontends/php/include/classes/screens/CScreenUrl.php -index e35c5f1..1df396e 100644 ---- a/frontends/php/include/classes/screens/CScreenUrl.php -+++ b/frontends/php/include/classes/screens/CScreenUrl.php -@@ -29,18 +29,10 @@ class CScreenUrl extends CScreenBase { - public function get() { - // prevent from resolving macros in configuration page - if ($this->mode != SCREEN_MODE_PREVIEW && $this->mode != SCREEN_MODE_SLIDESHOW) { -- return $this->getOutput( -- CHtmlUrlValidator::validate($this->screenitem['url'], false) -- ? new CIFrame($this->screenitem['url'], $this->screenitem['width'], $this->screenitem['height'], -- 'auto') -- : makeMessageBox(false, [[ -- 'type' => 'error', -- 'message' => _s('Provided URL "%1$s" is invalid.', $this->screenitem['url']) -- ]] -- ) -- ); -+ return $this->getOutput($this->prepareElement()); - } -- elseif ($this->screenitem['dynamic'] == SCREEN_DYNAMIC_ITEM && $this->hostid == 0) { -+ -+ if ($this->screenitem['dynamic'] == SCREEN_DYNAMIC_ITEM && $this->hostid == 0) { - return $this->getOutput((new CTableInfo())->setNoDataMessage(_('No host selected.'))); - } - -@@ -54,14 +46,28 @@ class CScreenUrl extends CScreenBase { - - $this->screenitem['url'] = $url ? $url : $this->screenitem['url']; - -- return $this->getOutput( -- CHtmlUrlValidator::validate($this->screenitem['url'], false) -- ? new CIFrame($this->screenitem['url'], $this->screenitem['width'], $this->screenitem['height'], 'auto') -- : makeMessageBox(false, [[ -- 'type' => 'error', -- 'message' => _s('Provided URL "%1$s" is invalid.', $this->screenitem['url']) -- ]] -- ) -- ); -+ return $this->getOutput($this->prepareElement()); -+ } -+ -+ /** -+ * @return CTag -+ */ -+ public function prepareElement() { -+ if (CHtmlUrlValidator::validate($this->screenitem['url'], false)) { -+ $item = new CIFrame($this->screenitem['url'], $this->screenitem['width'], $this->screenitem['height'], -+ 'auto' -+ ); -+ -+ if (ZBX_IFRAME_SANDBOX !== false) { -+ $item->setAttribute('sandbox', ZBX_IFRAME_SANDBOX); -+ } -+ -+ return $item; -+ } -+ -+ return makeMessageBox(false, [[ -+ 'type' => 'error', -+ 'message' => _s('Provided URL "%1$s" is invalid.', $this->screenitem['url']) -+ ]]); - } - } -diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php -index a67a625..c6a437c 100644 ---- a/frontends/php/include/defines.inc.php -+++ b/frontends/php/include/defines.inc.php -@@ -1284,6 +1284,14 @@ if (function_exists('bcscale')) { - bcscale(7); - } - -+/** -+ * The sandbox attribute enables an extra set of restrictions for the content in the iframe. Default is set to empty -+ * string, which means all restrictions are applied. To disable, set to FALSE. To set a specific set of restrictions, -+ * write a custom string. -+ * https://www.w3.org/TR/2010/WD-html5-20100624/the-iframe-element.html#attr-iframe-sandbox -+ */ -+define('ZBX_IFRAME_SANDBOX', ''); -+ - // HTTP headers - /* - * Value of HTTP X-Frame-options header. diff --git a/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild b/net-analyzer/zabbix/zabbix-4.0.30.ebuild index 5a02f074a7f6..e77e263d0bd1 100644 --- a/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild +++ b/net-analyzer/zabbix/zabbix-4.0.30.ebuild @@ -11,11 +11,11 @@ DESCRIPTION="ZABBIX is software for monitoring of your applications, network and HOMEPAGE="https://www.zabbix.com/" MY_P=${P/_/} MY_PV=${PV/_/} -SRC_URI="https://cdn.zabbix.com/stable/${PV}/${P}.tar.gz" +SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz" LICENSE="GPL-2" SLOT="0/$(ver_cut 1-2)" WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" REQUIRED_USE="|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) @@ -93,9 +93,8 @@ BDEPEND=" " PATCHES=( + "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" - "${FILESDIR}/${PN}-3.0.30-mysql8.patch" - "${FILESDIR}/${P}-fix-cve-2020-15803.patch" ) S=${WORKDIR}/${MY_P} @@ -270,12 +269,12 @@ src_install() { doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar exeinto /${ZABBIXJAVA_BASE}/lib doexe \ - src/zabbix_java/lib/logback-classic-0.9.27.jar \ + src/zabbix_java/lib/logback-classic-1.2.3.jar \ src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.jar \ + src/zabbix_java/lib/logback-core-1.2.3.jar \ src/zabbix_java/lib/logback.xml \ src/zabbix_java/lib/android-json-4.3_r3.1.jar \ - src/zabbix_java/lib/slf4j-api-1.6.1.jar + src/zabbix_java/lib/slf4j-api-1.7.30.jar newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy fi diff --git a/net-analyzer/zabbix/zabbix-5.0.10.ebuild b/net-analyzer/zabbix/zabbix-5.0.10.ebuild new file mode 100644 index 000000000000..78fb7f873441 --- /dev/null +++ b/net-analyzer/zabbix/zabbix-5.0.10.ebuild @@ -0,0 +1,598 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit webapp java-pkg-opt-2 systemd toolchain-funcs go-module user-info +EGO_SUM=( + "github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU=" + "github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZdiDllfyYH5l5OkAaZtk7VkWe89bPJFmnDBNHxg=" + "github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=" + "github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=" + "github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=" + "github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=" + "github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=" + "github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=" + "github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=" + "github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=" + "github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=" + "github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143 h1:K9CFK8HRZWzmoIWbpA7u0XYLggCyfa/N77eVaq/nUiA=" + "github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143/go.mod h1:BLhrehfVmtABJWBZTJV8HyPWCSZoiMzjjcZ3+vHHhPI=" + "github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=" + "github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=" + "github.com/go-ldap/ldap v3.0.3+incompatible h1:HTeSZO8hWMS1Rgb2Ziku6b8a7qRIZZMHjsvuZyatzwk=" + "github.com/go-ldap/ldap v3.0.3+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc=" + "github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4=" + "github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=" + "github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=" + "github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=" + "github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=" + "github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=" + "github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=" + "github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4=" + "github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=" + "github.com/godror/godror v0.20.1 h1:s/ehD65nfVzWR2MrZGChDkLvVPlIVxbt+Jpzfwkl1c8=" + "github.com/godror/godror v0.20.1/go.mod h1:YlPoIf962ZZKPM5Xqa8NxmGgck39pi51tqAs+K3IaFM=" + "github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=" + "github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=" + "github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=" + "github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=" + "github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=" + "github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=" + "github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=" + "github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=" + "github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=" + "github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=" + "github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=" + "github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=" + "github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s=" + "github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk=" + "github.com/jackc/pgconn v1.5.0 h1:oFSOilzIZkyg787M1fEmyMfOUUvwj0daqYMfaWwNL4o=" + "github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=" + "github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=" + "github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc h1:9ThyBXKdyBFN2Y1NSCPGCA0kdWCNpd9u4SKWwtr6GfU=" + "github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc/go.mod h1:gm9GeeZiC+Ja7JV4fB/MNDeaOqsCrzFiZlLVhAompxk=" + "github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=" + "github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=" + "github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA=" + "github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE=" + "github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=" + "github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=" + "github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=" + "github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=" + "github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=" + "github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=" + "github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=" + "github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=" + "github.com/jackc/pgproto3/v2 v2.0.1 h1:Rdjp4NFjwHnEslx2b66FfCI2S0LhO4itac3hXz6WX9M=" + "github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=" + "github.com/jackc/pgproto3/v2 v2.0.4 h1:RHkX5ZUD9bl/kn0f9dYUWs1N7Nwvo1wwUYvKiR26Zco=" + "github.com/jackc/pgproto3/v2 v2.0.4/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=" + "github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8 h1:Q3tB+ExeflWUW7AFcAhXqk40s9mnNYLk1nOkKNZ5GnU=" + "github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=" + "github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg=" + "github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=" + "github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=" + "github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=" + "github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=" + "github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0=" + "github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po=" + "github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ=" + "github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716 h1:DrP52jA32liWkjCF/g3rYC1QjnRh6kvyXaZSevAtlqE=" + "github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig=" + "github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=" + "github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=" + "github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=" + "github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA=" + "github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o=" + "github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg=" + "github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85 h1:G5gbS1Q6cq7/Q1Z1CUqU9IKWfar2R1P6CE0zkKClEG0=" + "github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85/go.mod h1:OWJpVJk5U9XXEiYHeQ+5NtRt82Y5c8gvIZj96kl27Ow=" + "github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=" + "github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=" + "github.com/jackc/puddle v1.1.0 h1:musOWczZC/rSbqut475Vfcczg7jJsdUQf0D6oKPLgNU=" + "github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=" + "github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=" + "github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a h1:ec2LCBkfN1pOq0PhLRH/QitjSXr9s2dnh0gOFyohxHM=" + "github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=" + "github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=" + "github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=" + "github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=" + "github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=" + "github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=" + "github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=" + "github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=" + "github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=" + "github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=" + "github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=" + "github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=" + "github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=" + "github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=" + "github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=" + "github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU=" + "github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=" + "github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=" + "github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=" + "github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=" + "github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=" + "github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=" + "github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=" + "github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=" + "github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=" + "github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=" + "github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=" + "github.com/mediocregopher/radix/v3 v3.5.0 h1:8QHQmNh2ne9aFxTD3z63u/bkPPiOtknHoz80oP8EA/E=" + "github.com/mediocregopher/radix/v3 v3.5.0/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=" + "github.com/memcachier/mc/v3 v3.0.1 h1:Os/fUl/8c+hc1qWgjv5hNK0JI6GxKUOuehzB/UmjLP0=" + "github.com/memcachier/mc/v3 v3.0.1/go.mod h1:GzjocBahcXPxt2cmqzknrgqCOmMxiSzhVKPOe90Tpug=" + "github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce h1:TqjP/BTDrwN7zP9xyXVuLsMBXYMt6LLYi55PlrIcq8U=" + "github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:ifHPsLndGGzvgzcaXUvzmt6LxKT4pJ+uzEhtnMt+f7A=" + "github.com/omeid/go-yarn v0.0.1 h1:mUQExNwUrYn7tZRwQdsUuoQWHIujtjjpjb/PAtUj9dk=" + "github.com/omeid/go-yarn v0.0.1/go.mod h1:JYxmAvShSw7YmX/9vFsccpJE4o/KW111eUh3n/TQ5h8=" + "github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=" + "github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=" + "github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=" + "github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=" + "github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=" + "github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=" + "github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=" + "github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=" + "github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=" + "github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=" + "github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE=" + "github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=" + "github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY=" + "github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=" + "github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=" + "github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=" + "github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=" + "github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=" + "github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=" + "github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=" + "github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=" + "github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=" + "github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=" + "github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=" + "github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=" + "github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=" + "go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=" + "go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=" + "go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=" + "go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=" + "go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=" + "go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=" + "go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=" + "go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=" + "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=" + "golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=" + "golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=" + "golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=" + "golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=" + "golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59 h1:3zb4D3T4G8jdExgVU/95+vQXfpEPiMdCaZgmGVxjNHM=" + "golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=" + "golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=" + "golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=" + "golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=" + "golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=" + "golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=" + "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=" + "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=" + "golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA=" + "golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=" + "golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=" + "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=" + "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=" + "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=" + "golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=" + "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=" + "golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=" + "golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=" + "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=" + "golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=" + "golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=" + "golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=" + "golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=" + "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=" + "golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=" + "golang.org/x/sys v0.0.0-20200428200454-593003d681fa h1:yMbJOvnfYkO1dSAviTu/ZguZWLBTXx4xE3LYrxUCCiA=" + "golang.org/x/sys v0.0.0-20200428200454-593003d681fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=" + "golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=" + "golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=" + "golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=" + "golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=" + "golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=" + "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=" + "golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=" + "golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=" + "golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=" + "golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=" + "golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=" + "golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=" + "golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=" + "golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=" + "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=" + "golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA=" + "golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=" + "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=" + "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=" + "golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=" + "golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=" + "gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM=" + "gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=" + "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=" + "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=" + "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=" + "gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=" + "gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=" + "gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw=" + "gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=" + "gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU=" + "gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=" + "gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=" + "gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=" + "gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=" + "honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=" +) +go-module_set_globals + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" +HOMEPAGE="https://www.zabbix.com/" +MY_P=${P/_/} +MY_PV=${PV/_/} +SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz + agent2? ( ${EGO_SUM_SRC_URI} ) +" + +LICENSE="GPL-2" +SLOT="0/$(ver_cut 1-2)" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="~amd64 ~x86" +IUSE="+agent +agent2 java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" +REQUIRED_USE="|| ( agent agent2 frontend proxy server ) + proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) + server? ( ^^ ( mysql oracle postgres odbc ) ) + static? ( !oracle !snmp )" + +COMMON_DEPEND=" + curl? ( net-misc/curl ) + java? ( >=virtual/jdk-1.8:* ) + ldap? ( + =dev-libs/cyrus-sasl-2* + net-libs/gnutls + net-nds/openldap + ) + libxml2? ( dev-libs/libxml2 ) + mysql? ( dev-db/mysql-connector-c ) + odbc? ( dev-db/unixODBC ) + openipmi? ( sys-libs/openipmi ) + oracle? ( dev-db/oracle-instantclient-basic ) + postgres? ( dev-db/postgresql:* ) + proxy? ( sys-libs/zlib ) + server? ( + dev-libs/libevent + sys-libs/zlib + ) + snmp? ( net-analyzer/net-snmp ) + sqlite? ( dev-db/sqlite ) + ssh? ( net-libs/libssh2 ) + ssl? ( dev-libs/openssl:=[-bindist] ) +" + +RDEPEND="${COMMON_DEPEND} + acct-group/zabbix + acct-user/zabbix + java? ( >=virtual/jre-1.8:* ) + mysql? ( virtual/mysql ) + proxy? ( net-analyzer/fping[suid] ) + server? ( + app-admin/webapp-config + dev-libs/libevent + dev-libs/libpcre + net-analyzer/fping[suid] + ) + frontend? ( + app-admin/webapp-config + dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + media-libs/gd[png] + virtual/httpd-php:* + mysql? ( dev-lang/php[mysqli] ) + odbc? ( dev-lang/php[odbc] ) + oracle? ( dev-lang/php[oci8-instant-client] ) + postgres? ( dev-lang/php[postgres] ) + sqlite? ( dev-lang/php[sqlite] ) + ) +" +DEPEND="${COMMON_DEPEND} + static? ( + curl? ( net-misc/curl[static-libs] ) + ldap? ( + =dev-libs/cyrus-sasl-2*[static-libs] + net-libs/gnutls[static-libs] + net-nds/openldap[static-libs] + ) + libxml2? ( dev-libs/libxml2[static-libs] ) + mysql? ( dev-db/mysql-connector-c[static-libs] ) + odbc? ( dev-db/unixODBC[static-libs] ) + postgres? ( dev-db/postgresql:*[static-libs] ) + sqlite? ( dev-db/sqlite[static-libs] ) + ssh? ( net-libs/libssh2 ) + ) +" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" + "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" +) + +S=${WORKDIR}/${MY_P} + +ZABBIXJAVA_BASE="opt/zabbix_java" + +pkg_setup() { + if use oracle; then + if [ -z "${ORACLE_HOME}" ]; then + eerror + eerror "The environment variable ORACLE_HOME must be set" + eerror "and point to the correct location." + eerror "It looks like you don't have Oracle installed." + eerror + die "Environment variable ORACLE_HOME is not set" + fi + if has_version 'dev-db/oracle-instantclient-basic'; then + ewarn + ewarn "Please ensure you have a full install of the Oracle client." + ewarn "dev-db/oracle-instantclient* is NOT sufficient." + ewarn + fi + fi + + if use frontend; then + webapp_pkg_setup + fi + + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default +} + +src_configure() { + econf \ + $(use_enable agent) \ + $(use_enable agent2) \ + $(use_enable ipv6) \ + $(use_enable java) \ + $(use_enable proxy) \ + $(use_enable server) \ + $(use_enable static) \ + $(use_with curl libcurl) \ + $(use_with ldap) \ + $(use_with libxml2) \ + $(use_with mysql) \ + $(use_with odbc unixodbc) \ + $(use_with openipmi openipmi) \ + $(use_with oracle) \ + $(use_with postgres postgresql) \ + $(use_with snmp net-snmp) \ + $(use_with sqlite sqlite3) \ + $(use_with ssh ssh2) \ + $(use_with ssl openssl) +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" + fi +} + +src_install() { + local dirs=( + /etc/zabbix + /var/lib/zabbix + /var/lib/zabbix/home + /var/lib/zabbix/scripts + /var/lib/zabbix/alertscripts + /var/lib/zabbix/externalscripts + /var/log/zabbix + ) + + for dir in "${dirs[@]}"; do + dodir "${dir}" + keepdir "${dir}" + done + + if use server; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_server.conf + fperms 0640 /etc/zabbix/zabbix_server.conf + fowners root:zabbix /etc/zabbix/zabbix_server.conf + + newinitd "${FILESDIR}"/zabbix-server.init zabbix-server + + dosbin src/zabbix_server/zabbix_server + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-server.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf + fi + + if use proxy; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_proxy.conf + fperms 0640 /etc/zabbix/zabbix_proxy.conf + fowners root:zabbix /etc/zabbix/zabbix_proxy.conf + + newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy + + dosbin src/zabbix_proxy/zabbix_proxy + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-proxy.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf + fi + + if use agent; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_agentd.conf + fperms 0640 /etc/zabbix/zabbix_agentd.conf + fowners root:zabbix /etc/zabbix/zabbix_agentd.conf + + newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd + + dosbin src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + + systemd_dounit "${FILESDIR}"/zabbix-agentd.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf + fi + + if use agent2; then + insinto /etc/zabbix + doins "${S}"/src/go/conf/zabbix_agent2.conf + fperms 0640 /etc/zabbix/zabbix_agent2.conf + fowners root:zabbix /etc/zabbix/zabbix_agent2.conf + + newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2 + + dosbin src/go/bin/zabbix_agent2 + + systemd_dounit "${FILESDIR}"/zabbix-agent2.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf + fi + + fowners root:zabbix /etc/zabbix + fowners zabbix:zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + dodoc README INSTALL NEWS ChangeLog \ + conf/zabbix_agentd.conf \ + conf/zabbix_proxy.conf \ + conf/zabbix_agentd/userparameter_examples.conf \ + conf/zabbix_agentd/userparameter_mysql.conf \ + conf/zabbix_server.conf + + if use frontend; then + webapp_src_preinst + cp -R ui/* "${D}/${MY_HTDOCSDIR}" + webapp_configfile \ + "${MY_HTDOCSDIR}"/include/db.inc.php \ + "${MY_HTDOCSDIR}"/include/config.inc.php + webapp_src_install + fi + + if use java; then + dodir \ + /${ZABBIXJAVA_BASE} \ + /${ZABBIXJAVA_BASE}/bin \ + /${ZABBIXJAVA_BASE}/lib + keepdir /${ZABBIXJAVA_BASE} + exeinto /${ZABBIXJAVA_BASE}/bin + doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar + exeinto /${ZABBIXJAVA_BASE}/lib + doexe \ + src/zabbix_java/lib/logback-classic-1.2.3.jar \ + src/zabbix_java/lib/logback-console.xml \ + src/zabbix_java/lib/logback-core-1.2.3.jar \ + src/zabbix_java/lib/logback.xml \ + src/zabbix_java/lib/android-json-4.3_r3.1.jar \ + src/zabbix_java/lib/slf4j-api-1.7.30.jar + newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy + newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy + fi +} + +pkg_postinst() { + if use server || use proxy ; then + elog + elog "You may need to configure your database for Zabbix" + elog "if you have not already done so." + elog + + zabbix_homedir=$(egethome zabbix) + if [ -n "${zabbix_homedir}" ] && \ + [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then + ewarn + ewarn "The user 'zabbix' should have his homedir changed" + ewarn "to /var/lib/zabbix/home if you want to use" + ewarn "custom alert scripts." + ewarn + ewarn "A real homedir might be needed for configfiles" + ewarn "for custom alert scripts." + ewarn + ewarn "To change the homedir use:" + ewarn " usermod -d /var/lib/zabbix/home zabbix" + ewarn + fi + fi + + if use server; then + elog + elog "For distributed monitoring you have to run:" + elog + elog "zabbix_server -n <nodeid>" + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + elog "--" + elog + elog "You may need to add these lines to /etc/services:" + elog + elog "zabbix-agent 10050/tcp Zabbix Agent" + elog "zabbix-agent 10050/udp Zabbix Agent" + elog "zabbix-trapper 10051/tcp Zabbix Trapper" + elog "zabbix-trapper 10051/udp Zabbix Trapper" + elog + + if use server || use proxy ; then + # check for fping + fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) + case "${fping_perms}" in + 4[157][157][157]) + ;; + *) + ewarn + ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," + ewarn "you have to make /usr/sbin/fping setuid root and executable" + ewarn "by everyone. Run the following command to fix it:" + ewarn + ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" + ewarn + ewarn "Please be aware that this might impose a security risk," + ewarn "depending on the code quality of fping." + ewarn + ;; + esac + fi +} + +pkg_prerm() { + (use frontend || use server) && webapp_pkg_prerm +} diff --git a/net-analyzer/zabbix/zabbix-5.2.6.ebuild b/net-analyzer/zabbix/zabbix-5.2.6.ebuild new file mode 100644 index 000000000000..0770128c545e --- /dev/null +++ b/net-analyzer/zabbix/zabbix-5.2.6.ebuild @@ -0,0 +1,604 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit webapp java-pkg-opt-2 systemd toolchain-funcs go-module user-info +# content of src/go/go.sum +EGO_SUM=( + "github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU=" + "github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZdiDllfyYH5l5OkAaZtk7VkWe89bPJFmnDBNHxg=" + "github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=" + "github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=" + "github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=" + "github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=" + "github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=" + "github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=" + "github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=" + "github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=" + "github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=" + "github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143 h1:K9CFK8HRZWzmoIWbpA7u0XYLggCyfa/N77eVaq/nUiA=" + "github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143/go.mod h1:BLhrehfVmtABJWBZTJV8HyPWCSZoiMzjjcZ3+vHHhPI=" + "github.com/eclipse/paho.mqtt.golang v1.2.0 h1:1F8mhG9+aO5/xpdtFkW4SxOJB67ukuDC3t2y2qayIX0=" + "github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts=" + "github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=" + "github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=" + "github.com/go-ldap/ldap v3.0.3+incompatible h1:HTeSZO8hWMS1Rgb2Ziku6b8a7qRIZZMHjsvuZyatzwk=" + "github.com/go-ldap/ldap v3.0.3+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc=" + "github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4=" + "github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=" + "github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=" + "github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=" + "github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=" + "github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=" + "github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=" + "github.com/goburrow/modbus v0.1.0 h1:DejRZY73nEM6+bt5JSP6IsFolJ9dVcqxsYbpLbeW/ro=" + "github.com/goburrow/modbus v0.1.0/go.mod h1:Kx552D5rLIS8E7TyUwQ/UdHEqvX5T8tyiGBTlzMcZBg=" + "github.com/goburrow/serial v0.1.0 h1:v2T1SQa/dlUqQiYIT8+Cu7YolfqAi3K96UmhwYyuSrA=" + "github.com/goburrow/serial v0.1.0/go.mod h1:sAiqG0nRVswsm1C97xsttiYCzSLBmUZ/VSlVLZJ8haA=" + "github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4=" + "github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=" + "github.com/godror/godror v0.20.1 h1:s/ehD65nfVzWR2MrZGChDkLvVPlIVxbt+Jpzfwkl1c8=" + "github.com/godror/godror v0.20.1/go.mod h1:YlPoIf962ZZKPM5Xqa8NxmGgck39pi51tqAs+K3IaFM=" + "github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=" + "github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=" + "github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=" + "github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=" + "github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=" + "github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=" + "github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=" + "github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=" + "github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=" + "github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=" + "github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=" + "github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=" + "github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s=" + "github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk=" + "github.com/jackc/pgconn v1.5.0 h1:oFSOilzIZkyg787M1fEmyMfOUUvwj0daqYMfaWwNL4o=" + "github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=" + "github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=" + "github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc h1:9ThyBXKdyBFN2Y1NSCPGCA0kdWCNpd9u4SKWwtr6GfU=" + "github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc/go.mod h1:gm9GeeZiC+Ja7JV4fB/MNDeaOqsCrzFiZlLVhAompxk=" + "github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=" + "github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=" + "github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA=" + "github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE=" + "github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=" + "github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=" + "github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=" + "github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=" + "github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=" + "github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=" + "github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=" + "github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=" + "github.com/jackc/pgproto3/v2 v2.0.1 h1:Rdjp4NFjwHnEslx2b66FfCI2S0LhO4itac3hXz6WX9M=" + "github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=" + "github.com/jackc/pgproto3/v2 v2.0.4 h1:RHkX5ZUD9bl/kn0f9dYUWs1N7Nwvo1wwUYvKiR26Zco=" + "github.com/jackc/pgproto3/v2 v2.0.4/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=" + "github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8 h1:Q3tB+ExeflWUW7AFcAhXqk40s9mnNYLk1nOkKNZ5GnU=" + "github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=" + "github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg=" + "github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=" + "github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=" + "github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=" + "github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=" + "github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0=" + "github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po=" + "github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ=" + "github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716 h1:DrP52jA32liWkjCF/g3rYC1QjnRh6kvyXaZSevAtlqE=" + "github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig=" + "github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=" + "github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=" + "github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=" + "github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA=" + "github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o=" + "github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg=" + "github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85 h1:G5gbS1Q6cq7/Q1Z1CUqU9IKWfar2R1P6CE0zkKClEG0=" + "github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85/go.mod h1:OWJpVJk5U9XXEiYHeQ+5NtRt82Y5c8gvIZj96kl27Ow=" + "github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=" + "github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=" + "github.com/jackc/puddle v1.1.0 h1:musOWczZC/rSbqut475Vfcczg7jJsdUQf0D6oKPLgNU=" + "github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=" + "github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=" + "github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a h1:ec2LCBkfN1pOq0PhLRH/QitjSXr9s2dnh0gOFyohxHM=" + "github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=" + "github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=" + "github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=" + "github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=" + "github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=" + "github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=" + "github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=" + "github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=" + "github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=" + "github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=" + "github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=" + "github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=" + "github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=" + "github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=" + "github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=" + "github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU=" + "github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=" + "github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=" + "github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=" + "github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=" + "github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=" + "github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=" + "github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=" + "github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=" + "github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=" + "github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=" + "github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=" + "github.com/mediocregopher/radix/v3 v3.5.0 h1:8QHQmNh2ne9aFxTD3z63u/bkPPiOtknHoz80oP8EA/E=" + "github.com/mediocregopher/radix/v3 v3.5.0/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=" + "github.com/memcachier/mc/v3 v3.0.1 h1:Os/fUl/8c+hc1qWgjv5hNK0JI6GxKUOuehzB/UmjLP0=" + "github.com/memcachier/mc/v3 v3.0.1/go.mod h1:GzjocBahcXPxt2cmqzknrgqCOmMxiSzhVKPOe90Tpug=" + "github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce h1:TqjP/BTDrwN7zP9xyXVuLsMBXYMt6LLYi55PlrIcq8U=" + "github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:ifHPsLndGGzvgzcaXUvzmt6LxKT4pJ+uzEhtnMt+f7A=" + "github.com/omeid/go-yarn v0.0.1 h1:mUQExNwUrYn7tZRwQdsUuoQWHIujtjjpjb/PAtUj9dk=" + "github.com/omeid/go-yarn v0.0.1/go.mod h1:JYxmAvShSw7YmX/9vFsccpJE4o/KW111eUh3n/TQ5h8=" + "github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=" + "github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=" + "github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=" + "github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=" + "github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=" + "github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=" + "github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=" + "github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=" + "github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=" + "github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=" + "github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE=" + "github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=" + "github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY=" + "github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=" + "github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=" + "github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=" + "github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=" + "github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=" + "github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=" + "github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=" + "github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=" + "github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=" + "github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=" + "github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=" + "github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=" + "github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=" + "go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=" + "go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=" + "go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=" + "go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=" + "go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=" + "go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=" + "go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=" + "go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=" + "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=" + "golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=" + "golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=" + "golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=" + "golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=" + "golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59 h1:3zb4D3T4G8jdExgVU/95+vQXfpEPiMdCaZgmGVxjNHM=" + "golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=" + "golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=" + "golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=" + "golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=" + "golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=" + "golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=" + "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=" + "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=" + "golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA=" + "golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=" + "golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=" + "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=" + "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=" + "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=" + "golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=" + "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=" + "golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=" + "golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=" + "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=" + "golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=" + "golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=" + "golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=" + "golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=" + "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=" + "golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=" + "golang.org/x/sys v0.0.0-20200428200454-593003d681fa h1:yMbJOvnfYkO1dSAviTu/ZguZWLBTXx4xE3LYrxUCCiA=" + "golang.org/x/sys v0.0.0-20200428200454-593003d681fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=" + "golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=" + "golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=" + "golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=" + "golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=" + "golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=" + "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=" + "golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=" + "golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=" + "golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=" + "golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=" + "golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=" + "golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=" + "golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=" + "golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=" + "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=" + "golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA=" + "golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=" + "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=" + "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=" + "golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=" + "golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=" + "gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM=" + "gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=" + "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=" + "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=" + "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=" + "gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=" + "gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=" + "gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw=" + "gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=" + "gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU=" + "gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=" + "gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=" + "gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=" + "gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=" + "honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=" +) +go-module_set_globals + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" +HOMEPAGE="https://www.zabbix.com/" +MY_P=${P/_/} +MY_PV=${PV/_/} +SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz + agent2? ( ${EGO_SUM_SRC_URI} ) +" + +LICENSE="GPL-2" +SLOT="0/$(ver_cut 1-2)" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="~amd64 ~x86" +IUSE="+agent +agent2 java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" +REQUIRED_USE="|| ( agent agent2 frontend proxy server ) + proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) + server? ( ^^ ( mysql oracle postgres odbc ) ) + static? ( !oracle !snmp )" + +COMMON_DEPEND=" + curl? ( net-misc/curl ) + java? ( >=virtual/jdk-1.8:* ) + ldap? ( + =dev-libs/cyrus-sasl-2* + net-libs/gnutls + net-nds/openldap + ) + libxml2? ( dev-libs/libxml2 ) + mysql? ( dev-db/mysql-connector-c ) + odbc? ( dev-db/unixODBC ) + openipmi? ( sys-libs/openipmi ) + oracle? ( dev-db/oracle-instantclient-basic ) + postgres? ( dev-db/postgresql:* ) + proxy? ( sys-libs/zlib ) + server? ( + dev-libs/libevent + sys-libs/zlib + ) + snmp? ( net-analyzer/net-snmp ) + sqlite? ( dev-db/sqlite ) + ssh? ( net-libs/libssh2 ) + ssl? ( dev-libs/openssl:=[-bindist] ) +" + +RDEPEND="${COMMON_DEPEND} + acct-group/zabbix + acct-user/zabbix + java? ( >=virtual/jre-1.8:* ) + mysql? ( virtual/mysql ) + proxy? ( net-analyzer/fping[suid] ) + server? ( + app-admin/webapp-config + dev-libs/libevent + dev-libs/libpcre + net-analyzer/fping[suid] + ) + frontend? ( + app-admin/webapp-config + dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + media-libs/gd[png] + virtual/httpd-php:* + mysql? ( dev-lang/php[mysqli] ) + odbc? ( dev-lang/php[odbc] ) + oracle? ( dev-lang/php[oci8-instant-client] ) + postgres? ( dev-lang/php[postgres] ) + sqlite? ( dev-lang/php[sqlite] ) + ) +" +DEPEND="${COMMON_DEPEND} + static? ( + curl? ( net-misc/curl[static-libs] ) + ldap? ( + =dev-libs/cyrus-sasl-2*[static-libs] + net-libs/gnutls[static-libs] + net-nds/openldap[static-libs] + ) + libxml2? ( dev-libs/libxml2[static-libs] ) + mysql? ( dev-db/mysql-connector-c[static-libs] ) + odbc? ( dev-db/unixODBC[static-libs] ) + postgres? ( dev-db/postgresql:*[static-libs] ) + sqlite? ( dev-db/sqlite[static-libs] ) + ssh? ( net-libs/libssh2 ) + ) +" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" + "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" +) + +S=${WORKDIR}/${MY_P} + +ZABBIXJAVA_BASE="opt/zabbix_java" + +pkg_setup() { + if use oracle; then + if [ -z "${ORACLE_HOME}" ]; then + eerror + eerror "The environment variable ORACLE_HOME must be set" + eerror "and point to the correct location." + eerror "It looks like you don't have Oracle installed." + eerror + die "Environment variable ORACLE_HOME is not set" + fi + if has_version 'dev-db/oracle-instantclient-basic'; then + ewarn + ewarn "Please ensure you have a full install of the Oracle client." + ewarn "dev-db/oracle-instantclient* is NOT sufficient." + ewarn + fi + fi + + if use frontend; then + webapp_pkg_setup + fi + + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default +} + +src_configure() { + econf \ + "$(use_enable agent)" \ + "$(use_enable agent2)" \ + "$(use_enable ipv6)" \ + "$(use_enable java)" \ + "$(use_enable proxy)" \ + "$(use_enable server)" \ + "$(use_enable static)" \ + "$(use_with curl libcurl)" \ + "$(use_with ldap)" \ + "$(use_with libxml2)" \ + "$(use_with mysql)" \ + "$(use_with odbc unixodbc)" \ + "$(use_with openipmi openipmi)" \ + "$(use_with oracle)" \ + "$(use_with postgres postgresql)" \ + "$(use_with snmp net-snmp)" \ + "$(use_with sqlite sqlite3)" \ + "$(use_with ssh ssh2)" \ + "$(use_with ssl openssl)" +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" + fi +} + +src_install() { + local dirs=( + /etc/zabbix + /var/lib/zabbix + /var/lib/zabbix/home + /var/lib/zabbix/scripts + /var/lib/zabbix/alertscripts + /var/lib/zabbix/externalscripts + /var/log/zabbix + ) + + for dir in "${dirs[@]}"; do + dodir "${dir}" + keepdir "${dir}" + done + + if use server; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_server.conf + fperms 0640 /etc/zabbix/zabbix_server.conf + fowners root:zabbix /etc/zabbix/zabbix_server.conf + + newinitd "${FILESDIR}"/zabbix-server.init zabbix-server + + dosbin src/zabbix_server/zabbix_server + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-server.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf + fi + + if use proxy; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_proxy.conf + fperms 0640 /etc/zabbix/zabbix_proxy.conf + fowners root:zabbix /etc/zabbix/zabbix_proxy.conf + + newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy + + dosbin src/zabbix_proxy/zabbix_proxy + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-proxy.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf + fi + + if use agent; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_agentd.conf + fperms 0640 /etc/zabbix/zabbix_agentd.conf + fowners root:zabbix /etc/zabbix/zabbix_agentd.conf + + newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd + + dosbin src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + + systemd_dounit "${FILESDIR}"/zabbix-agentd.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf + fi + if use agent2; then + insinto /etc/zabbix + doins "${S}"/src/go/conf/zabbix_agent2.conf + fperms 0640 /etc/zabbix/zabbix_agent2.conf + fowners root:zabbix /etc/zabbix/zabbix_agent2.conf + + newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2 + + dosbin src/go/bin/zabbix_agent2 + + systemd_dounit "${FILESDIR}"/zabbix-agent2.service + systemd_newtmpfilesd "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf + fi + + fowners root:zabbix /etc/zabbix + fowners zabbix:zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + dodoc README INSTALL NEWS ChangeLog \ + conf/zabbix_agentd.conf \ + conf/zabbix_proxy.conf \ + conf/zabbix_agentd/userparameter_examples.conf \ + conf/zabbix_agentd/userparameter_mysql.conf \ + conf/zabbix_server.conf + + if use frontend; then + webapp_src_preinst + cp -R ui/* "${D}/${MY_HTDOCSDIR}" + webapp_configfile \ + "${MY_HTDOCSDIR}"/include/db.inc.php \ + "${MY_HTDOCSDIR}"/include/config.inc.php + webapp_src_install + fi + + if use java; then + dodir \ + /${ZABBIXJAVA_BASE} \ + /${ZABBIXJAVA_BASE}/bin \ + /${ZABBIXJAVA_BASE}/lib + keepdir /${ZABBIXJAVA_BASE} + exeinto /${ZABBIXJAVA_BASE}/bin + doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar + exeinto /${ZABBIXJAVA_BASE}/lib + doexe \ + src/zabbix_java/lib/logback-classic-1.2.3.jar \ + src/zabbix_java/lib/logback-console.xml \ + src/zabbix_java/lib/logback-core-1.2.3.jar \ + src/zabbix_java/lib/logback.xml \ + src/zabbix_java/lib/android-json-4.3_r3.1.jar \ + src/zabbix_java/lib/slf4j-api-1.7.30.jar + newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy + newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy + fi +} + +pkg_postinst() { + if use server || use proxy ; then + elog + elog "You may need to configure your database for Zabbix" + elog "if you have not already done so." + elog + + zabbix_homedir=$(egethome zabbix) + if [ -n "${zabbix_homedir}" ] && \ + [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then + ewarn + ewarn "The user 'zabbix' should have his homedir changed" + ewarn "to /var/lib/zabbix/home if you want to use" + ewarn "custom alert scripts." + ewarn + ewarn "A real homedir might be needed for configfiles" + ewarn "for custom alert scripts." + ewarn + ewarn "To change the homedir use:" + ewarn " usermod -d /var/lib/zabbix/home zabbix" + ewarn + fi + fi + + if use server; then + elog + elog "For distributed monitoring you have to run:" + elog + elog "zabbix_server -n <nodeid>" + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + elog "--" + elog + elog "You may need to add these lines to /etc/services:" + elog + elog "zabbix-agent 10050/tcp Zabbix Agent" + elog "zabbix-agent 10050/udp Zabbix Agent" + elog "zabbix-trapper 10051/tcp Zabbix Trapper" + elog "zabbix-trapper 10051/udp Zabbix Trapper" + elog + + if use server || use proxy ; then + # check for fping + fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) + case "${fping_perms}" in + 4[157][157][157]) + ;; + *) + ewarn + ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," + ewarn "you have to make /usr/sbin/fping setuid root and executable" + ewarn "by everyone. Run the following command to fix it:" + ewarn + ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" + ewarn + ewarn "Please be aware that this might impose a security risk," + ewarn "depending on the code quality of fping." + ewarn + ;; + esac + fi +} + +pkg_prerm() { + (use frontend || use server) && webapp_pkg_prerm +} |