diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:52:04 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:52:04 +0100 |
commit | 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /net-analyzer | |
parent | 6612a728ea11526a849618ec515ad57131d64416 (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'net-analyzer')
23 files changed, 432 insertions, 391 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz Binary files differindex 1ea425fd5586..fdaf5e9a011b 100644 --- a/net-analyzer/Manifest.gz +++ b/net-analyzer/Manifest.gz diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest index 72a9a15e4ae3..b4f3dd2cfcbc 100644 --- a/net-analyzer/fail2ban/Manifest +++ b/net-analyzer/fail2ban/Manifest @@ -2,7 +2,7 @@ DIST fail2ban-0.10.2.tar.gz 474675 BLAKE2B 569599eec3c7b786933af332507ca148f49d3 DIST fail2ban-0.10.3.1.tar.gz 485826 BLAKE2B 79ca86a601bd79ba3729d4c9b00f20a0717df8c7ceb20183099e11f84cceade274173be90d0b4b000d37a1b9d242e14106c9e7e40e372e450d69bca003fff6fb SHA512 ed3646ef2113fe10d9130c239818087b228ac9708411e26acc412beae022e3f9ff8cea32d824bd491117882fb8f184dcb88bda295bd31e865ac8310c7e27fc7a DIST fail2ban-0.9.6.tar.gz 352145 BLAKE2B a529a7a1c78f29f457abc26215da015f7624f6d777571e96725775557725b6cbbfda5068e77520f1b3c20efcff07c11f210c5cca3ed47cf86c6f5e87c503052f SHA512 c09778d39741dc38d1073495a9f491012717d5ed04d28722f2ae6755104bdcc472baf06d33f500fed592b04c05277ba5cf74e527f1c0ed751108f4f1be22fa7e EBUILD fail2ban-0.10.2.ebuild 3349 BLAKE2B 030c91982ed07d229c72605bdb80648596a686416d6e695cd8057092bf9a4167a39b23b38d234c3ed91879f897c899d64a3f1b6fa7fc1c9828641b8f8e8a2e8a SHA512 d818e7e00258bccd14540ebedd427f3e05dc7b5feef3138a80123425726388d82e21b0f49ce71fd5e15a486a4042e4533e28e0a947941a985c78ae98939e7584 -EBUILD fail2ban-0.10.3.1.ebuild 3344 BLAKE2B b2851fe55c59ce815ec89b137fa656279e5e984f3cd6a82e3e395439252b43e5f33cc9bb66491f0b2cfed4dfe118c9b97b123d3cfd49280acb936e51aa8d14d3 SHA512 01dcac4c1ec75a0c82db304fdccd6d71326fce56fb54a5b92a69a00f31420b25c2e7f4181cd5877a71ae365bd4c81cb761278d344e430b2d9a34cc2dfd8c5c81 +EBUILD fail2ban-0.10.3.1.ebuild 3341 BLAKE2B 0b0f7d1f4ca20d23ef9d787c04bc984e9859900f9e3fec4c691338d6638a32e6e9fa4948ce31895821a7cc4787806051059687864c2cde8fce7f13f26ef0e084 SHA512 63c23a53745ce27797eeb686fb896d3dfaf86b7a1c4a7cfddaf1f2438fef6c44dead638719f884d4ed46fe19d40edd204dad20a0d05121d1646d51a5b4a40e60 EBUILD fail2ban-0.9.6.ebuild 3118 BLAKE2B 421153aa5ee52702e6cb79dd780ed3706b22c4ee7497c4da505cc1a2c7aee27c80ad737b427e4de3abcaea129add9b9b70e008336597ca2e57bdc6d08dcda790 SHA512 e10fe1a544c0ea50eade24a3399cc2e4f27a0cbd4e4455a2cbc48cd1def13793474a24f4eefaefcb4ddc5c3e3773821c6149001c83ca953db3be1dcfb41d30b0 EBUILD fail2ban-99999999.ebuild 3190 BLAKE2B dac84d04dc01c20b5af2a34c07be78ce7db25c79d00a5cfc7e6c58b4077e884b71e8fdb83b34e9abe7326c68836b3963d6ebd373bb618e74db4f13cb7464e086 SHA512 8b2a59c16a2a9bc712c7d905a30df88d72ebf47e5f89e227bd1371ae35aa7d44c6056c1aef7c9952ae166b0bab806e8a21ee584eff36652df43d0cc668f237e5 MISC metadata.xml 372 BLAKE2B 7fca866187d9a128e6fb6787a4099d7a6442e0e51e558786773b91c3e2f06e67167d76f9bc96be0fe1baa1c44fc3f0e9e2105a327a10cb2720b3e3f9e4303a66 SHA512 4d5710e2fb4a7c353ca6bd3203bceef57d4d004367993dc1044800ee8713a3f4697fe8ba3472a73ecd015503656dfb7cd68d674c99188ce5702769cfeaf06b25 diff --git a/net-analyzer/fail2ban/fail2ban-0.10.3.1.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.3.1.ebuild index 1ccf82b68cd5..3dda24f6f476 100644 --- a/net-analyzer/fail2ban/fail2ban-0.10.3.1.ebuild +++ b/net-analyzer/fail2ban/fail2ban-0.10.3.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd" IUSE="selinux systemd" # TODO support ipfw and ipfilter diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest index 2614ee46d858..c54ed0abde9b 100644 --- a/net-analyzer/munin/Manifest +++ b/net-analyzer/munin/Manifest @@ -1,7 +1,5 @@ AUX logrotate.d-munin.3 647 BLAKE2B 3f0272b95bc2a926807b3c66aecf91e3f62d492b4aa32efb0672525952d3f0332ec4a8543eb1d05c346a145e41b1e06a312519fa12707229be6a55f068e83efe SHA512 14ec0363b561695ae58db95e8d6fc68d7161805cfa0002001ec60566d0b22cc6103ae949de12715dc646131d692e023735895007c04807940c6d1a22de342302 AUX munin-1.3.2-plugins.conf 1760 BLAKE2B 97d853698470c35dd4bc305a559be6b1160a6877e557f6146eeddaf7d91f72c7ade36e1f5571c5ad742560a2f5f400fc51b481ee7ce305db9546af6b211046ac SHA512 c3498c4364cedd27016562568f918995be92dd6b3c2735ddd008190de0a729f8ea59e61f8517f6f48beaad14edb349af7476a39f55d246ab06d6cbe91679565f -AUX munin-2.0.33-nogitversion.patch 327 BLAKE2B 7368d2f44bd6d6c2ebb842d8a516b8ee238c49e3492ea91467ffe5b85c6db9c36e236d853e0d3e6e5a8e3bd96a39c365c3fba137a84d7ad6f79f8ed2b0085f78 SHA512 61dfdae1f224860ee33def50d3d074e1d1ae431fcba2007d7cd4d8b0b602b302b782a06626e6e795436cd65362a752e6aa97107575b46bcfa547a72ec27d8cf0 -AUX munin-2.0.33-perl526.patch 849 BLAKE2B 4f38dedbe74e601dd67f44339dc1e64754f30284e368e4768db4f593749060a32923030a55811beb6ab2ed1e7b7fb1d817761656c0fff89adee3c518fb5e88ad SHA512 b20e6b7de057ea88cfe5420fe79520d1fbb23cfdf961096c355c6bd48384b6d78a74b7545e8ded47374eeb5b884f54b39556abf950577e025d8221f69ef43789 AUX munin-async.service 201 BLAKE2B 2de35c4577d097525b75fb812042627702e846daf908b8deeaf9980c76b31135d5ea906b0932dfe3b4d589e3c635e37e8198cf2b6e9d60cdc305eb499815266f SHA512 55a99866cb9ff50723a223b8a45b418f13ed754b6ca919260af8312a323aad432aca047724a5e32f6aee2f8f541ae829bf6bfdf19d22e7543ef2e5a7b9cd9d6a AUX munin-asyncd.init.2 452 BLAKE2B 3f368195aa6896a726068b9db0ce0d1fc5750fee69a4ca5b60bfc2897486625cb83dab1ceec5cd6c1cf4d4aa0fc517eb0e41548004254abc8ad25657b0bfd422 SHA512 5d2ca928ea953e5fec8451dca218165f2c058c6d57519fea65e94148c0dff5ca0a06a2a22b09f416e375e825463d4d2a7c1a424c60051fdb4fa0d79af9463c26 AUX munin-graph.service 208 BLAKE2B 0234016852b69c645ee7184fb373dd5435a111f52e44b2c0e0c716a39e8356717042ffde25d9292c396b410f563af5894f8a78bd1baafb43e25c2d5257c9bcdc SHA512 3c0ea1cbcaacca02d2e36dbe0dbf02a553ce899db253510a17cbdd1a21275556101117f5d2701bd5519a8813c9ae022465c7fe89fa6000c857ca09c6aed6989c @@ -18,7 +16,10 @@ DIST munin-2.0.34-gentoo-1.tar.xz 11920 BLAKE2B 19cb949b8712ad57544b424de0cb09f9 DIST munin-2.0.34.tar.gz 1349842 BLAKE2B 641a780cd42d07c1a4f370dbf3a2647c99d3d69b5226a50f198ef561ff36e362fe397a55102ce57ef70a4a730ed14e02cb3a4f3043cac1874f36670535e0968e SHA512 db802266842e103017c8c3bc0fc676d0d6146a37b06e69e709cfb396d67c42ac4932b8d4979e4d1a108fc0c2467c66423799212f6ea1279fb9ed64352ddf41cc DIST munin-2.0.37-gentoo-1.tar.xz 5572 BLAKE2B 5f6371b2fd7e4933e3f19435e74773d2f74d6d909d65aac1f26e334239af2de4f7f78f81ae58c763024a30a15c9eaf9324c5a3a4ccc5b086951c1a49ddf8a2c9 SHA512 9ab47db4c98bc68a32e63aaf44fad83661efa316ff8f19967a886e3c5e268288d7b25503639c89e851edd57a50d215d8dd46b8e9b985feac9d367d56eb21610b DIST munin-2.0.37.tar.gz 2249145 BLAKE2B 430a89e6ec5920885abdd09779e61df1365ba132527ac156803a2b71d1a10d716658135a34820083b55ed843f8c6bd502c0f078493ab995df39b0afe4ee5d86e SHA512 22a87fe17a3674464e0cb242c27db57eb97a2b23e5f1fc7044de1b1b8187fbdb2ee5dbab51df42c87dfd8640194fbde23332998bff707368997421c61098d07f +DIST munin-2.0.38-gentoo-1.tar.xz 5404 BLAKE2B d375c6a6c5bda768f83f701a9cf0236eba6f024c6ac430356cff725c35cfdd84240f5df57d87a0c5bcd71fa5c1dc0482c6a91f7a46d75aeca68f745a74264243 SHA512 a725f978710f328b0a14aa96b5ba499eead358668431c2d53483847846a447bc6f5be855d12c0c13e7dadf821e1c8aee1352ba90f380db389c6d720a0704785f +DIST munin-2.0.38.tar.gz 2253625 BLAKE2B 10e4c1f9fb846fd30491c00c5be19d627ae97b033a190cfa1d3a5def7455daf7c6cae741b08f3389b4508220eb2bda6b6afd7eddf620dbb745eecd9cbc3e7b08 SHA512 1139cd2ca765ba85fcf7cf37986fb0dd5423d976ae2943373ee4706f376a6f299f0c626912db318eb49e541054017c604725e6f9b0c1e9198530375a2db6eb05 EBUILD munin-2.0.34.ebuild 12222 BLAKE2B 2a807d7d83ae99af03812a00bebb78d6089a4a94f7fae417b99afa0b07a0ea53ec633334b682c839ee018bb56b6b8e6fb043ec038930bcd89fa04e151f22d70d SHA512 20b6ee28055cb652d231046d1725ca75160d274b41da1fbc9e67bdbe276948013a7376ca9563b3dac71195f4cbd460644db1db0daa00f89c8302603976553a9c EBUILD munin-2.0.37.ebuild 12383 BLAKE2B 3da162ea89c907034b757ffed960bf651e04a7268e98d6830868b44b1b45ab00daf77675cc0e16b0e4aea40edeeb9ad66994506d30f17e97a9ac20cbb6900902 SHA512 8ff80be8cd3d11976ddbf9d9748c8a4156a2c0005852ab8f490ea5dc96a37e36d54866b367e0a6b10a1fca77fde3bcb0b6703da2a74b3dc301674164796bd690 +EBUILD munin-2.0.38.ebuild 12297 BLAKE2B 012b21a48257d59999ec27e985825c99512854d305a5becf9ad390d380655e2b679b85f6758fdbef6a6a3f43b4a5646af865ee5753d92cb1cec2b862f50521c6 SHA512 8e09ad8e1e8844c30c8d9ac73f182053899365b986ffcb3be2947f484dcdecf459a0b0a58df717490740bb87019fee83880858216a6a3d2c7eb91bcba4a323d7 EBUILD munin-2.1.9999.ebuild 11520 BLAKE2B 7f55a4e139ddb37419299ff65fbda91e22a3e890c86c23bc7d83f902fdc81f36ad665d3f0c6d7bbfdb60684740e1ae86ec9ec9f34dbf15f49e5385c72156fa55 SHA512 6069e6d31b9385885e98e815d4bf33227689fa8e74c48f4aa7b6af673be76d25ef26e777ef819563a8978a3cd73bc518b0ad3e5807c58a5b0e575aeb712f5ce5 MISC metadata.xml 4116 BLAKE2B 652f8bb067b024f91b3f2fb9d885c93405ccd3e4fdfa141ae5e2996f9898e757d7be93d7e74d027a82403d2b9b472f7c6fec95815b18a0b2975e20e328fb7862 SHA512 ecfa257040277d815c05693724e9ff454b5ddefc1134b6afb38d66783a5e415aae78bdb35aeb0e80882a7b8ff19499f2b3b3646cc2a139e7797a0a718c2389f3 diff --git a/net-analyzer/munin/files/munin-2.0.33-nogitversion.patch b/net-analyzer/munin/files/munin-2.0.33-nogitversion.patch deleted file mode 100644 index 6cf33538bdec..000000000000 --- a/net-analyzer/munin/files/munin-2.0.33-nogitversion.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- munin-2.0.33/getversion -+++ munin-2.0.33/getversion -@@ -54,8 +54,6 @@ - - if [ -s "RELEASE" ]; then - cat RELEASE --elif [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then -- generate_version_string - elif [ ! -z "$(generate_version_string_from_dir)" ]; then - generate_version_string_from_dir - else diff --git a/net-analyzer/munin/files/munin-2.0.33-perl526.patch b/net-analyzer/munin/files/munin-2.0.33-perl526.patch deleted file mode 100644 index d3cabb9906c3..000000000000 --- a/net-analyzer/munin/files/munin-2.0.33-perl526.patch +++ /dev/null @@ -1,26 +0,0 @@ - - -diff -ruN munin-2.0.33.orig/master/Build.PL munin-2.0.33/master/Build.PL ---- munin-2.0.33.orig/master/Build.PL 2017-03-03 00:02:39.000000000 -0000 -+++ munin-2.0.33/master/Build.PL 2017-08-05 15:06:55.799816839 -0000 -@@ -1,3 +1,4 @@ -+use lib q[.]; - use MasterBuilder; - - use warnings; -diff -ruN munin-2.0.33.orig/node/Build.PL munin-2.0.33/node/Build.PL ---- munin-2.0.33.orig/node/Build.PL 2017-03-03 00:02:39.000000000 -0000 -+++ munin-2.0.33/node/Build.PL 2017-08-05 15:11:07.689824612 -0000 -@@ -1,3 +1,4 @@ -+use lib q[.]; - use NodeBuilder; - - use warnings; -diff -ruN munin-2.0.33.orig/plugins/Build.PL munin-2.0.33/plugins/Build.PL ---- munin-2.0.33.orig/plugins/Build.PL 2017-03-03 00:02:39.000000000 -0000 -+++ munin-2.0.33/plugins/Build.PL 2017-08-05 15:13:57.056168401 -0000 -@@ -1,3 +1,4 @@ -+use lib q[.]; - use PluginsBuilder; - - use warnings; diff --git a/net-analyzer/munin/munin-2.0.38.ebuild b/net-analyzer/munin/munin-2.0.38.ebuild new file mode 100644 index 000000000000..1659f7a892a5 --- /dev/null +++ b/net-analyzer/munin/munin-2.0.38.ebuild @@ -0,0 +1,417 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PATCHSET=1 + +inherit user java-pkg-opt-2 systemd + +MY_P=${P/_/-} + +DESCRIPTION="Munin Server Monitoring Tool" +HOMEPAGE="http://munin-monitoring.org/" +SRC_URI=" + https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2" +REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )" + +# Upstream's listing of required modules is NOT correct! +# Some of the postgres plugins use DBD::Pg, while others call psql directly. +# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly. +# We replace the original ipmi plugins with the freeipmi_ plugin which at least works. +DEPEND_COM=" + dev-lang/perl:=[berkdb] + dev-perl/DBI + dev-perl/Date-Manip + dev-perl/File-Copy-Recursive + dev-perl/List-MoreUtils + dev-perl/Log-Log4perl + dev-perl/Net-CIDR + dev-perl/Net-DNS + dev-perl/Net-Netmask + dev-perl/Net-SNMP + dev-perl/Net-Server[ipv6(-)?] + virtual/perl-Digest-MD5 + virtual/perl-Getopt-Long + virtual/perl-MIME-Base64 + virtual/perl-Storable + virtual/perl-Text-Balanced + virtual/perl-Time-HiRes + apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) + asterisk? ( dev-perl/Net-Telnet ) + cgi? ( + dev-perl/FCGI + dev-perl/CGI-Fast + ) + dhcpd? ( + >=net-misc/dhcp-3[server] + dev-perl/Net-IP + dev-perl/HTTP-Date + ) + doc? ( dev-python/sphinx ) + http? ( dev-perl/libwww-perl ) + irc? ( dev-perl/Net-IRC ) + ldap? ( dev-perl/perl-ldap ) + kernel_linux? ( sys-process/procps ) + memcached? ( dev-perl/Cache-Memcached ) + mysql? ( + virtual/mysql + dev-perl/Cache-Cache + dev-perl/DBD-mysql + ) + postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) + ssl? ( dev-perl/Net-SSLeay ) + syslog? ( virtual/perl-Sys-Syslog ) + !minimal? ( + dev-perl/HTML-Template + dev-perl/IO-Socket-INET6 + dev-perl/URI + >=net-analyzer/rrdtool-1.3[graph,perl] + virtual/ssh + ) + " + +# Keep this seperate, as previous versions have had other deps here +DEPEND="${DEPEND_COM} + dev-perl/Module-Build + java? ( >=virtual/jdk-1.5 ) + test? ( + dev-perl/Test-Deep + dev-perl/Test-LongString + dev-perl/Test-Differences + dev-perl/Test-MockModule + dev-perl/Test-MockObject + dev-perl/File-Slurp + dev-perl/IO-stringy + dev-perl/IO-Socket-INET6 + )" +RDEPEND="${DEPEND_COM} + virtual/awk + ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) + java? ( + >=virtual/jre-1.5 + || ( net-analyzer/netcat6 net-analyzer/netcat ) + ) + !minimal? ( + virtual/cron + media-fonts/dejavu + ) + selinux? ( sec-policy/selinux-munin ) + !<sys-apps/openrc-0.11.8" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + enewgroup munin + enewuser munin 177 -1 /var/lib/munin munin + enewuser munin-async -1 /bin/sh /var/spool/munin-async + esethome munin-async /var/spool/munin-async + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + echo ${PV} > RELEASE || die + + eapply "${WORKDIR}"/patches/*.patch + + sed -i -e '/hp-ux/ s/done/fi/' Makefile || die + + eapply_user + + java-pkg-opt-2_src_prepare +} + +src_configure() { + local cgidir='$(DESTDIR)/usr/libexec/munin/cgi' + use cgi || cgidir="${T}/useless/cgi-bin" + + local cgiuser=$(usex apache2 apache munin) + + cat >> "${S}"/Makefile.config <<- EOF + PREFIX=\$(DESTDIR)/usr + CONFDIR=\$(DESTDIR)/etc/munin + DOCDIR=${T}/useless/doc + MANDIR=\$(PREFIX)/share/man + LIBDIR=\$(PREFIX)/libexec/munin + HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin + CGIDIR=${cgidir} + CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi + CGIUSER=${cgiuser} + DBDIR=\$(DESTDIR)/var/lib/munin + DBDIRNODE=\$(DESTDIR)/var/lib/munin-node + SPOOLDIR=\$(DESTDIR)/var/spool/munin-async + LOGDIR=\$(DESTDIR)/var/log/munin + PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2) + JCVALID=$(usex java yes no) + STATEDIR=\$(DESTDIR)/run/munin + EOF +} + +# parallel make and install need to be fixed before, and I haven't +# gotten around to do so yet. +src_compile() { + emake -j1 + use doc && emake -C doc html +} + +src_test() { + if [[ ${EUID} == 0 ]]; then + eerror "You cannot run tests as root." + eerror "Please enable FEATURES=userpriv before proceeding." + return 1 + fi + + local testtargets="test-common test-node test-plugins" + use minimal || testtargets+=" test-master" + + LC_ALL=C emake -j1 ${testtargets} +} + +src_install() { + local dirs=" + /var/log/munin + /var/lib/munin/plugin-state + /etc/munin/plugin-conf.d + /etc/munin/plugins" + use minimal || dirs+=" /etc/munin/munin-conf.d/" + + keepdir ${dirs} + fowners munin:munin ${dirs} + + # parallel install doesn't work and it's also pointless to have this + # run in parallel for now (because it uses internal loops). + emake -j1 DESTDIR="${D}" $(usex minimal "install-minimal install-man" install) + + # we remove /run from the install, as it's not the package's to deal + # with. + rm -rf "${D}"/run || die + + # remove the plugins for non-Gentoo package managers; use -f so that + # it doesn't fail when installing on non-Linux platforms. + rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die + + insinto /etc/munin/plugin-conf.d/ + newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node + + newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node + newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node + + newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd + + dodir /usr/lib/tmpfiles.d + cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF + d /run/munin 0700 munin munin - - + EOF + + systemd_dounit "${FILESDIR}"/munin-async.service + systemd_dounit "${FILESDIR}"/munin-graph.{service,socket} + systemd_dounit "${FILESDIR}"/munin-html.{service,socket} + systemd_dounit "${FILESDIR}"/munin-node.service + + cat >> "${T}"/munin.env <<- EOF + CONFIG_PROTECT=/var/spool/munin-async/.ssh + EOF + newenvd "${T}"/munin.env 50munin + + dodoc README ChangeLog INSTALL + if use doc; then + cd "${S}"/doc/_build/html || die + docinto html + dodoc -r * + cd "${S}" || die + fi + + dodir /etc/logrotate.d/ + sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \ + "${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin + + dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_ + + if use syslog; then + sed -i -e '/log_file/s| .*| Sys::Syslog|' \ + "${D}"/etc/munin/munin-node.conf || die + fi + + # Use a simpler pid file to avoid trouble with /run in tmpfs. The + # munin-node service is ran as user root, and only later drops + # privileges. + sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \ + "${D}"/etc/munin/munin-node.conf || die + + keepdir /var/spool/munin-async/.ssh + touch "${D}"/var/spool/munin-async/.ssh/authorized_keys + fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}} + fperms 0750 /var/spool/munin-async{,/.ssh} + fperms 0600 /var/spool/munin-async/.ssh/authorized_keys + + if use minimal; then + # This requires the presence of munin-update, which is part of + # the non-minimal install... + rm "${D}"/usr/libexec/munin/plugins/munin_stats + else + # remove font files so that we don't have to keep them around + rm "${D}"/usr/libexec/${PN}/*.ttf || die + + if use cgi; then + sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die + + keepdir /var/cache/munin-cgi + touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log + fowners $(usex apache2 apache munin) \ + /var/cache/munin-cgi \ + /var/log/munin/munin-cgi-{graph,html}.log + + if use apache2; then + insinto /etc/apache2/vhosts.d + newins "${FILESDIR}"/munin.apache.include munin.include + newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include + fi + else + sed \ + -e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \ + -i "${D}"/etc/munin/munin.conf || die + fi + + keepdir /var/lib/munin/.ssh + cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF + IdentityFile /var/lib/munin/.ssh/id_ecdsa + IdentityFile /var/lib/munin/.ssh/id_rsa + EOF + + fowners munin:munin /var/lib/munin/.ssh/{,config} + fperms go-rwx /var/lib/munin/.ssh/{,config} + + dodir /usr/share/${PN} + cat >> "${D}"/usr/share/${PN}/crontab <<- EOF + # Force the shell to bash + SHELL=/bin/bash + # Mail reports to root@, not munin@ + MAILTO=root + + # This runs the munin task every 5 minutes. + */5 * * * * /usr/bin/munin-cron + + # Alternatively, this route works differently + # Update once a minute (for busy sites) + #*/1 * * * * /usr/libexec/munin/munin-update + ## Check for limit excess every 2 minutes + #*/2 * * * * /usr/libexec/munin/munin-limits + ## Update graphs every 5 minutes + #*/5 * * * * nice /usr/libexec/munin/munin-graph + ## Update HTML pages every 15 minutes + #*/15 * * * * nice /usr/libexec/munin/munin-html + EOF + + cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF + # Mail reports to root@, not munin@, only execute one at a time + !mailto(root),serial(true) + + # This runs the munin task every 5 minutes. + @ 5 /usr/bin/munin-cron + + # Alternatively, this route works differently + # Update once a minute (for busy sites) + #@ 1 /usr/libexec/munin/munin-update + ## Check for limit excess every 2 minutes + #@ 2 /usr/libexec/munin/munin-limits + ## Update graphs every 5 minutes + #@ 5 nice /usr/libexec/munin/munin-graph + ## Update HTML pages every 15 minutes + #@ 15 nice /usr/libexec/munin/munin-html + EOF + + # remove .htaccess file + find "${D}" -name .htaccess -delete || die + fi +} + +pkg_config() { + if use minimal; then + einfo "Nothing to do." + return 0 + fi + + einfo "Press enter to install the default crontab for the munin master" + einfo "installation from /usr/share/${PN}/f?crontab" + einfo "If you have a large site, you may wish to customize it." + read + + ebegin "Setting up cron ..." + if has_version sys-process/fcron; then + fcrontab - -u munin < /usr/share/${PN}/fcrontab + else + # dcron is very fussy about syntax + # the following is the only form that works in BOTH dcron and vixie-cron + crontab - -u munin < /usr/share/${PN}/crontab + fi + eend $? + + einfo "Press enter to set up the SSH keys used for SSH transport" + read + + # generate one rsa (for legacy) and one ecdsa (for new systems) + ssh-keygen -t rsa \ + -f /var/lib/munin/.ssh/id_rsa -N '' \ + -C "created by portage for ${CATEGORY}/${PN}" || die + ssh-keygen -t ecdsa \ + -f /var/lib/munin/.ssh/id_ecdsa -N '' \ + -C "created by portage for ${CATEGORY}/${PN}" || die + chown -R munin:munin /var/lib/munin/.ssh || die + chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die + + einfo "Your public keys are available in " + einfo " /var/lib/munin/.ssh/id_rsa.pub" + einfo " /var/lib/munin/.ssh/id_ecdsa.pub" + einfo "and follows for convenience" + echo + cat /var/lib/munin/.ssh/id_*.pub +} + +pkg_postinst() { + elog "Please follow the munin documentation to set up the plugins you" + elog "need, afterwards start munin-node." + elog "" + elog "To make use of munin-async, make sure to set up the corresponding" + elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys" + elog "" + if ! use minimal; then + elog "Please run" + elog " emerge --config net-analyzer/munin" + elog "to automatically configure munin's cronjobs as well as generate" + elog "passwordless SSH keys to be used with munin-async." + fi + elog "" + elog "Further information about setting up Munin in Gentoo can be found" + elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin" + + if use cgi; then + chown $(usex apache2 apache munin) \ + "${ROOT}"/var/cache/munin-cgi \ + "${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log + + if use apache2; then + elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include" + elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual" + elog "host you want it to be served." + elog "If you want to enable CGI-based HTML as well, you have to add to" + elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI." + else + elog "Effective CGI support has just been added in 2.0.7-r6." + elog "Documentation on how to use it is still sparse." + fi + fi + + # we create this here as we don't want Portage to check /run + # symlinks but we still need this to be present before the reboot. + if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then + mkdir "${ROOT}"/run/munin + chown munin:munin "${ROOT}"/run/munin + chmod 0700 "${ROOT}"/run/munin + fi +} diff --git a/net-analyzer/nagios-check_linux_bonding/Manifest b/net-analyzer/nagios-check_linux_bonding/Manifest index 576c3ab79809..c02d33005fc3 100644 --- a/net-analyzer/nagios-check_linux_bonding/Manifest +++ b/net-analyzer/nagios-check_linux_bonding/Manifest @@ -1,3 +1,3 @@ DIST check_linux_bonding-1.4.tar.gz 24670 BLAKE2B 6f136043fdcc74f677963ad4798ea18a8f813c3bf6cf1d00f6649d72dfc7d953c01a43bd3050758a8461f255ce3a9d3ddbdd1bcb29de316ea6438f20409ce699 SHA512 2b1e11007680accd8667ceb8710c7a7448766fd0c5aa3be60a34209f1b25892e7fecc46f9fc5e7cc0d4776f68cc17f8db8d8f2758695c82045a5832e8a4c7e81 -EBUILD nagios-check_linux_bonding-1.4.ebuild 714 BLAKE2B 6162389d0b67476e4a19e81dfb658ba85586bf8b37c86aa9f6b0b493f8fcb829aa4e953c5613d235a782a3cb2b51f8810f38ede8ee95598399bad3a0707e0e23 SHA512 07e745ee927c0ad7146dd249df97399e51b20c660724a1ebfe8934287e48d17df4a771b7b325c3e01e841975ea3cc40a7ace694a6445acca4772f6697d366944 +EBUILD nagios-check_linux_bonding-1.4.ebuild 713 BLAKE2B 6abd0a186a51daaa22173147c5fdcbcbaa55cc7d78e582779f6d94d6d83123e2f86aee250fbae1ab914e820f8a0e136ce5985f4e65d848ed57b7e6a97d2f7952 SHA512 6e787e6b2ac2cae19094712b7680a7eb6323c67159e18ed73aedb279feb856d91c05c35a1efa367d0e7074cc179e4f1482f6e7ba2276a275eb1f719c026f98e3 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild index 6cb284ba95a4..f5b6af3adc6b 100644 --- a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild +++ b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://folk.uio.no/trondham/software/files/${MY_P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND="dev-lang/perl" diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index 0a8ba8a0021d..fabb97b152e8 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -5,6 +5,6 @@ DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 6cb8182f40a4f83875c94df040bb1c62ce078d DIST nagios-4.4.0.tar.gz 11295727 BLAKE2B f89e7934b13814ec8c0ae7a19f14eed8842c7b0044fb2812f1399f27a82e5a639b63cc53f04b58ae99aa87bf595b2e25642ad3eb134a041e39f744919bd46d2f SHA512 8c136463133cf26c756ccd39b158ed417297e30f8a0b12d063a4dba6a43f126b27bb5f7ea962c8cde9fb9c1fd8d3439d7cfeaab833045315a9800c993fa0676f DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766 EBUILD nagios-core-4.3.3.ebuild 7467 BLAKE2B f337eabcfbd918295f437ec735917fda59e0695ee2a6800eea4a15d9f49b1fb63ee135498c8556c0c1a545f7ff0f0141abfb2080a605f19928a5036cac1fdfac SHA512 250b84f3b417756fbb9034af2a909c94c7c2ec7e1539f66590f84b4ff3735314d403b8b6496880c9e0aee2f4052dd7d7829779d1fc4ae78e01f53449abe206ab -EBUILD nagios-core-4.3.4.ebuild 6643 BLAKE2B 5ba2d8ba564d053abacf30df936e8301ef465a42b3ac540a97d1416e939319e5bacec7ea482c9383dd088d90c8b3ab6a4bf07665f557a35a876dba44dfa4f94e SHA512 a0e4a8d19f9675e0f2694f34e244873b8cc0f926794fba11b848a232f5933213a636e77ddd6ee8ed4573138f19ea8a2c347b05acd86dcfe65c09353adf914b49 +EBUILD nagios-core-4.3.4.ebuild 6642 BLAKE2B c0791a70440fc8cacdd1c84a5d7e2789316554344d6b26654d8595664fdf67a67e2e278c690c666632995f3abcbca920ff612ca34862fe7a34ca69c35c8dfe1d SHA512 8309de23dfa46bb1a31e70c0f28b2d7c2e6719d8d1e0ce2660298d530d1123978814612dfdb9a56103d1209bea9477b4fb81df3c623f6bf8d07a7419a28d4ae3 EBUILD nagios-core-4.4.0.ebuild 6650 BLAKE2B 71f116cd32789faa2bc1d4cbccf4042043da69dd26c1c561af86cd56a58c0ba5f48e84b2fa50c01a90bfd696787656921793079c97422a336a0483cba556f34a SHA512 701adbe2152b67cde427b279d201bb157d8c700a3457bb45eb50853185e0612b99a385e384b4c6ca0b9667bce68a6dee6b57a47dedaeb4db3398c49b95a06104 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild index ee472ba7a10c..9ee27cd6da9c 100644 --- a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild +++ b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_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="apache2 classicui lighttpd perl +web vim-syntax" # In pkg_postinst(), we change the group of the Nagios configuration diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest index 12697f8bee9d..184b4a29c849 100644 --- a/net-analyzer/nagstamon/Manifest +++ b/net-analyzer/nagstamon/Manifest @@ -3,5 +3,5 @@ AUX nagstamon-3.0-setup.patch 1139 BLAKE2B f399c6c600785629c7c90b1de396c17805882 DIST Nagstamon-2.0.1.tar.gz 535814 BLAKE2B f366a0b5d2f2e4c7168bbb996b68aea7f9ea2f248c25505f8e2ca553d4c275260eec8fdad27b7c1187826cca0cebc7c027491a4f7b6acb24ddf604b6b6a8a930 SHA512 f9c8ab928a78f289693ae58cd3dde6fa75dd66dc931dbec6a4affc35bd96f16c39a03cb441575c9ca42e810ae5962fc7226513b8cc2a17871e0365aa3a207db6 DIST Nagstamon-3.0.2.tar.gz 542005 BLAKE2B 090875cabbf22feea5cfe0eab0934b503d68df0f49c0a2e8056ccfed8251f278e149da5d0f8002cc5c96ffddd5b89a3ad997d90790e33c9cf1b9ffd9e32a83c0 SHA512 8b05b74adc7399b84cfb66d4c55ff80b2a37af7612496578bdc72ce00f712c8eae087204d00e7d7f1e1d35377f7bb8460d5cf337e315943a48a4ad5108e8d14f EBUILD nagstamon-2.0.1.ebuild 1193 BLAKE2B 9364c8ec44986d3352e29ba9a543cb417f812c114746e5743bf5993463d34adff33c75967c8bb3fae6783cda1a5653601afcdcf03d4c6d86c3eb1d4f79fb6f68 SHA512 4e4e469d11fcb40dfc5a3a2f0ce5c95886432c92f11116f9e860fb7f3ae7a0159ea26108bf32729ef75807bc37e885e96cb97b22e9b806057eeac0e27ae298e1 -EBUILD nagstamon-3.0.2.ebuild 1379 BLAKE2B b55ad28645ce8723bb0e732385dc698641fbd3aae1513cfebd076118fe51d5b98a18c5543a5b175e64c95ae292f9f62d23f64f9e883e56fa8b37da3f511da7f5 SHA512 9b0f15f63c4a6ede8f885a1ca5dd234ef8b9a93e0856e7e5c5e5654a46ed5c0953fd480e7ee3ce40ac3d179a200ce368b691a38481ee1cd4ec8c9ee820086ba4 +EBUILD nagstamon-3.0.2-r1.ebuild 1383 BLAKE2B 19c84d6faa5a09290a73da7252060e5a23fa52f0c040e8fad80154269595f291933c8150e6b714cd4882e3164696e0f35aed75144f6b5cec8fe3e37e101f1596 SHA512 42ed49a6983b713c208e7cf59214fbd25056cfb014d73ead0039d1a127238d59718218e2ff9731ea6a9eedbe959a234360d703f162d947fb3c424c80de4f3e36 MISC metadata.xml 525 BLAKE2B ad9c68b36b1260f907ceb8f50389fd0e035d441d33e99c71bb8dd493cda5cdaaa4e2ec32746d2b96d15b776d9de03070e411515f34e90c93063dd4b6b803c155 SHA512 5a1bf5be48ee8d28b501dceea33c65791b13cf0301c6bb170e4fe5ecd7b771cc28d3e9a49b82440770800854146961069cb26529ed5fe3e2c9a796329b085c64 diff --git a/net-analyzer/nagstamon/nagstamon-3.0.2.ebuild b/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild index 992274b0ce37..508d1a24e804 100644 --- a/net-analyzer/nagstamon/nagstamon-3.0.2.ebuild +++ b/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild @@ -33,7 +33,7 @@ RDEPEND="${PYTHON_DEPS} dev-python/secretstorage[${PYTHON_USEDEP}] >=dev-python/python-xlib-0.19[${PYTHON_USEDEP}] dev-python/requests-kerberos[${PYTHON_USEDEP}] - dev-python/typing[${PYTHON_USEDEP}]" + virtual/python-typing[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest index b857dc318630..cad0a4ca48ad 100644 --- a/net-analyzer/netperf/Manifest +++ b/net-analyzer/netperf/Manifest @@ -7,5 +7,5 @@ AUX netperf-2.7.0-space.patch 455 BLAKE2B aa4fae48102f2d767a0c72a13b20820d9e42f7 AUX netperf-fix-scripts.patch 819 BLAKE2B 59779076ad1e3315712f7db54451256dcbd04c2712020d0b39c0fb1969fbfec0cbf8a3f1b6203ce5622b45a2cc6877b1c1448b0d505aa98a034c2a7fd2f285e3 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad EBUILD netperf-2.7.0-r1.ebuild 1877 BLAKE2B c117075369a78b86c82e0edd569696a23c267b57f971baa2d37bbf12e2235904f1e53290e59a796657a46fda64e0b57b355680c17d7332b238011ef1d1a9f152 SHA512 a1cbc73bf527e97afdfa88b3644d2f459138363fc8232a5a657b502214fd0d3eb0b48579831df7c56c07ec954b41724ee7cd1555a74d9229ff796cb50e7c7e6f -EBUILD netperf-2.7.0-r2.ebuild 1921 BLAKE2B c2bbe4ed891f75bbae93b535705802e505843ce4fb9ce1e119f08b9a1ea112d803b5fbd4af272360eeaeb70512d5bb524949df663ced9139dec74f4293407d3a SHA512 6e4a2b2779fbe8d551e886c42e9e977efe143ab3d7e504bb287c47fed2e17dbfe6943aecee4c4b4bcd7aa1d485bd5466aefd47118d5e589a32866a013aafed7d +EBUILD netperf-2.7.0-r2.ebuild 1920 BLAKE2B 786d469ad8be710d5e1df43469e9a9a3e0dcc4b82295d1cad84fed00ca40a16ab6535e410d38ccbeb9d01d1bac72a4a11a01d14aeed37e3fcfc390cfb4963d7c SHA512 0dfc5521c78b597ea0f2f481ff198c1c735fd15a3b49f07bf9df6f1232ce2627bb1e99adcd68f844b0fbf25638c4002a92aba6f7aa747b0c6fc9ddbe22e50627 MISC metadata.xml 775 BLAKE2B 7f097a5c5390a88319c63497486a12367b5b89ac7979e22271581f6c9b6eaa5c69209f4d3cc82c57e8a3b0d0c0469378cd73579447c56d9991379af46b7fca1d SHA512 c1aaecd84a7fe73d798842ed1c117357809069f3f8c30a6920abf6641c46a5885e170dcecf7f2172d376b7f010e6dd07c47e233f15289c5de432550f1d05845e diff --git a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild index a0d87cf67300..435bed3f65b2 100644 --- a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild +++ b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild @@ -6,7 +6,7 @@ inherit eutils flag-o-matic user DESCRIPTION="Network performance benchmark" SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2" -KEYWORDS="alpha ~amd64 arm64 ~hppa ia64 ppc ppc64 sparc x86" +KEYWORDS="alpha amd64 arm64 ~hppa ia64 ppc ppc64 sparc x86" HOMEPAGE="http://www.netperf.org/" LICENSE="netperf" diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest index 82cf7b0177fd..deab42521460 100644 --- a/net-analyzer/sarg/Manifest +++ b/net-analyzer/sarg/Manifest @@ -1,13 +1,6 @@ -AUX sarg-2.3.10-bool.patch 228 BLAKE2B 38c1ca6c03c316afab832c2680afc433d499a9f0218c004996b4f74ef24395c57bd3e2355d1af0244b31d1a50f017faf96ca8e75e142884a3b2ab5ac66bbb7e6 SHA512 f5f5aa42a16e01fe84c4f62715215ed960323b1c2525281c1433e20bde08c1ed4c0a460b635905d2fd7a0269cff232446b557c30dc49b4652988f660b832f618 AUX sarg-2.3.10-config.patch 2612 BLAKE2B 8d0d6bdab60784dd9c289e974dba087b11234b3f961c951bd96ce76a59bdc36f8da5fe5f3c4268f238b5c25f34baa69f97c1e05fbd161abaecb2eb7949d9591d SHA512 e04a971a0838bef3e777708c3328ff940cce84d934de72014eafbcc5123cb8ff2075c30aafdb4ae4541778c6c0fcce38ac32b6dde57ed1a52fc03f1b1f980cda -AUX sarg-2.3.10-format.patch 1541 BLAKE2B cfa03a3dad67f3ca8ec3b47db8755f5760b3780bedcb29549e04cecc955212003930e2a467749e964ab8073a404d55359826132e43ff6d1a01228a1a6fe79229 SHA512 d3c25d94da93dd1308b9c035fff3ddf6a241327596c182d85d79f183b659fa20ea8e806e5b1e3e8675dae843744b7329d03e572260c6932466694103180c8bd6 AUX sarg-2.3.11-configure.patch 641 BLAKE2B 8afacc3e90ee7092b762c812dd7e2cab94e9bc6d63026818fb67b26c814b101695989d31e2b3bdd61a346334008afbe2b6f55493e68ecf5c55f7e23f16325253 SHA512 15dce8406ddcc4a4937743c9a6ee8cbe11eb95ef2d86f56f8e6a7b5f3288534a98cb0b3609332ef6b40a3d5d22dc879aaa750f0bbda64b3d5ecc66c606bad9d4 AUX sarg-2.3.11-format.patch 778 BLAKE2B c3fdcbba47da9ef4b27adeb3cd0bcfc80b1eee230bfb7f44ed5508e0ebe0e5005abf9c40b8794f6986a533170166f7d5c455e0782271f9f87c5db7da594460e9 SHA512 d7e6baa56465d163c0422dd15317bbbf2bf8b20e4aae54eab2c77c7505f18cbf1cc600ddf35ed3f8e7b2a4c58326c5e38c837711c8f9d9188a1e1e8dfe244bc7 -AUX sarg-2.3.9-configure-bash.patch 4033 BLAKE2B 7f98a2fda63c4abe93ec80f5a068bdd99a647f811cb95c05f0a716167ca73b6ae4476b344cfe7f1d7d7b5e43e491790cbc8cb8aefc36bb0e0696cadb69a65350 SHA512 42f40db8b2d378888ce73aab0ab03e05f3bbad516d4db025fe6ce1377e1b1d97db2a857b99fb350c8e92a80de75a4c2c4012403546c3f4e5261972060be60b68 -AUX sarg-2.3.9-configure.patch 641 BLAKE2B dc4162b7180bc40692e779ddf1d1a1b48442e9814c4d043593f695062f132041102ec70807aad07119b9415a9e04776d5728cd2e73a646e4c2dcb4351d4bf9a5 SHA512 0da589199b6ea13589bc8cdc8504f6b4260a03bf1d8ab48093ada01e3be3a82961a2fad6f0abe301ed004bd9c642f0789ebb745d52044214e98211124c66f6ae -DIST sarg-2.3.10.tar.gz 1278071 BLAKE2B a9412069826328a7828cc3759858160a8e9121fee30697b8c54bc2e6ca948255f297147ff8692e3a62fe6c0a2b596a1a73e1090d03ef1fdacdd692866e6ef27d SHA512 d0a61ac6d455feb8fff024c21f1b7547471ef8cf847fd54d9042881cac3ee14a41fe2a8ea9e0fc2bd2ea0448714ba457e9070282c31e4f3c879e4d83d00ecb2d DIST sarg-2.3.11.tar.gz 1346884 BLAKE2B f1ba5e5d3531b611cca1e18444b24772d5f6fb31622d3702ce34bf7e5208b7ff04000ed80c984ff103f785dd9b7015f56403b8389100bbd02cdbf936c8343be9 SHA512 a5bf5c0f696a9d58d9dd1d631d2b458e7a48f597e7a084b032b2feb6185440b08babe7ffaaefc04676f0dbc11301084d1896b6246a7e79a10acdbd7aa7882ff6 -EBUILD sarg-2.3.10-r1.ebuild 936 BLAKE2B f5e330e0c9b7e0a906c04c69e00676bce19a84d021186f3e99208a4bd2fd67895bc837191d0f774fd9488d547813b43e07a0ca8ff72eaadd46284e88bd92082f SHA512 c989ef3e90ae8d1e8852e50d08825efa7596e8c688332e38f648b716bda4cce1d6b35cf1cd249a84c0565284c0aafd9e57d1bfc7d4272219e33dea1156bb16a2 -EBUILD sarg-2.3.10.ebuild 1757 BLAKE2B 1e5d9122b9f9dc647971485eafc762155ed7cda0bcd24739a9b1d780d1c9e7f0880136e9ba0b88dc6e628dd2e2341414fa61f08aa92266b73530c5a3e40c391d SHA512 ceef1daa6e382ffa0095733f6747ad7480aab5dd39edbeef15812aa64ce44c87e56a475c5a29dc4878b0581ac1414b569361349e1446684f8aa7533a6405c182 -EBUILD sarg-2.3.11-r1.ebuild 850 BLAKE2B 5eaf073ba0951e283a2418a23c45d72bf2be1fb0a4dbec7e926f2931586c74489170e702d7ada29066543865521972ddd9b07a1a0ab17d43232cbfa4acf22d33 SHA512 e7dc21b45f3bd8227cc039b2a3b8e7a328073b26bd698d742fefde1ab309d6746f328fd831e5b8bb23e3ed5b7f0a5daf9c28f5f37b6015a8e00a7295c4c0c005 +EBUILD sarg-2.3.11-r1.ebuild 849 BLAKE2B dadaef09ee5131c4aec4bec7a5d27084a9a5da0bcb0bc18f7648ece30d5ff7b8da5345bbc3833c423c3530c2596cdebb837396aacccd2f11471e26a53d78b448 SHA512 395e8bbb6c7b752637393f6ad1b90b964cc7502f3750674888a1ae94da13de0efa890c52f5dd59af0e23f54a4976180859cab86aa3b9ce0dc62bdbe74c0b3973 MISC metadata.xml 856 BLAKE2B 0640133457b9035a7a30e4ec481ff092254902a21cb8f8cc9a91d0a0b13f99a484982787646e2367f7bcde5f3d2436371f588729acc35b638c289c09cddb2ff9 SHA512 3571bb6b4562fa58e9736ce48c4b3930bb33a3b38dec15b79b22b3cbd457ea7751819a2b45a7e728b02e641c187c085e813eb29d8644dc57e40b682f061b115a diff --git a/net-analyzer/sarg/files/sarg-2.3.10-bool.patch b/net-analyzer/sarg/files/sarg-2.3.10-bool.patch deleted file mode 100644 index 188b6dd3732b..000000000000 --- a/net-analyzer/sarg/files/sarg-2.3.10-bool.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/util.c -+++ b/util.c -@@ -2088,7 +2088,7 @@ - int pad_len; - bool bracket=false; - bool port=false; -- bool port_num=0; -+ int port_num=0; - - // skip leading spaces and tabs - while (*buf && (*buf==' ' || *buf=='\t')) buf++; diff --git a/net-analyzer/sarg/files/sarg-2.3.10-format.patch b/net-analyzer/sarg/files/sarg-2.3.10-format.patch deleted file mode 100644 index 926fdc8c6725..000000000000 --- a/net-analyzer/sarg/files/sarg-2.3.10-format.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- a/report.c -+++ b/report.c -@@ -54,7 +54,7 @@ - char accsmart[MAXLEN]; - char crc2[MAXLEN/2 -1]; - char siteind[MAX_TRUNCATED_URL]; -- char arqtt[256]; -+ char arqtt[MAX_USER_FNAME_LEN * 2 + MAXLEN + 10]; - char *oldurltt=NULL; - char oldaccdiatt[11],oldacchoratt[9]; - char tmp3[MAXLEN]; ---- a/util.c -+++ b/util.c -@@ -671,10 +671,10 @@ - char *buildtime(long long int elap) - { - int num = elap / 1000; -- int hor = 0; -- int min = 0; -- int sec = 0; -- static char buf[12]; -+ short int hor = 0; -+ short int min = 0; -+ short int sec = 0; -+ static char buf[15]; - - buf[0]='\0'; - -@@ -1236,10 +1236,10 @@ - char *fixtime(long long int elap) - { - int num = elap / 1000; -- int hor = 0; -- int min = 0; -- int sec = 0; -- static char buf[12]; -+ short int hor = 0; -+ short int min = 0; -+ short int sec = 0; -+ static char buf[15]; - - hor=num / 3600; - min=(num % 3600) / 60; -@@ -1248,7 +1248,7 @@ - if(hor==0 && min==0 && sec==0) - strcpy(buf,"0"); - else -- sprintf(buf,"%d:%02d:%02d",hor,min,sec); -+ sprintf(buf,"%02d:%02d:%02d",hor,min,sec); - - return buf; - } ---- a/index.c -+++ b/index.c -@@ -89,9 +89,9 @@ - char monthdir[MAXLEN]; - char monthname1[9], monthname2[9]; - char nmonth[30]; -- char monthnum[10]; -+ char monthnum[15]; - char dayindex[MAXLEN]; -- char daynum[10]; -+ char daynum[15]; - char title[80]; - int yearsort[150]; - int nyears; ---- a/userinfo.c -+++ b/userinfo.c -@@ -67,7 +67,7 @@ - int skip; - int flen; - int count, clen; -- char cstr[9]; -+ char cstr[10]; - - last=NULL; - for (group=first_user_group ; group ; group=group->next) { diff --git a/net-analyzer/sarg/files/sarg-2.3.9-configure-bash.patch b/net-analyzer/sarg/files/sarg-2.3.9-configure-bash.patch deleted file mode 100644 index ddc0ca8ec4eb..000000000000 --- a/net-analyzer/sarg/files/sarg-2.3.9-configure-bash.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -41,7 +41,7 @@ - CFLAGS="${CFLAGS} -Wextra -Wno-unused-parameter" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_extra_warnings="yes"],[have_extra_warnings="no"]) - AC_MSG_RESULT($have_extra_warnings) --if test "$have_extra_warnings" == "no" ; then -+if test "$have_extra_warnings" = "no" ; then - CFLAGS="${saved_CFLAGS}" - fi - -@@ -50,7 +50,7 @@ - CFLAGS="${CFLAGS} -Werror=implicit-function-declaration" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_implicit_function_declaration="yes"],[have_implicit_function_declaration="no"]) - AC_MSG_RESULT($have_implicit_function_declaration) --if test "$have_implicit_function_declaration" == "no" ; then -+if test "$have_implicit_function_declaration" = "no" ; then - CFLAGS="${saved_CFLAGS}" - fi - -@@ -59,7 +59,7 @@ - CFLAGS="${CFLAGS} -Werror=format" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_error_format="yes"],[have_error_format="no"]) - AC_MSG_RESULT($have_error_format) --if test "$have_error_format" == "no" ; then -+if test "$have_error_format" = "no" ; then - CFLAGS="${saved_CFLAGS}" - fi - -@@ -93,7 +93,7 @@ - [],[with_gd=check]) - if ( test "x$with_gd" != "xno" ) ; then - AC_CHECK_HEADERS(gd.h gdfontl.h gdfontt.h gdfonts.h gdfontmb.h gdfontg.h) -- if ( test "x$ac_cv_header_gd_h" == "xyes" ) ; then -+ if ( test "x$ac_cv_header_gd_h" = "xyes" ) ; then - AC_CHECK_LIB(gd, gdImagePng,LIBS="-lgd ${LIBS}"; HAVE_GD_LIB="yes", HAVE_GD_LIB="") - if ( test "x$HAVE_GD_LIB" != "xyes" ) ; then - AC_MSG_ERROR([ligbd is required to compile sarg with gd]) -@@ -137,7 +137,7 @@ - [],[with_pcre=check]) - if ( test "x$with_pcre" != "xno" ) ; then - AC_CHECK_HEADERS(pcre.h) -- if ( test "x$ac_cv_header_pcre_h" == "xyes" ) ; then -+ if ( test "x$ac_cv_header_pcre_h" = "xyes" ) ; then - LIBS="$LIBS $(pcre-config --libs)" - CFLAGS="$CFLAGS $(pcre-config --cflags)" - else -@@ -243,7 +243,7 @@ - fi - ],[FONTDIR="${datarootdir}/sarg/fonts"]) - if test "$FONTDIR" ; then -- if test "x$prefix" == "xNONE" ; then -+ if test "x$prefix" = "xNONE" ; then - tempfullpath=`prefix=$ac_default_prefix ; eval "echo $FONTDIR"` - else - tempfullpath=`eval "echo $FONTDIR"` -@@ -261,7 +261,7 @@ - IMAGEDIR=$enableval - fi - ],[IMAGEDIR="${datarootdir}/sarg/images"]) --if test "x$prefix" == "xNONE" ; then -+if test "x$prefix" = "xNONE" ; then - tempfullpath=`prefix=$ac_default_prefix ; eval "echo $IMAGEDIR"` - else - tempfullpath=`eval "echo $IMAGEDIR"` -@@ -286,7 +286,7 @@ - CFLAGS="${CFLAGS} -Wformat -Werror=format-security" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_format_security="yes"],[have_format_security="no"]) - AC_MSG_RESULT($have_format_security) -- if test "$have_format_security" == "no" ; then -+ if test "$have_format_security" = "no" ; then - CFLAGS="${saved_CFLAGS}" - fi - -@@ -295,7 +295,7 @@ - CFLAGS="${CFLAGS} -Wempty-body" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_empty_body="yes"],[have_empty_body="no"]) - AC_MSG_RESULT($have_empty_body) -- if test "$have_empty_body" == "no" ; then -+ if test "$have_empty_body" = "no" ; then - CFLAGS="${saved_CFLAGS}" - fi - fi -@@ -367,14 +367,14 @@ - AC_CONFIG_FILES([Makefile po/Makefile.in]) - AC_OUTPUT - --if ( test "x$gd_status" == "xdisabled" ) ; then -+if ( test "x$gd_status" = "xdisabled" ) ; then - AC_MSG_NOTICE([Not building with gd as requested on the configuration command line]) --elif ( test "x$gd_status" == "xnot found" ) ; then -+elif ( test "x$gd_status" = "xnot found" ) ; then - AC_MSG_NOTICE([gd.h was not found so the graphs won't be available in the report]) - fi - --if ( test "x$pcre_status" == "xdisabled" ) ; then -+if ( test "x$pcre_status" = "xdisabled" ) ; then - AC_MSG_NOTICE([Not building with pcre as requested on the configuration command line]) --elif ( test "x$pcre_status" == "xnot found" ) ; then -+elif ( test "x$pcre_status" = "xnot found" ) ; then - AC_MSG_NOTICE([pcre.h was not found so the regexp won't be available in the hostalias]) - fi diff --git a/net-analyzer/sarg/files/sarg-2.3.9-configure.patch b/net-analyzer/sarg/files/sarg-2.3.9-configure.patch deleted file mode 100644 index 630e944f7534..000000000000 --- a/net-analyzer/sarg/files/sarg-2.3.9-configure.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -2,6 +2,7 @@ - AC_INIT([sarg],[2.3.9]) - AC_CONFIG_SRCDIR([log.c]) - AC_CONFIG_AUX_DIR(cfgaux) -+AC_CONFIG_MACRO_DIR(m4) - - AC_CANONICAL_HOST - -@@ -26,6 +27,11 @@ - dnl C99 support is required to define LLONG_MAX (at least on CentOS 5.7) - AC_PROG_CC_C99 - -+dnl mkdir_p / MKDIR_P -+AC_PROG_MKDIR_P -+mkdir_p="$MKDIR_P" -+AC_SUBST(mkdir_p) -+ - # Report more warnings to improve code quality. - CFLAGS="${CFLAGS} -Wall -Wno-sign-compare" - -@@ -60,7 +66,7 @@ - - case "$host" in - *-solaris*) -- LDFLAGS="${LDFLAGS} -lsocket -lnsl" -+ LIBS="${LIBS} -lsocket -lnsl" - CFLAGS="-DSOLARIS ${CFLAGS}" - ;; - esac diff --git a/net-analyzer/sarg/sarg-2.3.10-r1.ebuild b/net-analyzer/sarg/sarg-2.3.10-r1.ebuild deleted file mode 100644 index 72e6e4dbb97f..000000000000 --- a/net-analyzer/sarg/sarg-2.3.10-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools - -DESCRIPTION="Squid Analysis Report Generator" -HOMEPAGE="http://sarg.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~x86" -SLOT="0" -IUSE="+gd ldap pcre" - -DEPEND=" - gd? ( media-libs/gd[png,truetype] ) - ldap? ( net-nds/openldap ) - pcre? ( dev-libs/libpcre ) -" -RDEPEND="${DEPEND}" - -DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess ) -PATCHES=( - "${FILESDIR}"/${PN}-2.3.9-configure.patch - "${FILESDIR}"/${PN}-2.3.9-configure-bash.patch - "${FILESDIR}"/${PN}-2.3.10-format.patch - "${FILESDIR}"/${PN}-2.3.10-bool.patch - "${FILESDIR}"/${PN}-2.3.10-config.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - econf \ - $(use_with gd) \ - $(use_with ldap) \ - $(use_with pcre) \ - --sysconfdir="${EPREFIX}/etc/sarg/" -} diff --git a/net-analyzer/sarg/sarg-2.3.10.ebuild b/net-analyzer/sarg/sarg-2.3.10.ebuild deleted file mode 100644 index 870baa2e64d8..000000000000 --- a/net-analyzer/sarg/sarg-2.3.10.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="Squid Analysis Report Generator" -HOMEPAGE="http://sarg.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" -SLOT="0" -IUSE="+gd ldap pcre" - -DEPEND=" - gd? ( media-libs/gd[png,truetype] ) - ldap? ( net-nds/openldap ) - pcre? ( dev-libs/libpcre ) -" -RDEPEND="${DEPEND}" - -DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess ) - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-2.3.9-configure.patch \ - "${FILESDIR}"/${PN}-2.3.9-configure-bash.patch - - sed -i \ - -e 's:/usr/local/squid/var/logs/access.log:/var/log/squid/access.log:' \ - -e 's:/usr/local/\(squidGuard/squidGuard.conf\):/etc/\1:' \ - -e 's:/var/www/html/squid-reports:/var/www/localhost/htdocs/squid-reports:' \ - -e 's:/usr/local/sarg/exclude_codes:/etc/sarg/exclude_codes:' \ - sarg.conf || die - - sed -i \ - -e 's:"/var/www/html/squid-reports":"/var/www/localhost/htdocs/squid-reports":' \ - log.c || die #43132 - - sed -i \ - -e 's:/usr/local/sarg/passwd:/etc/sarg/passwd:' \ - htaccess || die - - sed -i \ - -e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \ - -e 's:/usr/local/squid/etc/passwd:/etc/squid/passwd:' \ - user_limit_block || die - - sed -i \ - -e 's:/usr/local/squid/etc/block.txt:/etc/squid/etc/block.txt:' \ - sarg-php/sarg-block-it.php || die - - sed -i \ - -e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \ - -e 's:/usr/local/\(squidGuard/squidGuard.conf\):/etc/\1:' \ - sarg.1 sarg-php/sarg-squidguard-block.php || die - - eautoreconf -} - -src_configure() { - econf \ - $(use_with gd) \ - $(use_with ldap) \ - $(use_with pcre) \ - --sysconfdir="${EPREFIX}/etc/sarg/" -} diff --git a/net-analyzer/sarg/sarg-2.3.11-r1.ebuild b/net-analyzer/sarg/sarg-2.3.11-r1.ebuild index 10cc09c45d5e..88f7c507e91e 100644 --- a/net-analyzer/sarg/sarg-2.3.11-r1.ebuild +++ b/net-analyzer/sarg/sarg-2.3.11-r1.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="http://sarg.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" -KEYWORDS="amd64 ~ppc x86" +KEYWORDS="amd64 ppc x86" SLOT="0" IUSE="+gd ldap pcre" |