net-analyzer/munin: cleanup
authorHans de Graaff <graaff@gentoo.org>
Fri, 29 May 2020 05:42:51 +0000 (07:42 +0200)
committerHans de Graaff <graaff@gentoo.org>
Fri, 29 May 2020 05:48:32 +0000 (07:48 +0200)
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
net-analyzer/munin/Manifest
net-analyzer/munin/munin-2.0.57.ebuild [deleted file]

index afd8481757cb1363d6fee80e6e46cd6335b51727..cbf5ac0eed0df782de54159ff0278867d83622ca 100644 (file)
@@ -2,8 +2,6 @@ DIST munin-2.0.52-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051
 DIST munin-2.0.52.tar.gz 2266820 BLAKE2B 41233cd28ce4d682dfd47895061426404540c6b1c65798609a2d509d39ad5359b22087027662e7c03848e5676815843c34d078b782e3d0ab3a6a29b6a22e058b SHA512 7439ea10006a94227b71328d06411378f6855f23f17815a433b3a1c40ea23da5a25a366d48f911b9cfdc43c4b98f3bb9777b67db2b894441eb8941e84ede379c
 DIST munin-2.0.56-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.56.tar.gz 2271203 BLAKE2B f3df227b905ab794e2253637d367819eff2625f9e0f2355d23916b033b3b23d14bb64a78bf6a334f0c7a1859e60c227d1f754a2689bf291cc5f43a46986d35fe SHA512 111b9b8d88474f480eac1e304a92a52c2295d72a1c6709bb2942ff6ee0ba26a56d25dc5d0cf08ddb98a23d6d9693ad0cddb2185e10df83d553655d017d102b1d
-DIST munin-2.0.57-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
-DIST munin-2.0.57.tar.gz 2272894 BLAKE2B 8daff79d4c9224d83ea91d4583a1c11cdc0d2de05c536da5717cf31555f1d2c87475e4de541688e4b542267a6b8a534911149a7edd6469bd13de79838fae3aed SHA512 d00cfaf450dc4be5fe52f30440fc14ee49f021fe46c1a641ffd2e60682056051b6b2fc8713bd14ae9f9e5aaf28dbf335b6a2e9ec53f8518178888442c069298c
 DIST munin-2.0.59-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.59.tar.gz 2276011 BLAKE2B 0681cd838daaa056418258d473825642e2aa6b7a3ac7a435859033a467351145be73df327d3149b46c53f5a04c602bea57bc5af428cafb7b5bf1e9c780915ddf SHA512 5597db797f7a0de3581a17be13b079a3fd1e50903014d67d81a262e921fdfca84eee8ec65e3927438db0e01525d16faaabc7e3f7d4cad1a73e7e14002b10478f
 DIST munin-2.0.61-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
diff --git a/net-analyzer/munin/munin-2.0.57.ebuild b/net-analyzer/munin/munin-2.0.57.ebuild
deleted file mode 100644 (file)
index 80f46fa..0000000
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCHSET=1
-
-inherit java-pkg-opt-2 systemd
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin-monitoring.org/"
-SRC_URI="
-       https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
-       https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
-REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
-RESTRICT="!test? ( test )"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
-# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
-DEPEND_COM="
-       acct-user/munin
-       acct-user/munin-async
-       acct-group/munin
-       dev-lang/perl:=[berkdb]
-       dev-perl/DBI
-       dev-perl/Date-Manip
-       dev-perl/File-Copy-Recursive
-       dev-perl/List-MoreUtils
-       dev-perl/Log-Log4perl
-       dev-perl/Net-CIDR
-       dev-perl/Net-DNS
-       dev-perl/Net-Netmask
-       dev-perl/Net-SNMP
-       dev-perl/Net-Server[ipv6(-)?]
-       virtual/perl-Digest-MD5
-       virtual/perl-Getopt-Long
-       virtual/perl-MIME-Base64
-       virtual/perl-Storable
-       virtual/perl-Text-Balanced
-       virtual/perl-Time-HiRes
-       apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
-       asterisk? ( dev-perl/Net-Telnet )
-       cgi? (
-               dev-perl/FCGI
-               dev-perl/CGI-Fast
-               )
-       dhcpd? (
-               >=net-misc/dhcp-3[server]
-               dev-perl/Net-IP
-               dev-perl/HTTP-Date
-               )
-       doc? ( dev-python/sphinx )
-       http? ( dev-perl/libwww-perl )
-       irc? ( dev-perl/Net-IRC )
-       ldap? ( dev-perl/perl-ldap )
-       kernel_linux? ( sys-process/procps )
-       memcached? ( dev-perl/Cache-Memcached )
-       mysql? (
-               virtual/mysql
-               dev-perl/Cache-Cache
-               dev-perl/DBD-mysql
-               )
-       postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
-       ssl? ( dev-perl/Net-SSLeay )
-       syslog? ( virtual/perl-Sys-Syslog )
-       !minimal? (
-               dev-perl/HTML-Template
-               dev-perl/IO-Socket-INET6
-               dev-perl/URI
-               >=net-analyzer/rrdtool-1.3[graph,perl]
-               virtual/ssh
-               )
-       "
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-       dev-perl/Module-Build
-       java? ( >=virtual/jdk-1.5 )
-       test? (
-               dev-perl/Test-Deep
-               dev-perl/Test-Exception
-               dev-perl/Test-LongString
-               dev-perl/Test-Differences
-               dev-perl/Test-MockModule
-               dev-perl/Test-MockObject
-               dev-perl/File-Slurp
-               dev-perl/IO-stringy
-               dev-perl/IO-Socket-INET6
-       )"
-RDEPEND="${DEPEND_COM}
-               virtual/awk
-               ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
-               java? (
-                       >=virtual/jre-1.5
-                       || ( net-analyzer/netcat net-analyzer/openbsd-netcat )
-               )
-               !minimal? (
-                       virtual/cron
-                       media-fonts/dejavu
-               )
-               selinux? ( sec-policy/selinux-munin )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-       echo ${PV} > RELEASE || die
-
-       eapply "${WORKDIR}"/patches/*.patch
-
-       eapply_user
-
-       java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-       local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
-       use cgi || cgidir="${T}/useless/cgi-bin"
-
-       local cgiuser=$(usex apache2 apache munin)
-
-       cat >> "${S}"/Makefile.config <<- EOF
-       PREFIX=\$(DESTDIR)/usr
-       CONFDIR=\$(DESTDIR)/etc/munin
-       DOCDIR=${T}/useless/doc
-       MANDIR=\$(PREFIX)/share/man
-       LIBDIR=\$(PREFIX)/libexec/munin
-       HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
-       CGIDIR=${cgidir}
-       CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
-       CGIUSER=${cgiuser}
-       DBDIR=\$(DESTDIR)/var/lib/munin
-       DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
-       SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
-       LOGDIR=\$(DESTDIR)/var/log/munin
-       PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2)
-       JCVALID=$(usex java yes no)
-       STATEDIR=\$(DESTDIR)/run/munin
-       EOF
-}
-
-# parallel make and install need to be fixed before, and I haven't
-# gotten around to do so yet.
-src_compile() {
-       emake -j1
-       use doc && emake -C doc html
-}
-
-src_test() {
-       if [[ ${EUID} == 0 ]]; then
-               eerror "You cannot run tests as root."
-               eerror "Please enable FEATURES=userpriv before proceeding."
-               return 1
-       fi
-
-       local testtargets="test-common test-node test-plugins"
-       use minimal || testtargets+=" test-master"
-
-       LC_ALL=C emake -j1 ${testtargets}
-}
-
-src_install() {
-       local dirs="
-               /var/log/munin
-               /var/lib/munin/plugin-state
-               /var/lib/munin-node/plugin-state
-               /var/www/localhost/htdocs/munin
-               /etc/munin/plugin-conf.d
-               /etc/munin/plugins"
-       use minimal || dirs+=" /etc/munin/munin-conf.d/"
-
-       keepdir ${dirs}
-       fowners munin:munin ${dirs}
-
-       # parallel install doesn't work and it's also pointless to have this
-       # run in parallel for now (because it uses internal loops).
-       emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
-
-       # we remove /run from the install, as it's not the package's to deal
-       # with.
-       rm -rf "${D}"/run || die
-
-       # remove the plugins for non-Gentoo package managers; use -f so that
-       # it doesn't fail when installing on non-Linux platforms.
-       rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
-
-       insinto /etc/munin/plugin-conf.d/
-       newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
-
-       newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
-       newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
-
-       newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
-
-       dodir /usr/lib/tmpfiles.d
-       cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
-       d /run/munin 0700 munin munin - -
-       EOF
-
-       systemd_dounit "${FILESDIR}"/munin-async.service
-       systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
-       systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
-       systemd_dounit "${FILESDIR}"/munin-node.service
-
-       cat >> "${T}"/munin.env <<- EOF
-       CONFIG_PROTECT=/var/spool/munin-async/.ssh
-       EOF
-       newenvd "${T}"/munin.env 50munin
-
-       dodoc README ChangeLog INSTALL
-       if use doc; then
-               cd "${S}"/doc/_build/html || die
-               docinto html
-               dodoc -r *
-               cd "${S}" || die
-       fi
-
-       dodir /etc/logrotate.d/
-       sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
-               "${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
-
-       dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
-
-       if use syslog; then
-               sed -i -e '/log_file/s| .*| Sys::Syslog|' \
-                       "${D}"/etc/munin/munin-node.conf || die
-       fi
-
-       # Use a simpler pid file to avoid trouble with /run in tmpfs. The
-       # munin-node service is ran as user root, and only later drops
-       # privileges.
-       sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
-               "${D}"/etc/munin/munin-node.conf || die
-
-       keepdir /var/spool/munin-async/.ssh
-       touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
-       fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
-       fperms 0750 /var/spool/munin-async{,/.ssh}
-       fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
-
-       if use minimal; then
-               # This requires the presence of munin-update, which is part of
-               # the non-minimal install...
-               rm "${D}"/usr/libexec/munin/plugins/munin_stats
-       else
-               # remove font files so that we don't have to keep them around
-               rm "${D}"/usr/libexec/${PN}/*.ttf || die
-
-               if use cgi; then
-                       sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
-
-                       keepdir /var/cache/munin-cgi
-                       touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
-                       fowners $(usex apache2 apache munin) \
-                               /var/cache/munin-cgi \
-                               /var/log/munin/munin-cgi-{graph,html}.log
-
-                       if use apache2; then
-                               insinto /etc/apache2/vhosts.d
-                               newins "${FILESDIR}"/munin.apache.include munin.include
-                               newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
-                       fi
-               else
-                       sed \
-                               -e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
-                               -i "${D}"/etc/munin/munin.conf || die
-               fi
-
-               keepdir /var/lib/munin/.ssh
-               cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
-               IdentityFile /var/lib/munin/.ssh/id_ecdsa
-               IdentityFile /var/lib/munin/.ssh/id_rsa
-               EOF
-
-               fowners munin:munin /var/lib/munin/.ssh/{,config}
-               fperms go-rwx /var/lib/munin/.ssh/{,config}
-
-               dodir /usr/share/${PN}
-               cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
-               # Force the shell to bash
-               SHELL=/bin/bash
-               # Mail reports to root@, not munin@
-               MAILTO=root
-
-               # This runs the munin task every 5 minutes.
-               */5     * * * *         /usr/bin/munin-cron
-
-               # Alternatively, this route works differently
-               # Update once a minute (for busy sites)
-               #*/1 * * * *            /usr/libexec/munin/munin-update
-               ## Check for limit excess every 2 minutes
-               #*/2 * * * *            /usr/libexec/munin/munin-limits
-               ## Update graphs every 5 minutes
-               #*/5 * * * *            nice /usr/libexec/munin/munin-graph
-               ## Update HTML pages every 15 minutes
-               #*/15 * * * *           nice /usr/libexec/munin/munin-html
-               EOF
-
-               cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
-               # Mail reports to root@, not munin@, only execute one at a time
-               !mailto(root),serial(true)
-
-               # This runs the munin task every 5 minutes.
-               @ 5             /usr/bin/munin-cron
-
-               # Alternatively, this route works differently
-               # Update once a minute (for busy sites)
-               #@ 1    /usr/libexec/munin/munin-update
-               ## Check for limit excess every 2 minutes
-               #@ 2    /usr/libexec/munin/munin-limits
-               ## Update graphs every 5 minutes
-               #@ 5    nice /usr/libexec/munin/munin-graph
-               ## Update HTML pages every 15 minutes
-               #@ 15   nice /usr/libexec/munin/munin-html
-               EOF
-
-               # remove .htaccess file
-               find "${D}" -name .htaccess -delete || die
-       fi
-}
-
-pkg_config() {
-       if use minimal; then
-               einfo "Nothing to do."
-               return 0
-       fi
-
-       einfo "Press enter to install the default crontab for the munin master"
-       einfo "installation from /usr/share/${PN}/f?crontab"
-       einfo "If you have a large site, you may wish to customize it."
-       read
-
-       ebegin "Setting up cron ..."
-       if has_version sys-process/fcron; then
-               fcrontab - -u munin < /usr/share/${PN}/fcrontab
-       else
-               # dcron is very fussy about syntax
-               # the following is the only form that works in BOTH dcron and vixie-cron
-               crontab - -u munin < /usr/share/${PN}/crontab
-       fi
-       eend $?
-
-       einfo "Press enter to set up the SSH keys used for SSH transport"
-       read
-
-       # generate one rsa (for legacy) and one ecdsa (for new systems)
-       ssh-keygen -t rsa \
-               -f /var/lib/munin/.ssh/id_rsa -N '' \
-               -C "created by portage for ${CATEGORY}/${PN}" || die
-       ssh-keygen -t ecdsa \
-               -f /var/lib/munin/.ssh/id_ecdsa -N '' \
-               -C "created by portage for ${CATEGORY}/${PN}" || die
-       chown -R munin:munin /var/lib/munin/.ssh || die
-       chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
-
-       einfo "Your public keys are available in "
-       einfo "  /var/lib/munin/.ssh/id_rsa.pub"
-       einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
-       einfo "and follows for convenience"
-       echo
-       cat /var/lib/munin/.ssh/id_*.pub
-}
-
-pkg_postinst() {
-       elog "Please follow the munin documentation to set up the plugins you"
-       elog "need, afterwards start munin-node."
-       elog ""
-       elog "To make use of munin-async, make sure to set up the corresponding"
-       elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
-       elog ""
-       if ! use minimal; then
-               elog "Please run"
-               elog "  emerge --config net-analyzer/munin"
-               elog "to automatically configure munin's cronjobs as well as generate"
-               elog "passwordless SSH keys to be used with munin-async."
-       fi
-       elog ""
-       elog "Further information about setting up Munin in Gentoo can be found"
-       elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
-
-       if use cgi; then
-               chown $(usex apache2 apache munin) \
-                       "${ROOT}"/var/cache/munin-cgi \
-                       "${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
-
-               if use apache2; then
-                       elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
-                       elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
-                       elog "host you want it to be served."
-                       elog "If you want to enable CGI-based HTML as well, you have to add to"
-                       elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
-               else
-                       elog "Effective CGI support has just been added in 2.0.7-r6."
-                       elog "Documentation on how to use it is still sparse."
-               fi
-       fi
-
-       # we create this here as we don't want Portage to check /run
-       # symlinks but we still need this to be present before the reboot.
-       if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
-               mkdir "${ROOT}"/run/munin
-               chown munin:munin "${ROOT}"/run/munin
-               chmod 0700 "${ROOT}"/run/munin
-       fi
-}