diff options
Diffstat (limited to 'net-analyzer')
32 files changed, 668 insertions, 1704 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz Binary files differindex 0a545eeb75e0..c338aaf09786 100644 --- a/net-analyzer/Manifest.gz +++ b/net-analyzer/Manifest.gz diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest index 9a6db2c88816..f8536099ebda 100644 --- a/net-analyzer/monitoring-plugins/Manifest +++ b/net-analyzer/monitoring-plugins/Manifest @@ -1,7 +1,4 @@ AUX define-own-mysql-port-constant.patch 3296 BLAKE2B 7a7c88c6f2c71bc1fc2f802ad202c2d2dbf3ede5af55dbe46cc15a064d37178b27670e30aa7bea07147456ce4d3e1ce9f495fa6df9deb4095367a7427e217719 SHA512 3ead6340800ac15fbe76e223599a5b3dbc6b6b13b72b684919aa43487838564ad7117b4e67fa7f36f0f58554fd8b8d6233efbcb82e6927a0c31f22c6a9ab5dbb -DIST monitoring-plugins-2.1.2.tar.gz 2613060 BLAKE2B ea352b283166a183b993c474d7318b218e8ba75d2cca91ae1901046e6c4bc2075c21217038a649aaf1355f04d6133a623ee1439fa0d1548c8ec6d03fb8952854 SHA512 845eb7636691aa5402119384c3d4256969e959fbc29ef5257c24fc4c21536cad3dade30747f36c9ad998cb37df0f325df66ea679d3d5b96c2993b59a9a325fed DIST monitoring-plugins-2.2.tar.gz 2461548 BLAKE2B 0f68b492e089c6dfd09db6aab78ab4490f2e8983677c70dda4c3800a06380c066865587536a44f135d0e314006ed81a757cbfbd918f53e009f9d2c50b8e58db0 SHA512 5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27 -EBUILD monitoring-plugins-2.1.2.ebuild 2858 BLAKE2B 3b07074b43e7dce8b468946f5184938a51444c093c3fb68a6abdfe7b3ea825f141c2b1994a54bed25b5362454a9d48e5684b12ed220ae14623c712dbd737fe81 SHA512 9426fdb164c60771cc3dddc6cff2e526ae7770400378b74dde706a2cfce7dba51aecddfb7c7a532e6bc07078d05cf28d64ddddc3e4eefeb4ec2bb70f44151f7a EBUILD monitoring-plugins-2.2-r2.ebuild 3011 BLAKE2B 3e2fdb8a93f5adad5de4172a7fc4cb5d6afa5ec63dc4221160493b8068361d971650462838dece42d282511c458dc7ef0b4f60b541aa9c422019be5e48a00ec8 SHA512 bdd095ae665410133fd2125ba7b015e75aa57b8a0c35742a172ddb34cf3e71cb7389956aa278f92a3366b3aeb055ba6a579473878975fa7288d9e79f029b78a7 -EBUILD monitoring-plugins-2.2.ebuild 2875 BLAKE2B 8dfdf9c0bdb239768f0d441ba4f2a6648ed9f7d23580b9def8d2f93ec40d91653a841d821e54aed856bc6f30939ce386fbdde23a7bb86122113ab3d89fe0ff78 SHA512 67a2e298d56b06cfa7ef0f718889c4e300cccd668e7335f6574e36b929dbf349473ce4c4541a083a703440e8d61abea0551e2e245bfec4dbf95cd174e72114d5 MISC metadata.xml 1404 BLAKE2B 68d3a914681db790872872cee7114b053aaa118b9eacbf33b02db932d3b970a80b0fc1d79d9e3f836f7d0f8870066bdf78b6b688864cac753d5ddf42a7ad9f9c SHA512 766657a0c9a0d16fa9fc0c052342b65c1f5b32dbbc0eb4e8fb014274b92dd0370dc19a6821ceed3979a1def5f429e1e3f23ccbf2ca443f787a50e00b503acf42 diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild deleted file mode 100644 index e48fdba53145..000000000000 --- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic multilib user - -DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu" -HOMEPAGE="https://www.monitoring-plugins.org/" -SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres samba snmp ssh +ssl" - -# Most of the plugins use automagic dependencies, i.e. the plugin will -# get built if the binary it uses is installed. For example, check_snmp -# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is -# installed. End result: most of our runtime dependencies are required -# at build time as well. -# -# REAL_DEPEND contains the dependencies that are actually needed to -# build. DEPEND contains those plus the automagic dependencies. -# -REAL_DEPEND="dev-lang/perl - ldap? ( net-nds/openldap ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql:= ) - ssl? ( - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - gnutls? ( net-libs/gnutls ) - )" - -DEPEND="${REAL_DEPEND} - dns? ( net-dns/bind-tools ) - game? ( games-util/qstat ) - fping? ( net-analyzer/fping ) - samba? ( net-fs/samba ) - ssh? ( net-misc/openssh ) - snmp? ( dev-perl/Net-SNMP - net-analyzer/net-snmp[-minimal] )" - -# Basically everything collides with nagios-plugins. -RDEPEND="${DEPEND} - !net-analyzer/nagios-plugins" - -# At least one test is interactive. -RESTRICT="test" - -src_configure() { - append-flags -fno-strict-aliasing - - # Use an array to prevent econf from mangling the ping args. - local myconf=() - - if use ssl; then - myconf+=( $(use_with !gnutls openssl /usr) - $(use_with gnutls gnutls /usr) ) - else - myconf+=( --without-openssl ) - myconf+=( --without-gnutls ) - fi - - # The autodetection for these two commands can hang if localhost is - # down or ICMP traffic is filtered. Bug #468296. - myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" ) - - if use ipv6; then - myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" ) - fi - - econf \ - $(use_with mysql) \ - $(use_with ipv6) \ - $(use_with ldap) \ - $(use_with postgres pgsql /usr) \ - "${myconf[@]}" \ - --libexecdir="/usr/$(get_libdir)/nagios/plugins" \ - --sysconfdir="/etc/nagios" -} - -DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \ - NEWS README REQUIREMENTS SUPPORT THANKS ) - -pkg_preinst() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -pkg_postinst() { - elog "This ebuild has a number of USE flags that determine what you" - elog "are able to monitor. Depending on what you want to monitor, some" - elog "or all of these USE flags need to be set." - elog - elog "The plugins are installed in ${ROOT}usr/$(get_libdir)/nagios/plugins" -} diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild deleted file mode 100644 index 940ae5f013e4..000000000000 --- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic multilib user - -DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu" -HOMEPAGE="https://www.monitoring-plugins.org/" -SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 sparc x86" -IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres samba snmp ssh +ssl" - -# Most of the plugins use automagic dependencies, i.e. the plugin will -# get built if the binary it uses is installed. For example, check_snmp -# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is -# installed. End result: most of our runtime dependencies are required -# at build time as well. -# -# REAL_DEPEND contains the dependencies that are actually needed to -# build. DEPEND contains those plus the automagic dependencies. -# -REAL_DEPEND="dev-lang/perl - ldap? ( net-nds/openldap ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql:= ) - ssl? ( - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - gnutls? ( net-libs/gnutls ) - )" - -DEPEND="${REAL_DEPEND} - dns? ( net-dns/bind-tools ) - game? ( games-util/qstat ) - fping? ( net-analyzer/fping ) - samba? ( net-fs/samba ) - ssh? ( net-misc/openssh ) - snmp? ( dev-perl/Net-SNMP - net-analyzer/net-snmp[-minimal] )" - -# Basically everything collides with nagios-plugins. -RDEPEND="${DEPEND} - !net-analyzer/nagios-plugins" - -# At least one test is interactive. -RESTRICT="test" - -src_configure() { - append-flags -fno-strict-aliasing - - # Use an array to prevent econf from mangling the ping args. - local myconf=() - - if use ssl; then - myconf+=( $(use_with !gnutls openssl /usr) - $(use_with gnutls gnutls /usr) ) - else - myconf+=( --without-openssl ) - myconf+=( --without-gnutls ) - fi - - # The autodetection for these two commands can hang if localhost is - # down or ICMP traffic is filtered. Bug #468296. - myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" ) - - if use ipv6; then - myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" ) - fi - - econf \ - $(use_with mysql) \ - $(use_with ipv6) \ - $(use_with ldap) \ - $(use_with postgres pgsql /usr) \ - "${myconf[@]}" \ - --libexecdir="/usr/$(get_libdir)/nagios/plugins" \ - --sysconfdir="/etc/nagios" -} - -DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \ - NEWS README REQUIREMENTS SUPPORT THANKS ) - -pkg_preinst() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -pkg_postinst() { - elog "This ebuild has a number of USE flags that determine what you" - elog "are able to monitor. Depending on what you want to monitor, some" - elog "or all of these USE flags need to be set." - elog - elog "The plugins are installed in ${EROOT%/}/usr/$(get_libdir)/nagios/plugins" -} diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index 31a670554568..eab93682e4c5 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -1,19 +1,8 @@ -AUX 99_nagios3.conf 377 BLAKE2B e26a41d3a52f808615a920caae73d5d1314a296434572c57a93d7a45edff37ee152cbcf1131e0a9a67a93f17c2630b0b7c4a2fff831359549ab096f26059f3fc SHA512 53ceae12cf19d2dda1298e9faaa3ddab9b4d95163df87ccfaa0a58e54d60cf8e005ea32ed827348f1b43aee53258896972b72727145f9a20f6a4e1ce1e56ea3f AUX 99_nagios4.conf 368 BLAKE2B 147f4b73bd2f7d71dabb56f646399b939d3a87c288efed9b135e9401120e81c27e2a05f96982b62e601d1dd9b21be494e866103467a363336234b8b15095daf1 SHA512 f0b239f23d74afa89483806f27fb9259054e46bc5742de8a414c9a9a9852a4fbdc14db45aeb148a15288196c8f7d51bdd485b005e20d012892e9e7321b50e161 -AUX conf.d 298 BLAKE2B 755ef6d5f69b7920cbe4e71643c64526743219f7967fefbc2046e51d1833186cf17c7b5ec4d8f8ad911e2e7c9470b41defa95c34a791a1b75c0aa932ffb4e897 SHA512 81d1bbbff88b56f2bbad7e38701977eeaeaa56c6511e98fa2675960040dbad45b3243f22742b68c1a18e7df1b2fadcc6593b61e92eac42f7362ae16c33989418 -AUX lighttpd_nagios3-r1.conf 482 BLAKE2B 3b3a70304174c0380fefc276f43462058a3968d06d8907f94248fb7eb0b0942830a405f8dfb81f7d17c006800c9ceeeaaca64c7ef235a1eb62ee835ed1897794 SHA512 8a6811432034f97aa136b4d2c4cf1382c8cb13388eec67a2112034aa1331e08fa73e5822ef78634cf25581b068280736a9efd15848fecaa7215364104778194b AUX lighttpd_nagios4.conf 325 BLAKE2B f89b9d5aed8305d54f76adf29c65ba20bee74b6c82d149c8b0a786dddacc58c62337072691136c486d4050d1e3bce82420398d5f525ebc0bb36eefdf3a6a2e7f SHA512 a2f854713512ee8ee5c451235beb6ffccf2e04617a98619c6de807a5abca0a424e0581c34b4d255dcbc108e677e18bed25dd33e3d38df8fe10d7d8d4fab015c9 -AUX nagios-core-3.5.1-process_cgivars.patch 5282 BLAKE2B 09f1e16689dcdebe53a71a76fd8eed50b2b57c5dc4f7bfc1884148cfbb4e1d24972b31745e0a19b04a74230532382245a00f7d81e37dd756a99cc7ac78a7c2e8 SHA512 302d45f59f9165771ae766d1a3e085995056c515fc1ae8a61341b44afe7b903f85a2ac5a7dd68d3b9f1944a6d102d63d1fd9aded5d2c916e70affec5d43b766a -AUX nagios-core-4.3.1-fix-upstream-issue-337.patch 810 BLAKE2B 65d75d238c00fbafb260fac8d98264b9c5975eeee3d13646b7b19d7930c6afd5b6d12497c2b1f96a5774f5e7a1f57e3363a899dd4752c8558ff7da84066c52e0 SHA512 67c4c8efe0df27e83cf8108bd43fc6d4cc9b75b531761cd9e17794965d9fed27593897f8ab2b8569e3980abd9b52b26c1edacfed90fae1134b3bf3526a39228f -AUX nagios3 1208 BLAKE2B fa158d417bb48e6f85a88f7498c1b354df39a23d072eb66e8fd170249e2841eb87edfff3f795dbbcf29041ee3784266b3547b2b9656ad169d2f716d57a8e611e SHA512 92ed5cc52440c622af1e9346177dfd22167d2ebffbe00a24c2661d29de7dbf153f9a27143f29f7c42fb1a727b2bbb3dea0806a6adf1e1def7e010c3d7a9a5e75 -AUX nagios4-r1 1077 BLAKE2B 30ac1de0872caae1540c1c976c24d8964de3a3c2f9e5cba2314d95420494856b644d6c9bcb1ff76e63b8c76d34156afa740af9cfce8708fc53e3ba08906ba957 SHA512 91955f947b7bc70ba330bc541ea8770fafd7f4f77fbc1e08c2838029c7fbac6610adafc14afff01261d3d294cd8649456b78d2a940a87baa47808dace9ca3cc6 -DIST nagios-3.5.1.tar.gz 1763584 BLAKE2B e0391c906e11aec18a07bc8627ed47892f69415f5f777ab6ecf2f08f7486b1b71efc3687547665b5cf62eb9f477084d7fc58344e7e5754d1bea32be3a916779e SHA512 48e2ecb91002b08203937b12a438c87c62cd3c5c401a0ed9e861cd6d79074c7017ed373e9379f013d87dea1fd7cb8e3d85112d55c87ac91aed96b256868c112d -DIST nagios-4.3.1.tar.gz 11095797 BLAKE2B 46c7ca25b7277dc1b114b08fba6eece6d841ea8bd2a499428f1b8637ae547a4990a66b4ab7feb7137d9bc4249a9fb73238f37145da76d98be7591abe0d87b4eb SHA512 d5f1919e2b32b0b2f4c5766367f0992fcf9b1f6766f4d3386e15e318cc1f57cdae6bc07f09464fd8212bef1713948fcb25d233eab588438036f996b6c479c97e DIST nagios-4.3.3.tar.gz 11101531 BLAKE2B 537d49ecf28b457fbc1e24eaaa9c5d9e8c4db59ed69c91a573c0cacb6cfb6fd2d52c31e87c0cef34b81a69247bb5b9513983d95e7eae3ea7f861742da485d2d4 SHA512 588292a95342cb2d95d7b58f70442b82b99a23dd9fdc1390e9ae0743626a047e5127d77b1d7e6a1d8edd6f34a425e581bcd42459b673a0ddea14125bde4b7d9e DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820 SHA512 f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766 -EBUILD nagios-core-3.5.1.ebuild 6155 BLAKE2B fd6eb2d5bda94625f5f5b265d8e99e5e1cd802e94deaa04b3c1d4acba13d37c49dff07780aaa47ecf50073643b32dabcceb8d86b2eb71c1a1577c9e0304b7f79 SHA512 54259b2f4ba0251c92441a3fb7bd686a66c31d0abe6368c04d7d1c764089f004e2911534ccf2b005d687815f6d60307b9e97209c044db7c5c7adcea164a9f28c -EBUILD nagios-core-4.3.1-r1.ebuild 7580 BLAKE2B 0ae2c990bdbbc08df278b40027763868bc88497d7462b57560558ec2e3bc04df9ece62358390b0ee510d7414f9bc20051a5124bee03804d1e3bbf65f279b8d1d SHA512 c9ac60fa3010434f409a5f889046546c8d6132652eb2a6bb9f89ada7d01447b79f130c1e529d88256636bc7ee45307489b2684532d4c0156a021d3dcae3b1d3b EBUILD nagios-core-4.3.3.ebuild 7467 BLAKE2B f337eabcfbd918295f437ec735917fda59e0695ee2a6800eea4a15d9f49b1fb63ee135498c8556c0c1a545f7ff0f0141abfb2080a605f19928a5036cac1fdfac SHA512 250b84f3b417756fbb9034af2a909c94c7c2ec7e1539f66590f84b4ff3735314d403b8b6496880c9e0aee2f4052dd7d7829779d1fc4ae78e01f53449abe206ab EBUILD nagios-core-4.3.4.ebuild 6644 BLAKE2B 74ea9541876cb35aafbae6721c096e572200b8aa0975b9867ea535a6878d4786c4d552c1f08263a5e5ef2c534b562223726dc248499a793f3a86acf29deb58e5 SHA512 7e51585249db59f040033e22ec2043dbae6cc6e96117f87ded0a4ce4049b4dcf6bdc10d597233f3d5fec95ec60842bdb98f3bf354665d9f4c1ef4ab27cd038e2 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b diff --git a/net-analyzer/nagios-core/files/99_nagios3.conf b/net-analyzer/nagios-core/files/99_nagios3.conf deleted file mode 100644 index 074f9ce5e4a9..000000000000 --- a/net-analyzer/nagios-core/files/99_nagios3.conf +++ /dev/null @@ -1,15 +0,0 @@ -<IfDefine NAGIOS> - ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/ - <Directory "/usr/lib/nagios/cgi-bin/"> - AllowOverride AuthConfig - Options ExecCGI - Order allow,deny - Allow from all - </Directory> - Alias /nagios /usr/share/nagios/htdocs - <Directory "/usr/share/nagios/htdocs"> - AllowOverride AuthConfig - Order allow,deny - Allow from all - </Directory> -</IfDefine> diff --git a/net-analyzer/nagios-core/files/conf.d b/net-analyzer/nagios-core/files/conf.d deleted file mode 100644 index 68c7370c887c..000000000000 --- a/net-analyzer/nagios-core/files/conf.d +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# 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/nagios-core/files/lighttpd_nagios3-r1.conf b/net-analyzer/nagios-core/files/lighttpd_nagios3-r1.conf deleted file mode 100644 index 6e2577029aca..000000000000 --- a/net-analyzer/nagios-core/files/lighttpd_nagios3-r1.conf +++ /dev/null @@ -1,24 +0,0 @@ -server.modules += ("mod_cgi") -server.modules += ("mod_auth") -server.modules += ("mod_alias") - -auth.require += ( "/nagios" => - ( - "method" => "digest", - "realm" => "nagios", - "require" => "valid-user" - ) -) - -$HTTP["url"] =~ "^/nagios/cgi-bin/" { - dir-listing.activate = "disable" - cgi.assign = ( - ".pl" => "/usr/bin/perl", - ".cgi" => "" - ) -} - -alias.url += ( - "/nagios/cgi-bin" => "/usr/lib/nagios/cgi-bin", - "/nagios" => "/usr/share/nagios/htdocs" -) diff --git a/net-analyzer/nagios-core/files/nagios-core-3.5.1-process_cgivars.patch b/net-analyzer/nagios-core/files/nagios-core-3.5.1-process_cgivars.patch deleted file mode 100644 index 9d9536747794..000000000000 --- a/net-analyzer/nagios-core/files/nagios-core-3.5.1-process_cgivars.patch +++ /dev/null @@ -1,175 +0,0 @@ -commit d97e03f32741a7d851826b03ed73ff4c9612a866 -Author: Eric Stanley <estanley@nagios.com> -Date: Fri Dec 20 13:14:30 2013 -0600 - - CGIs: Fixed minor vulnerability where a custom query could crash the CGI. - - Most CGIs previously incremented the input variable counter twice when - it encountered a long key value. This could cause the CGI to read past - the end of the list of CGI variables. This commit removes the second - increment, removing the possibility of reading past the end of the list - of CGI variables. - -diff --git a/cgi/avail.c b/cgi/avail.c -index 76afd86..64eaadc 100644 ---- a/cgi/avail.c -+++ b/cgi/avail.c -@@ -1096,7 +1096,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - -diff --git a/cgi/cmd.c b/cgi/cmd.c -index fa6cf5a..50504eb 100644 ---- a/cgi/cmd.c -+++ b/cgi/cmd.c -@@ -311,7 +311,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - -diff --git a/cgi/config.c b/cgi/config.c -index f061b0f..3360e70 100644 ---- a/cgi/config.c -+++ b/cgi/config.c -@@ -344,7 +344,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - -diff --git a/cgi/extinfo.c b/cgi/extinfo.c -index 62a1b18..5113df4 100644 ---- a/cgi/extinfo.c -+++ b/cgi/extinfo.c -@@ -591,7 +591,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - -diff --git a/cgi/histogram.c b/cgi/histogram.c -index 4616541..f6934d0 100644 ---- a/cgi/histogram.c -+++ b/cgi/histogram.c -@@ -1060,7 +1060,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - -diff --git a/cgi/notifications.c b/cgi/notifications.c -index 8ba11c1..461ae84 100644 ---- a/cgi/notifications.c -+++ b/cgi/notifications.c -@@ -327,7 +327,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - -diff --git a/cgi/outages.c b/cgi/outages.c -index 426ede6..cb58dee 100644 ---- a/cgi/outages.c -+++ b/cgi/outages.c -@@ -225,7 +225,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - -diff --git a/cgi/status.c b/cgi/status.c -index 3253340..4ec1c92 100644 ---- a/cgi/status.c -+++ b/cgi/status.c -@@ -567,7 +567,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - -diff --git a/cgi/statusmap.c b/cgi/statusmap.c -index ea48368..2580ae5 100644 ---- a/cgi/statusmap.c -+++ b/cgi/statusmap.c -@@ -400,7 +400,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - -diff --git a/cgi/statuswml.c b/cgi/statuswml.c -index bd8cea2..d25abef 100644 ---- a/cgi/statuswml.c -+++ b/cgi/statuswml.c -@@ -226,8 +226,13 @@ int process_cgivars(void) { - - for(x = 0; variables[x] != NULL; x++) { - -+ /* do some basic length checking on the variable identifier to prevent buffer overflows */ -+ if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -+ continue; -+ } -+ - /* we found the hostgroup argument */ -- if(!strcmp(variables[x], "hostgroup")) { -+ else if(!strcmp(variables[x], "hostgroup")) { - display_type = DISPLAY_HOSTGROUP; - x++; - if(variables[x] == NULL) { -diff --git a/cgi/summary.c b/cgi/summary.c -index 126ce5e..749a02c 100644 ---- a/cgi/summary.c -+++ b/cgi/summary.c -@@ -725,7 +725,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - -diff --git a/cgi/trends.c b/cgi/trends.c -index b35c18e..895db01 100644 ---- a/cgi/trends.c -+++ b/cgi/trends.c -@@ -1263,7 +1263,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - -diff --git a/contrib/daemonchk.c b/contrib/daemonchk.c -index 78716e5..9bb6c4b 100644 ---- a/contrib/daemonchk.c -+++ b/contrib/daemonchk.c -@@ -174,7 +174,6 @@ static int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - } diff --git a/net-analyzer/nagios-core/files/nagios-core-4.3.1-fix-upstream-issue-337.patch b/net-analyzer/nagios-core/files/nagios-core-4.3.1-fix-upstream-issue-337.patch deleted file mode 100644 index d5344a6442cb..000000000000 --- a/net-analyzer/nagios-core/files/nagios-core-4.3.1-fix-upstream-issue-337.patch +++ /dev/null @@ -1,21 +0,0 @@ -From e03e4fd470fbc8d4304d860d7b3b523c5d78373d Mon Sep 17 00:00:00 2001 -From: "John C. Frickson" <jfrickson@nagios.com> -Date: Thu, 2 Mar 2017 10:24:24 -0600 -Subject: [PATCH] every 15sec /var/log/messages is flooded with "nagios: - set_environment_var" - -Fix for https://github.com/NagiosEnterprises/nagioscore/issues/337 -diff --git a/base/utils.c b/base/utils.c -index 733fdef..19e20c7 100644 ---- a/base/utils.c -+++ b/base/utils.c -@@ -872,9 +872,6 @@ int set_environment_var(char *name, char *value, int set) { - - /* set the environment variable */ - if(set == TRUE) { -- log_debug_info(DEBUGL_EVENTS, 0, "set_environment_var '%s'='%s'\n", name, value); -- syslog(LOG_DAEMON|LOG_INFO, "set_environment_var '%s'='%s'\n", name, value); -- - #ifdef HAVE_SETENV - setenv(name, (value == NULL) ? "" : value, 1); - #else diff --git a/net-analyzer/nagios-core/files/nagios3 b/net-analyzer/nagios-core/files/nagios3 deleted file mode 100644 index 9b9049362277..000000000000 --- a/net-analyzer/nagios-core/files/nagios3 +++ /dev/null @@ -1,52 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_commands="checkconfig" -extra_started_commands="reload" - -nagios_config="/etc/nagios/nagios.cfg" -nagios_cmdfile="/var/nagios/rw/nagios.cmd" - -command="/usr/sbin/nagios" -command_args="-d ${nagios_config}" -pidfile="/var/nagios/nagios.lock" -start_stop_daemon_args="-e HOME=/var/nagios/home" - -depend() { - need net - use dns logger firewall - after mysql postgresql -} - -reload() -{ - checkconfig || return 1 - ebegin "Reloading configuration" - start-stop-daemon --signal HUP --pidfile ${pidfile} - eend $? -} - -checkconfig() { - ebegin "Verifying config files" - - # Silent Check - /usr/sbin/nagios -v ${nagios_config} &>/dev/null && return 0 - - # Now we know there's problem - run again and display errors - /usr/sbin/nagios -v ${nagios_config} - eend $? "Configuration Error. Please fix your configfile" -} - -start_pre() { - checkconfig || return 1 - - touch /var/nagios/nagios.log /var/nagios/status.sav - chown nagios:nagios /var/nagios/nagios.log /var/nagios/status.sav - rm -f ${nagios_cmdfile} -} - -stop_post() { - rm -f /var/nagios/status.log /var/nagios/nagios.tmp ${pidfile} \ - ${nagios_cmdfile} -} diff --git a/net-analyzer/nagios-core/files/nagios4-r1 b/net-analyzer/nagios-core/files/nagios4-r1 deleted file mode 100644 index 6309fcf06706..000000000000 --- a/net-analyzer/nagios-core/files/nagios4-r1 +++ /dev/null @@ -1,45 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_commands="checkconfig" -extra_started_commands="reload" - -nagios_config="/etc/nagios/nagios.cfg" - -command="/usr/sbin/nagios" -command_args="-d ${nagios_config}" -pidfile="/var/nagios/nagios.lock" -start_stop_daemon_args="-e HOME=/var/nagios/home" - -depend(){ - need net - use dns logger firewall - after mysql postgresql -} - -reload(){ - checkconfig || return 1 - ebegin "Reloading configuration" - start-stop-daemon --signal HUP --pidfile ${pidfile} - eend $? -} - -checkconfig(){ - ebegin "Verifying config files" - - # Silent Check - ${command} -v ${nagios_config} > /dev/null 2>&1 && return 0 - - # Now we know there's a problem. Run the check again and - # this time, display the errors. - ${command} -v ${nagios_config} - eend $? "Configuration Error. Please fix your config file." -} - -start_pre() { - # Without this, the "start" action will appear to succeed even - # when the config file contains errors and the daemon failed to - # start. - checkconfig || return 1 -} diff --git a/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild b/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild deleted file mode 100644 index 06ad6320317a..000000000000 --- a/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit depend.apache eutils multilib toolchain-funcs user - -MY_P=${PN/-core}-${PV} -DESCRIPTION="Nagios Core - Check daemon, CGIs, docs" -HOMEPAGE="https://www.nagios.org/" -SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86" -IUSE="debug lighttpd perl +web vim-syntax" -DEPEND="virtual/mailx - web? ( - >=media-libs/gd-1.8.3-r5[jpeg,png] - lighttpd? ( www-servers/lighttpd dev-lang/php[cgi] ) - apache2? ( || ( dev-lang/php[apache2] dev-lang/php[cgi] ) ) - ) - perl? ( >=dev-lang/perl-5.6.1-r7:= )" -RDEPEND="${DEPEND} - !net-analyzer/nagios-imagepack - vim-syntax? ( app-vim/nagios-syntax )" - -want_apache2 - -S="${WORKDIR}/${PN/-core}" - -pkg_setup() { - depend.apache_pkg_setup - - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-3.5.1-process_cgivars.patch" - local strip="$(echo '$(MAKE) strip-post-install')" - sed -i -e "s:${strip}::" {cgi,base}/Makefile.in || die "sed failed in Makefile.in" -} - -src_configure() { - local myconf - - if use perl ; then - myconf="${myconf} --enable-embedded-perl --with-perlcache" - fi - - if use debug; then - myconf="${myconf} --enable-DEBUG0" - myconf="${myconf} --enable-DEBUG1" - myconf="${myconf} --enable-DEBUG2" - myconf="${myconf} --enable-DEBUG3" - myconf="${myconf} --enable-DEBUG4" - myconf="${myconf} --enable-DEBUG5" - 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 CGI's if "web" useflag is set. - emake CC=$(tc-getCC) DESTDIR="${D}" cgis - fi -} - -src_install() { - dodoc Changelog INSTALLING LEGAL README UPGRADING - - if ! use web ; then - sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due missing web use flag/' \ - -e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due missing web use flag/' \ - -e 's/$(MAKE) install-exfoliation/# line removed due missing web use flag/' \ - Makefile - fi - - sed -i -e 's/^contactgroups$//g' Makefile - - emake DESTDIR="${D}" install - emake DESTDIR="${D}" install-config - emake DESTDIR="${D}" install-commandmode - if use web; then - emake DESTDIR="${D}" install-classicui - fi - - newinitd "${FILESDIR}"/nagios3 nagios - newconfd "${FILESDIR}"/conf.d nagios - - # Apache Module - if use web ; then - if use apache2 ; then - insinto "${APACHE_MODULES_CONFDIR}" - doins "${FILESDIR}"/99_nagios3.conf - elif use lighttpd ; then - insinto /etc/lighttpd - newins "${FILESDIR}/lighttpd_nagios3-r1.conf" nagios.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 - - fi - - for dir in etc/nagios var/nagios ; do - chown -R nagios:nagios "${D}/${dir}" || die "Failed chown of ${D}/${dir}" - done - - dosbin p1.pl - - chown -R root:root "${D}"/usr/$(get_libdir)/nagios - find "${D}"/usr/$(get_libdir)/nagios -type d -print0 | xargs -0 chmod 755 - find "${D}"/usr/$(get_libdir)/nagios/cgi-bin -type f -print0 | xargs -0 chmod 755 - - keepdir /etc/nagios - keepdir /var/nagios - keepdir /var/nagios/archives - keepdir /var/nagios/rw - keepdir /var/nagios/spool/checkresults - - if use !apache2 && use !lighttpd; then - chown -R nagios:nagios "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw" - else - if use apache2 ; then - chown -R nagios:apache "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw" - elif use lighttpd ; then - chown -R nagios:lighttpd "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw" - fi - fi - - chmod ug+s "${D}"/var/nagios/rw || die "Failed Chmod of ${D}/var/nagios/rw" - chmod 0750 "${D}"/etc/nagios || die "Failed chmod of ${D}/etc/nagios" -} - -pkg_postinst() { - elog "If you want nagios to start at boot time" - elog "remember to execute:" - elog " rc-update add nagios default" - elog - - if use web ; then - elog "This does not include cgis that are perl-dependent" - elog "Currently traceroute.cgi is perl-dependent" - elog "To have ministatus.cgi requires copying of ministatus.c" - elog "to cgi directory for compiling." - - elog "Note that the user your webserver is running at needs" - elog "read-access to /etc/nagios." - 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 nagios apache" - elog "or" - elog " chown nagios:apache /etc/nagios" - elog - elog "Also edit /etc/conf.d/apache2 and add \"-D NAGIOS\"" - elif use lighttpd ; then - elog " usermod -G nagios lighttpd " - elog "or" - elog " chown nagios:lighttpd /etc/nagios" - fi - elog - elog "That will make nagios's web front end visable via" - elog "http://localhost/nagios/" - elog - else - elog "IMPORTANT: Do not forget to add the user your webserver" - elog "is running as to the nagios group!" - fi - - else - elog "Please note that you have installed Nagios without web interface." - elog "Please don't file any bugs about having no web interface when you do this." - elog "Thank you!" - 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 -} - -pkg_postinst() { - einfo "Fixing permissions" - chown nagios:nagios "${ROOT}"var/nagios -} diff --git a/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild deleted file mode 100644 index 7e952737c4d0..000000000000 --- a/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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 hppa 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}" - -PATCHES=( "${FILESDIR}"/${PN}-4.3.1-fix-upstream-issue-337.patch ) - -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 INSTALLING LEGAL README.asciidoc UPGRADING - - emake DESTDIR="${D}" install-base - emake DESTDIR="${D}" install-basic - emake DESTDIR="${D}" install-config - emake DESTDIR="${D}" install-commandmode - - if use web; then - emake DESTDIR="${D}" install-cgis - - # install-html installs the new exfoliation theme - emake DESTDIR="${D}" install-html - - if use classicui; then - # This overwrites the already-installed exfoliation theme - emake 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. - insopts --group=nagios --owner=nagios --mode=0664 - insinto /usr/share/nagios/htdocs/images/logos - doins "${WORKDIR}/${GENTOO_ICONS}"/*.* - insopts --mode=0644 # Back to the default... - fi - - newinitd "${FILESDIR}"/nagios4-r1 nagios - newconfd "${FILESDIR}"/conf.d 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 - - for dir in etc/nagios var/nagios ; do - chown -R nagios:nagios "${D}/${dir}" \ - || die "failed chown of ${D}/${dir}" - done - - chown -R root:root "${D}/usr/$(get_libdir)/nagios" \ - || die "failed chown of ${D}/usr/$(get_libdir)/nagios" - - # The following two find...exec statements will die properly as long - # as chmod is only called once (that is, as long as the argument - # list is small enough). - find "${D}/usr/$(get_libdir)/nagios" -type d \ - -exec chmod 755 '{}' + || die 'failed to make nagios dirs traversable' - - if use web; then - find "${D}/usr/$(get_libdir)/nagios/cgi-bin" -type f \ - -exec chmod 755 '{}' + || die 'failed to make cgi-bins executable' - fi - - keepdir /etc/nagios - keepdir /var/nagios - keepdir /var/nagios/archives - keepdir /var/nagios/rw - keepdir /var/nagios/spool/checkresults - - if use !apache2 && use !lighttpd; then - chown -R nagios:nagios "${D}"/var/nagios/rw \ - || die "failed chown of ${D}/var/nagios/rw" - else - if use apache2 ; then - chown -R nagios:apache "${D}"/var/nagios/rw \ - || die "failed chown of ${D}/var/nagios/rw" - elif use lighttpd ; then - chown -R nagios:lighttpd "${D}"/var/nagios/rw \ - || die "failed chown of ${D}/var/nagios/rw" - fi - fi - - chmod ug+s "${D}"/var/nagios/rw || die "failed chmod of ${D}/var/nagios/rw" - chmod 0750 "${D}"/etc/nagios || die "failed chmod of ${D}/etc/nagios" -} - -pkg_postinst() { - - if use web; then - elog "Note that your web server user requires read-only access to" - elog "${ROOT}etc/nagios." - - if use apache2 || use lighttpd ; then - elog - elog "To that end, we have changed the group of ${ROOT}etc/nagios" - elog "to that of your web server user." - elog - if use apache2; then - chown nagios:apache "${ROOT}etc/nagios" \ - || die "failed to change group of ${ROOT}etc/nagios" - - 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 - chown nagios:lighttpd "${ROOT}etc/nagios" \ - || die "failed to change group of ${ROOT}etc/nagios" - 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/" - else - elog "Since you're not using either Apache or Lighttpd, you" - elog "will have to grant the necessary permissions yourself." - 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-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest index 3539622d3c6a..c4bd449450d8 100644 --- a/net-analyzer/nagios-plugins/Manifest +++ b/net-analyzer/nagios-plugins/Manifest @@ -2,5 +2,5 @@ AUX define-own-mysql-port-constant.patch 3271 BLAKE2B a9776567af41b106616c10aac0 DIST nagios-plugins-2.0.3.tar.gz 2659772 BLAKE2B d4deccf04458daccde5fbe7e6c659282d36fec69096e6b1b8487455db0089f7a5073ce14ef6a74f82869de08ad740b0d3b617d691c85b8895e475302152ca33c SHA512 2753e6f3fc7433a5583fee01e63a65b9ea74155964f2b6e6bf3458e56cb29ea5dbd020f83816044a717b66d6548d203b3a082fba0faedcd629c7a8457bc19b36 DIST nagios-plugins-2.2.1.tar.gz 2728818 BLAKE2B ea89862935491d9c31403a36712d39557fa8e90dc2306e027531e974933cd13cc6b55ebfdd7dfc7541d6458741aaf57714df57fdddc92049001a59f0ffb6413a SHA512 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3 EBUILD nagios-plugins-2.0.3-r2.ebuild 2828 BLAKE2B 2581655bd322f74c6253811b6a10de420c5f1c90677d87d5f344f4939d45b00d394fe8b026b44ed9bf76024d18ef67d4f7ab222e6fa75e72d88e7c4f44eae94a SHA512 cabe19f142006c4d104721361c2c58fc7a103717041050a21bc21b47adb6702bf05c77f1ed8b063f74b11a59a2dd1120d8478e5b1d803636aeb9f1ae92c2ae91 -EBUILD nagios-plugins-2.2.1-r2.ebuild 3110 BLAKE2B 5512dffd00d20b21b2add22ab17dedc2168025266ad3a33a0e3cd49d86203f493dc7d4e8aeb1f81438257ec4e2f005c21751723279bbcf7a2fa34dac22fc6358 SHA512 cf4f79dbc8ef0e28d3b93894e25e2853020ecb0079432372eb34e5770dec389d2ffc2bd2b9fdaef71617c2562e83f1417ce052a2e89d7e0d66b4bcfd92d7aea8 +EBUILD nagios-plugins-2.2.1-r2.ebuild 3109 BLAKE2B fb9958b01df2993cf3f2f95c50996f94b30e9238a39e116dd857255c60bb4d516781171041d8070a50ffc7526766d24b0331c4f93302d875e17775043b4f84ab SHA512 a7080b7c27013958a97a9125ba11bfa93be6402dbe8a8667b80f236bf3364e994b44815bb6ace6e24e08a0f9c0f90f96f47ca2d71403152c444b4b5afd064249 MISC metadata.xml 1430 BLAKE2B 63a889dc51085a41a5dec4b6c32e6262ff59fdb1413699736d6332a75406749551b1c82d62a2662f4d7935c46a4bc3b51e0ca7e3b070656163fb0b6fc69c742e SHA512 d6cbc6820de52e1ed471b97a6c592af72474db492204594314eebb656b8abe89a01667a7bbb621418fd393aeacb28e9a10c5749de7ace67dd15119f701019e72 diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild index bf726cb7c1fb..70bc775d0c45 100644 --- a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild +++ b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc ~x86" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86" IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl" # Most of the plugins use automagic dependencies, i.e. the plugin will diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest index 8b6d45d11424..7ea8c5d21cec 100644 --- a/net-analyzer/nagios/Manifest +++ b/net-analyzer/nagios/Manifest @@ -1,4 +1,3 @@ -EBUILD nagios-4.3.1.ebuild 393 BLAKE2B 9698b8a0efcd6930c84611cb9aee6a792dc1555922f93ddd62f546a966cec83e4d03e7b7a4bd18ceb10de91e58fb4dae04f0514be0ca94247059848c95616383 SHA512 d5cb30f16a97bbd59154223e4dbf62bf98d6c2e03d5021bc8f3ed9c11c8a1bc25b0391d1809a5cbb8b2345ce7c5ae88afb3f3c8473c09bee0bec46da5a52639a EBUILD nagios-4.3.3.ebuild 393 BLAKE2B 9698b8a0efcd6930c84611cb9aee6a792dc1555922f93ddd62f546a966cec83e4d03e7b7a4bd18ceb10de91e58fb4dae04f0514be0ca94247059848c95616383 SHA512 d5cb30f16a97bbd59154223e4dbf62bf98d6c2e03d5021bc8f3ed9c11c8a1bc25b0391d1809a5cbb8b2345ce7c5ae88afb3f3c8473c09bee0bec46da5a52639a EBUILD nagios-4.3.4.ebuild 400 BLAKE2B fbd1d3c6d07c27bae1f9ebe45385f5c02797e85c557b1ea2276de7a211cb0afe4edb7589e6b492d466daa66906cf14ce4cb73fccdd3915ce99a4f861a1d24e01 SHA512 e766f3e115adb6e8c1ad8e490b107d8dfc1d8125e7290ce854332198f49d9d2cf0ee7adc5c9091250b8ca2357dc1f48e875fe31e7f0b811b4e631e79cc1efb93 MISC metadata.xml 1110 BLAKE2B a3577be74f7ae7da47c1add86da6b9cd2972ebea1e4e4241886027e7c4aecb936ffa776a32bcc0b77498c393ebb4c81aa9a98a3c8d45cbd5556f8b9014384e52 SHA512 7614b25879899b4939a136de6cd4cbd3995372747e95d2d6b90ccd8e074800b6acb738df5f9c852625c34f5a72c3072c0dec910266068ec8a72184f75aa204e1 diff --git a/net-analyzer/nagios/nagios-4.3.1.ebuild b/net-analyzer/nagios/nagios-4.3.1.ebuild deleted file mode 100644 index 2c40afdab198..000000000000 --- a/net-analyzer/nagios/nagios-4.3.1.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest index 02f8a24218ce..296aea8be541 100644 --- a/net-analyzer/pnp4nagios/Manifest +++ b/net-analyzer/pnp4nagios/Manifest @@ -1,16 +1,6 @@ AUX 98_pnp4nagios-2.4.conf 725 BLAKE2B ca04f13ad57a90d339980566008d7176aed8be5def8ddb1d4e55ed9ef846900f690ca9bcf37893d73c559c8dea625a027966407f9b87c9ea474447dad9d61314 SHA512 9698529decd9587b4c48dfd5a92069645d4a8fb0796f05fea104459bc4a58aab081f10fc110d75e97331ec960e5fef71a85745c3ea58c6b9f6c37bcec4143000 -AUX 98_pnp4nagios.conf 1025 BLAKE2B ed7df45632b47395c0020ab8578cd9dccbf28cfffab430ff241b0a13e7f8f4ffefa80bd9bcfacbd20ddf27f0ac71251d709d66cf5e1d66aabf6be156335935e0 SHA512 ac7f4cd92951e856c5af44eb8cfa0c75a867364b6d3d76ed5fb2479631f9ae20587f2d0a09ff4810602665558210232ab41ce6abf53859884a956826cbb5bfc2 -AUX npcd 647 BLAKE2B 4e62fa54c2aac0eed23f5c8e81d831d03534e082a950ec374dae0c906a215893242bd0b9fae80b34d644a5f4069f55e069c9cad3d0a6d7573d61e67f89d21db6 SHA512 44facf1300e151f085851e5dfb67e2d67cccc3e9fd9169b15a160af78e02dfbb5e8720b4a63ad4ee61a5aedcdc86cd75520c2f5b0fce26a631d4a38b464af89f AUX npcd.initd 364 BLAKE2B b985e4951f95807f4d1d887cfe4f65780150ec827cbe6995e24a955290ce040c263c5848773f24c4ab8e05f5d78ab34693a3636bc8837aae8ef718e64f5c4e3c SHA512 efbf969865ce8f61a733ea0f0e3846854231b55d148dbf0121b4cf6022fedd94cb1ea8f717920f38aedddd6a8f33edf473f139599dc01cc2da14eedb80f7f4f2 AUX pnp4nagios-0.6.14-makefile.patch 1057 BLAKE2B 623115771d66839df357cf19ceb0eac9600cac220cb77b77638c76ac1a5a419b7dd83145192779cfeb845a122729728bccd7cc069de1a4da51180aabbff1b91c SHA512 a67e4b66b0f24db25f9b67d982d99a90c20ad229d404537c9963b2e9f1c5df39a46faa34ecdeb1a9e69b46efd96104d97a39a7e326a01d1c2d09dcc149171602 -AUX pnp4nagios-0.6.25-rrdtool-0.6.0-support.patch 3578 BLAKE2B d452715960cbf2418d394d13a547177462cc97d30e19e7adfc9ba83e64d511efe6231a1020f2a4ed943ec10aa1e5cc97679a23d88c7ef0eae9a2fa5c5d71f800 SHA512 a0a5c57808b59b748c7d8cb3febe1b4f29fce1e37abe546ae65b4037da330f580b90f155f7c179f7ae8ddcc8d25d5e595d8e6d5699738531f22dfab40e5cfc84 -DIST pnp4nagios-0.6.24.tar.gz 2919182 BLAKE2B 95f2e00182e8fcce7bb17c56d0900def9c7a99c7f709983a906465a3033807fc673de64d2312f61446247b34a2bb56a06972fad225b7929ed87250abece7bb47 SHA512 7e8c32e0ac69ab747a57e8ab6cc59fddfb63e16598fda9c1e6270d6309ff0885cd1bd0876d05aa1d30bffa76b281d41dc8fbe59e430778bf4d3bdddc4a7bee9f -DIST pnp4nagios-0.6.25.tar.gz 2921068 BLAKE2B 9497af2e5d2ffc24685f0cae6e3ab6b912765cb246b22dac2c93a196ebf13fce0909fcd4a1d94438ca986808168416f54ade97972d278a64d069d38fff8ebbb8 SHA512 e561fcac8243e6b1ab401312b4a05a6c752e2869da7366a22e4e48d54ae1e9c17c52cb2dffb1ca5748179f3bc856f779317196992643e9862eb09c4debf277c8 DIST pnp4nagios-0.6.26.tar.gz 3039265 BLAKE2B 1adb3c41222e6bc93671af955a1564387d77901ce118f5d309d101d88c691140e0feef1c2594bc5db44706ff01505a4fcf99b79b6a0c5b5cb923838dd00f1ff0 SHA512 caf6dcced74967174d9e6f09dd1a5bee17397c10a68d0f577c37dcc836f928d78c20d75a0189539e9ffa93715ab7b6e732e9f36b9698cf4dd9c09cfb65184427 -EBUILD pnp4nagios-0.6.24.ebuild 1970 BLAKE2B f186f42c32e1f5e767c8e9de01c94d9d1b3c320c89577b90a4901dad29800b67027f441329876d9d453fe88697322b060685054681fef9c6a181f99d3325bad3 SHA512 248b5f4ff3bbaa3d2dd71ae1efbb5a65e1926ca709034e2e3d4c62966608f9e83c6136ed0be63586c5dbd4b1d5e0f56705ccd68ccefaeb9d420d89f8bd26fd02 -EBUILD pnp4nagios-0.6.25-r1.ebuild 2906 BLAKE2B 06c491fcc0b3396f8c118bfc136009d5854f14bcd8bb14246f911036271071f2b1e5ca6c3b87a2a05c2d1b4b4b9c55080863eaf083f22c2a93a858f1a45f3656 SHA512 f1c56eba7c88eb6359f50f637f871cedd22f74134522ba0b2e0de355411c4322f013fe438503b366986962072ba168ac4d015145b10aa6893b3999b6776707c5 -EBUILD pnp4nagios-0.6.25-r2.ebuild 2995 BLAKE2B 23f45b9bc7dbd7d6093fe70d5e070921aa134b8b73c670e1efc70e7156f87d13e2f1e15a9f76221e48f666be8cb436f33b906fd6efb73a2cd9ea5a99f320a94c SHA512 142625f3438c605aab45689b2965bdce80d905680a23f3fb40ffc1bb0b0487842235d28493df0042616341a8e93ee3ee79b70361502f2cd5b85d594d5400f447 -EBUILD pnp4nagios-0.6.25-r3.ebuild 2868 BLAKE2B bd9740058486234cfc4ae2f3452df23469b67011cf97e68289822b4448189d2f09560c4cb54548789485fcacf7a87a395757c3fa675491103e0c0628dae83680 SHA512 45b01c76de8002a28e804895d55e2fbeb5f5dac61a0f6dd5314b60ac0113f76007f58d4c586b7d3fd19ab8a54e544d64f76b4d3f0c6837dd83544a0868521ff0 -EBUILD pnp4nagios-0.6.25.ebuild 2909 BLAKE2B 048c5c1bccd6e87586a292ce249ce3143e79b13d341c0a95aaa37e8731a8698826391c1df61dcfa5cda9656201dbeab78393e4ca05f66aa900b2c3f1bec077ae SHA512 79633a38ff8bb00563edcd3ab5b1cad51f104eb696de227599fd4a6dc51fd0d9e5a7fe8c610c72f49bdf4c223834efe47b9456a19f1ad6c5706fb3a905285ae3 EBUILD pnp4nagios-0.6.26-r9.ebuild 3101 BLAKE2B d4c6461563e1dd89223f8684f03c7d093b32846777238e15c8dd2aeff3ee5ab293f5f1ef968cfe229f11f25f2e9e6a3381244c05f0d343ab65499d191466bc2c SHA512 670fb5974ea643834f1a14e8b92b01daf2feafcfdf7af82b3aef11dc918c773693a791475a52eea0af87a4cc40acb048960657114a0e7bb7541cb1ef4418071a MISC metadata.xml 716 BLAKE2B 571931c0525f50709ef759d13290bb5606ad311954ce10a8fa60a521cd1fd5d1917316ddc32231c2d16c07b2c0d6fc17c38a81b317e1ed4927645f1663b315ba SHA512 ad8ef6398f119ad3a0d51613fb67546ff9ec43b57825f1f251d27ea3feaf3fe2cb0029f30c179db9dba79f984e14a15926268868930910266f97671c8bea2a55 diff --git a/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf b/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf deleted file mode 100644 index 4879779a8f93..000000000000 --- a/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf +++ /dev/null @@ -1,22 +0,0 @@ -<IfDefine PNP> - Alias /pnp4nagios /usr/share/pnp/ - <Directory /usr/share/pnp> - AllowOverride AuthConfig - Order allow,deny - Allow from all - <IfModule mod_rewrite.c> - # Turn on URL rewriting - RewriteEngine On - Options FollowSymLinks - # Installation directory - RewriteBase /pnp4nagios - # Protect application and system files from being viewed - RewriteRule ^(application|modules|system) - [F,L] - # Allow any files or directories that exist to be displayed directly - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - # Rewrite all other URLs to index.php/URL - RewriteRule .* index.php/$0 [PT,L] - </IfModule> - </Directory> -</IfDefine> diff --git a/net-analyzer/pnp4nagios/files/npcd b/net-analyzer/pnp4nagios/files/npcd deleted file mode 100644 index 9ae67362d645..000000000000 --- a/net-analyzer/pnp4nagios/files/npcd +++ /dev/null @@ -1,36 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -opts="${opts} reload" - -depend() { - need net -} - -start() { - ebegin "Starting npcd" - start-stop-daemon --start --exec /usr/bin/npcd \ - -- -f /etc/pnp/npcd.cfg \ - -d - eend $? "Failed to Start npcd" -} - -stop() { - ebegin "Stopping npcd" - start-stop-daemon --stop --quiet -n npcd - eend $? "Failed to Stop npcd" -} - -reload() { - ebegin "Reloading npcd" - kill -HUP `pgrep npcd` - eend $? "Failed to reload npcd" -} - -restart() { - ebegin "Restarting npcd" - svc_stop - svc_start - eend $? "Failed to Restart npcd" -} diff --git a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.25-rrdtool-0.6.0-support.patch b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.25-rrdtool-0.6.0-support.patch deleted file mode 100644 index 1a16d771c7b3..000000000000 --- a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.25-rrdtool-0.6.0-support.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 0a539e1c7ab03ec015c27e4ad0fe16343a98c269 Mon Sep 17 00:00:00 2001 -From: Louis Sautier <sautier.louis@gmail.com> -Date: Mon, 25 Apr 2016 12:31:49 +0200 -Subject: [PATCH] Use complete option arguments for compatibility with rrdtool - 1.6.0 - -Since rrdtool switched to optparse, it seems that complete option -arguments must be used: -https://github.com/oetiker/rrdtool-1.x/commit/83530d3e43cebc32da157733d35c60bf4bb098da ---- - share/pnp/templates.dist/check_dns.php | 2 +- - share/pnp/templates.dist/check_multi.php | 2 +- - share/pnp/templates.dist/check_ping_tick.php | 2 +- - share/pnp/templates.dist/check_users.php | 2 +- - share/pnp/templates.dist/default.php | 6 +++--- - 5 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/share/pnp/templates.dist/check_dns.php b/share/pnp/templates.dist/check_dns.php -index b8ab048..dad209a 100644 ---- a/share/pnp/templates.dist/check_dns.php -+++ b/share/pnp/templates.dist/check_dns.php -@@ -4,7 +4,7 @@ - # Template for check_dns - # - --$opt[1] = "--lower=$MIN[1] --vertical-label $UNIT[1] --title \"DNS Response Time\" "; -+$opt[1] = "--lower-limit=$MIN[1] --vertical-label $UNIT[1] --title \"DNS Response Time\" "; - - - $def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:AVERAGE " ; -diff --git a/share/pnp/templates.dist/check_multi.php b/share/pnp/templates.dist/check_multi.php -index ba6bcd1..cd0794a 100644 ---- a/share/pnp/templates.dist/check_multi.php -+++ b/share/pnp/templates.dist/check_multi.php -@@ -4,7 +4,7 @@ - # Template for check_multi - # - --$opt[1] = "--lower=$MIN[1] --vertical-label num --title \"Number of Checks\" "; -+$opt[1] = "--lower-limit=$MIN[1] --vertical-label num --title \"Number of Checks\" "; - $ds_name[1] = "Executed Plugins"; - - $def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:AVERAGE " ; -diff --git a/share/pnp/templates.dist/check_ping_tick.php b/share/pnp/templates.dist/check_ping_tick.php -index 865479f..f191049 100644 ---- a/share/pnp/templates.dist/check_ping_tick.php -+++ b/share/pnp/templates.dist/check_ping_tick.php -@@ -6,7 +6,7 @@ - # RTA - # - $ds_name[1] = "Round Trip Times"; --$opt[1] = "--lower=0 --vertical-label \"RTA\" --title \"Ping times\" "; -+$opt[1] = "--lower-limit=0 --vertical-label \"RTA\" --title \"Ping times\" "; - $opt[1] .= rrd::darkteint(); - $def[1] = rrd::def("var1", $RRDFILE[1], $DS[1], "AVERAGE") ; - $def[1] .= rrd::ticker("var1", $WARN[1], $CRIT[1]) ; -diff --git a/share/pnp/templates.dist/check_users.php b/share/pnp/templates.dist/check_users.php -index 9fe878d..c66fc01 100644 ---- a/share/pnp/templates.dist/check_users.php -+++ b/share/pnp/templates.dist/check_users.php -@@ -4,7 +4,7 @@ - # Template for check_users - # - --$opt[1] = "--lower=$MIN[1] --vertical-label \"Users\" --title \"Users\" "; -+$opt[1] = "--lower-limit=$MIN[1] --vertical-label \"Users\" --title \"Users\" "; - - - $def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:MAX " ; -diff --git a/share/pnp/templates.dist/default.php b/share/pnp/templates.dist/default.php -index 6fdf38c..823ee6a 100644 ---- a/share/pnp/templates.dist/default.php -+++ b/share/pnp/templates.dist/default.php -@@ -47,7 +47,7 @@ - $crit_min = $VAL['CRIT_MIN']; - } - if ( $VAL['MIN'] != "" && is_numeric($VAL['MIN']) ) { -- $lower = " --lower=" . $VAL['MIN']; -+ $lower = " --lower-limit=" . $VAL['MIN']; - $minimum = $VAL['MIN']; - } - if ( $VAL['MAX'] != "" && is_numeric($VAL['MAX']) ) { -@@ -55,8 +55,8 @@ - } - if ($VAL['UNIT'] == "%%") { - $vlabel = "%"; -- $upper = " --upper=101 "; -- $lower = " --lower=0 "; -+ $upper = " --upper-limit=101 "; -+ $lower = " --lower-limit=0 "; - } - else { - $vlabel = $VAL['UNIT']; diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild deleted file mode 100644 index 7a79e5d51e9a..000000000000 --- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit depend.apache eutils - -DESCRIPTION="A performance data analyzer for nagios" -HOMEPAGE="http://www.pnp4nagios.org" -SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" -KEYWORDS="amd64 ppc ppc64 ~sparc x86" - -DEPEND=" - dev-lang/php[json,simplexml,zlib,xml,filter] - >=dev-lang/php-5.3 - >=net-analyzer/rrdtool-1.2[graph,perl] - || ( net-analyzer/nagios-core net-analyzer/icinga net-analyzer/icinga2 )" -RDEPEND="${DEPEND} - virtual/perl-Getopt-Long - virtual/perl-Time-HiRes - media-fonts/dejavu - apache2? ( www-servers/apache[apache2_modules_rewrite] )" - -want_apache2 - -pkg_setup() { - depend.apache_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.6.14-makefile.patch -} - -src_configure() { - local var_dir= - local user_group= - - if has_version net-analyzer/nagios-core; then - var_dir=/var/nagios/ - user_group=nagios - else - var_dir=/var/lib/icinga/ - user_group=icinga - fi - - econf \ - --sysconfdir=/etc/pnp \ - --datarootdir=/usr/share/pnp \ - --mandir=/usr/share/man \ - --with-perfdata-dir=${var_dir}/perfdata \ - --with-nagios-user=${user_group} \ - --with-nagios-group=${user_group} \ - --with-perfdata-logfile=${var_dir}/perfdata.log \ - --with-perfdata-spool-dir=/var/spool/pnp -} - -src_compile() { - # The default target just shows a help - emake all -} - -src_install() { - emake DESTDIR="${D}" install install-config - newinitd "${FILESDIR}"/npcd.initd npcd - rm "${D}"/usr/share/pnp/install.php || die - - if use apache2 ; then - insinto "${APACHE_MODULES_CONFDIR}" - doins "${FILESDIR}"/98_pnp4nagios.conf - fi - - # Bug 430358 - CVE-2012-3457 - find "${D}/etc/pnp" -type f -exec chmod 0640 {} \; || die - find "${D}/etc/pnp" -type d -exec chmod 0750 {} \; || die -} - -pkg_postinst() { - elog "Please make sure to enable URL rewriting in Apache or any other" - elog "webserver you're using, to get pnp4nagios running!" -} diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r1.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r1.ebuild deleted file mode 100644 index ea74516d0c55..000000000000 --- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit depend.apache eutils - -DESCRIPTION="A performance data analyzer for nagios" -HOMEPAGE="http://www.pnp4nagios.org/" -SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" - -# A lot of things (sync mode, for one) are broken with nagios-4.x. -DEPEND=" - dev-lang/php:*[filter,gd,json,simplexml,xml,zlib] - >=net-analyzer/rrdtool-1.2[graph,perl] - || ( <net-analyzer/nagios-core-4 net-analyzer/icinga net-analyzer/icinga2 )" - -# A list of modules used in our Apache config file. -APACHE_MODS="apache2_modules_alias," # "Alias" directive -APACHE_MODS+="apache2_modules_authz_core," # "Require" directive -APACHE_MODS+="apache2_modules_rewrite" # "RewriteEngine" and friends - -RDEPEND="${DEPEND} - virtual/perl-Getopt-Long - virtual/perl-Time-HiRes - media-fonts/dejavu - apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )" - -# There is no want_apache2_4, but we needed to specify that manually -# anyway to be able to include the list of modules. -want_apache2 - -pkg_setup() { - depend.apache_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-0.6.14-makefile.patch" -} - -src_configure() { - local var_dir= - local user_group= - - if has_version net-analyzer/nagios-core; then - var_dir=/var/nagios/ - user_group=nagios - else - var_dir=/var/lib/icinga/ - user_group=icinga - fi - - econf \ - --sysconfdir=/etc/pnp \ - --datarootdir=/usr/share/pnp \ - --mandir=/usr/share/man \ - --with-perfdata-dir=${var_dir}/perfdata \ - --with-nagios-user=${user_group} \ - --with-nagios-group=${user_group} \ - --with-perfdata-logfile=${var_dir}/perfdata.log \ - --with-perfdata-spool-dir=/var/spool/pnp -} - -src_compile() { - # The default target just shows a help - emake all -} - -src_install() { - emake DESTDIR="${D}" install install-config - newinitd "${FILESDIR}"/npcd.initd npcd - rm "${D}/usr/share/pnp/install.php" || \ - die "unable to remove ${D}/usr/share/pnp/install.php" - - if use apache2 ; then - insinto "${APACHE_MODULES_CONFDIR}" - newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf - - # Allow the apache user to read our config files. This same - # approach is used in net-analyzer/nagios-core. - chgrp -R apache "${D}/etc/pnp" \ - || die "failed to change group of ${ROOT}etc/pnp" - fi - - # Bug 430358 - CVE-2012-3457 - find "${D}/etc/pnp" -type f -exec chmod 0640 '{}' + || \ - die "unable to set file permissions under ${D}/etc/pnp" - - find "${D}/etc/pnp" -type d -exec chmod 0750 '{}' + || \ - die "unable to set directory permissions under ${D}/etc/pnp" -} - -pkg_postinst() { - elog "To enable the pnp4nagios web front-end, please visit" - elog "${ROOT}etc/conf.d/apache2 and add \"-D PNP -D PHP5\"" - elog "to APACHE2_OPTS. Then pnp4nagios will be available at," - elog - elog " http://localhost/pnp4nagios" - elog -} diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild deleted file mode 100644 index 7630fe3e6f9b..000000000000 --- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit depend.apache eutils - -DESCRIPTION="A performance data analyzer for nagios" -HOMEPAGE="http://www.pnp4nagios.org/" -SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" -KEYWORDS="amd64 ppc ppc64 ~sparc x86" - -# A lot of things (sync mode, for one) are broken with nagios-4.x. -DEPEND=" - dev-lang/php:*[filter,gd,json,simplexml,xml,zlib] - >=net-analyzer/rrdtool-1.2[graph,perl] - || ( <net-analyzer/nagios-core-4 net-analyzer/icinga net-analyzer/icinga2 )" - -# A list of modules used in our Apache config file. -APACHE_MODS="apache2_modules_alias," # "Alias" directive -APACHE_MODS+="apache2_modules_authz_core," # "Require" directive -APACHE_MODS+="apache2_modules_rewrite" # "RewriteEngine" and friends - -RDEPEND="${DEPEND} - virtual/perl-Getopt-Long - virtual/perl-Time-HiRes - media-fonts/dejavu - apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )" - -# There is no want_apache2_4, but we needed to specify that manually -# anyway to be able to include the list of modules. -want_apache2 - -pkg_setup() { - depend.apache_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-0.6.14-makefile.patch" -} - -src_configure() { - local var_dir= - local user_group= - - if has_version net-analyzer/nagios-core; then - var_dir=/var/nagios/ - user_group=nagios - elif has_version net-analyzer/icinga2; then - var_dir=/var/lib/icinga2/ - user_group=icinga - else - var_dir=/var/lib/icinga/ - user_group=icinga - fi - - econf \ - --sysconfdir=/etc/pnp \ - --datarootdir=/usr/share/pnp \ - --mandir=/usr/share/man \ - --with-perfdata-dir=${var_dir}/perfdata \ - --with-nagios-user=${user_group} \ - --with-nagios-group=${user_group} \ - --with-perfdata-logfile=${var_dir}/perfdata.log \ - --with-perfdata-spool-dir=/var/spool/pnp -} - -src_compile() { - # The default target just shows a help - emake all -} - -src_install() { - emake DESTDIR="${D}" install install-config - newinitd "${FILESDIR}"/npcd.initd npcd - rm "${D}/usr/share/pnp/install.php" || \ - die "unable to remove ${D}/usr/share/pnp/install.php" - - if use apache2 ; then - insinto "${APACHE_MODULES_CONFDIR}" - newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf - - # Allow the apache user to read our config files. This same - # approach is used in net-analyzer/nagios-core. - chgrp -R apache "${D}/etc/pnp" \ - || die "failed to change group of ${ROOT}etc/pnp" - fi - - # Bug 430358 - CVE-2012-3457 - find "${D}/etc/pnp" -type f -exec chmod 0640 '{}' + || \ - die "unable to set file permissions under ${D}/etc/pnp" - - find "${D}/etc/pnp" -type d -exec chmod 0750 '{}' + || \ - die "unable to set directory permissions under ${D}/etc/pnp" -} - -pkg_postinst() { - elog "To enable the pnp4nagios web front-end, please visit" - elog "${ROOT}etc/conf.d/apache2 and add \"-D PNP -D PHP5\"" - elog "to APACHE2_OPTS. Then pnp4nagios will be available at," - elog - elog " http://localhost/pnp4nagios" - elog -} diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r3.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r3.ebuild deleted file mode 100644 index 2044e45a7e0d..000000000000 --- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r3.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A performance data analyzer for nagios" -HOMEPAGE="http://www.pnp4nagios.org/" -SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="apache2" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" - -# A lot of things (sync mode, for one) are broken with nagios-4.x. -DEPEND=" - dev-lang/php:*[filter,gd,json,simplexml,xml,zlib] - >=net-analyzer/rrdtool-1.2[graph,perl] - || ( <net-analyzer/nagios-core-4 net-analyzer/icinga net-analyzer/icinga2 )" - -# A list of modules used in our Apache config file. -APACHE_MODS="apache2_modules_alias," # "Alias" directive -APACHE_MODS+="apache2_modules_authz_core," # "Require" directive -APACHE_MODS+="apache2_modules_rewrite" # "RewriteEngine" and friends - -RDEPEND="${DEPEND} - virtual/perl-Getopt-Long - virtual/perl-Time-HiRes - media-fonts/dejavu - apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )" - -PATCHES=( - "${FILESDIR}/${PN}-0.6.14-makefile.patch" - "${FILESDIR}/${P}-rrdtool-0.6.0-support.patch" -) - -src_configure() { - local var_dir user_group - - if has_version net-analyzer/nagios-core; then - var_dir=/var/nagios - user_group=nagios - elif has_version net-analyzer/icinga2; then - var_dir=/var/lib/icinga2 - user_group=icinga - else - var_dir=/var/lib/icinga - user_group=icinga - fi - - econf \ - --sysconfdir="${EPREFIX}"/etc/pnp \ - --datarootdir="${EPREFIX}"/usr/share/pnp \ - --with-perfdata-dir="${EPREFIX}"${var_dir}/perfdata \ - --with-nagios-user=${user_group} \ - --with-nagios-group=${user_group} \ - --with-perfdata-logfile="${EPREFIX}"${var_dir}/perfdata.log \ - --with-perfdata-spool-dir="${EPREFIX}"/var/spool/pnp -} - -src_compile() { - # The default target just shows a help - emake all -} - -src_install() { - emake DESTDIR="${D}" install install-config - einstalldocs - newinitd "${FILESDIR}"/npcd.initd npcd - rm "${ED%/}/usr/share/pnp/install.php" || \ - die "unable to remove ${ED%/}/usr/share/pnp/install.php" - - if use apache2 ; then - insinto "${APACHE_MODULES_CONFDIR}" - newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf - - # Allow the apache user to read our config files. This same - # approach is used in net-analyzer/nagios-core. - chgrp -R apache "${ED%/}/etc/pnp" \ - || die "failed to change group of ${ED%/}/etc/pnp" - fi - - # Bug 430358 - CVE-2012-3457 - local f - while IFS="" read -d $'\0' -r f ; do - chmod 0640 "${f}" || die - done < <(find "${ED%/}/etc/pnp" -type f) - - while IFS="" read -d $'\0' -r f ; do - chmod 0750 "${f}" || die - done < <(find "${ED%/}/etc/pnp" -type d) -} - -pkg_postinst() { - elog "To enable the pnp4nagios web front-end, please visit" - elog "${EROOT%/}/etc/conf.d/apache2 and add \"-D PNP -D PHP5\"" - elog "to APACHE2_OPTS. Then pnp4nagios will be available at," - elog - elog " http://localhost/pnp4nagios" - elog -} diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild deleted file mode 100644 index 8c83a932fe0c..000000000000 --- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit depend.apache eutils - -DESCRIPTION="A performance data analyzer for nagios" -HOMEPAGE="http://www.pnp4nagios.org/" -SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" - -# A lot of things (sync mode, for one) are broken with nagios-4.x. -DEPEND=" - >=dev-lang/php-5.3:*[json,simplexml,zlib,xml,filter] - >=net-analyzer/rrdtool-1.2[graph,perl] - || ( <net-analyzer/nagios-core-4 net-analyzer/icinga net-analyzer/icinga2 )" - -# A list of modules used in our Apache config file. -APACHE_MODS="apache2_modules_alias," # "Alias" directive -APACHE_MODS+="apache2_modules_authz_core," # "Require" directive -APACHE_MODS+="apache2_modules_rewrite" # "RewriteEngine" and friends - -RDEPEND="${DEPEND} - virtual/perl-Getopt-Long - virtual/perl-Time-HiRes - media-fonts/dejavu - apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )" - -# There is no want_apache2_4, but we needed to specify that manually -# anyway to be able to include the list of modules. -want_apache2 - -pkg_setup() { - depend.apache_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-0.6.14-makefile.patch" -} - -src_configure() { - local var_dir= - local user_group= - - if has_version net-analyzer/nagios-core; then - var_dir=/var/nagios/ - user_group=nagios - else - var_dir=/var/lib/icinga/ - user_group=icinga - fi - - econf \ - --sysconfdir=/etc/pnp \ - --datarootdir=/usr/share/pnp \ - --mandir=/usr/share/man \ - --with-perfdata-dir=${var_dir}/perfdata \ - --with-nagios-user=${user_group} \ - --with-nagios-group=${user_group} \ - --with-perfdata-logfile=${var_dir}/perfdata.log \ - --with-perfdata-spool-dir=/var/spool/pnp -} - -src_compile() { - # The default target just shows a help - emake all -} - -src_install() { - emake DESTDIR="${D}" install install-config - newinitd "${FILESDIR}"/npcd.initd npcd - rm "${D}/usr/share/pnp/install.php" || \ - die "unable to remove ${D}/usr/share/pnp/install.php" - - if use apache2 ; then - insinto "${APACHE_MODULES_CONFDIR}" - newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf - - # Allow the apache user to read our config files. This same - # approach is used in net-analyzer/nagios-core. - chgrp -R apache "${D}/etc/pnp" \ - || die "failed to change group of ${ROOT}etc/pnp" - fi - - # Bug 430358 - CVE-2012-3457 - find "${D}/etc/pnp" -type f -exec chmod 0640 '{}' + || \ - die "unable to set file permissions under ${D}/etc/pnp" - - find "${D}/etc/pnp" -type d -exec chmod 0750 '{}' + || \ - die "unable to set directory permissions under ${D}/etc/pnp" -} - -pkg_postinst() { - elog "To enable the pnp4nagios web front-end, please visit" - elog "${ROOT}etc/conf.d/apache2 and add \"-D PNP -D PHP5\"" - elog "to APACHE2_OPTS. Then pnp4nagios will be available at," - elog - elog " http://localhost/pnp4nagios" - elog -} diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 83a84aead4f8..2492f9e43c41 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -15,6 +15,6 @@ DIST wireshark-2.4.6.tar.xz 28851192 BLAKE2B 19a69d077b794ab07fbfb22b7cf9e61ff54 DIST wireshark-2.6.1.tar.xz 28386244 BLAKE2B fe45f4249c81fd83ce35384b7038d7f1b5e21d884a5faec4344dda8f0c8b71393207e043672ce57bb6f1c45800ffce8feed8573a064db8048b3c0268feb0b486 SHA512 e68f7fa5975f10feccb76ab64c9a00f141cd04a12fa586a9839c93630d3554565d8e2ddfab83ec31cb813485b14b3227b7ec6e59baef007a6fe74b8b2a5ed444 EBUILD wireshark-2.4.5.ebuild 7380 BLAKE2B 0fd3f07582d42cf9651496978c983c9cfa54b2ee0df52151c04bcb7ffd7c886aecf233598226dc2427ec0fbf6fa7d5d4ca8bf92f361c853a10b72dd625fa72dd SHA512 558350df39da8b7419d63251544900f519d920e120ffa40cdfefc7b088731d2ac6755928758bd4c9379f49b1b00b93f4cda8713601e340647d955cc73e6e590c EBUILD wireshark-2.4.6.ebuild 7388 BLAKE2B 1d73922229e3216ee9aeb3f95f964da3aa6afea193e88209df3f91419ba99de6de201538750dd79c3421bd8cf12dcfd1b12022b0be97a21f3e743fea17f70107 SHA512 dc66e5dd25527f9fd7ec05f6d810b4d92f2c138e2337def5571e7a7bcaf6034099ad649869190aa366700e6223e9de09997fa36c6910f9dbbc5e0c736e26a92b -EBUILD wireshark-2.6.1.ebuild 6789 BLAKE2B ba7e455a10617d05bc601e1b3dfe91435a98cbc5c60ae5a86dfc9ca2739b31caad3e71a1420e2a335ad0fb6ceabace19a7b3621ac3c07e832fd76058d4974f7e SHA512 3b6245df2f0fe2ef6d7e4de7daf9b3ada6b99c6a1fb22912789db9712bf002c03f7592806c95f47cfd8a500aaa99640a93db0e0f5dd5c0a3faeccfb082f8bc5d +EBUILD wireshark-2.6.1.ebuild 6795 BLAKE2B ad6d4255e7957fb847563e3450ba3b2577fb3cd5c7a8f9e62ad6b4823e72297eb8f06a3638a06d2670bfde43a759b9022665cd14d24595789d911147f8e990c1 SHA512 9d4ccd80f395d28030529b0a3907e048047efd7f45759a981669d8a6d31bafae35bf3d59cfcb111e2c633e13afe0ffa22348c8c8da675b11f579948eb7f1f957 EBUILD wireshark-99999999.ebuild 6391 BLAKE2B a97356a1ffeafe735cad35e35d7633dc34c97239f7a0f47542da28d2912ca8eff0f9e5172d37efdc157d921026ddd6a92bb22d45b628cdecfdd485b0369552d4 SHA512 56818a23c3cd32a9553b4e7ca77ca21f99546a0a2bbab5fd8c3311d4c564c7e634fb19da5587609386ceb3c925150031b1c296753e89be68626b0f1e137903d8 MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9 diff --git a/net-analyzer/wireshark/wireshark-2.6.1.ebuild b/net-analyzer/wireshark/wireshark-2.6.1.ebuild index 088cd5cb5d0d..b9152684e6ed 100644 --- a/net-analyzer/wireshark/wireshark-2.6.1.ebuild +++ b/net-analyzer/wireshark/wireshark-2.6.1.ebuild @@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz" LICENSE="GPL-2" SLOT="0/${PV}" -KEYWORDS="amd64 arm hppa ia64 ~ppc64 x86" +KEYWORDS="alpha amd64 arm hppa ia64 ~ppc64 x86" IUSE=" adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index 93bab52946af..941db9452408 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -26,9 +26,11 @@ DIST zabbix-2.2.16.tar.gz 15498413 BLAKE2B fc634ca5124525b3143bb736b53b5040c8f1f DIST zabbix-2.2.21.tar.gz 15489747 BLAKE2B e00fe140977f0ce995497954a15ff647c813c048a706e536a12010a649d3467d6c63343c3c0d11b1900f91f8fcc5bb235f9e4a030362c93ad3c1c31e68699f54 SHA512 29e3cba0663e7160dce5141cc389959571e5e298206baed26209facab206cc4f66611d48d76306a53925a2096db6f0bed1753435ec1be20bd8db53862cb902a4 DIST zabbix-3.0.14.tar.gz 15643983 BLAKE2B 129bcde3318c049932ad24d6b20fcd3cdf3a0a0f246aadb81663265eb31550fd5966745486e4e863236801d41e6cefec3bdc82eca024be94bc2437f44b2d81a1 SHA512 b024de610b86bd45fc0be655e8275daf53b1de813e13a1e78cfad149b1191a7f118862646f5ded43938bc489ff0b0f325de36d4b2c076ce6fe768ee4234eb944 DIST zabbix-3.0.17.tar.gz 15646656 BLAKE2B c24ac286f35d36163054abf3946e9d6530bf44c66576a4c077874bf68dff1ad0a36a98bf23b81063ba551b5bc0069a1d7c74ab75f5bf67c87039af371bcf2512 SHA512 5a06e8dca49c1f7e9fef936f0e534e78af9be6fecdf534d24e914ce658ad7140c1bd62510603f6a8860f964e4fe78093c115efd8da8e12581b452116b6b14627 +DIST zabbix-3.0.18.tar.gz 15661951 BLAKE2B a6c31cf783f9b2a1ceb4ec5d2430bbc6127bc9e7a7b2c656c436bab10c821d28e782552403de95d45aed3df82b5f61072638251a03c695424c1ae55e1bd40b72 SHA512 b1bf3a109becaf6f756898f0f3bbf8d4df0ec9dfabf9b9c7cf7c7c7813b917e3c23c757f6f62df782c3f37f25e0532049a378e8d5a86d59aaee60e39dc4eaf2a DIST zabbix-3.2.10.tar.gz 16089723 BLAKE2B c69b8b00781198b8e4845f94e5a42e3910950954bd240703165be15630788f22e486a2ebbd941902eb92b06b42bc7923869f7b885fcc7248508d9e535ad23170 SHA512 6413247ea0f47f410eadd970599dc4a0bfef4202b6f88bcb1636d1fad270a2d5545a90870052af5445a5219dab3b58867c23f3afaddb5d78e200fecbd987e545 DIST zabbix-3.2.11.tar.gz 16099820 BLAKE2B 7038679ecc9ae1b6684d65b3dd0019865e587c82e5a3ffe55610c057f8516ebe34978101065ac31628e6fd54077877c447d64cb1d169e0ad7402e727c7e65d76 SHA512 a14e0af4b183c8deb524c8965700c2988c0c131844f7fbc748aa8d1703b9dad73c2cf6d77663799fbd455adf58fdd1ce8dc5fd6404a9269c1a42160ad0e33e6e DIST zabbix-3.2.9.tar.gz 16098846 BLAKE2B a8d7ab803cab075889bbaee10806c1f35be42a91c78e1ee62e8fa458987865401d2fb677d4ebf42267e13acb38b8689bb6d232fbc3247ffba3f06f5e8c3cd692 SHA512 e8d82d4cadd8f6d5124de5d1b93f4768086c9543bfea676f321df86a76e001400330ea3650d3c295b25fa76858a205dac49caa97d61af30cc31fac544025d347 +DIST zabbix-3.4.10.tar.gz 17300622 BLAKE2B 1b4c275d271ae4d4607400cb6e5f955ba624bf19cd116728e7a71a1b4adc0fbbde8cf91e6b0a71c5d48bf5c38b2ebe0db79f00ba3a42cc4213a0e310d56d5e29 SHA512 25e85cbe7a93a088fa0132ed6f3f75ad1aadedb839d745be38e180f0f9b858e32045b9d057b10cab4d3a8aa770b22b631aa0894fe5f1c3ca4ca62a000934bf94 DIST zabbix-3.4.5.tar.gz 17170228 BLAKE2B bd799a3ad25256421bc2a8458019237da17e78d2dd5253485cebbc40df785e550e7cf15fcf8925a225c118e38e9aaad3f7532f909ba3eaff3a175136033ae81a SHA512 e77c8693d687c9f1e3c160f2f41161b5e4ac663f0db69f4bff424da4ba607815ad0148448c6f80a2b9357ad7472016610f4beed173e40c6fcf661874d75c69a4 DIST zabbix-3.4.6.tar.gz 17162881 BLAKE2B cf8a461f720b2f1d4910d8f512ac9949c56b9116fb9ddd1a26687b22da2c3938c4f10e6d0029bf348101e897fe6d352880964aaf5a0f55dd377fb6eec59a5006 SHA512 02300b103278f6f2867629a958a8bc5ea8e6cfe5743056b7e2f9d59afdeea04e29f51cae7c5d9847899c45c321a4c15cdaf66203c627fb1d85b3af619afe73ca DIST zabbix-3.4.7.tar.gz 17177022 BLAKE2B db465ff9c0085922e23ba042b0975d1368abb15408e943aa784e8efb49f7c412761742d1c8cda19c3cf86ea03d358d731cbe022ba3c9b139963f396290e4a272 SHA512 8397ee41c3b4efc2fb66638fd7c554ea668fad0a7c79d8aa3ed442cae065e62355c1e16e2008c7a65def775f23e6dfa1d75bbc682c49a45c9db5d7eddf905140 @@ -38,9 +40,11 @@ EBUILD zabbix-2.2.16.ebuild 9436 BLAKE2B 3d7e32e772074500827d0bd469e280f77a4f731 EBUILD zabbix-2.2.21.ebuild 9438 BLAKE2B 2032d57e9e5dec45250fba571414aa22b896ecd3f13d42d04b86f0392f153e2cfdc9097cac3b983a331dabd03bcde7b74685139879114bd361a15449bd850123 SHA512 dcda14cad8ea47a09853f5768fb9f538a8150a0fc1da33350ab7d77e161fa85b3719dfcac9515b461815d7c710da7b2ca5ff24db7b7a05a26edeceb00931944d EBUILD zabbix-3.0.14.ebuild 9301 BLAKE2B e51a2965a2acaabbf7c4d7678bbae209a1e9f694155a796be577f6db26ffefcb509799040aebd6230f0fabebe2905790290c1ef9ce7743e24a1bfad4dea0feed SHA512 f46a5b8c0242858fba26a3ef6f4b3f24f884cdc8c73f07f06de536c2fca8065a301d44d5a156e18164ee48560ec6ca6e97baa664bd73bf527563e31999dadad8 EBUILD zabbix-3.0.17.ebuild 9278 BLAKE2B 6e5e42556fbd612fb7060a205bd5a4e12d13db91c6ac5ac0a0724e3462dbab5657db6992f7e5b8d746a91fc2b8ee1cdb2d0c8e982b57b14a141877318dbfcc0e SHA512 7219c5535aa5d91be8132fd74bb7fc7eee2dda0fedc761c031518c0b7b86ec97dee74a03a444979ae2f556e9de252f339e88b337fbedf6efc1a5d97fcefea04c +EBUILD zabbix-3.0.18.ebuild 9278 BLAKE2B 6e5e42556fbd612fb7060a205bd5a4e12d13db91c6ac5ac0a0724e3462dbab5657db6992f7e5b8d746a91fc2b8ee1cdb2d0c8e982b57b14a141877318dbfcc0e SHA512 7219c5535aa5d91be8132fd74bb7fc7eee2dda0fedc761c031518c0b7b86ec97dee74a03a444979ae2f556e9de252f339e88b337fbedf6efc1a5d97fcefea04c EBUILD zabbix-3.2.10.ebuild 9265 BLAKE2B 489884d6ce42e154f3c7c0a9b1f2e0143b9fdd38a1778b13dd8be48d0e4ba1e6645934fcb495dd08a19a22f23201270c2ef79d3d2885316b2eebae142a4bb04a SHA512 f2fd5f8759e9625a798edad0b00868c27f961cb2d3327855cde7e53e46f4950b269bdc95f280d79d89a95291cf92288a6e163fd72562a889f900ddf519a9e44e EBUILD zabbix-3.2.11.ebuild 9265 BLAKE2B 489884d6ce42e154f3c7c0a9b1f2e0143b9fdd38a1778b13dd8be48d0e4ba1e6645934fcb495dd08a19a22f23201270c2ef79d3d2885316b2eebae142a4bb04a SHA512 f2fd5f8759e9625a798edad0b00868c27f961cb2d3327855cde7e53e46f4950b269bdc95f280d79d89a95291cf92288a6e163fd72562a889f900ddf519a9e44e EBUILD zabbix-3.2.9.ebuild 9265 BLAKE2B 489884d6ce42e154f3c7c0a9b1f2e0143b9fdd38a1778b13dd8be48d0e4ba1e6645934fcb495dd08a19a22f23201270c2ef79d3d2885316b2eebae142a4bb04a SHA512 f2fd5f8759e9625a798edad0b00868c27f961cb2d3327855cde7e53e46f4950b269bdc95f280d79d89a95291cf92288a6e163fd72562a889f900ddf519a9e44e +EBUILD zabbix-3.4.10.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980 EBUILD zabbix-3.4.5.ebuild 9279 BLAKE2B 31252cddd5531295c4236bbb1fee0dc01b540da63e7f4b8c821a6008ebed9e83d56de2f44190378723c2399bc5faf0de0578c2084ba8a77a0e73b397ea6377a1 SHA512 21f1df6bf68e77fc10cedc8b4f39c4a9d94bd0ac1538b01b669b49837451983a0e2978226b8ca841b5340be21f3a7aee09cdf95ccd36e671271d5ab1a9c45836 EBUILD zabbix-3.4.6.ebuild 9279 BLAKE2B 31252cddd5531295c4236bbb1fee0dc01b540da63e7f4b8c821a6008ebed9e83d56de2f44190378723c2399bc5faf0de0578c2084ba8a77a0e73b397ea6377a1 SHA512 21f1df6bf68e77fc10cedc8b4f39c4a9d94bd0ac1538b01b669b49837451983a0e2978226b8ca841b5340be21f3a7aee09cdf95ccd36e671271d5ab1a9c45836 EBUILD zabbix-3.4.7.ebuild 9279 BLAKE2B 31252cddd5531295c4236bbb1fee0dc01b540da63e7f4b8c821a6008ebed9e83d56de2f44190378723c2399bc5faf0de0578c2084ba8a77a0e73b397ea6377a1 SHA512 21f1df6bf68e77fc10cedc8b4f39c4a9d94bd0ac1538b01b669b49837451983a0e2978226b8ca841b5340be21f3a7aee09cdf95ccd36e671271d5ab1a9c45836 diff --git a/net-analyzer/zabbix/zabbix-3.0.18.ebuild b/net-analyzer/zabbix/zabbix-3.0.18.ebuild new file mode 100644 index 000000000000..c3575d4f121b --- /dev/null +++ b/net-analyzer/zabbix/zabbix-3.0.18.ebuild @@ -0,0 +1,331 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +# 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="https://prdownloads.sourceforge.net/zabbix/${MY_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 sqlite odbc ) ) + static? ( !oracle !snmp )" + +COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) + ldap? ( + net-nds/openldap + =dev-libs/cyrus-sasl-2* + net-libs/gnutls + ) + mysql? ( >=virtual/mysql-5.0.3 ) + sqlite? ( >=dev-db/sqlite-3.3.5 ) + postgres? ( dev-db/postgresql:* ) + oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) + xmpp? ( dev-libs/iksemel ) + libxml2? ( dev-libs/libxml2 ) + curl? ( net-misc/curl ) + openipmi? ( sys-libs/openipmi ) + ssh? ( net-libs/libssh2 ) + java? ( virtual/jdk:* ) + odbc? ( dev-db/unixODBC ) + ssl? ( dev-libs/openssl:=[-bindist] )" + +RDEPEND="${COMMON_DEPEND} + proxy? ( net-analyzer/fping ) + server? ( net-analyzer/fping + app-admin/webapp-config ) + java? ( + >=virtual/jre-1.4 + dev-java/slf4j-api + ) + frontend? ( + >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) + 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] ) + media-libs/gd[png] + app-admin/webapp-config )" +DEPEND="${COMMON_DEPEND} + static? ( + ldap? ( + net-nds/openldap[static-libs] + =dev-libs/cyrus-sasl-2*[static-libs] + net-libs/gnutls[static-libs] + ) + mysql? ( >=virtual/mysql-5.0.3[static-libs] ) + sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) + postgres? ( dev-db/postgresql:*[static-libs] ) + libxml2? ( dev-libs/libxml2[static-libs] ) + curl? ( net-misc/curl[static-libs] ) + ssh? ( net-libs/libssh2[static-libs] ) + odbc? ( dev-db/unixODBC[static-libs] ) + ) + virtual/pkgconfig" + +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_prepare() { + cd "${S}/src/zabbix_java/lib" + rm -v *.jar || die + + java-pkg_jar-from slf4j-api +} + +src_prepare() { + default +} + +src_configure() { + econf \ + $(use_enable server) \ + $(use_enable proxy) \ + $(use_enable agent) \ + $(use_enable ipv6) \ + $(use_enable static) \ + $(use_enable java) \ + $(use_with ldap) \ + $(use_with snmp net-snmp) \ + $(use_with mysql) \ + $(use_with postgres postgresql) \ + $(use_with oracle) \ + $(use_with sqlite sqlite3) \ + $(use_with xmpp jabber) \ + $(use_with curl libcurl) \ + $(use_with openipmi openipmi) \ + $(use_with ssh ssh2) \ + $(use_with libxml2) \ + $(use_with odbc unixodbc) \ + $(use_with ssl openssl) \ + || die "econf failed" +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" + fi +} + +src_install() { + dodir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + keepdir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + if use server; then + insinto /etc/zabbix + doins "${FILESDIR}/3.0"/zabbix_server.conf + doinitd "${FILESDIR}/3.0"/init.d/zabbix-server + dosbin src/zabbix_server/zabbix_server + fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf + fperms 0640 /etc/zabbix/zabbix_server.conf + dodir /usr/share/zabbix + /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ + systemd_dounit "${FILESDIR}/zabbix-server.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf + fi + + if use proxy; then + doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy + dosbin src/zabbix_proxy/zabbix_proxy + insinto /etc/zabbix + doins "${FILESDIR}/3.0"/zabbix_proxy.conf + dodir /usr/share/zabbix + /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ + systemd_dounit "${FILESDIR}/zabbix-proxy.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf + fi + + if use agent; then + insinto /etc/zabbix + doins "${FILESDIR}/3.0"/zabbix_agentd.conf + doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd + dosbin src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf + fperms 0640 /etc/zabbix/zabbix_agentd.conf + systemd_dounit "${FILESDIR}/zabbix-agentd.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf + fi + + fowners zabbix:zabbix \ + /etc/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 + exeinto /${ZABBIXJAVA_BASE}/ + doexe \ + src/zabbix_java/settings.sh \ + src/zabbix_java/startup.sh \ + src/zabbix_java/shutdown.sh + fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} + fi +} + +pkg_postinst() { + if use server || use proxy ; then + elog + elog "You may need to configure your database for Zabbix," + elog "if you have not already done so. " + elog + + zabbix_homedir=$(egethome zabbix) + if [ -n "${zabbix_homedir}" ] && \ + [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then + ewarn + ewarn "The user 'zabbix' should have his homedir changed" + ewarn "to /var/lib/zabbix/home if you want to use" + ewarn "custom alert scripts." + ewarn + ewarn "A real homedir might be needed for configfiles" + ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" + ewarn "using sendxmpp for Jabber alerts)." + ewarn + ewarn "To change the homedir use:" + ewarn " usermod -d /var/lib/zabbix/home zabbix" + ewarn + fi + fi + + if use server; then + elog + elog "For distributed monitoring you have to run:" + elog + elog "zabbix_server -n <nodeid>" + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + elog "--" + elog + elog "You may need to add these lines to /etc/services:" + elog + elog "zabbix-agent 10050/tcp Zabbix Agent" + elog "zabbix-agent 10050/udp Zabbix Agent" + elog "zabbix-trapper 10051/tcp Zabbix Trapper" + elog "zabbix-trapper 10051/udp Zabbix Trapper" + elog + + if use server || use proxy ; then + # check for fping + fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) + case "${fping_perms}" in + 4[157][157][157]) + ;; + *) + ewarn + ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," + ewarn "you have to make /usr/sbin/fping setuid root and executable" + ewarn "by everyone. Run the following command to fix it:" + ewarn + ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" + ewarn + ewarn "Please be aware that this might impose a security risk," + ewarn "depending on the code quality of fping." + ewarn + ;; + esac + fi +} diff --git a/net-analyzer/zabbix/zabbix-3.4.10.ebuild b/net-analyzer/zabbix/zabbix-3.4.10.ebuild new file mode 100644 index 000000000000..94b8bc3cdfff --- /dev/null +++ b/net-analyzer/zabbix/zabbix-3.4.10.ebuild @@ -0,0 +1,329 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +# 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="https://prdownloads.sourceforge.net/zabbix/${MY_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="snmp? ( net-analyzer/net-snmp ) + ldap? ( + net-nds/openldap + =dev-libs/cyrus-sasl-2* + net-libs/gnutls + ) + mysql? ( >=virtual/mysql-5.0.3 ) + sqlite? ( >=dev-db/sqlite-3.3.5 ) + postgres? ( dev-db/postgresql:* ) + oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) + xmpp? ( dev-libs/iksemel ) + libxml2? ( dev-libs/libxml2 ) + curl? ( net-misc/curl ) + openipmi? ( sys-libs/openipmi ) + ssh? ( net-libs/libssh2 ) + java? ( virtual/jdk:* ) + odbc? ( dev-db/unixODBC ) + ssl? ( dev-libs/openssl:=[-bindist] )" + +RDEPEND="${COMMON_DEPEND} + proxy? ( net-analyzer/fping[suid] ) + server? ( net-analyzer/fping[suid] + app-admin/webapp-config + dev-libs/libevent ) + java? ( + >=virtual/jre-1.4 + dev-java/slf4j-api + ) + frontend? ( + >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) + 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] ) + media-libs/gd[png] + app-admin/webapp-config )" +DEPEND="${COMMON_DEPEND} + static? ( + ldap? ( + net-nds/openldap[static-libs] + =dev-libs/cyrus-sasl-2*[static-libs] + net-libs/gnutls[static-libs] + ) + mysql? ( >=virtual/mysql-5.0.3[static-libs] ) + sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) + postgres? ( dev-db/postgresql:*[static-libs] ) + libxml2? ( dev-libs/libxml2[static-libs] ) + curl? ( net-misc/curl[static-libs] ) + ssh? ( net-libs/libssh2[static-libs] ) + odbc? ( dev-db/unixODBC[static-libs] ) + ) + virtual/pkgconfig" + +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_prepare() { + cd "${S}/src/zabbix_java/lib" + rm -v *.jar || die + + java-pkg_jar-from slf4j-api +} + +src_prepare() { + default +} + +src_configure() { + econf \ + $(use_enable server) \ + $(use_enable proxy) \ + $(use_enable agent) \ + $(use_enable ipv6) \ + $(use_enable static) \ + $(use_enable java) \ + $(use_with ldap) \ + $(use_with snmp net-snmp) \ + $(use_with mysql) \ + $(use_with postgres postgresql) \ + $(use_with oracle) \ + $(use_with sqlite sqlite3) \ + $(use_with xmpp jabber) \ + $(use_with curl libcurl) \ + $(use_with openipmi openipmi) \ + $(use_with ssh ssh2) \ + $(use_with libxml2) \ + $(use_with odbc unixodbc) \ + $(use_with ssl openssl) \ + || die "econf failed" +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" + fi +} + +src_install() { + dodir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + keepdir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + if use server; then + insinto /etc/zabbix + doins "${FILESDIR}/3.0"/zabbix_server.conf + doinitd "${FILESDIR}/3.0"/init.d/zabbix-server + dosbin src/zabbix_server/zabbix_server + fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf + fperms 0640 /etc/zabbix/zabbix_server.conf + dodir /usr/share/zabbix + /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ + systemd_dounit "${FILESDIR}/zabbix-server.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf + fi + + if use proxy; then + doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy + dosbin src/zabbix_proxy/zabbix_proxy + insinto /etc/zabbix + doins "${FILESDIR}/3.0"/zabbix_proxy.conf + dodir /usr/share/zabbix + /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ + systemd_dounit "${FILESDIR}/zabbix-proxy.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf + fi + + if use agent; then + insinto /etc/zabbix + doins "${FILESDIR}/3.0"/zabbix_agentd.conf + doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd + dosbin src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf + fperms 0640 /etc/zabbix/zabbix_agentd.conf + systemd_dounit "${FILESDIR}/zabbix-agentd.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf + fi + + fowners zabbix:zabbix \ + /etc/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 + fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} + doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy + doconfd "${FILESDIR}"/3.0/conf.d/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 +} |