commit:     d1e6dd920a4a96d3db2cd1c93435e42a6fa2714d
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 18 17:54:41 2017 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 18:33:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1e6dd92

net-analyzer/munin: add 2.0.33, bug 602710

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-analyzer/munin/Manifest            |   2 +
 net-analyzer/munin/munin-2.0.33.ebuild | 412 +++++++++++++++++++++++++++++++++
 2 files changed, 414 insertions(+)

diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 4038ef4eda9..c924770f5b6 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -2,3 +2,5 @@ DIST munin-2.0.19-gentoo-1.tar.xz 10884 SHA256 
e9fcec3cd671a0008348ab3f33e435073
 DIST munin-2.0.19.tar.gz 1335496 SHA256 
13db9b00d432b92907d61f9f2bd18c2aafca03b2a6e257222fff17aa4ed02896 SHA512 
c08ab54634587bb2abc4e55e52114d417ce9f3d2b421c4f44c5df3506238ecd80d1f27359346404a4eab7d779a42bc3438ebb75210e979662f261de1521a464b
 WHIRLPOOL 
288ac49ae86aff13591cbe7357afe963d6da95b3915d94ea3887a63347dbd45969d3a86d8378d2c6ddcb3b8ad24f27ff95ce2567cdfbb216e6584219db7800e1
 DIST munin-2.0.25-gentoo-1.tar.xz 10964 SHA256 
725a91fe3690a045439fd3d2541de9b67b4fe3628a6c6ec838b690c019f04922 SHA512 
9065c24fc7942d6e02e7d2a7d3be516852816164c5ada496aa2703f1e5a3a41bd7f00302348496d58fad7d39d8bb2b84cfa2a2481e92834c6d1958bb153c023f
 WHIRLPOOL 
318b0df95352b2c8a0181ef577179d380b8002288e79ac37d903603fce482ad2f0cbe5e0797495e4d1cb50c765b80daadad8d861ef83d6db89f47effeb7d6183
 DIST munin-2.0.25.tar.gz 1337586 SHA256 
6832bc5839d03639e4309178d9370697fc8a80a83d9b6653953f40161e949694 SHA512 
a29563cfef26b05237b3813b44b5582563f2f75477ae3c076540cfb4f3e83f89193bd05fd7eae208d9d1bae58aff75977cc2c5f4de81225f0cbb2ba2c41effa9
 WHIRLPOOL 
14e7fac3d91025816fa31823484673726441f186ded0bb2a6dc6f4d8f3976211a6fc49c20c7faac5d7078d6f9963766517ee2c9b22820b1164333cb6def106b8
+DIST munin-2.0.33-gentoo-1.tar.xz 11024 SHA256 
f956d9051e0da05231bb8777c0ca3342ca5bb86e48c44a68289c41c42c440e46 SHA512 
c1f49f01fd641e157145d9710a091696c09380887a374ee845e516d40384ee6bc576019f3510ac322436b1f10ee1b675ae512b9f677a6a0fa2ef022cbb7269b8
 WHIRLPOOL 
3c0fbccc4c8ee9a2dacf8ce1845d149198c8d53ed17cd62fd17bae60986ca6616e12213d4f520fd06e8329accec559a7f9529559f21dc62de3aa0b66680d7ab7
+DIST munin-2.0.33.tar.gz 1349546 SHA256 
99dbc1e5f4f0fed4e28f295245333544193f9a26c597f2a78571ae20b4d450b6 SHA512 
33c56fcb347396f29662f304aa50f0e3dfc909b067ea49809762bbbb4dd2cd7e95789c318adcef64923e6d0248dcf9ea6fe933c49d920b6b7856d85511d40d67
 WHIRLPOOL 
2429b605d19bbf4caa460e9f2b46de8e2462bf606bd1143bcdcbb4f2e079b2acf5f87def86affa6152ed8b26cf14bc83d62274bb58424818deb2b5f2024de7f0

diff --git a/net-analyzer/munin/munin-2.0.33.ebuild 
b/net-analyzer/munin/munin-2.0.33.ebuild
new file mode 100644
index 00000000000..4a882bb9c12
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.33.ebuild
@@ -0,0 +1,412 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PATCHSET=1
+
+inherit eutils 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 ~mips ~ppc ~x86"
+IUSE="asterisk irc java memcached minimal mysql postgres selinux ssl test cgi 
ipv6 syslog ipmi http dhcpd doc apache"
+REQUIRED_USE="cgi? ( !minimal ) apache? ( 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
+       apache? ( 
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 )
+       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() {
+       epatch "${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 apache 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 apache 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 apache apache munin) \
+                               /var/cache/munin-cgi \
+                               /var/log/munin/munin-cgi-{graph,html}.log
+
+                       if use apache; 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 apache apache munin) \
+                       "${ROOT}"/var/cache/munin-cgi \
+                       "${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
+
+               if use apache; 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
+}

Reply via email to