diff options
Diffstat (limited to 'net-analyzer')
200 files changed, 2982 insertions, 2968 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz Binary files differindex 73dfbe813904..f11050f75daa 100644 --- a/net-analyzer/Manifest.gz +++ b/net-analyzer/Manifest.gz diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest index 28304487b183..ae3c3eb8e4de 100644 --- a/net-analyzer/arping/Manifest +++ b/net-analyzer/arping/Manifest @@ -1,8 +1,8 @@ DIST arping-2.17.tar.gz 174346 BLAKE2B b0a095ff4e39e8f08b25a10db828e4ab9f60299043fbefc353b9df14e5bae839a93be20724ab9758b5bfc830c211e5f9bdfd606e321db508dbce9886b5903b09 SHA512 062026f522ab3d3b96c05c97aa3133995bce808a25a470207359a1236886da0300368ddac7d76568201510c0bcc2ac4ef6b34b2284c8d367c1be41972f0ee1c2 -DIST arping-2.19.tar.gz 177178 BLAKE2B ed8936b5526c02526d3cf0f208be0cbb91034fec861a26ae9f3fa7a865597ae8ba9d9b15418b07e930b7b5d1e766e4a4be4b4b61e5ba313dcca0f1e038373a00 SHA512 7ad242202432d91adc34b049c5511529789cf381ef02e803f8fc61394a5540427b719981946a36f692df9b1b3186e3f39b0f867f583aa42e237ae7f7549822a2 DIST arping-2.20.tar.gz 48102 BLAKE2B ce08c68e5d76db89f4f9ecb31bcee3316064cfd8ffd9615964677db33f214b856300de0dd2619430ce934b19f260cd38c8fa892636787ae4de82022301274a06 SHA512 c5fac3b43a9be8c63ee7707a7df1cef2d75c6f7944cc6e580450a6558fb7e72b0d97d09b5c9b4a3aa86a59f49faba94b39bd634c93917c11ae20ac59e8635282 -EBUILD arping-2.17.ebuild 721 BLAKE2B 3b34ca9fe025bcc6a7f0282999800218408f3a09571955554f2af34c5398f339bcadd62bb18a50059110621856b0db9461ccfa7bdb89376cd7136aba4fc2ef5a SHA512 29f25f6c3c5dfcd39d0a80cf4a7d2f7dd0a82058a1ed93e6dafbce8d6cd18eef08a879a2d53c2be820c99e8e68ed604da1984aec1b99b9e3c8cb432c2348fb50 -EBUILD arping-2.19.ebuild 729 BLAKE2B af75619dbd47a05ddd7956da56bac240eb19017df187f895ba5ecc74623bee988a2e256f330a0614dc3cde14226b9672aea3d20c56d7d6c09abda012f24b5a02 SHA512 4519008c8b2de9c878243cb07a78f5dd4166fdfb118289bd9ade85496ca9eb9658576ab99fe3243fdc2e1370ae97a041885830fb2acb17211d12e2f12c4ef74b -EBUILD arping-2.20.ebuild 811 BLAKE2B 823c9a759cdfe2a831fca83d6e02dcfff9c4fac95af8c7f134809191414c896c1b5af1e4e5092fbc51bfd4531d09245081b925d5d07055af8f0c9a50338c235b SHA512 4a40d0e652c6384966946b2de7a983a26895c2e30158aa5581053eca20802b6339b778a49ec29d560fb5ede72d8f87b28dd6d0ea71bde7f9c2ae2c534eeb6f1e +DIST arping-2.21.tar.gz 50067 BLAKE2B 67b76cc48e9717117dbf43702df7f422634ed40196ec44d273a773610618922ddf7de47ffdf32cb7296db1dbce0a696c57b7992e6ad11f6fddf52a16212154fc SHA512 e976ce1a3ec0e4f57bbded09c6a07934e21df66ce7931422c420f5335dafcd88968f03ba6987d192dcdf51cca89180c86337aff50806713c7b04cb13e3e83504 +EBUILD arping-2.17.ebuild 718 BLAKE2B afeeebbeb658b4aa5bb74a0696a08a7e18f53a0da4a2349ad8f577aec0af5253e9630c086f065762e1644ecaf0c3406bf243193d095bb05c0e1dbb3ebad8a55c SHA512 85846c582ebc68c58da6829f2ab6e9af532b157de9ddb590015a322669cb3da2e07712609b5635e2dcbac2fe28189592705348fef4797eefef8a4048f9e1c4e7 +EBUILD arping-2.20.ebuild 807 BLAKE2B 4dd3667f883eb173f8dfcdb57a64f69f90a84972af6c0b6b4e46b3e92a4511e44a3928e34821d2951f883515c0f75bafbb03225303c47c383e4382a258d0328d SHA512 aeb3bcab144934c1aff8fe6506252e2e26cfff8cf3c7d9087c00dbd4a7e49f9f56ee1b8bfb22112ce61bbb06e4329ae75284761e838f97f39667c44a59d90cbc +EBUILD arping-2.21.ebuild 807 BLAKE2B 4dd3667f883eb173f8dfcdb57a64f69f90a84972af6c0b6b4e46b3e92a4511e44a3928e34821d2951f883515c0f75bafbb03225303c47c383e4382a258d0328d SHA512 aeb3bcab144934c1aff8fe6506252e2e26cfff8cf3c7d9087c00dbd4a7e49f9f56ee1b8bfb22112ce61bbb06e4329ae75284761e838f97f39667c44a59d90cbc EBUILD arping-9999.ebuild 628 BLAKE2B 90f247f73d143e302004ac102e67baacf27385e1943d2e0bda9667aa8511fc3c5839b55738c4cce91bd649eaa51ba04d7face31680e561effd9e16db38f86753 SHA512 51046ede312bd8de290bb6c96bdea0aa2c95b2b6975af2bffc5147e3d82766b0f1d7528dd22c97eb838aadfc48b672927cc1a5a638b010105824d109aca4b12b MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/arping/arping-2.17.ebuild b/net-analyzer/arping/arping-2.17.ebuild index 349568e67984..795d562c6a29 100644 --- a/net-analyzer/arping/arping-2.17.ebuild +++ b/net-analyzer/arping/arping-2.17.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz" LICENSE="GPL-2" SLOT="2" -KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="test" RESTRICT="!test? ( test )" diff --git a/net-analyzer/arping/arping-2.20.ebuild b/net-analyzer/arping/arping-2.20.ebuild index 2af28124c81d..7c39a6fb1a52 100644 --- a/net-analyzer/arping/arping-2.20.ebuild +++ b/net-analyzer/arping/arping-2.20.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 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz" LICENSE="GPL-2" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="test" RESTRICT="!test? ( test )" diff --git a/net-analyzer/arping/arping-2.19.ebuild b/net-analyzer/arping/arping-2.21.ebuild index 8c07c531c864..7c39a6fb1a52 100644 --- a/net-analyzer/arping/arping-2.19.ebuild +++ b/net-analyzer/arping/arping-2.21.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit fcaps +EAPI=7 +inherit autotools fcaps DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it" HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping" -SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz" +SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz" LICENSE="GPL-2" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="test" RESTRICT="!test? ( test )" @@ -26,5 +26,10 @@ RDEPEND=" ${CDEPEND} !net-misc/iputils[arping(+)] " - FILECAPS=( cap_net_raw /usr/sbin/arping ) +S=${WORKDIR}/${PN}-${P} + +src_prepare() { + default + eautoreconf +} diff --git a/net-analyzer/bing/Manifest b/net-analyzer/bing/Manifest index d96ec3591582..a7f3aefff057 100644 --- a/net-analyzer/bing/Manifest +++ b/net-analyzer/bing/Manifest @@ -1,3 +1,3 @@ DIST bing_1.1.3.orig.tar.gz 38847 BLAKE2B ba01ff0e9a53fa8e9cd44ee085d78ae8d8891cc5478697a0d8fb13917c9a4104a672dcc7aba0c6c91e7f0084ac4254b6f565cf44486b6162225c5a21cb1614a7 SHA512 df56f93047454a02b305154b12898b063c340e96778db9e11114ac4598446648b3ed5fe4304e0f3e33f612069b0f0e4e231396ee878655683f923ad5418d6242 -EBUILD bing-1.1.3-r2.ebuild 604 BLAKE2B e96192ba7e9eb17aa28a8e66628153ae652fedcbaa916482d81c56c16e7d14fefe0b0948763b048fb9cad3ede0b3f90952444419267b496277384fbc42d1a748 SHA512 1585c67cb662f5b0207a4e5cd6655cc16459e7763341b4482d69ec88998a0215cd2eedbbfd2d3f6c945c3f5ab2be754e2d58cbc022914fe150b64698c2219213 +EBUILD bing-1.1.3-r2.ebuild 605 BLAKE2B 762559fd5373c6dcb4023ee65edd81d2a8b7a136e4cd042e1f32d3031532449c0ae3d191735b685268d3fe6e56c715626b4a620e7a0dfb2e24241adf887789c7 SHA512 b8c3319d93640063415ae7aeb3721f341a4cb39b8949df0e51913a85091b1b90a7920a8100252be741c2345f1723f3c594ade7ce4c18250e634fac82fd5f73c3 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/net-analyzer/bing/bing-1.1.3-r2.ebuild b/net-analyzer/bing/bing-1.1.3-r2.ebuild index 83f643000e81..565ed702e870 100644 --- a/net-analyzer/bing/bing-1.1.3-r2.ebuild +++ b/net-analyzer/bing/bing-1.1.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,11 +11,11 @@ HOMEPAGE="http://fgouget.free.fr/bing/index-en.shtml" LICENSE="BSD-4" SLOT="0" -KEYWORDS="amd64 ~arm ia64 ppc sparc x86" +KEYWORDS="amd64 ~arm ~ia64 ppc sparc x86" src_prepare() { default - sed -i -e "s:#COPTIM = -g: COPTIM = ${CFLAGS}:" Makefile || die + sed -i -e "s|#COPTIM = -g| COPTIM = ${CFLAGS}|" Makefile || die } src_compile() { diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest index 0c08e3624c63..a6a3ac8a6279 100644 --- a/net-analyzer/cacti-spine/Manifest +++ b/net-analyzer/cacti-spine/Manifest @@ -1,6 +1,6 @@ AUX cacti-spine-0.8.8d-ping.patch 260 BLAKE2B 4c6ac12fcb0fd31f6e53e46e5de39f34c565ee8ae1dbc947949ded2cc65816f697b6f4de40e0441c710b092f30a3b1eadf292b1065a17f385327c70071ca9713 SHA512 5bd91a390e352930d2b89f580fb0c3e93dfa9d52c86b16a0b8c036452088757e2b739aae05b3f07301a3ed94dafe6f05cc593b28359261b6664d002c907cfb49 AUX cacti-spine-0.8.8g-net-snmp.patch 673 BLAKE2B 90badfc18bbeb3cd4a6f381ac732eb07ae371a25b4951728f129df617096f9c62203643cf2c42008e534c7ce0d51fa0a14e8e24a595d2e5dabbfc2badf5dda97 SHA512 4eadde6b71eb20df4baf42241e7ec9b4e99af6d5f2023ea044ec27c379a8e7c4d3accced97091764ce1c946e30eebafb18c7f598be280e9b6b0b255c27f4ef57 -DIST cacti-spine-1.2.9.tar.gz 106572 BLAKE2B 803d16b6708e4cc5fc5ea9a5cb49bfd535fea421a873ce9baf74e1de75597a5a4941a909219d729e291ff3201c0f9c2a8304381144d935778ef331779395c688 SHA512 668b25cb89fad331ae4bc726b797bbeade74c90500af348748a995be0de2f699264cd24e98ea709214453328058e1dba6399dca2074bb6ce71e0d4b434b9dee4 -EBUILD cacti-spine-1.2.9.ebuild 893 BLAKE2B 6cf6f61d4bcbf6bdfb8ba26800ab92555f75f71b69f567964aaca60ef8ca438f8ead73a3276564365f20e4cba7d609199c62d0f356659d78f881932871d52852 SHA512 085cd6edd7a13757e84e63f46da3a674806c88596243c2d9af12189ee2974d5558aa772c7eefb902d565dafe60551766be5cac15f5a599d6e5357535dedfdff3 +DIST cacti-spine-1.2.11.tar.gz 107495 BLAKE2B faa2356e374f392565d3a1fed446527bd5be9cf63ec1b286e0e6069503b80fea9042d367f087f05ff5660a0fb647a2d2478c6f25a557b8aec821a151af2a7f02 SHA512 6c7dd2c4b35040cce58714e1b238b473d42465327cde469cb09c304d51fe74b0731ec4ed4d70321c092d6efd4eac6ab375140beb5d552fcf7ad4286713a4f22b +EBUILD cacti-spine-1.2.11.ebuild 893 BLAKE2B 6cf6f61d4bcbf6bdfb8ba26800ab92555f75f71b69f567964aaca60ef8ca438f8ead73a3276564365f20e4cba7d609199c62d0f356659d78f881932871d52852 SHA512 085cd6edd7a13757e84e63f46da3a674806c88596243c2d9af12189ee2974d5558aa772c7eefb902d565dafe60551766be5cac15f5a599d6e5357535dedfdff3 EBUILD cacti-spine-99999.ebuild 884 BLAKE2B 5df3c6c34e5b6d1fdf833d49a5a4cd1e9c6137199bd54879f47f632059b8cfa1d836d68f3f0abf126f66a0f78e6c3166a322b86df6f1b8f2acd709691f1e22b1 SHA512 7d2dface1745bc2847de70b2b8067822438b4d51d0039e1e9a9e4599d2ff64cbdc2d2e431a7e6d81694c1c23158a2f1f99cada8f374eff60a31ef9da6e6c0566 MISC metadata.xml 728 BLAKE2B 5e36aa5717b3f0f72d1d5116e9df6223fe4d99040b970fd86baebbc6835fa0c673327114dd867a2e52822fa71731b3e1fc3e93b77344be89de8fe0b9b648286d SHA512 a8aef67f6761ecf0ac98771a82908e67fb9aead1a32f7ececb8c80ae46c1a431abcfc1165ed471dd428bd6c0a5d4bdc2ddbea1c86ae5c917ff9786bacd6d0f38 diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.9.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.11.ebuild index ac2422dded6c..ac2422dded6c 100644 --- a/net-analyzer/cacti-spine/cacti-spine-1.2.9.ebuild +++ b/net-analyzer/cacti-spine/cacti-spine-1.2.11.ebuild diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest index a5c1836f2918..f3c64f39c0b4 100644 --- a/net-analyzer/cacti/Manifest +++ b/net-analyzer/cacti/Manifest @@ -1,4 +1,4 @@ AUX postinstall-en.txt 2249 BLAKE2B ec7a32177aca0ebec0194fc4dee825251a5ac71c1005c41f91ba7e7da690e8b3734312b7df5ef506aea771284264035517a73c12d37be1e9479dea7e6e5a99d4 SHA512 8df52b187b301b42382746f9dea43993f7963edf018bc80e94305a743ea5fbb024d670917c0200f4782c0a3bd47abfb879c755ad415581616ae5c6413cf00623 -DIST cacti-1.2.9.tar.gz 24906227 BLAKE2B 65a4459f9f55c55db853f81bcac6c60f146ba50f6dfd0abde449a41847afdb8564452ede1a493291c19ee7732ccc4a76d485af078021c7e0fcb6d1b265994940 SHA512 e50eb5587dc0274788b35cb701383ba897ab7c45a65efc7a8d32963b492c1ff1b96b0271ab7b6f9b53ad7dff5dd66b3ce4bd4a91c3ecf8ccd8d4b19b3ac972e4 -EBUILD cacti-1.2.9.ebuild 1010 BLAKE2B aa1febefca9f600b00b544fd86167386e984c6b3134689023367e8795e073684ba8801910675d19568b8b34b9d7ebd1c212618017826bd60fcfa96a3a03a6680 SHA512 75a010fcfa28e289810ddd10a3b0f6c507ef608eb9176199d2d965cfea6b900eb3a9768adc5eaff56e46d0b15e82aa62e7b6c8ee9df6ba63338758f4240b1b92 +DIST cacti-1.2.11.tar.gz 25099698 BLAKE2B 25d974eb21bafeb9d5c84d1a857b1d95803945c73b21fc4e7219c5349c15aebb4d0130dc9701b3a3615c3514bfa3f3a29286153ba8f7cb515a255e06f20a56a9 SHA512 ab8a856fde55f405314fe0ec1eccccfb78105181fc081dcc04091963b08777550182867b45daea4f630f19dbb538ad7ca5c62f2dac9cd867524dfef113e2a220 +EBUILD cacti-1.2.11.ebuild 1010 BLAKE2B aa1febefca9f600b00b544fd86167386e984c6b3134689023367e8795e073684ba8801910675d19568b8b34b9d7ebd1c212618017826bd60fcfa96a3a03a6680 SHA512 75a010fcfa28e289810ddd10a3b0f6c507ef608eb9176199d2d965cfea6b900eb3a9768adc5eaff56e46d0b15e82aa62e7b6c8ee9df6ba63338758f4240b1b92 MISC metadata.xml 834 BLAKE2B 964a66f49027e0190434a6fe4dfdabd9153cb9a44b8b23ee1a0331e9c38a9ca1480b35412a2088d2ffc7feba6232330e26c8156b4461d663cb8c3bebbdf0e250 SHA512 f74b807c0629400ad06ee2b03650be38524268b2590d455ab4b672bc2c6c13856f881226a7c1d6e74e1acb6f85abc3d5bd311abaa6571216aca7698e8368e616 diff --git a/net-analyzer/cacti/cacti-1.2.9.ebuild b/net-analyzer/cacti/cacti-1.2.11.ebuild index 096bfc1182c1..096bfc1182c1 100644 --- a/net-analyzer/cacti/cacti-1.2.9.ebuild +++ b/net-analyzer/cacti/cacti-1.2.11.ebuild diff --git a/net-analyzer/dnstracer/Manifest b/net-analyzer/dnstracer/Manifest index 3f569a1eb5f5..b0351778d9dc 100644 --- a/net-analyzer/dnstracer/Manifest +++ b/net-analyzer/dnstracer/Manifest @@ -1,4 +1,4 @@ AUX dnstracer-1.9-argv0.patch 343 BLAKE2B d3a1fe5b9aec3099ef2e385fdbd4e638cd8877bf533e59abbbfdf46bb80d6c0a64f4d3ad6ebc96e83bb007bc3bd22a1c26815fc7a7e98e63d8ef7a975f0307f4 SHA512 6871b93a4ebf1d307c4ef56ca134d8e39c152fe22564e6845ead6d7d97c96ff21982649808618d098b7105159a9bf09a201c4147c61be0b98676a69a9f4bfaa2 DIST dnstracer-1.9.tar.gz 130884 BLAKE2B cf08795eed59851c6da5d5c0ecc1a0b8445584ab10a9adf3cc526f5f831ceef9ed8deee8728ec964c35808a71e865f841f698403bcc0f16346e3abd5e13cac8b SHA512 e69fe772062ff315ff3148c26df78bd41c75d11dcfa6431f1e9374e6069182bd80826b22dc116011d975838d9527913d46edd78de049edd25e3ac9247d5f3473 -EBUILD dnstracer-1.9-r2.ebuild 528 BLAKE2B 58c7cac8e8a3c73eb34e739eb72c03d1f669fa23ea148cde47fb6d4e97c6c793fb089e7d780236ee6ee562731a1d51b31db58aeed5e607c97338365029ee3bd6 SHA512 a344a7c63cf1e69468fb35d70a7aecd19d2665d6332269a050354a07c60bfd626c54a66d5d6d1b5100929f1dacf5e36df534314e0561105141a7580518a92c80 +EBUILD dnstracer-1.9-r2.ebuild 529 BLAKE2B 98b954fd431a19ac9bdcc6c4a03b205a26a8e2a6976ee021887b6924be2d1aad4f24489b5ca5ba503f9afd1f47b8ce8d79a8862a1aa7f7ada2d8752158b91d44 SHA512 0de06d1dd0e15f6f71f733a24f24e6fcb13b950fd3e4bd584ccc4686503609f668f25f0fbf6337b537b542ead4de1c426fc160fd597739f7029cf543c1fd730c MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild b/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild index 2db5b7bd0e74..2e93e346523c 100644 --- a/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild +++ b/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://www.mavetju.org/download/${P}.tar.gz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="amd64 arm hppa ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux" +KEYWORDS="amd64 arm hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux" IUSE="ipv6" DOCS=( CHANGES README ) diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest index d0fd73d7e2e1..639d6dcceedb 100644 --- a/net-analyzer/fail2ban/Manifest +++ b/net-analyzer/fail2ban/Manifest @@ -4,6 +4,6 @@ DIST fail2ban-0.11.1.tar.gz 538660 BLAKE2B c88765ac3f49c19e0570248891814c647f2c3 EBUILD fail2ban-0.10.4-r1.ebuild 3216 BLAKE2B d807e5422811d4a703133ee2b435926d4f3aa17f94281ded5972374180203a7baa3045c7f3a306be8a3e9105250a06279e097544378c8e9ae82003470eed9de1 SHA512 1ffb020f2cfa7927553a6715be23681d6f7917273036af304b4e44bdab1342662824efbf3c9d5822bded8bf552eb4bfa1d439d972ff27f282b41ed052442a74f EBUILD fail2ban-0.10.4-r2.ebuild 3259 BLAKE2B 1f10e15e5baa979906974fdee8d6a3050f9570b2861dd72ea2b4a7282fa1492885590fc22e9d5445f79720f1f52f65544ce286c57e43ff73156af5b2d038fabf SHA512 606d8b0bb9f1b66a5b65dce012f19e3d90231d033bc72dab513af2179bad23b0cf96378f65b3437c73c6c38a69ea91a71e65d837a1afcead25312ffbd3abb8d9 EBUILD fail2ban-0.10.5-r1.ebuild 3381 BLAKE2B 27c5f4a366091b2e64c8cf1b133bdba9739673a85613ef5130d42eee7296355796c2b9c862129c41e2b0a4e3881bd23ae7cf47781c08c4b91689f75ecd0f2bf3 SHA512 6021f943f4d5bf45b137df2631c73a16e4e38dd4a190d059b401179daaa4938ed94b55eb769fed0bb96eb2c9ca054768fd50a9ed74438730635f2ecf41bf453c -EBUILD fail2ban-0.11.1-r2.ebuild 3331 BLAKE2B 2b9c142ff0c09146bc13f1fc948ce6ed4bf24c1f579c7eb4c37e427540b031a7ed9b110e4811ccc64274e4ff0d580e88968440f7f5b2217b278ff617df5387a5 SHA512 0e319a557b1defbd9ea3b21185e93f8aef6240d397478de3747392f10a7eb6b91bac9e6669512b63f08c6c749e2e9b76bda66b5b55eccc82dac29e35ec802d4b -EBUILD fail2ban-99999999.ebuild 3260 BLAKE2B 1eb373ec59419250e94593453c2b3940c4cf6e6df0061b4c019d8df0b783a88a0ec4d36c29bc004105eb3f25f29989d25a11a00e9cb5b8b3ad9d770549fd8d0e SHA512 d85e54971603803631fac51ad5a65fbea837dbae3ce9bbab0a5f26af4e501261362aa71b7482933e6398727894fb5b99c6453779ec378a40f401fd9708cbd0aa +EBUILD fail2ban-0.11.1-r2.ebuild 3335 BLAKE2B 826790fb32386ba0770657b81d5cc35cac20ab1ff924cf87950c53494a31aa8323d44aa92dc1f9a5b3691df6fe5de5e957b9bd106ba10211aaac20f127055366 SHA512 75469e838b1991997f14e87514e61d5bd450577f919e67e8945003061b14c74d92eaf0702e6985d448837abfaed6d4d968fa07c521bb5c702b4227b7c837a1d1 +EBUILD fail2ban-99999999.ebuild 3264 BLAKE2B c6b6d7983bfe24941a3d22df8bb86683eac433977d6be7366f005e6e94cb1dec8db40050da768f901c9f5f524b708c7dd442d1612c6ca07a727b0127101a770d SHA512 20c092acc70eea675c0147e7cfa65d86bbc1233669e7ce34fbd2686fc3aba1217acb4ae35b7fa8360f42f843cd6bf5a4a021747eb4d25589babde78115068649 MISC metadata.xml 372 BLAKE2B 7fca866187d9a128e6fb6787a4099d7a6442e0e51e558786773b91c3e2f06e67167d76f9bc96be0fe1baa1c44fc3f0e9e2105a327a10cb2720b3e3f9e4303a66 SHA512 4d5710e2fb4a7c353ca6bd3203bceef57d4d004367993dc1044800ee8713a3f4697fe8ba3472a73ecd015503656dfb7cd68d674c99188ce5702769cfeaf06b25 diff --git a/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild index 12997e0f764a..a9be25c75638 100644 --- a/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild +++ b/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7} ) DISTUTILS_SINGLE_IMPL=1 inherit bash-completion-r1 distutils-r1 systemd diff --git a/net-analyzer/fail2ban/fail2ban-99999999.ebuild b/net-analyzer/fail2ban/fail2ban-99999999.ebuild index 4bde96c6afe5..2fe548988a01 100644 --- a/net-analyzer/fail2ban/fail2ban-99999999.ebuild +++ b/net-analyzer/fail2ban/fail2ban-99999999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7} ) DISTUTILS_SINGLE_IMPL=1 inherit bash-completion-r1 distutils-r1 git-r3 systemd diff --git a/net-analyzer/fping/Manifest b/net-analyzer/fping/Manifest index f13de05a894c..c88d2290fcf2 100644 --- a/net-analyzer/fping/Manifest +++ b/net-analyzer/fping/Manifest @@ -9,8 +9,8 @@ DIST fping-4.1.tar.gz 170851 BLAKE2B 4cad16f05afff5d1755f58be454059d1959cce1c9f5 DIST fping-4.2.tar.gz 171409 BLAKE2B 7f61d7bb06e486c327539443bfd441e494d44cdf0f949c73272e51e0867f1b39b2c3ea7df62856b493e05d9964220e03e632df839a84a15ee92168389cc55668 SHA512 2bab34dae539d942eb5e436802e6f74d57c04aa4b782f9adbd6c27830209fdb47707131f20ed966012bcec3d253c9bb3df9033a60b55bfe560af6bb1f572ee8a DIST fping_2.4b2-to-ipv6-16.1.diff.gz 8488 BLAKE2B fe229b5042445665403f40c5a7740e024c836176a375c77440a827463adb3ed219a9c6da73375482baa81c1134764d3cfafebc44aef7596dd380e0964ff130e0 SHA512 6af25324d159df4ddd7dd909e2e1a0d85e08c2f51c31469960c2dbc7a9eb4967fd114eb87361f8c6b1691de60e7f753d371e6c902bec706f3fed3d205fbe49f0 DIST fping_2.4b2-to-ipv6.orig.tar.gz 63333 BLAKE2B b3495c304d1108732cf5aedbf3665ce2ce50be5ca051b724e92583197f9aa7f84e41655b9c3438e0715eb8210ec79fb17a020904fa0d1cfef43f7178f622ea87 SHA512 3d1a76680d3a7cd361481d6e6de49797fbaf01422a73c784c8b667131afd56de2bfbbeb17014047cd2dea903f87d9f19e38ed7b0a5c2e8f2faf82759bf064ff9 -EBUILD fping-2.4_beta2_p161-r2.ebuild 1188 BLAKE2B 830412a3bc9889b6e9626c6932c2540d1b7e5eadf000c3e34faf74556fd5baef02ab6b1a7f601641df1c39e3a4a47190f7120c407cc87e9ef2a531700ff7b80a SHA512 9672c71fd45269022a9b136dc01cc42e5d0673e7e888a87490c963ad92431a482a39c2af85c99e704d6bfd4096784e7465b6378a99312b8ca91e4ab7d32c8655 -EBUILD fping-3.13.ebuild 549 BLAKE2B 03df712a30263a13ca8224be6c4dd288c5a27c133703fdd77dab36b71770ce6a3f82593c904c97b7b560db5d7b43213f61e3700eff2653a42e921411af47a036 SHA512 dd6fd95a7223a9a94fc222b7257b62f069e83769195ed815b2f3c7a0f26fbbe3e39dd7abd92129bbba06df1362840d4aeb7caa90beca6d4a9fdd259a5deacac4 +EBUILD fping-2.4_beta2_p161-r2.ebuild 1189 BLAKE2B afe89e154f87e6aca77b4de90cbcc2d201713ba946d5b667f7c4fcb26314f5bf42d2079d88ae20d647b3cfd1d147b64eb600ea9d7cf08cf0c1b9048914a8b68e SHA512 0b94a677b031fc3698a3d6a9f9cff27f6274085f06c6936e920beb948c84fbffee8b2d7a0e88f7dc1c2f16ff1e0d3bf75e4c501505502966fc617ce7e06528ad +EBUILD fping-3.13.ebuild 550 BLAKE2B 8a2e24aa3da841fd15202edeeaa963da2237aecfee1d89ccbce819982ad53f6efcd82dbc7f43cb05cec493af6a2810ff8431bb3e1e99e6dd5b42abf6efc6afa0 SHA512 720857d4d7b5658fcb0c2a125c235fdbd9827dda8a89edab1f23fcbd939ee26160d12bc398925715988a0df4900f37e145c56d626bd591035a0d85d2cc7dde9d EBUILD fping-4.0.ebuild 524 BLAKE2B 37afe8c889ff6a04e9a452686a22bc06378b20f09bb7eca6e4c9087dddcf3eda4c2db965f2125ad9c584cb13624f54a02fc8225fcc9810b0ec6200dcfe0d35ac SHA512 e561eb0d9a1090dfdaae4d9fbc5d3207ff27969a26d659e9c3d5a35b6488755d00be8064f578e97ef54a7d40d2521e6d761c8a0e1e0ff2dd7443591deb3579b2 EBUILD fping-4.1.ebuild 573 BLAKE2B cacfc3f9367c046a70e96ed2980a8ac416a383d63cc915f1cf9a42093f9e40eaa8405a46cc8dbee6111d92fbe440921efe26546cb8eca7552a90e1cbc1fe98a4 SHA512 466941d669576fe07cd4e34b75e8b7e648a8e9997776fad2a2fcb419da54f3810844ac1125d0ddbcdb827d0b1794d7c31363c37d6505b19fdbfe2bc3add3e58f EBUILD fping-4.2-r1.ebuild 729 BLAKE2B 0e09d1adf6f798e073347356e687d1bf7d31b950d8dc0cd8630665bb6558bbd259d296156597de1a4f2cb7f933144007610ac7a10fc270fa56205cbb6028c325 SHA512 576c28d07fac7010c5febdeea586e5a0e4fbbfb217a7560eecc07f44308e071b15a95277e969d88469bd4e8a438b85fe918357bb12f6628d204f86503c60aa91 diff --git a/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild b/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild index e26b3ddcc421..23e248eb31f2 100644 --- a/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild +++ b/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://fping.sourceforge.net/ https://packages.qa.debian.org/f/fping.h SLOT="0" LICENSE="fping" -KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="ipv6" S="${WORKDIR}/fping-2.4b2_to-ipv6" diff --git a/net-analyzer/fping/fping-3.13.ebuild b/net-analyzer/fping/fping-3.13.ebuild index fa15e77e7f97..a4c4388c06a1 100644 --- a/net-analyzer/fping/fping-3.13.ebuild +++ b/net-analyzer/fping/fping-3.13.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://fping.org/dist/${P}.tar.gz" LICENSE="fping" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="ipv6 suid" src_configure() { diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest index ca9dec8f133c..d1367b957bf0 100644 --- a/net-analyzer/graphite-web/Manifest +++ b/net-analyzer/graphite-web/Manifest @@ -1,5 +1,5 @@ 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 DIST graphite-web-1.1.5.tar.gz 1173809 BLAKE2B 94a1b4deab3159d3bde2d3c8b6f9664f39942cb1b815ce042b196be3c0e769ee1acac4b619135e9471360849308b90e02e1df4f7d6b7d0ef31e46d38ee2425e5 SHA512 b2097609ca77a40e6e7d83a3141335e2208d69e7f4edbac8ce3505ed9dd654589836a3b3498bfb7f7585332bceeb8e367f0c10f3cf6afdb5ad6b96377338a7bb -EBUILD graphite-web-1.1.5.ebuild 3094 BLAKE2B 1db35a156c7ccbae29aa475415833015fcaadd450cb0391a00b2600ef501da8af165816d1aa4e49ce627be4430271b0ab64182cfb46a31e5e9441fd3661eeba0 SHA512 14a1ad66884c01131e703e1074ff8a812c76ca65786836988c8e9256d0004b4278a9e1fbd97af71eae46dccc151adf9564efaa013961bbcb5f2841b61e45fabf +EBUILD graphite-web-1.1.5-r1.ebuild 3045 BLAKE2B 5bff9640ecb28a608b661dbafe5d7b94b36ca21f55df3dbfd1f3de3fd5f85fbdd5b5d68faecf774c2cbaa63dc5e77812b53612bb2f7f558bcef4a2aee435567b SHA512 d224b3c3900a2d737564d81413a14a64c57fb113d0a548583d0e9e2d2c05d767e06ec59c8e7a70a1878dbb256970cae6070bf30f89018f8588a96c3ebf467968 MISC metadata.xml 592 BLAKE2B 1c284eea68c1db410d55439c14dbf245651157c8f3cb2c77357e50ad8d4426e1c2faf8bd767095f49e9a711e84bbe8b5223aa26529d6dd9cd8dd08c3d8c7c75a SHA512 e9be9344db6989ed9d1d649fff05c4d05c72528097c6d921b5d0d31f9be65d1cfb02071356101f46ffddfa5b7a91785995ad59e15ba0fd78b75d785959051a98 diff --git a/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild index 25a6afa9f356..f0dbbc3d667d 100644 --- a/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild +++ b/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild @@ -27,8 +27,7 @@ RDEPEND=" ) ) postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - >=dev-python/django-1.8[sqlite?,${PYTHON_USEDEP}] - <dev-python/django-2.1.99[sqlite?,${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}] diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest index bba222949119..6762d02e2228 100644 --- a/net-analyzer/greenbone-security-assistant/Manifest +++ b/net-analyzer/greenbone-security-assistant/Manifest @@ -4,12 +4,16 @@ AUX greenbone-security-assistant-8.0.1-pid.patch 283 BLAKE2B 15f3c15da9cc198a0bb AUX greenbone-security-assistant-8.0.1-reactjs.patch 988 BLAKE2B b2e7929ac17d9bd8f7d2ef964b8ab479245a105a42c7c27cb1c0533014c93335683a465b2e67e324d692a61561a912aea484604cd650e79ebcc64390fb214556 SHA512 6dbff78f70620983ada5918d5ebc06b5a2f1077cffcf8b74fdb217fd7df45648c0b6b06367ca9b894b0106cdc7f4be1c05e926c0b9f5819507a548fc3fc26d84 AUX greenbone-security-assistant-8.0.1-sbin.patch 361 BLAKE2B dfa390d0545a470c73af5cc24059e09967a9134a9f361ba606450ce046999ba200198b8051b515d6c33361bcc33678037a65c7ba68f97f0ff140f0ce622fcacc SHA512 307ca36d757d6ec6e710b1d4ef14bc55a611f0b3b23eb1cf349faf5be298f3f5a6ba852900c2c9b5f03231627364dba021ce8fa3e4859fcfb65eb9049f18e292 AUX greenbone-security-assistant-8.0.1-uninstall-snippet.patch 398 BLAKE2B 8f9b4c754e4406d6830c69d029a05a3525bce3553550931424a12710b4b88f37257a8415e7219e2714985bf2ed76134e52e52a867f03c35c675debd5cfb0d540 SHA512 b0e44673687b09421beff5eadd02b86a25d87c531144a7c2ec087f48dda4463588d8c462c3b51431f1b5f69d7241ccb86e1eb702ddc8dfeb1402f2a142b29a4d +AUX greenbone-security-assistant-9.0.0-uninstall-snippet.patch 398 BLAKE2B 107dced9e5fe74901b0ab7c5cb98164bab43d4276793d2a92e86a1321408bbe0a98a0ec0038359ea1e1fc21e45b6af80f939160e511f1ef79abbb655bf7dda41 SHA512 582c34e24acd0cc181cb48749eaf4c48a6888122f6ecb5a27ff8db6fd0a095deea7bbbbdeb664afb6b31bc0b9056ae02838b52c51cd1bd5a6b05f3d6a47d4e85 AUX gsa.nginx.reverse.proxy.example 3835 BLAKE2B c4ec87cd5f1a0e5aedb93f95c7010a3f19b9123355b24b2899c157a532b020ba192ee6f5a382448b17fe0ff1d8473be6a390e0779d3f8c3963d050d0f5c91775 SHA512 c323f37f4dd1bc4633213f9aede141e2a915344df7aa8e7be043583e6a5415ec8fefea707f1cab29f478423165f3285c629da683515f08d6e046385fb7177751 AUX gsad-daemon.conf 416 BLAKE2B 7c6dff183ceb8afdbe7abb75333fb8aa570be406ecb18641e96d8045d793b6ef81b46acbfd243c4bb9a4bcb98cb6c039ebd0793c13855b7f5404e552a6088ef5 SHA512 7e696a3bb61310d7e8c553ed3744adb5fd60a75c83c0b9f99c76c092f78b4cf25d8b9c72b10d4a79ed501da16a27b8beddcda36f48acb550dfa01dbc19379f68 -AUX gsad.init 569 BLAKE2B 8fdfa94dd969e7947e1920c778034bd6db07ccf1be102e69a7c32cda0fb6111b7770d9458b4a86fad25629aba20768b8e6224d04c3d26088a253f665a9773e73 SHA512 806e669529fdaad52cf530df70aaa53889c3947f1dd3b6ec485501dca37fc2383452a7c2877ddca4e23e344f5bef612bbdbee8ca9921f32c907cccb6ced61a28 +AUX gsad.init 582 BLAKE2B fd158b117350b0025ba7853f35ccfbbf0a3d67a0fabc60d6b9b7b698fe432125de63329246b254b94cee0173ef7f0cfe4967c2cc64d7f4e522e5e45407621580 SHA512 46c8de9165767089ebeefa78062ed5e2d81fdc77c7348cc1725526278dfbeb79be767faa91a5d42bbf2d04523a750c8a4dcaf8293dc587ce1f2ac66cbba9b625 AUX gsad.logrotate 325 BLAKE2B 00fb4953308bbfb47f328a88541778adb2f8523108b72058e16f6e93c4c55b01bf668c57b0151555401d3bc989f3b8e5a4cb872f1b2cbae691a40dd590facb40 SHA512 ab43f8c54cf72e2a800bdcf4daebeabfa18a7ef49f098d65e70f97ccab3d36606c353b82b8fd6b4f2cecd289d36f48f805a5c34cba86f8e8c61bf074b0afe695 AUX gsad.service 434 BLAKE2B 43ac179a66d1f4ddeecddae1804ff9bbb48ddce7e7cd18feff6c5ca681ecd5f6401e1a26b94b6f5d5e83a9e59bcccf2f773edca50d1d2f9abca0934ac813fd40 SHA512 d842531486d852b710b512a631ddde75bdfaee1db097e024f0de439d9c8c3ed699f7116a685650f1acf23b1be982987d38bc16a0c3bd4c6405b16c8cffc5a476 DIST greenbone-security-assistant-8.0.1-node_modules.tar.gz 34084175 BLAKE2B 17c9e24961b63b957f932e4c5970113499ad65655b42e624284fb22a495d50c12e5f8289da4e17db717885b65909a6e18213fa312052c9c06c9bdc37816204f1 SHA512 552ea55fe218ae2345fa45b43af349825f255ccd86137dd245679efe6abc805d16c4ced3599f644d9b9f2686047b486d5e0c8aa4eaa0cbbf13157b9e2dbc8cc2 DIST greenbone-security-assistant-8.0.1.tar.gz 1558918 BLAKE2B 75287784ed215300cfb30101d39b06b134092ca2d4311bcca976be23cc289529c6a8d661b99cb28e890c68f27e93a9259681add067749a772b7e3aea28761f3b SHA512 b91c1c4b8073c3ad3d3d636abbaa7881393f1448eae7366636ff618391c199c240e6bc4c848740a4267b4142aa872fb91c0798b8034d152d16016e650fbda2b8 +DIST greenbone-security-assistant-9.0.0-node_modules.tar.gz 52811832 BLAKE2B e4d0f77722158b2fddfea55e8238abcc46de6aa821b81ca59087a0fc0a0c1383b9ce876a31d8f133cca53d9a81962a80925d5b26e036b09b3c3e7ef64edc3a29 SHA512 1bb3b338ac71c16375be6518fe371c1d8037de34067be9ecf1b423e5ac649825b2cbd36a29c43a3cc0b2b622a9b64ca356c4d073bbdf74b07c74953457f0b268 +DIST greenbone-security-assistant-9.0.0.tar.gz 1807537 BLAKE2B 00690e4f6dd1078a79c9309e19c751a6f31b856a2de762e0f1d0e8ce8601c82351b059a8995a9051a6fc1061d3ae9bf27c49fcaef6e76d3837f308eef06bf79f SHA512 5f2b955408e0231b96f4b2415df0c76e9003079acd65b9e1c771082999540121ff92a8c17d9529362be8f7fc632d91bd3f48854a5a2d9632efe10fb354361d8e EBUILD greenbone-security-assistant-8.0.1-r1.ebuild 3207 BLAKE2B bdf238bcecce4d580eb95a199c0f219eead7b792d7f602e449ccb6da83dfab74faa748e4ca96df323ab70234c0b697074a962fb7e7c2c2f298bdd1e8d1676321 SHA512 f383fc91f3fe1c150274bd51536f0b8759bde9b3184bda8af3c6d3566c45a501f591bd823aa8b8fbb3180d35f05679cfcb342f1acdac7e823d3f0f7304b47ec0 -MISC metadata.xml 961 BLAKE2B cd5edd05b4ebc657f40a20a5edf6d33e065ecd5ae6971c36c1640999b1f4e05382363f288cf57dd56ad8c4cdebd307cbaf86fb80b31ef478e278e03293dfe72a SHA512 a5d74e05d38115b2741f5d4f8a781a07a434976dbad9c427701f50a38efc5db5d18f03bd6e2eaf617c7e6c05c2616249babb0bc5dc857f16a509fff85598d3e4 +EBUILD greenbone-security-assistant-9.0.0.ebuild 3073 BLAKE2B 97a12ea48397be4c82d5c4f51dacc2e537117783b513e2d87d252ee1996678c8d6bd414da7da4a31b090d38b28edc586a1ca59c2b266d9a6074d06645d71015c SHA512 9b9adc2ff08304daf419d9783306915f90fd5a47c301444036f38899b9655afd8238f4691c185721025bb78622165a11bcd04da5d3692835d8071184994ee0d2 +MISC metadata.xml 953 BLAKE2B e7c1cc4d11ed04f7d034d6d8b6db37a27ad130ce2fbbff8036ea331df68ca7be2fd368bc45e09901d776b91e4bb83e457607182d60225a8c3d4daaa5f2199f7d SHA512 3d5fda98924d8f45711fc3b6283fdf968fb70f44d7a5dee06640c3386ab404905c25e033f5754810d8ea9bdf4f6426348014a30f6bace937654739cc695a350f diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.0.0-uninstall-snippet.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.0.0-uninstall-snippet.patch new file mode 100644 index 000000000000..8622fd810674 --- /dev/null +++ b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.0.0-uninstall-snippet.patch @@ -0,0 +1,12 @@ +--- a/gsa/CMakeLists.txt 2019-07-18 23:14:04.639202986 +0300 ++++ b/gsa/CMakeLists.txt 2019-07-18 23:21:54.568052589 +0300 +@@ -1164,9 +1164,6 @@ + install (FILES public/robots.txt + DESTINATION ${GSA_DEST_DIR}) + +-# remove old generated files +-install (CODE "file(REMOVE_RECURSE ${GSA_DEST_DIR}/static)") +- + install (DIRECTORY + ${GSA_BUILD_DIR}/static + ${GSA_BUILD_DIR}/img diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.init b/net-analyzer/greenbone-security-assistant/files/gsad.init index 6d431bd21196..7dc4b82afa78 100644 --- a/net-analyzer/greenbone-security-assistant/files/gsad.init +++ b/net-analyzer/greenbone-security-assistant/files/gsad.init @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 : ${GSAD_USER:=gvm} @@ -8,7 +8,7 @@ name="Greenbone Security Assistant (GSA)" command="/usr/bin/gsad" -command_args="${GSAD_OPTIONS} ${GSAD_LISTEN_ADDRESS} ${GSAD_LISTEN_PORT} ${GVMD_LISTEN_ADDRESS} ${GVMD_LISTEN_PORT} ${GSAD_GNUTLS_PRIORITIES}" +command_args="--foreground ${GSAD_OPTIONS} ${GSAD_LISTEN_ADDRESS} ${GSAD_LISTEN_PORT} ${GVMD_LISTEN_ADDRESS} ${GVMD_LISTEN_PORT} ${GSAD_GNUTLS_PRIORITIES}" command_background="true" command_user="${GSAD_USER}:${GSAD_GROUP}" pidfile="/run/gsad.pid" diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.0.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.0.ebuild new file mode 100644 index 000000000000..d4ec6d1546fd --- /dev/null +++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.0.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="emake" +inherit cmake flag-o-matic systemd toolchain-funcs + +MY_PN="gsa" +MY_DN="gsad" +MY_NODE_N="node_modules" + +DESCRIPTION="Greenbone Security Assistant" +HOMEPAGE="https://www.greenbone.net/en/" +SRC_URI="https://github.com/greenbone/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz +https://github.com/greenbone/${MY_PN}/releases/download/v${PV}/gsa-node-modules-${PV}.tar.gz -> ${P}-${MY_NODE_N}.tar.gz" + +SLOT="0" +LICENSE="GPL-2+" +KEYWORDS="~amd64 ~x86" +IUSE="extras" + +DEPEND=" + dev-libs/libgcrypt:0= + dev-libs/libxml2 + dev-libs/libxslt + >=net-analyzer/gvm-libs-10.0.1 + net-libs/gnutls:= + net-libs/libmicrohttpd" + +RDEPEND=" + ${DEPEND} + >=net-analyzer/gvmd-9.0.0 + net-analyzer/ospd-openvas" + +BDEPEND=" + dev-python/polib + >=net-libs/nodejs-8.12.0 + >=sys-apps/yarn-1.15.2 + virtual/pkgconfig + extras? ( + app-doc/doxygen[dot] + app-doc/xmltoman + app-text/htmldoc + sys-devel/gettext + )" + +BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build" +S="${WORKDIR}/${MY_PN}-${PV}" +MY_NODE_DIR="${S}/${MY_PN}/" + +PATCHES=( + # Disable yarn-fetch during compile. + "${FILESDIR}/${PN}-8.0.1-node.patch" + # Remove ugly uninstall-snippet that causes failing re-emerge. + "${FILESDIR}/${P}-uninstall-snippet.patch" +) + +src_prepare() { + cmake_src_prepare + # We will use pre-generated npm stuff. + mv "${WORKDIR}/${MY_NODE_N}" "${MY_NODE_DIR}" || die "couldn't move node_modules" + # Update .yarnrc accordingly. + echo "--modules-folder ${MY_NODE_DIR}" >> "${S}/${MY_PN}/.yarnrc" || die "echo failed" + # QA-Fix | Remove !CLANG doxygen warnings for 9.0.0 + if use extras; then + if ! tc-is-clang; then + local f + for f in gsad/doc/*.in + do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DSBINDIR=${EPREFIX}/usr/bin" + "-DGSAD_PID_DIR=${EPREFIX}/run/" + "-DDEFAULT_CONFIG_DIR=${EPREFIX}/etc/default" + "-DLOGROTATE_DIR=${EPREFIX}/etc/logrotate.d" + ) + cmake_src_configure +} + +src_compile() { + # setting correct PATH for finding react-js + NODE_ENV=production PATH="$PATH:${S}/gsa/node_modules/.bin/" cmake_src_compile + if use extras; then + cmake_build -C "${BUILD_DIR}" doc + cmake_build doc-full -C "${BUILD_DIR}" doc + fi + cmake_build rebuild_cache +} + +src_install() { + if use extras; then + local HTML_DOCS=( "${BUILD_DIR}/${MY_DN}/doc/generated/html/." ) + fi + cmake_src_install + + insinto /etc/gvm/sysconfig + doins "${FILESDIR}/${MY_DN}-daemon.conf" + + insinto /etc/gvm/reverse-proxy + doins "${FILESDIR}/${MY_PN}.nginx.reverse.proxy.example" + fowners -R gvm:gvm /etc/gvm + + newinitd "${FILESDIR}/${MY_DN}.init" "${MY_DN}" + newconfd "${FILESDIR}/${MY_DN}-daemon.conf" "${MY_DN}" + + insinto /etc/logrotate.d + newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}" + + systemd_dounit "${FILESDIR}/${MY_DN}.service" +} diff --git a/net-analyzer/greenbone-security-assistant/metadata.xml b/net-analyzer/greenbone-security-assistant/metadata.xml index 5a350f963a3c..f6df02262b86 100644 --- a/net-analyzer/greenbone-security-assistant/metadata.xml +++ b/net-analyzer/greenbone-security-assistant/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>hasan.calisir@psauxit.com</email> - <name>Hasan ÇALIŞIR</name> + <email>jonas.licht@gmail.com</email> + <name>Jonas Licht</name> </maintainer> <maintainer type="project"> <email>proxy-maint@gentoo.org</email> diff --git a/net-analyzer/gvm-libs/Manifest b/net-analyzer/gvm-libs/Manifest index 66916b72ba5d..b86728c0883d 100644 --- a/net-analyzer/gvm-libs/Manifest +++ b/net-analyzer/gvm-libs/Manifest @@ -1,4 +1,7 @@ AUX gvm-libs-10.0.1-pid.patch 312 BLAKE2B 805c21d61dfc6bf29cab6c6dd768fe6c9249aa7613ab18f21d347d1aeab58afc4bb75d17cc62687f3fa2270a05f16c883ba5293534e84e045f1d67dc527f8194 SHA512 dc42f495f2e45687ce221ba72fbdde4ca8fec11b4e55a46dd011e0d7169d5b20e1ba4473aa33180c698b655fce25fac2f8c6283fde04137b43c9c16af34eec43 +AUX gvm-libs-11.0.0-gnutls.patch 950 BLAKE2B af0bac65ecc5e131296df3898f7da10c335c7d0433e875e201ab4687438457e5ab58d99d835f38e1a485dc0a36c1122500779ae6adc1c49f4c002f3234ab13a5 SHA512 512825f9cc2f10eb108c899a2b10327fe74d48b77f44c1d2025cee500c07e2470ad0a75adc0bdfb6c7bc36d1c1f6f257d175e40c1451f4accaf96c904bf2dd56 DIST gvm-libs-10.0.1.tar.gz 198483 BLAKE2B 4f4ddc7a3a1b4d45a51868cf03844365a9c4dd07f17ab53957ac4a1452ecba595885abdf01402a78aa784163aaba60b5c452fb9c2b5a11d38c40706e820c22c2 SHA512 961570e8fa8f89f0b462991bff1bf4e512ed6419cff6871c7432899847fb9edcc9f0adb7c280d12ee69fbb5c8e306c9e4366e2cbbb05fc3bae06795dcfb42206 +DIST gvm-libs-11.0.0.tar.gz 207205 BLAKE2B 026b999a48ad524df9305d219dd29f5deb71affb3f5d338ad1178924aa701f2fe698ee4009f4b5a6973de6e590a870871b3b708a2531aaba6e05755cd7f00f97 SHA512 ff981b4ca37b425a8d1f491e90bd1cef4701033886f9fd47dad34540b36fa275d4af8b176e63a07405cc1f29137851b96a6ce80c46ed92f809b089fb0cd928af EBUILD gvm-libs-10.0.1.ebuild 2274 BLAKE2B 59cf5e18a5a5cdb0fbcfed7ef8772abf9c33e86e1051c12dd3450993e6a4778967197e8bffdeaf7fdb8d4928bdb112889c7f7265cead065dea656e41113ca507 SHA512 0896c4be88d76dd7a08bfd79a5c5b185035779238545c8f0cdbb3ef207b8d537e0c086cba25c6c6a048696bdcb28d4c5362f3b312240c600ade1708436315428 -MISC metadata.xml 790 BLAKE2B c8eaf3364b9acd770faf586a9f1062da2efe28c42342a59ad60fc8d65f12c2f459d8f24e99f216fbf9c219b2444f72e4944a5c806cb1f5283d8965c258d7bb1e SHA512 267856946386f023fe1eaf42794652126891773f578bbe7c0a1d70bfc107f46e49bebfeae6e485def0104dd9ebcf17f890a4cfb59c3362f29badfd803d3eb06e +EBUILD gvm-libs-11.0.0-r1.ebuild 2023 BLAKE2B 01050064d29f8c4bb180836dfd652d4da3f2933c6cc6b78bda81b20017ef09239eb6659dfde4441633f8316bf67438b3569660996fc4a4fe3de5cb8bbbef4087 SHA512 82644656222c78215251417f289d3695a2bb73fa20bfa838411928c8ec7e0dad8aaaec988ce304e8396a7aeefcff877698c2a32b809a64262738bea1ed48dae9 +MISC metadata.xml 782 BLAKE2B 002fcba6357c321932dc1506bdc826eb848ae9959e1bbbeabb9f3c4348eabd3aedf34df68af834221ed4f7c7f8b5a5ecf69c3ee657706342f9161b810ed68f60 SHA512 33d2c86b3e5bd9261a78ed7bd726d01d677f715c675caee8868adbfe80b408d3f155779faecdf1124a00b3b72167966111bb5ae1c9849725a7de76fa46e5f7b4 diff --git a/net-analyzer/gvm-libs/files/gvm-libs-11.0.0-gnutls.patch b/net-analyzer/gvm-libs/files/gvm-libs-11.0.0-gnutls.patch new file mode 100644 index 000000000000..427647ddcd9c --- /dev/null +++ b/net-analyzer/gvm-libs/files/gvm-libs-11.0.0-gnutls.patch @@ -0,0 +1,22 @@ +From 61205ecc6e28f6a1af799ec40074a61037d9bf31 Mon Sep 17 00:00:00 2001 +From: Juan Jose Nicola <juan.nicola@greenbone.net> +Date: Mon, 28 Oct 2019 14:04:52 +0100 +Subject: [PATCH] Fix missing linking to libgnutls in util/CMakeLists.txt + +--- + util/CMakeLists.txt | 2 +- + 1 files changed, 1 insertions(+), 1 deletion(-) + +diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt +index 2b7f441d..af5e363e 100644 +--- a/util/CMakeLists.txt ++++ b/util/CMakeLists.txt +@@ -158,7 +158,7 @@ if (BUILD_SHARED) + + target_link_libraries (gvm_util_shared LINK_PRIVATE ${GLIB_LDFLAGS} + ${GIO_LDFLAGS} ${GPGME_LDFLAGS} ${ZLIB_LDFLAGS} +- ${RADIUS_LDFLAGS} ${LIBSSH_LDFLAGS} ++ ${RADIUS_LDFLAGS} ${LIBSSH_LDFLAGS} ${GNUTLS_LDFLAGS} + ${GCRYPT_LDFLAGS} ${LDAP_LDFLAGS} ${REDIS_LDFLAGS} + ${UUID_LDFLAGS} ${LINKER_HARDENING_FLAGS}) + endif (BUILD_SHARED) diff --git a/net-analyzer/gvm-libs/gvm-libs-11.0.0-r1.ebuild b/net-analyzer/gvm-libs/gvm-libs-11.0.0-r1.ebuild new file mode 100644 index 000000000000..00bd14e824ab --- /dev/null +++ b/net-analyzer/gvm-libs/gvm-libs-11.0.0-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="emake" +inherit cmake flag-o-matic toolchain-funcs + +DESCRIPTION="Greenbone vulnerability management libraries, previously named openvas-libraries" +HOMEPAGE="https://www.greenbone.net/en/" +SRC_URI="https://github.com/greenbone/gvm-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2+" +KEYWORDS="~amd64 ~x86" +IUSE="extras ldap radius" + +DEPEND=" + acct-user/gvm + app-crypt/gpgme:= + dev-libs/glib + dev-libs/hiredis + dev-libs/libgcrypt:= + dev-perl/UUID + net-libs/gnutls:= + net-libs/libssh:= + sys-libs/zlib + ldap? ( net-nds/openldap ) + radius? ( net-dialup/freeradius-client )" + +RDEPEND=" + ${DEPEND}" + +BDEPEND=" + dev-vcs/git + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + extras? ( + app-doc/doxygen[dot] + app-doc/xmltoman + app-text/htmldoc + dev-perl/CGI + dev-perl/SQL-Translator + )" + +PATCHES=( + # patch for missing gnutls linking https://github.com/greenbone/gvm-libs/issues/277 + "${FILESDIR}/${P}-gnutls.patch" +) + +src_prepare() { + cmake_src_prepare + # QA-Fix | Remove doxygen warnings for !CLANG + if use extras; then + if ! tc-is-clang; then + local f + for f in doc/*.in + do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DGVM_PID_DIR=${EPREFIX}/var/lib/gvm" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use extras; then + cmake_build -C "${BUILD_DIR}" doc + cmake_build doc-full -C "${BUILD_DIR}" doc + fi + cmake_build rebuild_cache +} + +src_install() { + if use extras; then + local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) + fi + cmake_src_install + + # Set proper permissions on required files/directories + keepdir /var/lib/gvm + fowners -R gvm:gvm /var/lib/gvm +} diff --git a/net-analyzer/gvm-libs/metadata.xml b/net-analyzer/gvm-libs/metadata.xml index dbbfe2e9f17b..3fc9918d9918 100644 --- a/net-analyzer/gvm-libs/metadata.xml +++ b/net-analyzer/gvm-libs/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>hasan.calisir@psauxit.com</email> - <name>Hasan ÇALIŞIR</name> + <email>jonas.licht@gmail.com</email> + <name>Jonas Licht</name> </maintainer> <maintainer type="project"> <email>proxy-maint@gentoo.org</email> diff --git a/net-analyzer/gvm-tools/Manifest b/net-analyzer/gvm-tools/Manifest index 994912462413..fc69fd42384d 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 1013 BLAKE2B 1d9369c6e19f549849332f76b38da6abb356ded43e4715506333d0979276c3dcaf24306586470f983024943a928fe9e4cdfb69e4fdda1b9420c55314a6673edc SHA512 fef35d8711e3df6b281d0496e5a0e4a0df69202d9451d85317ad1a14e8ad2108f1705de8687ffa6bdd8c1fce158e3e7c095014308b94be871a9bf456dbd8ba90 -MISC metadata.xml 879 BLAKE2B 3fbe5d9d66b98ce42e4ba158d42cd2018b41b0b505932cd4d17e6ef0555e4622bd1c12020af18ff79f155009127ebe2681b1a6eb5b062fb0d65dcefc0b24c0f1 SHA512 38beadc54c27ab14b71eff900e70242dba92d5971dbddecec45d85c844b225d6abb50584a08f825c7b70092dcb489b7fc17eeaad0f9db7ab607fc1c078ef622e +EBUILD gvm-tools-2.0.0.ebuild 1046 BLAKE2B 0d4a4ebca110f60f6d9e7bbb0da7f85d0ca6cfdc19d2c285bf011079154f8171d549252b44779a1149c5cb47b3a3965df8fdc74c89e2c292d7e2767dba63e416 SHA512 a51843b3b89d9caa0c5ef91286a7ed73a3d197a6ea31b7ffb87d45b4a70a72a3b57f706cac679ff6d616306cdeafaca3e11c757f6da9b83cdf5d5d85662525e1 +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.ebuild index 5a3779fa72e7..ba3a4b6f72fd 100644 --- a/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild +++ b/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild @@ -4,6 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_6 ) +DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 DESCRIPTION="Remote control for Greenbone Vulnerability Manager, previously named openvas-cli" diff --git a/net-analyzer/gvm-tools/metadata.xml b/net-analyzer/gvm-tools/metadata.xml index f85b386b890f..eb6dcb63c5d3 100644 --- a/net-analyzer/gvm-tools/metadata.xml +++ b/net-analyzer/gvm-tools/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>hasan.calisir@psauxit.com</email> - <name>Hasan ÇALIŞIR</name> + <email>jonas.licht@gmail.com</email> + <name>Jonas Licht</name> </maintainer> <maintainer type="project"> <email>proxy-maint@gentoo.org</email> diff --git a/net-analyzer/gvm/Manifest b/net-analyzer/gvm/Manifest index 8c60262a10ce..c00743c091f6 100644 --- a/net-analyzer/gvm/Manifest +++ b/net-analyzer/gvm/Manifest @@ -1,2 +1,3 @@ EBUILD gvm-10.0.1.ebuild 1291 BLAKE2B a33df3a9c6f273df51af9c3d134c3baba7d3321a6f39e9a1a7c80876700737aa0ff60527acd110888d4841a37950209acc823ff495e967795b1953dae53186d2 SHA512 5ea04eeacbf75133c3d5bea1f6599ac861a0e2bde70194f9175180b6e54d409d1817bd75e19c0d4a956ee6448ffe14705e8c54e824dd45c399536d8e27ddc412 -MISC metadata.xml 1178 BLAKE2B 69832f118fc0ccbb384a8d7c52f45bc1bba5300bd027bcae2c692261a1226a1a9b2ec6d556225a6c4ad942a61e1dfff0733d5c3b52b815c4592409df5d5afb87 SHA512 c700eb2605fc7b56acf34eb425483024dc2d952ea9a674ef932f2eb512144ba2b176bf1c12cec6ea9351c6f9160a40c6cfaa9b811483c924e6ce06a52d898377 +EBUILD gvm-11.0.0.ebuild 1218 BLAKE2B 4b3c6a454b1ea7d033a784654cfc03adcb041e397bb5d51f1c05d1b63a33f0c8aa298163a2a12d84d6a0e691bbbe23a59c4752cd38f65865642016816956ebfb SHA512 6c473005b0ce07a899c3906947a71aedc0be33fd5c0e253d69086d51b8527baee69a562ef5a497898b414d18f3a285a76d06436e51286051ed1521425667d038 +MISC metadata.xml 1170 BLAKE2B 2c1758e283daf2d72e61cc1eacf6312c4131b7f89a8a10ec924573f1dfab865c7e66992ffa4591036f183d20e9b73594d61dd213e5adfbd1e428836920df6d6c SHA512 c7f720bce7ee7e6ed5efee259423e5750528c4e7ec9bf3bec443abc67f2412ca05f98a6bee67352ccd053f1ce26b9f7279e78ed5646aacb1bcff2918a61a0279 diff --git a/net-analyzer/gvm/gvm-11.0.0.ebuild b/net-analyzer/gvm/gvm-11.0.0.ebuild new file mode 100644 index 000000000000..46d9ed063ff2 --- /dev/null +++ b/net-analyzer/gvm/gvm-11.0.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils + +DESCRIPTION="Greenbone Vulnerability Management,previously named OpenVAS" +HOMEPAGE="https://www.greenbone.net/en/" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="cli +cron +extras +gsa ldap ospd radius" + +RDEPEND=" + >=net-analyzer/gvm-libs-11.0.0[extras?,ldap?,radius?] + >=net-analyzer/gvmd-9.0.0[extras?] + >=net-analyzer/openvas-scanner-7.0.0[cron?,extras?] + cli? ( >=net-analyzer/gvm-tools-2.0.0 ) + gsa? ( >=net-analyzer/greenbone-security-assistant-9.0.0[extras?] ) + ospd? ( >=net-analyzer/ospd-2.0.0[extras?] )" + +pkg_postinst() { + elog "Additional support for extra checks can be get from" + optfeature "Web server scanning and testing tool" net-analyzer/nikto + optfeature "Portscanner" net-analyzer/nmap + optfeature "IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan + optfeature "Application protocol detection tool" net-analyzer/amap + optfeature "ovaldi (OVAL) — an OVAL Interpreter" app-forensics/ovaldi + optfeature "Linux-kernel-based portscanner" net-analyzer/portbunny + optfeature "Web application attack and audit framework" net-analyzer/w3af +} diff --git a/net-analyzer/gvm/metadata.xml b/net-analyzer/gvm/metadata.xml index 8f3369bf5f0d..eeb4ec70aac9 100644 --- a/net-analyzer/gvm/metadata.xml +++ b/net-analyzer/gvm/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>hasan.calisir@psauxit.com</email> - <name>Hasan ÇALIŞIR</name> + <email>jonas.licht@gmail.com</email> + <name>Jonas Licht</name> </maintainer> <maintainer type="project"> <email>proxy-maint@gentoo.org</email> diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest index a34ec514eac1..c84a81aaddb2 100644 --- a/net-analyzer/gvmd/Manifest +++ b/net-analyzer/gvmd/Manifest @@ -5,9 +5,11 @@ AUX gvmd-8.0.1-sbin.patch 2224 BLAKE2B 84e13415d01e3ce996af11f3ffde68a803c8db0a2 AUX gvmd-8.0.1-tmplock.patch 746 BLAKE2B afba3139cd18734d9d9b89b05e7e5a3120c44b5099463cfa74f26142c2a779f75e473b0742e21d86171b5026af0d834bbedb2fb61edb3d1b83711898c0b6fcf9 SHA512 d5b12df500cef0c598aba6d0489ec18d6882ad0c111dce970ae4268af79df9b0aba66a5c9148b91af0e579aa82afb397bab1daced11b6f0ab2918472181800b2 AUX gvmd-daemon.conf 813 BLAKE2B b4d73d6a5cc17325f56b250bf1e63fab808bf7e36a0b357641de87d54a3238fd68cf34cba08ce606827e3441e042c514cfc4ce73ff88b70cd4dea080dd68eb97 SHA512 1fcce48ed1d53489f4509138b3570790574003931289e65ab0f767a51da1e5d6c8d33c44da8d967f6c0442f0bee500bf46554a49b113fe0bc933dffd3fb121eb AUX gvmd-startpre.sh 223 BLAKE2B 2b12ff7077464d089591e53c631c3b38f4d9351d98326ef65f50ef0501f165bc8393af86c21a3e9663464526dcd2b435eb1a89ba3a05946cb862f959d3efe5d7 SHA512 d532037beb7b05037c136c5b7d7bcea65d166d11c4eb3c580fdabd4a99b110d230b67f633a9661674d3186c09baaf50089b222c7c17e57b4c0a234a4470af531 -AUX gvmd.init 598 BLAKE2B 92533371b043ff4752869d44702601f214233e4eddf0ecac74555c7a3f6f9641965b1d2b160f69d906ee2311321b715541cfdfadc9526c39d309d2d9a9eacf73 SHA512 03b7a19371ba08f0c7ed1387d4bcbd3a37d0c98603719341a5fb1843027eabb807382e4c87a2a654e3c08e59939e59c0f5df12e7dd6245922cd64f82c3ab8b72 +AUX gvmd.init 614 BLAKE2B e5c4bd192941b98f6e42dd1644a61b6d1fa6651c8932a7f85d3680f07272b2acabca91d0723c6b9057734fb41916ec52021161b9ff9a1512fbed04299a2d9941 SHA512 8eb0daf424fa9346674757f1d3f94a4708df9748d5e6c5a1b1ab8233651462bf1a93eda7899963484a7cdf2396eba30603ddb079bc4ae2855bc49097ea88f82d AUX gvmd.logrotate 325 BLAKE2B 4df59e6d9484b9e60d54cb3633ffc9888ad8550bb1d1f23123da21b1269125cd7354426b97ce42e06bf547d23788cefaac5ef51f7aa83d6cc34076bce4ab7339 SHA512 e1eeef173bfab7c750efcc7faa42cf7a1cfb9e6b137716063f273bc709c1346f11262dadbdb0c49822d885dc00177d8ccb91c0491ddc33cfee0a3827f11908f6 AUX gvmd.service 505 BLAKE2B 32736b0f8f45b87e1e2c6f578d6f6b891b3642dab3bba6c56657ac61c0c55f81f8bf809c5d6508945972dcaf31b4e75729c7686409a2ebaea4b7a132d8d557d9 SHA512 ea9132367ee28814ed6e36c0b1fb1ce4700e5735d77e0889947618aba511c3adbc968167b4968d1fa28bd41959575a49b8b2ddb9b116957c729f51ece33dfd98 DIST gvmd-8.0.1.tar.gz 1495311 BLAKE2B 17419f5fecf7cce07536a5e12f17a61a31d45add185e0e1635515834eca6abd8a6babeb89b8f879ff8cb90b60f3682a19a62403142f4901be3f932b8a44cac68 SHA512 5490b902ad42499657eca9031b396c70a82d3c523985601067e697758f2472d123c4e99b085b963e58888d99224fa2a441a140772c702d7cd60d6424b126bfc8 +DIST gvmd-9.0.0.tar.gz 1425724 BLAKE2B f44c14a660f2ee9986e5873011233a423565acfdaea479ac6749998da997343a97dabec0355d618fd9032b65871737ba0407525b8d2b49e88aaa58523b633cae SHA512 99faf4b4a9e0baf7993769efb30ef39e09d76173416b44baa1b0849c7b68bd07cd9f82404832136a3e1b37769c7d5e77e5da54275ff75fffc2e6e6fa7a8b9dac EBUILD gvmd-8.0.1.ebuild 2896 BLAKE2B b882c80f53ac49d1ed63f9666a124dd16c2f391587de6b23256e4105cab6549973b97dc83f0afdd24506b139059dd0c9cebd943845bc8db895291f78889c681e SHA512 527c8838fed46ee3b851b6edfdf62243e2b64c99dea52e84f345391f124e783266ba21656295b5b9688c1f2cfa2b732fffc7c34c6fdd0a010cf7a39daa17b7b8 -MISC metadata.xml 1051 BLAKE2B f0773c3dbf8eabb4823bb5f3f9b70c6374db7af731ec828a2d295faed6c4c587a64683661a915d92ddf1bd3e5f623706a036d5a702d8271e5a310234ba22da08 SHA512 efcf5992b893f1e2f5b1a905e4f331ea3bc1446e5c1a5482b4dffdafd1b6f3daf9847a9164d74588463740f4c87925f4db47722fbf87e6beda2909c1981bd339 +EBUILD gvmd-9.0.0.ebuild 2626 BLAKE2B 6f0d8cd665919a819ae3ad126bc87331da8d68dcb6360dbad4a74ba15dfb1851e631a81d74628445e63adf065cc823ce35b9071be06d6043cde2d11d9826f438 SHA512 ccd900b0b3b7bc1bf2aaaf59b188e6e641165e71297745fb2e36133dff2199bebf4269cac33706fb40007d717c47f53207b7a09ec7468113a661169935664b75 +MISC metadata.xml 1043 BLAKE2B 589df7f1076a8797197ce4446df8030e6529db7abb704d5638059bb6f1b381cf80a609c08812434a2cfa17225b1f9b267a145b9358b2304de1be3dcd7d9b5c7b SHA512 3f0bc3b7bf085c5d86b2ac0c7671658955fb0951104f1fe308826a4100fe3ee56b6cf31a5f34e57ee0d7c4c02ce2d062e6e93b1eea1f2c72bfc70ab500b4d8ed diff --git a/net-analyzer/gvmd/files/gvmd.init b/net-analyzer/gvmd/files/gvmd.init index 9686c9b5398e..098232afa1e5 100644 --- a/net-analyzer/gvmd/files/gvmd.init +++ b/net-analyzer/gvmd/files/gvmd.init @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 : ${GVMD_USER:=gvm} @@ -8,7 +8,7 @@ name="Greenbone Vulnerability Manager" command=/usr/bin/gvmd -command_args="${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}" +command_args="--foreground ${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}" command_background="true" command_user="${GVMD_USER}:${GVMD_GROUP}" pidfile="/run/gvmd.pid" @@ -16,7 +16,7 @@ retry="${GVMD_TIMEOUT}" depend() { after bootmisc - need localmount net openvassd + need localmount net ospd-openvas } start_pre() { diff --git a/net-analyzer/gvmd/gvmd-9.0.0.ebuild b/net-analyzer/gvmd/gvmd-9.0.0.ebuild new file mode 100644 index 000000000000..e0a0cce830ef --- /dev/null +++ b/net-analyzer/gvmd/gvmd-9.0.0.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="emake" +inherit cmake flag-o-matic systemd toolchain-funcs + +DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager" +HOMEPAGE="https://www.greenbone.net/en/" +SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2+" +KEYWORDS="~amd64 ~x86" +IUSE="extras +postgres sqlite" +# keep deprecated USE Flags for revdep of gvm +REQUIRED_USE="postgres !sqlite" + +DEPEND=" + dev-db/postgresql:*[uuid] + dev-libs/libgcrypt:0= + dev-libs/libical + >=net-analyzer/gvm-libs-11.0.0 + net-libs/gnutls:=[tools] + extras? ( + app-text/xmlstarlet + dev-texlive/texlive-latexextra )" + +RDEPEND=" + ${DEPEND} + acct-user/gvm + net-analyzer/ospd-openvas" + +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + extras? ( + app-doc/doxygen[dot] + app-doc/xmltoman + app-text/htmldoc + dev-libs/libxslt + )" + +src_prepare() { + cmake_src_prepare + # QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0 + sed -i -e "s*share/doc/gvm/html/*share/doc/gvmd-${PV}/html/*g" "$S"/doc/CMakeLists.txt || die + sed -i -e "s*/doc/gvm/*/doc/gvmd-${PV}/*g" "$S"/CMakeLists.txt || die + # QA-Fix | Remove !CLANG Doxygen warnings for 9.0.0 + if use extras; then + if ! tc-is-clang; then + local f + for f in doc/*.in + do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DLIBDIR=${EPREFIX}/usr/$(get_libdir)" + "-DSBINDIR=${EPREFIX}/usr/bin" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use extras; then + cmake_build -C "${BUILD_DIR}" doc + cmake_build doc-full -C "${BUILD_DIR}" doc + fi + cmake_build rebuild_cache +} + +src_install() { + if use extras; then + local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) + fi + cmake_src_install + + insinto /etc/gvm + doins -r "${FILESDIR}"/*sync* + + insinto /etc/gvm/sysconfig + doins "${FILESDIR}/${PN}-daemon.conf" + + exeinto /etc/gvm + doexe "${FILESDIR}"/gvmd-startpre.sh + + fowners -R gvm:gvm /etc/gvm + + newinitd "${FILESDIR}/${PN}.init" "${PN}" + newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}" + + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotate" "${PN}" + + systemd_dounit "${FILESDIR}/${PN}.service" + + # Set proper permissions on required files/directories + keepdir /var/lib/gvm/gvmd + fowners -R gvm:gvm /var/lib/gvm +} diff --git a/net-analyzer/gvmd/metadata.xml b/net-analyzer/gvmd/metadata.xml index 36ce32a69a9f..072f33914919 100644 --- a/net-analyzer/gvmd/metadata.xml +++ b/net-analyzer/gvmd/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>hasan.calisir@psauxit.com</email> - <name>Hasan ÇALIŞIR</name> + <email>jonas.licht@gmail.com</email> + <name>Jonas Licht</name> </maintainer> <maintainer type="project"> <email>proxy-maint@gentoo.org</email> diff --git a/net-analyzer/hping/Manifest b/net-analyzer/hping/Manifest index 5b0487ffea05..e673774da80c 100644 --- a/net-analyzer/hping/Manifest +++ b/net-analyzer/hping/Manifest @@ -15,6 +15,6 @@ AUX hping-3_pre20141226-scan-overflow.patch 316 BLAKE2B 7d43d98fe736dc78a2e104c0 AUX hping-3_pre20141226-unused-but-set.patch 1272 BLAKE2B 8ae0bfad0bab0c8f0f7592b5ec370ebe146bb31c2dd5a53651d2bd27441c605114f46ab98ec9a97e9f5d386cae5a561c80c420c4c15d6d9424440ac4a53736ef SHA512 a9f031c39a448b0d1f6b076193a07c7a9628756af46a06c2f0d8a2859a02e55bbff5ae55ee4341297b19c4e1ba041b5dd2cdee9b64bdf35e6aff5dc4b8faf6db DIST hping-3_pre20141226.zip 648502 BLAKE2B 4c75bdb886a37180a4561a8179e00ea5bb6534e32b6fa749cd53824e36dfbeaa38b1a772b58f61d68056f510a294f6c3363f56705adb75f42fec11f4f4cd8fa1 SHA512 33ca573d66d7f6285f69a060f56a95e7307bc24d6c81b5e1752c72b8487ab9c85ac6e4499f9c4897e2656a67e12d608a0a149ca5502bdcf18cf97c88d4a2309b DIST hping3-20051105.tar.gz 584001 BLAKE2B b99b7d2310e1706926ec5c649cd03a8889e3cff36f2a8e1f899799ddb1f4e6e432ab2b83c82b741ab827f715dbf8649a94831e75ef22793c7730e80d49c576c1 SHA512 3b3faa836e70054c8f9f004d876b7eb5f668b64826a6aaf8ca3685619111d9df4eb494a7d38b83cea6cb5f0bd164956461039bf4f73f7c7e90d80cede639b2b3 -EBUILD hping-3_pre20051105-r6.ebuild 1594 BLAKE2B efff44e45a13062194eadd1f69cbe51a79e11e2ced8dbe5a7a0fedac21970dce67310072fc06d3f7cc9474ecaf6e6448ee649b4c34d911d0cc368287566ca810 SHA512 d8e5efa035a4d57310035e0b2f18d5457f87cf5cdfa95ba8723ece4e1242b57615e35cd20898a8fc6180efbc86970be1cf019a7586e4749e080a4735ea0f3bc6 +EBUILD hping-3_pre20051105-r6.ebuild 1595 BLAKE2B 012c23455fecc64b36fb412ac9fc3f96efb744ef7b218e2cd8ab7dc9046c2a8c2a1f68fdf466036bd3c04e6c7dc4246fef946cea815ec3bd914145634c17a64d SHA512 e77b0b7b3fc82dcff5a4f1e430f9f75f5f5d74a21177711497b4d8ff3a7a1e14959a6a21c7f5cf6aea21822794528f7ff54c1d6d79bbaddf1cd57d48b6bb3233 EBUILD hping-3_pre20141226.ebuild 1570 BLAKE2B d383f47c10f3d2efca53240ee7adc07b2a552112e4086598bacec34c7b3e4ebcd1b04bc5a65dfafda1f9fd8ea251aa296c663b2a9188de170f359766d5062af7 SHA512 c8c10c3d93ef8b94222a66a4e87ca282e3154d091cff24a85877e80fc2e190f6dce427310e0f0e00d4ebec204d1905039cd79b5951e94c7ae25d930bd642fdac MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/hping/hping-3_pre20051105-r6.ebuild b/net-analyzer/hping/hping-3_pre20051105-r6.ebuild index 5cc5d5cf2588..37f6833041af 100644 --- a/net-analyzer/hping/hping-3_pre20051105-r6.ebuild +++ b/net-analyzer/hping/hping-3_pre20051105-r6.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.hping.org/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc sparc x86" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc sparc x86" IUSE="tcl" S="${WORKDIR}/${MY_P}" diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest deleted file mode 100644 index 74c194e6a7e3..000000000000 --- a/net-analyzer/icinga-web/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST icinga-web-1.14.1.tar.gz 14524043 BLAKE2B 0a3bdf9afc77b508dd3967e38050f6babfe01240f8cf8196158abe42818079b09a962513541298d0b0ac2b1497640d292cf1ef4feac24e302c0622f6ef0fafd8 SHA512 1ddb1fe128c2ceff20e232d61d84abebbe9578f2ef9bf0c408523c399ab6125dedc7d4e82981fff113aba8959a1ac02712032b4a36e5aa951850c084792a47bb -EBUILD icinga-web-1.14.1.ebuild 6357 BLAKE2B 4df0dab1a4e534e62c28405d6ba77b42ec27321a95810e7249276cb20680ea5ad6dfd09d8b267e96679cb8963ab7a69d6f5e9d4d938986d30334686218a93a1d SHA512 21944355ba70371dcbaa60c1382191d2c55067a1a43c7b179aa41f2f774660fdb2f88cc4e455df9622185f91910b591e3fe95f36130516b17e18598542568b74 -MISC metadata.xml 565 BLAKE2B 8f3d66d10fc929779bccaed43db56800be1cd81ed044b0244e8db73b89d9587b9554a59915477dccf5fb0bd7d4f96d9b6330a9309c0e79d20bbd458d827bdfbe SHA512 534f181a73fff13650cd97081c748cf0d75424bab7826ac83eda2a09e6cd3737fd447db3ad9a0207b2cdb24cc84f0515ad5282de2024ec6eddae2a85be41a084 diff --git a/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild b/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild deleted file mode 100644 index 39f00e240223..000000000000 --- a/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit depend.apache eutils user multilib - -DESCRIPTION="Icinga Web - new Web Interface" -HOMEPAGE="http://www.icinga.org/" -SRC_URI="https://github.com/icinga/${PN}/archive/v${PV}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="apache2 mysql pnp postgres" -DEPEND="dev-php/phing - dev-db/libdbi-drivers[mysql?,postgres?] - || ( >=net-analyzer/icinga-1.10.0 >=net-analyzer/icinga2-2.1.1 ) - dev-lang/php:=[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml] - pnp? ( net-analyzer/pnp4nagios )" -RDEPEND="${DEPEND}" - -want_apache2 - -pkg_setup() { - if use apache2 ; then - depend.apache_pkg_setup - fi - enewgroup icinga - enewgroup nagios - enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios" -} - -src_prepare() { - #removed checks for some php stuff since we have these things called use flags - sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g' configure.ac - sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in - autoreconf -} - -src_configure() { - local myconf - - myconf="--prefix=/usr/share/icinga/icinga-web - --bindir=/usr/sbin - --sbindir=/usr/$(get_libdir)/icinga/cgi-bin - --datarootdir=/usr/share/icinga/htdocs - --localstatedir=/var/lib/icinga - --sysconfdir=/etc/icinga - --libexecdir=/usr/$(get_libdir)/icinga/plugins - --with-bin-user=icinga - --with-bin-group=nagios - --with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd - --with-conf-dir=/etc/icinga-web - --with-log-dir=/var/log/icinga-web - --with-icinga-objects-dir=/etc/icinga/objects - --with-icinga-bin=/usr/sbin/icinga - --with-icinga-cfg=/etc/icinga/icinga.cfg" - - if use apache2 ; then - myconf+=" --with-web-user=apache - --with-web-group=apache - --with-web-apache-path=${APACHE_MODULES_CONFDIR}" - else - myconf+=" --with-web-user=root - --with-web-group=root" - fi - - if use postgres ; then - myconf+=" --with-db-type=pgsql - --with-db-port=5432 - --with-api-subtype=pgsql - --with-api-port=5432" - fi - - econf ${myconf} -} - -src_install() { - dodoc README - rm -f README - - emake -j1 DESTDIR="${D}" install - - emake DESTDIR="${D}" install-javascript - - if use apache2 ; then - dodir ${APACHE_MODULES_CONFDIR} - emake DESTDIR="${D}" install-apache-config - echo '<IfDefine ICINGA_WEB>' > "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf" - cat "${WORKDIR}/${P}/etc/apache2/icinga-web.conf" >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf" - rm "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" || die "rm failed" - echo '</IfDefine>' >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf" - fi - - insinto /usr/share/icinga/icinga-web/contrib - doins -r etc/schema/* - - if use apache2 ; then - sed -i 's/%%USER%%/apache/g' etc/scheduler/icingaCron - else - sed -i 's/%%USER%%/root/g' etc/scheduler/icingaCron - fi - sed -i 's/%%PATH%%/\/usr\/share\/icinga\/icinga-web/g' etc/scheduler/icingaCron - - dodir /usr/share/icinga/icinga-web/cron/ - cat - >> "${D}"/usr/share/icinga/icinga-web/cron/crontab <<EOF -# Force the shell to bash -SHELL=/bin/bash -#mail to root -MAILTO=root - -#runs every minute -* * * * * /usr/bin/php /usr/share/icinga/icinga-web/lib/icingaScheduler/icingaCron.php --useAgavi --exec >> /var/log/icinga-web/cron_error.log -EOF - - cat - >> "${D}"/usr/share/icinga/icinga-web/cron/fcrontab <<EOF -# Mail reports to root -!mailto(root) - -#runs every minute -@ 1 /usr/bin/php /usr/share/icinga/icinga-web/lib/icingaScheduler/icingaCron.php --useAgavi --exec >> /var/log/icinga-web/cron_error.log -EOF - - if use apache2 ; then - diropts -o apache -g apache - else - diropts -o root -g root - fi - dodir /var/log/icinga-web - - if use apache2 ; then - fowners apache:apache /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat - else - fowners root:root /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat - fi - - if use pnp ; then - insinto /usr/share/icinga/icinga-web/app/modules/Cronks/data/xml/extensions/ - doins contrib/PNP_Integration/templateExtensions/pnp-host-extension.xml - doins contrib/PNP_Integration/templateExtensions/pnp-service-extension.xml - fi -} - -pkg_config() { - einfo "press enter to install the icinga-web crontab" - einfo "installation from /usr/share/icinga/icinga-web/cron/icingaCron" - einfo - read - - if has_version sys-process/fcron; then - fcrontab - -u root < /usr/share/icinga/icinga-web/cron/fcrontab - else - crontab - -u root < /usr/share/icinga/icinga-web/cron/crontab - fi -} - -pkg_postinst() { - einfo - einfo "If this is a new install, you must create a new database for it, e.g. icinga_web." - einfo "You can find the database scripts in /usr/share/icinga/icinga-web/contrib/." - einfo - einfo "Additionally, you need to setup a database user." - einfo "The user must have default data privileges like SELECT, UPDATE, INSERT, DELETE." - einfo - einfo "Example for a MySQL database:" - einfo " echo \"CREATE DATABASE icinga_web;\" | mysql" - einfo " echo \"GRANT SELECT,UPDATE,INSERT,DELETE ON icinga_web.* TO 'icinga_web'@'localhost' IDENTIFIED BY 'xxxxxx';\" | mysql" - einfo " echo \"FLUSH PRIVILEGES;\" | mysql" - einfo - einfo " cat /usr/share/icinga/icinga-web/contrib/mysql.sql | mysql icinga_web" - einfo - - ewarn - ewarn "If you're upgrading from a previous release, you must upgrade your database schema." - ewarn "You can find upgrade scripts in /usr/share/icinga/icinga-web/contrib/updates/." - ewarn - ewarn "IMPORTANT: If you are upgrading from an older version and there are other versions in between," - ewarn " be advised that you need to apply those upgrade files with incremental steps!" - ewarn - ewarn "Example to upgrade a MySQL database:" - ewarn " cat /usr/share/icinga/icinga-web/contrib/updates/mysql_<oldversion>_to_<newversion>.sql | mysql icinga_web" - ewarn - ewarn "Don't forget to clear the config cache." - ewarn " /usr/share/icinga/icinga-web/bin/clearcache.sh" - ewarn - - einfo - einfo "Please note that the magic_quotes_gpc setting must be disabled (in both apache and cli php.ini)." - einfo - - if use apache2 ; then - einfo - einfo "apache config was installed into" - einfo "/etc/apache2/modules.d/99_icinga-web.conf" - einfo - einfo "The apache config value for \'ServerTokens\' must be set to at" - einfo "least \'Min\'." - einfo - else - einfo - einfo "If you are not using apache you may need to change some" - einfo "permissions, so that your web server can access files and logs" - einfo - fi -} diff --git a/net-analyzer/icinga-web/metadata.xml b/net-analyzer/icinga-web/metadata.xml deleted file mode 100644 index 224b578f16c1..000000000000 --- a/net-analyzer/icinga-web/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>prometheanfire@gentoo.org</email> - <name>Matthew Thode</name> - </maintainer> - <longdescription lang="en"> - Icinga-web is a database backed web frontend to icinga. - </longdescription> - <use> - <flag name="pnp">Enables pnp4nagios integration</flag> - </use> - <upstream> - <remote-id type="sourceforge">icinga</remote-id> - <remote-id type="github">icinga/icinga-web</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest deleted file mode 100644 index 414273a4b963..000000000000 --- a/net-analyzer/icinga/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX icinga-apache.conf 465 BLAKE2B 2a74475126eb4dbc3d7a9ccfccc98696c1d69774e99bca9d3ec67d8cb54526f07f215d0ba13e0fbdf6209e3aa8b7a6abcc21d51c93e630b9db1919b3a5b71c41 SHA512 8f08f6938f2c233e230b45afdc634653cd971bf26fab60252f8633f2b1609f724575f256b018b6016852279ff3ddd12341825f0489be3266c3c096fe983e5841 -AUX icinga-conf.d 178 BLAKE2B e65d9d36e6026046912c7cd3be69493aaa5b564d20756fad47b08ce542e7c8d456fc8f5c6f8c15c89e40af9199df85784ba2fe486f4cee8987cca976a87a7c8c SHA512 96411175c488423c61f45fc9c76131a9807a36f08c9f73c6a6fb50e432d951d3e4ab42b456732b48cb009944faff4af472eb76fbefd75fd61978dfc6d199e9cd -AUX icinga-init.d 1504 BLAKE2B 31dfc99fc9f0d264c35df7a03178ae9465d8b6d2efdd021e02674a09fc6f46efde1e384d25e8bae6f6f3d5181b45d31c1322a1e9a635218f91dce89964e09537 SHA512 fc79b59047981710ae886a08d4b3c84d4fd91c3a8fd0b553056df5703c8b0685e22f9288df9c4f9788ae2e3429935d5f57f39711d1f47bf4723232a78f9082af -AUX icinga-lighty.conf 465 BLAKE2B fe68f22ac43b2010c50fb47da1219e8e60d5f68ea57eef47e53ce890ab6a441abcf4ee9adf2d9b90105366d42f6f711b129f7851d0ba6c2c3ccbce363d596892 SHA512 2a8783945330c54eaa331587f2e7291bdddb8c6717c659ac8dfec7c14ab762a01a870f5fb35d91bb54f36c867eb56c13dce11b5ab13d6e5b6fc9049ce5f57372 -AUX ido2db-conf.d 35 BLAKE2B ca911fa8d9094fc5507849fdc4787156e0015676ee0e77006093af867120af9783d53f91b90493960acdc2878273fe10730bef36bdcc26c017a4a2d3400cf6cc SHA512 c2988f205ce29daaacd2daa20ceb285da2b76e2a68bb5dd695874e73b275714eaea5e0b6bb0afaf7e5d875a9e89ee35c7dfcdb5c77513b2f1a59fbbd28f49f4f -AUX ido2db-init.d 822 BLAKE2B 6affaf5af609a93ee1c12b9ff0b76e3cd4883ab26e58fedd6bff36978873b6347c005d0ba5018e3b0bb40771b1f8eebf259a6f387786154243a0b00b1c8e4b04 SHA512 8593a676389aae540a4fa3e4c7c6f558254da018b13b8dda7a932307645029775659b1258c68fa2178086978c59250be4820b0cc1a3d3c7ded276aa17a3b9b6e -DIST icinga-1.14.2.tar.gz 20779284 BLAKE2B ffc5ab7195faa64b01ae2f37385590405a5525b5ba0cb357bbdc24eb61c1590d25f299d706debb1af1026215dd3800c5133a5fe81cbce8708e0f7ee761a584e2 SHA512 9e993d9653497a5942ad6c3d1ef50b5da4153ba2c7a747aa094c2628f36b687033588b629ca21f8955c84fc6a15f7a7d8169f8b8677f36939bab76cc5e398e41 -EBUILD icinga-1.14.2.ebuild 7420 BLAKE2B db1ece37948ae70ebe0bedd2874c581848f4a5c8f8e267e74e33a9ee181cc1077bc3c337f937d402f2ae4dc30c5d59c1d9b2672220581fc8c73afb70bfe512b1 SHA512 8227e377b435a678adc2c7a1e04e9a40a6575f7d4a081408451400066961e3ce97f25ade413a2bec633c4fc7a9d2d638c32d2f5132c4f7553d338ef05eede6b2 -MISC metadata.xml 853 BLAKE2B 6825b192328f944e2389f221e4dbf5fffea45f1cb650866a8240e53c723ae9b40473e092d48003844fd99b65db4e6ddc7747eddbf7239e7cf4ecddfcca375eb8 SHA512 1aad02d84c0e90f4f0f5ed54e326d9a14e77f5146b3ba9293279e009f45900a69e1b2fcc9f54cb02111f05bb2aef0370cda1b4bc4fffa4fc4dd0c2a073e0a92b diff --git a/net-analyzer/icinga/files/icinga-apache.conf b/net-analyzer/icinga/files/icinga-apache.conf deleted file mode 100644 index 7c768b4eb317..000000000000 --- a/net-analyzer/icinga/files/icinga-apache.conf +++ /dev/null @@ -1,17 +0,0 @@ -<IfDefine ICINGA> - ScriptAlias /icinga/cgi-bin/ /usr/lib/icinga/cgi-bin/ - <Directory "/usr/lib/icinga/cgi-bin/"> - Options ExecCGI - AuthName "Icinga Access" - AuthType Basic - AuthUserFile /etc/icinga/htpasswd.users - Require valid-user - </Directory> - Alias /icinga /usr/share/icinga/htdocs - <Directory "/usr/share/icinga/htdocs"> - AuthName "Icinga Access" - AuthType Basic - AuthUserFile /etc/icinga/htpasswd.users - Require valid-user - </Directory> -</IfDefine> diff --git a/net-analyzer/icinga/files/icinga-conf.d b/net-analyzer/icinga/files/icinga-conf.d deleted file mode 100644 index da5b324b31b7..000000000000 --- a/net-analyzer/icinga/files/icinga-conf.d +++ /dev/null @@ -1,3 +0,0 @@ -# Distributed monitoring users will want to configure here the ip/hostname of the central server. -# It will be used by submit_check_result_via_nsca. -NAGIOS_NSCA_HOST="localhost" diff --git a/net-analyzer/icinga/files/icinga-init.d b/net-analyzer/icinga/files/icinga-init.d deleted file mode 100644 index 3a20f31c1940..000000000000 --- a/net-analyzer/icinga/files/icinga-init.d +++ /dev/null @@ -1,64 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -: ${ICINGACFG:=/etc/icinga/icinga.cfg} - -extra_commands="checkconfig" -extra_started_commands="reload" - -command=/usr/sbin/icinga -command_args="-d ${ICINGACFG}" - -get_config() { - if [ -e "${ICINGACFG}" ]; then - sed -n -e 's:^[ \t]*'$1'=\([^#]\+\).*:\1:p' "${ICINGACFG}" - fi -} - -pidfile=$(get_config lock_file) -start_stop_daemon_args="-e HOME=/var/lib/icinga" - -depend() { - need net - use dns logger firewall mysql postgresql -} - -checkconfig() { - # Silent Check - ${command} -v ${ICINGACFG} &>/dev/null && return 0 - # Now we know there's problem - run again and display errors - ${command} -v ${ICINGACFG} - eend $? "Configuration Error. Please fix your configfile" -} - -reload() -{ - checkconfig || return 1 - ebegin "Reloading configuration" - kill -HUP $(cat ${pidfile}) &>/dev/null - eend $? -} - -start_pre() { - checkpath -d -o icinga:icinga $(dirname $(get_config lock_file)) $(dirname $(get_config log_file)) $(dirname $(get_config status_file)) - checkpath -f -o icinga:icinga $(get_config log_file) - rm -f $(get_config command_file) - # Temp dir must NOT be group-writable - # grsec: denied untrusted exec (due to file in group-writable directory) - checkpath -d -o icinga:icinga -m 0750 $(get_config temp_path) -} - -stop_post() { - rm -f $(get_config command_file) - rm -r /tmp/icinga -} - -svc_restart() { - checkconfig || return 1 - ebegin "Restarting icinga" - svc_stop - svc_start - eend $? -} - diff --git a/net-analyzer/icinga/files/icinga-lighty.conf b/net-analyzer/icinga/files/icinga-lighty.conf deleted file mode 100644 index 678f2331e4ed..000000000000 --- a/net-analyzer/icinga/files/icinga-lighty.conf +++ /dev/null @@ -1,24 +0,0 @@ -server.modules += ("mod_cgi") -server.modules += ("mod_auth") -server.modules += ("mod_alias") - -auth.require += ( "/icinga" => - ( - "method" => "digest", - "realm" => "icinga", - "require" => "valid-user" - ) -) - -$HTTP["url"] =~ "^/icinga/cgi-bin/" { - dir-listing.activate = "disable" - cgi.assign = ( - ".pl" => "/usr/bin/perl", - ".cgi" => "" - ) -} - -alias.url += ( - "/icinga/cgi-bin" => "/usr/lib/icinga/cgi-bin", - "/icinga" => "/usr/share/icinga/htdocs" -) diff --git a/net-analyzer/icinga/files/ido2db-conf.d b/net-analyzer/icinga/files/ido2db-conf.d deleted file mode 100644 index 5429fa9a5268..000000000000 --- a/net-analyzer/icinga/files/ido2db-conf.d +++ /dev/null @@ -1 +0,0 @@ -IDO2DBCFG="/etc/icinga/ido2db.cfg" diff --git a/net-analyzer/icinga/files/ido2db-init.d b/net-analyzer/icinga/files/ido2db-init.d deleted file mode 100644 index 2b827fa87535..000000000000 --- a/net-analyzer/icinga/files/ido2db-init.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -get_config() { - if [ -e "${IDO2DBCFG}" ]; then - sed -n -e 's:^[ \t]*'$1'=\([^#]\+\).*:\1:p' "${IDO2DBCFG}" - fi -} - -command=/usr/sbin/ido2db -command_args="-c ${IDO2DBCFG}" -pidfile="$(get_config lock_file)" - -depend() { - config "${IDO2DBCFG}" - - need net icinga - use dns logger firewall - - case $(get_config db_servertype) in - mysql) - use mysql ;; - pgsql) - use postgresql ;; - esac -} - -IDO2DBSOCKET="$(get_config socket_name)" - - -start_pre() { - if [ -S "${IDO2DBSOCKET}" ] ; then - ewarn "Strange, the socket file already exist in \"${IDO2DBSOCKET}\"" - ewarn "it will be removed now and re-created by ido2db" - ewarn "BUT please make your checks." - rm -f "${IDO2DBSOCKET}" - fi -} diff --git a/net-analyzer/icinga/icinga-1.14.2.ebuild b/net-analyzer/icinga/icinga-1.14.2.ebuild deleted file mode 100644 index 3bc81cee760c..000000000000 --- a/net-analyzer/icinga/icinga-1.14.2.ebuild +++ /dev/null @@ -1,265 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator - -DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils" -HOMEPAGE="http://www.icinga.org/" -SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz" -S="${WORKDIR}/${PN}-core-${PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86" -IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web" -DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) - perl? ( dev-lang/perl:= ) - virtual/mailx - web? ( - media-libs/gd[jpeg,png] - lighttpd? ( www-servers/lighttpd ) - ) - !net-analyzer/nagios-core" -RDEPEND="${DEPEND} - plugins? ( || ( - net-analyzer/monitoring-plugins - net-analyzer/nagios-plugins - ) )" -RESTRICT="test" - -want_apache2 - -pkg_setup() { - depend.apache_pkg_setup - enewgroup icinga - enewgroup nagios - enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios" -} - -src_configure() { - local myconf - - myconf="$(use_enable perl embedded-perl) - $(use_with perl perlcache) - $(use_enable idoutils) - $(use_enable ssl) - --with-cgiurl=/icinga/cgi-bin - --with-log-dir=/var/log/icinga - --libdir=/usr/$(get_libdir) - --bindir=/usr/sbin - --sbindir=/usr/$(get_libdir)/icinga/cgi-bin - --datarootdir=/usr/share/icinga/htdocs - --localstatedir=/var/lib/icinga - --sysconfdir=/etc/icinga - --with-lockfile=/var/run/icinga/icinga.lock - --with-temp-dir=/tmp/icinga - --with-temp-file=/tmp/icinga/icinga.tmp" - - if use idoutils ; then - myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock - --with-icinga-chkfile=/var/lib/icinga/icinga.chk - --with-ido-sockfile=/var/lib/icinga/ido.sock - --with-idomod-tmpfile=/tmp/icinga/idomod.tmp" - fi - - if use eventhandler ; then - myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers" - fi - - if use plugins ; then - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" - else - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" - fi - - if use !apache2 && use !lighttpd ; then - myconf+=" --with-command-group=icinga" - else - if use apache2 ; then - myconf+=" --with-httpd-conf=/etc/apache2/conf.d" - myconf+=" --with-command-group=apache" - elif use lighttpd ; then - myconf+=" --with-command-group=lighttpd" - fi - fi - - econf ${myconf} -} - -src_compile() { - tc-export CC - - emake icinga - - if use web ; then - emake DESTDIR="${D}" cgis - fi - - if use contrib ; then - emake DESTDIR="${D}" -C contrib - fi - - if use idoutils ; then - emake DESTDIR="${D}" idoutils - fi -} - -src_install() { - dodoc Changelog README UPGRADING - - if ! use web ; then - sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile - fi - - emake DESTDIR="${D}" install{,-config,-commandmode} - - if use idoutils ; then - emake DESTDIR="${D}" install-idoutils - fi - - if use contrib ; then - emake DESTDIR="${D}" -C contrib install - fi - - if use eventhandler ; then - emake DESTDIR="${D}" install-eventhandlers - fi - - newinitd "${FILESDIR}"/icinga-init.d icinga - newconfd "${FILESDIR}"/icinga-conf.d icinga - if use idoutils ; then - newinitd "${FILESDIR}"/ido2db-init.d ido2db - newconfd "${FILESDIR}"/ido2db-conf.d ido2db - insinto /usr/share/icinga/contrib/db - doins -r module/idoutils/db/* - fi - # Apache Module - if use web ; then - if use apache2 ; then - insinto "${APACHE_MODULES_CONFDIR}" - newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf - elif use lighttpd ; then - insinto /etc/lighttpd - newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf - else - ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver" - ewarn "out-of-the-box. Since you are not using one of them, you" - ewarn "have to configure your webserver accordingly yourself." - fi - fowners -R root:root /usr/$(get_libdir)/icinga - cd "${D}" - find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} + - find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} + - fi - - if use eventhandler ; then - dodir /etc/icinga/eventhandlers -# fowners icinga:icinga /etc/icinga/eventhandlers - fi - - keepdir /etc/icinga - keepdir /var/lib/icinga - keepdir /var/lib/icinga/archives - keepdir /var/lib/icinga/rw - keepdir /var/lib/icinga/spool/checkresults - - if use apache2 ; then - webserver=apache - elif use lighttpd ; then - webserver=lighttpd - else - webserver=icinga - fi - - fowners icinga:icinga /var/lib/icinga - fowners -R icinga:${webserver} /var/lib/icinga/rw - - fperms 6755 /var/lib/icinga/rw - - # ensure ownership - fowners -R root:root /etc/icinga - fperms 0750 /etc/icinga - fowners -R root:root /usr/sbin - fowners -R root:root /usr/$(get_libdir) - fowners -R root:root /usr/share/icinga/htdocs - - # paxmarks - if use idoutils ; then - pax-mark m usr/sbin/ido2db - fi -} - -pkg_postinst() { - if use web ; then - elog "This does not include cgis that are perl-dependent" - elog "Currently traceroute.cgi is perl-dependent" - elog "Note that the user your webserver is running as needs" - elog "read-access to /etc/icinga." - elog - if use apache2 || use lighttpd ; then - elog "There are several possible solutions to accomplish this," - elog "choose the one you are most comfortable with:" - elog - if use apache2 ; then - elog " usermod -G icinga apache" - elog "or" - elog " chown icinga:apache /etc/icinga" - elog - elog "Also edit /etc/conf.d/apache2 and add a line like" - elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\"" - elog - elog "Icinga web service needs user authentication. If you" - elog "use the base configuration, you need a password file" - elog "with a password for user \"icingaadmin\"" - elog "You can create this file by executing:" - elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin" - elog - elog "you may want to also add apache to the icinga group" - elog "to allow it access to the AuthUserFile" - elog - elif use lighttpd ; then - elog " usermod -G icinga lighttpd " - elog "or" - elog " chown icinga:lighttpd /etc/icinga" - elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'" - fi - elog - elog "That will make icinga's web front end visable via" - elog "http://localhost/icinga/" - elog - else - elog "IMPORTANT: Do not forget to add the user your webserver" - elog "is running as to the icinga group!" - fi - else - ewarn "Please note that you have installed Icinga without web interface." - ewarn "Please don't file any bugs about having no web interface when you do this." - ewarn "Thank you!" - fi - elog - elog "If you want icinga to start at boot time" - elog "remember to execute:" - elog " rc-update add icinga default" - elog - elog "If your kernel has /proc protection, icinga" - elog "will not be happy as it relies on accessing the proc" - elog "filesystem. You can fix this by adding icinga into" - elog "the group wheel, but this is not recomended." - elog - if [ -d "${ROOT}"/var/icinga ] ; then - ewarn - ewarn "/var/icinga was moved to /var/lib/icinga" - ewarn "please move the files if this was an upgrade" - if use idoutils ; then - ewarn "and edit /etc/ido2db.cfg to change the location of the files" - ewarn "it accesses" - ewarn "update your db with the scripts under the directory" - ewarn "/usr/share/icinga/contrib/db/" - fi - ewarn - ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files" - ewarn "remove /var/icinga afterwards to make this warning disappear" - fi -} diff --git a/net-analyzer/icinga/metadata.xml b/net-analyzer/icinga/metadata.xml deleted file mode 100644 index 958f95e0f18f..000000000000 --- a/net-analyzer/icinga/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <longdescription lang="en">A rebuild of nagios from the ground up</longdescription> - <use> - <flag name="contrib">additional scripts</flag> - <flag name="idoutils">Adds DB support</flag> - <flag name="lighttpd">Adds Lighttpd support</flag> - <flag name="plugins">Adds support for nagios plugins</flag> - <flag name="web">Adds generic web interface support</flag> - <flag name="eventhandler">Adds support for running custom scripts whenever a host or service state change occurs</flag> - </use> - <maintainer type="person"> - <email>prometheanfire@gentoo.org</email> - </maintainer> - <upstream> - <remote-id type="github">icinga/icinga-core</remote-id> - <remote-id type="sourceforge">icinga</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest index 89856f484aa1..20d2133a0bcc 100644 --- a/net-analyzer/icinga2/Manifest +++ b/net-analyzer/icinga2/Manifest @@ -1,10 +1,6 @@ AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082 AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a -DIST icinga2-2.10.5.tar.gz 5141193 BLAKE2B 7262e9f0ccb2180faba51b2e04b58964fe6c72782ab61488925c0f6528a80fc1f58afab5f3858f6f696fdca7c8d5546beb8fd374f7f72e452ffd7cd1f1e3ff4a SHA512 c43443d0bbb4ec997d3c5405ef3019ae3b09131bcce2e9d7c7b0e187768335a2f1347fdd382655f12a28b3a29ec8bf644c1b610ea5157f3ee40ae5e0e9253d38 -DIST icinga2-2.10.6.tar.gz 5148999 BLAKE2B a155ccb381947854dfd9115575680b7101dc8d01708c76c719d4e6306c5acdf0bf3394128a8937f7d8e03d97c18442ee1b576af28f98fb11e42055b8b4498cce SHA512 ab1440fdbb36217c5e50d8a254d0f1294e412325038fcc02496c606558ab33f4fafda93b1f439ab6e51e956aff6daddee005282b6d529c7e9d9d781af120834d -DIST icinga2-2.11.2.tar.gz 7476465 BLAKE2B b3c1ebd220dc21feffa998311d743b004c83e897fee758b1398897b5ec5772b7e27840ebe925cbfff89df333c25b366ca15c16fcedddb596fdd1e1236540fa16 SHA512 88bed284aae0196b964a9998c638066f54788474f91d9e21b0f262bf889b17d46ab0c143f9dc4bb976bfcc5785a1f0521c0bf16fa7e54a7af22fd1baae1a231d -EBUILD icinga2-2.10.5.ebuild 4658 BLAKE2B e32a17d5b6e76bda09f46f28323ecf9ea483c523427cc6b61cc54255a9093a480979dcb9aea219e1a4f256c4c53ad7ad6ecdedb77690892b14b265f5880bdf71 SHA512 77a14c8278034b2e768be05080f4bab3bfa45c6f2d1456aa787fc961b66a14af055cbbd6a963cf8920bbedd9c4d42111dc35cb88feb74730ea9701c9aca06860 -EBUILD icinga2-2.10.6.ebuild 4645 BLAKE2B 1a0ea70341877bb5f386475eb8c9dd93bed9a9c0c6d765532a3284c24d7219d5378540b10f4ea34d9d77330f9d10dc0fb1d196cee25a1551ed4ae403cc5efbab SHA512 f7c02edf56b15717e710ef655eac41d12a3abfbc8d23b412d315fbebd3fd70cb75cfcd71a6ff6f5b017b539cce25d8062beae25d32e09a7f4ddc7b6df003d334 -EBUILD icinga2-2.11.2.ebuild 4636 BLAKE2B 8b5a2bc164cd2ff0cf643d478ab96e947b3e8985bf2a572d7f1ae905c26c16bfc6f45a71a9ac40eb57daa2fef1f7868dd5e270049259efbaf5d1fed62d36b57a SHA512 f4bb74c822091bc49db44039dd1ae21fd94fa4de1fcf1c4b6bacb34a0a15d9a8adf0f88f574a5f290b776f975546a1563baa2b4eb44b726baa17b2c41546ded4 -EBUILD icinga2-9999.ebuild 4669 BLAKE2B abaf22a582c9e821c392a49d2754aa6599b9d5c348cfc5a1eae48a55df74ed63c186eb8c026ed9225d2a99194f47a689dc97604f5cb8e23f6458b6200963daab SHA512 6578fd3c8da1cee03afdb192468bf1ef3414bd68e14c73daac844c99bd432989370910bb82f7fc43b67933db35b30eb5296d9b5f1b7b5a5f557369c1f5f0067d +DIST icinga2-2.11.3.tar.gz 7475785 BLAKE2B baabe8c90170a7b2ddb3ae7e95ef3cd042e64f68dbfdb50f5a981bc63ae5aa1e8ec4082729456d1b3fc02c0c74a98e15383cc56e56c53a2ab6181db94125365c SHA512 616e938fabaa6565fb9ac4824649c09801dd53b3517c0a9b5b62307293bc838377c18818cc13dd40e240902f02455c421d433b6ee54671403598c5b7aeb78ea1 +EBUILD icinga2-2.11.3.ebuild 4566 BLAKE2B 1640a4ad8c70b4b9be789f43c097abfff3719c305a03879f0eb2302ce6d22aae6279957261ec2486b159199219244691548793b4d082434a493cefe2540fb45d SHA512 bd5fb8407a0a2f497e93638e4cf10e4ceed3c17db80031e7bc18f77e94e7f4bcbe1c856834466bdb3c636891c0b2c2ddc5bf6319615d02ee7c1c61083e52f131 +EBUILD icinga2-9999.ebuild 4599 BLAKE2B 31cd0366e1d779e8b218c119e611e65b6822d329e10b7a5e490d00603bc9e7263ad1a4126aefa3e01051e3aff915a337b3041a28f0ac7c5c4cc1bb3a7321f01d SHA512 f84ff05c3a31cd2872cc8c60773dea7a1d69fc591a867a0674eff3af8c1cf92a7b7150259f0511a42e0a496d6696c6e1dc66384f215cbdc6537e8aadb920d3eb MISC metadata.xml 767 BLAKE2B 5a1f42327c794c6a9c7bc2c12a9d58fc0eb01e414f18a3ef80ac25263166a615ac1e3865544d3cc17bd950e5688b1f092b5061cbb5d4a51bca8c94bc83ddf9e5 SHA512 e92f81fbe17e5a54e509f26fa6b1fd0461c5229eecd3d0c5e078ab35fa6f2b5898e60e0d132b096bd2292d54ec9c4694564e96282fb4157985dfddec80c58675 diff --git a/net-analyzer/icinga2/icinga2-2.10.5.ebuild b/net-analyzer/icinga2/icinga2-2.10.5.ebuild deleted file mode 100644 index 5ca081b66606..000000000000 --- a/net-analyzer/icinga2/icinga2-2.10.5.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -if [[ ${PV} != 9999 ]]; then - inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets - SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" -else - inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets - EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" - EGIT_BRANCH="master" - KEYWORDS="" -fi - -DESCRIPTION="Distributed, general purpose, network monitoring engine" -HOMEPAGE="http://icinga.org/icinga2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" -WX_GTK_VER="3.0" - -CDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - >=dev-libs/boost-1.58-r1:= - console? ( dev-libs/libedit ) - mariadb? ( dev-db/mariadb-connector-c:= ) - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:= ) - dev-libs/yajl" - -DEPEND=" - ${CDEPEND} - sys-devel/bison - >=sys-devel/flex-2.5.35" - -RDEPEND=" - ${CDEPEND} - plugins? ( || ( - net-analyzer/monitoring-plugins - net-analyzer/nagios-plugins - ) ) - mail? ( virtual/mailx )" - -REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" - -want_apache2 - -pkg_setup() { - depend.apache_pkg_setup - enewgroup icinga - enewgroup icingacmd - enewgroup nagios # for plugins - enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios" -} - -src_configure() { - sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die - local mycmakeargs=( - -DICINGA2_UNITY_BUILD=FALSE - -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_BUILD_TYPE=None - -DCMAKE_INSTALL_SYSCONFDIR=/etc - -DCMAKE_INSTALL_LOCALSTATEDIR=/var - -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 - -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins" - -DICINGA2_USER=icinga - -DICINGA2_GROUP=icingacmd - -DICINGA2_COMMAND_GROUP=icingacmd - -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes - -DUSE_SYSTEMD=$(usex systemd ON OFF) - -DLOGROTATE_HAS_SU=ON - ) - # default to off if minimal, allow the flags to be set otherwise - if use minimal; then - mycmakeargs+=( - -DICINGA2_WITH_MYSQL=OFF - -DICINGA2_WITH_PGSQL=OFF - ) - else - mycmakeargs+=( - -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF) - -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF) - ) - fi - # LTO - if use lto; then - mycmakeargs+=( - -DICINGA2_LTO_BUILD=ON - ) - else - mycmakeargs+=( - -DICINGA2_LTO_BUILD=OFF - ) - fi - - cmake-utils_src_configure -} - -src_install() { - BUILDDIR="${WORKDIR}"/icinga2-${PV}_build - cd "${BUILDDIR}" || die - - emake DESTDIR="${D}" install - - einstalldocs - - newinitd "${FILESDIR}"/icinga2.initd-3 icinga2 - - if use mysql ; then - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* - fi - if use mariadb ; then # same as mysql - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* - fi - if use postgres ; then - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/* - fi - - keepdir /etc/icinga2 - keepdir /var/lib/icinga2/api/zones - keepdir /var/lib/icinga2/api/repository - keepdir /var/lib/icinga2/api/log - keepdir /var/spool/icinga2/perfdata - - rm -r "${D}/var/run" || die "failed to remove /var/run" - rm -r "${D}/var/cache" || die "failed to remove /var/cache" - - fowners root:icinga /etc/icinga2 - fperms 0750 /etc/icinga2 - fowners icinga:icinga /var/lib/icinga2 - fowners icinga:icinga /var/spool/icinga2 - fowners -R icinga:icingacmd /var/lib/icinga2/api - fowners icinga:icinga /var/spool/icinga2/perfdata - fowners icinga:icingacmd /var/log/icinga2 - - fperms ug+rwX,o-rwx /etc/icinga2 - fperms ug+rwX,o-rwx /var/lib/icinga2 - fperms ug+rwX,o-rwx /var/spool/icinga2 - fperms ug+rwX,o-rwx /var/log/icinga2 - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax - fi - - if use nano-syntax; then - insinto /usr/share/nano - doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc - fi -} - -pkg_postinst() { - if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then - elog "DB IDO schema upgrade may be required required. - https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/" - fi -} diff --git a/net-analyzer/icinga2/icinga2-2.10.6.ebuild b/net-analyzer/icinga2/icinga2-2.10.6.ebuild deleted file mode 100644 index 6c9a7ab3cdf3..000000000000 --- a/net-analyzer/icinga2/icinga2-2.10.6.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -if [[ ${PV} != 9999 ]]; then - inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets - SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" -else - inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets - EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" - EGIT_BRANCH="master" -fi - -DESCRIPTION="Distributed, general purpose, network monitoring engine" -HOMEPAGE="http://icinga.org/icinga2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" -WX_GTK_VER="3.0" - -CDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - >=dev-libs/boost-1.58-r1:= - console? ( dev-libs/libedit ) - mariadb? ( dev-db/mariadb-connector-c:= ) - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:= ) - dev-libs/yajl" - -DEPEND=" - ${CDEPEND} - sys-devel/bison - >=sys-devel/flex-2.5.35" - -RDEPEND=" - ${CDEPEND} - plugins? ( || ( - net-analyzer/monitoring-plugins - net-analyzer/nagios-plugins - ) ) - mail? ( virtual/mailx )" - -REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" - -want_apache2 - -pkg_setup() { - depend.apache_pkg_setup - enewgroup icinga - enewgroup icingacmd - enewgroup nagios # for plugins - enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios" -} - -src_configure() { - sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die - local mycmakeargs=( - -DICINGA2_UNITY_BUILD=FALSE - -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_BUILD_TYPE=None - -DCMAKE_INSTALL_SYSCONFDIR=/etc - -DCMAKE_INSTALL_LOCALSTATEDIR=/var - -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 - -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins" - -DICINGA2_USER=icinga - -DICINGA2_GROUP=icingacmd - -DICINGA2_COMMAND_GROUP=icingacmd - -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes - -DUSE_SYSTEMD=$(usex systemd ON OFF) - -DLOGROTATE_HAS_SU=ON - ) - # default to off if minimal, allow the flags to be set otherwise - if use minimal; then - mycmakeargs+=( - -DICINGA2_WITH_MYSQL=OFF - -DICINGA2_WITH_PGSQL=OFF - ) - else - mycmakeargs+=( - -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF) - -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF) - ) - fi - # LTO - if use lto; then - mycmakeargs+=( - -DICINGA2_LTO_BUILD=ON - ) - else - mycmakeargs+=( - -DICINGA2_LTO_BUILD=OFF - ) - fi - - cmake-utils_src_configure -} - -src_install() { - BUILDDIR="${WORKDIR}"/icinga2-${PV}_build - cd "${BUILDDIR}" || die - - emake DESTDIR="${D}" install - - einstalldocs - - newinitd "${FILESDIR}"/icinga2.initd-3 icinga2 - - if use mysql ; then - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* - fi - if use mariadb ; then # same as mysql - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* - fi - if use postgres ; then - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/* - fi - - keepdir /etc/icinga2 - keepdir /var/lib/icinga2/api/zones - keepdir /var/lib/icinga2/api/repository - keepdir /var/lib/icinga2/api/log - keepdir /var/spool/icinga2/perfdata - - rm -r "${D}/var/run" || die "failed to remove /var/run" - rm -r "${D}/var/cache" || die "failed to remove /var/cache" - - fowners root:icinga /etc/icinga2 - fperms 0750 /etc/icinga2 - fowners icinga:icinga /var/lib/icinga2 - fowners icinga:icinga /var/spool/icinga2 - fowners -R icinga:icingacmd /var/lib/icinga2/api - fowners icinga:icinga /var/spool/icinga2/perfdata - fowners icinga:icingacmd /var/log/icinga2 - - fperms ug+rwX,o-rwx /etc/icinga2 - fperms ug+rwX,o-rwx /var/lib/icinga2 - fperms ug+rwX,o-rwx /var/spool/icinga2 - fperms ug+rwX,o-rwx /var/log/icinga2 - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax - fi - - if use nano-syntax; then - insinto /usr/share/nano - doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc - fi -} - -pkg_postinst() { - if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then - elog "DB IDO schema upgrade may be required required. - https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/" - fi -} diff --git a/net-analyzer/icinga2/icinga2-2.11.2.ebuild b/net-analyzer/icinga2/icinga2-2.11.3.ebuild index ec0fd092da51..a98d579ea652 100644 --- a/net-analyzer/icinga2/icinga2-2.11.2.ebuild +++ b/net-analyzer/icinga2/icinga2-2.11.3.ebuild @@ -3,11 +3,11 @@ EAPI=6 if [[ ${PV} != 9999 ]]; then - inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets + inherit cmake-utils depend.apache eutils systemd toolchain-funcs wxwidgets SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 ~arm64 x86" else - inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets + inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs wxwidgets EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" EGIT_BRANCH="master" fi @@ -41,7 +41,11 @@ RDEPEND=" net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) - mail? ( virtual/mailx )" + mail? ( virtual/mailx ) + acct-user/icinga + acct-group/icinga + acct-group/icingacmd + acct-group/nagios" REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" @@ -49,10 +53,6 @@ want_apache2 pkg_setup() { depend.apache_pkg_setup - enewgroup icinga - enewgroup icingacmd - enewgroup nagios # for plugins - enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios" } src_configure() { diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild index 92b7c65b3f1b..7243f8baa7c6 100644 --- a/net-analyzer/icinga2/icinga2-9999.ebuild +++ b/net-analyzer/icinga2/icinga2-9999.ebuild @@ -3,11 +3,11 @@ EAPI=6 if [[ ${PV} != 9999 ]]; then - inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets + inherit cmake-utils depend.apache eutils systemd toolchain-funcs wxwidgets SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" else - inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets + inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs wxwidgets EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" EGIT_BRANCH="master" fi @@ -41,7 +41,11 @@ RDEPEND=" net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) - mail? ( virtual/mailx )" + mail? ( virtual/mailx ) + acct-user/icinga + acct-group/icinga + acct-group/icingacmd + acct-group/nagios" REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" @@ -49,10 +53,6 @@ want_apache2 pkg_setup() { depend.apache_pkg_setup - enewgroup icinga - enewgroup icingacmd - enewgroup nagios # for plugins - enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios" } src_configure() { diff --git a/net-analyzer/iftop/Manifest b/net-analyzer/iftop/Manifest index 4f8e7e57577a..ffd4b4ba5a52 100644 --- a/net-analyzer/iftop/Manifest +++ b/net-analyzer/iftop/Manifest @@ -7,7 +7,7 @@ AUX iftop-1.0_pre4-ip6.arpa.patch 1857 BLAKE2B 920b5393366d0fe1ccf7619a862fb6a91 AUX iftop-1.0_pre4-tsent-set-but-not-used.patch 229 BLAKE2B 42318fa63e40a2a0b3f50d33c6ca3fef69c837290272f132d63dde276a4302254378f8ab31ab49dbb0b50e821594a2979c713f9119eb4ec852971b585648b344 SHA512 06d26d9497c6afc6b7eb5db508def08c8945408e89127f3938667973f8a8b7884dc0e7b005c115a7acd66d62107de5d47d49a869b89f25f24dd999161b0fb0bf AUX iftoprc 1391 BLAKE2B b2558509d0f8e9dfade1bcb1a1b50569510cada2629fb3b0cb772d2fa0642455ed6e4c18024a19b656bb9d42eefd4e2db2ea066dae28528ad51f12b439307f0a SHA512 01373add0177399e7cf4ae0ecba893fdd9c73bad5243478b4ac9ac5e936647738a22906ee1e8b22b51d541cc4150d0e0619f134666a1e3d0cb78a59a5c04b95b DIST iftop-1.0pre4.tar.gz 204665 BLAKE2B 181385c3fbf43abd4ead975aac11b5ff196de94d9a8d6f195b3f0068aba6ae953067995d19f0175b49ab15c447c99d531542ae786603ee390e080e79bdcd7ae3 SHA512 abd74e8025bb82fef9ebab4997b1d018201a523d47c0128128ca37797490046538d74758dc4471735c22b890e5bd238ad6b2a30776d465138ede367cdd263d22 -EBUILD iftop-1.0_pre4-r2.ebuild 930 BLAKE2B 6cd971da5b9b93da7cbe64c73cb3e0af89552c26f65f1e750835e0f75b658d12107cc047694200b96d69e3761138bb952afbdb15b079a2dba1c7fc8b1308c6db SHA512 9154283719e2c07c2112f5d45b769f298c7f7bd2c1bc495165d13f4ef4b1ae398eda5a78b5ad09fa1abe838f846b0ff75d05bcc70360960538656a4ba7aeac0d +EBUILD iftop-1.0_pre4-r2.ebuild 931 BLAKE2B e39c863df202fa76f0923696ac9abc9d2e3ff69251726e82649329212ae6faeea587e192684a0ccfffaea43c84ed671254822feea7bf2e6bb9355f9bd4255728 SHA512 986734bdbdb493b2e8c630827df7558caa34b2ab45483f989d7ced5318f0c5ba057b1a0fc9a2e5a767d3240a0b293c0e4d6b7cea3173d8161ea84d08319a0176 EBUILD iftop-1.0_pre4-r3.ebuild 967 BLAKE2B 3c772cb506cb89668fec11e768e7fd3a8867883c553a91d12c718391afc7c6f66236a5a298f8181a5e9b497e347e3e56ffb2abf6800730325bf02a728b6da0af SHA512 99150916518329e9af9b0c005f728f9280405ed5c6aab1caa01b035481d11c97e68d898bcaa5a742224c081bc1b9b4b3cd100ba12ccbcef0cb9c074d5e848af6 EBUILD iftop-1.0_pre4-r4.ebuild 1106 BLAKE2B 3ee1172d92c73c97245755b626d11ca1b6763714e2add23dfebec41b764d7e666c99a44e1d6ddb144f9468968c1ed12b77206c375b86d75e266c6e8160aa2e8e SHA512 ccec613b80b771d0de500c6aaf07e079f59933a4dad5fd30d888468e8bf3b66bc9f933c0277d4a5e5611a8d9ac361f2f48a89f6f3435370d8564b2dbbca5b186 EBUILD iftop-9999999.ebuild 879 BLAKE2B e9dec0c2587a447d304892be2b038542a3ac00e0cb47ce2465a8979c10829cf0d5a453ca4c40d5bfe3828900f855288eda1387225a5b6978d19344483d7eb64d SHA512 c8e2c9f166973105ae8786d98e790fa79cd9add436504ecdc4cfb5f154e485070b9b8d630485ed2c08f98945104c274ab5b807da0b1e3890496e8a3f20447e11 diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild index aeb8c0813eb7..7ab2fdef1a8d 100644 --- a/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild +++ b/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="" RDEPEND=" diff --git a/net-analyzer/ipband/Manifest b/net-analyzer/ipband/Manifest index 3a096ab38768..14155df43543 100644 --- a/net-analyzer/ipband/Manifest +++ b/net-analyzer/ipband/Manifest @@ -1,7 +1,8 @@ +AUX ipband-0.8.1-fno-common.patch 5046 BLAKE2B 15d70bd5f9280cab53f17cf93536c7c53ac87e268d6c05df2908fa92c2102d23a52438a6f025c84ecf9e72a0b862cee70ff4f7933549ffc09d728828bef6b3b3 SHA512 c22daa264f3a85da2bbb32f336c49491fac5ef2be44044a5d0195b80e7051c0b84161face018c70ebccdf59861b6c831257d9ab9bfe9a980f9185bbd43be579a AUX ipband-0.8.1-gentoo.patch 353 BLAKE2B 5f8b29a75aba4c673bf6573df4f03f864d636bfa63a63e3c49c212d71a8b70f13f04940f9112f47fd4d6317654366a6dafafc0f55011c6ad957419e96b17dcfb SHA512 4d07dfeac19d5c7e0f82007082ef902c5b736aaf26d53dda2c66941f198e9dc0c1c1506c939eae7a491891c3b5bf988cdba37366d5b21005a66503b835fda16e AUX ipband-0.8.1-postfix.patch 447 BLAKE2B 4c9f9b89b401e3530be636b87c9ece2fe80b63a60627e1eaf4909ec9cd63b6d21bed34ed30354b4466d959cdd866253d8316db75172061580c18775c8fda318a SHA512 9f7948e6bbaba4c7bf9c0fde4c21735a176b522a5765f8c05b4747dabdef1a80f600d2dbb95a24561346edde294f5ad8f3d60a139130149fa320f03701fee9a3 AUX ipband-init 449 BLAKE2B 5307c6e1aa5c0d1165737a3ad2c01eeb3ef338ac30ef8496973cc5c1d340b0e805093bf357ebd84c7970aa9f6b36cc048fed1911809b69e06e18466c65d4470b SHA512 0a95f80bbfcc26c089a196ba359812a3292e08f378e94140605d2e4d378c60528af013738268055028c40d45b769317f6f631f1af9330f983172c92180999467 DIST ipband-0.8.1.tgz 36675 BLAKE2B ab0bab6a455fd7fc8193be8b94d7de6c8a781cf3ad7b3a79866deb5fddff834dd5e752163e55007d34c0852fc8ba7ff5b20095b9d5d62bb0db7ca62c72c83b72 SHA512 66347652fee7c7426620260ae615de2f4cfeedacac21d606643e4ae8da204cc81780bfd3f4062a16a9172a78a4a7799fc97e0141750ed26b0e21c8ac2eab3c4f EBUILD ipband-0.8.1-r1.ebuild 735 BLAKE2B af55a858f1663175871afb4fc64bc16e87403c2208d1769c5e50b4991f6f8f6cfe76a9a6ed62bf5956cc87283f9a48993d1612eff33226d2233f278ab5388f44 SHA512 6439330ff316aea465e36cc46aaa7b975fe1d80be4c48cab259b907f2cf442338b3f7507b4d08b3cbf045b6c9f148918719ada77edbc9d8d898dcf1944c19e55 -EBUILD ipband-0.8.1-r2.ebuild 688 BLAKE2B 5ad5bb6ac1f1ff1762b1674840d7c4a96582f3d794cfc80483746db5e2ac3b876b2c66d76922c71e9f19dfd055bd4477f742e9d6bd61931473ec25bf6016a691 SHA512 b6ea6049a91f24400e2403e4fe32dfcd884f48ca04d431c891ed8e9768406287321645c17fd72ab6f99eeae7daee9e816cd0647c93a5574c0a98fe12328c5209 +EBUILD ipband-0.8.1-r2.ebuild 725 BLAKE2B b221424abc864193473068eae1ffbe8788855b16ba2f53456d5bbdb477c10b6265a4a829b8766d494444af193e29ae977f5e3e54790c019da8de322df522dce4 SHA512 6a6459f90c73453d6309c204b90dc90e85abfa8f6b0d897e4754bce5803f00962ed3aa73c3c763fb9f83627543bc5feb40faea117651636cd8a845956f6a9649 MISC metadata.xml 356 BLAKE2B 2a7264932ec2f44d0f36309d4c4cdcac45257f4d5fd6d61a6feda0f8ba2be066ef497b4021dc27f7802271d1ed3d7bba0e8a41d44a123c5eac7f6f6a6004b804 SHA512 6c8c90ab34232d8be24772a9dca38941823d65270cff167a9ac3eff89c00d447e881fa2dade1201dccece369a7c6e52fb265ff15e33799c8fccfe3adf2c56399 diff --git a/net-analyzer/ipband/files/ipband-0.8.1-fno-common.patch b/net-analyzer/ipband/files/ipband-0.8.1-fno-common.patch new file mode 100644 index 000000000000..4a5fe78fcc49 --- /dev/null +++ b/net-analyzer/ipband/files/ipband-0.8.1-fno-common.patch @@ -0,0 +1,113 @@ +--- a/ipband.h ++++ b/ipband.h +@@ -174,40 +174,40 @@ + extern char pcap_version[]; + + /* Internal use */ +-int isig_m; /* Interupt flag for capture loop */ +-int preload_m; /* Subnets are preloaded flag */ +-char *pcapdev_m; /* Device to listen to */ +-pcap_t *pcapfile_m; /* Pcap input file descriptor */ +-int pcapoffset_m; /* IP header offset */ +-time_t started_m; /* Time when we started */ ++extern int isig_m; /* Interupt flag for capture loop */ ++extern int preload_m; /* Subnets are preloaded flag */ ++extern char *pcapdev_m; /* Device to listen to */ ++extern pcap_t *pcapfile_m; /* Pcap input file descriptor */ ++extern int pcapoffset_m; /* IP header offset */ ++extern time_t started_m; /* Time when we started */ + +-ll_srvc_t *ll_tcp_cache; /* Resolved tcp services cache */ +-ll_srvc_t *ll_udp_cache; /* Resolved udp services cache */ ++extern ll_srvc_t *ll_tcp_cache; /* Resolved tcp services cache */ ++extern ll_srvc_t *ll_udp_cache; /* Resolved udp services cache */ + + + /* Variables holding option values */ +-int debug_m; /* Debug option */ +-int do_html; /* Generate HTML output */ +-char *filtercmd_m; /* Pcap filter string */ +-char *repfname_m; /* Subnet report output file */ +-char *htmlfname_m; /* HTML report output file */ +-char *htmltitle_m; /* HTML Title */ +-int mask_m; /* Network aggregation mask bits */ +-int cycle_m; /* Number of sec to average data */ +-int rcycle_m; /* How long in sec bandwidth +- threshold may be exceeded */ +-float thresh_m; /* Bandwidth threshold in kBps */ +-int fork_m; /* Fork flag */ +-int top_m; /* No of top connections in report */ +-char *config_m; /* Config file name */ +-char *mailto_m; /* E-mail address for reporting */ +-char *mailfoot_m; /* Footer file for e-mail report */ +-char *mtastring_m; /* MTA command string */ +-int report_aggr_m; /* Flag to report aggr exceed time */ +-int promisc_m; /* Use promiscious mode? */ +-int *iplist_m; /* List of local networks */ +-int niplist_m; /* Number of local networks */ +-int lenadj_m; /* IP packet length adjustment in bytes */ ++extern int debug_m; /* Debug option */ ++extern int do_html; /* Generate HTML output */ ++extern char *filtercmd_m; /* Pcap filter string */ ++extern char *repfname_m; /* Subnet report output file */ ++extern char *htmlfname_m; /* HTML report output file */ ++extern char *htmltitle_m; /* HTML Title */ ++extern int mask_m; /* Network aggregation mask bits */ ++extern int cycle_m; /* Number of sec to average data */ ++extern int rcycle_m; /* How long in sec bandwidth ++ threshold may be exceeded */ ++extern float thresh_m; /* Bandwidth threshold in kBps */ ++extern int fork_m; /* Fork flag */ ++extern int top_m; /* No of top connections in report */ ++extern char *config_m; /* Config file name */ ++extern char *mailto_m; /* E-mail address for reporting */ ++extern char *mailfoot_m; /* Footer file for e-mail report */ ++extern char *mtastring_m; /* MTA command string */ ++extern int report_aggr_m; /* Flag to report aggr exceed time */ ++extern int promisc_m; /* Use promiscious mode? */ ++extern int *iplist_m; /* List of local networks */ ++extern int niplist_m; /* Number of local networks */ ++extern int lenadj_m; /* IP packet length adjustment in bytes */ + + + /* +--- a/main.c ++++ b/main.c +@@ -26,6 +26,37 @@ + + #include "ipband.h" + ++/* Internal use */ ++int isig_m; /* Interupt flag for capture loop */ ++int preload_m; /* Subnets are preloaded flag */ ++char *pcapdev_m; /* Device to listen to */ ++pcap_t *pcapfile_m; /* Pcap input file descriptor */ ++int pcapoffset_m; /* IP header offset */ ++time_t started_m; /* Time when we started */ ++ ++/* Variables holding option values */ ++int debug_m; /* Debug option */ ++int do_html; /* Generate HTML output */ ++char *filtercmd_m; /* Pcap filter string */ ++char *repfname_m; /* Subnet report output file */ ++char *htmlfname_m; /* HTML report output file */ ++char *htmltitle_m; /* HTML Title */ ++int mask_m; /* Network aggregation mask bits */ ++int cycle_m; /* Number of sec to average data */ ++int rcycle_m; /* How long in sec bandwidth ++ threshold may be exceeded */ ++float thresh_m; /* Bandwidth threshold in kBps */ ++int fork_m; /* Fork flag */ ++int top_m; /* No of top connections in report */ ++char *config_m; /* Config file name */ ++char *mailto_m; /* E-mail address for reporting */ ++char *mailfoot_m; /* Footer file for e-mail report */ ++char *mtastring_m; /* MTA command string */ ++int report_aggr_m; /* Flag to report aggr exceed time */ ++int promisc_m; /* Use promiscious mode? */ ++int *iplist_m; /* List of local networks */ ++int niplist_m; /* Number of local networks */ ++int lenadj_m; /* IP packet length adjustment in bytes */ + + /* Initialize here and not in set_defaults() in case the latter called + _after_ the structures are created */ diff --git a/net-analyzer/ipband/ipband-0.8.1-r2.ebuild b/net-analyzer/ipband/ipband-0.8.1-r2.ebuild index 6d65e278291e..c0d621602ceb 100644 --- a/net-analyzer/ipband/ipband-0.8.1-r2.ebuild +++ b/net-analyzer/ipband/ipband-0.8.1-r2.ebuild @@ -21,6 +21,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-postfix.patch + "${FILESDIR}"/${P}-fno-common.patch ) src_configure() { diff --git a/net-analyzer/iptraf-ng/Manifest b/net-analyzer/iptraf-ng/Manifest index aae2806985a5..f24aad22d716 100644 --- a/net-analyzer/iptraf-ng/Manifest +++ b/net-analyzer/iptraf-ng/Manifest @@ -3,8 +3,8 @@ 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 -EBUILD iptraf-ng-1.1.4-r1.ebuild 1328 BLAKE2B 2a96658a389867f9298739a9664a3510a1bedd56301fac1976e64db9bb89f37eb239a083298b2e8ac4db6a8010f7c3d3b905a5ad0a9e4f811738d7c7192d7cbd SHA512 398808732fda59229cf07061ec437a37b896e40b7dc89ec79a30fff2688b5177cbbd8c94d1f968bee72adc3fb5aeb11c32d57ce05caf7dbb1f238c3261ef0985 -EBUILD iptraf-ng-1.1.4-r2.ebuild 1434 BLAKE2B 557210a6fd82005b9dc18c56b531d34d35f47d87090a807818eb59107853b8a41e5a5ba4f5f7d4ee0e79a8c60b3194b7cf1903927579471966699e4565340bf0 SHA512 71fd8f9b5fcc3f36b46a09d15e6a1d1bfcf1643574a958b0a8228cfb1c56f542ee163de7aa661ad79fd4d6df06fb4d02399843d1372bf4552464ab468afda8e7 -EBUILD iptraf-ng-1.1.4-r3.ebuild 1452 BLAKE2B fbbd65c88f6eaf0d715e6afd1a29ba83faa1e2a4bb86c08037808f1ea963f85fe6751e0cd124a9bdcce91d74247c86ec414f9db1cfe5df9b4afaefe2b5fccba2 SHA512 a9562595ce49b76f2edcef73a76219ede0c98a02e37bd79cce2797e79591d445a08c5b5bfdb5b617f5dcd5c20070842dad832939b207b923609822685e8b1f1d +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 MISC metadata.xml 376 BLAKE2B e5dd4ba7396c36e80ee1eed3eda4444bdd914e4701dd5acb0780b51a2e0e37020982bf624e1e8ecb81b5ba9af20f199885b52c03329d8238e43ca16c468a1900 SHA512 440bbe472188ac3acd7f0dcdddf8390e690a8f81cda49d6be5bed8a46cdf1fb10416f4313d426c408bd9f88501312af812badc765a24e76927b5ecfc64e7c225 diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild index a2c8b3a67b0f..414a906e2eb0 100644 --- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild +++ b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz" LICENSE="GPL-2 doc? ( FDL-1.1 )" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" IUSE="doc" RESTRICT="test" diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild index 1cb32750a719..0295b3c12613 100644 --- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild +++ b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -10,7 +10,7 @@ SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz" LICENSE="GPL-2 doc? ( FDL-1.1 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="doc" RESTRICT="test" diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild index 12ba38d3c69a..960fddbae484 100644 --- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild +++ b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.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 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/iptraf-ng/iptraf-ng/archive/v${PV}.tar.gz -> ${P}-gi LICENSE="GPL-2 doc? ( FDL-1.1 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="doc" RDEPEND=" diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest index 17d7350b3d2e..7da629e8300f 100644 --- a/net-analyzer/mtr/Manifest +++ b/net-analyzer/mtr/Manifest @@ -5,8 +5,8 @@ AUX mtr-0.88-tinfo.patch 450 BLAKE2B 7241ab3ffcf80c9775700328de031c39172f3842583 DIST mtr-0.87.tar.gz 184645 BLAKE2B e96535b0bd46ee63c5e6110ee465195a9ead6ff7c7ea3629b2668631f25e9181cf4236ba0e2cfc0517e7c70683bbb6347d9c26a2b09701d89e225c27aa2faae4 SHA512 172ba2f78a6ee4deb427ac2fb00dff16843215dbd23663fbe41fcc957ffe278b408a73a0c7e1c05788b235e2d03fb53f9971b8b82d4de2f95edcaa9f2cff3cf9 DIST mtr-0.92.tar.gz 296430 BLAKE2B 0f7dfcbd77d6f9cd0a9ba4c7e6829ce8f3fa0e1de4009632d10c3a1c2acc280db5830296695c27d89317d38d507af8f7e9bdd12b1c0e0d198872dc39f13032e7 SHA512 d362a418b6c17fd2d08da1ed9e033fa3330e4c0497e1bb0644f6193d23f4e20dd8ee181942c2a20ec0025a8b96c521394a21be5a1d9036f8a0a8c4cddfbe381f DIST mtr-0.93.tar.gz 291015 BLAKE2B 6ac0e21f9e06fbfee9e9ada4cddb6cd9685ae669a05d1ed257a2c238ab78ac16e1a1e152ef1359ca530b0eced14c9333df2b691c27cbc29173c843ebc64eaaa9 SHA512 046e98a661bd6248ce819411ceb6e2b875b92877de38523594898df507836c113573cf40d7d4cc548370f515abe99e0aa4d8b3ba44ad54dd00f8e93c8a96c021 -EBUILD mtr-0.87.ebuild 1157 BLAKE2B 8d0b5eacc9ec794046845d88f510326dd7b2518b6cba7ec61073248630ec6e23cfaa1376227c7fc88adb0f4814fb506c9f3ab2f8dba36887ae2f379a0b5b20a0 SHA512 69ee1c54f9cfe71d5003cc004cfac38e09bb014d7e9036e528644c6103291b0f48e042e4ed41bd09a8296eb41843d3ab823f0567f27234ea2c00711de17d1fd8 -EBUILD mtr-0.92-r1.ebuild 1424 BLAKE2B b8ac6ee0aee8c14de230a724f29c9a02bf828546b68689e95cd890037ab609754560a23d5bb922a8109262916aaa6af36f8696827734f4f36ff32fab224d0c57 SHA512 66552bf4dc1f2a765cc27afa7e070fe82fd551d30d45dca4f9be10133117aa8428d608637594bdc76d784a0cf2e3608c82b4338121c2d9d5161736c23374498c -EBUILD mtr-0.93-r1.ebuild 1516 BLAKE2B dc40f0a55e8ae08ff73b89491b7dbd56715b80871a6ab16cf91415c4d3ee5512c83b02ac4c357206fad0a160b1efbcc27b8b72120df88ce8f7226d4c725e606b SHA512 3f686ba48e6c67ce7cde669d23dcb3fb97c5405b23099f9e1857d6ec51d21823abb3a25872303346a7c5b1e9c0be69eaee58b2687a2f55c332db9b727e57af15 +EBUILD mtr-0.87.ebuild 1154 BLAKE2B 7dabf8118eb039767ee7f67948667de349928e053525f41af128db531bfe92192613ad5047ef0836deca9b23da72816b9fbd628546cc76131c9bb4b7b6ce8948 SHA512 51b6c6ed2710f98729551d2ba2ff4d79f048d31c31fd839a9ec8268be675e940d7e91cf2e9f1255d6b6a715ef43f1a5cb2b1a1817ac72c63b8b413091b2a85c0 +EBUILD mtr-0.92-r1.ebuild 1420 BLAKE2B 8527926e0ea370212e705fc65ed8d52d092efafa1a454d78eca60458180ecf9526627a8585575eea94bf566b582c4521a194e07f1d389d1cd0533d5d9df5c31f SHA512 ad4d4561d0bee0f0870f1a821fcc31fca6c7ba54151e1b3f186ed7fd35fc74a0539c30857833b15e7fe355e070e8a691edb3b4058fe547eaab61e0594fc3017f +EBUILD mtr-0.93-r1.ebuild 1512 BLAKE2B c5fff2be28d6e98371148fe9b4cb3d2b26df1d55c8d6a8b17840964135ba72fd836d2bf5ba213f486e989c69bbbe4d6e3925d83008230dae13e897bba9ef6f68 SHA512 4784aa297c9c8ace48c4c0853e12dcff3c3a5d8bb758449604349ee67e80777053f6f8d2afe37327e53f1f16b48fed82fedbd7a29a64b4395fe9d56cfa9d67e5 EBUILD mtr-9999.ebuild 1265 BLAKE2B 8b8bdca8bbfd8b9c1a61296a34d561fc7fad185440ea00ef1d5aa3b63f70dfc65ca61d180c86d1e40045b4c1e9a456da3883853e3369c7ff9d1f4f60b8d28166 SHA512 bdb92c834b3f4c8a3b1848c6c40564ecdb1d7d1d688a77c39870be0179172b0fe6104914e5b3d3137885610a4ac63b69343af8d561f963c380832d1752642b24 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef diff --git a/net-analyzer/mtr/mtr-0.87.ebuild b/net-analyzer/mtr/mtr-0.87.ebuild index 68c3b68c2b24..c3577104b26d 100644 --- a/net-analyzer/mtr/mtr-0.87.ebuild +++ b/net-analyzer/mtr/mtr-0.87.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="gtk ipv6" RDEPEND=" diff --git a/net-analyzer/mtr/mtr-0.92-r1.ebuild b/net-analyzer/mtr/mtr-0.92-r1.ebuild index f3684cc00ecd..703412cb9201 100644 --- a/net-analyzer/mtr/mtr-0.92-r1.ebuild +++ b/net-analyzer/mtr/mtr-0.92-r1.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=6 @@ -10,7 +10,7 @@ SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="gtk ipv6 ncurses" RDEPEND=" diff --git a/net-analyzer/mtr/mtr-0.93-r1.ebuild b/net-analyzer/mtr/mtr-0.93-r1.ebuild index d9d465764723..c0b5cae918d7 100644 --- a/net-analyzer/mtr/mtr-0.93-r1.ebuild +++ b/net-analyzer/mtr/mtr-0.93-r1.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=6 @@ -10,7 +10,7 @@ SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="gtk ipv6 ncurses" RDEPEND=" diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest index d8e90e02f2f3..0ed1e9fcb995 100644 --- a/net-analyzer/munin/Manifest +++ b/net-analyzer/munin/Manifest @@ -11,17 +11,16 @@ AUX munin-node_conf.d_1.4.6-r2 188 BLAKE2B 419e475fb422a74d1c094145c25b7ad371e10 AUX munin-node_init.d_2.0.19 598 BLAKE2B a6442b2873a01d3846ae502314bbdee4ac08ce94ee1dd9e2ca9dc15ba322b531fe4564a76e5cd6526b5b1be5bf06e31ca6c108e8e9f05c89d718c7531ef18a5f SHA512 c2429156972e6db9c75160dcb3419ea67a59801a70e4a13a07899ebea84db079d1efcbeb653e2abea3212fa7cfb96a35ff020daf4918d8fe2839b670ea63b31b AUX munin.apache.include 604 BLAKE2B 796293be594baefca293b6cc5f5d6f31c9ab28ecaa209c776aced2d2a0916ff4b61c195393f19355a6460bf2bde8baf41892e4f41905332996afde32e99397ea SHA512 de4797ccac5c9299dd55140300276f746febf3ac5bfebfc48901ca71fa0e035017917eba054b251cc2383c65f1e209e244906b34eebad237f43a7bd7171f6087 AUX munin.apache.include-2.4 577 BLAKE2B efd0a424cb058b77aa19d6384fac085345f789264b19d878126ca826eda84e79714741529218d9715ba51e175cb1628839e1ca09733f67b370b2401e019c9351 SHA512 b07791a4d5b822b5d0ad84ddbea3444cc1475cee8ee20f62dbb5f3a1792b71dba995e412433d30b3c295e40ad5346528d25e04438ec2dfa535983aae9198cea4 -DIST munin-2.0.49-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851 -DIST munin-2.0.49.tar.gz 2257501 BLAKE2B f2852357e3aa0c1ca3e217b66c3e2d1c0d9c70bf1f8487517ee913e2223ca1c5ae9b922c07f83754522c51fddd0f72f87f5ceea9b7e9642a44aab04ead44538f SHA512 e8bf652000ab76f16bc3b18a16c5231ffb5523fe9f78a90bec97ca31e46ff73566e1cbbf0a3616931d0b46ceb6f5a2b5d4fdc68c797539419a2217dccf643762 DIST munin-2.0.52-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851 DIST munin-2.0.52.tar.gz 2266820 BLAKE2B 41233cd28ce4d682dfd47895061426404540c6b1c65798609a2d509d39ad5359b22087027662e7c03848e5676815843c34d078b782e3d0ab3a6a29b6a22e058b SHA512 7439ea10006a94227b71328d06411378f6855f23f17815a433b3a1c40ea23da5a25a366d48f911b9cfdc43c4b98f3bb9777b67db2b894441eb8941e84ede379c -DIST munin-2.0.54-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851 -DIST munin-2.0.54.tar.gz 2270295 BLAKE2B d0f573a46eedf9e9a7de61428de6c2261f6c9fddd3aa5696966c2ffdaa82a432dca72d60cd2e4b75601f312ad07918090a9dd45a10e3c9c81371b97200e28b12 SHA512 b9a8c7403b34d393115d833ee41e3b5c325e072729b66f6b8b7fd3546ab4660e59e59c6f192eabb706e2bc9c73aea9c50c880c2c36826c5f2962bca46098e732 DIST munin-2.0.56-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851 DIST munin-2.0.56.tar.gz 2271203 BLAKE2B f3df227b905ab794e2253637d367819eff2625f9e0f2355d23916b033b3b23d14bb64a78bf6a334f0c7a1859e60c227d1f754a2689bf291cc5f43a46986d35fe SHA512 111b9b8d88474f480eac1e304a92a52c2295d72a1c6709bb2942ff6ee0ba26a56d25dc5d0cf08ddb98a23d6d9693ad0cddb2185e10df83d553655d017d102b1d -EBUILD munin-2.0.49.ebuild 12302 BLAKE2B f943778e48a625a0fc342ca5cc7d9323092ebbbd4d4fbce281d11d11f0d68425a734290ac2e63b3e221fed2fa6ce9b6a52dc99c4c0ac23c1fbecaaa599ce31f8 SHA512 fe270e67ff999c30c5f88b6b9ef4143de37b2f4e6708dac876ce35f44efd8cab7efec1fa08d49466e091e549020384676b2b6598d3a21f7811cb143fe3e89faf -EBUILD munin-2.0.52-r1.ebuild 12256 BLAKE2B 1c6d426aff660c76e03ab64745e4aaab525291e8a182a98902ed0707a1bd907895d5e6b7e6f14e3063efc631ee377d4374f0897c5b594303c5379b902ee9ef10 SHA512 a055bfaa3d168343afc4fda050b9a99027ec17fe94b673f2cc23ebedc5ffbce9ad9cb2cf149fac16ec55c54d35a32e4a4f37242116fc3e82c4f02c493128c446 +DIST munin-2.0.57-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851 +DIST munin-2.0.57.tar.gz 2272894 BLAKE2B 8daff79d4c9224d83ea91d4583a1c11cdc0d2de05c536da5717cf31555f1d2c87475e4de541688e4b542267a6b8a534911149a7edd6469bd13de79838fae3aed SHA512 d00cfaf450dc4be5fe52f30440fc14ee49f021fe46c1a641ffd2e60682056051b6b2fc8713bd14ae9f9e5aaf28dbf335b6a2e9ec53f8518178888442c069298c +DIST munin-2.0.59-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851 +DIST munin-2.0.59.tar.gz 2276011 BLAKE2B 0681cd838daaa056418258d473825642e2aa6b7a3ac7a435859033a467351145be73df327d3149b46c53f5a04c602bea57bc5af428cafb7b5bf1e9c780915ddf SHA512 5597db797f7a0de3581a17be13b079a3fd1e50903014d67d81a262e921fdfca84eee8ec65e3927438db0e01525d16faaabc7e3f7d4cad1a73e7e14002b10478f EBUILD munin-2.0.52.ebuild 12389 BLAKE2B 4e1046e310948f97ed2469cb58f67c4c7cc6b66ef2fc401a409f2069c2c3b717a1b76d5b9f51add689c00e7daa6a555e927b98f9290ee7e24aac81202f17c557 SHA512 3f1edf0c2c9a35f17794003e143fbde255f60527e0f595a40233b63c1cfaf3bb00416902f6f45941c597987eb292d6b507cc8eb3720d2a17793607f9099ed823 -EBUILD munin-2.0.54.ebuild 12256 BLAKE2B 1c6d426aff660c76e03ab64745e4aaab525291e8a182a98902ed0707a1bd907895d5e6b7e6f14e3063efc631ee377d4374f0897c5b594303c5379b902ee9ef10 SHA512 a055bfaa3d168343afc4fda050b9a99027ec17fe94b673f2cc23ebedc5ffbce9ad9cb2cf149fac16ec55c54d35a32e4a4f37242116fc3e82c4f02c493128c446 -EBUILD munin-2.0.56.ebuild 12256 BLAKE2B 1c6d426aff660c76e03ab64745e4aaab525291e8a182a98902ed0707a1bd907895d5e6b7e6f14e3063efc631ee377d4374f0897c5b594303c5379b902ee9ef10 SHA512 a055bfaa3d168343afc4fda050b9a99027ec17fe94b673f2cc23ebedc5ffbce9ad9cb2cf149fac16ec55c54d35a32e4a4f37242116fc3e82c4f02c493128c446 +EBUILD munin-2.0.56.ebuild 12254 BLAKE2B 925fe7a93c3130d665afa4aa9c874bbf34b22e29fea84fbb6a5f518facd256cb79bf1e2b20ffa5f086d1a8715328a3f34482e1e08f7ded2fa924a976b20cd93f SHA512 5fdc2357b5a48815f7de08d46def379bc5d263b68f1f88ecd5756d095299a53fc8996dce41350fd4281bba434c85c090bfbd965edc1ca46ce5f051d47eeb7c46 +EBUILD munin-2.0.57.ebuild 12256 BLAKE2B 1c6d426aff660c76e03ab64745e4aaab525291e8a182a98902ed0707a1bd907895d5e6b7e6f14e3063efc631ee377d4374f0897c5b594303c5379b902ee9ef10 SHA512 a055bfaa3d168343afc4fda050b9a99027ec17fe94b673f2cc23ebedc5ffbce9ad9cb2cf149fac16ec55c54d35a32e4a4f37242116fc3e82c4f02c493128c446 +EBUILD munin-2.0.59.ebuild 12256 BLAKE2B 1c6d426aff660c76e03ab64745e4aaab525291e8a182a98902ed0707a1bd907895d5e6b7e6f14e3063efc631ee377d4374f0897c5b594303c5379b902ee9ef10 SHA512 a055bfaa3d168343afc4fda050b9a99027ec17fe94b673f2cc23ebedc5ffbce9ad9cb2cf149fac16ec55c54d35a32e4a4f37242116fc3e82c4f02c493128c446 MISC metadata.xml 3920 BLAKE2B cb28e1a3e95ffcc305975d7edc26a5cf852a2a29f8c56376c9bbc90fd2b2850bfeb614d750e7700870aa0c10c8dcfcd2b845c210a5518f591ccfbb7571971cda SHA512 9d12c61750f5ee42cfcb6672facf3b46a024872d918c7acb26631c1b9bab29802a6ac9f4d895b9f4ef18a6f283ad64d4bd6e313df0489a6ed82185c660c42083 diff --git a/net-analyzer/munin/munin-2.0.49.ebuild b/net-analyzer/munin/munin-2.0.49.ebuild deleted file mode 100644 index 1e0ed2049704..000000000000 --- a/net-analyzer/munin/munin-2.0.49.ebuild +++ /dev/null @@ -1,417 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PATCHSET=1 - -inherit user java-pkg-opt-2 systemd - -MY_P=${P/_/-} - -DESCRIPTION="Munin Server Monitoring Tool" -HOMEPAGE="http://munin-monitoring.org/" -SRC_URI=" - https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ppc x86" -IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2" -RESTRICT="!test? ( test )" -REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )" - -# Upstream's listing of required modules is NOT correct! -# Some of the postgres plugins use DBD::Pg, while others call psql directly. -# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly. -# We replace the original ipmi plugins with the freeipmi_ plugin which at least works. -DEPEND_COM=" - dev-lang/perl:=[berkdb] - dev-perl/DBI - dev-perl/Date-Manip - dev-perl/File-Copy-Recursive - dev-perl/List-MoreUtils - dev-perl/Log-Log4perl - dev-perl/Net-CIDR - dev-perl/Net-DNS - dev-perl/Net-Netmask - dev-perl/Net-SNMP - dev-perl/Net-Server[ipv6(-)?] - virtual/perl-Digest-MD5 - virtual/perl-Getopt-Long - virtual/perl-MIME-Base64 - virtual/perl-Storable - virtual/perl-Text-Balanced - virtual/perl-Time-HiRes - apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) - asterisk? ( dev-perl/Net-Telnet ) - cgi? ( - dev-perl/FCGI - dev-perl/CGI-Fast - ) - dhcpd? ( - >=net-misc/dhcp-3[server] - dev-perl/Net-IP - dev-perl/HTTP-Date - ) - doc? ( dev-python/sphinx ) - http? ( dev-perl/libwww-perl ) - irc? ( dev-perl/Net-IRC ) - ldap? ( dev-perl/perl-ldap ) - kernel_linux? ( sys-process/procps ) - memcached? ( dev-perl/Cache-Memcached ) - mysql? ( - virtual/mysql - dev-perl/Cache-Cache - dev-perl/DBD-mysql - ) - postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) - ssl? ( dev-perl/Net-SSLeay ) - syslog? ( virtual/perl-Sys-Syslog ) - !minimal? ( - dev-perl/HTML-Template - dev-perl/IO-Socket-INET6 - dev-perl/URI - >=net-analyzer/rrdtool-1.3[graph,perl] - virtual/ssh - ) - " - -# Keep this seperate, as previous versions have had other deps here -DEPEND="${DEPEND_COM} - dev-perl/Module-Build - java? ( >=virtual/jdk-1.5 ) - test? ( - dev-perl/Test-Deep - dev-perl/Test-Exception - dev-perl/Test-LongString - dev-perl/Test-Differences - dev-perl/Test-MockModule - dev-perl/Test-MockObject - dev-perl/File-Slurp - dev-perl/IO-stringy - dev-perl/IO-Socket-INET6 - )" -RDEPEND="${DEPEND_COM} - virtual/awk - ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) - java? ( - >=virtual/jre-1.5 - || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) - ) - !minimal? ( - virtual/cron - media-fonts/dejavu - ) - selinux? ( sec-policy/selinux-munin ) - !<sys-apps/openrc-0.11.8" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup munin - enewuser munin 177 -1 /var/lib/munin munin - enewuser munin-async -1 /bin/sh /var/spool/munin-async - esethome munin-async /var/spool/munin-async - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - echo ${PV} > RELEASE || die - - eapply "${WORKDIR}"/patches/*.patch - - eapply_user - - java-pkg-opt-2_src_prepare -} - -src_configure() { - local cgidir='$(DESTDIR)/usr/libexec/munin/cgi' - use cgi || cgidir="${T}/useless/cgi-bin" - - local cgiuser=$(usex apache2 apache munin) - - cat >> "${S}"/Makefile.config <<- EOF - PREFIX=\$(DESTDIR)/usr - CONFDIR=\$(DESTDIR)/etc/munin - DOCDIR=${T}/useless/doc - MANDIR=\$(PREFIX)/share/man - LIBDIR=\$(PREFIX)/libexec/munin - HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin - CGIDIR=${cgidir} - CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi - CGIUSER=${cgiuser} - DBDIR=\$(DESTDIR)/var/lib/munin - DBDIRNODE=\$(DESTDIR)/var/lib/munin-node - SPOOLDIR=\$(DESTDIR)/var/spool/munin-async - LOGDIR=\$(DESTDIR)/var/log/munin - PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2) - JCVALID=$(usex java yes no) - STATEDIR=\$(DESTDIR)/run/munin - EOF -} - -# parallel make and install need to be fixed before, and I haven't -# gotten around to do so yet. -src_compile() { - emake -j1 - use doc && emake -C doc html -} - -src_test() { - if [[ ${EUID} == 0 ]]; then - eerror "You cannot run tests as root." - eerror "Please enable FEATURES=userpriv before proceeding." - return 1 - fi - - local testtargets="test-common test-node test-plugins" - use minimal || testtargets+=" test-master" - - LC_ALL=C emake -j1 ${testtargets} -} - -src_install() { - local dirs=" - /var/log/munin - /var/lib/munin/plugin-state - /etc/munin/plugin-conf.d - /etc/munin/plugins" - use minimal || dirs+=" /etc/munin/munin-conf.d/" - - keepdir ${dirs} - fowners munin:munin ${dirs} - - # parallel install doesn't work and it's also pointless to have this - # run in parallel for now (because it uses internal loops). - emake -j1 DESTDIR="${D}" $(usex minimal "install-minimal install-man" install) - - # we remove /run from the install, as it's not the package's to deal - # with. - rm -rf "${D}"/run || die - - # remove the plugins for non-Gentoo package managers; use -f so that - # it doesn't fail when installing on non-Linux platforms. - rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die - - insinto /etc/munin/plugin-conf.d/ - newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node - - newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node - newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node - - newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd - - dodir /usr/lib/tmpfiles.d - cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF - d /run/munin 0700 munin munin - - - EOF - - systemd_dounit "${FILESDIR}"/munin-async.service - systemd_dounit "${FILESDIR}"/munin-graph.{service,socket} - systemd_dounit "${FILESDIR}"/munin-html.{service,socket} - systemd_dounit "${FILESDIR}"/munin-node.service - - cat >> "${T}"/munin.env <<- EOF - CONFIG_PROTECT=/var/spool/munin-async/.ssh - EOF - newenvd "${T}"/munin.env 50munin - - dodoc README ChangeLog INSTALL - if use doc; then - cd "${S}"/doc/_build/html || die - docinto html - dodoc -r * - cd "${S}" || die - fi - - dodir /etc/logrotate.d/ - sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \ - "${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin - - dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_ - - if use syslog; then - sed -i -e '/log_file/s| .*| Sys::Syslog|' \ - "${D}"/etc/munin/munin-node.conf || die - fi - - # Use a simpler pid file to avoid trouble with /run in tmpfs. The - # munin-node service is ran as user root, and only later drops - # privileges. - sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \ - "${D}"/etc/munin/munin-node.conf || die - - keepdir /var/spool/munin-async/.ssh - touch "${D}"/var/spool/munin-async/.ssh/authorized_keys - fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}} - fperms 0750 /var/spool/munin-async{,/.ssh} - fperms 0600 /var/spool/munin-async/.ssh/authorized_keys - - if use minimal; then - # This requires the presence of munin-update, which is part of - # the non-minimal install... - rm "${D}"/usr/libexec/munin/plugins/munin_stats - else - # remove font files so that we don't have to keep them around - rm "${D}"/usr/libexec/${PN}/*.ttf || die - - if use cgi; then - sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die - - keepdir /var/cache/munin-cgi - touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log - fowners $(usex apache2 apache munin) \ - /var/cache/munin-cgi \ - /var/log/munin/munin-cgi-{graph,html}.log - - if use apache2; then - insinto /etc/apache2/vhosts.d - newins "${FILESDIR}"/munin.apache.include munin.include - newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include - fi - else - sed \ - -e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \ - -i "${D}"/etc/munin/munin.conf || die - fi - - keepdir /var/lib/munin/.ssh - cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF - IdentityFile /var/lib/munin/.ssh/id_ecdsa - IdentityFile /var/lib/munin/.ssh/id_rsa - EOF - - fowners munin:munin /var/lib/munin/.ssh/{,config} - fperms go-rwx /var/lib/munin/.ssh/{,config} - - dodir /usr/share/${PN} - cat >> "${D}"/usr/share/${PN}/crontab <<- EOF - # Force the shell to bash - SHELL=/bin/bash - # Mail reports to root@, not munin@ - MAILTO=root - - # This runs the munin task every 5 minutes. - */5 * * * * /usr/bin/munin-cron - - # Alternatively, this route works differently - # Update once a minute (for busy sites) - #*/1 * * * * /usr/libexec/munin/munin-update - ## Check for limit excess every 2 minutes - #*/2 * * * * /usr/libexec/munin/munin-limits - ## Update graphs every 5 minutes - #*/5 * * * * nice /usr/libexec/munin/munin-graph - ## Update HTML pages every 15 minutes - #*/15 * * * * nice /usr/libexec/munin/munin-html - EOF - - cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF - # Mail reports to root@, not munin@, only execute one at a time - !mailto(root),serial(true) - - # This runs the munin task every 5 minutes. - @ 5 /usr/bin/munin-cron - - # Alternatively, this route works differently - # Update once a minute (for busy sites) - #@ 1 /usr/libexec/munin/munin-update - ## Check for limit excess every 2 minutes - #@ 2 /usr/libexec/munin/munin-limits - ## Update graphs every 5 minutes - #@ 5 nice /usr/libexec/munin/munin-graph - ## Update HTML pages every 15 minutes - #@ 15 nice /usr/libexec/munin/munin-html - EOF - - # remove .htaccess file - find "${D}" -name .htaccess -delete || die - fi -} - -pkg_config() { - if use minimal; then - einfo "Nothing to do." - return 0 - fi - - einfo "Press enter to install the default crontab for the munin master" - einfo "installation from /usr/share/${PN}/f?crontab" - einfo "If you have a large site, you may wish to customize it." - read - - ebegin "Setting up cron ..." - if has_version sys-process/fcron; then - fcrontab - -u munin < /usr/share/${PN}/fcrontab - else - # dcron is very fussy about syntax - # the following is the only form that works in BOTH dcron and vixie-cron - crontab - -u munin < /usr/share/${PN}/crontab - fi - eend $? - - einfo "Press enter to set up the SSH keys used for SSH transport" - read - - # generate one rsa (for legacy) and one ecdsa (for new systems) - ssh-keygen -t rsa \ - -f /var/lib/munin/.ssh/id_rsa -N '' \ - -C "created by portage for ${CATEGORY}/${PN}" || die - ssh-keygen -t ecdsa \ - -f /var/lib/munin/.ssh/id_ecdsa -N '' \ - -C "created by portage for ${CATEGORY}/${PN}" || die - chown -R munin:munin /var/lib/munin/.ssh || die - chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die - - einfo "Your public keys are available in " - einfo " /var/lib/munin/.ssh/id_rsa.pub" - einfo " /var/lib/munin/.ssh/id_ecdsa.pub" - einfo "and follows for convenience" - echo - cat /var/lib/munin/.ssh/id_*.pub -} - -pkg_postinst() { - elog "Please follow the munin documentation to set up the plugins you" - elog "need, afterwards start munin-node." - elog "" - elog "To make use of munin-async, make sure to set up the corresponding" - elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys" - elog "" - if ! use minimal; then - elog "Please run" - elog " emerge --config net-analyzer/munin" - elog "to automatically configure munin's cronjobs as well as generate" - elog "passwordless SSH keys to be used with munin-async." - fi - elog "" - elog "Further information about setting up Munin in Gentoo can be found" - elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin" - - if use cgi; then - chown $(usex apache2 apache munin) \ - "${ROOT}"/var/cache/munin-cgi \ - "${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log - - if use apache2; then - elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include" - elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual" - elog "host you want it to be served." - elog "If you want to enable CGI-based HTML as well, you have to add to" - elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI." - else - elog "Effective CGI support has just been added in 2.0.7-r6." - elog "Documentation on how to use it is still sparse." - fi - fi - - # we create this here as we don't want Portage to check /run - # symlinks but we still need this to be present before the reboot. - if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then - mkdir "${ROOT}"/run/munin - chown munin:munin "${ROOT}"/run/munin - chmod 0700 "${ROOT}"/run/munin - fi -} diff --git a/net-analyzer/munin/munin-2.0.56.ebuild b/net-analyzer/munin/munin-2.0.56.ebuild index 80f46fab8967..500c7e3caf59 100644 --- a/net-analyzer/munin/munin-2.0.56.ebuild +++ b/net-analyzer/munin/munin-2.0.56.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="amd64 ~arm ~ppc 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/munin/munin-2.0.52-r1.ebuild b/net-analyzer/munin/munin-2.0.57.ebuild index 80f46fab8967..80f46fab8967 100644 --- a/net-analyzer/munin/munin-2.0.52-r1.ebuild +++ b/net-analyzer/munin/munin-2.0.57.ebuild diff --git a/net-analyzer/munin/munin-2.0.54.ebuild b/net-analyzer/munin/munin-2.0.59.ebuild index 80f46fab8967..80f46fab8967 100644 --- a/net-analyzer/munin/munin-2.0.54.ebuild +++ b/net-analyzer/munin/munin-2.0.59.ebuild diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index 458bc3913021..4f6cca7667b2 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -2,10 +2,7 @@ AUX 99_nagios4-r1.conf 309 BLAKE2B c539330d9f100045fc02d13061dd3b8e958370c8885ef 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.3.4.tar.gz 11101966 BLAKE2B 6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820 SHA512 f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316 DIST nagios-4.4.5.tar.gz 11304463 BLAKE2B e1152c2cd14aa790fbdb84c0d7b3eb4691b05793640bf2871bc4ab1e2d645bb52bb2d1660b7389fb26d599d015f71820988ed1cd58003ed978dd9df38c357675 SHA512 14372e2e4470229bd000a8ad94def6ae504ce3f8e2cf94a9da73736560d1e3b2633302fe232ee7099d88ba00aecde5a9e352901828d6d9a9cd1fdce203deca30 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766 -EBUILD nagios-core-4.3.4.ebuild 6634 BLAKE2B fb1be517d926d7bc26b4feea11d1bbbd0c2cf91455403f4537cb7a5d03a78f943ddc9739683452b033afa06af6005501669fe65df48a95c12c49e4ad94bf3277 SHA512 d6f2c95148d9b0f8598d113f99512fce9a4ba102985b193ee939657feb089928e91ff5697d2aebe1c97714a8a2d5bcd0bae542cb2ffdd1d6881f81a6e52d371c -EBUILD nagios-core-4.4.5-r3.ebuild 7470 BLAKE2B ceb783a9c27047b42b6464a2570452125f2ff6f5c7c6a3333a63f113b2c78037ca7cea1db6cd6ca783d58d3d4bfaa491fade7217bff29b76f2cbaa7496c74dc4 SHA512 4962381b6508363c2f330e81dd81d3de878cb7ef7428f8ba9fc71193c6a3de2c93c8c32298212312feaa72e76b0094fec7ff9e04a9f07072be8181c12497a82a -EBUILD nagios-core-4.4.5-r6.ebuild 8044 BLAKE2B 14761a831bb22669589931e9d66fc50907b6caab8fce0f06a26c0098d61d8261241037f4276ec8cfb87b957b2e5c28de59df4b6c83b773ed5e8112df8f758391 SHA512 cc0d4a90b62bbb6cc7a8bf04bbe388e07106241d98133aa5f345e332bab043b72a55dda194959161580ad9f47832e0490ae9cdefc3c5a5dedd76743ad36a1ada +EBUILD nagios-core-4.4.5-r6.ebuild 8040 BLAKE2B 5b858dd570d525154d2d2d7cbf6066888c8371a611f6420958adb54446c940dabbc499ce4749279aaa70e57c0365ee4e842163f0925c9842752ba54ee03d4b54 SHA512 417299f07aa2092a8e5bb4ed8f9a2fc94a892798e7b665605407d6e267545947fca1bbd7e5c4a29e804c9fa9ed46f6044df8b0fd0e11296e907a81a9ecdf0711 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild deleted file mode 100644 index 53142ce95408..000000000000 --- a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild +++ /dev/null @@ -1,214 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs user - -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 )" - -# sys-devel/libtool dependency is bug #401237. -# -# 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="sys-devel/libtool - 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}" - -pkg_setup() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -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=/usr \ - --bindir=/usr/sbin \ - --sbindir=/usr/$(get_libdir)/nagios/cgi-bin \ - --datadir=/usr/share/nagios/htdocs \ - --localstatedir=/var/nagios \ - --sysconfdir=/etc/nagios \ - --libexecdir=/usr/$(get_libdir)/nagios/plugins -} - -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.asciidoc 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 - - 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 openrc-init nagios - - if use web ; then - if use apache2 ; then - # Install the Nagios configuration file for Apache. - insinto "/etc/apache2/modules.d" - doins "${FILESDIR}"/99_nagios4.conf - elif use lighttpd ; then - # Install the Nagios configuration file for Lighttpd. - insinto /etc/lighttpd - newins "${FILESDIR}/lighttpd_nagios4.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 -} diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r3.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.5-r3.ebuild deleted file mode 100644 index b6994129cefe..000000000000 --- a/net-analyzer/nagios-core/nagios-core-4.4.5-r3.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs user - -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="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}" - -pkg_setup() { - enewgroup nagios - enewuser nagios -1 -1 -1 nagios -} - -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=/usr \ - --bindir=/usr/sbin \ - --localstatedir=/var/lib/nagios \ - --sysconfdir=/etc/nagios \ - --libexecdir=/usr/$(get_libdir)/nagios/plugins \ - --with-cgibindir=/usr/$(get_libdir)/nagios/cgi-bin \ - --with-webdir=/usr/share/nagios/htdocs -} - -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" - doins "${FILESDIR}"/99_nagios4.conf - elif use lighttpd ; then - # Install the Nagios configuration file for Lighttpd. - insinto /etc/lighttpd - newins "${FILESDIR}/lighttpd_nagios4.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.5-r6.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild index 6ec6bb7044f5..4fd452fbe90c 100644 --- a/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild +++ b/net-analyzer/nagios-core/nagios-core-4.4.5-r6.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 7dae507e3d0f..bd80ceab7974 100644 --- a/net-analyzer/nagios/Manifest +++ b/net-analyzer/nagios/Manifest @@ -1,3 +1,2 @@ -EBUILD nagios-4.3.4.ebuild 392 BLAKE2B f15d86c3e331db4ff4ee7b2b32b5501925f62642a1be06f2112461c9997fd6b3de55cd4d4ac62079620d1b0a81c401a96dde0407243de86f00818d7150c10e7f SHA512 fc4e28d7d2ff4eab3c9fb37eb582e561acb66511f89f0b1275b585541f6f8a75f4ba07e475d57daf5fb264031915ca54df6b36dea8a5013279cb206718f6e3be -EBUILD nagios-4.4.5.ebuild 397 BLAKE2B 244121a98f46b570281d36276ca17413b51a015a46835b1bd1f568328d0b12a90bd5f001199a3bd11f4121287bb78762e36007f9e206e75dcfad5af792ce10e0 SHA512 c260ebfa1f7578fd20bb76ba8ae0dfe9dcd495b185c8c5272b09657918b08d194b539428642f4e9e20afa9ba6cdb73a73806f47e9e4e80a321021e04c3f5b405 +EBUILD nagios-4.4.5.ebuild 399 BLAKE2B f6b008474ca0aa1a111004dd288082bb0da6e9882f5b4fb95d118d6dd8a23872572acad62d53a51acbe1731f7973ce23511a96401dc665818da71b28867104ac SHA512 2c382361f2211d245a0937d9c4813f0b40caada397ee1565954e09d1e21345ce2d5216a5d76fd4f8f45439397052a845724ae30293b62d97af6638c8dc43718f MISC metadata.xml 1110 BLAKE2B a3577be74f7ae7da47c1add86da6b9cd2972ebea1e4e4241886027e7c4aecb936ffa776a32bcc0b77498c393ebb4c81aa9a98a3c8d45cbd5556f8b9014384e52 SHA512 7614b25879899b4939a136de6cd4cbd3995372747e95d2d6b90ccd8e074800b6acb738df5f9c852625c34f5a72c3072c0dec910266068ec8a72184f75aa204e1 diff --git a/net-analyzer/nagios/nagios-4.3.4.ebuild b/net-analyzer/nagios/nagios-4.3.4.ebuild deleted file mode 100644 index 1c10d69b68b9..000000000000 --- a/net-analyzer/nagios/nagios-4.3.4.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="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa 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.5.ebuild b/net-analyzer/nagios/nagios-4.4.5.ebuild index 39d47b09dafc..23bb68489c5f 100644 --- a/net-analyzer/nagios/nagios-4.4.5.ebuild +++ b/net-analyzer/nagios/nagios-4.4.5.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=6 @@ -6,9 +6,9 @@ EAPI=6 DESCRIPTION="The Nagios metapackage" HOMEPAGE="https://www.nagios.org/" -LICENSE="GPL-2" +LICENSE="metapackage" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86" IUSE="" RDEPEND="~net-analyzer/nagios-core-${PV} diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest index d379f4054122..a3c5e77bcd64 100644 --- a/net-analyzer/nagstamon/Manifest +++ b/net-analyzer/nagstamon/Manifest @@ -5,7 +5,7 @@ DIST Nagstamon-3.0.2.tar.gz 542005 BLAKE2B 090875cabbf22feea5cfe0eab0934b503d68d DIST Nagstamon-3.2.1.tar.gz 545190 BLAKE2B ce8b6624a3b1b61e307281ba193d07850bd5d104205d21e2967c1f65c0fdb217be2b2422d0312cfccaba766b814cb1f298a2ed62d07b7377530fd2ef3200a46f SHA512 c3ddda8d046d08514f7633b9129abebdc039e7faee5a618ef8ef77fc2c518bad798572fb549eb9ab9ef96377cd390e159934f268d9bd97c071c4895682bff8e6 DIST Nagstamon-3.4.1.tar.gz 563745 BLAKE2B 3ac35c90757eb525e7e7953f63a8798a0087470e4a94161987f3c382b6be43240aa8b5c44f279d23d841dbf9e4536f38d3f5e2f63234538a00fe6b6e0ee9c680 SHA512 68f8a7345c606b8ad4511b34e2d76383faf8831202c9429ab24eeb215073984f00f580c83a7f5e348f7d4104d3c82bd6f4661939801444e463c3fcf64c8240bd EBUILD nagstamon-2.0.1.ebuild 1184 BLAKE2B e3266f765f3cd0a6bb64e3b851358d152cf6bc107125ac21fc334c8b8ce56551ce4f01c9cf786f81fadbce2e1b479e6656dd6c2194147088f9f166f41e0f5733 SHA512 69d8101e5720eb8dfc4ccb2997a274e995623b948357ef5c20fb3c7e5c9bd372e1f51299b09d508ba033debd9284cd68108cee62d8c35302641b71003097f608 -EBUILD nagstamon-3.0.2-r1.ebuild 1374 BLAKE2B 093e6a2ecfc4712ab8b2b032c7ccdc38de68e769aa7efaa15631cfb13b41021c3d80cedf37b9e8379105a3d2cfa9b093c53114c96d468d9bf8f2da918f50728e SHA512 d903857718fd239725f39f2e347bda8a8857c9159531abd2d445bf44e1fe30281d1c480f75e63ac056d928b5e66d46f44fc502c999d700433f045f1f73e06685 -EBUILD nagstamon-3.2.1.ebuild 1503 BLAKE2B 3255251edb70611db3e397159aba274599afbf10060274d3e8943ecbeccd3493f2d65a71bebdfb91cbf81f91d6f2a8369c2a6c6c758c3bcba8de495aa65f51d7 SHA512 a84d5bef3ef5d6238f27849116e9838eb16ce05aec6b38f82466f83c790dcb3df26c867bd2250dbba62d4a92f255897f707177c8de719b73dfff569dfddd1a11 -EBUILD nagstamon-3.4.1.ebuild 1503 BLAKE2B 3255251edb70611db3e397159aba274599afbf10060274d3e8943ecbeccd3493f2d65a71bebdfb91cbf81f91d6f2a8369c2a6c6c758c3bcba8de495aa65f51d7 SHA512 a84d5bef3ef5d6238f27849116e9838eb16ce05aec6b38f82466f83c790dcb3df26c867bd2250dbba62d4a92f255897f707177c8de719b73dfff569dfddd1a11 +EBUILD nagstamon-3.0.2-r1.ebuild 1333 BLAKE2B cfcfe7586f8054838a94b512251ba0b465b0707ec76712a029b668f1ff5a4c398f096c24a01017cf0487207c8dbda75656653a429af70441f28b9977ad01d7d1 SHA512 978fd5089009961b2b83581c75148bd75386d5bf932ab67e4a1e563d890eaeb7e3fadcd8e9b5a7b0e0f7872554b38a19ceaede2dba561058d9e0e7b066e77aaf +EBUILD nagstamon-3.2.1.ebuild 1462 BLAKE2B db3f9a87f8dab49ac77a04bdceae82394eda91a428e511bc9477699f001ec87d10a4d0dfb37fc750fcb7ecd655df42d3f81e15b4fb20e988d24ce27bd3c0e62d SHA512 05d3aa0f8fcf3b29780a39d9468b2fe84c99ebafa6c2f75108e9b9e7bac4eac2359123250b3fc604214d28267091162f1ebcb87a49b1a0598985910c71312740 +EBUILD nagstamon-3.4.1.ebuild 1462 BLAKE2B db3f9a87f8dab49ac77a04bdceae82394eda91a428e511bc9477699f001ec87d10a4d0dfb37fc750fcb7ecd655df42d3f81e15b4fb20e988d24ce27bd3c0e62d SHA512 05d3aa0f8fcf3b29780a39d9468b2fe84c99ebafa6c2f75108e9b9e7bac4eac2359123250b3fc604214d28267091162f1ebcb87a49b1a0598985910c71312740 MISC metadata.xml 525 BLAKE2B ad9c68b36b1260f907ceb8f50389fd0e035d441d33e99c71bb8dd493cda5cdaaa4e2ec32746d2b96d15b776d9de03070e411515f34e90c93063dd4b6b803c155 SHA512 5a1bf5be48ee8d28b501dceea33c65791b13cf0301c6bb170e4fe5ecd7b771cc28d3e9a49b82440770800854146961069cb26529ed5fe3e2c9a796329b085c64 diff --git a/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild b/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild index bd34a19dbb02..e3878f27c7c5 100644 --- a/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild +++ b/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild @@ -32,8 +32,7 @@ RDEPEND="${PYTHON_DEPS} dev-python/cryptography[${PYTHON_USEDEP}] dev-python/secretstorage[${PYTHON_USEDEP}] >=dev-python/python-xlib-0.19[${PYTHON_USEDEP}] - dev-python/requests-kerberos[${PYTHON_USEDEP}] - virtual/python-typing[${PYTHON_USEDEP}]" + dev-python/requests-kerberos[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/net-analyzer/nagstamon/nagstamon-3.2.1.ebuild b/net-analyzer/nagstamon/nagstamon-3.2.1.ebuild index bb891b8c5697..9f9c756c602f 100644 --- a/net-analyzer/nagstamon/nagstamon-3.2.1.ebuild +++ b/net-analyzer/nagstamon/nagstamon-3.2.1.ebuild @@ -32,8 +32,7 @@ RDEPEND="${PYTHON_DEPS} dev-python/cryptography[${PYTHON_USEDEP}] dev-python/secretstorage[${PYTHON_USEDEP}] >=dev-python/python-xlib-0.19[${PYTHON_USEDEP}] - dev-python/requests-kerberos[${PYTHON_USEDEP}] - virtual/python-typing[${PYTHON_USEDEP}]" + dev-python/requests-kerberos[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/net-analyzer/nagstamon/nagstamon-3.4.1.ebuild b/net-analyzer/nagstamon/nagstamon-3.4.1.ebuild index bb891b8c5697..9f9c756c602f 100644 --- a/net-analyzer/nagstamon/nagstamon-3.4.1.ebuild +++ b/net-analyzer/nagstamon/nagstamon-3.4.1.ebuild @@ -32,8 +32,7 @@ RDEPEND="${PYTHON_DEPS} dev-python/cryptography[${PYTHON_USEDEP}] dev-python/secretstorage[${PYTHON_USEDEP}] >=dev-python/python-xlib-0.19[${PYTHON_USEDEP}] - dev-python/requests-kerberos[${PYTHON_USEDEP}] - virtual/python-typing[${PYTHON_USEDEP}]" + dev-python/requests-kerberos[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest index 14fc3c90a396..dba3d5b9086b 100644 --- a/net-analyzer/nessus-agent-bin/Manifest +++ b/net-analyzer/nessus-agent-bin/Manifest @@ -1,6 +1,4 @@ AUX nessusagent.initd 563 BLAKE2B 63820368c95dc2358ff73843e239a084e21cea48bd4dfd170e486f0c702e7ec6be1581478f7c37dd12868dd3648dfd8f44b8ff47c85fdab0276a0c84b78eb7d1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718 -DIST NessusAgent-7.4.2-es7.x86_64.rpm 15989044 BLAKE2B 7fdc998acc4a5ee38519a3cf4d41d1de29cb8ddacb05bd6f734a458c63d7ce22c547b4d080320631d489dc381c4553d99a81786dcb48231833a77561ffa6928f SHA512 4aacc51d360c41963ad46c0976322cd29012d52e054337d4e0a303257796923bd35059324a041827ce0c54ef5c5dd6738311fcc4f0bcba19b6d4ea1e3730a146 -DIST NessusAgent-7.5.0-es7.x86_64.rpm 16793328 BLAKE2B 2a7409477f0d08d2be6d3c5e482f33e73861bc01c3c26e1edd689d71861621f5699ce0e2bb67e994dcd54e9e1314dee056b46aea79fe990bf1629e229ada8e64 SHA512 ed82b37d67a27a3fc9d317a9009afd42332b2935f869f72344f60946a28446ee606821b927f74a4899bb3c5d485b1a607935714ab604e206108db3abe99dcc38 -EBUILD nessus-agent-bin-7.4.2.ebuild 1970 BLAKE2B 278773d237abd92549945042f22e33de29803a1eb7f94678d85c8824fe4e93e932afa56bb250680a997706fe3be683f960656e48a8272e87ac9c8b628902b2ca SHA512 6b075584220409015a3e82cddc2f2b7d1b68aa1ec2093b6ddf350bb35461b4c29969fd02ee646b30bbf3c2cea5cbe6bd339b7b8f14bdb04122238d86da25c684 -EBUILD nessus-agent-bin-7.5.0.ebuild 1970 BLAKE2B 278773d237abd92549945042f22e33de29803a1eb7f94678d85c8824fe4e93e932afa56bb250680a997706fe3be683f960656e48a8272e87ac9c8b628902b2ca SHA512 6b075584220409015a3e82cddc2f2b7d1b68aa1ec2093b6ddf350bb35461b4c29969fd02ee646b30bbf3c2cea5cbe6bd339b7b8f14bdb04122238d86da25c684 +DIST NessusAgent-7.5.1-es7.x86_64.rpm 16793324 BLAKE2B 4fdb1d02cd407049d10c8cd9ab7949d44dc8b61e377a4b6a1b34f12e425834706eb2536f6d05c9b84415321652676e048eb002fc81463b12cccff865f22560b2 SHA512 6b3cbacdaa32da404f285a53d990dfc5f520e05c4a00690d7b46cfbf8b7f89a0089f2d36288ef695a0dae033b70e9dd3cf85c682833910e9314a78414aa2bd07 +EBUILD nessus-agent-bin-7.5.1.ebuild 1970 BLAKE2B ed1f9f97734a82f17c7eab6c39588d28e1b4bc97508f4259b6ab619ca5d67e4b7b75f0cb6171d51a13c8d223b92c45ba9f92175dc785c9fcf6a8de14e965c00a SHA512 6adb47eea90f782f904f5a8de08f1b404de60cb5836619b266e4a6101bad77f825c5d2347462329b5d9f9946a50ef6dae5da2b6f0acaf1ee46abff732b106683 MISC metadata.xml 353 BLAKE2B e3ba298accb9a0618eb7340652a32cc166702f8873b49de734f6c117e2aeadbd9c31a76f231574ee04159454633191d4d3480925c05c993be174bf4efd3cc994 SHA512 81bc629de5c0367706b7b3259b3bb68edff6260dd47de345153af292a81fb6df23771b0f4974617f1fdef7b446dc17ab3c485d44d3dcb376e93c69173503a348 diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.2.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.2.ebuild deleted file mode 100644 index 20d896ea6290..000000000000 --- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit rpm pax-utils systemd - -MY_P="NessusAgent-${PV}-es7" - -DESCRIPTION="A remote security scanner for Linux - agent component" -HOMEPAGE="https://www.tenable.com/" -SRC_URI="${MY_P}.x86_64.rpm" - -LICENSE="GPL-2 Nessus-EULA" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="mirror fetch strip" - -QA_PREBUILT="opt/nessus_agent/bin/nasl - opt/nessus_agent/bin/nessus-mkrand - opt/nessus_agent/lib/nessus/libjemalloc.so.${PV} - opt/nessus_agent/lib/nessus/libnessus-glibc-fix.so - opt/nessus_agent/lib/nessus/plugins/ovaldi64-rhel7.inc - opt/nessus_agent/sbin/nessus-check-signature - opt/nessus_agent/sbin/nessus-service - opt/nessus_agent/sbin/nessuscli - opt/nessus_agent/sbin/nessusd" - -S="${WORKDIR}" - -pkg_nofetch() { - einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus-agents" - einfo "The archive should then be placed into your DISTDIR directory." -} - -src_install() { - # Using doins -r would strip executable bits from all binaries - cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files" - - pax-mark m "${D}"/opt/nessus_agent/sbin/nessusd - - # Make sure these originally empty directories do not vanish, - # Nessus will not run properly without them - keepdir /opt/nessus_agent/com/nessus/CA - keepdir /opt/nessus_agent/etc/nessus - keepdir /opt/nessus_agent/var/nessus/logs - keepdir /opt/nessus_agent/var/nessus/tmp - keepdir /opt/nessus_agent/var/nessus/users - - newinitd "${FILESDIR}"/nessusagent.initd nessusagent - systemd_dounit usr/lib/systemd/system/nessusagent.service -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "In order to link the agent to Tenable.io or an instance of Nessus Manager," - elog "obtain an appropriate linking key and run" - elog "" - elog " /opt/nessus_agent/sbin/nessuscli agent link --key=<key> --host=<host> --port=<port> [optional parameters]" - elog "" - elog "This can be done before the agent is started." - fi -} diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.5.0.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.5.1.ebuild index 20d896ea6290..893d4776496a 100644 --- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.5.0.ebuild +++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.5.1.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 diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest index 85c7abe5d46d..a669928cc68b 100644 --- a/net-analyzer/nessus-bin/Manifest +++ b/net-analyzer/nessus-bin/Manifest @@ -1,8 +1,4 @@ AUX nessusd-initd 582 BLAKE2B 67c5e73262512c590b5b4fc0668297a504677aa3d771fdeee2809c921d988faef19cbf10a7fb26d52114e1a67d33ef197e32c561cd5b2003c8abbde2dfe5cb4f SHA512 f825fad89564303aeff423f3c32a1544ee4b063ef57702cd54220aebed8e01e7b178ff5bd10b48b654ebdee78657a9bc41caf779a23968d008916fd51e88b2f4 -DIST Nessus-8.5.2-es7.x86_64.rpm 72892020 BLAKE2B c5ae05c02da4fe3265ae1b31da0d8dc025c7275ef466d7f889ebefe6a6006e500e2df029ab90ab37cd0c5089078a22b4f0474a4cfa830a378aead68337154f91 SHA512 ef96ee30b693c72a33981757a8e9616ce7813837de90065c8d140e9702552798e09c0941c282d1a54817f036f606a9934bc9020e86dce12baf50a1a57dbcec08 -DIST Nessus-8.8.0-es7.x86_64.rpm 77275432 BLAKE2B 437d4f958d0f45924cb0c994710d908b6a0a48bbee9ffa184391e7a31484d9c933a210c7d4c6d68fa918a873e09874a58ed40ca81203aaef5c44541037777dbd SHA512 d779703db9c114a51e282dde35257121278fa4ec6035c0c861ebc9f04e967aa2a0cde1efdd4f08c2652ecfab3978a8853970081759e9dee492a3ebe8c4fc502b -DIST Nessus-8.9.0-es7.x86_64.rpm 81085048 BLAKE2B fc4717c31b59261199e87e2080f04a492a96fced562b2ded36741303d0f1c0fc447113f080cf64d2fd606148109f558499383433b39caafb2b8f77684f1b2ad5 SHA512 d397dd545a6c02f906b998c55f2d3b0ae06b247d648f1c25d260190ca4f161199f494d903c430cf2d9a664345b88f6ca5f4cd865a6a39b19be22a1d8a236c603 -EBUILD nessus-bin-8.5.2.ebuild 1654 BLAKE2B 0d59c80388e1119268776c8c98c6996d1c702d6362e2d4d1f3f69c950352aa420c9484c48d636904e8842e38478d3af86c4a458b9833d24f4a7923a9e8d7e70c SHA512 97b5baa4b22213b5211acccfb63292f210170c4ee6156f1035e077b0a914c6f4aea263f10a76f8530cfecca50bd0bfd1b82b7261c5b001f51dbce7b0a37252df -EBUILD nessus-bin-8.8.0.ebuild 1654 BLAKE2B 0d59c80388e1119268776c8c98c6996d1c702d6362e2d4d1f3f69c950352aa420c9484c48d636904e8842e38478d3af86c4a458b9833d24f4a7923a9e8d7e70c SHA512 97b5baa4b22213b5211acccfb63292f210170c4ee6156f1035e077b0a914c6f4aea263f10a76f8530cfecca50bd0bfd1b82b7261c5b001f51dbce7b0a37252df -EBUILD nessus-bin-8.9.0.ebuild 1654 BLAKE2B c6a96ee9a5c51dfc0a1b1fc30743436a983746dfb350ffdb74945c9647a4fa269f386bdcfa360b027198b93aa1022e6974ae23e3b0c39c1db2fb4cbc217170bd SHA512 5ac2ee1ff272d8c7561e86fedaafecdd20fcb5387f99eba614dbc47bf5bc5e4b58ce930f12e899ed7562f189c2fb74abd664c8180d6acdd506a7cc4462bfa3a4 +DIST Nessus-8.9.1-es7.x86_64.rpm 83715796 BLAKE2B b0362956fd8935162b2e47753fdeedd76452be55904ac90040ed0a4021194aa987321c9eec331490c61de3df25a23b4e668f62393b957f16cfdc50a033075c3f SHA512 7b746866cee3247a4c8f5df14aa2af3b28a5b4d485c87927f2226d73a962ef41b4ae0402529af00040890b93462171dd2a6c3ed842952a472bd112dcab79e4d6 +EBUILD nessus-bin-8.9.1.ebuild 1654 BLAKE2B c6a96ee9a5c51dfc0a1b1fc30743436a983746dfb350ffdb74945c9647a4fa269f386bdcfa360b027198b93aa1022e6974ae23e3b0c39c1db2fb4cbc217170bd SHA512 5ac2ee1ff272d8c7561e86fedaafecdd20fcb5387f99eba614dbc47bf5bc5e4b58ce930f12e899ed7562f189c2fb74abd664c8180d6acdd506a7cc4462bfa3a4 MISC metadata.xml 345 BLAKE2B 05fdd17a4decd9a096175a59991a6df8260591c09193fef114895d7d29e0f08210aacd4517678410813d06a27b1032889c529e2966427c5a9ad454f9534d25f5 SHA512 3535519b1c621f6df120e6aa39f9a11ec132b68499a029915650218c16e9ca1a07cb30409ace95b2aa0204194a61c7b4743051e1f4ffc94cb5ba3372cac72e8c diff --git a/net-analyzer/nessus-bin/nessus-bin-8.5.2.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.5.2.ebuild deleted file mode 100644 index 45aa75d3c45a..000000000000 --- a/net-analyzer/nessus-bin/nessus-bin-8.5.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit rpm pax-utils systemd - -MY_P="Nessus-${PV}-es7" - -DESCRIPTION="A remote security scanner for Linux" -HOMEPAGE="https://www.tenable.com/" -SRC_URI="${MY_P}.x86_64.rpm" - -LICENSE="GPL-2 Nessus-EULA" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="mirror fetch strip" - -QA_PREBUILT="opt/nessus/bin/nasl - opt/nessus/bin/ndbg - opt/nessus/bin/nessus-mkrand - opt/nessus/lib/nessus/libjemalloc.so.2 - opt/nessus/lib/nessus/libnessus-glibc-fix.so - opt/nessus/sbin/nessus-service - opt/nessus/sbin/nessuscli - opt/nessus/sbin/nessusd" - -S="${WORKDIR}" - -pkg_nofetch() { - einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus" - einfo "The archive should then be placed into your DISTDIR directory." -} - -src_install() { - # Using doins -r would strip executable bits from all binaries - cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files" - - pax-mark m "${D}"/opt/nessus/sbin/nessusd - - # Make sure these originally empty directories do not vanish, - # Nessus will not run properly without them - keepdir /opt/nessus/com/nessus/CA - keepdir /opt/nessus/etc/nessus - keepdir /opt/nessus/var/nessus/logs - keepdir /opt/nessus/var/nessus/tmp - - newinitd "${FILESDIR}"/nessusd-initd nessusd-bin - systemd_newunit usr/lib/systemd/system/nessusd.service nessusd-bin.service -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "To get started launch the nessusd-bin service, then point your Web browser to" - elog " https://<yourhost>:8834/" - else - elog "You may want to restart the nessusd-bin service to use" - elog "the new version of Nessus." - fi -} diff --git a/net-analyzer/nessus-bin/nessus-bin-8.8.0.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.8.0.ebuild deleted file mode 100644 index 45aa75d3c45a..000000000000 --- a/net-analyzer/nessus-bin/nessus-bin-8.8.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit rpm pax-utils systemd - -MY_P="Nessus-${PV}-es7" - -DESCRIPTION="A remote security scanner for Linux" -HOMEPAGE="https://www.tenable.com/" -SRC_URI="${MY_P}.x86_64.rpm" - -LICENSE="GPL-2 Nessus-EULA" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="mirror fetch strip" - -QA_PREBUILT="opt/nessus/bin/nasl - opt/nessus/bin/ndbg - opt/nessus/bin/nessus-mkrand - opt/nessus/lib/nessus/libjemalloc.so.2 - opt/nessus/lib/nessus/libnessus-glibc-fix.so - opt/nessus/sbin/nessus-service - opt/nessus/sbin/nessuscli - opt/nessus/sbin/nessusd" - -S="${WORKDIR}" - -pkg_nofetch() { - einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus" - einfo "The archive should then be placed into your DISTDIR directory." -} - -src_install() { - # Using doins -r would strip executable bits from all binaries - cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files" - - pax-mark m "${D}"/opt/nessus/sbin/nessusd - - # Make sure these originally empty directories do not vanish, - # Nessus will not run properly without them - keepdir /opt/nessus/com/nessus/CA - keepdir /opt/nessus/etc/nessus - keepdir /opt/nessus/var/nessus/logs - keepdir /opt/nessus/var/nessus/tmp - - newinitd "${FILESDIR}"/nessusd-initd nessusd-bin - systemd_newunit usr/lib/systemd/system/nessusd.service nessusd-bin.service -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "To get started launch the nessusd-bin service, then point your Web browser to" - elog " https://<yourhost>:8834/" - else - elog "You may want to restart the nessusd-bin service to use" - elog "the new version of Nessus." - fi -} diff --git a/net-analyzer/nessus-bin/nessus-bin-8.9.0.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.9.1.ebuild index eedc870324ec..eedc870324ec 100644 --- a/net-analyzer/nessus-bin/nessus-bin-8.9.0.ebuild +++ b/net-analyzer/nessus-bin/nessus-bin-8.9.1.ebuild diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest index 26cb16c4070c..2fa4385f1304 100644 --- a/net-analyzer/net-snmp/Manifest +++ b/net-analyzer/net-snmp/Manifest @@ -13,10 +13,12 @@ AUX snmptrapd.init.2 338 BLAKE2B 893a510af4cb7f4115c5995ecd40c6ac3c5d2fd4cf92524 AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c5976394c04bfd8da30917395b1a752f8e66502259d271ccf264c3e99f99e95df62b80447d4099d1dd7 SHA512 763682e3926fd1e7f28a013be2ad56cc53eed26a0415770906968e07a183128c9d5fb70d76513244ba0cc95fc2526b68c32207b5fda83b8f53c256549cfa1b1d DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636 DIST net-snmp-5.8.1.pre1.tar.gz 6630615 BLAKE2B 32ae7177fc08a773928da7f19cd06617feb1358c0dd21d39e08db460fa4267b6353f4afede1f5a500a628235a6a94d95700c84df6e85bda18b7a7a6e7bf3781f SHA512 e1ad421970abb67490a08fa735bbe9ff77a6fc5a19b8bf6942bef80f5b328f8038373cd5995970085177bcfe939dfa309019512b2abce0e8cf779e693f7d6dbd +DIST net-snmp-5.8.1.pre2.tar.gz 6642893 BLAKE2B 4b2a1e87738c3bde49354f0cca84628f2953ee14f6b08ca53cf0bc5c320052cb4fe0f6eeb46551eaf2d45ba9c17f86ce06b64c00c1629b2d17bc351c0ccb37a8 SHA512 78cd9a29cc89ff7fa170ee767db3ca2077fc1d877f207c018887c2ea0148ffaf01eb013efc21b47f14c893a6ca48b3b439210ccd27dfc77f8c8e56bf9546f23e DIST net-snmp-5.8.tar.gz 6591680 BLAKE2B ac1bff4152310da57818a00d752a08a7fc61d697b02479d9952ca12d024d3d68dc8bfa674571e93d6f3597605b2fe91513fb6839057a80f2c3dd8d0cce0077f2 SHA512 27895a583b23f3e14c48562bc32f3ba83513d81aa848e878be9a3650f0458d45950635c937ef627135f80b757b663e71fab9a3bde4fd91889153998ae3468fe7 -EBUILD net-snmp-5.8-r3.ebuild 5310 BLAKE2B 47a553d78eba3127be3fa4d73614ba180651f1f5c519f945656315cc5ad21049b3174d3691e21082b6cb3f848fd39db55038090cb7bf3af91c39fb8a7c3b3fc4 SHA512 815948a84bebae1ed8c8a35ce87f18bf2b719966ec006a6c62835152d33e613c1f471fb6258bac7e6cd0a0c8d8b49a93708949162c715cca6c4e925e817d4de2 -EBUILD net-snmp-5.8-r4.ebuild 5366 BLAKE2B 630900c16812924fae314ca61665f88bf4de8ced7d25f1c988d5ebcdda4a28fefbcd13ba262ac1977ff335ab5885b961996981e4744d262726e9e8653051525d SHA512 857b6798c98a3aa814fb1c66917aaf748ea4d5962eaa5b4c24c796db7d63b38ba562977f5fa44f9acacd66e00007fff0339a4ed0523af5e37c6d0045c6bcf714 -EBUILD net-snmp-5.8-r5.ebuild 5570 BLAKE2B 5b1fb3cd1c1417a1159bcd2e6f65896657088feb83fd6784d326e8b8567d45d87d3b7f944c777f675445b4ad9d28050120d6bc5ffc26896fd9536cde810156de SHA512 31daac5c51bdd7dc0e421d5fb019a8dac778ac07515eb7395b771fdfb80337f2f58d0b44cc674667b2e0c73a402139a0bbbc3f9f9819698be17f739079920346 -EBUILD net-snmp-5.8.1_pre1-r1.ebuild 5574 BLAKE2B 63e724effb975f1cf5b7c0202b0d7c7154fe5f40c7ec2a0f54f81d6955258199dd0add8332eafba67a28c259985bda9e88700b93ffee4d59bb3802eb5f4fb96f SHA512 175073aa77170649ff5c07ba824a39635fbfeaa20e2f39a59c893dec69557a2b4c48c82eb51b8daf5cfe4682bf16e5e81ccea4e0d2c8afb8c29bd1ac691a3234 +EBUILD net-snmp-5.8-r3.ebuild 5307 BLAKE2B 0fd9232f549db78f18da4af6ac54b03259824e6e6a53e5c698be79c5119292dddc5399f5ce33f6942164e21daf2ad8df5b99a9387c05c48674e5bce498c959da SHA512 f09184badd9aef60566ba914652d1b0ac4c9394b6fed387f53fe721c6cc7fbb9e5a2fb8c9ab69ecb325ea78f3f0415405ef25660bda9a89b868847afeb3b143c +EBUILD net-snmp-5.8-r4.ebuild 5362 BLAKE2B ea28ce42536d30a2ebd65aea7fe43373811c0c7bae824fa5e97738644f077e5fa20feff6e2bc4d2110a1c032d7fec889a74ce991b043dcd193e3d7a7a830ba70 SHA512 2d3cd08567007c19e68b19452474817da4929f33ea31f954da6b80f903834d1a9c0e1c9ac8d9d9303566133a78abd86a74df0f9ecebbd5939ed1d5d41b29b361 +EBUILD net-snmp-5.8-r5.ebuild 5558 BLAKE2B fcb029e7f92bdf90ac3578d5599177d9a5d2ea4479199ee438bf44e82ab54b17a411b1db8058d1071a00e147c769b8026ec0ee853ddebb98a5bd1ea48a769b22 SHA512 0597a38dee250bca1a42370abebba5c67febf707c5429e21fd489475b0cdf8e47cec0dff91290982ce15a12b31ba3ad7d1eceedd88801f2a82f60ff0213c237e +EBUILD net-snmp-5.8.1_pre1-r1.ebuild 5570 BLAKE2B f75cd10ede99d60c0795bfd327bf256ad90a9c72821c14e6a4292315bd3ff3947eaa5f1ecfc45bbaa9796411f6c2cb31f04678eb2080868f84bbcb1a26aa948e SHA512 aacc4e3f80cb1b10e21cf069ad0c79c59a3262adb7399d4b8e33b00e05506b032c1b46a2434a0cab5d4351a55c45b76d20a9449398f5f3724eac4179c1e8075c +EBUILD net-snmp-5.8.1_pre2.ebuild 5571 BLAKE2B 24e01221c74e249b692b68e666f92ccc31b06d27bc0a83a2513efd0f53d6823fc24ae652f1716791fd48f241bef8279713e954b7efe732f8e2ddd50322b3d679 SHA512 9de9231e3be9ba3aefaef68bc67b02ab1a55686d1f2b20c9af10cd31d4db1c6a06ea98fbc8936b6d37d872cc971ba53d7174671e5106da97eff6e26aab3c7ee2 EBUILD net-snmp-99999999.ebuild 5509 BLAKE2B 9621a6effe14d8f835902a07951473acf43700e0620264a23b74273fb22d64ccc21ba8a084f594957bccd012ae6e15f0d266365d5b7d0cbc0e61ad6340c8ff1e SHA512 4e4bbeec20b7be336c2c740a73ec3c41b8d9b5a5026e2ce1e41b39cc42c93e88e83c910ab18e404770c38ed725d3fd4aba11f67124c6a88185bc06110d3b870e MISC metadata.xml 1296 BLAKE2B 76a0264baf629293eac4127e3dbaf167b5af236e53e0de9cb1c65869242d13e6d5f3c90d47856d5f8c63eba34661698637dd7da56b307d9e6e07403bf91df320 SHA512 ff45396992b1804f3774bd532438b8e64327dfa71c109cde9073f6a5a17f6c3dcc2ba1278359fa10d5eb00c3ead0368706d29178466e9b8586b66e0219d7e4b0 diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild index ac6797d27dc5..a1920941b96a 100644 --- a/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild @@ -23,7 +23,7 @@ S=${WORKDIR}/${P/_/.} # GPL-2 for the init scripts LICENSE="HPND BSD GPL-2" SLOT="0/35" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" IUSE="X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib" COMMON_DEPEND=" diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild index ced28fac187f..a9de9b055493 100644 --- a/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild @@ -23,7 +23,7 @@ S=${WORKDIR}/${P/_/.} # GPL-2 for the init scripts LICENSE="HPND BSD GPL-2" SLOT="0/35" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib" COMMON_DEPEND=" diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild index fd31b84d6b69..d99fb7481f5e 100644 --- a/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild @@ -23,7 +23,7 @@ S=${WORKDIR}/${P/_/.} # GPL-2 for the init scripts LICENSE="HPND BSD GPL-2" SLOT="0/35" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" IUSE=" X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib diff --git a/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild index 3f60c5340f9e..c40fd89123d1 100644 --- a/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild @@ -23,7 +23,7 @@ S=${WORKDIR}/${P/_/.} # GPL-2 for the init scripts LICENSE="HPND BSD GPL-2" SLOT="0/35" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE=" X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib diff --git a/net-analyzer/net-snmp/net-snmp-5.8.1_pre2.ebuild b/net-analyzer/net-snmp/net-snmp-5.8.1_pre2.ebuild new file mode 100644 index 000000000000..1418de67f9f9 --- /dev/null +++ b/net-analyzer/net-snmp/net-snmp-5.8.1_pre2.ebuild @@ -0,0 +1,209 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 ) +DISTUTILS_SINGLE_IMPL=yesplz +DISTUTILS_OPTIONAL=yesplz +WANT_AUTOMAKE=none +PATCHSET=3 +GENTOO_DEPEND_ON_PERL=no + +inherit autotools distutils-r1 perl-module systemd + +DESCRIPTION="Software for generating and retrieving SNMP data" +HOMEPAGE="http://www.net-snmp.org/" +SRC_URI=" + mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}-pre-releases/${P/_pre/.pre}.tar.gz + https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz +" + +S=${WORKDIR}/${P/_/.} + +# GPL-2 for the init scripts +LICENSE="HPND BSD GPL-2" +SLOT="0/35" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE=" + X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql + netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib +" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + rpm? ( bzip2 zlib ) +" + +COMMON_DEPEND=" + bzip2? ( app-arch/bzip2 ) + elf? ( dev-libs/elfutils ) + lm-sensors? ( sys-apps/lm-sensors ) + mysql? ( dev-db/mysql-connector-c:0= ) + netlink? ( dev-libs/libnl:3 ) + pcap? ( net-libs/libpcap ) + pci? ( sys-apps/pciutils ) + perl? ( dev-lang/perl:= ) + python? ( + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_MULTI_USEDEP}] + ') + ${PYTHON_DEPS} + ) + rpm? ( + app-arch/rpm + dev-libs/popt + ) + ssl? ( + !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) + libressl? ( dev-libs/libressl:= ) + ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + zlib? ( >=sys-libs/zlib-1.1.4 ) +" +DEPEND=" + ${COMMON_DEPEND} + doc? ( app-doc/doxygen ) +" +RDEPEND=" + ${COMMON_DEPEND} + perl? ( + X? ( dev-perl/Tk ) + !minimal? ( dev-perl/TermReadKey ) + ) + selinux? ( sec-policy/selinux-snmp ) +" +S=${WORKDIR}/${P/_pre/.pre} +RESTRICT=test +PATCHES=( + "${FILESDIR}"/${PN}-5.7.3-include-limits.patch + "${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch + "${FILESDIR}"/${PN}-5.8-pcap.patch + "${FILESDIR}"/${PN}-5.8-tinfo.patch + "${FILESDIR}"/${PN}-5.8.1-pkg-config.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + # snmpconf generates config files with proper selinux context + use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch + + mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die + mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die + eapply "${WORKDIR}"/patches/*.patch + + default + + eautoconf +} + +src_configure() { + # keep this in the same line, configure.ac arguments are passed down to config.h + local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable" + use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib" + use smux && mibs="${mibs} smux" + + # Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136) + use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab + + econf \ + $(use_enable !ssl internal-md5) \ + $(use_enable ipv6) \ + $(use_enable mfd-rewrites) \ + $(use_enable perl embedded-perl) \ + $(use_enable ucd-compat ucd-snmp-compatibility) \ + $(use_with bzip2) \ + $(use_with elf) \ + $(use_with kmem kmem-usage) \ + $(use_with mysql) \ + $(use_with netlink nl) \ + $(use_with pcap) \ + $(use_with pci) \ + $(use_with perl perl-modules INSTALLDIRS=vendor) \ + $(use_with python python-modules) \ + $(use_with rpm) \ + $(use_with ssl openssl) \ + $(use_with tcpd libwrap) \ + $(use_with zlib) \ + --enable-shared --disable-static \ + --with-default-snmp-version="3" \ + --with-install-prefix="${D}" \ + --with-ldflags="${LDFLAGS}" \ + --with-logfile="/var/log/net-snmpd.log" \ + --with-mib-modules="${mibs}" \ + --with-persistent-directory="/var/lib/net-snmp" \ + --with-sys-contact="root@Unknown" \ + --with-sys-location="Unknown" +} + +src_compile() { + for target in snmplib agent sedscript all; do + emake OTHERLDFLAGS="${LDFLAGS}" ${target} + done + + use doc && emake docsdox +} + +src_install () { + # bug #317965 + emake -j1 DESTDIR="${D}" install + + use python && python_optimize + + if use perl ; then + perl_delete_localpod + if ! use X; then + rm "${D}"/usr/bin/tkmib || die + fi + else + rm -f \ + "${D}"/usr/bin/fixproc \ + "${D}"/usr/bin/ipf-mod.pl \ + "${D}"/usr/bin/mib2c \ + "${D}"/usr/bin/net-snmp-cert \ + "${D}"/usr/bin/snmp-bridge-mib \ + "${D}"/usr/bin/snmpcheck \ + "${D}"/usr/bin/snmpconf \ + "${D}"/usr/bin/tkmib \ + "${D}"/usr/bin/traptoemail \ + "${D}"/usr/share/snmp/mib2c.perl.conf \ + "${D}"/usr/share/snmp/snmp_perl_trapd.pl \ + || die + fi + + dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO + newdoc EXAMPLE.conf.def EXAMPLE.conf + + if use doc; then + docinto html + dodoc -r docs/html/* + fi + + keepdir /var/lib/net-snmp + + newinitd "${FILESDIR}"/snmpd.init.2 snmpd + newconfd "${FILESDIR}"/snmpd.conf snmpd + + newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd + newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd + + systemd_dounit "${FILESDIR}"/snmpd.service + systemd_dounit "${FILESDIR}"/snmptrapd.service + + insinto /etc/snmp + newins "${S}"/EXAMPLE.conf snmpd.conf.example + + # Remove everything not required for an agent. + # Keep only the snmpd, snmptrapd, MIBs, headers and libraries. + if use minimal; then + rm -rf \ + "${D}"/**/*.pl \ + "${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \ + "${D}"/usr/share/snmp/*.conf \ + "${D}"/usr/share/snmp/snmpconf-data \ + || die + fi + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-analyzer/netcat/Manifest b/net-analyzer/netcat/Manifest index d066bba2ee25..f4e431ec8002 100644 --- a/net-analyzer/netcat/Manifest +++ b/net-analyzer/netcat/Manifest @@ -2,6 +2,6 @@ DIST nc-v6-20000918.patch.gz 8740 BLAKE2B 56274ee32a77f335c31b5593ae92afdb1758ee DIST nc110.20180111.tar.xz 69984 BLAKE2B cb345db31d8857fc1c3973eba45c7a45ec0c5721829a19c46f1ec91a792d9d6309930b3bba5df1180989025f7a04ec8c85cf4832ac6f4199d13f15764f000420 SHA512 4413849c07c6ec5aae07c6e2baa1ba9a99721fa6ac08cf9e7d15379937a207246eb4f4299dd8c049445a72eac9cfe0a3633a87e4e01e21036db1217ea7a1e330 DIST nc110.tgz 75267 BLAKE2B 203b5f54805ddef2c3e9627300dfb6d14f098e88433ca807c8db01f009dec1ccc329925025238dae00b5e82e91c0787ef25536d08310ac127cda1775cfb2afb3 SHA512 c9a7f5045f76d9ffef4e83fcc3e82f69ac4eb05e061686db51e9367949bfe0b90226b290a059dc68dcf3bf2040b95b5c78545199674da57a7c73e2f9145cf812 DIST netcat-110-patches-1.0.tar.bz2 25751 BLAKE2B c0be51a057981ad1df932f7317a1c317c8788efa670778a4f5bbf67c9d983754bd20188a15e7ced3d849a25244926afc54129e0a2df07bc34932d15a3efbf302 SHA512 b9e7e35aa7e26d30f0115d87aff34fd0cadfad99fdb77cc5aa3ba51bec331f632e180484927c4368172ee9cc6c996b8691bd19bad8806912d8820158a98eab46 -EBUILD netcat-110-r9.ebuild 1623 BLAKE2B a21d33dc2619959e94e85e3f6096a6368721f408b6c40ba2910ab59d32733836c8ec570095735de201ee4b3b2a165609acddeb7e72b77d458bb0e4fd22b2002d SHA512 368dd775f340a66155503987a1ff2bbe2705e498250a6bef1e516ab23d4ddd27c7ceec704339112775871ff4ef0756370659b22d05c54753185fa721e133f390 -EBUILD netcat-110.20180111.ebuild 1279 BLAKE2B 32b1fc5499ed4959ac9cbfec93ed55cbf3d2f28e1711f9ebecd7b554c5572eac2c15350084237d3ec600bde72edd2032d39c3b3f1b5a3475b6cce156dcfd16cc SHA512 bc38cfc75e3ccb33f818f5392bfb814d41b2e7a37f3b883168cea3a28a5239adf3433d6d1491227dde6cdb70d137b761b5743904db0483eac78ed66ee1a95f8b +EBUILD netcat-110-r9.ebuild 1621 BLAKE2B 6013e95a657dbaa87c4857fcc77541ba01a96390838ce2c8f7acb41587b50db0e689735cadc578876ddc2b61311d475193d60d99f32bed2f1d4048715204b578 SHA512 32a396ffb07d3b30ad80a8f2a9e08e0f1ede7a3f964acebdeefdb7dcab49816f4fad80d95b998f841e8a69ea665c48f9d9978c4b3b1cd32c6bee7e53d0e5ac6a +EBUILD netcat-110.20180111.ebuild 1272 BLAKE2B b58aad81ff3d298a022954308c3b8e7405fe8542b5f658fb57331919406e2a682fb66455c19f319c41427d01619ec88c4bfa6278b595029e24f1e6fc7f560c25 SHA512 3e05c4a06f4a44ef0a2c8e36c26be838420d127226c36644b3b7cd6b25c122f5b19cdbd767e343313498ebc6ffa14e43ceef94c0132127b30dcc87037ac97d0c MISC metadata.xml 420 BLAKE2B 2ecb5d0734634fa00dbe4aecc8353dcad2a6d76bfb6ff22522b52ca2e67298a0923e46fd2d32c31f48262b06c6f46b02e4e065853c56efc793186132b2e92570 SHA512 f6d0b317880cf10065aa552d4653f3338c89fc36b2175d64b6b17bcdafbea03e0c02608904ffca7a934f2bdcc794758f4132b7cd279fc91530ab077eb2115ccf diff --git a/net-analyzer/netcat/netcat-110-r9.ebuild b/net-analyzer/netcat/netcat-110-r9.ebuild index f2efeefc7fb3..7dbaeeb0c4e4 100644 --- a/net-analyzer/netcat/netcat-110-r9.ebuild +++ b/net-analyzer/netcat/netcat-110-r9.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/nc110/${MY_P}.tgz LICENSE="netcat" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x64-solaris" IUSE="crypt ipv6 static" LIB_DEPEND="crypt? ( dev-libs/libmix[static-libs(+)] )" diff --git a/net-analyzer/netcat/netcat-110.20180111.ebuild b/net-analyzer/netcat/netcat-110.20180111.ebuild index df0524891b05..da20c98247b7 100644 --- a/net-analyzer/netcat/netcat-110.20180111.ebuild +++ b/net-analyzer/netcat/netcat-110.20180111.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/nc110/${MY_P}.tar.xz" LICENSE="netcat" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x64-solaris" IUSE="ipv6 static" S=${WORKDIR}/nc110 diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest index ab82944bf6d2..7758123e6c1c 100644 --- a/net-analyzer/netdata/Manifest +++ b/net-analyzer/netdata/Manifest @@ -2,7 +2,10 @@ AUX netdata-1.19.0-fno-common.patch 3807 BLAKE2B 42908f83322a9dab98b52fba245d31a AUX netdata-1.19.0-prometheus-spelling.patch 1149 BLAKE2B 567e93c8099f7edc6afd3c40a6249162f44dca30f9cccf1702df453523203ee2e79fb4d03a53f5b1c4e5dd6dfaa52961b0717546aa21bc25bb3927a9280598ad SHA512 a498b04683138fd56e71bcf1191b4f3a655be03746f850d9f407bbe24c28f16dd564967401c856ce404f58c6a947b8277e2fa0868dbe7c0aa63ff05a8b465561 DIST netdata-1.19.0.tar.gz 3443251 BLAKE2B 8e18a661367850e712a75c1c11b661a977bf77b48369e0e36763a74f96b3726c523093a82eb6f94257c02e754d900cb675d501fda824ceb94eef31dfa30e5712 SHA512 026ae159d8ed52a30e406c110c2732e54e50f070865ba3e430df73e4df40387105053e750ca6029cfbc7f40a2c05b7fb6ba4e3e4a7070822c7eec4c1a4712aea DIST netdata-1.20.0.tar.gz 3598521 BLAKE2B 3837ef2beb1b275af89e5927362ab0b83f13cc1227d156f742f4c29ecc9f79de212987c13d6707ac785abac7ae5ce979333a50d5c521b0f019f8cbdf88f831a1 SHA512 ada398cdccf1b1b4dbac5b24d4539f86aafb964458aa4f3bdfac336362504aab6d74b7f2f12bad18b62a44bb62d1a2a8ddd0c2ed80a7c16bc388854d4210bcb6 +DIST netdata-1.21.0.tar.gz 3747997 BLAKE2B 1c7d0b26f1ea1203fbab9e7d1bbf6de3c7dc18e73cf4f700fd5d6d658714b4b468568d8699695b7b7bf94a29ec3cacc634cbe2f99d6741c6ebf28faa1f59415f SHA512 65d3bd7dc3cace861184f8293f24e9d4ba20389c6d5e4176631c04ecf4a5e92c328fb6673fcefaecf2d2cc1296bfc0aa35d81b3284c7d3fb6729bb101fef8475 EBUILD netdata-1.19.0-r2.ebuild 3334 BLAKE2B aa38cb9caaf21a6a7c5fc4f158f97631d02de9ba7441ddeffed4d4fceca7ba517372db1dde38f1b22b1878f47385686b94a005f50a94342b3de8a3acff77d125 SHA512 074b2876241890485a212174d9e5b71a2ab248d78c3b99adbc425f37faf1030de0639962d5ac63573f2f799557233e102bff1c190fabc2482563bc695b699aec +EBUILD netdata-1.20.0-r1.ebuild 3367 BLAKE2B 011b453ac0060f016f350e63093b8ffed1cb646e3f4890a89315c395b9efdf686281b72acebbb220c6cb2032ed13dfa6e8f6fa2878d558ac631894eb9a7c13f3 SHA512 e385d82188efe853c93e6817ac5edeecf82e7a46349ea85b96495cd52671a9fd8fecdccb334b734c49297d31dd9cb537d4836510ba23153a8cee91a095e60c30 EBUILD netdata-1.20.0.ebuild 3367 BLAKE2B b7ee50506412d0019b08e67478ca99780cb689cae7e65b1911e52df5f5938976d857f2a1a71138b0c964fd50759ddeabe689a51efc9fe0adaf8f40bb9d4017b1 SHA512 086808e110e8e4b2dac661ae48e21ca11d6fc439ab9c4b82b6a8b44f1f8ef632f1427c79c542b3be2f13bc9cf2de7c5116810594f51a6ded19a33f08f6851c03 -EBUILD netdata-9999.ebuild 3367 BLAKE2B b7ee50506412d0019b08e67478ca99780cb689cae7e65b1911e52df5f5938976d857f2a1a71138b0c964fd50759ddeabe689a51efc9fe0adaf8f40bb9d4017b1 SHA512 086808e110e8e4b2dac661ae48e21ca11d6fc439ab9c4b82b6a8b44f1f8ef632f1427c79c542b3be2f13bc9cf2de7c5116810594f51a6ded19a33f08f6851c03 +EBUILD netdata-1.21.0.ebuild 3367 BLAKE2B 011b453ac0060f016f350e63093b8ffed1cb646e3f4890a89315c395b9efdf686281b72acebbb220c6cb2032ed13dfa6e8f6fa2878d558ac631894eb9a7c13f3 SHA512 e385d82188efe853c93e6817ac5edeecf82e7a46349ea85b96495cd52671a9fd8fecdccb334b734c49297d31dd9cb537d4836510ba23153a8cee91a095e60c30 +EBUILD netdata-9999.ebuild 3367 BLAKE2B 011b453ac0060f016f350e63093b8ffed1cb646e3f4890a89315c395b9efdf686281b72acebbb220c6cb2032ed13dfa6e8f6fa2878d558ac631894eb9a7c13f3 SHA512 e385d82188efe853c93e6817ac5edeecf82e7a46349ea85b96495cd52671a9fd8fecdccb334b734c49297d31dd9cb537d4836510ba23153a8cee91a095e60c30 MISC metadata.xml 1270 BLAKE2B e2c5bac8fd169d84daf8a6e6cfea30761490cca3d7211a29e29f6cf298a9cd728ddc56075e5a85c8f5ed5467900a2f3fb1e09c40b764c2bb0e02bf1ff8e98108 SHA512 77e4d91d31d9d48b769b13f5c9778e09fc8d64941a145ea0bc1ce3e735eb64e5c89fa36a4314753e7c0871738a7b3e94f6a998a87b9c7b9d1d7aa6e8800cdbdf diff --git a/net-analyzer/netdata/netdata-1.20.0-r1.ebuild b/net-analyzer/netdata/netdata-1.20.0-r1.ebuild new file mode 100644 index 000000000000..05058d2b9921 --- /dev/null +++ b/net-analyzer/netdata/netdata-1.20.0-r1.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{3_6,3_7} ) + +inherit autotools fcaps linux-info python-single-r1 systemd + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/netdata/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Linux real time system monitoring, done right!" +HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/" + +LICENSE="GPL-3+ MIT BSD" +SLOT="0" +IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen" +REQUIRED_USE=" + mysql? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) + tor? ( python )" + +# most unconditional dependencies are for plugins.d/charts.d.plugin: +RDEPEND=" + acct-group/netdata + acct-user/netdata + app-misc/jq + >=app-shells/bash-4:0 + || ( + net-analyzer/openbsd-netcat + net-analyzer/netcat + ) + net-misc/curl + net-misc/wget + sys-apps/util-linux + virtual/awk + caps? ( sys-libs/libcap ) + cups? ( net-print/cups ) + dbengine? ( + dev-libs/libuv + app-arch/lz4 + dev-libs/judy + dev-libs/openssl:= + ) + compression? ( sys-libs/zlib ) + ipmi? ( sys-libs/freeipmi ) + jsonc? ( dev-libs/json-c ) + kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) + mongodb? ( dev-libs/mongo-c-driver ) + nfacct? ( + net-firewall/nfacct + net-libs/libmnl + ) + nodejs? ( net-libs/nodejs ) + prometheus? ( + dev-libs/protobuf:= + app-arch/snappy + ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]') + mysql? ( + || ( + $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') + $(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]') + ) + ) + postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') ) + tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') ) + ) + xen? ( + app-emulation/xen-tools + dev-libs/yajl + )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +FILECAPS=( + 'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin' +) + +pkg_setup() { + use python && python-single-r1_pkg_setup + linux-info_pkg_setup +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --localstatedir="${EPREFIX}"/var \ + --with-user=netdata \ + $(use_enable jsonc) \ + $(use_enable cups plugin-cups) \ + $(use_enable dbengine) \ + $(use_enable nfacct plugin-nfacct) \ + $(use_enable ipmi plugin-freeipmi) \ + $(use_enable kinesis backend-kinesis) \ + $(use_enable mongodb backend-mongodb) \ + $(use_enable prometheus backend-prometheus-remote-write) \ + $(use_enable xen plugin-xenstat) \ + $(use_enable cpu_flags_x86_sse2 x86-sse) \ + $(use_with compression zlib) +} + +src_install() { + default + + rm -rf "${D}/var/cache" || die + + keepdir /var/log/netdata + fowners -Rc netdata:netdata /var/log/netdata + keepdir /var/lib/netdata + keepdir /var/lib/netdata/registry + fowners -Rc netdata:netdata /var/lib/netdata + + fowners -Rc root:netdata /usr/share/${PN} + + newinitd system/netdata-openrc ${PN} + systemd_dounit system/netdata.service + insinto /etc/netdata + doins system/netdata.conf +} + +pkg_postinst() { + fcaps_pkg_postinst + + if use xen ; then + fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin' + fi +} diff --git a/net-analyzer/netdata/netdata-1.21.0.ebuild b/net-analyzer/netdata/netdata-1.21.0.ebuild new file mode 100644 index 000000000000..05058d2b9921 --- /dev/null +++ b/net-analyzer/netdata/netdata-1.21.0.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{3_6,3_7} ) + +inherit autotools fcaps linux-info python-single-r1 systemd + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/netdata/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Linux real time system monitoring, done right!" +HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/" + +LICENSE="GPL-3+ MIT BSD" +SLOT="0" +IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen" +REQUIRED_USE=" + mysql? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) + tor? ( python )" + +# most unconditional dependencies are for plugins.d/charts.d.plugin: +RDEPEND=" + acct-group/netdata + acct-user/netdata + app-misc/jq + >=app-shells/bash-4:0 + || ( + net-analyzer/openbsd-netcat + net-analyzer/netcat + ) + net-misc/curl + net-misc/wget + sys-apps/util-linux + virtual/awk + caps? ( sys-libs/libcap ) + cups? ( net-print/cups ) + dbengine? ( + dev-libs/libuv + app-arch/lz4 + dev-libs/judy + dev-libs/openssl:= + ) + compression? ( sys-libs/zlib ) + ipmi? ( sys-libs/freeipmi ) + jsonc? ( dev-libs/json-c ) + kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) + mongodb? ( dev-libs/mongo-c-driver ) + nfacct? ( + net-firewall/nfacct + net-libs/libmnl + ) + nodejs? ( net-libs/nodejs ) + prometheus? ( + dev-libs/protobuf:= + app-arch/snappy + ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]') + mysql? ( + || ( + $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') + $(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]') + ) + ) + postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') ) + tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') ) + ) + xen? ( + app-emulation/xen-tools + dev-libs/yajl + )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +FILECAPS=( + 'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin' +) + +pkg_setup() { + use python && python-single-r1_pkg_setup + linux-info_pkg_setup +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --localstatedir="${EPREFIX}"/var \ + --with-user=netdata \ + $(use_enable jsonc) \ + $(use_enable cups plugin-cups) \ + $(use_enable dbengine) \ + $(use_enable nfacct plugin-nfacct) \ + $(use_enable ipmi plugin-freeipmi) \ + $(use_enable kinesis backend-kinesis) \ + $(use_enable mongodb backend-mongodb) \ + $(use_enable prometheus backend-prometheus-remote-write) \ + $(use_enable xen plugin-xenstat) \ + $(use_enable cpu_flags_x86_sse2 x86-sse) \ + $(use_with compression zlib) +} + +src_install() { + default + + rm -rf "${D}/var/cache" || die + + keepdir /var/log/netdata + fowners -Rc netdata:netdata /var/log/netdata + keepdir /var/lib/netdata + keepdir /var/lib/netdata/registry + fowners -Rc netdata:netdata /var/lib/netdata + + fowners -Rc root:netdata /usr/share/${PN} + + newinitd system/netdata-openrc ${PN} + systemd_dounit system/netdata.service + insinto /etc/netdata + doins system/netdata.conf +} + +pkg_postinst() { + fcaps_pkg_postinst + + if use xen ; then + fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin' + fi +} diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild index 38d285c386ee..05058d2b9921 100644 --- a/net-analyzer/netdata/netdata-9999.ebuild +++ b/net-analyzer/netdata/netdata-9999.ebuild @@ -119,8 +119,8 @@ src_install() { keepdir /var/log/netdata fowners -Rc netdata:netdata /var/log/netdata keepdir /var/lib/netdata - fowners -Rc netdata:netdata /var/lib/netdata keepdir /var/lib/netdata/registry + fowners -Rc netdata:netdata /var/lib/netdata fowners -Rc root:netdata /usr/share/${PN} diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest index 174d46a13c17..664faaaa2e45 100644 --- a/net-analyzer/netperf/Manifest +++ b/net-analyzer/netperf/Manifest @@ -6,5 +6,5 @@ AUX netperf-2.7.0-inline.patch 974 BLAKE2B 4e3174761db0b72656e22e361841bbb887da6 AUX netperf-2.7.0-space.patch 455 BLAKE2B aa4fae48102f2d767a0c72a13b20820d9e42f782455876766399e7edc5625cd6ff0c740c3268aee4443d844ef6b28da69144c039bfdc63519a7279d2cc1ad433 SHA512 e39bfcec70da00fa886b1f8389f54eca6bac83fc8ff48a72427fcd30c3f605e4ec2d01d2f7161ae0fa26bd56283c03593caf756db7d808f0e3e4d3a90d50f1fc AUX netperf-fix-scripts.patch 819 BLAKE2B 59779076ad1e3315712f7db54451256dcbd04c2712020d0b39c0fb1969fbfec0cbf8a3f1b6203ce5622b45a2cc6877b1c1448b0d505aa98a034c2a7fd2f285e3 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad -EBUILD netperf-2.7.0-r2.ebuild 1941 BLAKE2B eb6255f913e4e50a16667730c575df5d81d8d51623273ec11356e5acf92b1fd5ee156f4e398522d171bee84d14be48f438ea5492f80cbd4f22b492eb53e216f2 SHA512 278cff1742f5e88d9cce6070e3a7f50399ecc37b10f4abfc95c7a940500252bea820eb0a986c961de51431d4922c8e05f69ba9291368f0f857c6b3001baf5017 +EBUILD netperf-2.7.0-r2.ebuild 1942 BLAKE2B ffb7d91533bab5dccbd85fb5570dd36ba32eabaaac83e7c8c17b5909c360497fc1b9a13313e992fad35a7e1b18d8f01adfb5becf34f875de3660cca51ce388f1 SHA512 f683a1642cacf6b355ac1fe071f3e993eeb4fdbf27e03e07698fa1ee2bfda3dd7b6da02c098eae79c0c2806aae960a44d37c012ae0721a1f8e5b41c16830d228 MISC metadata.xml 855 BLAKE2B 20c4b64a1abe9e4f83a56e759b9d7cfb161886dd06a4672dc96828a80d3f91c064665138a87c263815c217091a869e7ced811fca059405bf047de337814c52a5 SHA512 628efc289da10094d7fab1c0c47e8acd67260fffc036e2d4eaa1430e1b91fd2610d681134211cff4dcd5f84858199a4bbf36aaaa73f3e507bef1114a64b4e588 diff --git a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild index dbeb9077af87..e82ad712e781 100644 --- a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild +++ b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild @@ -6,7 +6,7 @@ inherit eutils flag-o-matic user DESCRIPTION="Network performance benchmark" SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2" -KEYWORDS="~alpha amd64 arm64 hppa ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ppc ppc64 sparc x86" HOMEPAGE="http://www.netperf.org/" LICENSE="netperf" diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest index d1f3e565f938..c8aeb2a7c02d 100644 --- a/net-analyzer/netselect/Manifest +++ b/net-analyzer/netselect/Manifest @@ -2,6 +2,6 @@ AUX netselect-0.4-bsd.patch 1573 BLAKE2B 62405aa2962ffe74fce014341433d114f6785fd AUX netselect-0.4-flags.patch 172 BLAKE2B 17acc10b64404c9d8525147f5ca526f661a2b2c2b7e7ae31b19186784ef4b4714b14e43ccb77d318016b60c6ff80e381acf9b006487f0d9ebed06e70cb026a3a SHA512 3f665743859e243126de95340da5b9dd42ff671d82f3809e294b752a568b7ede96b13f6a63e18cc522ce19d1537b137d5c05e0e49ce533e8fc337922e18ea74a DIST netselect-0.4-ipv6.patch.xz 18272 BLAKE2B 6197057085e892c156a9fb3a82ac0030a2ff1b4276dde48405de2d2bcfdcef066c4f3eeff174f766af23d2807085f97e459dbffc87b2a2950a472e7964f2e3fc SHA512 422b54df5be45379fe7d6776b6e653a8e49df6fb77421527f2eb6c687597f36cccc7ab5cc5206e9823c318f6facd84fb4e8c0dbffbf9641cee593401cb73abea DIST netselect-0.4.tar.gz 22095 BLAKE2B 1dd83c4dcd38ab7b987ead76f4e7e727980bbad91b59c56948e13540307e685984cc11ea94292d38959c8253f1f6ec2e6e6e044302f26b09153717d6e29e96be SHA512 eee9639122b7cc89218c610794d090582aecb3df138bcef41472c8d40c0f7e998b2c4b04aace13795fda5c710ee28cc2c0784a680ad6d1aa6a14eb441a408bfa -EBUILD netselect-0.4-r1.ebuild 971 BLAKE2B 014c9140477b29f5fab51404d732bf8ffcb28c0cacbf9a714248aecd9e97b26e8967a7ebb98818137b2594c84515285e852f4a20fdb1b38e1baa6e3f02600f65 SHA512 dbd3a0249a539e78b605df9178e14d6caf021619c8b8d6717d84b245f20b593386fa2986eeb8b4ca813e6b47f3fd13bf2ee96df3d0b18086ac8fe4e882c8f810 +EBUILD netselect-0.4-r1.ebuild 969 BLAKE2B ba6341713f9c3b388a39075517f931cb4640777d7f86944a581ed7e4d1ec17cd6276832322eecc3a829926275034c42411310528c98fc3baecbe3df833cb7310 SHA512 db226a2f796b0ab8c90be85ea85685cf78e121cfa1c48c302d1e04c2ae4340c7f88e3d3cbc12f8da6d7c3a7cec3a5744ffc06c7afadc6ed12b5567dc51705a1f EBUILD netselect-9999.ebuild 899 BLAKE2B 3ba6abea554f5c72ebab839ae1649c326a6bb76483dad1ca9f4731637a77fb75ff71746e0560cbb0140921f90e1aeecc85b9f1b3ba18aba85e68fb7a5cf7342c SHA512 3eb340cc66a031be74b83bb77d78fd80f77eadb8c8dd3394987e8651a70f78d008d497a78ed3e7725b88deb08b301df705e06e5fea3a90d3ca8d38bfd403e66f MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/netselect/netselect-0.4-r1.ebuild b/net-analyzer/netselect/netselect-0.4-r1.ebuild index 00f427e799d0..7ad668d54316 100644 --- a/net-analyzer/netselect/netselect-0.4-r1.ebuild +++ b/net-analyzer/netselect/netselect-0.4-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="ipv6" PATCHES=( diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest index 2f2b29898afc..9474ab03c1b3 100644 --- a/net-analyzer/nfdump/Manifest +++ b/net-analyzer/nfdump/Manifest @@ -1,12 +1,7 @@ -AUX nfdump-1.6.14-libft.patch 709 BLAKE2B c24a246e36dd99d61a5ba04ef50bb3509a7a6ec4add1e1690f9635a17998deb13a4b4b336686a00c1aba556ae4d75667f68c3878148a8b093bcaeabe5fdfed40 SHA512 2a1e3559ae3f1d1ad1a17305888469852211c984324c56c0f58f510ff1a6fb1d85f5b5367b3e325d932f20be6832ed98d56b8e85e220da948aa6a28ecd9d0cdd -AUX nfdump-1.6.14-libnfdump.patch 2439 BLAKE2B cb714491b19a70cc6f458167d8dfed619026d2ef7600d1413a32d15717e7fbfe9db3a794eb5aa922bb9afa53a3cc5d8d3c8cb5ada20ef5c9dc8eebf1331bd4a5 SHA512 09746329df3ad517875d907c16842c8b8ee31f06de649217cc3650cf566e0b059563df93eaf48a60595d2ada41fd43d1279f5bcb400122d9d60fdcb0b813ef46 -AUX nfdump-1.6.16-DEVEL.patch 3694 BLAKE2B 09d5f15aa3ff4a6a9536bca05db5f425b894582347c27bc5b9a9c1497cf9304a0e7cd6c53264de2397977ba3e2b9b1d4f60e560984c0e9e480fd8a6e62d7e3ef SHA512 fd5c3e0aa804eeb7ff1dd7cd2122043308e925b0ac0782a107edb96f7cffe9c5ec60df3ebd8a8f15431d62b412dcf338ee56c24c70a0fde5cd96254fb3e64ca9 -AUX nfdump-1.6.16-libnfdump.patch 196 BLAKE2B 2c97bd45eb810f67f1bcf5d62fee19fd3617cb4ac7d3d085d0031869a398b9d905b7f47043e9b0626e5069145778d85a6aa7e8278428c6f05a75127f6e5853ab SHA512 4c5a7c4deec55ffd66165dbf8dc4229a6288f628f4decd7a6142e34c604ff07a6546796afba9b1e05cb4420858e83a71bf1e0eaeeb6619c741eb3136d5e07c15 -DIST nfdump-1.6.14-security.patch 31579 BLAKE2B d747526f46837e99193bf761bceb853bb44ea54bc6ca2a9977565742e1485b706f3f33370005ccf5c854429635de01f5cf594fd43122d4a6f8912e2a457d8caf SHA512 ee3b82f1283f3dceb36cf60abcee7f5a8fb6c8fe257e2233c3fbb9a34b3c5608dfa101fd473c8b839356a9d1c294a37b9e65657ff1b2d5c015015ff90b2d2c97 -DIST nfdump-1.6.14.tar.gz 1834355 BLAKE2B be92ec6c6eb60c883863a21e7d203c487f176e862f6227bf21d17ade2a04815095c5c119719a18c106401519d7976a2b82e46a11b7f207494abef3e0f73d2716 SHA512 c5e5540526dfce3798728930576e4c7930c3ff80893a94d7f9e65c7c577d1e78bdc47a99c47cee837327ad202197afc378d2408b1b9b847044d0110146055ffe -DIST nfdump-1.6.15.tar.gz 1834855 BLAKE2B 1892cfbd1d1299c44b14a39b55c766d3dd411d7410a66b8ecbebe590c9da595c79764966ef1c91adb91b936ee3c052ad14bca27c6bcb98472011eb2c67dff60f SHA512 a6bb4f2293ad85d8f16025e7272b889d3814cea2e9255dbd315ee92754675e4ee925c3ebe4e1350f2d5452d69d1d3c13ddeb656324a409c4744da1d4927fe1f2 -DIST nfdump-1.6.16.tar.gz 1814857 BLAKE2B cd50680adbb6023915232bb780daf2bcc4319348444a28c89fc4fdfd19225bdf243bb42179a6bd545c06ab6fafa50091401b7a286527d1863c888a96c0b0a2eb SHA512 c1af3cf984c7eaaf1012c71c061e00f12dbcdf276306096436eb707552932c65b9f03e7a22b4cc0989d951c433f32c5c927600a8248826227f10b4fb2d906a32 -EBUILD nfdump-1.6.14-r1.ebuild 1407 BLAKE2B b7b8cf843c604e3b9dedc14d7e9b091620f1acfc797f9e493b07c773eb089cad249455dbea296a431f3c184bee7a0ba22c21325b376227c693c12d77b392c8cd SHA512 2b3bf14b9d0888d1e98f394eec8f2ac8b9ea2769adf6a1893dee3a0b7fe61f8ae363f1ff8dac2743192a0d18bad563c68f1e9f6c3cdebed0dde207ded2a8caac -EBUILD nfdump-1.6.15-r1.ebuild 1378 BLAKE2B 3bb3017b1ffa1dc7f7e366938ac5c7b999efb265a48bcb1b37bd9a533a47493c4d304f69c2736c89682c84d1826772ade943f36bd9ee82b4e847ff7686915167 SHA512 d27f7031a7a3f5a608ac295c346fcbdb44090a2fc7dc2a6d717c47ddf53dbe15663d704429e1b38fdc291a122776c46fc999d9c5fabb8da96000f109c18bb2f8 -EBUILD nfdump-1.6.16-r1.ebuild 1411 BLAKE2B 602acf354c5fcd2486bae8c6273039585ef2c734ec7d60bdfc6eaaad2bceba8e620653ae9cb41bdaea231d3ec6872c6b3d022cc527b42410c7a4dec43bb50527 SHA512 be8eef2a778067b0c7322b84ca9722436a7e9eb391ad5b012395d69c6253aef8f650cdeac32779d08fdeef36f74e256d59bbf449a84f450259ee92651eb9e397 -MISC metadata.xml 1010 BLAKE2B 0f80dce100cf4a9b5b6011b0690b928d149e9430e894cceaf2ae18a37588f8edb81477b2fc70bd2ba1101bb3b4e225dfc7a82d60513dcb5273b7f230727db9d6 SHA512 81abafe5f8da7c40612127765d5b62532168b16d93bd0f0414e8e6c4e86339c8fd77e7ecb4a5b406cf5f33c087f8d2ecd971fdf065c7be0430bd8a095a503c67 +AUX nfdump-1.6.19-compiler.patch 528 BLAKE2B b289f32a18a03b2725360b84314b294ebe6843f3ecaf3eb6ddffb9ba4e85641167c705682a8fc90560e0ce5d41dfeed7a739d011569361c31107dec9c98bf213 SHA512 300e79fdf994bd6a75c9595417d4e3e12b7e4030d6b1fa685b1b352404f36cfe2f1d8f31796a62f2a465a93dfeab0ab81caaf63a4de56a7851aea255b4607dc8 +AUX nfdump-1.6.19-libft.patch 815 BLAKE2B 8b82ce3c93214e016b63fa593e7e8d3c8960e1d2636a9ad0cebd75e9945c73d9d42ebfcf5afe82ec10d62ed3d4bc8334670aaf46f543782b5c86ac2f60d57db1 SHA512 884458ac127497e9c3c7b5f8ed4eca60278d052ba2749efad1d267446c6a62da4417a018aca758bac6633d09ab08e699b54163300ed176510271aabf0769d3c4 +DIST nfdump-1.6.19.tar.gz 561923 BLAKE2B 458cf0e23f433c7c1c27450712a2f9f8f75a990eeaf079bac9a74bf5abf4bc22c930294494424fd8e7f7d03ffc1e5f1e35ba50e29ba4f3528f63e1739524c9ed SHA512 577c23ca3aae8ab035c734c137d3a338e09f46b5f8551946fd84b9a03fae1ef2aa80e2ab9657eb226defcd753bb63503eeb85316ca1df18d95b85270df8f379e +DIST nfdump-1.6.20.tar.gz 561053 BLAKE2B 20c8db09386a4aa6174d3c2919c33409a4b2d9b295908ae61e8ce12107c08ba7742fb7ec80bcb7bcdb15e036e6d2320c83f0446a479185cb18717720eca87c88 SHA512 8396241fa24d532540135762a81ce035586c405d4ab1e01d6e2b8226b7cc9b6784170ca1fa4c1581fb60f324473cca5ce2d3de82282313d3877f9584e449d137 +EBUILD nfdump-1.6.19.ebuild 1390 BLAKE2B ccd3bc87b5f005bd5e5767090f41b7380bfb39224c1f5d31007004e171483e18bb293f9cc157f887f30749a8f694fbc25418a883ebeace04f4a3dbf90a88c662 SHA512 e0e772dae0a2550fd14808e2132a83587508684fe57136754db314add1c55857e5b8d6787eadcb066c73f48522157c2bf414b6cfbd028977adc63c99a6f42035 +EBUILD nfdump-1.6.20.ebuild 1392 BLAKE2B f9d43b2f41c5c901255e06c391eff327bf2b56bf9af02add91e22ad8a935c682e6e332b252be90dfa9564971f59d908c37ea532b36a08ac7df09106b9ea41218 SHA512 5da3069596339dd040c1573a65b538e1cedc75d30420e84cf0864474a391e5a19a6914a2dafa8f7f4024b491c84799a926bd9b4f4d31cd7fff57788e822b2f9f +MISC metadata.xml 909 BLAKE2B 51cc25f3d90d566c345857c50aafb86601e1c48350291f18cee655d008bb90a73f54277c78141fec70923d6e3f0af5a86b3f77f87c0142ea7fa3963282213103 SHA512 ff5188e78baccfa693342af4e1f053a1685e78e68ce11ae43b1f7ae6c31eec31dbf1efc7f3b0628e6f77bf237072830dcffae58e0c06ad5d52aeb35ee92b9ede diff --git a/net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch b/net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch deleted file mode 100644 index 38482c4bdb1a..000000000000 --- a/net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- a/bin/Makefile.am -+++ b/bin/Makefile.am -@@ -30,7 +30,6 @@ - LDADD = $(DEPS_LIBS) - - #Add extra debug info for gdb --AM_CFLAGS = -ggdb - - # libnfdump sources - common = nf_common.c nf_common.h -@@ -65,30 +64,36 @@ - - nfdump_SOURCES = nfdump.c nfdump.h nfstat.c nfstat.h nfexport.c nfexport.h \ - $(nflowcache) $(nfprof) -+nfdump_DEPENDENCIES = libnfdump.la - nfdump_LDADD = -lnfdump - - nfreplay_SOURCES = nfreplay.c $(nfprof) \ - $(nfnet) $(collector) $(nfv1) $(nfv9) $(nfv5v7) $(ipfix) -+nfreplay_DEPENDENCIES = libnfdump.la - nfreplay_LDADD = -lnfdump - - nfprofile_SOURCES = nfprofile.c profile.c profile.h $(nfstatfile) -+nfprofile_DEPENDENCIES = libnfdump.la - nfprofile_LDADD = -lnfdump -lrrd - - nftrack_SOURCES = ../extra/nftrack/nftrack.c \ - ../extra/nftrack/nftrack_rrd.c ../extra/nftrack/nftrack_rrd.h \ - ../extra/nftrack/nftrack_stat.c ../extra/nftrack/nftrack_stat.h - nftrack_CFLAGS = -I ../extra/nftrack -+nftrack_DEPENDENCIES = libnfdump.la - nftrack_LDADD = -lnfdump -lrrd - - nfcapd_SOURCES = nfcapd.c \ - $(nfstatfile) $(launch) \ - $(nfnet) $(collector) $(nfv1) $(nfv5v7) $(nfv9) $(ipfix) $(bookkeeper) $(expire) -+nfcapd_DEPENDENCIES = libnfdump.la - nfcapd_LDADD = -lnfdump - - nfpcapd_SOURCES = nfpcapd.c \ - $(pcaproc) $(netflow_pcap) \ - $(nfstatfile) $(launch) \ - $(nfnet) $(collector) $(bookkeeper) $(expire) $(content) -+nfpcapd_DEPENDENCIES = libnfdump.la - nfpcapd_LDADD = -lnfdump - - if READPCAP -@@ -107,6 +112,7 @@ - sfcapd_SOURCES = sfcapd.c sflow.c sflow.h sflow_proto.h \ - $(nfstatfile) $(launch) \ - $(nfnet) $(collector) $(bookkeeper) $(expire) -+sfcapd_DEPENDENCIES = libnfdump.la - sfcapd_LDADD = -lnfdump - - if READPCAP -@@ -116,25 +122,31 @@ - endif - - nfreader_SOURCES = nfreader.c -+nfreader_DEPENDENCIES = libnfdump.la - nfreader_LDADD = -lnfdump - - nfanon_SOURCES = nfanon.c $(anon) -+nfanon_DEPENDENCIES = libnfdump.la - nfanon_LDADD = -lnfdump - - nfgen_SOURCES = nfgen.c -+nfgen_DEPENDENCIES = libnfdump.la - nfgen_LDADD = -lnfdump - - nfexpire_SOURCES = nfexpire.c \ - $(bookkeeper) $(expire) $(nfstatfile) -+nfexpire_DEPENDENCIES = libnfdump.la - nfexpire_LDADD = -lnfdump @FTS_OBJ@ - - nftest_SOURCES = nftest.c -+nftest_DEPENDENCIES = libnfdump.la - nftest_LDADD = -lnfdump - nftest_DEPENDENCIES = nfgen - - if FT2NFDUMP - ft2nfdump_SOURCES = ft2nfdump.c - ft2nfdump_CFLAGS = @FT_INCLUDES@ -+ft2nfdump_DEPENDENCIES = libnfdump.la - ft2nfdump_LDADD = -lnfdump -lft -lz - ft2nfdump_LDADD += @FT_LDFLAGS@ - endif diff --git a/net-analyzer/nfdump/files/nfdump-1.6.16-DEVEL.patch b/net-analyzer/nfdump/files/nfdump-1.6.16-DEVEL.patch deleted file mode 100644 index 21aeb6f0e343..000000000000 --- a/net-analyzer/nfdump/files/nfdump-1.6.16-DEVEL.patch +++ /dev/null @@ -1,104 +0,0 @@ ---- a/bin/flowtree.c -+++ b/bin/flowtree.c -@@ -467,9 +467,8 @@ void Push_Node(NodeList_t *NodeList, struct FlowNode *node) { - NodeList->last = node; - NodeList->length++; - #ifdef DEVEL -- int proto = node->proto; - printf("pushed node 0x%llx proto: %u, length: %u first: %llx, last: %llx\n", -- (unsigned long long)node, proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last); -+ (unsigned long long)node, node->proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last); - ListCheck(NodeList); - #endif - if ( NodeList->waiting ) { -@@ -483,7 +482,6 @@ void Push_Node(NodeList_t *NodeList, struct FlowNode *node) { - - struct FlowNode *Pop_Node(NodeList_t *NodeList, int *done) { - struct FlowNode *node; --int proto; - - GetTreeLock(NodeList); - while ( NodeList->length == 0 && !*done ) { -@@ -522,12 +520,11 @@ int proto; - - node->left = NULL; - node->right = NULL; -- proto = node->proto; - - NodeList->length--; - #ifdef DEVEL - printf("popped node 0x%llx proto: %u, length: %u first: %llx, last: %llx\n", -- (unsigned long long)node, proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last); -+ (unsigned long long)node, node->proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last); - - ListCheck(NodeList); - #endif ---- a/bin/nfexpire.c -+++ b/bin/nfexpire.c -@@ -212,12 +212,12 @@ int main( int argc, char **argv ) { - struct stat fstat; - int c, err, maxsize_set, maxlife_set; - int do_rescan, do_expire, do_list, print_stat, do_update_param, print_books, is_profile, nfsen_format; --char *maxsize_string, *lifetime_string, *datadir; -+char *lifetime_string, *datadir; - uint64_t maxsize, lifetime, low_water; - uint32_t runtime; - channel_t *channel, *current_channel; - -- maxsize_string = lifetime_string = NULL; -+ lifetime_string = NULL; - datadir = NULL; - maxsize = lifetime = 0; - do_rescan = 0; ---- a/bin/nfstat.c -+++ b/bin/nfstat.c -@@ -1670,7 +1670,7 @@ uint32_t maxindex, c; - else - printf("Top flows ordered by %s:\n", order_mode[order_index].string); - } -- if ( !record_header ) -+ if ( record_header ) - printf("%s\n", record_header); - } - PrintSortedFlowcache(SortList, maxindex, topN, 0, print_record, tag, DESCENDING, extension_map_list); ---- a/bin/sflow.c -+++ b/bin/sflow.c -@@ -515,11 +515,17 @@ static inline void readCountersSample_v2v4(SFSample *sample, FlowSource_t *fs); - - static inline void StoreSflowRecord(SFSample *sample, FlowSource_t *fs); - -+extern int verbose; -+ - #ifdef DEVEL - static inline char *printTag(uint32_t tag, char *buf, int bufLen); --#endif - --extern int verbose; -+static inline char *printTag(uint32_t tag, char *buf, int bufLen) { -+ snprintf(buf, bufLen, "%u:%u", (tag >> 12), (tag & 0x00000FFF)); -+ return buf; -+} // End of printTag -+ -+#endif - - - /*_________________---------------------------__________________ -@@ -1410,15 +1416,11 @@ static inline uint32_t getAddress(SFSample *sample, SFLAddress *address) { - static inline void skipTLVRecord(SFSample *sample, uint32_t tag, uint32_t len, char *description) { - - #ifdef DEVEL --static inline char *printTag(uint32_t tag, char *buf, int bufLen) { -- snprintf(buf, bufLen, "%u:%u", (tag >> 12), (tag & 0x00000FFF)); -- return buf; --} // End of printTag -- --char buf[51]; -+ char buf[51]; -+ snprintf(buf, 50, "%u:%u", (tag >> 12), (tag & 0x00000FFF)); -+ printf("skipping unknown %s: 0x%x, %s len=%d\n", description, tag, buf, len); - #endif - -- dbg_printf("skipping unknown %s: 0x%x, %s len=%d\n", description, tag, printTag(tag, buf, 50), len); - skipBytes(sample, len); - } // End of skipTLVRecord - diff --git a/net-analyzer/nfdump/files/nfdump-1.6.16-libnfdump.patch b/net-analyzer/nfdump/files/nfdump-1.6.16-libnfdump.patch deleted file mode 100644 index a748969da2e7..000000000000 --- a/net-analyzer/nfdump/files/nfdump-1.6.16-libnfdump.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/bin/Makefile.am -+++ b/bin/Makefile.am -@@ -30,7 +30,6 @@ - LDADD = $(DEPS_LIBS) - - #Add extra debug info for gdb --AM_CFLAGS = -ggdb - - # libnfdump sources - common = nf_common.c nf_common.h diff --git a/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch b/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch new file mode 100644 index 000000000000..8826c50c9dc2 --- /dev/null +++ b/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch @@ -0,0 +1,21 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -9,8 +9,6 @@ + AM_INIT_AUTOMAKE([subdir-objects]) + + # Checks for programs. +-CFLAGS="-g -O3" +-AC_PROG_CC([clang gcc]) + AX_CHECK_C11 + CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing" + +--- a/bin/Makefile.am ++++ b/bin/Makefile.am +@@ -30,7 +30,6 @@ + LDADD = $(DEPS_LIBS) + + #Add extra debug info for gdb +-AM_CFLAGS = -ggdb + + # libnfdump sources + output = output_util.h output_util.c output_raw.h output_raw.c diff --git a/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch b/net-analyzer/nfdump/files/nfdump-1.6.19-libft.patch index 3699fa2a5d01..47953c772172 100644 --- a/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch +++ b/net-analyzer/nfdump/files/nfdump-1.6.19-libft.patch @@ -1,14 +1,17 @@ --- a/configure.ac +++ b/configure.ac -@@ -125,9 +125,8 @@ +@@ -115,12 +115,8 @@ if test ! -f "$WHERE_FTPATH/include/ftlib.h"; then AC_MSG_ERROR(ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH) fi -- if test ! -f "$WHERE_FTPATH/lib/libft.a" -a -f "$WHERE_FTPATH/lib64/libft.a" ! -f "$WHERE_FTPATH/lib/libft.so" -a -f "$WHERE_FTPATH/lib64/libft.so"; then +- if test -f "$WHERE_FTPATH/lib/libft.a" -o -f "$WHERE_FTPATH/lib64/libft.a" -o -f "$WHERE_FTPATH/lib/libft.so" -o -f "$WHERE_FTPATH/lib64/libft.so"; then +- FT_INCLUDES="-I$WHERE_FTPATH/include -I$WHERE_FTPATH/lib" +- FT_LDFLAGS="-L$WHERE_FTPATH/lib" +- else - AC_MSG_ERROR(libft.a not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first) - fi + AC_CHECK_LIB([ft], [main],, + AC_MSG_ERROR(libft not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first)) - FT_INCLUDES="-I$WHERE_FTPATH/include -I$WHERE_FTPATH/lib" - FT_LDFLAGS="-L$WHERE_FTPATH/lib" else + AC_MSG_ERROR(flow-tools directory '$WHERE_FTPATH' does not exists. Use --with-ftpath=PATH) + fi diff --git a/net-analyzer/nfdump/metadata.xml b/net-analyzer/nfdump/metadata.xml index f6dc8af136ae..435ade187731 100644 --- a/net-analyzer/nfdump/metadata.xml +++ b/net-analyzer/nfdump/metadata.xml @@ -7,7 +7,6 @@ </maintainer> <use> <flag name="readpcap">Build nfcapd collector to read from pcap file instead ofnetwork data</flag> - <flag name="compat15">Enable read support for nfdump data files created with nfdump 1.5.x</flag> <flag name="ftconv">Build the flow-tools to nfdump converter</flag> <flag name="nfprofile">Build nfprofile used by NfSen</flag> <flag name="nftrack">Build nfprofile used by PortTracker</flag> diff --git a/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild deleted file mode 100644 index 64b2478d5f8f..000000000000 --- a/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="A set of tools to collect and process netflow data" -HOMEPAGE="https://github.com/phaag/nfdump" -SRC_URI=" - https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/phaag/nfdump/commit/ff0e855bd1f51bed9fc5d8559c64d3cfb475a5d8.patch -> ${P}-security.patch -" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="amd64 x86" -IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow" - -COMMON_DEPEND=" - app-arch/bzip2 - sys-libs/zlib - ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) - nfprofile? ( net-analyzer/rrdtool ) - nftrack? ( net-analyzer/rrdtool ) - readpcap? ( net-libs/libpcap ) -" -DEPEND=" - ${COMMON_DEPEND} - sys-devel/flex - virtual/yacc -" -RDEPEND=" - ${COMMON_DEPEND} - dev-lang/perl -" - -DOCS=( AUTHORS ChangeLog NEWS README ) - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.6.14-libft.patch \ - "${FILESDIR}"/${PN}-1.6.14-libnfdump.patch \ - "${DISTDIR}"/${P}-security.patch - - eautoreconf -} - -src_configure() { - # --without-ftconf is not handled well #322201 - econf \ - $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \ - $(use nfprofile && echo --enable-nfprofile) \ - $(use nftrack && echo --enable-nftrack) \ - $(use_enable compat15) \ - $(use_enable debug devel) \ - $(use_enable readpcap) \ - $(use_enable sflow) -} diff --git a/net-analyzer/nfdump/nfdump-1.6.15-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.19.ebuild index 1bc02e2ad824..3c3245ff7c29 100644 --- a/net-analyzer/nfdump/nfdump-1.6.15-r1.ebuild +++ b/net-analyzer/nfdump/nfdump-1.6.19.ebuild @@ -1,17 +1,17 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools eutils ltprune +EAPI=7 +inherit autotools DESCRIPTION="A set of tools to collect and process netflow data" HOMEPAGE="https://github.com/phaag/nfdump" SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow static-libs" +SLOT="0/1.6.15" +KEYWORDS="amd64 x86" +IUSE="debug ftconv nfprofile nftrack readpcap sflow static-libs" COMMON_DEPEND=" app-arch/bzip2 @@ -23,6 +23,7 @@ COMMON_DEPEND=" " DEPEND=" ${COMMON_DEPEND} + app-doc/doxygen sys-devel/flex virtual/yacc " @@ -30,17 +31,18 @@ RDEPEND=" ${COMMON_DEPEND} dev-lang/perl " - +PATCHES=( + "${FILESDIR}"/${PN}-1.6.19-compiler.patch + "${FILESDIR}"/${PN}-1.6.19-libft.patch +) DOCS=( AUTHORS ChangeLog README.md ) src_prepare() { - eapply \ - "${FILESDIR}"/${PN}-1.6.14-libft.patch \ - "${FILESDIR}"/${PN}-1.6.14-libnfdump.patch - - eapply_user + default eautoreconf + + doxygen -u doc/Doxyfile.in || die } src_configure() { @@ -49,7 +51,6 @@ src_configure() { $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \ $(use nfprofile && echo --enable-nfprofile) \ $(use nftrack && echo --enable-nftrack) \ - $(use_enable compat15) \ $(use_enable debug devel) \ $(use_enable readpcap) \ $(use_enable sflow) \ @@ -58,6 +59,5 @@ src_configure() { src_install() { default - - prune_libtool_files + find "${ED}" -name '*.la' -delete || die } diff --git a/net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.20.ebuild index 1c1536dcf588..d866f89da5b1 100644 --- a/net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild +++ b/net-analyzer/nfdump/nfdump-1.6.20.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools eutils ltprune +EAPI=7 +inherit autotools DESCRIPTION="A set of tools to collect and process netflow data" HOMEPAGE="https://github.com/phaag/nfdump" @@ -11,7 +11,7 @@ SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0/1.6.15" KEYWORDS="~amd64 ~x86" -IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow static-libs" +IUSE="debug ftconv nfprofile nftrack readpcap sflow static-libs" COMMON_DEPEND=" app-arch/bzip2 @@ -23,6 +23,7 @@ COMMON_DEPEND=" " DEPEND=" ${COMMON_DEPEND} + app-doc/doxygen sys-devel/flex virtual/yacc " @@ -30,17 +31,18 @@ RDEPEND=" ${COMMON_DEPEND} dev-lang/perl " -DOCS=( AUTHORS ChangeLog README.md ) PATCHES=( - "${FILESDIR}"/${PN}-1.6.14-libft.patch - "${FILESDIR}"/${PN}-1.6.16-libnfdump.patch - "${FILESDIR}"/${PN}-1.6.16-DEVEL.patch + "${FILESDIR}"/${PN}-1.6.19-compiler.patch + "${FILESDIR}"/${PN}-1.6.19-libft.patch ) +DOCS=( AUTHORS ChangeLog README.md ) src_prepare() { default eautoreconf + + doxygen -u doc/Doxyfile.in || die } src_configure() { @@ -49,7 +51,6 @@ src_configure() { $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \ $(use nfprofile && echo --enable-nfprofile) \ $(use nftrack && echo --enable-nftrack) \ - $(use_enable compat15) \ $(use_enable debug devel) \ $(use_enable readpcap) \ $(use_enable sflow) \ @@ -58,6 +59,5 @@ src_configure() { src_install() { default - - prune_libtool_files + find "${ED}" -name '*.la' -delete || die } diff --git a/net-analyzer/ngrep/Manifest b/net-analyzer/ngrep/Manifest index 059ecc236145..b5454a3bf76b 100644 --- a/net-analyzer/ngrep/Manifest +++ b/net-analyzer/ngrep/Manifest @@ -4,6 +4,6 @@ AUX ngrep-1.45-setlocale.patch 495 BLAKE2B 10d70be3c787344f120ed2faf527425af68ab AUX ngrep-1.47-regex.patch 683 BLAKE2B 5eaed7398a140dee747664ce05c3f9afb9f57f827ef96efd4ad284be313dd234c15603bcd842c7d2c96a46900de46205cec1d0270cc83d36b5e9feedf1f3b2b3 SHA512 e435f1e4fb35fbed0eeef414da2fd19c09311287b466e667c9150d53a1ae52abbe31173758192c9638eaecf54e4c3be99020e9831a2543b2e4d0c61f5b9f55de DIST ngrep-1.45.tar.bz2 463361 BLAKE2B 31f7828fb28197f06a583cd6d250b5d70bfbd2bc5dae657daaed3f7ea286aec4dff9cca449c72a3c27d8e8b30d861304872eaaaa11abc9eb71f2acc94d9fc9f2 SHA512 0feb4080f834449d57ae99897c573d2b8148711cfb550fa4ff415169dedb1f0d23f4b03f625660162ca72f8ad06e19874c1af46da6afd8f8fe8dd553558c14f7 DIST ngrep-1.47.tar.gz 187067 BLAKE2B 4fa47ed343b88e84fb5a3ab6e4dc8139cb008ffcbea901a67664335ad76d36e975e037620cebb1b204ba22e5b139e822c7cfbc74a061fc6cacae631be3f87a52 SHA512 47ba65878df6b555701c866721a8a935eabdcce636d398284cbfe5f63baf68c62d994a2f373ea4fc8f44fbed3eecee149f2ee48d39c71c04d34e5a088db8c657 -EBUILD ngrep-1.45-r3.ebuild 1052 BLAKE2B d04b9862b79cb815dcd0cd065ff66a1fffd30aa47bcad9755cb2676e8529f529fae0aa93d7b929dee1ba1acb6e067105251d45bee29f4f7b5f8276d688d73d01 SHA512 5bc70e6a90a92418edfc8bac2bd43fde511cd0f18682dac79d2eb118c9f58c22ff9c7253d93174470725ecba4225ae64e98a6fc50acd652db61c8ad48c23f8c1 -EBUILD ngrep-1.47.ebuild 988 BLAKE2B 731b827b3c2d547e5bfb376ef1e432e7dc847a58cf83645bda13d632c398973b36ee0b15547cdae8d4d1858161bc213c58d5df739ca2869f84df0cc2f2670f2c SHA512 e167e1a6ec84666e5521eabc51182e12aa6efcbcb960d5599d881a99d860f762c291a9fbbb4aa47163e73c05f47704fec8146a80820e708d93ebea88f2d2dddf +EBUILD ngrep-1.45-r3.ebuild 1050 BLAKE2B 405266d7b8805ff562241b5ac72e0a0319754884b64934e71c650e63577da53e18704a32648bc72c1aae35a4036606c4922169d10a3e2b8d481632c141a25ce9 SHA512 6bdd2ebb0b45d9c7744243a0f16c193b3d4501b10716ffdf614774a9ba63168be8d14c2b2795322b41469e820a3aeb511e57343ebbbef01abc45292192af93d0 +EBUILD ngrep-1.47.ebuild 984 BLAKE2B 74ff3a0f7b20c56af1b0744cb2a71e0a0f11fee4b74cbead47344ccec5e73a4faca58e0213938072941acb64aebadaa5b65004caebfd8ddc08daf31f1f4da51f SHA512 066075c2dd4e8efc9aae2166cc341b464132135a19ee102e1ad9672de26036f7cd520852e188e088e69c3aa0304313094bed95d0b6e2fa109ac4241b18f84c28 MISC metadata.xml 669 BLAKE2B 79852bd4c0d1185bcbf60e5ba9e5a9c58b6d6720942cd0cd6d7f8f4f6d445d9ba3fa888bbfba625d1627df4a0aaed22513163075806483a576e199acb9c5fb4d SHA512 d680774ca1d7a66bbe9badb840ebf3f0249c80d0850a229797d17a09da27e2fad9510449ceecfb62b3141ad105fd2970713a14879df57e0bb14c26ac66c807ad diff --git a/net-analyzer/ngrep/ngrep-1.45-r3.ebuild b/net-analyzer/ngrep/ngrep-1.45-r3.ebuild index b55f3909d222..daa699482be9 100644 --- a/net-analyzer/ngrep/ngrep-1.45-r3.ebuild +++ b/net-analyzer/ngrep/ngrep-1.45-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ngrep/${P}.tar.bz2" LICENSE="ngrep" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="ipv6" DEPEND=" diff --git a/net-analyzer/ngrep/ngrep-1.47.ebuild b/net-analyzer/ngrep/ngrep-1.47.ebuild index 0372332adb1f..5b7b863658ae 100644 --- a/net-analyzer/ngrep/ngrep-1.47.ebuild +++ b/net-analyzer/ngrep/ngrep-1.47.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/jpr5/ngrep/archive/V${PV/./_}.tar.gz -> ${P}.tar.gz" LICENSE="ngrep" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="ipv6" DEPEND=" diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index bf1cc3c55489..18a71234b6b7 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -10,10 +10,8 @@ AUX nmap-7.31-libnl.patch 498 BLAKE2B 15ba0015ce0c5f266adf1f6b53ad99db82521a3ef8 AUX nmap-7.70-time.patch 586 BLAKE2B 5354fffebb073c2e96ec744ac746b140ef1b528539faea0ba9423283b2bb535e4310423cbae9671b13ef3af4381182cb61a6662bf314f597cc2fbcaf16b9d11e SHA512 5b948f7393fae98bc0d94e3aef585308476728fe1530fd59bc67aa16ab8f8d790f06b9efa30c9c0a924e690c088453f213520b086ec233a80aa7de8205d79276 AUX nmap-7.80-ac-config-subdirs.patch 849 BLAKE2B d46ad183900ca2f541a1577a2add5c13cebf97007867e737bd8f2c4d45e0716ddd0a8ea0e193eca17fd26d8f5acc1c2b4cd7166d8ddc1942e75e0adbaca17f01 SHA512 e1c1aee3fc5e0030409b258c7bb8838844c2008cde48457105ae43e6d8dd705672bfba269911807105e0735ff0b25fc86304be9dc4c3dc33b3f722a9c492ecd4 AUX nmap-9999-netutil-else.patch 373 BLAKE2B 39f28e3b6a8ddf55029f1db1444200ee475e9351105c7348fe9fd48156e452d8f9697b83a7860ffb188a7f8089c3696c8eef49322a7b029496a334972ae1a180 SHA512 1e062a571eaefbea55f8c4164d8c2b7da177f7c5dd7e846bea5515f81847248bfcaffdb58433fee5f2e08cba387c1ddda21bacbd86efc32a6cdea486cac57cd1 -DIST nmap-7.70.tar.bz2 10467371 BLAKE2B 53d751773851e45fcfa7604f8b325297f429f525bafdef91e7f693b9a9876ddb23e978c50821776b64764adb5bf36e759042cac3254bdbf36bff7048dfb6f58d SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5 DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 -EBUILD nmap-7.70-r1.ebuild 4550 BLAKE2B af45bdb8ada04592f4b8407110e7b5bebbe6e218035183f7557e1e9a7345901646f89be3a552577555915c91687c6bb5c2ec5e64bd4533f8b74d9a83a7853980 SHA512 669d93675f1d23264ad20e6044a3fe365121dc782da44b8e0b6f59354c45c7ad7306516fd59da6904aeba6086d82942a77451f5c56a2a8a3f5c86fc6a6d67b5d -EBUILD nmap-7.80-r1.ebuild 4442 BLAKE2B d80731c4b11585f71c75df7ff637e360cbbd6aa77ce5a1d77e9805556ac20471865cdeb268a9307cd40e945cca566306bdbd7c6f01d82d29cf19c82a145d6ed4 SHA512 e098ef3d5e4d0847bc3c1dd1d1e562e0eead66d412b5185b73d5fd6c73c70431dea8ee5c8542efd5db75eb8bee831c2a5a4702216608b58fcd40efc600e8ad1f +EBUILD nmap-7.80-r1.ebuild 4431 BLAKE2B 4da9c633efc45bcd6f1fa6f17cc90775ccea9cf2baf7d3631c8c1384c103f658986d4298bc1077575913cb365add4ec366cfdd1c4dd4720ea6853d0ed6d5d145 SHA512 583d88de31f8ce56e751f8fbd79690f8eb0780f9b33de3551e1756f6fe291fd46e87766bf3eaac58d6827749136932158fa259214532a199b0c4fef0fbabb73d EBUILD nmap-9999.ebuild 4352 BLAKE2B 5301a8be69c471a295c719e41cc684c9f02d98264bdef33ac6b489b0c62fdbb6cd1b81a5ac2b0f415642550061bb3f60aad4a5d15c606a487b3d2cc5e9e3b4cd SHA512 26e536654f45be06d30a41b2f9ed858dec1ac3794d732bd1cf32cd693d683598929486fa6d38e3131f41521b84dfc067afd311073b724d7b277ecac0c7ce1e9e MISC metadata.xml 920 BLAKE2B c07add545e072588022e15d9de0595f1924fe10fdbec7a11cd401429a76a56ee0a53e4675b3e784f5e2e44372f531073cbdc3da717e4a7f3f906b5c1987530d8 SHA512 56d44c71139e48b75a89140bedd2c4a1bc20c8fe99e16ee8b71fb490cb606997571de95d6ac93147bdee81bbcbb736588c87c43b9cd4f9fac71280416a499185 diff --git a/net-analyzer/nmap/nmap-7.70-r1.ebuild b/net-analyzer/nmap/nmap-7.70-r1.ebuild deleted file mode 100644 index f6b7e054ca37..000000000000 --- a/net-analyzer/nmap/nmap-7.70-r1.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite,xml" -inherit autotools flag-o-matic python-single-r1 toolchain-funcs - -MY_P=${P/_beta/BETA} - -DESCRIPTION="A utility for network discovery and security auditing" -HOMEPAGE="https://nmap.org/" -SRC_URI=" - https://nmap.org/dist/${MY_P}.tar.bz2 - https://dev.gentoo.org/~jer/nmap-logo-64.png -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - -IUSE=" - ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua - zenmap -" -NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh ) -REQUIRED_USE=" - system-lua? ( nse ) - ndiff? ( ${PYTHON_REQUIRED_USE} ) - zenmap? ( ${PYTHON_REQUIRED_USE} ) -" -RDEPEND=" - dev-libs/liblinear:= - dev-libs/libpcre - net-libs/libpcap - libssh2? ( net-libs/libssh2[zlib] ) - ndiff? ( ${PYTHON_DEPS} ) - nls? ( virtual/libintl ) - nmap-update? ( - dev-libs/apr - dev-vcs/subversion - ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) - zenmap? ( - $(python_gen_cond_dep ' - dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}] - ') - ${PYTHON_DEPS} - ) -" -DEPEND=" - ${RDEPEND} - nls? ( sys-devel/gettext ) -" -PATCHES=( - "${FILESDIR}"/${PN}-5.10_beta1-string.patch - "${FILESDIR}"/${PN}-5.21-python.patch - "${FILESDIR}"/${PN}-6.46-uninstaller.patch - "${FILESDIR}"/${PN}-6.25-liblua-ar.patch - "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch - "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch - "${FILESDIR}"/${PN}-7.25-libpcre.patch - "${FILESDIR}"/${PN}-7.31-libnl.patch - "${FILESDIR}"/${PN}-7.70-time.patch -) -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use ndiff || use zenmap; then - python-single-r1_pkg_setup - fi -} - -src_unpack() { - # prevent unpacking the logo - unpack ${MY_P}.tar.bz2 -} - -src_prepare() { - rm -r libpcap/ || die - - cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die - - default - - local lingua - if use nls; then - for lingua in ${NMAP_LINGUAS[@]}; do - if ! has ${lingua} ${LINGUAS-${lingua}}; then - rm -r zenmap/share/zenmap/locale/${lingua} || die - rm zenmap/share/zenmap/locale/${lingua}.po || die - fi - done - else - # configure/make ignores --disable-nls - for lingua in ${NMAP_LINGUAS[@]}; do - rm -r zenmap/share/zenmap/locale/${lingua} || die - rm zenmap/share/zenmap/locale/${lingua}.po || die - done - fi - - sed -i \ - -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ - Makefile.in || die - - sed -i \ - -e '/rm -f $@/d' \ - $(find . -name Makefile.in) \ - || die - - # Fix desktop files wrt bug #432714 - sed -i \ - -e 's|^Categories=.*|Categories=Network;System;Security;|g' \ - zenmap/install_scripts/unix/zenmap-root.desktop \ - zenmap/install_scripts/unix/zenmap.desktop || die - - sed -i \ - -e '/AC_CONFIG_SUBDIRS(libz)/d' \ - -e '/AC_CONFIG_SUBDIRS(libssh2)/d' \ - configure.ac - - cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die - - eautoreconf - - if [[ ${CHOST} == *-darwin* ]] ; then - # we need the original for a Darwin-specific fix, bug #604432 - mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die - fi -} - -src_configure() { - # The bundled libdnet is incompatible with the version available in the - # tree, so we cannot use the system library here. - econf \ - $(use_enable ipv6) \ - $(use_enable nls) \ - $(use_with libssh2) \ - $(use_with ncat) \ - $(use_with ndiff) \ - $(use_with nmap-update) \ - $(use_with nping) \ - $(use_with ssl openssl) \ - $(use_with zenmap) \ - $(usex libssh2 --with-zlib) \ - $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \ - --cache-file="${S}"/config.cache \ - --with-libdnet=included \ - --with-pcre=/usr - # Commented out because configure does weird things - # --with-liblinear=/usr \ -} - -src_compile() { - local directory - for directory in . libnetutil nsock/src \ - $(usex ncat ncat '') \ - $(usex nmap-update nmap-update '') \ - $(usex nping nping '') - do - emake -C "${directory}" makefile.dep - done - - emake \ - AR=$(tc-getAR) \ - RANLIB=$(tc-getRANLIB) -} - -src_install() { - LC_ALL=C emake -j1 \ - DESTDIR="${D}" \ - STRIP=: \ - nmapdatadir="${EPREFIX}"/usr/share/nmap \ - install - if use nmap-update;then - LC_ALL=C emake -j1 \ - -C nmap-update \ - DESTDIR="${D}" \ - STRIP=: \ - nmapdatadir="${EPREFIX}"/usr/share/nmap \ - install - fi - - dodoc CHANGELOG HACKING docs/README docs/*.txt - - if use zenmap; then - doicon "${DISTDIR}/nmap-logo-64.png" - python_optimize - fi -} diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild index a742c24a2323..e974f482eb28 100644 --- a/net-analyzer/nmap/nmap-7.80-r1.ebuild +++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI=" https://nmap.org/dist/${MY_P}.tar.bz2 https://dev.gentoo.org/~jer/nmap-logo-64.png " -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" LICENSE="GPL-2" SLOT="0" diff --git a/net-analyzer/nmbscan/Manifest b/net-analyzer/nmbscan/Manifest index b561df5f7553..3315cc3209ff 100644 --- a/net-analyzer/nmbscan/Manifest +++ b/net-analyzer/nmbscan/Manifest @@ -1,4 +1,4 @@ AUX nmbscan-1.2.5-head.diff 442 BLAKE2B e97b6359f9479b76eae7cddc837df06a02b5adf886ee142f5e0b6dfe27debda30d49197c0184e802686d00df510ed0f6a47ea90c294ee1e124fb980b379121e9 SHA512 6fd79b7b9462700245df3c91345a197cbadafb30f60737b2426285f9a4bff969c752bd68bdde4f305cdd8079a5c89fa1be75360a2e35caf495489c01081b0ceb DIST nmbscan-1.2.5.tar.gz 44749 BLAKE2B be49afa46c6ed1533f3e3d7b5c6fbe54b83802385ed9b670f1cdc0105eae99135000be5e98a693ad2adca54f9948ebacc8cd4fc677828a61a5fa85667d584fcd SHA512 37030c6759cc8b257356274b54ec7474e49ddc523be20180c509064f9238da3350f0f0e73e84f2e89201405e93a350a7a7cdc24ef890e638b62648ee2fc4feb9 -EBUILD nmbscan-1.2.5-r1.ebuild 558 BLAKE2B e3508d2a08a4e47841ad3994a4371c8de96ad57a52ddb42f0da824539a57cd35da88abceec19528697d082ce54387648ed7b4b68fcfed3e5b664f995ed8062c0 SHA512 e1f9f5e4c84e4dd9cd4a5aba21888ce8e9f645f622dd6c898326df439e3e688cca9c2e8393eda6f38d157f3e53055f4eaaaad8f6658e76fab1ab535b42501e0f +EBUILD nmbscan-1.2.5-r1.ebuild 559 BLAKE2B b2d742fb8ed4e3de9a5bda9f8ee2111b92d05d900e50e6548b9d7726daadcbe7b71b5b8f4f42ac63c367b681c2f8541d6b38353f781084a2b1e2d4b26d750cce SHA512 adcba7e680bc53268ac7e64e3cefd60095c7ba737f5eae312ab8151c3c3647d466ed27633d672a98c652cdfae850a88a2a1d773e576e20500479ffaf9c8eb0ab MISC metadata.xml 683 BLAKE2B 8a9b8ad3c95bf0889477f9f8bb0a5f150f24e6d1cdc796a870c8f315497c1383c585b51b18c43dbf2f66122cd0db332c4f10da05ec62647573ba02fe2b450f16 SHA512 f0bb01d9be906681f1e7bf349e776b7cfc15a61be7a3e944e7291dac9f42a3fe151b05e20c6a13b98c8bad598d56811699a8365ba9227419bea4e2373de26b19 diff --git a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild index 349320409573..d47b82ff6739 100644 --- a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild +++ b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://nmbscan.g76r.eu/down/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sparc x86" RDEPEND="net-dns/bind-tools net-fs/samba diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest index dd35c79ec11a..65f081de7a93 100644 --- a/net-analyzer/nrpe/Manifest +++ b/net-analyzer/nrpe/Manifest @@ -2,9 +2,8 @@ AUX nrpe-3.2.1-eliminate-systemd-pid.patch 1264 BLAKE2B e0fb75dcc231881fd02fba73 AUX nrpe.init 1152 BLAKE2B eea4c8554ef02b7eb9e602a4b0750565520dd830435586043f61534a58563eaed379f1296df5eaf68aab88440f4199354118ffbcc5b4340eda633bb3eb49092c SHA512 19f470407d63b2949535acd6e5849afbea44f82a5773f9110f8b025c380c0626a0a733ead417b1ce293741168acea5a885c2e9f94fb1c0b3e38a06e0eae4ddca AUX nrpe.service 242 BLAKE2B 715f0e8b91d6c40405d6d1f3689bbbf750e61e78e1d727debbe998ae81922b36f1d5f7c011f6881979e485a81c08d3f1f405b962023fecea643c8f7a9e04c3df SHA512 ffd67467cc4f5ccdf73e0860d1355a8cc3e528d0c67f2054b0ad76c02a43f9c5a8964a3f6df6f91eaa8e15c3c9596259aa964ad69aa2da60678d68fa892b2346 AUX nrpe.xinetd.2 245 BLAKE2B 3e9db31c7d5b28dab18d2f5855d0465f25fc9cf4a70deac9a5d0c87c7cc546a33b432dbca172a49addadc0bd6583d870ec0fe350bf60e015e325d8bb923aca47 SHA512 d687cb2a5babfd28a97d3a5f1ac665758341ecc37fdd0193dbf0df4cba68c88aa24776a33a706989843fa5356b2e3e995662a823ceb2b86ba8f846f8c47e18fb -DIST nrpe-3.2.1.tar.gz 518015 BLAKE2B c9be2bf24e3d9977a7ff5c2f0e08bfe841729289af836bb7ac6ccb2c173a519958b12cc3e90ece612ac6c2527ad472ef1464be648a66b11ff8ad483d5ad78cc1 SHA512 ec6ff42a00bd97ed80010a82e26dc35fd419f2feda65820cda0108068173c1ae44eee698833a50fd2079429a6f5eb1321c4f06b09c6708bc5fbe48f176389856 DIST nrpe-4.0.0.tar.gz 523846 BLAKE2B 850a420f0550e1dfe6b0ea98a9d9cafec0ec583c115be89b3ba8e88a309c40226c87f6ae880d12c582822e492c5991e3d2444b68f5644750fc74ad75596c96fd SHA512 8773102f28f3e7e96f3637e77489eb12ffe88fe839abfe3f150d2eb3d2efe05f7f812ab4d52a64cbd8d0a5e491aed93d5300b7ce9a8dd072b3a00d885b91276b -EBUILD nrpe-3.2.1-r1.ebuild 2518 BLAKE2B 04b3c3a51d54fa4224462952fad8a87462e4ec7d7779c9302dba7f02591c42c6df772dca9d0b24fcb1d03d0b22d224511c7388e26efa7d22b8ee5261aefa540a SHA512 ae839675938af1bb739ed9fa7295b7d219b4d751b99c16dbbba3709a89b7e639ebd69e1b4c2ef446f4f1a0836472f1873d698060ae911d093db08fab5cc063a9 -EBUILD nrpe-3.2.1-r3.ebuild 2823 BLAKE2B 9a84075935704b6293c5bad466daf7dea676206f778cf7ad466929b4e9e593ff0bd7b5eb54c40cf3d1e6f35ef7a9e5da033d4dce7481ce11ec21639d2ce29aba SHA512 b3bc91e7c5a2e5e557aba4e1c891ea6551b4877bdee743ce5264fad84e84258a606a42fb32e085c901b59bc7009ddbd6adbcc703a3886779b3c417c82c708d75 -EBUILD nrpe-4.0.0.ebuild 2823 BLAKE2B 9a84075935704b6293c5bad466daf7dea676206f778cf7ad466929b4e9e593ff0bd7b5eb54c40cf3d1e6f35ef7a9e5da033d4dce7481ce11ec21639d2ce29aba SHA512 b3bc91e7c5a2e5e557aba4e1c891ea6551b4877bdee743ce5264fad84e84258a606a42fb32e085c901b59bc7009ddbd6adbcc703a3886779b3c417c82c708d75 +DIST nrpe-4.0.2.tar.gz 524146 BLAKE2B dc100579420eeccaaa2a913f56c76b86b6ebdce8d1afdddcc428bfd4a8c12ad19050ab0395e7a109d4e8b43ca7d6a11e13ec4a4250a91483e37725c184382ca2 SHA512 4d7cf6abc974bc79df54afc42644418e3f086a279c8c17d0fd104f19e3c21c0f3dae4fb4268dd134446ff9fe505159b0446372c5cac71cfe03a97479ed41c09b +EBUILD nrpe-4.0.0.ebuild 2818 BLAKE2B bb9f9c1d2a73a0209c56dc419f4683036b0abaf6770e9a39be95ed1c7bd59820b978f501d97c5b067fce393f811e73fd4f3478bc9bda723be42ce2712bb46270 SHA512 9251a9b424567a23ef301bdbc3e6f4edcaf57b2e138beca8cf2f9ac4a46f177ce9c361df677a926767ee63c025bad7ab5ab5bf42bd9744e05e9594f32fbe854c +EBUILD nrpe-4.0.2.ebuild 2874 BLAKE2B 0a3135a0421456de630405025c0b8f23f377f1998cf0f74cc44e456ed115fdcfa0642babf3f69815d1406ddb103383ecb985caf028b1fe6e46c68dea85bfb0df SHA512 554ca7a50f3fbe1b51d46df5c502a9282e7edca1001fd88f138827df6acf5e09ef885b81ba650d5d26bdd1ed5e6a62c5edc407521ba054a3be74c56123b868aa MISC metadata.xml 770 BLAKE2B 93991f7ee4c1b6c26b67e873fae0cdb66170cd93ba6b79d6e798cb2605126888a996f633eccd038ece2a822d1b92498c2036746bb3a1add2e336c6026c2db86d SHA512 48693abab21581eff977b8deaa5fabc5d388960c9cd090b590a1f6d3c8d37b63fe33ec86d6f95d7435404314b84053f8c2ca84b0f33c6c7241ea7260f82a3a27 diff --git a/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild b/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild deleted file mode 100644 index e6bbf0ba41bb..000000000000 --- a/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit systemd user - -DESCRIPTION="Nagios Remote Plugin Executor" -HOMEPAGE="https://github.com/NagiosEnterprises/nrpe" -SRC_URI="https://github.com/NagiosEnterprises/nrpe/releases/download/${P}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86" -IUSE="command-args libressl selinux ssl" - -DEPEND="sys-apps/tcp-wrappers - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" -RDEPEND="${DEPEND} - || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins ) - selinux? ( sec-policy/selinux-nagios )" - -PATCHES=( "${FILESDIR}/nrpe-3.2.1-eliminate-systemd-pid.patch" ) - -pkg_setup() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -src_configure() { - # The configure script tries to detect what OS, distribution, and - # init system you're running and changes the build/install process - # depending on what it comes up with. We specify fixed values - # because we don't want it guessing, for example, whether or not - # to install the tmpfiles.d entry based on whether or not systemd - # is currently running (OpenRC uses them too). - econf \ - --libexecdir=/usr/$(get_libdir)/nagios/plugins \ - --localstatedir=/var/nagios \ - --sysconfdir=/etc/nagios \ - --with-nrpe-user=nagios \ - --with-nrpe-group=nagios \ - --with-piddir=/run \ - --with-opsys=unknown \ - --with-dist-type=unknown \ - --with-init-type=unknown \ - --with-inetd-type=unknown \ - $(use_enable command-args) \ - $(use_enable ssl) -} - -src_compile() { - emake all -} - -src_install() { - default - - dodoc CHANGELOG.md SECURITY.md - insinto /etc/nagios - newins sample-config/nrpe.cfg nrpe.cfg - fowners root:nagios /etc/nagios/nrpe.cfg - fperms 0640 /etc/nagios/nrpe.cfg - - newinitd "startup/openrc-init" nrpe - newconfd "startup/openrc-conf" nrpe - systemd_newunit "startup/default-service" "${PN}.service" - - insinto /etc/xinetd.d/ - newins "${FILESDIR}/nrpe.xinetd.2" nrpe - - rm "${D}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool' -} - -pkg_postinst() { - elog 'Some users have reported incompatibilities between nrpe-2.x and' - elog 'nrpe-3.x. We recommend that you use the same major version for' - elog 'both your server and clients.' - - if use command-args ; then - ewarn '' - ewarn 'You have enabled command-args for NRPE. That lets clients' - ewarn 'supply arguments to the commands that are run, and IS A' - ewarn 'SECURITY RISK!' - ewarn'' - fi -} diff --git a/net-analyzer/nrpe/nrpe-4.0.0.ebuild b/net-analyzer/nrpe/nrpe-4.0.0.ebuild index 6e332b90dd45..d1e218e2cd8a 100644 --- a/net-analyzer/nrpe/nrpe-4.0.0.ebuild +++ b/net-analyzer/nrpe/nrpe-4.0.0.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/NagiosEnterprises/nrpe/releases/download/${P}/${P}.t LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86" IUSE="command-args libressl selinux ssl" DEPEND="acct-group/nagios diff --git a/net-analyzer/nrpe/nrpe-3.2.1-r3.ebuild b/net-analyzer/nrpe/nrpe-4.0.2.ebuild index 6e332b90dd45..73205353081b 100644 --- a/net-analyzer/nrpe/nrpe-3.2.1-r3.ebuild +++ b/net-analyzer/nrpe/nrpe-4.0.2.ebuild @@ -75,7 +75,8 @@ src_install() { insinto /etc/xinetd.d/ newins "${FILESDIR}/nrpe.xinetd.2" nrpe - rm "${D}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool' + rm "${ED}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool' + rm -r "${ED}/run" || die 'failed to remove /run' } pkg_postinst() { diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest index 7c8fe07d76f8..b539ed78db9e 100644 --- a/net-analyzer/ntopng/Manifest +++ b/net-analyzer/ntopng/Manifest @@ -9,5 +9,5 @@ AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d85574650 DIST ntopng-3.8.1.tar.gz 33914341 BLAKE2B 3b0df382e938af78d10e71282e863ccb7ba1da3dc7e2bf90b45f1e6e4670052a8c61a16cb8547f119f0dc753a2e31273b41f40aa26919480cbaecf43b6d59742 SHA512 4cb613881e36b435f97dcc25dfaa505d9c552f63ad8334d5c9d47ec06376d47124c65e6d782546d36f6d27b34b037cc73df7129f459f290ac51e270bb7453970 DIST ntopng-3.8.tar.gz 33910329 BLAKE2B a5aaed2244516b92e4b8c7364817ea66eb2f446fe814a96622cbbf5d851d79e8049b75da009d0f80f07c1fae90f8dc294794b76ed14450d8e0e6685a1b1ce8f2 SHA512 2236f9931fc606e4d0a6da379c480a48bacd441cf199a310ea690a03d74d08f369825ea02e3c13828a10f716a5531d4e6774876f253ab348a52bcf8bd8d5107f EBUILD ntopng-3.8-r1.ebuild 1729 BLAKE2B da6fc2d159813ca2505dae2bc82038fcc7831768adf03d2cbce74ef7ee9fc8268953819641015e0a98550b3ef19e7f42cb63da7c19e6e0f1edf6139f0326165c SHA512 3d71d06d03a0bb2c67be93701cb5a13058d50b029bc1a9f80d630fc687742dbfc7054be34a73c9c4f2f457c44692cec076b4d627a8f6d8b02d06352a4921d39e -EBUILD ntopng-3.8.1-r3.ebuild 1916 BLAKE2B 70b89a531144f15f89ec8d61c4e2851a8788e31abc2533b1f941dcca0231532d98eb8af749226ae0491130de9c4f10c122ccc391f7fab93c538aee4cd8244519 SHA512 bf6a351d4e5c3092e794e7c50489c72d30bfcef5fded136494539067b96a639e9278e95d4b4978c265167e5897c16f2a2db9f9e7ccdee3a74c0dee1e1e049d35 +EBUILD ntopng-3.8.1-r4.ebuild 1918 BLAKE2B de068e1989232534eb853d274bbb8993d6a31b8366ca6e36b6a0b0ea512cfa2d235dd5e44fc37bd84ea6508d480656ab68e40805a0a17f15c0ed62b6e8b955a3 SHA512 b29c347de506cfd771392dd1548651a7c1ac6429ef954b6d56cd94262e929cb41c710a160e8e408c8c193d58f7b84ecb64a70a322405b4ebd12cd1beb0e8fcc3 MISC metadata.xml 294 BLAKE2B 8576bdc8fbbdbeb8502b8d8fb59b71b02d8e99c67d1262ce17ff3cd711ef4c7a7c9234c02503401aa861103ed136c397bf585e94902e13902db490fe55e9e5a4 SHA512 67820c7c2d32de9c79854059df9bad9444a6ef70cca8c718b5469035ce2dd1bf2242b332482b5a12d8f1eaba37ae905f483daf5ba929219c9e6ac3f108c3bc73 diff --git a/net-analyzer/ntopng/ntopng-3.8.1-r3.ebuild b/net-analyzer/ntopng/ntopng-3.8.1-r4.ebuild index 25938565c762..b4562c2a6b21 100644 --- a/net-analyzer/ntopng/ntopng-3.8.1-r3.ebuild +++ b/net-analyzer/ntopng/ntopng-3.8.1-r4.ebuild @@ -16,7 +16,7 @@ DEPEND=" >=net-libs/nDPI-3.0:= dev-db/mysql-connector-c:= dev-db/sqlite:3 - dev-libs/hiredis + dev-libs/hiredis:= dev-libs/json-c:= dev-libs/libmaxminddb dev-libs/libsodium:= diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest index 1301ab87a059..1ad9e4cd9649 100644 --- a/net-analyzer/openvas-scanner/Manifest +++ b/net-analyzer/openvas-scanner/Manifest @@ -1,6 +1,7 @@ AUX gvm-feed-sync.cron 98 BLAKE2B d0af35e85c0c84e6d848de26fbf3f03e8a7473cea9d46c513fbb0d46f1664a516c334221773309d4f9682187a0f46a447320772d52c9826cc8525df26d0b2c38 SHA512 06526d33017c83c7342d9c356fb80e22f7a145bf8cae9bd49a7c74ae5854f7248b2b3609bc0f423b7a3babaad59a4b92ba14873f7f4e20e4cd5af7eb9c01c5d0 AUX gvm-feed-sync.sh 1037 BLAKE2B 6ef8a375a06c0ce5a6181ee26eccdfaba09a5d935c56b98bed4435fdaee6b068f8cf87889789d4108361c6c2e83fa1979d533519c47f0d621f63423c43aa96a9 SHA512 a2abb96e268c8d7f74f61cc509730e4949894fe4225b22cb0f9d4fe2b215da70cc96c79405f59f3b05e290a45de2eeeb5d5ecf632cb23da80dd2102d4900b78a AUX openvas-scanner-6.0.1-sbin.patch 716 BLAKE2B 41883486bfa0cb27c4a05ae7290b69227b166c9179546434aece15d1aa2b380f6f9da9afdbfb684ffc68a93f4dd63093b7ce2308d67ca8f806d2cd8e12433819 SHA512 66e2a99f6c7a6d0053bbb4fa797818681983a07ad66814ae0c577b27b37d41054f6241ddd3c017a0928eddef3f2d342480b4a668402c68d28bbf48c357e65b05 +AUX openvas.conf 29 BLAKE2B 0cb02f4b349d996b07ca19a531b64a35692ce5afb0d1fd4b58b6c80ccce3caf82055b396b23fa14f561eb9b732afba0fdfccade4c33c5e300fa1aca41b3995b7 SHA512 7ae3c5eff9a63a5eaadee5886c80baa46ff123695a55e92f21178421bd69322b4c1c06615fd81ea461b61da12ff0e03f523ea3110105a58e709900a0e2d4eebc AUX openvassd-daemon.conf 394 BLAKE2B 9dd55e29004d6d55f0cd44568b3b22aab21cb4ed88969934e5b1905cdfb05017843ee46f59297f8cba5d7b9db35a0b9c906d1f00075c4361d57e039d7d0cf601 SHA512 c8076ecaa04824e45d7b9b90e63c530d8bbcec6ca22b4ac4d3f2b661f05b8a684f6bef340f9f4524a311c19efa85013199f2de5088efe799969bde301ebe1e82 AUX openvassd.gvm.conf 3577 BLAKE2B dd7452f0c9e63e431cf03553e221f802f7f7463ba36ad64fe18db12a44c3e7c0c4ded80cf4b7ab346a877e95271e5b10b7811d431be533eea2bb98eab53a9cee SHA512 dde7b0fe72e5dd551afdd3817562d785c95a03bbc109465490d65f81dc02a546e9d499a0c937828d2e38d357b9a7deadde12b2408307ea02a47c651c9fff4181 AUX openvassd.init 480 BLAKE2B 28dfdabe7935ce55615fb36e6ddae3c36c84793ba01f6d3c92274a2fea1e44efe3f96bd3e7016740f4dcabff034173b541058d18f99081bd232a098a56d8e572 SHA512 1b0f13ab77f332708e9efb9cad06c47e61e47f68597c797e3f5140a921acaa2b856c10003938f737a20b534caaee7d3bb446d427373d8be8ef3fe7c83ee11b82 @@ -8,5 +9,7 @@ AUX openvassd.logrotate 330 BLAKE2B faf900a6882bb23c29859080d0c140c9dde8dcab42f3 AUX openvassd.service 472 BLAKE2B 528c25dbc32cd742753eb6b155a9221f0adde0e792b1e7af376b714831bcc210a228f5a87089f449f6f0e808f46f45d40fd68d9caed44530d57d99c37dbb8b0d SHA512 3497382e6540ddc341cf17e63f1c8d2250249bb51f8dbe379d48c1f90e81d00fdf03349a4dd08c6c6c2dc7336b385fa892b316ff2315a623952d8a2db33681bd AUX redis.conf.example 1351 BLAKE2B ad1a99404360b76144944793b2994554799bcc6624abce68524773b7f748075b8bcec79dcf94d2f400132a424a5147a3675d67f48d23a46e28a6afdca83e50a3 SHA512 b5024c26696f49e5d453cef7a0e3838a3fa557b2339a250f95d5367a30564b8a62733c86901ae000f62e916d73162188fbca1c56ed3a078dd99e8e8db1cc2c64 DIST openvas-scanner-6.0.1.tar.gz 522100 BLAKE2B af82b41736329bd90ba1ea73a0ace36d4115375f81a7aaff5d3bd50f21cfa3195cdf4012aa952da52c4103a31475de5c5790ef3e2e36180aa06737371fa0e5a0 SHA512 db4087fffe1d50e232fa1e51325cf7f142237e2bd3cc5dcaa1e7058a4871300f352f2c0e700eae72ea9412c347b072e9d1f2eca508b27cb30f36c6895ec95147 +DIST openvas-scanner-7.0.0.tar.gz 428304 BLAKE2B fa0a21127edd2223dbbf533b6c188729a1b6de4977e5667fbc1a45b2c426045cdc73eb58d05df24b8b39d0e47fb445fa704bd1b827bb5ea6403fdb83c6b01fd9 SHA512 ce3e78ce5e1575c5c37b6c2aa77ec8955754029832bafb3fcedd75b48dff309906a97bac052d206f6e93e9e72b8461a131558e849f70b3afce6280a7b06924d1 EBUILD openvas-scanner-6.0.1.ebuild 3158 BLAKE2B f5f2c45f60642ccbcec6aa7ba4c8bb6f2078f4112cfed12f797a3e9883dd150fe01ffcceed52aaa34ce261671b37f0f7bc5652d480b5e1023db8b7739f12f8ff SHA512 9de0594e29d9e0d73a18ddd06f3a7f5d7247f5a721d62bd01555dadb69a914f0a31aadec6f834e01446c21d76584865a8c5807afb61ae87e8ce5dc0929904b86 -MISC metadata.xml 951 BLAKE2B 195ec0e9becddea6e9c08103473e7d26670d9fa766ed470a37f85d25a79d771654ec0305fe242d240e1255636657d086eb908f12e94fe934c7b7c66a59af7e50 SHA512 577b533837640c4131ca305e047dd6bbfc5456d19afcd91a71a8fd6b4c6cb4a464f346ac140b7e9505b2a5a4302d281616d762bc11eb123993d507cd0129b8a1 +EBUILD openvas-scanner-7.0.0.ebuild 2538 BLAKE2B 1e495ed831d223c1d5d750b0339ee94926d7419232f8dd85753d3ab5f738856e638ad58dcbdf9846b6ad75344c7c5ab6657cc28681a5c63a4d9fdb1e7dce4805 SHA512 bcf68d777ba0f6b175ad4255091c7da859e867b05a16ba5fd9f6ea04212458c37c3cd3b269875b42967150d3088dcd4cf5c9e7f154d396b73caa4482ac70964e +MISC metadata.xml 943 BLAKE2B 30afdfefaa60083a3444265990b72e282b8b87167a73f746b3a2f7d5aabe868d9e19864c1bb20f6c9c357f629c3d2829aadcf0096387634868717572dc5fc588 SHA512 f43cf9fdd9062758de6f9ac173d287946226780b57857ee0679687464bf38fb3964765a6a56b1e634a536cf4203ed55933bff8a2088ff4e1e65ab09b2cb8cb65 diff --git a/net-analyzer/openvas-scanner/files/openvas.conf b/net-analyzer/openvas-scanner/files/openvas.conf new file mode 100644 index 000000000000..487e643834b8 --- /dev/null +++ b/net-analyzer/openvas-scanner/files/openvas.conf @@ -0,0 +1 @@ +db_address = /tmp/redis.sock diff --git a/net-analyzer/openvas-scanner/metadata.xml b/net-analyzer/openvas-scanner/metadata.xml index 50c99b9436cc..932077da95e5 100644 --- a/net-analyzer/openvas-scanner/metadata.xml +++ b/net-analyzer/openvas-scanner/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>hasan.calisir@psauxit.com</email> - <name>Hasan ÇALIŞIR</name> + <email>jonas.licht@gmail.com</email> + <name>Jonas Licht</name> </maintainer> <maintainer type="project"> <email>proxy-maint@gentoo.org</email> diff --git a/net-analyzer/openvas-scanner/openvas-scanner-7.0.0.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-7.0.0.ebuild new file mode 100644 index 000000000000..eeee5c6277ab --- /dev/null +++ b/net-analyzer/openvas-scanner/openvas-scanner-7.0.0.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="emake" +inherit cmake flag-o-matic toolchain-funcs + +MY_PN="openvas" +MY_DN="openvassd" + +DESCRIPTION="Open Vulnerability Assessment Scanner" +HOMEPAGE="https://www.greenbone.net/en/" +SRC_URI="https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2 GPL-2+" +KEYWORDS="~amd64 ~x86" +IUSE="cron extras" + +DEPEND=" + acct-user/gvm + app-crypt/gpgme:= + dev-db/redis + dev-libs/glib + dev-libs/libgcrypt:= + dev-libs/libksba + >=net-analyzer/gvm-libs-11.0.0 + net-analyzer/net-snmp + net-libs/gnutls:= + net-libs/libpcap + net-libs/libssh:=" + +RDEPEND=" + ${DEPEND}" + +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + extras? ( + app-doc/doxygen[dot] + app-doc/xmltoman + app-text/htmldoc + dev-perl/CGI + dev-perl/SQL-Translator + )" + +BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build" +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + cmake_src_prepare + # QA-Fix | Correct FHS/Gentoo policy paths for 7.0.0 + sed -i -e "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" "$S"/src/CMakeLists.txt || die + # QA-Fix | Remove !CLANG doxygen warnings for 7.0.0 + if use extras; then + if ! tc-is-clang; then + local f + for f in doc/*.in + do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DSBINDIR=${EPREFIX}/usr/bin" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use extras; then + cmake_build -C "${BUILD_DIR}" doc + cmake_build doc-full -C "${BUILD_DIR}" doc + fi + cmake_build rebuild_cache +} + +src_install() { + if use extras; then + local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) + fi + cmake_src_install + + if use cron; then + # Install the cron job if they want it. + exeinto /etc/gvm + doexe "${FILESDIR}/gvm-feed-sync.sh" + fowners gvm:gvm /etc/gvm/gvm-feed-sync.sh + + insinto /etc/cron.d + newins "${FILESDIR}"/gvm-feed-sync.cron gvm + fi + + insinto /etc/logrotate.d + newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}" + + # Set proper permissions on required files/directories + keepdir /var/log/gvm + fowners gvm:gvm /var/log/gvm + keepdir /var/lib/openvas/{gnupg,plugins} + fowners -R gvm:gvm /var/lib/openvas + + insinto /etc/openvas + doins "${FILESDIR}/openvas.conf" +} diff --git a/net-analyzer/ospd-openvas/Manifest b/net-analyzer/ospd-openvas/Manifest new file mode 100644 index 000000000000..c573950dea51 --- /dev/null +++ b/net-analyzer/ospd-openvas/Manifest @@ -0,0 +1,8 @@ +AUX ospd-openvas.confd 226 BLAKE2B c43d443a83515f8890fd5406741a0e5e48d63fbe4e0a9060ee6c3679138ca406478f584bc8da7e24ec9520385509d3f1de609aaefb54ed36371638b2e0fa2c67 SHA512 ef07f02c3900ee431785b2c2e53f04f4fd114f502526ec509c869dcd3a95e4284fc65f05f5ec85280cc05a29a46fba9c74ef3b0b0d618b9c9c1e62d9bb3fc6fa +AUX ospd-openvas.initd 439 BLAKE2B 8f66305b3002e9946dcc9987de5230e2003f5644badbf648d632a29630fa3ade2c6968d82633b7c150896cbd586366837a4df418ce1ecf967f2cd29ad9614177 SHA512 8570c51af127f6d793d2aad8dd35c9592d445bbf92d19d3fe7fe6aaed57a5cbada5ea4d845da722307a63958bc93826c99729a4fdc5a2b57ed74e6032cc7cc09 +AUX ospd-openvas.service 512 BLAKE2B 68d3e676ab5ad2bb5f8122de9e8737f29b9bc95ff7d522e61dfbf079402b1525aacb27cbe93d525f732fb1e564858fb782c8a56fd7deb51aefd2d80cc2c99baa SHA512 d1d9610ee65491f9a712f5380471dc6696a1733b5873647731fd53799aa780666c71c84df58432d460cd5be605ec5d6e44eb3fa0c3803b7c91b572348756cf30 +AUX ospd.conf 189 BLAKE2B 7b4e2941b25cbbd4b7d5f913526977c5663640d4b5c208cd48b95b13ae6c3838eb8b2dba3340a2a1adab163f88fbf46ce1016cce793af7a39ace0ba14c3ff735 SHA512 68f19ac2bafa91719bc34db01eb0ac034205fc334a6dcfee8ea4d4eed2e4e0c1da5d14c6cdc78bfc14dd37c3a30c8aeb85bb9aa365566ea74465f04ecead7ca6 +AUX redis.conf.example 1351 BLAKE2B ad1a99404360b76144944793b2994554799bcc6624abce68524773b7f748075b8bcec79dcf94d2f400132a424a5147a3675d67f48d23a46e28a6afdca83e50a3 SHA512 b5024c26696f49e5d453cef7a0e3838a3fa557b2339a250f95d5367a30564b8a62733c86901ae000f62e916d73162188fbca1c56ed3a078dd99e8e8db1cc2c64 +DIST ospd-openvas-1.0.0.tar.gz 49725 BLAKE2B 230df2f572f345b9ed398e2af120a2fecee87f9f8d8d3c072ca314960f34f7329fe22b002ba0971ba6dc14cd3ca4543120653f89b3085a0f8a932fbeb6ef2682 SHA512 2b2e4f38843265a018a58b7fbd2fde0449d4f6cf3c5c1b7bec02d8390ab257020304f5be1bf2a77f7d28a04f4d1da611fc9b3066bef370dd686dfb8684fce534 +EBUILD ospd-openvas-1.0.0.ebuild 1053 BLAKE2B 2f7a718d305a245b0ee2f044159e8796749c94900b5f829e7a89909388b816cff08ccc90a2affdd84bafbc314b28b8fd898694a2b7c6d830b10270433dceb9da SHA512 4abbeb5cc608975ddb018048c3a4f101c4c49eb44c3a7efa5e9f7b19460df2895f9c85ba1f6b938bc3ac4c031a5926cb51388cd839cc7bb0d596d0003b44be90 +MISC metadata.xml 695 BLAKE2B 6f7c40458fe05cfe7a4ec7adfc34666c88d225097429f942c3a89842e3b6259a10c5b630a7d993a996b636c674d35237fd7fd1e9d4ea5a5dcf8afe31a27faa34 SHA512 03cd8af210753e2cb74e9e50cb94f6fb66a46e71eb58948bdd575be453e5c239dd26d4c1b42582a9d7f838f3e64c9ad980f9489260aa15de25eb919df697546f diff --git a/net-analyzer/ospd-openvas/files/ospd-openvas.confd b/net-analyzer/ospd-openvas/files/ospd-openvas.confd new file mode 100644 index 000000000000..fc776ac49e32 --- /dev/null +++ b/net-analyzer/ospd-openvas/files/ospd-openvas.confd @@ -0,0 +1,10 @@ +# OpenVAS Scanner command args + +# e.g --foreground +OSPD_OPENVAS_OPTIONS="" + +# Scanner listen socket +OSPD_OPENVAS_UNIX_SOCKET="--unix-socket=/tmp/ospd.sock" + +# Scanner listen mode +OSPD_OPENVAS_SOCKET_MODE="--socket-mode=0o777" diff --git a/net-analyzer/ospd-openvas/files/ospd-openvas.initd b/net-analyzer/ospd-openvas/files/ospd-openvas.initd new file mode 100644 index 000000000000..ced28d892dcd --- /dev/null +++ b/net-analyzer/ospd-openvas/files/ospd-openvas.initd @@ -0,0 +1,17 @@ +#!/sbin/openrc-run +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +name="remotely control an OpenVAS Scanner" +command=/usr/bin/ospd-openvas +pidfile="/run/${RC_SVCNAME}.pid" +command_args="${OSPD_OPENVAS_OPTIONS} \ + ${OSPD_OPENVAS_UNIX_SOCKET} \ + ${OSPD_OPENVAS_SOCKET_MODE} \ + --pid-file ${pidfile} \ + --config /etc/openvas/ospd.conf" + +depend() { + after bootmisc + need localmount redis +} diff --git a/net-analyzer/ospd-openvas/files/ospd-openvas.service b/net-analyzer/ospd-openvas/files/ospd-openvas.service new file mode 100644 index 000000000000..f496797d54ff --- /dev/null +++ b/net-analyzer/ospd-openvas/files/ospd-openvas.service @@ -0,0 +1,18 @@ +[Unit] +Description=OSPD OpenVAS +After=network.target networking.service dnsmasq.service redis-server@openvas.service systemd-tmpfiles.service +ConditionKernelCommandLine=!recovery + +[Service] +Type=forking +User=gvm +Group=gvm +ExecStart=/usr/bin/ospd-openvas --config /etc/openvas/ospd.conf --foreground +SuccessExitStatus=SIGKILL +# This works asynchronously, but does not take the daemon down during the reload so it's ok. +Restart=always +RestartSec=60 + +[Install] +WantedBy=multi-user.target +Alias=ospd-openvas.service diff --git a/net-analyzer/ospd-openvas/files/ospd.conf b/net-analyzer/ospd-openvas/files/ospd.conf new file mode 100644 index 000000000000..bac46565001c --- /dev/null +++ b/net-analyzer/ospd-openvas/files/ospd.conf @@ -0,0 +1,10 @@ +[OSPD - openvas] + +#required by gvmd +unix_socket = /tmp/ospd.sock + +#socket_mode = 0o770 +#unix_socket = /run/ospd/ospd-openvas.pid + +log_level = DEBUG +log_file = /var/log/gvm/ospd-openvas.log diff --git a/net-analyzer/ospd-openvas/files/redis.conf.example b/net-analyzer/ospd-openvas/files/redis.conf.example new file mode 100644 index 000000000000..6a41211aaae8 --- /dev/null +++ b/net-analyzer/ospd-openvas/files/redis.conf.example @@ -0,0 +1,57 @@ +bind 127.0.0.1 +protected-mode yes +port 0 +tcp-backlog 511 +unixsocket /tmp/redis.sock +unixsocketperm 700 +timeout 0 +tcp-keepalive 300 +daemonize no +supervised no +pidfile /run/redis/redis.pid +loglevel notice +logfile /var/log/redis/redis.log +databases 16 +always-show-logo yes +stop-writes-on-bgsave-error yes +rdbcompression yes +rdbchecksum yes +dbfilename dump.rdb +dir /var/lib/redis/ +slave-serve-stale-data yes +slave-read-only yes +repl-diskless-sync no +repl-diskless-sync-delay 5 +repl-disable-tcp-nodelay no +slave-priority 100 +lazyfree-lazy-eviction no +lazyfree-lazy-expire no +lazyfree-lazy-server-del no +slave-lazy-flush no +appendonly no +appendfilename "appendonly.aof" +appendfsync everysec +no-appendfsync-on-rewrite no +auto-aof-rewrite-percentage 100 +auto-aof-rewrite-min-size 64mb +aof-load-truncated yes +aof-use-rdb-preamble no +lua-time-limit 5000 +slowlog-log-slower-than 10000 +slowlog-max-len 128 +latency-monitor-threshold 0 +notify-keyspace-events "" +hash-max-ziplist-entries 512 +hash-max-ziplist-value 64 +list-max-ziplist-size -2 +list-compress-depth 0 +set-max-intset-entries 512 +zset-max-ziplist-entries 128 +zset-max-ziplist-value 64 +hll-sparse-max-bytes 3000 +activerehashing yes +client-output-buffer-limit normal 0 0 0 +client-output-buffer-limit slave 256mb 64mb 60 +client-output-buffer-limit pubsub 32mb 8mb 60 +hz 10 +aof-rewrite-incremental-fsync yes diff --git a/net-analyzer/ospd-openvas/metadata.xml b/net-analyzer/ospd-openvas/metadata.xml new file mode 100644 index 000000000000..d46922d749f9 --- /dev/null +++ b/net-analyzer/ospd-openvas/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>jonas.licht@gmail.com</email> + <name>Jonas Licht</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription lang="en"> + This is an OSP server implementation to allow GVM to remotely control OpenVAS. + Once running, you need to configure OpenVAS for the Greenbone Vulnerability Manager, for example via the web interface Greenbone Security Assistant. Then you can create scan tasks to use OpenVAS. + </longdescription> +</pkgmetadata> diff --git a/net-analyzer/ospd-openvas/ospd-openvas-1.0.0.ebuild b/net-analyzer/ospd-openvas/ospd-openvas-1.0.0.ebuild new file mode 100644 index 000000000000..f7eb63988b62 --- /dev/null +++ b/net-analyzer/ospd-openvas/ospd-openvas-1.0.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) +DISTUTILS_USE_SETUPTOOLS=rdepend +inherit distutils-r1 systemd + +DESCRIPTION="This is an OSP server implementation to allow GVM to remotely control OpenVAS" +HOMEPAGE="https://github.com/greenbone/ospd-openvas" +SRC_URI="https://github.com/greenbone/ospd-openvas/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + acct-user/gvm + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/redis-py[${PYTHON_USEDEP}] + net-analyzer/ospd[${PYTHON_USEDEP}] +" +RDEPEND=" + ${DEPEND} + >=net-analyzer/openvas-scanner-7.0.0" +BDEPEND="" + +distutils_enable_tests unittest + +python_install() { + distutils-r1_python_install + + insinto /etc/openvas + doins "${FILESDIR}"/redis.conf.example + doins "${FILESDIR}"/ospd.conf + + fowners -R gvm:gvm /etc/openvas + + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + + systemd_dounit "${FILESDIR}/${PN}.service" +} diff --git a/net-analyzer/ospd/Manifest b/net-analyzer/ospd/Manifest index a62b289c04e8..a95d5eafb964 100644 --- a/net-analyzer/ospd/Manifest +++ b/net-analyzer/ospd/Manifest @@ -1,3 +1,4 @@ +AUX ospd-2.0.0-socket-permission.patch 1717 BLAKE2B 82a1298fb20c472c1426b6f4a9525d80c940ea56d7c2d4c570e822c8097793279af01df46f45469ad336a2cdf4e0c719c082f2f3bcd3cedac1eb5a0f16a75350 SHA512 7c8acdf310703a3a7442e00b11697f19d280d870a513234eb26277f7f30c8b00ce26750379ca047175bc05757f593ce1a99782ec22b4424fb6c47abad616f1ee DIST ospd-2.0.0.tar.gz 81645 BLAKE2B 4c0c7af3caf274ea9e6a43790eb1e9d386ce42d9976e5e9625b49ffe12d8db2e613109458dcc59f322bc00aee39a4a89045caf302182474d1fab4ca1c4ff1bcf SHA512 971b4b57c39844ef08a0ae56d4bf87f0440c993960b5ad37516c622ad41eb2ab30fabb9d0a05fd043a9a1d98e446eaab9d5018cc1607fd711c533475f4703012 -EBUILD ospd-2.0.0.ebuild 718 BLAKE2B ef6723da53087f451913458961ce208fdccb58fe0cbeb74752fd209f74b2285eac149cfae11f31a616b366f2d5c0349fa5e6f4e7d3f392865bf4428537809ebe SHA512 92223051ff305f555306311bc406c3736e591ddc9416430e10a7eba7ffc15cceed6ff65ba94fd81f193c0f7bbad8b6c0cafe6e2d8b1561868e8306c1e4ab0f29 -MISC metadata.xml 879 BLAKE2B 312903697fda388ac1a9b8c773f69836154e9ea62ee28c1b8248c3e751a6df14dd0f25e1f5d05cca297309aadc0785139ea35c87eab0f5d0f3639a17cb19b570 SHA512 4c276360cc13793e6f505ac0e0b767fa8af277a696a9e64aa37a671780d1b7fa82812d25c2be25dd4542201ab5083d2721746344f46fe548999d4b615c2ceadc +EBUILD ospd-2.0.0-r1.ebuild 928 BLAKE2B 61dcb2ce267b7f78e20a1f51bca6cc95c5499f653b9daae348b461359c09f35812fd0a6546944f84d787409d86b854503d0a5a289bf36c67b16764181bd9de83 SHA512 661920a439554de11abe8d11e9d99360b74274db2bf3701a0f5cd430a1abdfd6fc2e3a9521880a62e3a9c56dd268f89ae940dde801d1f6b4214f7a5947178b56 +MISC metadata.xml 871 BLAKE2B 6f143ae78bda1d5880f975d8c722fd00da73bf048647e87ff28a7d131f98bf728fbc0d7f15a4bf58e0910ff33c5e14eccc94df930e8813ff7c1c6bb47aaaada2 SHA512 288d246b941a2ad7056548be377ac972ad9a62da9ac7f0557b6d4d8ecad0fe5c3d9f7163a6d8c68ded91cb1896eb92c6054703df8ebccb09f489e468af56e159 diff --git a/net-analyzer/ospd/files/ospd-2.0.0-socket-permission.patch b/net-analyzer/ospd/files/ospd-2.0.0-socket-permission.patch new file mode 100644 index 000000000000..b6adefd7b15b --- /dev/null +++ b/net-analyzer/ospd/files/ospd-2.0.0-socket-permission.patch @@ -0,0 +1,53 @@ +From 8f359bb07901a18609974d5f3e587b8fe8c36177 Mon Sep 17 00:00:00 2001 +From: Juan Jose Nicola <juan.nicola@greenbone.net> +Date: Wed, 16 Oct 2019 11:45:30 +0200 +Subject: [PATCH] Fix set permission on unix socket. It was trying to set the + permissions on the unix socket before creating it. + +--- + CHANGELOG.md | 7 +++++++ + ospd/server.py | 6 +++--- + 2 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/CHANGELOG.md b/CHANGELOG.md +index 56cb80f..0f173cb 100644 +--- a/CHANGELOG.md ++++ b/CHANGELOG.md +@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. + + The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). + ++## [2.0.1] (unreleased) ++ ++### Fixed ++- Fix set permission in unix socket. [#157](https://github.com/greenbone/ospd/pull/157) ++ ++[2.0.1]: https://github.com/greenbone/ospd/compare/v2.0.0...ospd-2.0 ++ + ## [2.0.0] (2019-10-11) + + ### Added +diff --git a/ospd/server.py b/ospd/server.py +index 5523de3..9356abf 100644 +--- a/ospd/server.py ++++ b/ospd/server.py +@@ -202,9 +202,6 @@ def start(self, stream_callback: StreamCallbackType): + self._cleanup_socket() + self._create_parent_dirs() + +- if self.socket_path.exists(): +- os.chmod(str(self.socket_path), self.socket_mode) +- + try: + self.stream_callback = stream_callback + self.server = ThreadedUnixSocketServer(self, str(self.socket_path)) +@@ -217,6 +214,9 @@ def start(self, stream_callback: StreamCallbackType): + ) + ) + ++ if self.socket_path.exists(): ++ self.socket_path.chmod(self.socket_mode) ++ + def close(self): + super().close() + self._cleanup_socket() diff --git a/net-analyzer/ospd/metadata.xml b/net-analyzer/ospd/metadata.xml index c20e7ad3a230..2a4516f1d3b0 100644 --- a/net-analyzer/ospd/metadata.xml +++ b/net-analyzer/ospd/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>hasan.calisir@psauxit.com</email> - <name>Hasan ÇALIŞIR</name> + <email>jonas.licht@gmail.com</email> + <name>Jonas Licht</name> </maintainer> <maintainer type="project"> <email>proxy-maint@gentoo.org</email> diff --git a/net-analyzer/ospd/ospd-2.0.0.ebuild b/net-analyzer/ospd/ospd-2.0.0-r1.ebuild index 24f2cac6bb8d..d6eb8b8a8dff 100644 --- a/net-analyzer/ospd/ospd-2.0.0.ebuild +++ b/net-analyzer/ospd/ospd-2.0.0-r1.ebuild @@ -3,7 +3,8 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) +DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 DESCRIPTION="Base class for scanner wrappers,communication protocol for GVM" @@ -23,6 +24,13 @@ RDEPEND=" DEPEND=" ${RDEPEND}" +PATCHES=( + # fixes socket permissions see https://github.com/greenbone/ospd-openvas/issues/170 + "${FILESDIR}/${P}-socket-permission.patch" +) + +distutils_enable_tests unittest + python_compile() { if use extras; then bash "${S}"/doc/generate || die diff --git a/net-analyzer/ossec-hids/Manifest b/net-analyzer/ossec-hids/Manifest index 185b78f39c03..6dbe3b7631f3 100644 --- a/net-analyzer/ossec-hids/Manifest +++ b/net-analyzer/ossec-hids/Manifest @@ -1,11 +1,14 @@ 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 AUX makefile.patch 933 BLAKE2B 29e0d41592983d060c5faeaf1a5719c6c6b41469e1de6f63dfdee051a066ee84e06cc29a0978318b07aa02265c4a04b6eddeeba35c85d8c24e7b1a20d3ddf712 SHA512 bb83123e06fee5ee84fcfcb0c4225210dba7149b3a414abe33425e6db9a1514128ceac0cc31c8d0e9b044a868f0241a799252566d3889f4abc7b821d3c0af6fa DIST ossec-hids-3.1.0.tar.gz 1886469 BLAKE2B c175c8659a8b5d0d269a5cb6bf142276f29e6f676afc6029accf854d68299d71147ba65a667601e77c6db8ca49a29afa49534e5683369f420f6389059ae61fc3 SHA512 fe55f82ac354d9fcd767d8379a492279644308788535780bb029d46688c93f259771686462570137555b40082c6756daad44bbdd1ddc953ed0bb22b65c6cb566 DIST ossec-hids-3.2.0.tar.gz 1896977 BLAKE2B d77cff3a3a72287ad2235f346c7d07cfdad83872d956f57877ed44ad21bb717e4b4ddcfd0e8b2ce45cb90160bb63a28a7d06bc6225b53cc5ed42f7a97c5a1765 SHA512 40b25b97c43a66b8a145914ab0badd9d4f7de7d2168aa7a49abdf778c620a4b533ce3de0883d26c4c39816cf78674a053788a57c5f9c38fbea7cd8b13a35d18f DIST ossec-hids-3.3.0.tar.gz 1900070 BLAKE2B a18a1e55ba44450c634b59099f10b674d27b2079ff456a034dc7bb4bbaf3c89b96f197515f3fb7aa54c248643f333e830a519b04cd4a9402cec2c32597fd96b2 SHA512 97c7e7b21ce88a3f1c89b79ff74b0c13804ba313cf3f30b98bcb4011f422ca050876e780c30624812d399d6b5c59629e52f6772b9ee0cd7cead1d66044dca627 +DIST ossec-hids-3.6.0.tar.gz 1921753 BLAKE2B ca33a94d09265c94dbdb99e2b9637d1e062f39ab88837a5c8f089d64a6369c1bef1e010b18ac4713cd4965dcf189bb1c2866fd33813cd94ae34ac04182070580 SHA512 1f5e897de757df264dfb56def74b7d8f886b6b9d772b5b3d0197c9cd00a32fd7fd8a7b53566851fea3cd74d433b5594cbd074e50b7dbe36305fb3c243e8ddcf5 EBUILD ossec-hids-3.1.0.ebuild 1565 BLAKE2B a87f9f384fd9164a1aac6c1febbafccc8018d10a75508c9acd4fb97d5da6dbe1d1c7dc364c1e38017ca64f5a758764cbb3f628ac52dc1d71496dbf6f7d70e3bf SHA512 797ee671d1f16d8d0144f069a55223d8a030477cb8137c9549ae5cf20d1831fd6c47bcb7ee0bb3134430cbcaa1cc6e97be5a3f96a29a8fd7b7168bd9f705d043 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 MISC metadata.xml 1184 BLAKE2B 491f885913c264b0bd1eb3bea5131e64afd36f8a07a8964a07a987dc67a5537a2a6fd1a8018b339e487218649833eab4a05199fe5d2b7aa79483ec3494a44bb7 SHA512 e786d57b92a5563eb9d3e4ca60c7f45cf1adf59e9409001f032dac07621cfcfedeaed4fc0d438d0b8c2f3146074d9e75874ebeb31616e158692ae2447fd3c767 diff --git a/net-analyzer/ossec-hids/files/makefile-3.6.0.patch b/net-analyzer/ossec-hids/files/makefile-3.6.0.patch new file mode 100644 index 000000000000..810bc077d438 --- /dev/null +++ b/net-analyzer/ossec-hids/files/makefile-3.6.0.patch @@ -0,0 +1,28 @@ +--- a/Makefile 2019-03-09 16:33:13.465947636 +0100 ++++ b/Makefile 2019-03-09 16:32:57.105946856 +0100 +@@ -370,7 +370,6 @@ + install-server: install-server-generic + + install-common: build +- ./init/adduser.sh ${OSSEC_USER} ${OSSEC_USER_MAIL} ${OSSEC_USER_REM} ${OSSEC_GROUP} ${PREFIX} + $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/ + $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs + $(call INSTALL_CMD,0660,${OSSEC_USER},${OSSEC_GROUP}) /dev/null ${PREFIX}/logs/ossec.log +@@ -1160,7 +1159,7 @@ + #### test ########## + #################### + +-CFLAGS_TEST = -g -O0 --coverage ++CFLAGS_TEST = -g -O0 + + LDFLAGS_TEST = -lcheck -lm -pthread -lrt + +@@ -1171,7 +1170,7 @@ + + test_programs = test_os_zlib test_os_xml test_os_regex test_os_crypto test_shared + +-.PHONY: test run_tests build_tests test_valgrind test_coverage ++.PHONY: test run_tests build_tests test_valgrind + + test: build_tests + ${MAKE} run_tests diff --git a/net-analyzer/ossec-hids/ossec-hids-3.6.0.ebuild b/net-analyzer/ossec-hids/ossec-hids-3.6.0.ebuild new file mode 100644 index 000000000000..7c416ed9c259 --- /dev/null +++ b/net-analyzer/ossec-hids/ossec-hids-3.6.0.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Open Source Host-based Intrusion Detection System" +HOMEPAGE="https://www.ossec.net/" +SRC_URI="https://github.com/ossec/ossec-hids/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="agent hybrid local mysql postgres server sqlite test" +REQUIRED_USE="^^ ( agent hybrid local server ) + ?? ( mysql postgres )" +RESTRICT="!test? ( test )" + +RDEPEND="acct-user/ossec + acct-user/ossecm + acct-user/ossecr + dev-libs/libevent + dev-libs/libpcre2 + mysql? ( virtual/mysql ) + postgres? ( dev-db/postgresql:= ) + sqlite? ( dev-db/sqlite:3 )" +DEPEND="${RDEPEND} + test? ( + dev-libs/check + dev-python/subunit + )" +S="${WORKDIR}/${P}/src" +PATCHES=( "${FILESDIR}/makefile-${PV}.patch" ) + +declare -a MY_OPT + +src_configure() { + local target="local" + use agent && target="agent" + use hybrid && target="hybrid" + use server && target="server" + MY_OPT=( + PCRE2_SYSTEM=yes + TARGET=${target} + USE_SQLITE=$(usex sqlite) + V=0 + ZLIB_SYSTEM=yes + ) + use mysql && MY_OPT+=( DATABASE=mysql ) + use postgres && MY_OPT+=( DATABASE=pgsql ) +} + +src_compile() { + emake "${MY_OPT[@]}" PREFIX=/var/ossec +} + +src_test() { + emake "${MY_OPT[@]}" PREFIX=/var/ossec test +} + +src_install() { + keepdir /var/ossec/logs/{alerts,archives,firewall} + keepdir /var/ossec/lua/{compiled,native} + keepdir /var/ossec/queue/{agent-info,agentless,alerts,diff,fts,ossec,rids,rootcheck,syscheck} + keepdir /var/ossec/{.ssh,stats,tmp,var/run} + newenvd - 50ossec-hids <<<'CONFIG_PROTECT="/var/ossec/etc"' + emake "${MY_OPT[@]}" PREFIX="${D}/var/ossec" install +} diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest index 2b0584e05e9f..dbd3d7f3c1de 100644 --- a/net-analyzer/pnp4nagios/Manifest +++ b/net-analyzer/pnp4nagios/Manifest @@ -3,4 +3,4 @@ AUX npcd.initd 364 BLAKE2B b985e4951f95807f4d1d887cfe4f65780150ec827cbe6995e24a9 AUX pnp4nagios-0.6.14-makefile.patch 1057 BLAKE2B 623115771d66839df357cf19ceb0eac9600cac220cb77b77638c76ac1a5a419b7dd83145192779cfeb845a122729728bccd7cc069de1a4da51180aabbff1b91c SHA512 a67e4b66b0f24db25f9b67d982d99a90c20ad229d404537c9963b2e9f1c5df39a46faa34ecdeb1a9e69b46efd96104d97a39a7e326a01d1c2d09dcc149171602 DIST pnp4nagios-0.6.26.tar.gz 3039265 BLAKE2B 1adb3c41222e6bc93671af955a1564387d77901ce118f5d309d101d88c691140e0feef1c2594bc5db44706ff01505a4fcf99b79b6a0c5b5cb923838dd00f1ff0 SHA512 caf6dcced74967174d9e6f09dd1a5bee17397c10a68d0f577c37dcc836f928d78c20d75a0189539e9ffa93715ab7b6e732e9f36b9698cf4dd9c09cfb65184427 EBUILD pnp4nagios-0.6.26-r9.ebuild 3071 BLAKE2B ed4e1c5b1b8355ae1f146eedf5af02c9a4ebac830b4df49f1b826488b0528b60918430fc9969e09ebb3f40bb7a44aa59d1a68538f3f2bcca0a4669780d7121dc SHA512 9fe5e0722484dadefa047c8fe0bff0f5faae933589d33ee6a3905de0f55e51e4bf1b00a48fb1e0547fad09415fd03393b857bb1bf8a7e57f02b0a8885e6dd143 -MISC metadata.xml 716 BLAKE2B 571931c0525f50709ef759d13290bb5606ad311954ce10a8fa60a521cd1fd5d1917316ddc32231c2d16c07b2c0d6fc17c38a81b317e1ed4927645f1663b315ba SHA512 ad8ef6398f119ad3a0d51613fb67546ff9ec43b57825f1f251d27ea3feaf3fe2cb0029f30c179db9dba79f984e14a15926268868930910266f97671c8bea2a55 +MISC metadata.xml 676 BLAKE2B 39cbab00f63f5b7e6cdd10826ef65eeb9ec85616c48c8c94939216e75615c1d0903285be99b53a99aaf0ed56a79845c63f42111b3fde6b1d6b1af9fb736d8596 SHA512 6efd39f07514cbdf85f95fdb0e7bb9f69bf7ba7ab78c1345bdde1eea645cd89415db5044fe2f1b458211c7b002c895e2e9e225c00172be416f1b30f47765f78e diff --git a/net-analyzer/pnp4nagios/metadata.xml b/net-analyzer/pnp4nagios/metadata.xml index 6612bb05751a..4854813f7de3 100644 --- a/net-analyzer/pnp4nagios/metadata.xml +++ b/net-analyzer/pnp4nagios/metadata.xml @@ -11,8 +11,7 @@ Build against <pkg>net-analyzer/nagios-core</pkg> (the default) </flag> <flag name="icinga"> - Build against <pkg>net-analyzer/icinga2</pkg> or - <pkg>net-analyzer/icinga</pkg> instead of + Build against <pkg>net-analyzer/icinga2</pkg> instead of <pkg>net-analyzer/nagios-core</pkg> </flag> </use> diff --git a/net-analyzer/python-gvm/Manifest b/net-analyzer/python-gvm/Manifest index fbae40786b1c..91e6f807be9c 100644 --- a/net-analyzer/python-gvm/Manifest +++ b/net-analyzer/python-gvm/Manifest @@ -1,3 +1,5 @@ DIST python-gvm-1.1.0.tar.gz 160289 BLAKE2B 64dbf79f6749c50cddc2b908c45c6aea6c3793f0ddb10a98a96870636ee351f1a2e66227fbcc1383c63e0e015b4c05bf4c116ac80ef35f73f7e9057f9c8dd9b5 SHA512 dae04d42a14adde274c2148f7bd4b47b0ea02d6e249d6c23dfeb15f217f04ad9ff722f2e98d13e1a7add7b61d9dabfec623ab5b45087aaf5f480447fd31a8071 +DIST python-gvm-1.2.0.tar.gz 160700 BLAKE2B 40ef2d6e01dee7a93796c5d2f29db06e2a533860f7c612000ad5250d9b291ce90164e3a7c65c77f7131fc12c4622094b22da4eeb989293ad1b33e2754063ec76 SHA512 3eacec521bbd4cbfaec08d1ccabfe1c97898288b8b56779f9e3ceb734f52d78b93faf92674c1eefc555501e0bfdb16ed26316e87c697bbdc5a673d1be2170c00 EBUILD python-gvm-1.1.0.ebuild 825 BLAKE2B 27fa0bc179da27573a4bacb5e8acd8ca7f55132c5ab1fead87afe52cde97c280e2e2e7fc9c8948ea82c6cdb14ca84858c2833100994cbaa023f28a723137ce13 SHA512 e15f846d2e2c9b30ebf4528dbe5fbf6f0b3b16ea71842c1c4d0979fa9e5f3872d519c6f4be683a6c75326b8f7ddfbcd0a6c386fed3f8c5dba93582cafaa4e786 -MISC metadata.xml 887 BLAKE2B 2027f57f28286aa9a7cd3d258dd8af4790b5bd0a852d0c40f48ded6986b129583f7043b36974d7708eb95d258160d7ea22ff3d468caef949f759e83f13bef77b SHA512 f04cfc43ed1f0efda4134830afdf4e6c6a54edcd3c880de49a9888b4093a3ddb0d898ab38f5d68f8bed4dd34810659ece1ad3074beeff742606a37139131a7c6 +EBUILD python-gvm-1.2.0.ebuild 827 BLAKE2B f57d9cf5c3fec85626e236da589e213230310092ab9f9035429ff1f30b1da1f94d8dde3f534c74afe6ee53557f6ff93e1d319643c3d863e31ae6f288cf664229 SHA512 0cd2c95a7ebe1c49b7a0e9f9393d5fcb09289fa573702ddd14756621a2bc130504c7f3bd37196a75a4cc723ce82989128fcfeb4d24c63293292ed4e0a069032e +MISC metadata.xml 879 BLAKE2B c2b7de38e8cbd8057c326eb81bb0071e864634f46c64c0474e8b13ef5645bc69426c2eb179a92c90200442c40f792da1a563afd1394c88bbb835989bcfa5d856 SHA512 baba7e3527bc2317480bb742a2e3edd092f6da4a19af04598e8a6a2d5b9c45d7a5f10d2afcba27843c2d3e2eb7493950c3659a2ba815166f700147f732d9e524 diff --git a/net-analyzer/python-gvm/metadata.xml b/net-analyzer/python-gvm/metadata.xml index 92109f9a1354..fd0b9228bd46 100644 --- a/net-analyzer/python-gvm/metadata.xml +++ b/net-analyzer/python-gvm/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>hasan.calisir@psauxit.com</email> - <name>Hasan ÇALIŞIR</name> + <email>jonas.licht@gmail.com</email> + <name>Jonas Licht</name> </maintainer> <maintainer type="project"> <email>proxy-maint@gentoo.org</email> diff --git a/net-analyzer/python-gvm/python-gvm-1.2.0.ebuild b/net-analyzer/python-gvm/python-gvm-1.2.0.ebuild new file mode 100644 index 000000000000..8643fbe95e03 --- /dev/null +++ b/net-analyzer/python-gvm/python-gvm-1.2.0.ebuild @@ -0,0 +1,34 @@ +# 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 distutils-r1 + +DESCRIPTION="Greenbone Vulnerability Management Python Library" +HOMEPAGE="https://www.greenbone.net/en/" +SRC_URI="https://github.com/greenbone/python-gvm/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-3" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + dev-python/defusedxml[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/paramiko[${PYTHON_USEDEP}]" + +DEPEND=" + ${RDEPEND}" + +distutils_enable_tests unittest + +src_prepare() { + distutils-r1_python_prepare_all + # Exlude tests & docs to fix build issue + sed \ + -e "s/packages=find_packages(exclude=.*/packages=find_packages(exclude=['tests*', 'docs']),/g" \ + -i "$S"/setup.py || die +} diff --git a/net-analyzer/ripe-atlas-tools/Manifest b/net-analyzer/ripe-atlas-tools/Manifest index c09bd59df9da..12246d828ab5 100644 --- a/net-analyzer/ripe-atlas-tools/Manifest +++ b/net-analyzer/ripe-atlas-tools/Manifest @@ -1,3 +1,3 @@ DIST ripe.atlas.tools-1.2.3.tar.gz 86364 BLAKE2B de2aa0a57e135d463d1edb7e3277d21052353009d1dbcc2ead03d659c9736e61f36e95d102b5c3792448a1ea304e340f97856647f3c565fec9fcbbf0c414596a SHA512 f9e3b94ac9561faf0f6738099a0511b5aedb3b0d3230997a8033b8a1a804b885169891de8f408933ad90e3d4543375741657d9989fef09548d9cc8f0d9920e66 -EBUILD ripe-atlas-tools-1.2.3-r1.ebuild 1311 BLAKE2B 0f04b1356156fa581576459b0432cadffd86fbbbf4173bf67fb0185a4b6090cb5a60ccc07d95e359f3d9c16897bdf826a13802ebc64ad9959a8fe2c8aca650e0 SHA512 4c9021f9a2c97fff338da9eb70f15d324073d29e4519297c4804c3c79d3600457e8f6811f00f66fbd2a62c2e727675e2e2bee14c21f74d00d0e6886ec30fc3e0 +EBUILD ripe-atlas-tools-1.2.3-r1.ebuild 1240 BLAKE2B c5ae756360e330d39486bbf2e5e37dcce8c099295333429a2a722b4dffedf5a3aadf4fb66fefcff7c55705efba825f384a59e40bebdc63f38e4e5597773d9346 SHA512 d434c51157636a7c82c407595828f0d8c09271362818949b2a06a7a2e704071509abc1cb94dcb8c991554e1b0fabd76dd33c225ebbdea7068597a82b59f454b5 MISC metadata.xml 245 BLAKE2B b9eb390672e4258c0f413eba0dbed731d0f8b2b65275669505e6c5ccdb034944856c212e564f307bc5567203f4897164654f047a2355b9d6f493e0633dce8192 SHA512 d4e3e22b2dde06b42ba712b048c38c8809da125ad6eacb06823f2013d5c9c9b82a4a0b5ffc104f0b786ef048700980c72bed9cabb90a1003db929d2ead0db9d5 diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild index 736af6b37ae0..5f7dc14d22b5 100644 --- a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild +++ b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild @@ -35,8 +35,7 @@ DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] test? ( ${RDEPEND} - dev-python/nose[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )" + dev-python/nose[${PYTHON_USEDEP}] )" python_test() { nosetests --verbose || die "Tests failed with ${EPYTHON}" diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest index 845d77b0df06..d951d8a20497 100644 --- a/net-analyzer/rrdtool/Manifest +++ b/net-analyzer/rrdtool/Manifest @@ -12,7 +12,7 @@ AUX rrdtool-1.7.1-rrdcached.socket.patch 733 BLAKE2B a9ca7691e1589061e65ed4acd3d DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3ebc2ffc0640081cdc2fa3ac643be1ce48a2cac60427a836dc3e457ddb042c95533d0ffbcdefa2978f5659150391 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd DIST rrdtool-1.7.1.tar.gz 2881346 BLAKE2B e538c6ba3fb6726f0515ed655aa8d5e184f6d3066bb32e981b3254e41c53e29529698da5ef73f8365391180c76d15808d1d727a0834b8025893b01c3b9af8f46 SHA512 ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29 -EBUILD rrdtool-1.6.0-r1.ebuild 4259 BLAKE2B d91a05f3acec7ac17a22fbcf8005da48b7155dd7393e82a6c7b69c46808c5c8655d856a3c1e98832883054b8f7a571e9994897cbe353384910e01779d44230f4 SHA512 a397b5258304bb0c205148be169a2b4afaacb6af7a3d047efae11f84dd230976624eccd233659d13a2cc3d55f5f7e5a05895be6f53bff79019b293e9a5e78721 -EBUILD rrdtool-1.7.1.ebuild 4261 BLAKE2B 6afa7adff86c88ad084bacd0c6ac1fbb4a5cfd394a39e7cabea028db06fed7cfd5994e882e6e0bcd0fa35292beae3cfa25de5cd94640b3e990d0b5f4c1056141 SHA512 43f62d0fef4a571bf7464d555c8dcf6e7e87080f9e9fd704a5c08c4187c6de2d96ee0538410d974ee977e066dba541f12c8b7ca382db3de2132b88b57edc12c5 -EBUILD rrdtool-1.7.2.ebuild 4209 BLAKE2B 02442e375f23612dabe41b9fe2334de9953e1dd1e47f39a25b044be24c81baeb47021b6a47a251c2ee4398d57e9bd1166ef2cf5d72bcf5fae48405a8dca24dcb SHA512 5e3c5b7a5ea126dd5f8a09b9847dcd5dbd4443a3f6240b0d8ce72971938cc257160284de12115e4448e969ba8a256e76689274bda08ae17a521a81d8729e362f +EBUILD rrdtool-1.6.0-r1.ebuild 4256 BLAKE2B 96efab5cf4cbdd45e5f64bf41bae3de3260dfa2ad0699ae76b2c6f98c3e88369df5173fb465628dceabb4f8bc92216c8bb51955454a8bc25bfadbed8a63e5906 SHA512 08bba445ae1e6a2e91bcdf903647919e645930bf95786d41ae2663acd1b01eb06009a2ba582ac559ccee45686168fcca9c4592e11570e7f17a2ddeb08329523b +EBUILD rrdtool-1.7.1.ebuild 4257 BLAKE2B fb477b4e164f5dd1f1bca0d9913b2c757e422d4d5fac755614677ae0138b6a4b277eefead23cc7309302e477822efce743a5515a9c17d47432786d57406a1ea6 SHA512 ba0a361ab8a69a10caa2a0f044c2bc727a35334db79ff26c1afe210d8231b1fd502eeb232b91ba95e9b8acb4a433b1fe2981f8e4a040eeab0366170ea47053b0 +EBUILD rrdtool-1.7.2.ebuild 4205 BLAKE2B 2b595a98c4da0802fac77d36e751c5fa05e8993b0fff2fa4931a227c41cb59d973fd1f8d307fd267dd2d513cf11ddaca3dd586f6c57addfede355b5fa369ddac SHA512 1794867d92c03c59e2788bf6d223b0c8d5312293e136c81f70bdf683f3be19a14ffdb8c2f8761f74bd4fc7998d548e239d586960a15d99aac3b810b4d5d91f5c MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23 diff --git a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild index fe2284a9133c..f7fc1fd88c1b 100644 --- a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild +++ b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0/8.0.0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild index ff22873538e5..c6feaa1b781e 100644 --- a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild +++ b/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0/8.0.0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild index 858ec12f8290..9ca47c565ce8 100644 --- a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild +++ b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0/8.0.0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/net-analyzer/sngrep/Manifest b/net-analyzer/sngrep/Manifest index 16350abc01d8..8e6747b4ea55 100644 --- a/net-analyzer/sngrep/Manifest +++ b/net-analyzer/sngrep/Manifest @@ -1,4 +1,5 @@ AUX sngrep-1.4.5-tinfo.patch 237 BLAKE2B 2ba30ab0828f475e790175d8c3dcd25160ff691194ebb6b8e86380251863b40ef52bd942cdd65c694b84bae8de8d216244f9ab5fa75066e640b8427099a39342 SHA512 7c47e530caa1c44f8452a536925fd1133a1f0aad3822117e5ce2e1b7b03307a90423d70bb031639305b638d4c6732d980f3dbe617adc489fd0c2b438354f5ce6 +AUX sngrep-1.4.6-stdin.patch 405 BLAKE2B 206e735df529efe81c3d272e8ccd7c3e759301c6b9ff8f607e3a60c4fc6f06f1ad8c61259b7353d42c991cc28daeffc376c121fc26cf1f60a01ab0deb3828412 SHA512 60766958dc218ee258902ec9944070539c272f2db5dfba638647e2d8942a8160745c3c5f11dd64af34cf8d3f258207e94b325ec0370a47628ce7cf628edadf4c DIST sngrep-1.4.6.tar.gz 235721 BLAKE2B e01f2a1d83b9147b99196f7ff2e5562552b16badc2ca634e63b2e2f5955a5d0328c9fcdb841f42a950899511a81fffd8eb64169758dc319875e3052d4359de93 SHA512 25c67e26158b140bded775b217f313ad5a6268684f03d0b9875ddd423d7548b50fa9c358346330d3873984f456aefa9401c2b0fdd136dd95061e34da6530bcc3 -EBUILD sngrep-1.4.6-r1.ebuild 839 BLAKE2B 57e97e07fea3d167fc9d21939792f4bf6ad65f655377c380308e670f2aaaf6bf89e73d69df8eabd855bda8f11c2c04ccb3a171562bd0347467f131791fc63b06 SHA512 edc380a679fd905062de3391db825e6a0ba1d8ccddc1e2fbb5acac1390483ce3066692d91d5b1e728e5e6991345666433c573d5562d667c26deb0560ee8ef2ca +EBUILD sngrep-1.4.6-r2.ebuild 878 BLAKE2B 8ea141c0d63a12b4b72ff587088421eacd286ca5848c808a6963b6683095bb498e384d6aec376969714e83165e816192b1727858109ed3ddf64baa1764772530 SHA512 6dfbeeb8760c22d90c691e662a73ab4688b3c21a8bf5ad646335d59bfff4c5ca547dfeb4062484ab0d5707fdf4c477628e951e0e5e6dbc466eeec116bd963060 MISC metadata.xml 468 BLAKE2B c4ecbf2a09c6361f3cdd82c6c2280d1885565eb1a834be6093b3acbde6ecad83b49026524c68b067bee7f2764dbf4d3bc73e7e8fc5d13ac499a04001c97b1b30 SHA512 def85ed081107978cef4e8cad0ce80a0717c5c644494ebb907a9a616ad571f13e518019d6d51447f05f1a9545c739dd31874d888cb06ce91ecc224fb2c40e446 diff --git a/net-analyzer/sngrep/files/sngrep-1.4.6-stdin.patch b/net-analyzer/sngrep/files/sngrep-1.4.6-stdin.patch new file mode 100644 index 000000000000..b61025d25b6e --- /dev/null +++ b/net-analyzer/sngrep/files/sngrep-1.4.6-stdin.patch @@ -0,0 +1,11 @@ +--- a/src/capture.c ++++ b/src/capture.c +@@ -191,7 +191,7 @@ + + // Reopen tty for ncurses after pcap have used stdin + if (!strncmp(infile, "/dev/stdin", 10)) { +- if (!(stdin = freopen("/dev/tty", "r", stdin))) { ++ if (!(fstdin = freopen("/dev/tty", "r", stdin))) { + fprintf(stderr, "Failed to reopen tty while using stdin for capture."); + return 1; + } diff --git a/net-analyzer/sngrep/sngrep-1.4.6-r1.ebuild b/net-analyzer/sngrep/sngrep-1.4.6-r2.ebuild index f11852bc421e..011fb09336bd 100644 --- a/net-analyzer/sngrep/sngrep-1.4.6-r1.ebuild +++ b/net-analyzer/sngrep/sngrep-1.4.6-r2.ebuild @@ -25,6 +25,7 @@ DEPEND=" RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${PN}-1.4.5-tinfo.patch + "${FILESDIR}"/${PN}-1.4.6-stdin.patch ) src_prepare() { diff --git a/net-analyzer/snmpclitools/Manifest b/net-analyzer/snmpclitools/Manifest new file mode 100644 index 000000000000..ef01c2cb03cc --- /dev/null +++ b/net-analyzer/snmpclitools/Manifest @@ -0,0 +1,3 @@ +DIST snmpclitools-0.6.4.tar.gz 50853 BLAKE2B 23b28395c1b4d376e4b39f8ebb6d9acf8329da8c9bd6403d0670236ed89a783c0145ceb3ed31a653055bc6fbde785f911e6eeb30f32a587b80878b26ea2a8ba1 SHA512 42c0905f65bc855f7f0089ee7e944543e29ca0ca5a8d7185f5fa877f9c97cae1f1952477e85c614db9785deabad1770f1a046c4e6e98a7832097581f8e14748c +EBUILD snmpclitools-0.6.4.ebuild 591 BLAKE2B 4ce2186bea7d25f27ef85e8211da476b0c047dc7cf8f1229f5bac8a76e274f91e470b1d7c007a3a129d5dbea5863a219d4571dfa31816c37c6ec7a4be4ea4ba1 SHA512 d9287b236ef0dab7f49f89f1b92f4fd6dff25bbc4180af2083249af79591ab1339025c0b1f10522044c8349805c4a9d1b4131169f91aea9390d5cea568f284c6 +MISC metadata.xml 289 BLAKE2B e0397501ebb162c536e6bd8e1a9c24243d5aec4bfdbb100939bdc57360d461f8c7adb503764fd2cf5b096c24d92d3c0d623bf8a4e60668adb78f9a6b1514952a SHA512 7e8013e9ecdd0ec4f0a584421aa9c1f6f976883ca89e6cf211923c99fc580099638cb8c8333948a6b9e1f6809fe72f6835d9b7410b1ebe282b0ad44e6e19e6cc diff --git a/net-analyzer/snmpclitools/metadata.xml b/net-analyzer/snmpclitools/metadata.xml new file mode 100644 index 000000000000..57e2cb1d8be5 --- /dev/null +++ b/net-analyzer/snmpclitools/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> +<email>python@gentoo.org</email> +</maintainer> +<maintainer type="project"> +<email>netmon@gentoo.org</email> +</maintainer> +</pkgmetadata> diff --git a/net-analyzer/snmpclitools/snmpclitools-0.6.4.ebuild b/net-analyzer/snmpclitools/snmpclitools-0.6.4.ebuild new file mode 100644 index 000000000000..4e5827951210 --- /dev/null +++ b/net-analyzer/snmpclitools/snmpclitools-0.6.4.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7} ) +inherit distutils-r1 + +DESCRIPTION="Pure-Python SNMP management tools, formerly pysnmp-apps" +HOMEPAGE="https://github.com/etingof/snmpclitools" +SRC_URI="https://github.com/etingof/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + !dev-python/pysnmp-apps + >=dev-python/pysnmp-4.2.2[${PYTHON_USEDEP}] + dev-python/pysnmp-mibs[${PYTHON_USEDEP}] +" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] +" diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest index 58619a802783..923f8b4d1297 100644 --- a/net-analyzer/suricata/Manifest +++ b/net-analyzer/suricata/Manifest @@ -5,5 +5,7 @@ AUX suricata-5.0.1_default-config.patch 813 BLAKE2B 5758447f2dc6fa50bb6a388c2c83 AUX suricata.service 501 BLAKE2B 00631ada0d2993eae97a028ef950b031b91bb3af346ee3538bd7f0deb9d76bb8552761b4666a3ac80673fe31ffd95424f2ff71e35db0f5fe6667b32478fab4c4 SHA512 4e4e87735731fd0e18ab26e536e7904833a19ce8785ffdd15b22d494673c73044137908feee74800486960f9efd09d1ddc2c75a490a2e35ef06caf23c7439a0c AUX suricata.tmpfiles 24 BLAKE2B 150b74a6775137704915015871ab4455b8d0b9204a75c398ea746e9194b0c0a787904f9015b98f36a685fac0dbb0fcb43746096dd403bf882afa5dfef12af94d SHA512 1530aed4efb35f988e2f0134388ea11ffc3ba1f217845a2c5dd47f947983ed4d343126e49d66a86ca7894ff60b5134464ddbe07509dcc80c001131f09cb7e2dd DIST suricata-5.0.1.tar.gz 23721536 BLAKE2B 529837e8e4d6c33d2093df8208bf03519e0d60deef92eadf9d0a44b7416eae2f900b2f72349815acb86d9bdd9d4253bbc5d7c4c1a34157f544982b0788291624 SHA512 db0797a7992abf0ddf170cb603fdac06b0ff92278bb91343860bccbbe029ea0e83131dfb9805ca44bcbbe3925502119259e350a17e94209b21d1f8b610d965a6 +DIST suricata-5.0.2.tar.gz 23735393 BLAKE2B 3fd9bac597cda59cbeb3d902eccf15e4b873b56b44967a1cad9e99e041f06778ffd4f8ea1378f0df3fa84f2cabd6ac13eda7a2cb233e80a75c27bf7c4e5f7cd0 SHA512 e288f6aee9f8fafb8fa811d2c83a89a29434edc24e05542e172852dc139b9d0bb474d35ddbdc4723df04e7a8b4e70e181c822a4fb1315ba2879c3c7a5c16ef16 EBUILD suricata-5.0.1-r1.ebuild 6265 BLAKE2B e55ba367e62b811a2143a29f422b3f9562c491142887e72c6c336c8c28b8cb4835f9e0b836974ecd1fbcec7e8d6f5964ed107a3076487b510b5f35caa67964f6 SHA512 db261a8a1ee914f0e3708640023a13c53abc8b685c026652dac422cdaaa7c71f2676e53669bbc994f07f2fda4b78f6671dc332b8cdefacba170bd7e00cc1c5da +EBUILD suricata-5.0.2.ebuild 6208 BLAKE2B 48decfc9042247a1cfbc969512589c9074f55867cb75e88a322a952b541b0a22fa20ec9ae31d7deec6fb0907c329403f104f1c1d0a112ee8bec6c42b86d651c6 SHA512 ce1fc4e7123251087a42a506d06dcc4f33dc457492e5af6c667d32525f65960c359472d97cf65c7a873721dc97899807a4cb54cfc8f20de8614a12839add22f3 MISC metadata.xml 1015 BLAKE2B 355c550ad2fe7a37d69b92f0bd710824d68a3353be687876449ad5b7d8e2c98b06b833e59ebcf479410aff09dce71e1f7f64be860c348f3d6c3519cd8fe2acf2 SHA512 0837e07a0130baff435e684b47a6b463991aec73b4f570672d0091a70adf163c5e83d19887e1575f12db783d6246050777011d25dc658fe4767cd3fe8fc1d4a5 diff --git a/net-analyzer/suricata/suricata-5.0.2.ebuild b/net-analyzer/suricata/suricata-5.0.2.ebuild new file mode 100644 index 000000000000..19940f3c9fb2 --- /dev/null +++ b/net-analyzer/suricata/suricata-5.0.2.ebuild @@ -0,0 +1,198 @@ +# 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 autotools flag-o-matic linux-info python-single-r1 systemd + +DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine" +HOMEPAGE="https://suricata-ids.org/" +SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test" + +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ?? ( lua luajit ) + bpf? ( af-packet )" + +CDEPEND="acct-group/suricata + acct-user/suricata + dev-libs/jansson + dev-libs/libpcre + dev-libs/libyaml + net-libs/libnet:* + net-libs/libnfnetlink + dev-libs/nspr + dev-libs/nss + $(python_gen_cond_dep ' + dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] + ') + >=net-libs/libhtp-0.5.32 + net-libs/libpcap + sys-apps/file + sys-libs/libcap-ng + bpf? ( >=dev-libs/libbpf-0.0.6 ) + cuda? ( dev-util/nvidia-cuda-toolkit ) + geoip? ( dev-libs/libmaxminddb ) + logrotate? ( app-admin/logrotate ) + lua? ( dev-lang/lua:* ) + luajit? ( dev-lang/luajit:* ) + lz4? ( app-arch/lz4 ) + nflog? ( net-libs/libnetfilter_log ) + nfqueue? ( net-libs/libnetfilter_queue ) + redis? ( dev-libs/hiredis )" +DEPEND="${CDEPEND} + >=sys-devel/autoconf-2.69-r5 + virtual/rust" +RDEPEND="${CDEPEND} + ${PYTHON_DEPS}" + +PATCHES=( + "${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch" + "${FILESDIR}/${PN}-5.0.1_default-config.patch" +) + +pkg_pretend() { + if use bpf && use kernel_linux; then + if kernel_is -lt 4 15; then + ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map" + fi + + CONFIG_CHECK="~XDP_SOCKETS" + ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata will to load XDP programs. " + ERROR_XDP_SOCKETS+="Other eBPF features should work normally." + check_extra_config + fi +} + +src_prepare() { + default + sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" + eautoreconf +} + +src_configure() { + local myeconfargs=( + "--localstatedir=/var" \ + "--runstatedir=/run" \ + "--enable-non-bundled-htp" \ + "--enable-gccmarch-native=no" \ + "--enable-python" \ + $(use_enable af-packet) \ + $(use_enable bpf ebpf) \ + $(use_enable control-socket unix-socket) \ + $(use_enable cuda) \ + $(use_enable detection) \ + $(use_enable geoip) \ + $(use_enable hardened gccprotect) \ + $(use_enable hardened pie) \ + $(use_enable lua) \ + $(use_enable luajit) \ + $(use_enable lz4) \ + $(use_enable nflog) \ + $(use_enable nfqueue) \ + $(use_enable redis hiredis) \ + $(use_enable test unittests) \ + "--disable-coccinelle" + ) + + if use debug; then + myeconfargs+=( $(use_enable debug) ) + # so we can get a backtrace according to "reporting bugs" on upstream web site + CFLAGS="-ggdb -O0" econf ${myeconfargs[@]} + else + econf ${myeconfargs[@]} + fi +} + +src_install() { + emake DESTDIR="${D}" install + python_optimize + + if use bpf; then + rm -f ebpf/Makefile.{am,in} + dodoc -r ebpf/ + keepdir /usr/libexec/suricata/ebpf + fi + + insinto "/etc/${PN}" + doins etc/{classification,reference}.config threshold.config suricata.yaml + + keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update" + keepdir "/var/log/${PN}" + + fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" + fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" + fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update" + + newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN} + newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN} + systemd_dounit "${FILESDIR}"/${PN}.service + systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf + + if use logrotate; then + insopts -m0644 + insinto /etc/logrotate.d + newins etc/${PN}.logrotate ${PN} + fi +} + +pkg_postinst() { + elog "" + if use systemd; then + elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)" + elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies" + elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise" + elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file" + elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ." + elog "For details, see the section on drop-in directories in systemd.unit(5)." + else + elog "The ${PN} init script expects to find the path to the configuration" + elog "file as well as extra options in /etc/conf.d." + elog "" + elog "To create more than one ${PN} service, simply create a new .yaml file for it" + elog "then create a symlink to the init script from a link called" + elog "${PN}.foo - like so" + elog " cd /etc/${PN}" + elog " ${EDITOR##*/} suricata-foo.yaml" + elog " cd /etc/init.d" + elog " ln -s ${PN} ${PN}.foo" + elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo." + elog "" + elog "You can create as many ${PN}.foo* services as you wish." + fi + + if use bpf; then + elog "" + elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use" + elog "because their configuration is hard-coded. You can find the default ones in" + elog " ${EPREFIX}/usr/share/doc/${PF}/ebpf" + elog "and the common location for eBPF bytecode is" + elog " ${EPREFIX}/usr/libexec/${PN}" + elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html" + fi + + if use debug; then + elog "" + elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:" + elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs" + elog "You need to also ensure the FEATURES variable in make.conf contains the" + elog "'nostrip' option to produce useful core dumps or back traces." + fi + + elog "" + elog "To download and install an initial set of rules, run:" + elog " emerge --config =${CATEGORY}/${PF}" + elog "" +} + +pkg_config() { + suricata-update +} diff --git a/net-analyzer/synscan/Manifest b/net-analyzer/synscan/Manifest index c2f8c20ce4a7..0f30ceca1705 100644 --- a/net-analyzer/synscan/Manifest +++ b/net-analyzer/synscan/Manifest @@ -4,4 +4,4 @@ DIST synscan-5.01.tar.gz 61440 BLAKE2B c32984108e7bf618816f29f034d120e322e25816b DIST synscan-5.02.tar.gz 60651 BLAKE2B 0ad083d6751234b60ec0428cb3752ba1207a5be5e305a0d26950343c7a7f0572aa9ad5cb16831d862ac43c35a051514bd8fefce4abadbf4c120e4e9add7fa433 SHA512 40ec616e169d0d4150e2213fbdcb985e55dcceefef521b0bf85d8964f5b82892b8abeffcbe9c5e38314c22b86553dae56fb082d546e83efa65755a4d345ea7b0 EBUILD synscan-5.01.ebuild 722 BLAKE2B 674dfa56b06e3e8d23b7244b1d877d423df89ad3bc883649e2a3ffaf35df7c45f7c072ce9d1f9d06a1e33160660624a70fba47e5cdd9264165b3bd2e2b4ec392 SHA512 6abd15b1dcf875b960044814edb968461e6ae863a3428cc5e5a37f4a0fd1d81bef5849a92d3726c968d1a5289c3c077fc729a771ad3ea0023e3a37f07c03a4c8 EBUILD synscan-5.02.ebuild 777 BLAKE2B 719dec90e0ecd003b1895cfdb101ec0a7aec4343a11c2368a991d7012980b55cc7ab6d49cbb157ea148d03a7b4f1540934ce0ffb67f69686791426feb0a5741b SHA512 617266198d115bb37d47e2e48531464d5779cc91a97980dd1309b6bce2d6ac733a4223e609c33edbcf5497f1f513efd6b96cc7323ed213dcd8bc86bd9f0dfa0a -MISC metadata.xml 373 BLAKE2B 475b09852e48dea8abbad16dfe918d7cef776bbabe51814dcc4bb82d074480cd3cfd463fd23057c403464bdae86b6f411e1fad098888e29621eaf0da72f0d246 SHA512 68d62e37a26c89ab68afd24c6832553150b21ef6a2abe911f5de8169c52daf10e6e5ffd201e0124b4a5069b123aad0dbc7669420b8d1823423d98553c1a36e4d +MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/net-analyzer/synscan/metadata.xml b/net-analyzer/synscan/metadata.xml index 1b94d6737400..7a38bb900964 100644 --- a/net-analyzer/synscan/metadata.xml +++ b/net-analyzer/synscan/metadata.xml @@ -1,12 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>hasan.calisir@psauxit.com</email> - <name>Hasan ÇALIŞIR</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest index 245460fd581a..278f53bb8a95 100644 --- a/net-analyzer/tcpdump/Manifest +++ b/net-analyzer/tcpdump/Manifest @@ -1,6 +1,6 @@ AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a45da05d0b47894368d39d2c8432f68ff47740d30c34868a60e6e300e08a1a1b5b8e17bb9519c945e39f81014a6 SHA512 eb12b115c8c6f0a2b7bb84712fe3dda5ddde3e6acb56d00000e97abc007b26a1411ddf6be793205bf7c76ccecc3915c417124870326745e3896ae6963bb42341 DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22 -EBUILD tcpdump-4.9.3-r1.ebuild 1930 BLAKE2B 27db7633b2afaf4d15024e1493d828a13a291ec94379a311173c2adef25f58b2dc207f3f665c4c7f7a54c006332bb94580f98d290d5508aafde63329e6b9ff78 SHA512 68c84a450281cfbcf079cc1b5087f8867632ae65754cf9d70d253ab2a68f45dfca2562edcb5f5e772dad0261644a1b2ae80e2531e10f3580109449688d910b1a -EBUILD tcpdump-4.9.3.ebuild 1973 BLAKE2B 664e7295763daa310f49759fe4f910544568f3248b08e72ec987d6aadd90a6d1ac39861ab3e62c323117b2a8cc66ae9d5eea1b126c7e4f0c8a85d9b5ed19165b SHA512 d842584337d0185925d9780a1b233b456bfbf09a748a8c977d7f02fea3884e78e513d0c289fee535865d33858b719ea154038246881e77e8bafa59453de1f07d -EBUILD tcpdump-9999.ebuild 2271 BLAKE2B 6f81a6c411fdb6664110e6b4a0a5355c4d2e3dde6947cc65db3ed0ac999e22442debb58520390484a3541b69856eb515d1f126e491688384890a788734339578 SHA512 d51ca992cd8ec90db0dacf7516cb0d22b6299be304971ccfb95417ded360634910cff5ba8415e8588c87a6fdfa2f1ba47136fd17d43217e41fdf8f1924c728b5 +EBUILD tcpdump-4.9.3-r1.ebuild 1926 BLAKE2B c29eba2ce6fb0ad870181b11f425a1890795f15f9b2a605cfa1f74fe845178fdc0f918640d0801187b5a599419d18967ccc502f9fd4aea0db79a73be5c1451d1 SHA512 05e260dfed29e697c8cb61e0a1400cab7b48706f55fb2c18f2b5e7f09f3055d4f006cddb3cd7147f151d501cf2072f2433f1d4df49c246c08c6afeef9e62bf12 +EBUILD tcpdump-4.9.3.ebuild 1970 BLAKE2B 21479c00b6e3782f76821cbe4971050bb048ecca3071f9499d5df49099b2f84c2aa689dc70a811191d7ae7d298ff457b8915d55dac8ecf7bd39f944f864d99d4 SHA512 7cd73813b82354b1f1eaacea501590438772a96f91fca4f29e83f4558dce430afaebea5b702a5acf3380305b624685993a7f86eef696ccd5df0c417c332803bf +EBUILD tcpdump-9999.ebuild 2267 BLAKE2B ba2e463b49d4d716709e5914e37bb84877ea954e59ae7ffdc59919221c76bc9811a7ec28cc23ff571373433456ea90522b8b2b59ad785ef235039c5783df1b65 SHA512 2c8c2f0346504873fd6f879e15b49b44d112cf780c75becf7bd862add84ca59a3613c996aa78bf34bad0c0163c278f12978b39c2b32c0d3b75994859116510ae MISC metadata.xml 639 BLAKE2B 2bbc5e38a9e172b7aa6dc69d211311d263007bb0da6e268cb9de953f0f862de3562b12e2ba3be267963ed2ef78254e7622951ab997550d78eb56fb057621e3ab SHA512 b765372f84fc597e257acf7d7e7daa5d9b220831ceb041851a9ef08da0fd419f36b12244cae9da0c3ef2b1b5c3fae9e4d234818ab4d58caf209c2c22604de392 diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild index 2fc6154ef964..8374b080d4e2 100644 --- a/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild +++ b/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="+drop-root libressl smi ssl samba suid test" RESTRICT="!test? ( test )" diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild index 32094766b858..f5cdec856e94 100644 --- a/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild +++ b/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="+drop-root libressl smi ssl samba suid test" RESTRICT="!test? ( test )" diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild index cb1394377af7..ac642f4be7b4 100644 --- a/net-analyzer/tcpdump/tcpdump-9999.ebuild +++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild @@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then KEYWORDS="" else SRC_URI="https://github.com/the-${PN}-group/${PN}/archive/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi RDEPEND=" diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest index 746ba58a445c..1da573da2967 100644 --- a/net-analyzer/testssl/Manifest +++ b/net-analyzer/testssl/Manifest @@ -1,5 +1,3 @@ -DIST testssl-2.9.5_p8.tar.gz 8956035 BLAKE2B 692e08e6ff3dedf52dad5ba960291043740fa4e8e8f117b5dff93adfe1a620add3a34660fcbc1c68b53e23b0df5a0ff1862a33b12a50e78312c65791e0a55b42 SHA512 4c0fd1faa8978f85b46a6ae41471e16c8ab2d5651bdb6e009478aeed7b363a3648ff44e6e7689ccf421bd5e6374a2b5bfe9e5a13f7284c3a46371ed58ce4e5fb DIST testssl-3.0.tar.gz 9207778 BLAKE2B 56f13cb58bc930e0c70ef1ff4734dd7e363f362397ebe354c446f1fd6e73a0774a6eb84326a405a5aab224b058754e03fcecda254617eee2fde4d9566ada4e15 SHA512 a5e65d3145bc422cf03b49087cc24cadca367206a06dda61d114b0a6afd7c4921204e23cdc3ade2f5d7e9ce4adf17b54691b9d33d46b75b296111663e9cf063a -EBUILD testssl-2.9.5_p8.ebuild 1510 BLAKE2B 9103b39ff060c190ff809e9aa0023ef6a34afc41fe524f3473243b215bc3171d919fefcf3b1504952afe0413991694eb507f4df52b6a2b4367f14c462b1b3490 SHA512 15175ab1c822895d967e3ab186efcc93d423f50b6e201d80ae8235692cbbe89ebb0fa8135b442fcc2cb27eeefdd1e0d9841c8addbc6589198d3bf466b18155be -EBUILD testssl-3.0.ebuild 1511 BLAKE2B 7bb402e6ecfa6ba7ec5a3b3f1411837c0fbbb35d014ce61fe80eb9eabf8fedd0375d1366019496ea4dd27bf7ee445d1e3c0203085e7dc912290f69246bf2b0fe SHA512 af622b997573b6b82392d4538dd1fb29dd0f72e05b5f1743b0b415d31638f72b73091216eb3b73f3010c5291a26af34aab57a9e28130896b11f6625ab87f4e17 +EBUILD testssl-3.0.ebuild 1509 BLAKE2B 3fe3638078171668db5e9820cd1b29062117c8f081e0d68f9830dc1e1970a17b546eeb491170420a359901abf7ea7d9b2255a9c483b2a564ebf315b2dec319bd SHA512 5e404a151afe689e1701cbf79ccd0c6e925f4848bb513ff9f5aab6f35dd99c287ba31321841693ad51b06e54122f0bb6d876f45cda4c8aa2480982f59983be14 MISC metadata.xml 427 BLAKE2B 5504150e6ed2e079db47b71afd8826e0543162d259ffb690caab572f6f87cf358ec4216b7859c274047f4d880aed40ab6858633856e12f9d9d05683198b75fba SHA512 83dacfa2293a8f14bce97a01f732376e76f84c4eb4fffbed1049b08210850cc5b54381d83df15bec2ecc1c1a592148d538ac37053b36fa1022542e023a97d9ab diff --git a/net-analyzer/testssl/testssl-2.9.5_p8.ebuild b/net-analyzer/testssl/testssl-2.9.5_p8.ebuild deleted file mode 100644 index ada154f761bb..000000000000 --- a/net-analyzer/testssl/testssl-2.9.5_p8.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="${PN}.sh" -MY_PV="${PV/_p/-}" - -DESCRIPTION="Tool to check TLS/SSL cipher support" -HOMEPAGE="https://testssl.sh/" -SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 bundled-openssl? ( openssl )" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="bundled-openssl kerberos" - -RDEPEND=" - app-shells/bash[net] - net-dns/bind-tools - sys-apps/util-linux - sys-libs/ncurses:0 - sys-process/procps - bundled-openssl? ( - kerberos? ( - sys-libs/zlib - virtual/krb5 - ) - ) - !bundled-openssl? ( dev-libs/openssl:0 ) -" - -S=${WORKDIR}/${MY_PN}-${MY_PV} - -QA_PREBUILT="opt/${PN}/*" - -pkg_setup() { - if use amd64; then - if use kerberos; then - BUNDLED_OPENSSL="openssl.Linux.x86_64.krb5" - else - BUNDLED_OPENSSL="openssl.Linux.x86_64" - fi - elif use x86; then - BUNDLED_OPENSSL="openssl.Linux.i686" - fi -} - -src_prepare() { - default - sed -i ${PN}.sh \ - -e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \ - -e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die - - if use bundled-openssl; then - sed -i ${PN}.sh \ - -e "/find_openssl_binary()/a OPENSSL=\"/opt/${PN}/${BUNDLED_OPENSSL}\"" || die - fi -} - -src_install() { - dodoc CHANGELOG.md CREDITS.md Readme.md - dodoc openssl-rfc.mappping.html - - dobin ${PN}.sh - - insinto /etc/${PN} - doins etc/* - - if use bundled-openssl; then - exeinto /opt/${PN} - use amd64 && doexe bin/${BUNDLED_OPENSSL} - fi -} diff --git a/net-analyzer/testssl/testssl-3.0.ebuild b/net-analyzer/testssl/testssl-3.0.ebuild index 8a2472e4e275..f8845bdafb9c 100644 --- a/net-analyzer/testssl/testssl-3.0.ebuild +++ b/net-analyzer/testssl/testssl-3.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/drwetter/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.ta LICENSE="GPL-2 bundled-openssl? ( openssl )" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="bundled-openssl kerberos" RDEPEND=" diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest index 1ae508e10870..7d159e1aecda 100644 --- a/net-analyzer/traceroute/Manifest +++ b/net-analyzer/traceroute/Manifest @@ -1,7 +1,7 @@ DIST traceroute-2.0.20.tar.gz 68907 BLAKE2B 0b80836fe05cad955f8d1a31ecad56f46b29f4710c949c43cac2f908aef551867f808672e3e750cf4b228a94685dca0032c3d2d3ed9d8d5982dfffbe824adbf4 SHA512 ba82468f5e52a14cf029ff977d85e9cc395bdac2fdf8c29232f9e664bf15efdbaca4f56a78533f2afadd3aef95e31d4497f00f4fc29f74a699a149f0434b484d DIST traceroute-2.0.22.tar.gz 69001 BLAKE2B 8678bf2636b3a0615e7282923ccfeae9c721adbecaecee1deff9324bdca8be26e9b821131f84e01411455806c07ded5bdb34b6ab64d4572ffef24af3cfd17c39 SHA512 f7981188b5aa13b6a6c26e7bb3b6cbab88b1adec53a04bff4b878f800bb32a62d82fa389fb36aefd81cc3e9da31740e095f6b6f7eba4dd5926520ad3cff7a92c DIST traceroute-2.1.0.tar.gz 71460 BLAKE2B 4c2126fa98625d525d0a1b0075d16a6ff37836e18d2ce8319f58c89bfa22a6a5e3bbe2ded22fa98d5128c7bb58578327db08120a5b78c1c4ff5673dcc0dea7e6 SHA512 3578007c734091ea0c906637c03fd133a8b0154fbf2e6b5c0c881184947918196bc03aeaf872d3bd53777b9b771cba5cf97f73fb5916bb53b75037f429b40ed3 -EBUILD traceroute-2.0.20.ebuild 936 BLAKE2B 44065288074723ef2e2c743c26ecc4727ea2fa84d2a2e30e074ae301d254f1ccfd3bad8082bdace585a6eac880d4af19d458334f278d70290a5451fd51064e3e SHA512 49dcee59d45d5d66bc48c9327af1e7f891156e7e924b96620cbca01c6d44d560d64c4b1c4829ff42501089cd183219eb66f7b7c04cd4aa40c899dc68da6909c6 -EBUILD traceroute-2.0.22.ebuild 886 BLAKE2B ef7ed7acedb3721376c68b2bdab8eba6b3f068b2e608c75a9cb1e7b5ac223859d56ce3c34bc93f9fbdf57f957857689806c690527164d2ca4cc680758530abd7 SHA512 38f00d14c9f5271ce85b21be8d69f32383d9da15db39583da46d6013b21f004ed4b696a3d586428c609067a14cd7f3f989fe60035697ed10a01bca15978b5da6 -EBUILD traceroute-2.1.0.ebuild 874 BLAKE2B fc69967cc6e625c5d0f794ff16dffeabe0225992c3049e61018946f512fa4b7d6b59df5403bbcc5db3a951132aa6838ef3622cf6fe7a6b66357bc57290e45ecb SHA512 d459120c684db4e3b65d6983fad75582be8442ebbd6455d373139d72853b3d60f2a8047ccf9f3493afa33cecbbac813d877e36792ddd32b0510ac1606ccf69df +EBUILD traceroute-2.0.20.ebuild 934 BLAKE2B 58a312ad6f392f442adc84096c24df543098130b121cb3c59448fac82bb42f1dce409479ceb72d03e15e4ca6c49d3ff94c776ba382cde5b001a5983a4c8f7069 SHA512 a44c21a77f07f84a296625f08df257fe23f9d5ad4df4640eeafaed806f0ce6a96c7d3d9a9fff8275377316dbaea38f7888ad632765e7cc22c69471e6ef09b19e +EBUILD traceroute-2.0.22.ebuild 882 BLAKE2B 68a60c7f67810f31239d800cbc72e0c4c824a73cea3faca78edae69e00114fab7390df90dd1202c78fdb0a028d9291cecc680e7c650093a228eb85634ef87496 SHA512 6ac23135e7b2c0c19eaf24654a723bceb5d97aa66a2e1bb0e6469f1a2ba0e9970bcbef377c878715dfb3c32d6a8219662879e2a9cd29e5e14dc342b67b6671cc +EBUILD traceroute-2.1.0.ebuild 871 BLAKE2B fa4ecff44e2cf4ce9697fa17ac95679ed17b95bf7828101a10b52fe55330027a7894a355ec4e9162906ff5491ade483c945ec2b3b42650f7e85728fe1664ec66 SHA512 32c4d0230ae00a8d0e1958a31bbe520cabd9fe4b16c95e416d25e26b73e06dd6d129780d57085c1da0d764511d90d1b1b7f6a1019502d345ad27424fa4ed2d8a MISC metadata.xml 437 BLAKE2B bbef3a65676e67e78b4f78846a46986a3ffc8b74bb73517795b4796b2865ee0ae4d6ecf99edb1a9b12dc97988cc51fb161dfb757e8ef449a3b46fa1eac5c8411 SHA512 928cbbbcefe88681f5f797616d8f8b4de75cf789157afa536a757e7e72f44b07c337105380816aa79713ec143c324ae16577351648357a77267b6625b962924d diff --git a/net-analyzer/traceroute/traceroute-2.0.20.ebuild b/net-analyzer/traceroute/traceroute-2.0.20.ebuild index 9fb51908a415..614c1836fee6 100644 --- a/net-analyzer/traceroute/traceroute-2.0.20.ebuild +++ b/net-analyzer/traceroute/traceroute-2.0.20.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="static" RDEPEND="!<net-misc/iputils-20121221-r1 diff --git a/net-analyzer/traceroute/traceroute-2.0.22.ebuild b/net-analyzer/traceroute/traceroute-2.0.22.ebuild index ca0995b4e8ea..c9dea6ed056c 100644 --- a/net-analyzer/traceroute/traceroute-2.0.22.ebuild +++ b/net-analyzer/traceroute/traceroute-2.0.22.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="5" @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="static" RDEPEND="!<net-misc/iputils-20121221-r1 diff --git a/net-analyzer/traceroute/traceroute-2.1.0.ebuild b/net-analyzer/traceroute/traceroute-2.1.0.ebuild index f82dabcc9bd1..03a922b734d2 100644 --- a/net-analyzer/traceroute/traceroute-2.1.0.ebuild +++ b/net-analyzer/traceroute/traceroute-2.1.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="static" RDEPEND="!<net-misc/iputils-20121221-r1 diff --git a/net-analyzer/wapiti/Manifest b/net-analyzer/wapiti/Manifest index 20ecf09dbb84..3e6ee0180b9d 100644 --- a/net-analyzer/wapiti/Manifest +++ b/net-analyzer/wapiti/Manifest @@ -1,6 +1,6 @@ DIST wapiti3-3.0.2.tar.gz 561658 BLAKE2B f013b7d3c23cc3b655503de9f14d53b24d281604344c558791561c900fbe8b1a591c6b56970b41c961b38f65680799bf254887f4613d8e2bc96ddbc0a6aa7c24 SHA512 02f0e2510ce428b6dd89251ec63b5806b34e8e02302c7fa8fb1d9460a4e8c073b4650c066183ef20dc554440721f0b659a6ea30ad38f05865fb0fccc1cca758f DIST wapiti3-3.0.3.tar.gz 553259 BLAKE2B c31a1ce3e367c7b85141b0a83c9617a901f01753ebcc56142092d475bf3d540fac6d4e529fc87f5919c962303451787db9e1f8872a5e70a646ff48c1b076139e SHA512 ed135a97ee0c2431fa15d87888eca424db389e9e54b1426e0efe7a83299ee110cb9895916c5f5f3690a99f81034e8ad0d97e3e432b2d478b89a3ba14534ddb96 -EBUILD wapiti-3.0.2.ebuild 1043 BLAKE2B e15a894c9b436994abcbe7c8298f424b12b220000aa30a06f66fef5dcf15faef150fc30264c277e4cd8962e4db1fdbbce85e0bf70f588c7ee3c1164fe6871662 SHA512 abe41d4195058fbcb9175523c39ade25eb94ff803a582eb5aa0ace1da10917d2c7c1d3b063e130fa85888c7e4f39a77f9338cfaa7a05c54df4209966137d625b -EBUILD wapiti-3.0.3.ebuild 1047 BLAKE2B ffaec39d9b48421c38a4eac8f4be90a8223a32f49353718ccdde3c6bb1b9766fda5197b27d393fffdb7146aa28027520aa0a74c8ee20c6a220489503a2b5c4ba SHA512 9851124d15241c153f50b60d6185586c546ac08542f0a37ae4668416f95ad60f7c59b1bcc71978a00eec280bf35b684bc08cf2584ef3b4a63f06386f5200a642 -EBUILD wapiti-9999.ebuild 1011 BLAKE2B ad1a5f599415bda5114ec1573e309c649b5e0a9605814d424f2efbfb30fb7020e9a868e3670ce31e11461bda779603c444fb461f45b77f1ae25a28ecfe466ca9 SHA512 3539e6093bd5219b5a6066e9708ee2a99501c01b868b3deef677fc9a45e8a75e8fdf94e05ab8c0a34ae86dc5cdd4b60e8b933162b7695f22cb5f92318a0661d0 +EBUILD wapiti-3.0.2.ebuild 999 BLAKE2B 6912380533828b179d8fe9850d74c35190d55e0c59a3059603ddeaa58b1c7219381de5f5455bdbcbcccdf01a080d5d7218af54f75b273825824cccb79c3b5858 SHA512 cf51b5c03661e20e1783fa7133c782e9643d43c8af7f28f226449c1a143e0b10f993218f2018e19a93fd3405247a3148a9eac64c32c4c28a6a93ee4c938b8b17 +EBUILD wapiti-3.0.3.ebuild 1003 BLAKE2B 33b785e3609818c3771c171ac01c2dee64844540d5e79c4346c7ae27f3da3912026a67dd7931ca5aba47538be440d0d3e0a757080303f38e8616ae36ad337a59 SHA512 1d6c4bb8408d61a1fa813ddc85a42f2df83784ff08a2138622d0573198d785c89b1c8706a5c5741c226551e756708b1fbce852c427bec72867284657d68c268b +EBUILD wapiti-9999.ebuild 967 BLAKE2B 2c93219385a04edbdbd3723a0a8f12000908f4430f4810d071bccdae1ccc92dcd9ee39be6a4c1df33108f1a86a8ca1679f2b2470063069b930f23fe832da3b40 SHA512 32a81fe623e896493be2ef09e6224ebe13037ea2e168ede4e341ab9701106d8cf4e84c0b815d56ab178ad1aebd68c43891a97b46a8251c9269ee7e8ed738acfe MISC metadata.xml 864 BLAKE2B 9551f009fa754e945364018cc66edcedc0b032929983895547b21dfdac4ad1a4dd33e72ef8613f4ed622631f04a96c4560a4a379b572e986086f8c5a9955d85c SHA512 6af9d0300f0d9edeff11f0478aaf2461337ac36c78ce3d0dd9c3fe30be33cb2b96a1e5fee2c4fe9e89c75bedd06347fd6ca27dfac8bc0d9c0539615487310f25 diff --git a/net-analyzer/wapiti/wapiti-3.0.2.ebuild b/net-analyzer/wapiti/wapiti-3.0.2.ebuild index e54191bc86f1..58cddc1b33e8 100644 --- a/net-analyzer/wapiti/wapiti-3.0.2.ebuild +++ b/net-analyzer/wapiti/wapiti-3.0.2.ebuild @@ -22,7 +22,6 @@ RESTRICT="!test? ( test )" DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-runner[${PYTHON_USEDEP}] )" RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] diff --git a/net-analyzer/wapiti/wapiti-3.0.3.ebuild b/net-analyzer/wapiti/wapiti-3.0.3.ebuild index a89de4ef3a34..c9bf7dc9b105 100644 --- a/net-analyzer/wapiti/wapiti-3.0.3.ebuild +++ b/net-analyzer/wapiti/wapiti-3.0.3.ebuild @@ -22,7 +22,6 @@ RESTRICT="!test? ( test )" DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-runner[${PYTHON_USEDEP}] )" RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] diff --git a/net-analyzer/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild index 3b16236056bc..8a61f85b7acf 100644 --- a/net-analyzer/wapiti/wapiti-9999.ebuild +++ b/net-analyzer/wapiti/wapiti-9999.ebuild @@ -21,7 +21,6 @@ RESTRICT="!test? ( test )" DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-runner[${PYTHON_USEDEP}] )" RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index b2cecc057a56..ee6175367f6b 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -6,6 +6,8 @@ AUX wireshark-99999999-androiddump-wsutil.patch 428 BLAKE2B 1385ce244836fa79c88d AUX wireshark-99999999-qtsvg.patch 160 BLAKE2B f282867fc9cf3d770fb6abb5e6e9b471e3a117e216d3b0e1ba370e1bda3346fc041bedb8d14813dd17fea72441c5cd49a192ecd5fa864dedde88154e729d73fb SHA512 d5e78204767db49b5da6295418cdbb242f91181348fea8042e6ed7fd4b82b19ddef91f0ac10e1f3b7a0f9316a0a8dc7ba0a9b5fb3550dcd7c8814c92989d902e AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3 DIST wireshark-3.2.1.tar.xz 31522124 BLAKE2B 49a83f6c99d54b7a0910f5ace4b46caac680ea73f81d7a3bf7818ccbc6a2fc07cd8f63e1b6ef341cc516220320bb5e035ef6fe82d3d0aba04ec01d6f67f017a1 SHA512 78300f7d597132d54cabe3e51e0f069657d164823852a9f23f1c3c9e6cfdefe5d5ac05c817d06869f4efa4e3cac25ea646cc39d880e5296cf409a8e1a03c2530 -EBUILD wireshark-3.2.1.ebuild 6785 BLAKE2B af47ab8bfc94e3b9dcedf61a38a8abfda54435a32640a94603085364bc68b16323d2e01a8b5293c80d1563f7d934162cad4002c5feae6ba9a3f10a795397ebbe SHA512 0e3ee73c443e12a7ab37364ff0b65473c26121bb3eccd47c3bce2213299da41d45faf27937c0a601411ecebe8ead91ed8286531ee15ba3483f33386ccc84b31f +DIST wireshark-3.2.3.tar.xz 31572052 BLAKE2B 799c1e139dca90905526f0b04c9c4fbb48baa439d7f660321137c64088d190b9bce70bed4a16a6faf7327c86897825ac4f9c12d9dad465b3d6f6a23868bd9e28 SHA512 6e13f5aba9c3f531fab94c9f19e85856278ff534d02e406143c0c134c9b37a76d372105b43f51e95f319e31d742fc17c2812defe377886bd8f7ed03f743f9e9a +EBUILD wireshark-3.2.1.ebuild 6787 BLAKE2B a6c802d721d9b5922c916654a97f00bb48b8099fdf1693b793966b4c0f6b53736db09f0c9366e7dc6ecfcd3c081e00d37ce8fbef68a1ae177dfb978ac17abb03 SHA512 bfdaae60f4fe32b358b232678330453d0b9e773308e65080aa9dee543852e4c148cc848202839743e109863c9f132980cd0968f5d14e524c54ac9e8754120d11 +EBUILD wireshark-3.2.3.ebuild 6778 BLAKE2B 09cddb89ddf101c34f6ebc5fd12a68325bd4a74a25f42e2f03c166fb58e556983116281c98f62a8d8174f7d5ef6f2f00ed0c0277b765787ee23797599aaf1e23 SHA512 9a39fdbcff83e17f67766cb91d912e256c1407c693f9f1fdd0928d0030ff8860b57f8d825109b7735005f0d6f3693df0a8f835b53c98f4a7c279823e605ec2a5 EBUILD wireshark-99999999.ebuild 6473 BLAKE2B 90f269e669b6510bec652d255cd7ed799f43d278262519ca5ea2902fcb38a7f631a01e9596b0aded3412971df16e8bc9bd36664dc757f2164f75c8a2c0294653 SHA512 aaf738de7189ab83ac74b9140693089fb68b22f4afd910454c0bb1ac1b459c27005a67be6266e4c663f213868ea7d79ee1636d4696e09f604f63f3f6fc94b5dc MISC metadata.xml 4887 BLAKE2B fe155238f794922efa1707256697726e556138179e431ca65376fa66c9904ef1cdbbe6018b583f61af3969be618e90b999969da92ce1b782f30f412b0c8305ca SHA512 40e145145120e0301aae8438d8b8782d2414946ac80f5e3d051261eb9372b823a74e4f779d5c4413fe9eb833c2f48e149ca64259f7498bb97275eadc0238a7b3 diff --git a/net-analyzer/wireshark/wireshark-3.2.1.ebuild b/net-analyzer/wireshark/wireshark-3.2.1.ebuild index 2427bff3fd55..83b510b02735 100644 --- a/net-analyzer/wireshark/wireshark-3.2.1.ebuild +++ b/net-analyzer/wireshark/wireshark-3.2.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" LICENSE="GPL-2" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc64 x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86" IUSE=" androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap diff --git a/net-analyzer/wireshark/wireshark-3.2.3.ebuild b/net-analyzer/wireshark/wireshark-3.2.3.ebuild new file mode 100644 index 000000000000..a09e19cba2a7 --- /dev/null +++ b/net-analyzer/wireshark/wireshark-3.2.3.ebuild @@ -0,0 +1,249 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7} ) +inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake + +DESCRIPTION="A network protocol analyzer formerly known as ethereal" +HOMEPAGE="https://www.wireshark.org/" +SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" +LICENSE="GPL-2" + +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" +IUSE=" + androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon + +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap + +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump + +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal + +text2pcap tfshark +tshark +udpdump zlib +zstd +" +S=${WORKDIR}/${P/_/} + +CDEPEND=" + >=dev-libs/glib-2.32:2 + >=net-dns/c-ares-1.5 + dev-libs/libgcrypt:0 + bcg729? ( media-libs/bcg729 ) + brotli? ( app-arch/brotli ) + ciscodump? ( >=net-libs/libssh-0.6 ) + filecaps? ( sys-libs/libcap ) + http2? ( net-libs/nghttp2 ) + kerberos? ( virtual/krb5 ) + libxml2? ( dev-libs/libxml2 ) + lua? ( >=dev-lang/lua-5.1:* ) + lz4? ( app-arch/lz4 ) + maxminddb? ( dev-libs/libmaxminddb ) + minizip? ( sys-libs/zlib[minizip] ) + netlink? ( dev-libs/libnl:3 ) + pcap? ( net-libs/libpcap ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + x11-misc/xdg-utils + ) + sbc? ( media-libs/sbc ) + sdjournal? ( sys-apps/systemd ) + smi? ( net-libs/libsmi ) + snappy? ( app-arch/snappy ) + spandsp? ( media-libs/spandsp ) + sshdump? ( >=net-libs/libssh-0.6 ) + ssl? ( net-libs/gnutls:= ) + zlib? ( sys-libs/zlib ) + zstd? ( app-arch/zstd ) +" +# We need perl for `pod2html`. The rest of the perl stuff is to block older +# and broken installs. #455122 +DEPEND=" + ${CDEPEND} + ${PYTHON_DEPS} +" +BDEPEND=" + dev-lang/perl + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + doc? ( + app-doc/doxygen + dev-ruby/asciidoctor + ) + qt5? ( + dev-qt/linguist-tools:5 + ) +" +RDEPEND=" + ${CDEPEND} + qt5? ( virtual/freedesktop-icon-theme ) + selinux? ( sec-policy/selinux-wireshark ) +" +REQUIRED_USE=" + plugin-ifdemo? ( plugins ) +" +PATCHES=( + "${FILESDIR}"/${PN}-2.4-androiddump.patch + "${FILESDIR}"/${PN}-2.6.0-redhat.patch + "${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch + "${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch + "${FILESDIR}"/${PN}-99999999-qtsvg.patch + "${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch +) + +pkg_setup() { + enewgroup wireshark +} + +src_configure() { + local mycmakeargs + + # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass + # --with-ssl to ./configure. (Mimics code from acinclude.m4). + if use kerberos; then + case $(krb5-config --libs) in + *-lcrypto*) + ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." + ewarn "Note there are annoying license incompatibilities between the OpenSSL" + ewarn "license and the GPL, so do your check before distributing such package." + mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) + ;; + esac + fi + + if use qt5; then + export QT_MIN_VERSION=5.3.0 + append-cxxflags -fPIC -DPIC + fi + + python_setup + + mycmakeargs+=( + $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) + $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') + $(usex qt5 MOC=$(qt5_get_bindir)/moc '') + $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') + $(usex qt5 UIC=$(qt5_get_bindir)/uic '') + -DBUILD_androiddump=$(usex androiddump) + -DBUILD_capinfos=$(usex capinfos) + -DBUILD_captype=$(usex captype) + -DBUILD_ciscodump=$(usex ciscodump) + -DBUILD_dftest=$(usex dftest) + -DBUILD_dpauxmon=$(usex dpauxmon) + -DBUILD_dumpcap=$(usex dumpcap) + -DBUILD_editcap=$(usex editcap) + -DBUILD_mergecap=$(usex mergecap) + -DBUILD_mmdbresolve=$(usex maxminddb) + -DBUILD_randpkt=$(usex randpkt) + -DBUILD_randpktdump=$(usex randpktdump) + -DBUILD_reordercap=$(usex reordercap) + -DBUILD_sdjournal=$(usex sdjournal) + -DBUILD_sharkd=$(usex sharkd) + -DBUILD_sshdump=$(usex sshdump) + -DBUILD_text2pcap=$(usex text2pcap) + -DBUILD_tfshark=$(usex tfshark) + -DBUILD_tshark=$(usex tshark) + -DBUILD_udpdump=$(usex udpdump) + -DBUILD_wireshark=$(usex qt5) + -DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}" + -DDISABLE_WERROR=yes + -DENABLE_BCG729=$(usex bcg729) + -DENABLE_BROTLI=$(usex brotli) + -DENABLE_CAP=$(usex filecaps caps) + -DENABLE_GNUTLS=$(usex ssl) + -DENABLE_KERBEROS=$(usex kerberos) + -DENABLE_LIBXML2=$(usex libxml2) + -DENABLE_LUA=$(usex lua) + -DENABLE_LZ4=$(usex lz4) + -DENABLE_MINIZIP=$(usex minizip) + -DENABLE_NETLINK=$(usex netlink) + -DENABLE_NGHTTP2=$(usex http2) + -DENABLE_PCAP=$(usex pcap) + -DENABLE_PLUGINS=$(usex plugins) + -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo) + -DENABLE_SBC=$(usex sbc) + -DENABLE_SMI=$(usex smi) + -DENABLE_SNAPPY=$(usex snappy) + -DENABLE_SPANDSP=$(usex spandsp) + -DENABLE_ZLIB=$(usex zlib) + -DENABLE_ZSTD=$(usex zstd) + ) + + cmake_src_configure +} + +src_test() { + cmake_src_test +} + +src_install() { + cmake_src_install + + # FAQ is not required as is installed from help/faq.txt + dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* + + # install headers + insinto /usr/include/wireshark + doins ws_diag_control.h ws_symbol_export.h \ + "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h + + local dir dirs=( + epan + epan/crypt + epan/dfilter + epan/dissectors + epan/ftypes + epan/wmem + wiretap + wsutil + ) + for dir in "${dirs[@]}" + do + insinto /usr/include/wireshark/${dir} + doins ${dir}/*.h + done + + #with the above this really shouldn't be needed, but things may be looking + # in wiretap/ instead of wireshark/wiretap/ + insinto /usr/include/wiretap + doins wiretap/wtap.h + + if use qt5; then + local s + for s in 16 32 48 64 128 256 512 1024; do + insinto /usr/share/icons/hicolor/${s}x${s}/apps + newins image/wsicon${s}.png wireshark.png + done + for s in 16 24 32 48 64 128 256 ; do + insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes + newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png + done + fi +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update + + # Add group for users allowed to sniff. + enewgroup wireshark + chgrp wireshark "${EROOT}"/usr/bin/dumpcap + + if use dumpcap && use pcap; then + fcaps -o 0 -g wireshark -m 4710 -M 0710 \ + cap_dac_read_search,cap_net_raw,cap_net_admin \ + "${EROOT}"/usr/bin/dumpcap + fi + + ewarn "NOTE: To capture traffic with wireshark as normal user you have to" + ewarn "add yourself to the wireshark group. This security measure ensures" + ewarn "that only trusted users are allowed to sniff your traffic." +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update +} diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index d9267bb78aed..040a385a09d8 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -15,8 +15,12 @@ AUX zabbix-server.service 429 BLAKE2B 1727ad52441b8e1ef31ee0f7faaa9d9964ee4ca5e2 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df DIST zabbix-3.0.30.tar.gz 14700686 BLAKE2B 9caa772c8dfdd53411bc996b8c97dce7c24853ea1049fe3cb71048c089105af5c7d1cf51071d91d1d2a98113181e9977a1ca3b4304e42a4a2f8bb0b87cd725b8 SHA512 6e60c9e5570aa69e1d52f005094eda1618aafc6d7ee831d4e5dc26f64b0691e2d9e494845fd36d22b049175776057fca28142da31d5e8e06d6c6f3e003bde3a3 DIST zabbix-4.0.18.tar.gz 17200784 BLAKE2B 00c447459518d4c3a600e82f42f2ae14bcda6d8a933eb25a31fb00951f556355925e90960b76e273c2cc08a83b476e7c1a98b2e94aa4c23363fd639d4b199ac5 SHA512 c686611f60242cb2bef408bacbd71b7f3e88ad01b5ac9c34566c36812c9469c85c2388a9efd2ded5b329a3ffa7ec474845f2bac4e100e66b80078823c276cecb +DIST zabbix-4.0.19.tar.gz 17211769 BLAKE2B 1f7ac3fb195c35a41fae84a2b9a7985bee49664df8469ef7a14b9e264348447e5d5822fdc05feca4041ca57e74d15bc8b5cae262024fc5dca7749af263224d2d SHA512 c279af3d8b1b9125420d65e4e20a8892f9531a345e1f0046214fa14ab6204d535fd0cb672b5f3c6b5e325b7d8ff44e317bde58611f4bef9d89aba70851326daf DIST zabbix-4.4.6.tar.gz 19371211 BLAKE2B b63d946f360c529bfc32070e2907cdfada34ee3615c24c6a65ada7379e2ad65ff8e1d182ff9b59e11c844103cb608aafeab0f2bc6bb97fc1a31183214a6df01e SHA512 f9e84872f0210e497261462de95e9096391fc74bee6fd511087825fcfdd8f363003bd090e01a8a092a69ef1f01c4dd31d623f5321cf77dbced0bd337fb91682c -EBUILD zabbix-3.0.30.ebuild 9229 BLAKE2B efeeee4b80c5e0f1fd05e384b0da6a043cf67feed01ab328d916c9000ad41d8e9e80d29336abff6c1f5d78c83f3d3686407a89b263888c330ccac3ff3dc022be SHA512 39d31445d487086c9a4d1038b3c925b979b56f12c1462f6a10e56569247de646cc88facb78bb3f7d5e0f1373b311727ba35114eb906cb93971d97ba631f83dec -EBUILD zabbix-4.0.18.ebuild 9244 BLAKE2B 41ed0452100dc832b18e433c2fcde2e69327d2bc869495b04154d0cd75daefc6d89bb034cecb4e564eceb8ad174dcaa0a6d93cd8314977808c8aeb701e4a287e SHA512 0ff064767a9ad2d361cc8fbf31fa11daca28ac790db72aed5d155f920ea1fa060a570d9067dcf1e9b59df96cc58f368c70df91f079a79170a18164b3ef8ce38b -EBUILD zabbix-4.4.6.ebuild 9121 BLAKE2B ddd2ae448061ceb124ddce5115d2bd17240a44d73f21ac4095f54f13dafa8d3d643e9bbe4b5f7e57ee164104e9cd88056b80dbd87436e1cb6b5d551dc947e4f5 SHA512 fd44d8b1579d111361563ff26f301312ae806d265630eed74a4c2bcf5c7fd4592a9d07b089ef6f68dc13928ff0a966fa67ac3521d38a76148d038df70a08a41f +DIST zabbix-4.4.7.tar.gz 19413652 BLAKE2B 3c7d55a64f8d0e94d7fca3d088bb40592f56ffd5ca8025fb2cdd82ae7946bca1449b354e74cc3e50a6fca9b0bc2b46cf995b74d31d4b462f3d0b4be734f7c19b SHA512 2b96771bb555fae3df67665ac2e47c94662b071eb97c943d59b8f1fc7d31e2bf349c551a0015c6e239321f069b3ab87373c397a023cbff3daad8bd310d11fb6a +EBUILD zabbix-3.0.30.ebuild 9227 BLAKE2B 565fe222ec1d1e2aca06bf705e78fe3c0f641dfdacd61f6346efd85385386e04e5c62eb079e16ebfb9307b84a8eeb2bbb220a59e0d771035a59c669e9685050b SHA512 055dd251714720d7d175d6f4c7c07dd0d452c339b007dc75501ac17a4185ca32d7b3d57a30e93828373c67a3bbd7a22f468330368c75565a26faf6610aca9dd7 +EBUILD zabbix-4.0.18.ebuild 9242 BLAKE2B 8821d1ad7452f863b8e14d54f60b460ede2fcdcf519431dabba2d64ec49b137686ef071c3c22a1d211bda2ed45b8c5f326eb37b598720a67e8d2c43e6960ce55 SHA512 22a2768ddcb2c05aaa4192bedf94bd92e68fb6504f77ac0fb87ea3ef39d34136889cd7f27f436f36f485ef8e8d03bf945c36965a76eaef2b385294e07383ff1c +EBUILD zabbix-4.0.19.ebuild 9244 BLAKE2B 41ed0452100dc832b18e433c2fcde2e69327d2bc869495b04154d0cd75daefc6d89bb034cecb4e564eceb8ad174dcaa0a6d93cd8314977808c8aeb701e4a287e SHA512 0ff064767a9ad2d361cc8fbf31fa11daca28ac790db72aed5d155f920ea1fa060a570d9067dcf1e9b59df96cc58f368c70df91f079a79170a18164b3ef8ce38b +EBUILD zabbix-4.4.6.ebuild 9119 BLAKE2B 558919cb6c7da44f730c97a185419f78916ce42be00278061430b0f4faa6c42489baffb2d6cb4a4bf425a461a03a82b14c0f0aed707b077b417d1b261f28b0c3 SHA512 3cf95baa0d1e665b8d801cb664c59546a71e8d7a1134dc110c6850f916ae812e2eaf2d20e45fc8eca6ad77acea52704277b68f25ad36b8eea9b1c8e371f995c0 +EBUILD zabbix-4.4.7.ebuild 9121 BLAKE2B ddd2ae448061ceb124ddce5115d2bd17240a44d73f21ac4095f54f13dafa8d3d643e9bbe4b5f7e57ee164104e9cd88056b80dbd87436e1cb6b5d551dc947e4f5 SHA512 fd44d8b1579d111361563ff26f301312ae806d265630eed74a4c2bcf5c7fd4592a9d07b089ef6f68dc13928ff0a966fa67ac3521d38a76148d038df70a08a41f 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 index 7a392ccf3382..bb8e85472a3c 100644 --- a/net-analyzer/zabbix/zabbix-3.0.30.ebuild +++ b/net-analyzer/zabbix/zabbix-3.0.30.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P} 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.18.ebuild b/net-analyzer/zabbix/zabbix-4.0.18.ebuild index 28210112c73a..1825d361d641 100644 --- a/net-analyzer/zabbix/zabbix-4.0.18.ebuild +++ b/net-analyzer/zabbix/zabbix-4.0.18.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P} 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 new file mode 100644 index 000000000000..28210112c73a --- /dev/null +++ b/net-analyzer/zabbix/zabbix-4.0.19.ebuild @@ -0,0 +1,350 @@ +# 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}-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.4.6.ebuild b/net-analyzer/zabbix/zabbix-4.4.6.ebuild index 8d4030480f5e..4f4099f27c63 100644 --- a/net-analyzer/zabbix/zabbix-4.4.6.ebuild +++ b/net-analyzer/zabbix/zabbix-4.4.6.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P} 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 ) ) diff --git a/net-analyzer/zabbix/zabbix-4.4.7.ebuild b/net-analyzer/zabbix/zabbix-4.4.7.ebuild new file mode 100644 index 000000000000..8d4030480f5e --- /dev/null +++ b/net-analyzer/zabbix/zabbix-4.4.7.ebuild @@ -0,0 +1,347 @@ +# 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 +} |