diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
| commit | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch) | |
| tree | 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /net-analyzer | |
| parent | f516638b7fe9592837389826a6152a7e1b251c54 (diff) | |
gentoo resync : 13.06.2020
Diffstat (limited to 'net-analyzer')
57 files changed, 957 insertions, 1572 deletions
diff --git a/net-analyzer/2ping/2ping-4.4.1.ebuild b/net-analyzer/2ping/2ping-4.4.1.ebuild new file mode 100644 index 000000000000..9d31cd1228f9 --- /dev/null +++ b/net-analyzer/2ping/2ping-4.4.1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{7,8} ) + +inherit distutils-r1 + +DESCRIPTION="A bi-directional ping utility" +HOMEPAGE="https://www.finnie.org/software/2ping/" +SRC_URI="https://www.finnie.org/software/2ping/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +IUSE="server" + +src_install() { + distutils-r1_src_install + doman doc/2ping.1 + dodoc doc/{2ping-protocol-examples.py,2ping-protocol.md} + use server && { + doinitd "${FILESDIR}"/2pingd + newconfd "${FILESDIR}"/2pingd.conf 2pingd + } +} diff --git a/net-analyzer/2ping/Manifest b/net-analyzer/2ping/Manifest index 62f48497ccbd..404df4e8e003 100644 --- a/net-analyzer/2ping/Manifest +++ b/net-analyzer/2ping/Manifest @@ -2,6 +2,8 @@ AUX 2pingd 692 BLAKE2B f393bc602a4e39f77970946926bae178f9181476f7331b9a91f1dddc6 AUX 2pingd.conf 57 BLAKE2B 79c2a05661e342d5a5c3903071d42864d3185d6f387a6b73f129a70cadfadf081f43d9bdfea22281170b0ad27ec17f9b3612cf40b570390f44f845d7ca4555d0 SHA512 c8c666116e841b86a1f17a891453e6ea25976ad485b8299062971b45395420dd46ecc9ac36cb1de5000207372f8586850f62c6178ece5f70732bf17ae9ab4af9 DIST 2ping-4.2.tar.gz 70054 BLAKE2B 01759c9f0d2eb2bf08e92155a74e11aaf7bb83adb43942be70b8e525486bba6608ad021bb149376f246bdcb066958c7d9886a1e5ea63094d715c8b25fa2b9784 SHA512 8c6e9b4cefd92929e8d5247f2c4caecdfc281548596f96fbfe52f99dc122dd1d53470c303e85bc469f0a7910937085ad36c7f928cb295c8f3fce5f3455dec3d9 DIST 2ping-4.3.tar.gz 70386 BLAKE2B 7a73508bdf5fef0d6ef99d1d6b8bfdee65740277ef0e17913e2070503c20bd4d9598a7d7353eb68dbe5c7380e49e465ddd49adba4899f95daead36bbc8514f69 SHA512 f7186fe5bed2f12593d62f85fe364c9dc571f8b0ad10f6766515470ea8f8ed32d439e580003e78494b4742a8224e2b30cc454f8275a4877d432eb76646334e77 +DIST 2ping-4.4.1.tar.gz 75284 BLAKE2B 29240c9710417f735acbeb61e948634c7dd3b608084f4499cae97172f25a0951eab81db92743d452ce679d171107925cf35b9fa9fea82fb5551b11d83a23fcb1 SHA512 b40698488bd067a50be171566a0920920edb6bd0baea65999f2226fe66771770a1ebb3c1078bf8d633c555af3297e8f9925f5c42a3e9aa7cd48b59d6cb59e10b EBUILD 2ping-4.2.ebuild 624 BLAKE2B 53e4efecd635c89dd92b66041b7a8ab25589b370a3dfffbaceda09f87e9918da969e761148ac5bef2014aa15510385cb4a86a99830dcbccb2dbe5102358490e8 SHA512 ff0cbe08db31810930778f9d6bd5635b0f97a25db1285614d861b4ac69dbc918493daf69d1e5052c353b8c621cf22eb7a560e378a9fb6b86ee6e61b390405913 EBUILD 2ping-4.3.ebuild 624 BLAKE2B b4f77612a74996f3f7db254ca3a7e591eaacbfe9dc38b819eeb946a6225ce26c85c443f178560a3a5913a77f2d6a5b76708739c46c65fb0336184dbce9a2f073 SHA512 02b8a0b3039747511d8792d65702ba2af69e5b19e9d0d5e12d4dcf5f3abb6644d0db26a17e8bd05719d2dcf624a516124557e3df5b2484c7834e6059cd7c097a +EBUILD 2ping-4.4.1.ebuild 628 BLAKE2B df13d1884a4873bed0a92a0844a98d3908ae19df724534d93e9510f1a8642cd5a9236f2b3a732f37628cafece46238b46c1a7340588a789b72eb54d14719859a SHA512 17653cd974285f970a38a885935b9fb5f513243b5f1656181474370921466ba550acf36832e77dacb75dd5dd17d4078a780d69111b962b4e51ef0abaea8a8681 MISC metadata.xml 400 BLAKE2B 8de660bda8c58cc5c6e6027c7e52efbd03ef973594e85a90483f0bb0dd2fcdcc4ee7989cf8624e72f0e71f31daf5af05c345126b862cad1007c3a45a8122bcd4 SHA512 9d35147319cbab8e826a2f0a8badee2169e70b8a52065d8639f2326ff0bfe1717a5e8b5422072f71677e2e4a99ec14a7d6e688662f2342d7917499c35a686154 diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz Binary files differindex 7aa384f8f1b9..351bedf9fdab 100644 --- a/net-analyzer/Manifest.gz +++ b/net-analyzer/Manifest.gz diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest index 72d81a2d8d7a..736197fa7f6d 100644 --- a/net-analyzer/arpwatch/Manifest +++ b/net-analyzer/arpwatch/Manifest @@ -5,7 +5,7 @@ AUX arpwatch.initd-r1 752 BLAKE2B ba0adcdc9c02ff0b60c46f9bd98c100171b365ca4d50f9 DIST arpwatch-2.1a15.tar.gz 202729 BLAKE2B b583dea83c57a55b8705f0265c1324de270571468dc9f2e1d5351fd53340f7636f1d00e3de24caa9747384697721e6227e5e6de4b3827e5ac7adef4ce524fffd SHA512 f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90 DIST arpwatch-patchset-0.7.tar.xz 132868 BLAKE2B 502d1493930ad905cd42bc76ec9b92a37811dce9829d69e8703d23039c5ab32a61da3cc1a399464b3edc71a2e020756ce2b9c5a069d10f809c21870add9a7f73 SHA512 2cbfa37acd29c30232da9ad0a742ddc9cd35c228fb786c6798555962841006ba0f47e31097722a3303e25f2e7c665b6e93707e49c02a8a9171b484b56a133e00 DIST arpwatch-patchset-0.8.tar.xz 131692 BLAKE2B 8db242f7c74c8fee0700e12e8ff028fcaa336e5feb61514b44a892a132779c11d1ca3ce2fabee3cbcbbdcb0dae0ed470daa786a91619c18e24066f11da126bc4 SHA512 3e8f1c043f09fbeacadb40c1db47fb907314ed18bb3fb506c6c510977fd0e6dd9950becc830cf7c10911a7eec97e56e0af8c8c3d7df811e8ab820290973ea0b0 -EBUILD arpwatch-2.1.15-r11.ebuild 2217 BLAKE2B a1f042a28108e69048d0d5494659fd890633d016bab65637ae3fd85d08bdc65e0c8d73fefbc60f4ba6a7ba40534b3fa3bc154cb8dca3b9e3be60b40480085e6a SHA512 af35788a8c783a35429835039940112fd9f470f99942251720609584c765c933bc49eace118fb401d291bb3d14a3e8599e8eea7d23a099907c513b03bad3ec8c +EBUILD arpwatch-2.1.15-r11.ebuild 2212 BLAKE2B 256c4c6ec2122cd1a6eda7272afa4cecbb46625ccda72117cf949faeb589ef74d089923a036bd3fd0ef057bc549a692dc150132aad92bff14b3d1cd1d54fef94 SHA512 b51f3752058eab0ac532d11157c5f9d5f65f0dda01f6d396b13b39d668f424cad3290baaddbfaec2c2edd718010aa95806f7e32f04dceb44a68f7a26382366be EBUILD arpwatch-2.1.15-r8.ebuild 1375 BLAKE2B ea7a95aa5dfb0d1f46820bba13da044476e1395a7a22f0b13dd70fbee1824a763d24797ade3d7c74093cbb4c81aad9420a16978716f6210ca35d6a8c364ea89e SHA512 d7228a4473f28162ca9c50b74538ad461193a44db4f583dfa3fe20475a3837f6ef90e096e073396d3932580c8333cfb2675f7d48bf309642847c6d18e8ea81cc EBUILD arpwatch-2.1.15-r9.ebuild 1357 BLAKE2B 5c18e76a61fb2ad63e7f999bc326fc370cfbc0816a597f2f603b5b4e09214b93326a0340334e55e3edecb03a4934eec6093a47ca305c75c8b6ac4e76eddd1458 SHA512 19e8abb183a16693af2d595798f19cfbcc44ce855c8ae4db5a55b298421f98a95d39be94208a16b66c3106735afeac491588be75ca601171eb98a46016a39d8e MISC metadata.xml 741 BLAKE2B 63f289064fdfc3164a8c2651f783e851c42c062996e4e916e69ece25c5a0892030a07aaaead7b2fc14e6708128bc48e4321d30fedca97d09efad66a2340e3897 SHA512 0db051d36fb16c5a50239a243ca46f686e71b13387330bf98df46c9af3389d16e9842b89c15d2e6fb3fba867e5a0b36a2fd745480588ba621e117ee86aadbd00 diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild index d30e87c6a301..fbefe68bec99 100644 --- a/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild +++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" +KEYWORDS="amd64 hppa ppc sparc x86" IUSE="selinux" DEPEND=" diff --git a/net-analyzer/cnet/Manifest b/net-analyzer/cnet/Manifest index 0c5dc1c88011..6f9e659b88c2 100644 --- a/net-analyzer/cnet/Manifest +++ b/net-analyzer/cnet/Manifest @@ -3,6 +3,6 @@ AUX cnet-3.3.1-tcl.patch 350 BLAKE2B 87816729c1705cb8d22676af3fe7172ae651fd565ba AUX cnet-3.3.4-gentoo.patch 4898 BLAKE2B 5a50a13c33b83717ee73b3c7c70d1cce2b913c35819bb62ef14bea9131d1aebd8e122c8cae837b891025c0c0a3e6d0d151af499b9e2e777d332708ce9a1ff7ec SHA512 58efef31fdb88ed401ba1aa26e8afce506ab77da47207cf2730c2f2efe47efa8dd916578eab34c6c2dc38f499073e14bf16d3c7d03b4412d1fb1fab0eb26614c DIST cnet-3.3.1.tgz 2684531 BLAKE2B 5cb2cf545ccf1e2adb1e50f4220b944361ed44d61857ef4bf0ce30ed9e6346e0ed709bfbcfa339751bf2abc67d930b19decdc6355803426fa1eb4d097a6eed73 SHA512 9b86a077d48086036fbcfa86ba202b49610e1e1eac55fd3076b24a7ca622a6fc9b34156477bcb25af15d06cf0813f12a7b3f4cb21f1eeb00fd2e010610797ce8 DIST cnet-3.3.4.tgz 2687235 BLAKE2B dec8b4510cfb9a39ade046dee56955d4ab39094d07acf373b056ce1917f3bbddcf22cf5feefe864b472be4c4a47da3147a3b977cdbf8b0295e0c3a8da95a8420 SHA512 51457541d1023e49bdad4df3502c51d11ea6d62e3e6ae857becfb60229626ba777226b2b42d313d95b982b2790c6b1f80b39e344d9d4bcd4c38ccc31b055d8f9 -EBUILD cnet-3.3.1.ebuild 978 BLAKE2B 60021756388bfbfd23ba197ea98ec12ed3c50b38e01354955ffb9638ed94b06bca5c6bdbb4faa42d08a42e9919e2febbae9f042fa407e2d0b64aafe9127b7db6 SHA512 0516c7eee23318d2cb48b04f51d4a3d5c1a378528662714bbeb4608921bb562b3d6093df3ee9e80f2547a00784c8b38c305c654b92828241eff5c9e1d16f04a9 -EBUILD cnet-3.3.4.ebuild 943 BLAKE2B 73a56c4d0e2018a4575f006db9aa43612dd884ab2ad119032569910b83d13c5c8e06a1c4559e1945cdaf570e4ab4762f041320123e85998f9a043c5bc9fea21f SHA512 05970fb9f411146ca58497a4b9db53706a1b4fd801c51b08851993d3357991b0d3620719974a93fb8edcd183e21e23a1e40d8cc0917cd2f66cddb640e1b545ee +EBUILD cnet-3.3.1.ebuild 976 BLAKE2B 335d2d78e4fc2e69ca6c733d37b9d5d9a72a2c026564142c30c9b25bcdbad12de43030c364b5a792edd56c436356284974bb17a2955d5ad66cc3ea1431bc6067 SHA512 2aab1f7b7a2041b9f74ddf81b95183dad5cc3e3d7781faf6c9a61581ab3e3854969f30e465bac8e18eba937ce0c2db66028def45b2d35f821dbdecbcf8338601 +EBUILD cnet-3.3.4.ebuild 941 BLAKE2B 888da30d1a962b0f8f30697e70dadc30f362feb3058d3c259ad2317505d92fadef8a7e12798266336b6d3f4e105e2cabe2bf2563e9a7a83cb7044b5d2b9c77ae SHA512 4737df21d2d7a891c53be4ed2cac8ceb72b4eb92d1ea37525a750c6105e85cddc4aa6028a2d9704f5ec4dc3334755f937db33df39ef95a1c3f283c0ee4e329ee MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/cnet/cnet-3.3.1.ebuild b/net-analyzer/cnet/cnet-3.3.1.ebuild index 3bde2f1eb731..e5765dba0c8d 100644 --- a/net-analyzer/cnet/cnet-3.3.1.ebuild +++ b/net-analyzer/cnet/cnet-3.3.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 inherit eutils multilib toolchain-funcs DESCRIPTION="Network simulation tool" -HOMEPAGE="http://www.csse.uwa.edu.au/cnet3/" +HOMEPAGE="https://www.csse.uwa.edu.au/cnet3/" SRC_URI="https://dev.gentoo.org/~jer/${P}.tgz" LICENSE="GPL-2" diff --git a/net-analyzer/cnet/cnet-3.3.4.ebuild b/net-analyzer/cnet/cnet-3.3.4.ebuild index d0f7d21a3314..252806110764 100644 --- a/net-analyzer/cnet/cnet-3.3.4.ebuild +++ b/net-analyzer/cnet/cnet-3.3.4.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit eutils multilib toolchain-funcs DESCRIPTION="Network simulation tool" -HOMEPAGE="http://www.csse.uwa.edu.au/cnet3/" +HOMEPAGE="https://www.csse.uwa.edu.au/cnet3/" SRC_URI="https://dev.gentoo.org/~jer/${P}.tgz" LICENSE="GPL-2" diff --git a/net-analyzer/gr-fosphor/Manifest b/net-analyzer/gr-fosphor/Manifest index 9d7bec1013b1..e52f36f808e8 100644 --- a/net-analyzer/gr-fosphor/Manifest +++ b/net-analyzer/gr-fosphor/Manifest @@ -1,2 +1,6 @@ -EBUILD gr-fosphor-9999.ebuild 1324 BLAKE2B fb6e43ec50f469d9fe71b1f2ab3e275c94e3f552f9a034ac86fe8253c09ecca22efb54390dabcd2570ad9484132d482d8805a836886fe56dac45db5963913421 SHA512 eeacf7ccb39e22fdb31e3b6035b57d68b151455ce4219ffde6dcbfc11a7280fa6253ea0fde990395212a38dc09bfd8e39a2a3b690168cf3d76ddaf4c7107dee6 +DIST gr-fosphor-0.0_p20191202.tar.gz 254103 BLAKE2B 460b4ff2ff9f4a6faa70c541dd8ce936ba8419a89cca7715913b6f93f07a151c467a5737860a362198d609dfe0e4bfc4a476278bfc720d89c1876ff56addf226 SHA512 6bc26be4aa3116af33a214046c76e5a7623e049e27e86d866892de611ffd4bfa4bd841b66535fc40320fa7c7a46d19af2d391ee594f9a7ed997355cd2ade6fa1 +DIST gr-fosphor-0.0_p20200131.tar.gz 244685 BLAKE2B db01b9df87f377db2adaaca3d1542f99eaca9f73303c71ea9add1845307704817c8930736d44462191476b4cb935a18401b7012a1ea6465bdb5cf3624c182f2c SHA512 7bf2758f98ae7d088256060878fbf33966880ddbb7fb132da00f9c2530d84b91a6385eabbf61ff40d3002d3a42eadf5e2d78b8c797bc93501cafaf8a7bdde7ae +EBUILD gr-fosphor-0.0_p20191202.ebuild 1379 BLAKE2B e24557d185a06d139ba915dfadb23eb99d434f88f09bb006fcbb7cfc0d565905bc095cd83e630d4b80b97c1fc25b906b5eefa5b8ecba00f5b7b950bda869c53a SHA512 c764a9ed59af2a4b929add701485cf89a5ed0563f0caddf29dc71fb23cc8e0fe00c92a834ad4acbdbd95fd335648d4d0c3f71f4bcccc84d455cd5086decfb873 +EBUILD gr-fosphor-0.0_p20200131.ebuild 1348 BLAKE2B c8c977e0b34e33e3e456c4a18b8149903b9391741500344ad904aa06e7c662cd28abed1330228ddd856ab40fac893650b38c3c5f0fa1c00b3830891a073f5ace SHA512 6cee886a5f0eab8b8be388664fd03bcd1c4746281d4dc86f15666eb7651e8412fed4fc5f0ff2f31cb00f7e8c8a5657f0ff32a082777c08f960c63beef6731c02 +EBUILD gr-fosphor-9999.ebuild 1348 BLAKE2B c8c977e0b34e33e3e456c4a18b8149903b9391741500344ad904aa06e7c662cd28abed1330228ddd856ab40fac893650b38c3c5f0fa1c00b3830891a073f5ace SHA512 6cee886a5f0eab8b8be388664fd03bcd1c4746281d4dc86f15666eb7651e8412fed4fc5f0ff2f31cb00f7e8c8a5657f0ff32a082777c08f960c63beef6731c02 MISC metadata.xml 308 BLAKE2B 365c82d2c544f94f613bee62f13ab91dcbefd1652fccfec5222a616443714400c686eb5d77c892b44ab0c1badd1877b4bd0dcb9040c98720c13934d567482857 SHA512 cca3e1ffd2ee31e64dbea0f66093f3295b9e1ce2161b9b71dbd1d518a6a0ff83843c684c1c958bffb80b4f4fda9d5a272be8d6ab2ecf6f0fe57202a65a218df9 diff --git a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20191202.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20191202.ebuild new file mode 100644 index 000000000000..78c0f817bcf6 --- /dev/null +++ b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20191202.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 ) + +inherit cmake-utils python-single-r1 + +DESCRIPTION="gnuradio fosphor block (GPU spectrum display)" +HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/osmocom/${PN}.git" +else + COMMIT="fa6761afbf8c2658782e0c7fc5d51063679b7ae4" + SRC_URI="https://github.com/osmocom/gr-fosphor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" + KEYWORDS="~amd64 ~x86" +fi + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="glfw qt5 wxwidgets" + +RDEPEND="qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + ) + =net-wireless/gnuradio-3.7*:0=[qt5,wxwidgets?,${PYTHON_SINGLE_USEDEP}] + media-libs/freetype + dev-libs/boost:= + glfw? ( >=media-libs/glfw-3 ) + virtual/opencl + virtual/opengl + ${PYTHON_DEPS} +" +DEPEND="${RDEPEND} + dev-lang/swig:0 + dev-util/cppunit +" + +src_prepare() { + cmake-utils_src_prepare + default +} + +src_configure() { + # tries to run OpenCL test program, but failing doesn't hurt + addpredict /dev/dri + + local mycmakeargs=( + -DENABLE_DEFAULT=OFF + -DENABLE_GLFW="$(usex glfw)" + -DENABLE_QT="$(usex qt5)" + -DENABLE_WX="$(usex wxwidgets)" + -DENABLE_PYTHON=ON + ) + cmake-utils_src_configure +} diff --git a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild new file mode 100644 index 000000000000..73f6863f9df9 --- /dev/null +++ b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit cmake-utils python-single-r1 + +DESCRIPTION="gnuradio fosphor block (GPU spectrum display)" +HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/osmocom/${PN}.git" +else + COMMIT="defdd4aca6cd157ccc3b10ea16b5b4f552f34b96" + SRC_URI="https://github.com/osmocom/gr-fosphor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" + KEYWORDS="~amd64 ~x86" +fi + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="glfw qt5" + +RDEPEND="qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + ) + dev-libs/boost:= + dev-libs/log4cpp + media-libs/freetype + =net-wireless/gnuradio-3.8*:0=[qt5,${PYTHON_SINGLE_USEDEP}] + glfw? ( >=media-libs/glfw-3 ) + virtual/opencl + virtual/opengl + ${PYTHON_DEPS} +" +DEPEND="${RDEPEND} + dev-lang/swig:0 + dev-util/cppunit +" + +src_prepare() { + cmake-utils_src_prepare + default +} + +src_configure() { + # tries to run OpenCL test program, but failing doesn't hurt + addpredict /dev/dri + + local mycmakeargs=( + -DENABLE_DEFAULT=OFF + -DENABLE_GLFW="$(usex glfw)" + -DENABLE_QT="$(usex qt5)" + -DENABLE_PYTHON=ON + ) + cmake-utils_src_configure +} diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild index 0eceaac74e02..73f6863f9df9 100644 --- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild +++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit cmake-utils python-single-r1 @@ -11,11 +11,11 @@ HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor" if [[ ${PV} == 9999* ]]; then inherit git-r3 - #EGIT_REPO_URI="git://git.osmocom.org/${PN}.git" EGIT_REPO_URI="https://github.com/osmocom/${PN}.git" - EGIT_BRANCH="gr3.7-qt5" else - SRC_URI="mirror://gentoo/${P}.tar.xz" + COMMIT="defdd4aca6cd157ccc3b10ea16b5b4f552f34b96" + SRC_URI="https://github.com/osmocom/gr-fosphor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" KEYWORDS="~amd64 ~x86" fi @@ -23,7 +23,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" LICENSE="GPL-3+" SLOT="0" -IUSE="glfw qt5 wxwidgets" +IUSE="glfw qt5" RDEPEND="qt5? ( dev-qt/qtcore:5 @@ -31,9 +31,10 @@ RDEPEND="qt5? ( dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) - >=net-wireless/gnuradio-3.7_rc:0=[qt5,wxwidgets?,${PYTHON_SINGLE_USEDEP}] - media-libs/freetype dev-libs/boost:= + dev-libs/log4cpp + media-libs/freetype + =net-wireless/gnuradio-3.8*:0=[qt5,${PYTHON_SINGLE_USEDEP}] glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl @@ -57,7 +58,6 @@ src_configure() { -DENABLE_DEFAULT=OFF -DENABLE_GLFW="$(usex glfw)" -DENABLE_QT="$(usex qt5)" - -DENABLE_WX="$(usex wxwidgets)" -DENABLE_PYTHON=ON ) cmake-utils_src_configure diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest index a26ac123e118..40b68e00a617 100644 --- a/net-analyzer/graphite-web/Manifest +++ b/net-analyzer/graphite-web/Manifest @@ -1,5 +1,7 @@ -AUX graphite-web-1.1.3-fhs-paths.patch 2714 BLAKE2B 3c2e4a73e32626ba28ee1c3f5697e95f52e3cdcb88f137ff1e42581b9daf75521dd1d3d452e1be7157658914a50116b58b35c39551260be54b385bd50c0e1ef0 SHA512 1f3ca2def8e757a2f86acc58636fccda55ae81977d6b435e4cb44eecdbb613b1791eb286ca46b97a832ce80cce3bedd52dd8ba74a9566ce3b71b998b5e6ca438 AUX graphite-web-1.1.5-fhs-paths.patch 2712 BLAKE2B f3a05cd9a732ee69d52a62ac5164b3e8bdc5e1d29d3474167c2873f4322a882509f60908731a081f971c01681094f2b6a772a4fcf159ade85ac651f7b0d90c1c SHA512 b383da7aebf0c38b557ac07b0ba4ecd22c41bb9f3318a9f491b37f495a8d2ad5cd8d677076c15958d6326aa1a46574c01a8f5a9cd64fb77ac30fc4d630e8f532 +AUX graphite-web-1.1.7-fhs-paths.patch 2691 BLAKE2B fbb09dfef58d94ef7099e98134d46122c2a82ab3cb0af4bd0cb92102f0e924c3efe80f481f898c81358722f7ad312a1168310ebbbc731c18ab788e1a81cf04ce SHA512 1a8bd3f62163004993f676a039035880512bb1add5f0cc80193471f2cfa483277bd24dd36b3b2b5c6e8faa6d83a029e59c5ea8cb8b713c6d063fe212b921c6a8 DIST graphite-web-1.1.5.tar.gz 1173809 BLAKE2B 94a1b4deab3159d3bde2d3c8b6f9664f39942cb1b815ce042b196be3c0e769ee1acac4b619135e9471360849308b90e02e1df4f7d6b7d0ef31e46d38ee2425e5 SHA512 b2097609ca77a40e6e7d83a3141335e2208d69e7f4edbac8ce3505ed9dd654589836a3b3498bfb7f7585332bceeb8e367f0c10f3cf6afdb5ad6b96377338a7bb +DIST graphite-web-1.1.7.tar.gz 1173818 BLAKE2B e2373360897c1447d60cbf84e5d0dd280130730f617ba12cf0195ed2539f55bcfe8a1cb3b6b9e4f9540a6f08ecb7870072aa61447012baa5553878ebf417937f SHA512 eb0a1de35d3535bd1fdc4e6edc6fe50fd6c8789fef4807eb4cd30d6b20e91e09d21daedb80f55339a8c05325db8fe1038e7a461bf155e41555dee60160d5b241 EBUILD graphite-web-1.1.5-r1.ebuild 2966 BLAKE2B ad0ebbd4068438719af7d8df197d938cadf89b8b92b9927e467e47adea7a8dbb5a6289e9ec2770a9796ba4825cc5ef6b39576fe6a2f5920d1dda9e63d28fd024 SHA512 010668dae9fd625d8b31a6db6d64fd0d3f860d6f208ecb951440ac7406b1376937d492a3719b6bb4d6e1605f1e691752cd32ab82c846fd27c4cf4a596b217fd7 +EBUILD graphite-web-1.1.7.ebuild 3038 BLAKE2B 8afc7e4e19c8815dc74fae76e59bc08a0d7432149f97d192188f7d5d415bf342cd1ccbfa74e4fee36dfc739c0e791352aca3f96538a4009bf822ae517f0875b7 SHA512 6b37ec3bbd1c2287051435cf55af36c90825d4c3b62ab1b5d256a481886464c3ffac881cf7fd7f04c388875473bf5d724e376aa552de1f2bdd9f77cb2b179cad MISC metadata.xml 592 BLAKE2B 1c284eea68c1db410d55439c14dbf245651157c8f3cb2c77357e50ad8d4426e1c2faf8bd767095f49e9a711e84bbe8b5223aa26529d6dd9cd8dd08c3d8c7c75a SHA512 e9be9344db6989ed9d1d649fff05c4d05c72528097c6d921b5d0d31f9be65d1cfb02071356101f46ffddfa5b7a91785995ad59e15ba0fd78b75d785959051a98 diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch b/net-analyzer/graphite-web/files/graphite-web-1.1.7-fhs-paths.patch index aa6ea74ff93f..6550f083039e 100644 --- a/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch +++ b/net-analyzer/graphite-web/files/graphite-web-1.1.7-fhs-paths.patch @@ -10,17 +10,17 @@ Install FHS-style paths from graphite.wsgi import application --- a/setup.py +++ b/setup.py -@@ -59,8 +59,8 @@ +@@ -115,8 +115,8 @@ ], package_data={'graphite' : ['templates/*', 'local_settings.py.example']}, - scripts=glob('bin/*'), -+ scripts=['bin/graphite-web-build-index'], - data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples, ++ scripts=['bin/graphite-web-build-index'], + data_files=list(webapp_content.items()), - install_requires=['Django>=1.8,<1.11.99', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], + install_requires=['Django>=1.8,<3.1', 'django-tagging==0.4.3', 'pytz', + 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], classifiers=[ - 'Intended Audience :: Developers', --- a/webapp/graphite/local_settings.py.example +++ b/webapp/graphite/local_settings.py.example @@ -101,6 +101,7 @@ diff --git a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild new file mode 100644 index 000000000000..74a4e43dac93 --- /dev/null +++ b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7} ) # 3.8 dropped due to dep on python-memcached + # 1.1.7 supports up to 3.9, so it's a matter of deps + +inherit distutils-r1 prefix + +DESCRIPTION="Enterprise scalable realtime graphing" +HOMEPAGE="https://graphiteapp.org/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+carbon ldap mysql memcached postgres +sqlite" + +DEPEND="" +RDEPEND=" + carbon? ( dev-python/carbon[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] ) + mysql? ( dev-python/mysqlclient[${PYTHON_USEDEP}] ) + postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + >=dev-python/django-1.11.19[sqlite?,${PYTHON_USEDEP}] + >=dev-python/django-tagging-0.4.6[${PYTHON_USEDEP}] + dev-python/cairocffi[${PYTHON_USEDEP}] + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/urllib3[${PYTHON_USEDEP}] + media-libs/fontconfig +" + +PATCHES=( + # Do not install the configuration and data files. We install them + # somewhere sensible by hand. + "${FILESDIR}"/${PN}-1.1.7-fhs-paths.patch +) + +python_prepare_all() { + # Use a less common name + mv bin/build-index bin/${PN}-build-index || die + # use FHS-style paths + export GRAPHITE_NO_PREFIX=yes + distutils-r1_python_prepare_all + eprefixify \ + conf/graphite.wsgi.example \ + webapp/graphite/local_settings.py.example +} + +python_install_all() { + distutils-r1_python_install_all + keepdir /var/{lib,log}/${PN} + docinto examples + docompress -x "/usr/share/doc/${PF}/examples" + dodoc \ + examples/example-graphite-vhost.conf \ + conf/dashboard.conf.example \ + conf/graphite.wsgi.example +} + +python_install() { + distutils-r1_python_install \ + --install-data="${EPREFIX}"/usr/share/${PN} + + insinto /etc/${PN} + newins webapp/graphite/local_settings.py.example local_settings.py + pushd "${D}/$(python_get_sitedir)"/graphite > /dev/null || die + ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py || die + popd > /dev/null || die + + python_optimize +} + +pkg_config() { + "${EROOT}"/usr/bin/django-admin.py migrate \ + --settings=graphite.settings --run-syncdb + "${EROOT}"/usr/bin/${PN}-build-index +} + +pkg_postinst() { + # Only display this for new installs + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "You need to configure ${PN} to run with a WSGI server of your choice." + elog "For example using Apache, you can use www-apache/mod_wsgi," + elog " using Nginx, you can use www-servers/uwsgi." + elog "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}" + elog "See https://graphite.readthedocs.org/en/latest/config-local-settings.html" + elog "Run emerge --config =${PN}-${PVR} if this is a fresh install." + elog "" + elog "If you want to update the search index regularily, you should consider running" + elog "the '${PN}-build-index' script in a crontab." + fi +} diff --git a/net-analyzer/gvm-tools/Manifest b/net-analyzer/gvm-tools/Manifest index fc69fd42384d..93d41e847dc6 100644 --- a/net-analyzer/gvm-tools/Manifest +++ b/net-analyzer/gvm-tools/Manifest @@ -1,3 +1,3 @@ DIST gvm-tools-2.0.0.tar.gz 114592 BLAKE2B 73532138f4153ce625e68d4feb477bea4504be910266d6dac113caff1da096bc6072649ddc456b3348e1aba79c9b7e147ba019a70e4163267c474850019a076e SHA512 0adf7e06b1208c91fbc02dab42593280c95f6572e27d96d6f8777d710747a9e427c79678d9aef785b7ecd6d4fd30e79a1c063fe4256025ac0616c1d242f45025 -EBUILD gvm-tools-2.0.0.ebuild 1046 BLAKE2B 0d4a4ebca110f60f6d9e7bbb0da7f85d0ca6cfdc19d2c285bf011079154f8171d549252b44779a1149c5cb47b3a3965df8fdc74c89e2c292d7e2767dba63e416 SHA512 a51843b3b89d9caa0c5ef91286a7ed73a3d197a6ea31b7ffb87d45b4a70a72a3b57f706cac679ff6d616306cdeafaca3e11c757f6da9b83cdf5d5d85662525e1 +EBUILD gvm-tools-2.0.0-r1.ebuild 1205 BLAKE2B 4716e02e956dea577f1071ce9c41ea0eced59168f7f3e9db4592f9c03b6789029280ad83eae2d0f4af04da6374d18bea496f027a06e30e5dec8452da298d9d53 SHA512 38c0ffe0852d339fdf8ac0f3140341610e434c43b76490a8356569dedb6ca0d4cc5e937d10b32e5ebb83dce4259195b3092145c033a0d9c210ea317900c778a5 MISC metadata.xml 871 BLAKE2B 65fdc24c170ca52b75a45f89d0f56447f83ce23f8860af2c87d3bf02178fe637e49fc94005f4383a576728514d78f59f6a62fc9a893b18dfe3bf9ef696738ade SHA512 66e5e2b493223a23276ed57c7685f8a151b4fdd4dfb4854d283c0f82a5b923bcbc2688bb1b9701e7934658a6ecdd0d9e036993f4f18aa5d160b330aec2bb72a5 diff --git a/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild b/net-analyzer/gvm-tools/gvm-tools-2.0.0-r1.ebuild index ba3a4b6f72fd..d7688b807664 100644 --- a/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild +++ b/net-analyzer/gvm-tools/gvm-tools-2.0.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7,8} ) DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 @@ -17,20 +17,24 @@ KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND=" - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/pythondialog:0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] + net-analyzer/python-gvm[${PYTHON_USEDEP}] !net-analyzer/openvas-cli !net-analyzer/openvas-tools" DEPEND=" ${RDEPEND}" +distutils_enable_tests unittest + src_prepare() { - distutils-r1_python_prepare_all + distutils-r1_src_prepare # Exlude tests & correct FHS/Gentoo policy paths - sed -i "s/packages=find_packages(),.*/packages=find_packages(exclude=['tests*', 'docs']),/" "$S"/setup.py || die - sed -i -e "s*''*'/usr/share/doc/${P}'*g" "$S"/setup.py || die + sed -i "s/packages=find_packages(),.*/packages=find_packages(exclude=['tests*', 'docs']),/" setup.py || die + sed -i -e "s*''*'/usr/share/doc/${P}'*g" setup.py || die + + # Fixing tests + # Use correct socket path + sed -i "s/\/usr\/local\/var\/run\/gvmd.sock/\/var\/run\/gvmd.sock/g" tests/test_parser.py || die + # ignore help formating + sed -i "s/class HelpFormatting/@unittest.skip('ignoring help formatting')\nclass HelpFormatting/g" tests/test_parser.py || die } diff --git a/net-analyzer/iptraf-ng/Manifest b/net-analyzer/iptraf-ng/Manifest index f24aad22d716..2878ef58a12b 100644 --- a/net-analyzer/iptraf-ng/Manifest +++ b/net-analyzer/iptraf-ng/Manifest @@ -3,8 +3,10 @@ AUX iptraf-ng-1.1.4-sprintf-format.patch 551 BLAKE2B 93a83234723924f80fa267b7bd2 AUX iptraf-ng-1.1.4-tcplog_flowrate_msg.patch 330 BLAKE2B edf2d08df81fb65c1f05bffd28bec622e008baa532353e90c5f275f10333dbbe1b67d9e2b801bbb424ea56628808b0f0a6f06fda6ee682deed42c71c9387a3ab SHA512 4b0c318ad245a82bb44243e23322f3d71ef4af9b4c86c95911e4da1e8145418ac7b9ee76c7d33bdf05c1189ec782443382de773e228c76f179fab87d5e897ec6 DIST iptraf-ng-1.1.4-github.tar.gz 556843 BLAKE2B 6f4e2bd8c4cf271d90732810f0ba6ab146b3471b723e657c180cf95ce8e1361d18c6803d5da56e872b0e49234956304fe1ff5532fde1332bc30a51a77ef8bdc0 SHA512 675165e08f979daf70fdbd0bd7ae24803860a182f3f1f6e6905f79f65b283470eedcc7e2f8608006c92af258cfad49c0b571652d843107cc79ad8eda63d4e5cb DIST iptraf-ng-1.1.4.tar.gz 583306 BLAKE2B c06fdc25838901fc5528057ade5ebe28b5679a6a545f461cef2a5f4d3cbc1346a7ab3e94f4fe317a1760067e480c3c622df1027591d978b0ac1236ba9203e9da SHA512 8cafb0000cec75eb4071156a9e9350ffe6de99cb6386e8f50d05337113872ee50082a30009d85faa02d83633a8e727039791332d600654321b95ca6cfc881774 +DIST iptraf-ng-1.2.0.tar.gz 324969 BLAKE2B 45a67fc64b5ab518339e55adfc158c8cf10eacded15941545d8d7cee19c954aae2619c39a11b1eeaa79f5a381b5dcf2e6a6e0b8fdd7e78e75f41ab10b71e6a0a SHA512 6dc3b5deb7c6fb3776ce696492975db43c13fa2d1d956712e7738ef34ac1bfc5f5d63a5211ba8e9fabf391e8bc5560c08c5d5e219b0cfe067e3499b2c02e6f3d EBUILD iptraf-ng-1.1.4-r1.ebuild 1325 BLAKE2B d27a62d5195b922cb586cf4fa65b6e5af4f4deb81ac4b854c0eebead7b6cda8a2e9a21fc94e184f6a2e02aec33a28964aebaca1620fa4f17b5a56d9d0a276a1b SHA512 62c3d031eeb0629adec93ef8347f8ae252633092a0ed372806304979e450ac7ed3513873d598795a98c564b6d847e698f3c0e7808adc3f253791f21b49e6ccf7 EBUILD iptraf-ng-1.1.4-r2.ebuild 1427 BLAKE2B 27461cb4a2b174032d5037ad83e9d11543a2a5dc6f92c58387af31b200a7f9e020e4df208bc4bdecfa44d10c0073a570b02ac35adbcdf75f5dfbbaaf1a436f4d SHA512 c2c05f847e354cd072c08966b7b8028de98646c0c2e6827220dd2514ddae6a471535c47f5ba5033c3e37f61b1524038dd542a746436a21c5bf1b1c47bacb84db EBUILD iptraf-ng-1.1.4-r3.ebuild 1448 BLAKE2B d293142f201e9d8176c60e3f7df01018cf2da03a37a064c4a99d1cdd68d1972ed6ba6a3f688565e52ce142b531b4bed5d3c4071955d670d48cc96b143cc7c4da SHA512 c7831c5963e73ac4ff68dec2e870f5a1f9948ff97af688bd41aafff079b1b215e2d7e3d28acf85d5984b06cc622cfccba48f179b98ad3291e6d269c0c867c0cc -EBUILD iptraf-ng-9999.ebuild 1211 BLAKE2B de919ac3801e2b9b526f0c7064b5f5eb6ecaeab908b063e550060b93961dbb7b7bd9fc8cd2519c56bbad174d169ec2028c87b000f42c192c1046da6e0d4ba512 SHA512 68ab03abef69a33d4dd9e1349ec95e7ff0c932d116226f1fad114f805f05e58257d3616623b52da59b69836e6a03a3c4fb028e5b8308250d7507c675f78341fd +EBUILD iptraf-ng-1.2.0-r1.ebuild 1222 BLAKE2B bb684c951569993138a987ef80cbd561d3054f33eec02dfb3144a2fc57b0f69d2091074e53f2ca2d44823ef6b51b0106ab207050234a4267bb5f035a79376c69 SHA512 69c3a436210c8d9cef2acdc7e7b6c9d361c98a8cdef4218b8f8013bf00387397b67e7c8587ad11fcbabb45ccfa28864b67ba4ae9a6aa2485e69cc73230216be5 +EBUILD iptraf-ng-9999.ebuild 1150 BLAKE2B 5b02da16a8fbff3bb5ef09536a69094088a7e4a1793f83272169cd9c91d8884647d643154cad17b267c1433a7e98735d7267e76e703a2bad0f49e2bba8c6bb24 SHA512 a8b3ff516d68e0dfa95c763f478dfcc66f556d93a814ee97362e54cafbb0465600459939a8d8cba58b7ffe35fd6de65b4455521867c7219ff8d0618bc9bbaf51 MISC metadata.xml 376 BLAKE2B e5dd4ba7396c36e80ee1eed3eda4444bdd914e4701dd5acb0780b51a2e0e37020982bf624e1e8ecb81b5ba9af20f199885b52c03329d8238e43ca16c468a1900 SHA512 440bbe472188ac3acd7f0dcdddf8390e690a8f81cda49d6be5bed8a46cdf1fb10416f4313d426c408bd9f88501312af812badc765a24e76927b5ecfc64e7c225 diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.2.0-r1.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.2.0-r1.ebuild new file mode 100644 index 000000000000..bda05a1a02a4 --- /dev/null +++ b/net-analyzer/iptraf-ng/iptraf-ng-1.2.0-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="A console-based network monitoring utility" +HOMEPAGE="https://github.com/iptraf-ng/iptraf-ng" +SRC_URI="https://github.com/iptraf-ng/iptraf-ng/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2 doc? ( FDL-1.1 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="doc" + +RDEPEND=" + >=sys-libs/ncurses-5.7-r7:0= +" +DEPEND=" + ${RDEPEND} + virtual/os-headers + !net-analyzer/iptraf +" +RESTRICT="test" + +src_prepare() { + sed -i \ + -e '/^CC =/d' \ + -e '/^CFLAGS/s:= -g -O2:+= :' \ + -e '/^LDFLAGS =/d' \ + -e 's|$(QUIET_[[:alpha:]]*)||g' \ + Makefile || die + sed -i \ + -e 's|IPTRAF|&-NG|g' \ + -e 's|IPTraf|&-NG|g' \ + -e 's|iptraf|&-ng|g' \ + src/*.8 || die + + default +} + +src_configure() { + # The configure script does not do very much we do not already control + append-cppflags '-DLOCKDIR=\"/run/lock/iptraf-ng\"' + tc-export CC +} + +src_install() { + dosbin ${PN} + + doman src/*.8 + dodoc AUTHORS CHANGES* FAQ README* + + if use doc; then + docinto html + dodoc -r Documentation/* + fi + + keepdir /var/{lib,log}/iptraf-ng #376157 +} diff --git a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild index 4c2ce0db62b9..486e56efca50 100644 --- a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild +++ b/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,6 +7,7 @@ inherit flag-o-matic git-r3 toolchain-funcs DESCRIPTION="A console-based network monitoring utility" HOMEPAGE="https://github.com/iptraf-ng/iptraf-ng" EGIT_REPO_URI="https://github.com/iptraf-ng/iptraf-ng" +EGIT_BRANCH="dev" LICENSE="GPL-2 doc? ( FDL-1.1 )" SLOT="0" @@ -34,8 +35,6 @@ src_prepare() { -e 's|IPTRAF|&-NG|g' \ -e 's|IPTraf|&-NG|g' \ -e 's|iptraf|&-ng|g' \ - -e 's|rvnamed|&-ng|g' \ - -e 's|RVNAMED|&-NG|g' \ src/*.8 || die default @@ -48,10 +47,10 @@ src_configure() { } src_install() { - dosbin {iptraf,rvnamed}-ng + dosbin ${PN} doman src/*.8 - dodoc AUTHORS CHANGES FAQ README* RELEASE-NOTES + dodoc AUTHORS CHANGES* FAQ README* if use doc; then docinto html diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest index 02b28eb6a344..59d1ddaa0b7a 100644 --- a/net-analyzer/munin/Manifest +++ b/net-analyzer/munin/Manifest @@ -23,7 +23,7 @@ DIST munin-2.0.63-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051 DIST munin-2.0.63.tar.gz 2254548 BLAKE2B 5e0aa63222706a1e23bcb2af98437ee8cc3f09cdf833a6546ea40cf7307728518d5d696bd500105f85139753bc17a26dddfb202a661d35a7046ffc55b5b9ef02 SHA512 c28d2bedda8abb8787e1ba40ec80961d1304c903e9e608e30ed7903210169f258f9c062fc97d89932ddd7aabefa4360495d19535520741911c489c9c3c2e76fe EBUILD munin-2.0.52.ebuild 12389 BLAKE2B 4e1046e310948f97ed2469cb58f67c4c7cc6b66ef2fc401a409f2069c2c3b717a1b76d5b9f51add689c00e7daa6a555e927b98f9290ee7e24aac81202f17c557 SHA512 3f1edf0c2c9a35f17794003e143fbde255f60527e0f595a40233b63c1cfaf3bb00416902f6f45941c597987eb292d6b507cc8eb3720d2a17793607f9099ed823 EBUILD munin-2.0.56.ebuild 12254 BLAKE2B 925fe7a93c3130d665afa4aa9c874bbf34b22e29fea84fbb6a5f518facd256cb79bf1e2b20ffa5f086d1a8715328a3f34482e1e08f7ded2fa924a976b20cd93f SHA512 5fdc2357b5a48815f7de08d46def379bc5d263b68f1f88ecd5756d095299a53fc8996dce41350fd4281bba434c85c090bfbd965edc1ca46ce5f051d47eeb7c46 -EBUILD munin-2.0.59.ebuild 12270 BLAKE2B 88ca95c980e9e487b32fe6050cb62fb651efa1b576db5a94d6bd1b5a5ffb53a59b9c2dc0f13b483de4529487622e488efe67fc60b4deef22fdf1f047d5c49194 SHA512 f8c17a89d5e1d26b68bbd9ee5bb50fa5b150341044c38baa6e7e875512b66c59981df7ec701feb12880d0339f304e396e84548dc2b7518d1ee51a844a101f8c4 +EBUILD munin-2.0.59.ebuild 12269 BLAKE2B 87c730135b056d65c2f0da98dd1c9bb9d348aa1dc14663b024c2fe8cc64e83b386dfa7e40db9198375c73daf05ecb6b6490626159c3a0b3b324039064288cf06 SHA512 9761e7f5358b82419e0537d03a6f745f2bb730715a9aa181a149f662ea010a159b237ccf1f7dc4af4caadc9aeb8e857c7d71bfa15633f170c953fad400cd4d72 EBUILD munin-2.0.61.ebuild 12270 BLAKE2B 88ca95c980e9e487b32fe6050cb62fb651efa1b576db5a94d6bd1b5a5ffb53a59b9c2dc0f13b483de4529487622e488efe67fc60b4deef22fdf1f047d5c49194 SHA512 f8c17a89d5e1d26b68bbd9ee5bb50fa5b150341044c38baa6e7e875512b66c59981df7ec701feb12880d0339f304e396e84548dc2b7518d1ee51a844a101f8c4 EBUILD munin-2.0.63.ebuild 12270 BLAKE2B 88ca95c980e9e487b32fe6050cb62fb651efa1b576db5a94d6bd1b5a5ffb53a59b9c2dc0f13b483de4529487622e488efe67fc60b4deef22fdf1f047d5c49194 SHA512 f8c17a89d5e1d26b68bbd9ee5bb50fa5b150341044c38baa6e7e875512b66c59981df7ec701feb12880d0339f304e396e84548dc2b7518d1ee51a844a101f8c4 MISC metadata.xml 3920 BLAKE2B cb28e1a3e95ffcc305975d7edc26a5cf852a2a29f8c56376c9bbc90fd2b2850bfeb614d750e7700870aa0c10c8dcfcd2b845c210a5518f591ccfbb7571971cda SHA512 9d12c61750f5ee42cfcb6672facf3b46a024872d918c7acb26631c1b9bab29802a6ac9f4d895b9f4ef18a6f283ad64d4bd6e313df0489a6ed82185c660c42083 diff --git a/net-analyzer/munin/munin-2.0.59.ebuild b/net-analyzer/munin/munin-2.0.59.ebuild index acaf9f6d9f0c..c395d69c9ece 100644 --- a/net-analyzer/munin/munin-2.0.59.ebuild +++ b/net-analyzer/munin/munin-2.0.59.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +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 )" diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index c2a47de814e2..bbc378ce9c0e 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -1,10 +1,6 @@ AUX 99_nagios4-r1.conf 309 BLAKE2B c539330d9f100045fc02d13061dd3b8e958370c8885ef8d28c38ee380b2043d86c9b0097c158dbc5d486f1c53e22ef6f52a96286d0c50d1d47d9eb025fb6b8a9 SHA512 cb93d6af5b6f43b172cec276f669ef786268c1ba51ffda994733c98a8ad5f625229aecaed68b5cb433a66257a8eb66ec16f9569aa87b6dcecf21d8339bd5fb8f -AUX 99_nagios4.conf 368 BLAKE2B 147f4b73bd2f7d71dabb56f646399b939d3a87c288efed9b135e9401120e81c27e2a05f96982b62e601d1dd9b21be494e866103467a363336234b8b15095daf1 SHA512 f0b239f23d74afa89483806f27fb9259054e46bc5742de8a414c9a9a9852a4fbdc14db45aeb148a15288196c8f7d51bdd485b005e20d012892e9e7321b50e161 AUX lighttpd_nagios4-r1.conf 297 BLAKE2B 8976123407c47be6023c5dae57c833f7e0b43ae2c70348dcd72b754453b5a84dd335daa222b4b75e5c19b3d5c18b64496739bdb61b8f2f67f5655b80a0ffb65f SHA512 2ef5268e9ba228d12e3dabb5a23ce73e49b7149a047acd4a2daac3cd3415b5233aaaf3b972c85780e71bd5fe3eefb6755a6222b40a509104fb318e219366867f -AUX lighttpd_nagios4.conf 325 BLAKE2B f89b9d5aed8305d54f76adf29c65ba20bee74b6c82d149c8b0a786dddacc58c62337072691136c486d4050d1e3bce82420398d5f525ebc0bb36eefdf3a6a2e7f SHA512 a2f854713512ee8ee5c451235beb6ffccf2e04617a98619c6de807a5abca0a424e0581c34b4d255dcbc108e677e18bed25dd33e3d38df8fe10d7d8d4fab015c9 -DIST nagios-4.4.5.tar.gz 11304463 BLAKE2B e1152c2cd14aa790fbdb84c0d7b3eb4691b05793640bf2871bc4ab1e2d645bb52bb2d1660b7389fb26d599d015f71820988ed1cd58003ed978dd9df38c357675 SHA512 14372e2e4470229bd000a8ad94def6ae504ce3f8e2cf94a9da73736560d1e3b2633302fe232ee7099d88ba00aecde5a9e352901828d6d9a9cd1fdce203deca30 DIST nagios-4.4.6.tar.gz 11333414 BLAKE2B b64d34c9267349582cb43500b7b90f7948152b5fd9b28ecb0a376d0255ec9774e693beba9205512294b07dddc4702f37d0f45b3c3fcc6abbf8e8b4d9236d0ace SHA512 6ceb582816ec741439963bde1fe8d85fa3bc4ed3c2238fb818db0c4f4224a4333d153040c11a7f4d783e919c11f9ff45907bdc478504e4155f64a4c575f80550 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766 -EBUILD nagios-core-4.4.5-r6.ebuild 8039 BLAKE2B b6437d73d0f50cd73e48cb184ea734e9389793bd3479ab73560ab60325fba6b936bd072a2aad1ae6eec26429270796e19b91ec0f5a9d08038dad6c14b39793f3 SHA512 0fb7d3be03aa30692542715c6d5e3a61f5fd65ef806f90241a3855205a10b5a32839086825b80610a7ae77101cf270ef73d623951e638f69fadc72c8c3039896 -EBUILD nagios-core-4.4.6.ebuild 8504 BLAKE2B 5b206a9280b010c277c8c3350ef375a69586e132ae4ab84b42cac098ac2235f31576f3c30e86137e2289b1d7e02ddc6390b22ad1188b3ad018ca0aeaaa60b8f4 SHA512 e6ae6f086f7279af0966de46be1c7a13f915bd401ab1b283265e961d6f9bc718e8ea505b8bdd5184b5ddc75a88547b6fd485e5c96fab2181fe3901fbea217a68 +EBUILD nagios-core-4.4.6.ebuild 8499 BLAKE2B 7820eb32090960de3012dde55abcdc4869a250edbcd11a7a532877a1764aee58712b7b4b2d253aa3a8092ad17471b82649dc1c3201bf2d50648c346fc975f918 SHA512 87de36179bcb17d1b1835cb4f1d57f3be33c7bb65b718a512621474ab8db70a0f41a853c32c17044e9522e9657b6b1043613579fac7eed11d7a930fbacc8207d MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b diff --git a/net-analyzer/nagios-core/files/99_nagios4.conf b/net-analyzer/nagios-core/files/99_nagios4.conf deleted file mode 100644 index b04c2980ebab..000000000000 --- a/net-analyzer/nagios-core/files/99_nagios4.conf +++ /dev/null @@ -1,16 +0,0 @@ -<IfDefine NAGIOS> - - ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/ - <Directory "/usr/lib/nagios/cgi-bin/"> - AllowOverride AuthConfig - Options ExecCGI - Require all granted - </Directory> - - Alias /nagios /usr/share/nagios/htdocs - <Directory "/usr/share/nagios/htdocs"> - AllowOverride AuthConfig - Require all granted - </Directory> - -</IfDefine> diff --git a/net-analyzer/nagios-core/files/lighttpd_nagios4.conf b/net-analyzer/nagios-core/files/lighttpd_nagios4.conf deleted file mode 100644 index a073f177f238..000000000000 --- a/net-analyzer/nagios-core/files/lighttpd_nagios4.conf +++ /dev/null @@ -1,15 +0,0 @@ -server.modules += ("mod_cgi") -server.modules += ("mod_alias") - -$HTTP["url"] =~ "^/nagios/cgi-bin/" { - dir-listing.activate = "disable" - cgi.assign = ( - ".pl" => "/usr/bin/perl", - ".cgi" => "" - ) -} - -alias.url += ( - "/nagios/cgi-bin" => "/usr/lib/nagios/cgi-bin", - "/nagios" => "/usr/share/nagios/htdocs" -) diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild deleted file mode 100644 index b8bec80a3e07..000000000000 --- a/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -MY_P=${PN/-core}-${PV} -DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation" -HOMEPAGE="https://www.nagios.org/" - -# The name of the directory into which our Gentoo icons will be -# extracted, and also the basename of the archive containing it. -GENTOO_ICONS="${PN}-gentoo-icons-20141125" -SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz - web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86" -IUSE="apache2 classicui lighttpd perl +web vim-syntax" - -# In pkg_postinst(), we change the group of the Nagios configuration -# directory to that of the web server user. It can't belong to both -# apache/lighttpd groups at the same time, so we block this combination -# for our own sanity. -# -# This could be made to work, but we would need a better way to allow -# the web user read-only access to Nagios's configuration directory. -# -REQUIRED_USE="apache2? ( !lighttpd )" - -# -# Note, we require one of the apache2 CGI modules: -# -# * mod_cgi -# * mod_cgid -# * mod_fcgid -# -# We just don't care /which/ one. And of course PHP supports both CGI -# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the -# dependencies, and expect the user not to do anything /too/ -# stupid. (For example, installing Apache with only FastCGI support, and -# PHP with only CGI support.) -# -# Another annoyance is that the upstream Makefile uses app-arch/unzip to -# extract a snapshot of AngularJS, but that's only needed when USE=web. -# -MOD_ALIAS=apache2_modules_alias -DEPEND="acct-group/nagios - acct-user/nagios - dev-libs/libltdl:0 - virtual/mailx - perl? ( dev-lang/perl:= ) - web? ( - app-arch/unzip - media-libs/gd[jpeg,png] - lighttpd? ( www-servers/lighttpd[php] ) - apache2? ( - || ( - >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi] - >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid] - >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] ) - || ( - dev-lang/php:*[apache2] - dev-lang/php:*[cgi] - dev-lang/php:*[fpm] ) - ) - )" -RDEPEND="${DEPEND} - vim-syntax? ( app-vim/nagios-syntax )" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local myconf - - if use perl; then - myconf="${myconf} --enable-embedded-perl --with-perlcache" - fi - - if use !apache2 && use !lighttpd ; then - myconf="${myconf} --with-command-group=nagios" - else - if use apache2 ; then - myconf="${myconf} --with-command-group=apache" - myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d" - elif use lighttpd ; then - myconf="${myconf} --with-command-group=lighttpd" - fi - fi - - econf ${myconf} \ - --prefix="${EPREFIX}/usr" \ - --bindir="${EPREFIX}/usr/sbin" \ - --localstatedir="${EPREFIX}/var/lib/nagios" \ - --sysconfdir="${EPREFIX}/etc/nagios" \ - --libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" \ - --with-cgibindir="${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin" \ - --with-webdir="${EPREFIX}/usr/share/nagios/htdocs" - - # The paths in the web server configuration files need to match - # those passed to econf above. - cp "${FILESDIR}/99_nagios4-r1.conf" \ - "${FILESDIR}/lighttpd_nagios4-r1.conf" \ - "${T}/" || die "failed to create copies of web server conf files" - - sed -e "s|@CGIBINDIR@|${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin|g" \ - -e "s|@WEBDIR@|${EPREFIX}/usr/share/nagios/htdocs|" \ - -i "${T}/99_nagios4-r1.conf" \ - -i "${T}/lighttpd_nagios4-r1.conf" \ - || die "failed to substitute paths into web server conf files" - -} - -src_compile() { - emake CC=$(tc-getCC) nagios - - if use web; then - # Only compile the CGIs/HTML when USE=web is set. - emake CC=$(tc-getCC) DESTDIR="${D}" cgis html - fi -} - -src_install() { - dodoc Changelog CONTRIBUTING.md README.md THANKS UPGRADING - - # There is no way to install the CGIs unstripped from the top-level - # makefile, so descend into base/ here. The empty INSTALL_OPTS - # ensures that root:root: owns the nagios executables. - cd "${S}/base" || die - emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped - cd "${S}" || die - - # Otherwise this gets installed as 770 and you get "access denied" - # for some reason or other when starting nagios. The permissions - # on nagiostats are just for consistency (these should both get - # fixed upstream). - fperms 775 /usr/sbin/nagios /usr/sbin/nagiostats - - # INSTALL_OPTS are needed for most of install-basic, but we don't - # want them on the LIBEXECDIR, argh. - emake DESTDIR="${D}" install-basic - fowners root:root /usr/$(get_libdir)/nagios/plugins - - # Don't make the configuration owned by the nagios user, because - # then he can edit nagios.cfg and trick nagios into running as root - # and doing his bidding. - emake INSTALL_OPTS="" DESTDIR="${D}" install-config - - # No INSTALL_OPTS used in install-commandmode, thankfully. - emake DESTDIR="${D}" install-commandmode - - # The build system installs these directories, but portage assumes - # that the build system doesn't know what it's doing so we have to - # keepdir them, too. I guess you'll have to manually re-check the - # upstream build system forever to see if this is still necessary. - keepdir /var/lib/nagios{,/archives,/rw,/spool,/spool/checkresults} - - if use web; then - # There is no way to install the CGIs unstripped from the - # top-level makefile, so descend into cgi/ here. The empty - # INSTALL_OPTS ensures that root:root: owns the CGI executables. - cd "${S}/cgi" || die - emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped - cd "${S}" || die - - # install-html installs the new exfoliation theme - emake INSTALL_OPTS="" DESTDIR="${D}" install-html - - if use classicui; then - # This overwrites the already-installed exfoliation theme - emake INSTALL_OPTS="" DESTDIR="${D}" install-classicui - fi - - # Install cute Gentoo icons (bug #388323), setting their - # owner, group, and mode to match those of the rest of Nagios's - # images. - insinto /usr/share/nagios/htdocs/images/logos - doins "${WORKDIR}/${GENTOO_ICONS}"/*.* - fi - - newinitd startup/openrc-init nagios - - if use web ; then - if use apache2 ; then - # Install the Nagios configuration file for Apache. - insinto "/etc/apache2/modules.d" - newins "${T}/99_nagios4-r1.conf" "99_nagios4.conf" - elif use lighttpd ; then - # Install the Nagios configuration file for Lighttpd. - insinto /etc/lighttpd - newins "${T}/lighttpd_nagios4-r1.conf" nagios.conf - else - ewarn "${CATEGORY}/${PF} only supports apache or lighttpd" - ewarn "out of the box. Since you are not using one of them, you" - ewarn "will have to configure your webserver yourself." - fi - fi -} - -pkg_postinst() { - - if use web; then - if use apache2 || use lighttpd ; then - if use apache2; then - elog "To enable the Nagios web front-end, please edit" - elog "${ROOT}etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\"" - elog "to APACHE2_OPTS. Then Nagios will be available at," - elog - elif use lighttpd; then - elog "To enable the Nagios web front-end, please add" - elog "'include \"nagios.conf\"' to the lighttpd configuration" - elog "file at ${ROOT}etc/lighttpd/lighttpd.conf. Then Nagios" - elog "will be available at," - elog - fi - - elog " http://localhost/nagios/" - fi - fi - - elog - elog "If your kernel has /proc protection, nagios" - elog "will not be happy as it relies on accessing the proc" - elog "filesystem. You can fix this by adding nagios into" - elog "the group wheel, but this is not recomended." - elog - - if [ -n "${REPLACING_VERSIONS}" ]; then - ewarn "The local state directory for nagios has changed in v4.4.5," - ewarn "from ${EROOT}var/nagios to ${EROOT}var/lib/nagios. If you" - ewarn "wish to migrate your state to the new location, first stop" - ewarn "nagios and then run" - ewarn "" - ewarn " diff --recursive --brief ${EROOT}var/nagios ${EROOT}var/lib/nagios" - ewarn "" - ewarn "to identify any files that should be moved to the new" - ewarn "location. They can simply be moved with \"mv\" before" - ewarn "restarting nagios." - fi -} diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild index e6228fde4033..e0fac4bf5ebd 100644 --- a/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild +++ b/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86" IUSE="apache2 classicui lighttpd perl +web vim-syntax" # In pkg_postinst(), we change the group of the Nagios configuration diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest index d48e96de0a8a..8c07f116bab4 100644 --- a/net-analyzer/nagios/Manifest +++ b/net-analyzer/nagios/Manifest @@ -1,3 +1,2 @@ -EBUILD nagios-4.4.5.ebuild 392 BLAKE2B 33882a460ec2320a9c265e8f7f9179c8304c1a05494978f44aab114be5560d74dd6c4be9f19930292096d6b6990bce6fb4a51526af779a2cb18e2cfb7abf4cca SHA512 6bdf8ea67f8dfc495cb394a7b598fc1709ba6b7479a5af9807bf4060ce82e872cdf22949fdad176e1729c2d2a99927233aba365e3eccb6419f3ba18eef122dd0 -EBUILD nagios-4.4.6.ebuild 397 BLAKE2B 706d8a1f8833cc9f1596d2e1cabee25595acf50577b3ff5626b52132676fb81986ef7660f0e6a37df6660eb50da00c9791804356967ed96d118c4e7178a0aad5 SHA512 e705f6fc813064a107f562c75d1e9d4a55dad3aaea4c6f6ef4ce15626205965518dbd3e8b4056127104d97c9462e5dc4f790cf3eb02b9b1f37a393a55df9303e +EBUILD nagios-4.4.6.ebuild 392 BLAKE2B b5c22bd69450ff0b872c63c613b0281de4ab1f6671905883c295efa4d8e197284dcb05ab67f7b12c838f51319213635f58b9179d8e2e81b6a30d604d7236b3c5 SHA512 6ec6c964b6b0d7fbbbd55f3296bb1312763af01ade0e1ca7d3b473e84ec74b275b3d05bf6c2ded9b50a75a95ba8b0eace242eb259b744fe1be85a88d809b7c29 MISC metadata.xml 1110 BLAKE2B a3577be74f7ae7da47c1add86da6b9cd2972ebea1e4e4241886027e7c4aecb936ffa776a32bcc0b77498c393ebb4c81aa9a98a3c8d45cbd5556f8b9014384e52 SHA512 7614b25879899b4939a136de6cd4cbd3995372747e95d2d6b90ccd8e074800b6acb738df5f9c852625c34f5a72c3072c0dec910266068ec8a72184f75aa204e1 diff --git a/net-analyzer/nagios/nagios-4.4.5.ebuild b/net-analyzer/nagios/nagios-4.4.5.ebuild deleted file mode 100644 index b58844b4739e..000000000000 --- a/net-analyzer/nagios/nagios-4.4.5.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="The Nagios metapackage" -HOMEPAGE="https://www.nagios.org/" - -LICENSE="metapackage" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86" -IUSE="" - -RDEPEND="~net-analyzer/nagios-core-${PV} - || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )" diff --git a/net-analyzer/nagios/nagios-4.4.6.ebuild b/net-analyzer/nagios/nagios-4.4.6.ebuild index 8e497876ab38..dfde78da41e9 100644 --- a/net-analyzer/nagios/nagios-4.4.6.ebuild +++ b/net-analyzer/nagios/nagios-4.4.6.ebuild @@ -8,7 +8,7 @@ HOMEPAGE="https://www.nagios.org/" LICENSE="metapackage" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86" IUSE="" RDEPEND="~net-analyzer/nagios-core-${PV} diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest index 1d98a9df113e..eabcb56727c2 100644 --- a/net-analyzer/netdata/Manifest +++ b/net-analyzer/netdata/Manifest @@ -1,10 +1,8 @@ -AUX netdata-1.19.0-fno-common.patch 3807 BLAKE2B 42908f83322a9dab98b52fba245d31ad56b86ea8fd37ed614b3399ee07fff30fc1afbc26fda2834177869c9e8cedb4a97480a18c9c7649b9f52021a6850e391d SHA512 1e032488fb8035a87024b9085cc12a87ba87ff99cb2084db56bcdeb280ba4cfca8042647b6df1a9a06cbb9627b6c25a350782408efeb3a7d780bd1ca3a6d86a8 -AUX netdata-1.19.0-prometheus-spelling.patch 1149 BLAKE2B 567e93c8099f7edc6afd3c40a6249162f44dca30f9cccf1702df453523203ee2e79fb4d03a53f5b1c4e5dd6dfaa52961b0717546aa21bc25bb3927a9280598ad SHA512 a498b04683138fd56e71bcf1191b4f3a655be03746f850d9f407bbe24c28f16dd564967401c856ce404f58c6a947b8277e2fa0868dbe7c0aa63ff05a8b465561 DIST netdata-1.21.1.tar.gz 3748090 BLAKE2B 5cc8dd47b768838eecc7c8af35a82548dc5bb16acb0a88c17ee1254f86ca9b63a5108bce9205c000283b817478749d963b69c65e3bdc8e2fadecc9a1826a7f2e SHA512 66d2e0cb977275250fd7b51e5156957a4506ddba586de5fe796459ea241cbbed7013fd4cf9d7acf6666407352fb34e3b962a2d01565a9cb982c89c76b7cd79b9 DIST netdata-1.22.0.tar.gz 3786121 BLAKE2B ad34bcdb94cf44f8de154bf53b2e4ecbecee43c6cef2e5337c0fa6bd08b0feb41c25ee96e51fc6c54d72909559e5ac822b44153daa71255487bb0713ce6eca1d SHA512 3bf239c3e950195ef7b8b43f1c17f2cc94f9257a4f21665629f7b518cc6fcef3b0837743254efd03323408b39e2afa9533487147fa30c8f015705c391aa543f3 DIST netdata-1.22.1.tar.gz 3787203 BLAKE2B cb09ade9540d81fac9b30738650206bce263b74445ce76bf3e9c57a7935bd5fed04806b3b3ba6631ad7ed119b93b1f36eb10261a239127e238e4cf09ca2f4e7a SHA512 47a0b6c4c1b3d8ab18cf25725223c72683ed74084f0efd09cddbe293950839315f8fcadb16c2e5fa9a179745f20b08ce8652d4b972465eacc6a1792b4cfc296e EBUILD netdata-1.21.1-r1.ebuild 3370 BLAKE2B 4fd3103e4841a6146365d93a6e5c77b633b7786864c47ca9eba4067197b7c093536b91d8f1ee323ff84ed41a8af6ec952008d5938f0835a5b785081ae9590d3c SHA512 e80fc41089efdaa6cd11cd1131d961ccda8a67a8260a8363312d0fd6fdbc18fa67d6ce7c23d6c89682a9ac2a207f9c5464d5d055ebb4780dfd80eb33706da1c8 EBUILD netdata-1.22.0-r1.ebuild 3457 BLAKE2B a4ee70e56b2298eea11449b09783f3778c09920ede42149949910c28a5a4ab6a01dc8137bacc4ff72490172db3f5995923b1483dc0f39478ca97f880ec778f02 SHA512 34bc66ca8bc201a24a07b2f2b0258132aecf1109cfe6c2928904e9de5effb978aed53716fec6af79c9c5b6a16879c33cc4be194c181db8de38f6be1ccb719c1b -EBUILD netdata-1.22.1-r1.ebuild 3457 BLAKE2B a4ee70e56b2298eea11449b09783f3778c09920ede42149949910c28a5a4ab6a01dc8137bacc4ff72490172db3f5995923b1483dc0f39478ca97f880ec778f02 SHA512 34bc66ca8bc201a24a07b2f2b0258132aecf1109cfe6c2928904e9de5effb978aed53716fec6af79c9c5b6a16879c33cc4be194c181db8de38f6be1ccb719c1b -EBUILD netdata-9999.ebuild 3457 BLAKE2B a4ee70e56b2298eea11449b09783f3778c09920ede42149949910c28a5a4ab6a01dc8137bacc4ff72490172db3f5995923b1483dc0f39478ca97f880ec778f02 SHA512 34bc66ca8bc201a24a07b2f2b0258132aecf1109cfe6c2928904e9de5effb978aed53716fec6af79c9c5b6a16879c33cc4be194c181db8de38f6be1ccb719c1b +EBUILD netdata-1.22.1-r1.ebuild 3459 BLAKE2B 51e39961afa8e068776f3316df2f6becf524e0506f4097c8e77d4fbd939f58ea29aa41b47e70b163ad97c660681c47b1322adcb95a5e888cd48afdfcebdc1876 SHA512 091da4e745725d9f4c626bb62e163ae999c822e148d84551225836ee83f50acd7619e5e96dbfcb1ddc765bd4bcf6c0e657c791a0da1f32c4431cd08a6a0a89c1 +EBUILD netdata-9999.ebuild 3459 BLAKE2B 51e39961afa8e068776f3316df2f6becf524e0506f4097c8e77d4fbd939f58ea29aa41b47e70b163ad97c660681c47b1322adcb95a5e888cd48afdfcebdc1876 SHA512 091da4e745725d9f4c626bb62e163ae999c822e148d84551225836ee83f50acd7619e5e96dbfcb1ddc765bd4bcf6c0e657c791a0da1f32c4431cd08a6a0a89c1 MISC metadata.xml 1270 BLAKE2B e2c5bac8fd169d84daf8a6e6cfea30761490cca3d7211a29e29f6cf298a9cd728ddc56075e5a85c8f5ed5467900a2f3fb1e09c40b764c2bb0e02bf1ff8e98108 SHA512 77e4d91d31d9d48b769b13f5c9778e09fc8d64941a145ea0bc1ce3e735eb64e5c89fa36a4314753e7c0871738a7b3e94f6a998a87b9c7b9d1d7aa6e8800cdbdf diff --git a/net-analyzer/netdata/files/netdata-1.19.0-fno-common.patch b/net-analyzer/netdata/files/netdata-1.19.0-fno-common.patch deleted file mode 100644 index 1b6d5b75020d..000000000000 --- a/net-analyzer/netdata/files/netdata-1.19.0-fno-common.patch +++ /dev/null @@ -1,126 +0,0 @@ -https://github.com/netdata/netdata/pull/7877 - -From c65f57af0714558294c1ad1b9568077720fb282b Mon Sep 17 00:00:00 2001 -From: Thiago Marques <thiagoftsm@gmail.com> -Date: Tue, 28 Jan 2020 13:59:20 +0000 -Subject: [PATCH 1/2] missing_extern: Fix missing - -Fix few externs that were missing in global variables ---- - daemon/common.h | 2 +- - health/health.h | 2 +- - libnetdata/health/health.h | 2 +- - web/api/web_api_v1.h | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/daemon/common.h b/daemon/common.h -index 6ac3cb3c87..59dbc41a8d 100644 ---- a/daemon/common.h -+++ b/daemon/common.h -@@ -84,6 +84,6 @@ extern char *netdata_configured_timezone; - extern int netdata_zero_metrics_enabled; - extern int netdata_anonymous_statistics_enabled; - --int netdata_ready; -+extern int netdata_ready; - - #endif /* NETDATA_COMMON_H */ -diff --git a/health/health.h b/health/health.h -index 9da90d70c9..d77318fd78 100644 ---- a/health/health.h -+++ b/health/health.h -@@ -52,7 +52,7 @@ extern unsigned int default_health_enabled; - - #define HEALTH_SILENCERS_MAX_FILE_LEN 10000 - --char *silencers_filename; -+extern char *silencers_filename; - - extern void health_init(void); - extern void *health_main(void *ptr); -diff --git a/libnetdata/health/health.h b/libnetdata/health/health.h -index a3dc0775fc..f7580edab2 100644 ---- a/libnetdata/health/health.h -+++ b/libnetdata/health/health.h -@@ -44,7 +44,7 @@ typedef struct silencers { - SILENCER *silencers; - } SILENCERS; - --SILENCERS *silencers; -+extern SILENCERS *silencers; - - extern SILENCER *create_silencer(void); - extern int health_silencers_json_read_callback(JSON_ENTRY *e); -diff --git a/web/api/web_api_v1.h b/web/api/web_api_v1.h -index 4fe3c8f6be..edeea98bed 100644 ---- a/web/api/web_api_v1.h -+++ b/web/api/web_api_v1.h -@@ -29,6 +29,6 @@ extern void host_labels2json(RRDHOST *host, BUFFER *wb, size_t indentation); - extern void web_client_api_v1_init(void); - extern void web_client_api_v1_management_init(void); - --char *api_secret; -+extern char *api_secret; - - #endif //NETDATA_WEB_API_V1_H - -From c0275ddaad62459a6da1eee0a0c76282a1391590 Mon Sep 17 00:00:00 2001 -From: Thiago Marques <thiagoftsm@gmail.com> -Date: Tue, 28 Jan 2020 14:06:56 +0000 -Subject: [PATCH 2/2] missing_extern: Variables - -This commit declares the variables inside .c files ---- - daemon/common.c | 2 +- - health/health.c | 1 + - libnetdata/health/health.c | 2 ++ - web/api/web_api_v1.c | 2 ++ - 4 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/daemon/common.c b/daemon/common.c -index e28f6cf000..67497a4e93 100644 ---- a/daemon/common.c -+++ b/daemon/common.c -@@ -13,4 +13,4 @@ char *netdata_configured_varlib_dir = VARLIB_DIR; - char *netdata_configured_home_dir = CACHE_DIR; - char *netdata_configured_host_prefix = NULL; - char *netdata_configured_timezone = NULL; -- -+int netdata_ready; -diff --git a/health/health.c b/health/health.c -index 1124cf9107..4a84ef7fca 100644 ---- a/health/health.c -+++ b/health/health.c -@@ -9,6 +9,7 @@ struct health_cmdapi_thread_status { - }; - - unsigned int default_health_enabled = 1; -+char *silencers_filename; - - // ---------------------------------------------------------------------------- - // health initialization -diff --git a/libnetdata/health/health.c b/libnetdata/health/health.c -index e03538db3f..98d26d295f 100644 ---- a/libnetdata/health/health.c -+++ b/libnetdata/health/health.c -@@ -1,5 +1,7 @@ - #include "health.h" - -+SILENCERS *silencers; -+ - /** - * Create Silencer - * -diff --git a/web/api/web_api_v1.c b/web/api/web_api_v1.c -index aafcbc70be..4ac50524ad 100644 ---- a/web/api/web_api_v1.c -+++ b/web/api/web_api_v1.c -@@ -2,6 +2,8 @@ - - #include "web_api_v1.h" - -+char *api_secret; -+ - static struct { - const char *name; - uint32_t hash; diff --git a/net-analyzer/netdata/files/netdata-1.19.0-prometheus-spelling.patch b/net-analyzer/netdata/files/netdata-1.19.0-prometheus-spelling.patch deleted file mode 100644 index 25c8dd4051ff..000000000000 --- a/net-analyzer/netdata/files/netdata-1.19.0-prometheus-spelling.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://github.com/netdata/netdata/pull/7674 - -From d19b834d0011485759604ecfa095a898b597d8e0 Mon Sep 17 00:00:00 2001 -From: Craig Andrews <candrews@integralblue.com> -Date: Sun, 5 Jan 2020 16:13:18 -0500 -Subject: [PATCH] Fix spelling of Prometheus (#7673) - -diff --git a/configure.ac b/configure.ac -index 00927ba8b1..8b2facb966 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -999,7 +999,7 @@ test "${enable_backend_prometheus_remote_write}" = "yes" -a "${have_CXX_compiler - AC_MSG_ERROR([C++ compiler required but not found. try installing g++]) - - AC_MSG_CHECKING([if prometheus remote write backend should be enabled]) --if test "${enable_backend_prometeus_remote_write}" != "no" -a "${have_libprotobuf}" = "yes" -a "${have_libsnappy}" = "yes" \ -+if test "${enable_backend_prometheus_remote_write}" != "no" -a "${have_libprotobuf}" = "yes" -a "${have_libsnappy}" = "yes" \ - -a "${have_protoc}" = "yes" -a "${have_CXX_compiler}" = "yes"; then - enable_backend_prometheus_remote_write="yes" - AC_DEFINE([ENABLE_PROMETHEUS_REMOTE_WRITE], [1], [Prometheus remote write API usability]) diff --git a/net-analyzer/netdata/netdata-1.22.1-r1.ebuild b/net-analyzer/netdata/netdata-1.22.1-r1.ebuild index 16f4f1078275..3b6458e2fb4e 100644 --- a/net-analyzer/netdata/netdata-1.22.1-r1.ebuild +++ b/net-analyzer/netdata/netdata-1.22.1-r1.ebuild @@ -49,7 +49,7 @@ RDEPEND=" dev-libs/libuv compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) - jsonc? ( dev-libs/json-c ) + jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild index 16f4f1078275..3b6458e2fb4e 100644 --- a/net-analyzer/netdata/netdata-9999.ebuild +++ b/net-analyzer/netdata/netdata-9999.ebuild @@ -49,7 +49,7 @@ RDEPEND=" dev-libs/libuv compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) - jsonc? ( dev-libs/json-c ) + jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( diff --git a/net-analyzer/ossec-hids/Manifest b/net-analyzer/ossec-hids/Manifest index 6dbe3b7631f3..384f58fabd2d 100644 --- a/net-analyzer/ossec-hids/Manifest +++ b/net-analyzer/ossec-hids/Manifest @@ -1,3 +1,4 @@ +AUX gcc-fno-common-3.6.0.patch 11832 BLAKE2B ff5da1e79f7e736058c3405735e6bc7992b2d847bcbf491d58a57b7c86246f067b86b4637d8a601d852073ab27f29c413a58d01e06d4cf10d0d5ac50a296bb73 SHA512 db6677e68ea6a2fe0a4a8b4b88a1e18ce76f33bbf06840102185b612e56a1fa54836e3a22b8417371893a255037838f16608b87d128f1e38fae06e79c1e631b5 AUX makefile-3.2.0.patch 942 BLAKE2B a60f51130d66f25447bfab9356c76a1f67a0e55a2f1429dd86cfead36122a080779c11669b6cd201c9e4bf06760a9daa7e1876e87f1475ce6960980c923c2961 SHA512 472e4b201fc20b23926223f7321c94b9035b7a6c6c37357d229a5bccba64ef9e19706434d7e7087c2e522d0e2ef5d72579845cfd340d06d4ee78f86a42e47a88 AUX makefile-3.3.0.patch 942 BLAKE2B a60f51130d66f25447bfab9356c76a1f67a0e55a2f1429dd86cfead36122a080779c11669b6cd201c9e4bf06760a9daa7e1876e87f1475ce6960980c923c2961 SHA512 472e4b201fc20b23926223f7321c94b9035b7a6c6c37357d229a5bccba64ef9e19706434d7e7087c2e522d0e2ef5d72579845cfd340d06d4ee78f86a42e47a88 AUX makefile-3.6.0.patch 942 BLAKE2B a60f51130d66f25447bfab9356c76a1f67a0e55a2f1429dd86cfead36122a080779c11669b6cd201c9e4bf06760a9daa7e1876e87f1475ce6960980c923c2961 SHA512 472e4b201fc20b23926223f7321c94b9035b7a6c6c37357d229a5bccba64ef9e19706434d7e7087c2e522d0e2ef5d72579845cfd340d06d4ee78f86a42e47a88 @@ -10,5 +11,5 @@ EBUILD ossec-hids-3.1.0.ebuild 1565 BLAKE2B a87f9f384fd9164a1aac6c1febbafccc8018 EBUILD ossec-hids-3.2.0-r1.ebuild 1590 BLAKE2B 849c6e5e9327cf2babdc642c79517d30bfcc67a69ac1c3fa253d4166eb139df663653687b29ab8dccb1da694d04ef0130d7b278737ab7a414b2a749cbaf5b569 SHA512 ddba4ca1c940717ac291f53114d6aba2338e69dd03ecca1b0d7cdbd249906c9ae7fd1f886f3c5d9d133d86c235fd2a13d858b5d8b8a632e2d4d403ba725aeda0 EBUILD ossec-hids-3.2.0.ebuild 1530 BLAKE2B fbb10305328d1666b2718485c3c4afc7ac7f08402cd07b265debc891212b2ffa152c8a0c22d46221ee81229f5fd289306c26fcab32f82c4203910bfe81dc2ce4 SHA512 1e0b2fe87c451ade9d83466f9bcef7e476ff5e39441fa17e5665006b01f7d07cb1d564ef09a2af6d60c867ddc32d524eaa0004125527b6f7eafaa07ec3db359a EBUILD ossec-hids-3.3.0.ebuild 1652 BLAKE2B c6965ea9d00a91b3046a47c17bb9100c03ee68085f33867aa499b17ff4ce0db678c642267df377507bb3ee0bd001ce2e3fec9bb9c317b8598eae6a2b0f768221 SHA512 fa725f3edb9d20b3c82a89c2e6fc32a9a8247ec360702dd795eeffb0479f6691c006c9e0121b4e875c2e3a1e46899262730e2ee0c6e51c0683d4f0d42e2c75b7 -EBUILD ossec-hids-3.6.0.ebuild 1656 BLAKE2B f2edf15e760706dd038e180f0e935aa0d71a8d418e7fe1cdaf6c600fb13d42cc43613a1f867bb2e6ad9da2afea6ab5a97018b9c980400c33fcf1793937dbfd9c SHA512 820a0a863229a355de8544d22614f1b58699cc01c7f9b3beb7ed9ad8b71a5931096cdcd847e7fde14604152959fbfe77ffc493c9594f3dc999b43faa549af7ab +EBUILD ossec-hids-3.6.0.ebuild 1846 BLAKE2B d53c2f615877e523e1a206a0e8b3a1c2d291b4cc4018f4e2eaa391c0a5837e010daf168ceff767e428b148320bd1cb03baa996f8f4d72951b1a7e15d8d99baff SHA512 40ba780b9158a80c1e60a01eae67d523ba30643d2ce59ccf38b98ed387cd111c106689d5a724fe5088222b5a19659b37133fad38da06c7b1e33f2f677b1629cc MISC metadata.xml 1184 BLAKE2B 491f885913c264b0bd1eb3bea5131e64afd36f8a07a8964a07a987dc67a5537a2a6fd1a8018b339e487218649833eab4a05199fe5d2b7aa79483ec3494a44bb7 SHA512 e786d57b92a5563eb9d3e4ca60c7f45cf1adf59e9409001f032dac07621cfcfedeaed4fc0d438d0b8c2f3146074d9e75874ebeb31616e158692ae2447fd3c767 diff --git a/net-analyzer/ossec-hids/files/gcc-fno-common-3.6.0.patch b/net-analyzer/ossec-hids/files/gcc-fno-common-3.6.0.patch new file mode 100644 index 000000000000..e8ed3c66dd9e --- /dev/null +++ b/net-analyzer/ossec-hids/files/gcc-fno-common-3.6.0.patch @@ -0,0 +1,402 @@ +diff --git a/src/addagent/main.c b/src/addagent/main.c +index 587a8a3d8..ab12f0326 100644 +--- a/src/addagent/main.c ++++ b/src/addagent/main.c +@@ -17,6 +17,7 @@ static void print_banner(void); + static void manage_shutdown(int sig) __attribute__((noreturn)); + #endif + ++int willchroot; + + #if defined(__MINGW32__) + static int setenv(const char *name, const char *val, __attribute__((unused)) int overwrite) +diff --git a/src/addagent/manage_agents.c b/src/addagent/manage_agents.c +index ac39c1e66..4f9c266ff 100644 +--- a/src/addagent/manage_agents.c ++++ b/src/addagent/manage_agents.c +@@ -85,6 +85,8 @@ int add_agent(int json_output) + + char authfile[257]; + ++ extern int willchroot; ++ + if(willchroot > 0) { + snprintf(authfile, 256, "%s", AUTH_FILE); //XXX + } else { +diff --git a/src/addagent/manage_agents.h b/src/addagent/manage_agents.h +index 4812dba43..f2962e80b 100644 +--- a/src/addagent/manage_agents.h ++++ b/src/addagent/manage_agents.h +@@ -147,4 +147,4 @@ extern fpos_t fp_pos; + #define GMF_UNKN_ERROR ARGV0 ": Could not run GetModuleFileName which returned (%ld).\n" + + +-int willchroot; ++//int willchroot; +diff --git a/src/addagent/manage_keys.c b/src/addagent/manage_keys.c +index 146b48326..ffb9a1f21 100644 +--- a/src/addagent/manage_keys.c ++++ b/src/addagent/manage_keys.c +@@ -336,6 +336,8 @@ int k_bulkload(const char *cmdbulk) + char delims[] = ","; + char *token = NULL; + ++ extern int willchroot; ++ + /* Check if we can open the input file */ + printf("Opening: [%s]\n", cmdbulk); + infp = fopen(cmdbulk, "r"); +diff --git a/src/analysisd/analysisd.c b/src/analysisd/analysisd.c +index a220f4421..0a81971de 100644 +--- a/src/analysisd/analysisd.c ++++ b/src/analysisd/analysisd.c +@@ -42,7 +42,12 @@ + #endif + + #ifdef SQLITE_ENABLED +-#include "syscheck-sqlite.h" ++#include <sqlite3.h> ++sqlite3 *conn; ++#endif ++ ++#ifdef LIBGEOIP_ENABLED ++GeoIP *geoipdb; + #endif + + /** Prototypes **/ +diff --git a/src/analysisd/config.h b/src/analysisd/config.h +index 8d74c756e..976d1942e 100644 +--- a/src/analysisd/config.h ++++ b/src/analysisd/config.h +@@ -12,6 +12,7 @@ + + #include "config/config.h" + #include "config/global-config.h" ++ + #ifdef LIBGEOIP_ENABLED + #include "GeoIP.h" + #endif +@@ -20,9 +21,11 @@ + extern long int __crt_ftell; /* Global ftell pointer */ + extern _Config Config; /* Global Config structure */ + ++/* + #ifdef LIBGEOIP_ENABLED + GeoIP *geoipdb; + #endif ++*/ + + int GlobalConf(const char *cfgfile); + +diff --git a/src/analysisd/decoders/geoip.c b/src/analysisd/decoders/geoip.c +index 464e4bb71..9816b4c81 100644 +--- a/src/analysisd/decoders/geoip.c ++++ b/src/analysisd/decoders/geoip.c +@@ -30,6 +30,7 @@ char *GetGeoInfobyIP(char *ip_addr) + GeoIPRecord *geoiprecord; + char *geodata = NULL; + char geobuffer[256 +1]; ++ extern GeoIP *geoipdb; + + if(!geoipdb) + { +diff --git a/src/analysisd/decoders/syscheck.c b/src/analysisd/decoders/syscheck.c +index a6d675892..30339a00d 100644 +--- a/src/analysisd/decoders/syscheck.c ++++ b/src/analysisd/decoders/syscheck.c +@@ -16,7 +16,7 @@ + #include "decoder.h" + + #ifdef SQLITE_ENABLED +-#include "syscheck-sqlite.h" ++#include <sqlite3.h> + #endif + + typedef struct __sdb { +diff --git a/src/analysisd/makelists.c b/src/analysisd/makelists.c +index 06c90db70..dfbe6a4a3 100644 +--- a/src/analysisd/makelists.c ++++ b/src/analysisd/makelists.c +@@ -32,6 +32,10 @@ time_t c_time; + char __shost[512]; + OSDecoderInfo *NULL_Decoder; + ++#ifdef LIBGEOIP_ENABLED ++GeoIP *geoipdb; ++#endif ++ + /* print help statement */ + __attribute__((noreturn)) + static void help_makelists(void) +diff --git a/src/analysisd/syscheck-sqlite.h b/src/analysisd/syscheck-sqlite.h +deleted file mode 100644 +index 526cab26e..000000000 +--- a/src/analysisd/syscheck-sqlite.h ++++ /dev/null +@@ -1,5 +0,0 @@ +-#ifdef SQLITE_ENABLED +-#include <sqlite3.h> +- +-sqlite3 *conn; +-#endif +diff --git a/src/analysisd/testrule.c b/src/analysisd/testrule.c +index c08fb4885..b1aa928f7 100644 +--- a/src/analysisd/testrule.c ++++ b/src/analysisd/testrule.c +@@ -83,6 +83,7 @@ int main(int argc, char **argv) + memset(prev_month, '\0', 4); + + #ifdef LIBGEOIP_ENABLED ++ extern GeoIP *geoipdb; + geoipdb = NULL; + #endif + +diff --git a/src/client-agent/agentd.c b/src/client-agent/agentd.c +index c09cf87d3..67828e79c 100644 +--- a/src/client-agent/agentd.c ++++ b/src/client-agent/agentd.c +@@ -23,6 +23,8 @@ void AgentdStart(const char *dir, int uid, int gid, const char *user, const char + fd_set fdset; + struct timeval fdtimeout; + ++ extern agent *agt; ++ + available_server = 0; + + /* Initial random numbers must happen before chroot */ +diff --git a/src/client-agent/agentd.h b/src/client-agent/agentd.h +index 0246a5457..a362ff9a3 100644 +--- a/src/client-agent/agentd.h ++++ b/src/client-agent/agentd.h +@@ -81,9 +81,9 @@ void os_agent_cb(int fd, short ev, void *arg); + extern time_t available_server; + extern int run_foreground; + extern keystore keys; +-extern agent *agt; ++//extern agent *agt; + #ifndef WIN32 +-struct imsgbuf server_ibuf; ++//struct imsgbuf server_ibuf; + #endif //WIN32 + + #endif /* __AGENTD_H */ +diff --git a/src/client-agent/event-forward.c b/src/client-agent/event-forward.c +index 2e81f0c90..22ed0beb9 100644 +--- a/src/client-agent/event-forward.c ++++ b/src/client-agent/event-forward.c +@@ -19,6 +19,9 @@ + /* Receive a message locally on the agent and forward it to the manager */ + void *EventForward(void) + { ++ ++ extern agent *agt; ++ + ssize_t recv_b; + char msg[OS_MAXSTR + 1]; + +diff --git a/src/client-agent/main.c b/src/client-agent/main.c +index 5f85cfb73..01c18970c 100644 +--- a/src/client-agent/main.c ++++ b/src/client-agent/main.c +@@ -16,7 +16,8 @@ + #define ARGV0 "ossec-agentd" + #endif + +-extern struct imsgbuf server_ibuf; ++//extern struct imsgbuf server_ibuf; ++struct imsgbuf server_ibuf; + + + /* Prototypes */ +@@ -112,6 +113,8 @@ int main(int argc, char **argv) + + debug1(STARTED_MSG, ARGV0); + ++ extern agent *agt; ++ + agt = (agent *)calloc(1, sizeof(agent)); + if (!agt) { + ErrorExit(MEM_ERROR, ARGV0, errno, strerror(errno)); +diff --git a/src/client-agent/notify.c b/src/client-agent/notify.c +index 1b239f26c..93fec325c 100644 +--- a/src/client-agent/notify.c ++++ b/src/client-agent/notify.c +@@ -68,6 +68,8 @@ void run_notify() + os_md5 md5sum; + time_t curr_time; + ++ extern agent *agt; ++ + keep_alive_random[0] = '\0'; + curr_time = time(0); + +diff --git a/src/client-agent/receiver-win.c b/src/client-agent/receiver-win.c +index 859bdf7f9..4ab62ee77 100644 +--- a/src/client-agent/receiver-win.c ++++ b/src/client-agent/receiver-win.c +@@ -19,6 +19,7 @@ + /* Receive events from the server */ + void *receiver_thread(__attribute__((unused)) void *none) + { ++ extern agent *agt; + int recv_b; + + char file[OS_SIZE_1024 + 1]; +diff --git a/src/client-agent/receiver.c b/src/client-agent/receiver.c +index fde64c282..5286e60dc 100644 +--- a/src/client-agent/receiver.c ++++ b/src/client-agent/receiver.c +@@ -29,6 +29,8 @@ void *receive_msg() + char cleartext[OS_MAXSTR + 1]; + char *tmp_msg; + ++ extern agent *agt; ++ + memset(cleartext, '\0', OS_MAXSTR + 1); + memset(buffer, '\0', OS_MAXSTR + 1); + +diff --git a/src/client-agent/sendmsg.c b/src/client-agent/sendmsg.c +index 454c2e714..3076dfcf9 100644 +--- a/src/client-agent/sendmsg.c ++++ b/src/client-agent/sendmsg.c +@@ -15,6 +15,9 @@ + /* Send a message to the server */ + int send_msg(int agentid, const char *msg) + { ++ ++ extern agent *agt; ++ + size_t msg_size; + char crypt_msg[OS_MAXSTR + 1]; + +diff --git a/src/client-agent/start_agent.c b/src/client-agent/start_agent.c +index 51670cee5..f1df43715 100644 +--- a/src/client-agent/start_agent.c ++++ b/src/client-agent/start_agent.c +@@ -24,6 +24,9 @@ int connect_server(int initial_id) + #ifdef WIN32 + unsigned int attempts = 2; + #endif //WIN32 ++ ++ extern agent *agt; ++ + int rc = initial_id; + + /* Checking if the initial is zero, meaning we have to +@@ -139,6 +142,8 @@ void start_agent(int is_startup) + char cleartext[OS_MAXSTR + 1]; + char fmsg[OS_MAXSTR + 1]; + ++ extern agent *agt; ++ + memset(msg, '\0', OS_MAXSTR + 2); + memset(buffer, '\0', OS_MAXSTR + 1); + memset(cleartext, '\0', OS_MAXSTR + 1); +@@ -241,6 +246,8 @@ void os_agent_cb(int fd, short ev, void *arg) { + struct imsg imsg; + struct imsgbuf *ibuf = (struct imsgbuf *)arg; + ++ extern agent *agt; ++ + if (ev & EV_READ) { + if ((n = imsg_read(ibuf) == -1 && errno != EAGAIN)) { + ErrorExit("%s: ERROR: imsg_read() failed: %s", ARGV0, strerror(errno)); +diff --git a/src/os_net/os_net.c b/src/os_net/os_net.c +index f18e3be77..756e9fac8 100644 +--- a/src/os_net/os_net.c ++++ b/src/os_net/os_net.c +@@ -14,7 +14,7 @@ + #include <errno.h> + #include "shared.h" + #include "os_net.h" +-agent *agt; ++agent *os_net_agt; + + /* Prototypes */ + static OSNetInfo *OS_Bindport(char *_port, unsigned int _proto, const char *_ip); +@@ -346,11 +346,11 @@ int OS_Connect(char *_port, unsigned int protocol, const char *_ip) + return(OS_INVALID); + } + +- if (agt) { +- if (agt->lip) { ++ if (os_net_agt) { ++ if (os_net_agt->lip) { + memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_flags = AI_NUMERICHOST; +- s = getaddrinfo(agt->lip, NULL, &hints, &result); ++ s = getaddrinfo(os_net_agt->lip, NULL, &hints, &result); + if (s != 0) { + verbose("getaddrinfo: %s", gai_strerror(s)); + } +@@ -363,8 +363,8 @@ int OS_Connect(char *_port, unsigned int protocol, const char *_ip) + memset(&hints, 0, sizeof(struct addrinfo)); + /* Allow IPv4 or IPv6 if local_ip isn't specified */ + hints.ai_family = AF_UNSPEC; +- if (agt) { +- if (agt->lip) { ++ if (os_net_agt) { ++ if (os_net_agt->lip) { + hints.ai_family = local_ai->ai_family; + } + } +@@ -398,13 +398,13 @@ int OS_Connect(char *_port, unsigned int protocol, const char *_ip) + continue; + } + +- if (agt) { +- if (agt->lip) { ++ if (os_net_agt) { ++ if (os_net_agt->lip) { + if (bind(ossock, local_ai->ai_addr, local_ai->ai_addrlen)) { + verbose("Unable to bind to local address %s. Ignoring. (%s)", +- agt->lip, strerror(errno)); ++ os_net_agt->lip, strerror(errno)); + } +- else verbose("Connecting from local address %s", agt->lip); ++ else verbose("Connecting from local address %s", os_net_agt->lip); + } + } + +diff --git a/src/os_net/os_net.h b/src/os_net/os_net.h +index 9b7250928..3aaf00429 100644 +--- a/src/os_net/os_net.h ++++ b/src/os_net/os_net.h +@@ -13,7 +13,7 @@ + + #include "headers/shared.h" + #include "config/client-config.h" +-extern agent *agt; ++extern agent *os_net_agt; + #ifdef WIN32 + #ifndef AI_ADDRCONFIG + #define AI_ADDRCONFIG 0x0400 +diff --git a/src/win32/win_agent.c b/src/win32/win_agent.c +index 40a37e621..a2ec784f2 100644 +--- a/src/win32/win_agent.c ++++ b/src/win32/win_agent.c +@@ -124,6 +124,7 @@ int local_start() + WSADATA wsaData; + DWORD threadID; + DWORD threadID2; ++ extern agent *agt; + + /* Start agent */ + agt = (agent *)calloc(1, sizeof(agent)); +@@ -271,6 +272,7 @@ int SendMSG(__attribute__((unused)) int queue, const char *message, const char * + char tmpstr[OS_MAXSTR + 2]; + char crypt_msg[OS_MAXSTR + 2]; + DWORD dwWaitResult; ++ extern agent *agt; + + tmpstr[OS_MAXSTR + 1] = '\0'; + crypt_msg[OS_MAXSTR + 1] = '\0'; +@@ -468,6 +470,8 @@ void send_win32_info(time_t curr_time) + tmp_msg[OS_MAXSTR + 1] = '\0'; + crypt_msg[OS_MAXSTR + 1] = '\0'; + ++ extern agent *agt; ++ + debug1("%s: DEBUG: Sending keep alive message.", ARGV0); + + /* Fix time */ diff --git a/net-analyzer/ossec-hids/ossec-hids-3.6.0.ebuild b/net-analyzer/ossec-hids/ossec-hids-3.6.0.ebuild index 7c416ed9c259..d305e7ce418f 100644 --- a/net-analyzer/ossec-hids/ossec-hids-3.6.0.ebuild +++ b/net-analyzer/ossec-hids/ossec-hids-3.6.0.ebuild @@ -29,10 +29,17 @@ DEPEND="${RDEPEND} dev-python/subunit )" S="${WORKDIR}/${P}/src" -PATCHES=( "${FILESDIR}/makefile-${PV}.patch" ) declare -a MY_OPT +src_prepare() { + # Patch for the GCC version 10 -fno-common change. See + # https://github.com/ossec/ossec-hids/pull/1875 + eapply -p2 "${FILESDIR}/gcc-fno-common-${PV}.patch" + eapply -p1 "${FILESDIR}/makefile-${PV}.patch" + eapply_user +} + src_configure() { local target="local" use agent && target="agent" diff --git a/net-analyzer/p0f/Manifest b/net-analyzer/p0f/Manifest index 57edaf1c3006..53d5d7f3722d 100644 --- a/net-analyzer/p0f/Manifest +++ b/net-analyzer/p0f/Manifest @@ -1,3 +1,3 @@ DIST p0f-3.09b.tgz 92896 BLAKE2B 5db3fe335c1dd3fedca5c007e8a133ff7327189c640ec6bce254ae7b1e6fe5729acd39d5a3d507e286742ac0b7c7612eb5aae452d60ab0e737cb05b0191ffbbb SHA512 2a688baa865f27c91c023a7c53e530649f56a681e6ca2533152ab07b42883857b20c378b636e87dda8d1d5dfac17e426d09ee032b363d0b7d98e57a9ff6164d0 -EBUILD p0f-3.09_beta.ebuild 1114 BLAKE2B 6f3274bd5d51a391a069c44e2fe13cc2d5661a45872b2dd35f6b1f2104e2c366cbd4ded0711b3a33f122bd116db5edd8e6a2139bd6a1dab6f10651e4052b3e3d SHA512 f21bd79fae2c4aeb6c4c07fedfcde224d42b32d9d69e91efcdfe6ef8eccc300e34db50748425418f8bd8d19d9c944461d6f8e3f30dc7626945fb2ddda4bd2498 +EBUILD p0f-3.09_beta.ebuild 1113 BLAKE2B 6907d512d2ea6bf2662cee08a56315142485ef210e44831c7c57e28c4f4d83a8b44ba060ef6ada2cf47c52aa855df884368535b35068319222a3506c52e92d0e SHA512 02aff709128984fe9670d4ae5d453e293534c4c153d9c9cf7626d3535e23c2badf5a05915c5d9da6282b46fefb58da93ff9ee07248c9f3abede028db4467aa8d MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/p0f/p0f-3.09_beta.ebuild b/net-analyzer/p0f/p0f-3.09_beta.ebuild index 68db0781a828..92f2334f50ea 100644 --- a/net-analyzer/p0f/p0f-3.09_beta.ebuild +++ b/net-analyzer/p0f/p0f-3.09_beta.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,8 +7,8 @@ inherit toolchain-funcs MY_P=${P/_beta/b} DESCRIPTION="A tool to perform passive OS detection based on SYN packets" -HOMEPAGE="http://lcamtuf.coredump.cx/p0f3/" -SRC_URI="http://lcamtuf.coredump.cx/p0f3/releases/${MY_P}.tgz" +HOMEPAGE="https://lcamtuf.coredump.cx/p0f3/" +SRC_URI="https://lcamtuf.coredump.cx/p0f3/releases/${MY_P}.tgz" LICENSE="LGPL-2.1" SLOT="0" diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest index d4f29c871574..b73117711c32 100644 --- a/net-analyzer/sarg/Manifest +++ b/net-analyzer/sarg/Manifest @@ -10,5 +10,5 @@ DIST sarg-2.3.11.tar.gz 1346884 BLAKE2B f1ba5e5d3531b611cca1e18444b24772d5f6fb31 DIST sarg-2.4.0.tar.gz 1371812 BLAKE2B 4a07e97f5bdf36dc9ea867517f511dff4e2b501c01231c523778b283000bcf8e6eeb26e219c3d710551ad31f939a47453341b6a8a5575df1d8f3957461326675 SHA512 cb314c15379b01c1ad874e473fcc41664ed5a0dd492b8537d5f375e2c00d9e083679a01da5e3506775b7d66f2d43ba698864ffbd36f5e5e512ef58882148739b EBUILD sarg-2.3.11-r1.ebuild 849 BLAKE2B dadaef09ee5131c4aec4bec7a5d27084a9a5da0bcb0bc18f7648ece30d5ff7b8da5345bbc3833c423c3530c2596cdebb837396aacccd2f11471e26a53d78b448 SHA512 395e8bbb6c7b752637393f6ad1b90b964cc7502f3750674888a1ae94da13de0efa890c52f5dd59af0e23f54a4976180859cab86aa3b9ce0dc62bdbe74c0b3973 EBUILD sarg-2.3.11-r2.ebuild 900 BLAKE2B ae2ee2cec4f73a97a4f2191a2a5659ab2cb314bd6e17b886085c246cc8aec0ac699f22aece2c3516380d107191b8267a211d496372a7ef5005776d32369134f4 SHA512 1905afac5cb561d9f28f11e86a4f594ab01a2667bbb84ac2504a916f43710a4c3547a8213094da9d70727ee6d14d2dea61ec6e2ea78f600a1486cf82ba9a7dfe -EBUILD sarg-2.4.0.ebuild 1252 BLAKE2B 84f4539cc89d0994471efde38959af24e115dcfb15d8e7c04d6e070b35c4abe550413fcd6c972d917c8099d4a43bbe763fbf09b562783452c8720728cadada59 SHA512 1181b89342ce7e32ca618a7ee47525e9d132336a10c82ee16fecf7229a56b8a4f6b798bf3c57a4f25b0ff74cc9eb07bf022cade2757ee4149077911a56e6506c +EBUILD sarg-2.4.0.ebuild 1251 BLAKE2B 92efa3523de1832a356fe880e6e46062cc9500c9e53ed180920974e03a9382d5a471c729b0ef988c2104021540dda681d6bc4dad45fa13d39ff7493013ed2898 SHA512 74c77cabc48e9335f866881027948a743c34f172ac0e90b3820a1e5cf7f1c217d1a9722fe701074089239a9c342396b40bdeac3511b6ff6e617b8fe02a5c39f8 MISC metadata.xml 997 BLAKE2B b0103361ea70e01da884621e5243317afdae68481b50c18296122617b0bc29669d50d6c6dda00c85d77e48186111bdf9252419a1b0627993b91dc652b263ca32 SHA512 0b24013475c4e92553539de23c2e88dff9e0bf9c42b3c5d6cb46e54dc113ceb8bc5889ac1d1c397f73bfde600ec6a394b2ba0da2520351f9050ec873b2c8d49c diff --git a/net-analyzer/sarg/sarg-2.4.0.ebuild b/net-analyzer/sarg/sarg-2.4.0.ebuild index b74ab98fe0b2..c2da09b5fa35 100644 --- a/net-analyzer/sarg/sarg-2.4.0.ebuild +++ b/net-analyzer/sarg/sarg-2.4.0.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://sourceforge.net/projects/sarg/" SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.gz" LICENSE="GPL-2" -KEYWORDS="amd64 ppc ~x86" +KEYWORDS="amd64 ppc x86" SLOT="0" IUSE="bzip2 doublecheck +gd +glob ldap lzma pcre zlib" diff --git a/net-analyzer/sngrep/Manifest b/net-analyzer/sngrep/Manifest index 8e6747b4ea55..907dba68fd8f 100644 --- a/net-analyzer/sngrep/Manifest +++ b/net-analyzer/sngrep/Manifest @@ -1,5 +1,8 @@ -AUX sngrep-1.4.5-tinfo.patch 237 BLAKE2B 2ba30ab0828f475e790175d8c3dcd25160ff691194ebb6b8e86380251863b40ef52bd942cdd65c694b84bae8de8d216244f9ab5fa75066e640b8427099a39342 SHA512 7c47e530caa1c44f8452a536925fd1133a1f0aad3822117e5ce2e1b7b03307a90423d70bb031639305b638d4c6732d980f3dbe617adc489fd0c2b438354f5ce6 AUX sngrep-1.4.6-stdin.patch 405 BLAKE2B 206e735df529efe81c3d272e8ccd7c3e759301c6b9ff8f607e3a60c4fc6f06f1ad8c61259b7353d42c991cc28daeffc376c121fc26cf1f60a01ab0deb3828412 SHA512 60766958dc218ee258902ec9944070539c272f2db5dfba638647e2d8942a8160745c3c5f11dd64af34cf8d3f258207e94b325ec0370a47628ce7cf628edadf4c +AUX sngrep-1.4.7-LDFLAGS.patch 290 BLAKE2B f15317a47b09dca8c0d28f2aa8c9bb96fdbb4f10cecfc0e5fb2f40d0cd98ad675471f793e46ff4092086b887c99bc7d6efea6d6170b3c7bb4d1db3e4032da5d3 SHA512 0c63147bcedab91a0b5a8c34b55a0c8ac11dfdd52f607b31658e8e8891963b87b8fdce8674f1eecf30829257006219c7ea42945fff5dce4502b62dcaf72505b3 +AUX sngrep-1.4.7-tinfo.patch 699 BLAKE2B 92943ef1b2b4b9bd0d0101667999ebbd7ef9dbfbfa4c2cc39a24f190e88482bbe6053813a8e32745565e3f61d3585207a540de823e715e4e0d1f013fd398ca0f SHA512 59276d306b6db2e5318f3b23c172b692b4f35884c7bf68f27a1a8636b2a5187dcdfbee58f11bee0a7de7afe068e0e1486d6a305d0b215a58627a041804452a4f DIST sngrep-1.4.6.tar.gz 235721 BLAKE2B e01f2a1d83b9147b99196f7ff2e5562552b16badc2ca634e63b2e2f5955a5d0328c9fcdb841f42a950899511a81fffd8eb64169758dc319875e3052d4359de93 SHA512 25c67e26158b140bded775b217f313ad5a6268684f03d0b9875ddd423d7548b50fa9c358346330d3873984f456aefa9401c2b0fdd136dd95061e34da6530bcc3 -EBUILD sngrep-1.4.6-r2.ebuild 878 BLAKE2B 8ea141c0d63a12b4b72ff587088421eacd286ca5848c808a6963b6683095bb498e384d6aec376969714e83165e816192b1727858109ed3ddf64baa1764772530 SHA512 6dfbeeb8760c22d90c691e662a73ab4688b3c21a8bf5ad646335d59bfff4c5ca547dfeb4062484ab0d5707fdf4c477628e951e0e5e6dbc466eeec116bd963060 +DIST sngrep-1.4.7.tar.gz 237978 BLAKE2B 30172748aeab2910e7fa13f35b447d7bd1688bb206576af6233c8c47405eb3fe93316cc72255169f19f3752e7fe3ada63c5c0bba0d9ab75706c1b0d3ac296474 SHA512 f414f9cc49b0c34cbbf5a77d285f12eb4091af3395953ed93dbe2f57d4ba3731d16c4b56c37e90744cf3784572975f485aed48cdd100898ffaee18e9a18943b1 +EBUILD sngrep-1.4.6-r3.ebuild 878 BLAKE2B 0fce80e75ed5959ffa4ef3a930028b59b5f09b60aafafbbcf14160485d3d5f542216b5f88490fad2d40b18c5c12821ca98ced7fd7a657ddff6d2cc5348bdc58e SHA512 4db6ee2085e7cd5dadfb24a6ef044c4b2a709b9a3788fd0e33aa352274785576eb489a11dfbf122f6d74e521f00d3e3da4cd03a05988ed63f5461f62c6813967 +EBUILD sngrep-1.4.7.ebuild 880 BLAKE2B 985c02fe8faeb7d69614571dc5ee17b5be9837135243e09d06a370d6ca9c7fa37664ae7a4ba83de58189ff2f35ecf0f3772f37f86beff834706241e3fe52be6b SHA512 553168f488dfbe3f0fd1062d58d5c86c6b67c53d390f3fcb979ae2cba74a52b6bf717a8d12173833ef191c725fa90be7d58b2bcda3b2fdb07292941f642a6df6 MISC metadata.xml 468 BLAKE2B c4ecbf2a09c6361f3cdd82c6c2280d1885565eb1a834be6093b3acbde6ecad83b49026524c68b067bee7f2764dbf4d3bc73e7e8fc5d13ac499a04001c97b1b30 SHA512 def85ed081107978cef4e8cad0ce80a0717c5c644494ebb907a9a616ad571f13e518019d6d51447f05f1a9545c739dd31874d888cb06ce91ecc224fb2c40e446 diff --git a/net-analyzer/sngrep/files/sngrep-1.4.5-tinfo.patch b/net-analyzer/sngrep/files/sngrep-1.4.5-tinfo.patch deleted file mode 100644 index f3829560264d..000000000000 --- a/net-analyzer/sngrep/files/sngrep-1.4.5-tinfo.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -98,6 +98,10 @@ - ]) - ]) - -+AC_SEARCH_LIBS([keyname], [tinfo], [], [ -+ AC_MSG_ERROR([ You need to have ncurses panelw library installed to compile sngrep.]) -+]) -+ - #### - #### GnuTLS Support - #### diff --git a/net-analyzer/sngrep/files/sngrep-1.4.7-LDFLAGS.patch b/net-analyzer/sngrep/files/sngrep-1.4.7-LDFLAGS.patch new file mode 100644 index 000000000000..3e63dc245dab --- /dev/null +++ b/net-analyzer/sngrep/files/sngrep-1.4.7-LDFLAGS.patch @@ -0,0 +1,11 @@ +--- a/m4/sngrep.m4 ++++ b/m4/sngrep.m4 +@@ -44,7 +44,7 @@ + LIBS="$sngrep_config_script $LIBS " + sngrep_script_success=yes + ], []) +- LDFLAGS="$save_LDFLAGS" ++ LDFLAGS="$sngrep_save_LDFLAGS" + fi + if test "x$sngrep_script_success" = xno; then + [$5] diff --git a/net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch b/net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch new file mode 100644 index 000000000000..8a01eeb2560b --- /dev/null +++ b/net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch @@ -0,0 +1,24 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -74,6 +74,10 @@ + AC_CHECK_LIB([menuw], [new_item], [], [ + AC_MSG_ERROR([ You need to have ncurses menuw library installed to compile sngrep.]) + ]) ++ ++ AC_SEARCH_LIBS([keyname], [tinfow], [], [ ++ AC_MSG_ERROR([ You need to have ncurses tinfow library installed to compile sngrep.]) ++ ]) + ], [ + + # Ncurses without wide-character support +@@ -96,6 +100,10 @@ + AC_CHECK_LIB([menu], [new_item], [], [ + AC_MSG_ERROR([ You need to have ncurses menu library installed to compile sngrep.]) + ]) ++ ++ AC_SEARCH_LIBS([keyname], [tinfo], [], [ ++ AC_MSG_ERROR([ You need to have ncurses tinfo library installed to compile sngrep.]) ++ ]) + ]) + + #### diff --git a/net-analyzer/sngrep/sngrep-1.4.6-r2.ebuild b/net-analyzer/sngrep/sngrep-1.4.6-r3.ebuild index 011fb09336bd..b9f731a5e648 100644 --- a/net-analyzer/sngrep/sngrep-1.4.6-r2.ebuild +++ b/net-analyzer/sngrep/sngrep-1.4.6-r3.ebuild @@ -24,8 +24,8 @@ DEPEND=" " RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}"/${PN}-1.4.5-tinfo.patch "${FILESDIR}"/${PN}-1.4.6-stdin.patch + "${FILESDIR}"/${PN}-1.4.7-tinfo.patch ) src_prepare() { diff --git a/net-analyzer/sngrep/sngrep-1.4.7.ebuild b/net-analyzer/sngrep/sngrep-1.4.7.ebuild new file mode 100644 index 000000000000..f021e73049e6 --- /dev/null +++ b/net-analyzer/sngrep/sngrep-1.4.7.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools + +DESCRIPTION="Ncurses SIP Messages flow viewer" +HOMEPAGE="https://github.com/irontec/sngrep" +SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="eep gnutls ipv6 openssl pcre unicode" +REQUIRED_USE=" + gnutls? ( !openssl ) +" + +DEPEND=" + net-libs/libpcap + sys-libs/ncurses:0=[unicode?] + openssl? ( dev-libs/openssl:0= ) + gnutls? ( net-libs/gnutls ) +" +RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-1.4.7-tinfo.patch + "${FILESDIR}"/${PN}-1.4.7-LDFLAGS.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable eep) \ + $(use_enable ipv6) \ + $(use_enable unicode) \ + $(use_with gnutls) \ + $(use_with openssl) \ + $(use_with pcre) +} diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest index 6eca5dd6b2e7..7b042b914237 100644 --- a/net-analyzer/tcpreplay/Manifest +++ b/net-analyzer/tcpreplay/Manifest @@ -1,5 +1,7 @@ AUX tcpreplay-4.3.0-enable-pcap_findalldevs.patch 333 BLAKE2B 1beb39a7263bf8491998760e4a62ac8908300e28c43500812d37d2512f9d63fcd175b93c1b384e03e9570e741dd95dea09ead017a014a4b62b3449833fe9b248 SHA512 3d035736c0656f6ace85b45af595866e06c8464641023e9d1606c288e598cde18eb96b1be8300514f6f31bc83756ae76b436402666036456571201ca38fe5026 DIST tcpreplay-4.3.2.tar.xz 747268 BLAKE2B 27cad902785975f9c7fbfb8abef24ae95fbc8812e0a4fabd3b1ecf74bb9f0a99cdb0c37db72c433296d3cebba89d0bbc90e944195e585bf2d1c2d93ef234c4f6 SHA512 641dd636d9c5c30637d0103f8b21da3ce234f9e3ed7ab4d2b20d004fc4a14301672dcd678b2d5e0eb90d55a97bcb0c4c67f31c790a5aa3c509a92d1142c5b7b9 +DIST tcpreplay-4.3.3_beta1.tar.xz 748424 BLAKE2B 9bccca73c0be4d6a72a61f2ebd4c6f61c160d829772605183e25177d4356e01d83be0602eaa84d154df2c316db1c6d09899e49311137be734a4c0b373be6e77f SHA512 d8c80d107ca0fdddc5d2ef88924cdee8b5897e0f4bb468b982f4bbacb01547a40c4fa324f7ee7dd93e1288c87e11e709a99c08e31d397b8ca3f28cc78e6d61a4 EBUILD tcpreplay-4.3.2.ebuild 1870 BLAKE2B b3259f3304d9a352c41843ad22808a10e0060437fe2476398a5ed5d0b2d6ebfe53375e73829ab831dbaa8fcb83dcce5008a2d994888e4db65c95cf3ab9db6cad SHA512 4aa9cc30b785932ed73c19e001f36c73f6191af1cb739637dbe6cd5b541811f3818ce4c64e14e8910a1d505708f6467ca1e2874a0cd54b7eb174d6f31ac62d4f +EBUILD tcpreplay-4.3.3_beta1.ebuild 1872 BLAKE2B 5fcfd4a57e6023865d261d022e6ac79f72cb0b2b773cd95b99202099767e8a6ed1288a5a38efffaed373da8f258d21f9b17ca88424dbf35064b4f28228804156 SHA512 3e385b4425ad1e832b810ebc77bbb15eaa4d09f57661275c0b724b5c9477bf2bb1cb1117592751344c7ffc7ec5666b6a49f2fd7a2eb9efad9901acd61524576c EBUILD tcpreplay-999999.ebuild 1809 BLAKE2B 196a27e64b132ffa5440aa7b540c4939d62dda5191ddc169a85b198f87d84cfcb15f26404e1c335ead442efa8a0cd70f795bceb3fa25736d525accaa42b448dd SHA512 2690427a1bcec51a564bf8dd6bac157a5bfa2dd27fe9c884c37b89b23963fe791a720c703cc4421d9955e8697f2209152e041302aeb767b40dfb052e7b0cfffd MISC metadata.xml 1116 BLAKE2B 23c8b7009a77b68831affc57432a87a31fde213d7e7ee88f68ced4a4e21a56c55f97497e610fc486a42c699759ef1edf1904fa9b0fe976df4fc9930535f97037 SHA512 58cb13a648ba7b9f9fd8c7a7cdfd37d56f0d7b957824a55d63001a8708f93d529b29e52df051bdce0c87eb672d24c7b2c35ee8a1e94ba062e2a1e12dd0d0ee1b diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.3_beta1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.3_beta1.ebuild new file mode 100644 index 000000000000..015df52f86f9 --- /dev/null +++ b/net-analyzer/tcpreplay/tcpreplay-4.3.3_beta1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2020 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" +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 -> ${P}.tar.xz" + +SLOT="0" +KEYWORDS="~amd64 ~arm ~sparc ~x86" +IUSE="debug pcapnav +tcpdump" + +DEPEND=" + >=sys-devel/autogen-5.18.4[libopts] + dev-libs/libdnet + >=net-libs/libpcap-0.9 + tcpdump? ( net-analyzer/tcpdump ) + pcapnav? ( net-libs/libpcapnav ) +" +RDEPEND="${DEPEND}" + +DOCS=( + docs/{CHANGELOG,CREDIT,HACKING,TODO} +) +PATCHES=( + "${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch +) + +S=${WORKDIR}/${P/_/-} + +src_prepare() { + default + + sed -i \ + -e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \ + src/common/sendpacket.c || die + sed -i \ + -e 's|@\([A-Z_]*\)@|$(\1)|g' \ + -e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \ + -e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \ + src/Makefile.am || die + + eautoreconf +} + +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) \ + --enable-dynamic-link \ + --enable-local-libopts \ + --enable-shared \ + --with-libdnet \ + --with-testnic2=lo \ + --with-testnic=lo +} + +src_test() { + if [[ ! ${EUID} -eq 0 ]]; then + ewarn "Some tests were disabled due to FEATURES=userpriv" + ewarn "To run all tests issue the following command as root:" + ewarn " # make -C ${S}/test" + emake -j1 -C test tcpprep + else + emake -j1 test || { + ewarn "Note that some tests require eth0 iface to be up." ; + die "self test failed - see ${S}/test/test.log" ; } + fi +} diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index 231745445ac3..9424af365cc3 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -12,18 +12,12 @@ AUX zabbix-proxy.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5ce AUX zabbix-server.init 494 BLAKE2B e58063bfdb0bcb6ea70325d31bff4ffebab2686b7063916619aaabc5b39b1ff5d960b968e382615f84b18531465cf0ad0eab5ffa171c0b4b1797e70d58ed3450 SHA512 7dd55ffe8062bee9104218bf673aeeeea56a4a332ef6a5676b83e7f026a2b6ebc70446c63d6116b684ad16abd95de355cdbdf07c81a51daf1424b3fd8d627c74 AUX zabbix-server.service 429 BLAKE2B 1727ad52441b8e1ef31ee0f7faaa9d9964ee4ca5e2ef61de4715c25b0e0c97a627e6735a67c4114484950f0334fffa344d94f9192ada63887a21b617122eaf0d SHA512 d20fa4aa3a545d2f36388d7cac78c70c5610f5e7529348447e6fa6bacc33f42dd6e1c37c50b1c2711900a3f29bbbbb0ebc7c54f04d3de717aadad48e18c46e28 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df -DIST zabbix-3.0.30.tar.gz 14700686 BLAKE2B 9caa772c8dfdd53411bc996b8c97dce7c24853ea1049fe3cb71048c089105af5c7d1cf51071d91d1d2a98113181e9977a1ca3b4304e42a4a2f8bb0b87cd725b8 SHA512 6e60c9e5570aa69e1d52f005094eda1618aafc6d7ee831d4e5dc26f64b0691e2d9e494845fd36d22b049175776057fca28142da31d5e8e06d6c6f3e003bde3a3 DIST zabbix-3.0.31.tar.gz 14698394 BLAKE2B b8b5f94fe7fe08385b1b358c628b2047b437e6068dab8c3dbdab03e55e95e27f1b77ede4a1a57c4f79bf4a629d9dc5671bd144c002ace7c915f2fed382ac13b2 SHA512 35fec45667cdf217c2be21a164181f92f8f11ef9bcfb0c8dad914726e7c436bae5f8a97aebc3af82499e37125f4d1896ef74ad061a1ee3cbb674562c22a832b1 -DIST zabbix-4.0.19.tar.gz 17211769 BLAKE2B 1f7ac3fb195c35a41fae84a2b9a7985bee49664df8469ef7a14b9e264348447e5d5822fdc05feca4041ca57e74d15bc8b5cae262024fc5dca7749af263224d2d SHA512 c279af3d8b1b9125420d65e4e20a8892f9531a345e1f0046214fa14ab6204d535fd0cb672b5f3c6b5e325b7d8ff44e317bde58611f4bef9d89aba70851326daf DIST zabbix-4.0.20.tar.gz 17215217 BLAKE2B 144b334e78b121d0ba01b285590a6d354ed54be8dcebc12216b51f9829dba98c76d122bb329efbf67931237636fe178ecf5dfd141954fe37d1063c24c3c6dcda SHA512 5f761ba8bd3eac67de9f8d3614ebf437a6a4cdad8f0bf961c8b4cbe39f13bafe64bdb58b6ba56f1a27304ebdaa32109447bd3328fd3e2fcc1aacde056fb1d5dd -DIST zabbix-4.4.7.tar.gz 19413652 BLAKE2B 3c7d55a64f8d0e94d7fca3d088bb40592f56ffd5ca8025fb2cdd82ae7946bca1449b354e74cc3e50a6fca9b0bc2b46cf995b74d31d4b462f3d0b4be734f7c19b SHA512 2b96771bb555fae3df67665ac2e47c94662b071eb97c943d59b8f1fc7d31e2bf349c551a0015c6e239321f069b3ab87373c397a023cbff3daad8bd310d11fb6a DIST zabbix-4.4.8.tar.gz 19457802 BLAKE2B 4cc566b744d500c5f3a95eeaebe5418ff58cf3852318f474991706b0f81d1a9b0a1b3793e3e28b99fc45f4a6bfb9281c4d42acb5bb8fc49c37802d3c245dd853 SHA512 bd850d4ec8f30b9bcd531d84606c900692be5b91424cb06f66cde24ed4634a93d25476010e4387b51933406c2552a611e2e7ec4691b57ca6c38fc874c4b1aef1 DIST zabbix-5.0.0.tar.gz 18519888 BLAKE2B 028fc41d4ce250c558130a631aaf385b0a944885a820f63aa3052738f767092ce71dfd65e52750dd61276b6171caa739eee5a5dea0002828a12035cc51a6f2d7 SHA512 056aee99d19def2f673813e29bb7869fa7906abe6956fddbeac359195167abe06add21ef08baf68a5ad6e256323a797e604cdd7828f34be2762daf7b31923984 -EBUILD zabbix-3.0.30.ebuild 9227 BLAKE2B 565fe222ec1d1e2aca06bf705e78fe3c0f641dfdacd61f6346efd85385386e04e5c62eb079e16ebfb9307b84a8eeb2bbb220a59e0d771035a59c669e9685050b SHA512 055dd251714720d7d175d6f4c7c07dd0d452c339b007dc75501ac17a4185ca32d7b3d57a30e93828373c67a3bbd7a22f468330368c75565a26faf6610aca9dd7 -EBUILD zabbix-3.0.31.ebuild 9214 BLAKE2B a03ee28ceae862d1909846f682b9489b7a23b44dce06267ce258e9137c8755271e4a90357fdf1d7843c8716df1e9518ed7188a95be4b651fb505b27e947453a9 SHA512 e4dd3829d87dbe8c28dc82e00574e6712abaf7c8b11e8bf97ccf059ff820e3689e64bc89387868c7c453328619eb62a33819d8831e50784c1ba5a6e19cd90f24 -EBUILD zabbix-4.0.19.ebuild 9250 BLAKE2B 77bad68ad6c6d435d07aa45c2f381772a8a694c5f0408100f34826cded4059ff310036c3e2d1b6f13b792e7492301d7453e8de126acedc8e7f4cacd2dec6e013 SHA512 62a6d0c2edf95779d46bb84a499fae78205101f4d4e3599c14aab3163b09ad9493742d15715b58b60088a5292694d8fed07dc286016284f2817ef026d23c1366 -EBUILD zabbix-4.0.20.ebuild 9221 BLAKE2B 342880176c78e465fe5d650826393970a5600a6a38d7ad9a40af6f8f48237a90939466079af51d63be7a939a1bea69b3607714bbfecca187058f1747121fe43e SHA512 27a8f7b4e46d9f5779d6ced6cebc13c1aef37ebd699ec9e52f31feb836eba4e4759e3597cf1995873f7808a952083f774931a4ab3e1cd7e84bbd24a6a859f1f5 -EBUILD zabbix-4.4.7.ebuild 9119 BLAKE2B 558919cb6c7da44f730c97a185419f78916ce42be00278061430b0f4faa6c42489baffb2d6cb4a4bf425a461a03a82b14c0f0aed707b077b417d1b261f28b0c3 SHA512 3cf95baa0d1e665b8d801cb664c59546a71e8d7a1134dc110c6850f916ae812e2eaf2d20e45fc8eca6ad77acea52704277b68f25ad36b8eea9b1c8e371f995c0 -EBUILD zabbix-4.4.8.ebuild 9090 BLAKE2B 10ceda1d5e6f59db90d495d97931e315325eafcdb1417e87f3894ef641b496f0873d19b09dfbc955b1e2daa3006264301db42c481d853f0040d8262d28eb029d SHA512 800867a11a498825eb8613e02268384f98836e48973ffecc2071946c448569f0d4b8d07ca965e277a8808f55e87062339718c770354ec44b3a4bed2ea1f3cb07 +EBUILD zabbix-3.0.31.ebuild 9212 BLAKE2B d7336dade436fb0d8257b60c57b0ffb7c5ece865fc422c860c5f1bed28219b85ef3efb22ca5f3825e27903509b6f97cee28ffa7edd687c0f34f7c869bd5f2027 SHA512 2ff1c545e08e419e3dd813749339c1edca5fd035e50cc4ad7965500c1fe8add46b5ddd864932c4bc11952117e7c3df619f8aa42f815a04e3114e8f46c45cfd3c +EBUILD zabbix-4.0.20.ebuild 9219 BLAKE2B 260a527502f825cd65c1192542dac57c14ff68f14acbd6b6c8f3c320aa2dfd62dde1cd7d71d764bdf3bce229a7e1d2618800633dc70e1911af7536f479c38e89 SHA512 eb752f9ed9c9fa64a118df3cc824a08af8a832e7d2202d4ea966c80448ed2d3c30aeee17d7d1c34b2f4bcd19a3a9f717144ba798066559a24e7ac935996ebfb3 +EBUILD zabbix-4.4.8.ebuild 9088 BLAKE2B a5681497e0f1bc1c3b10a5a2f6c0233787d379d82df41cd3c2852f22acde9954ae40b22dffc209616e5ea04ce3825fc2610b7f5ae7a86bb21b1a3855006e71f5 SHA512 17b71b82bf1660b873c4528e316cae3f713209ce1e2b54e6a9272b8d2ed78d2b387f6efe021ad3acb4bd70425d8bea1c8eb94013e72d88a6952a47d776f8d84c EBUILD zabbix-5.0.0.ebuild 9102 BLAKE2B 03f011a80a0b3ee224c24ab3d4cfeef0e0307a70202cb7af82b8b043fc6729fe9e1750d018422e50106f2f60b15c09e7ab1becacc271d39e8e6178de67d2fc11 SHA512 f50a8b85390edbf70fac2edd58dba016e69360a36e3485bf5633f59f4dabf6994924b134d42ab7386329e0658e3bc3979ad90b3759c905ac322870b5b97e3839 MISC metadata.xml 1518 BLAKE2B 3ec0ec6fcb2e8d92209689d685171ad4d97a81d89f60719cc1de88b88c0f91a86a5422359e84c665ed140b6dc764164a75177ac1cc2fa0d624599bcc050d057e SHA512 6a131659395d29c72126ea38648ec273c444497f592f830af6afb7791eff4063de1349059ae11917a3356c22b38f5ac954593394ab03b955183ae8011dd4b173 diff --git a/net-analyzer/zabbix/zabbix-3.0.30.ebuild b/net-analyzer/zabbix/zabbix-3.0.30.ebuild deleted file mode 100644 index bb8e85472a3c..000000000000 --- a/net-analyzer/zabbix/zabbix-3.0.30.ebuild +++ /dev/null @@ -1,350 +0,0 @@ -# Copyright 1999-2020 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 flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs - -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="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" -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 ) ) - 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] ) - xmpp? ( dev-libs/iksemel ) -" - -RDEPEND="${COMMON_DEPEND} - 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}/${P}-security-disable-PidFile.patch" - "${FILESDIR}/${P}-mysql8.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 - - enewgroup zabbix - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix - - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default -} - -src_configure() { - econf \ - $(use_enable agent) \ - $(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) \ - $(use_with xmpp jabber) -} - -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 - - 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 frontends/php/* "${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-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.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 - 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 (e.g. ~/.sendxmpprc when" - ewarn "using sendxmpp for Jabber alerts)." - 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 -} diff --git a/net-analyzer/zabbix/zabbix-3.0.31.ebuild b/net-analyzer/zabbix/zabbix-3.0.31.ebuild index ff07f82291b2..ca1bbd3d9498 100644 --- a/net-analyzer/zabbix/zabbix-3.0.31.ebuild +++ b/net-analyzer/zabbix/zabbix-3.0.31.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/stable/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" 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 ) ) diff --git a/net-analyzer/zabbix/zabbix-4.0.19.ebuild b/net-analyzer/zabbix/zabbix-4.0.19.ebuild deleted file mode 100644 index 5fe2b0dd7666..000000000000 --- a/net-analyzer/zabbix/zabbix-4.0.19.ebuild +++ /dev/null @@ -1,350 +0,0 @@ -# Copyright 1999-2020 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 flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs - -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="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" -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 ) ) - 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] ) - xmpp? ( dev-libs/iksemel ) -" - -RDEPEND="${COMMON_DEPEND} - 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 - - enewgroup zabbix - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix - - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default -} - -src_configure() { - econf \ - $(use_enable agent) \ - $(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) \ - $(use_with xmpp jabber) -} - -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 - - 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 frontends/php/* "${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-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.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 - 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 (e.g. ~/.sendxmpprc when" - ewarn "using sendxmpp for Jabber alerts)." - 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 -} diff --git a/net-analyzer/zabbix/zabbix-4.0.20.ebuild b/net-analyzer/zabbix/zabbix-4.0.20.ebuild index 3313b71565c9..a6e36395a53c 100644 --- a/net-analyzer/zabbix/zabbix-4.0.20.ebuild +++ b/net-analyzer/zabbix/zabbix-4.0.20.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/stable/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" 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 ) ) diff --git a/net-analyzer/zabbix/zabbix-4.4.7.ebuild b/net-analyzer/zabbix/zabbix-4.4.7.ebuild deleted file mode 100644 index 4f4099f27c63..000000000000 --- a/net-analyzer/zabbix/zabbix-4.4.7.ebuild +++ /dev/null @@ -1,347 +0,0 @@ -# Copyright 1999-2020 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 flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs - -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="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="amd64 x86" -IUSE="+agent java curl frontend ipv6 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 ) ) - 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} - 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 - - enewgroup zabbix - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix - - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default -} - -src_configure() { - econf \ - $(use_enable agent) \ - $(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 - - 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 frontends/php/* "${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-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.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 - 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 -} diff --git a/net-analyzer/zabbix/zabbix-4.4.8.ebuild b/net-analyzer/zabbix/zabbix-4.4.8.ebuild index 645e67353269..4ac5203ab7b3 100644 --- a/net-analyzer/zabbix/zabbix-4.4.8.ebuild +++ b/net-analyzer/zabbix/zabbix-4.4.8.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/stable/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+agent java curl frontend ipv6 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 ) ) |