From 6f1d011e30dbce0eab4052d9960e486e1c6352bf Mon Sep 17 00:00:00 2001 From: "Andreas K. Hüttel" Date: Thu, 29 Sep 2016 23:27:21 +0200 Subject: net-analyzer/icinga: Add missing slot operator in Perl dependency, bug 595428 Package-Manager: portage-2.3.0 --- net-analyzer/icinga/icinga-1.13.3-r1.ebuild | 269 ---------------------------- net-analyzer/icinga/icinga-1.13.3-r2.ebuild | 269 ++++++++++++++++++++++++++++ 2 files changed, 269 insertions(+), 269 deletions(-) delete mode 100644 net-analyzer/icinga/icinga-1.13.3-r1.ebuild create mode 100644 net-analyzer/icinga/icinga-1.13.3-r2.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/icinga/icinga-1.13.3-r1.ebuild b/net-analyzer/icinga/icinga-1.13.3-r1.ebuild deleted file mode 100644 index 3813739072a4..000000000000 --- a/net-analyzer/icinga/icinga-1.13.3-r1.ebuild +++ /dev/null @@ -1,269 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator - -DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils" -HOMEPAGE="http://www.icinga.org/" -#MY_PV=$(delete_version_separator 3) -#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz" -#S=${WORKDIR}/${PN}-${MY_PV} -#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz - https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/CVE-2015-8010_1.13.3.patch" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa x86" -IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web" -DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) - perl? ( dev-lang/perl ) - virtual/mailx - web? ( - media-libs/gd[jpeg,png] - lighttpd? ( www-servers/lighttpd ) - ) - !net-analyzer/nagios-core" -RDEPEND="${DEPEND} - plugins? ( || ( - net-analyzer/monitoring-plugins - net-analyzer/nagios-plugins - ) )" -RESTRICT="test" - -want_apache2 - -pkg_setup() { - depend.apache_pkg_setup - enewgroup icinga - enewgroup nagios - enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios" -} - -src_prepare() { - epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch" - epatch "${DISTDIR}/CVE-2015-8010_1.13.3.patch" -} - -src_configure() { - local myconf - - myconf="$(use_enable perl embedded-perl) - $(use_with perl perlcache) - $(use_enable idoutils) - $(use_enable ssl) - --with-cgiurl=/icinga/cgi-bin - --with-log-dir=/var/log/icinga - --libdir=/usr/$(get_libdir) - --bindir=/usr/sbin - --sbindir=/usr/$(get_libdir)/icinga/cgi-bin - --datarootdir=/usr/share/icinga/htdocs - --localstatedir=/var/lib/icinga - --sysconfdir=/etc/icinga - --with-lockfile=/var/run/icinga/icinga.lock - --with-temp-dir=/tmp/icinga - --with-temp-file=/tmp/icinga/icinga.tmp" - - if use idoutils ; then - myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock - --with-icinga-chkfile=/var/lib/icinga/icinga.chk - --with-ido-sockfile=/var/lib/icinga/ido.sock - --with-idomod-tmpfile=/tmp/icinga/idomod.tmp" - fi - - if use eventhandler ; then - myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers" - fi - - if use plugins ; then - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" - else - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" - fi - - if use !apache2 && use !lighttpd ; then - myconf+=" --with-command-group=icinga" - else - if use apache2 ; then - myconf+=" --with-httpd-conf=/etc/apache2/conf.d" - myconf+=" --with-command-group=apache" - elif use lighttpd ; then - myconf+=" --with-command-group=lighttpd" - fi - fi - - econf ${myconf} -} - -src_compile() { - tc-export CC - - emake icinga || die "make failed" - - if use web ; then - emake DESTDIR="${D}" cgis || die - fi - - if use contrib ; then - emake DESTDIR="${D}" -C contrib || die - fi - - if use idoutils ; then - emake DESTDIR="${D}" idoutils || die - fi -} - -src_install() { - dodoc Changelog README UPGRADING || die - - if ! use web ; then - sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die - fi - - emake DESTDIR="${D}" install{,-config,-commandmode} || die - - if use idoutils ; then - emake DESTDIR="${D}" install-idoutils || die - fi - - if use contrib ; then - emake DESTDIR="${D}" -C contrib install || die - fi - - if use eventhandler ; then - emake DESTDIR="${D}" install-eventhandlers || die - fi - - newinitd "${FILESDIR}"/icinga-init.d icinga || die - newconfd "${FILESDIR}"/icinga-conf.d icinga || die - if use idoutils ; then - newinitd "${FILESDIR}"/ido2db-init.d ido2db || die - newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die - insinto /usr/share/icinga/contrib/db - doins -r module/idoutils/db/* || die - fi - # Apache Module - if use web ; then - if use apache2 ; then - insinto "${APACHE_MODULES_CONFDIR}" - newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die - elif use lighttpd ; then - insinto /etc/lighttpd - newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die - else - ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver" - ewarn "out-of-the-box. Since you are not using one of them, you" - ewarn "have to configure your webserver accordingly yourself." - fi - fowners -R root:root /usr/$(get_libdir)/icinga || die - cd "${D}" || die - find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} + - find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} + - fi - - if use eventhandler ; then - dodir /etc/icinga/eventhandlers || die - fowners icinga:icinga /etc/icinga/eventhandlers || die - fi - - keepdir /etc/icinga - keepdir /var/lib/icinga - keepdir /var/lib/icinga/archives - keepdir /var/lib/icinga/rw - keepdir /var/lib/icinga/spool/checkresults - - if use apache2 ; then - webserver=apache - elif use lighttpd ; then - webserver=lighttpd - else - webserver=icinga - fi - - fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga" - fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw" - - fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw" - fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga" - - # paxmarks - if use idoutils ; then - pax-mark m usr/sbin/ido2db - fi -} - -pkg_postinst() { - if use web ; then - elog "This does not include cgis that are perl-dependent" - elog "Currently traceroute.cgi is perl-dependent" - elog "Note that the user your webserver is running as needs" - elog "read-access to /etc/icinga." - elog - if use apache2 || use lighttpd ; then - elog "There are several possible solutions to accomplish this," - elog "choose the one you are most comfortable with:" - elog - if use apache2 ; then - elog " usermod -G icinga apache" - elog "or" - elog " chown icinga:apache /etc/icinga" - elog - elog "Also edit /etc/conf.d/apache2 and add a line like" - elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\"" - elog - elog "Icinga web service needs user authentication. If you" - elog "use the base configuration, you need a password file" - elog "with a password for user \"icingaadmin\"" - elog "You can create this file by executing:" - elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin" - elog - elog "you may want to also add apache to the icinga group" - elog "to allow it access to the AuthUserFile" - elog - elif use lighttpd ; then - elog " usermod -G icinga lighttpd " - elog "or" - elog " chown icinga:lighttpd /etc/icinga" - elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'" - fi - elog - elog "That will make icinga's web front end visable via" - elog "http://localhost/icinga/" - elog - else - elog "IMPORTANT: Do not forget to add the user your webserver" - elog "is running as to the icinga group!" - fi - else - ewarn "Please note that you have installed Icinga without web interface." - ewarn "Please don't file any bugs about having no web interface when you do this." - ewarn "Thank you!" - fi - elog - elog "If you want icinga to start at boot time" - elog "remember to execute:" - elog " rc-update add icinga default" - elog - elog "If your kernel has /proc protection, icinga" - elog "will not be happy as it relies on accessing the proc" - elog "filesystem. You can fix this by adding icinga into" - elog "the group wheel, but this is not recomended." - elog - if [ -d "${ROOT}"/var/icinga ] ; then - ewarn - ewarn "/var/icinga was moved to /var/lib/icinga" - ewarn "please move the files if this was an upgrade" - if use idoutils ; then - ewarn "and edit /etc/ido2db.cfg to change the location of the files" - ewarn "it accesses" - ewarn "update your db with the scripts under the directory" - ewarn "/usr/share/icinga/contrib/db/" - fi - ewarn - ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files" - ewarn "remove /var/icinga afterwards to make this warning disappear" - fi -} diff --git a/net-analyzer/icinga/icinga-1.13.3-r2.ebuild b/net-analyzer/icinga/icinga-1.13.3-r2.ebuild new file mode 100644 index 000000000000..3c3076499561 --- /dev/null +++ b/net-analyzer/icinga/icinga-1.13.3-r2.ebuild @@ -0,0 +1,269 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator + +DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils" +HOMEPAGE="http://www.icinga.org/" +#MY_PV=$(delete_version_separator 3) +#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz" +#S=${WORKDIR}/${PN}-${MY_PV} +#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz + https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/CVE-2015-8010_1.13.3.patch" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~hppa x86" +IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web" +DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) + perl? ( dev-lang/perl:= ) + virtual/mailx + web? ( + media-libs/gd[jpeg,png] + lighttpd? ( www-servers/lighttpd ) + ) + !net-analyzer/nagios-core" +RDEPEND="${DEPEND} + plugins? ( || ( + net-analyzer/monitoring-plugins + net-analyzer/nagios-plugins + ) )" +RESTRICT="test" + +want_apache2 + +pkg_setup() { + depend.apache_pkg_setup + enewgroup icinga + enewgroup nagios + enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios" +} + +src_prepare() { + epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch" + epatch "${DISTDIR}/CVE-2015-8010_1.13.3.patch" +} + +src_configure() { + local myconf + + myconf="$(use_enable perl embedded-perl) + $(use_with perl perlcache) + $(use_enable idoutils) + $(use_enable ssl) + --with-cgiurl=/icinga/cgi-bin + --with-log-dir=/var/log/icinga + --libdir=/usr/$(get_libdir) + --bindir=/usr/sbin + --sbindir=/usr/$(get_libdir)/icinga/cgi-bin + --datarootdir=/usr/share/icinga/htdocs + --localstatedir=/var/lib/icinga + --sysconfdir=/etc/icinga + --with-lockfile=/var/run/icinga/icinga.lock + --with-temp-dir=/tmp/icinga + --with-temp-file=/tmp/icinga/icinga.tmp" + + if use idoutils ; then + myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock + --with-icinga-chkfile=/var/lib/icinga/icinga.chk + --with-ido-sockfile=/var/lib/icinga/ido.sock + --with-idomod-tmpfile=/tmp/icinga/idomod.tmp" + fi + + if use eventhandler ; then + myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers" + fi + + if use plugins ; then + myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" + else + myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" + fi + + if use !apache2 && use !lighttpd ; then + myconf+=" --with-command-group=icinga" + else + if use apache2 ; then + myconf+=" --with-httpd-conf=/etc/apache2/conf.d" + myconf+=" --with-command-group=apache" + elif use lighttpd ; then + myconf+=" --with-command-group=lighttpd" + fi + fi + + econf ${myconf} +} + +src_compile() { + tc-export CC + + emake icinga || die "make failed" + + if use web ; then + emake DESTDIR="${D}" cgis || die + fi + + if use contrib ; then + emake DESTDIR="${D}" -C contrib || die + fi + + if use idoutils ; then + emake DESTDIR="${D}" idoutils || die + fi +} + +src_install() { + dodoc Changelog README UPGRADING || die + + if ! use web ; then + sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die + fi + + emake DESTDIR="${D}" install{,-config,-commandmode} || die + + if use idoutils ; then + emake DESTDIR="${D}" install-idoutils || die + fi + + if use contrib ; then + emake DESTDIR="${D}" -C contrib install || die + fi + + if use eventhandler ; then + emake DESTDIR="${D}" install-eventhandlers || die + fi + + newinitd "${FILESDIR}"/icinga-init.d icinga || die + newconfd "${FILESDIR}"/icinga-conf.d icinga || die + if use idoutils ; then + newinitd "${FILESDIR}"/ido2db-init.d ido2db || die + newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die + insinto /usr/share/icinga/contrib/db + doins -r module/idoutils/db/* || die + fi + # Apache Module + if use web ; then + if use apache2 ; then + insinto "${APACHE_MODULES_CONFDIR}" + newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die + elif use lighttpd ; then + insinto /etc/lighttpd + newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die + else + ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver" + ewarn "out-of-the-box. Since you are not using one of them, you" + ewarn "have to configure your webserver accordingly yourself." + fi + fowners -R root:root /usr/$(get_libdir)/icinga || die + cd "${D}" || die + find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} + + find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} + + fi + + if use eventhandler ; then + dodir /etc/icinga/eventhandlers || die + fowners icinga:icinga /etc/icinga/eventhandlers || die + fi + + keepdir /etc/icinga + keepdir /var/lib/icinga + keepdir /var/lib/icinga/archives + keepdir /var/lib/icinga/rw + keepdir /var/lib/icinga/spool/checkresults + + if use apache2 ; then + webserver=apache + elif use lighttpd ; then + webserver=lighttpd + else + webserver=icinga + fi + + fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga" + fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw" + + fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw" + fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga" + + # paxmarks + if use idoutils ; then + pax-mark m usr/sbin/ido2db + fi +} + +pkg_postinst() { + if use web ; then + elog "This does not include cgis that are perl-dependent" + elog "Currently traceroute.cgi is perl-dependent" + elog "Note that the user your webserver is running as needs" + elog "read-access to /etc/icinga." + elog + if use apache2 || use lighttpd ; then + elog "There are several possible solutions to accomplish this," + elog "choose the one you are most comfortable with:" + elog + if use apache2 ; then + elog " usermod -G icinga apache" + elog "or" + elog " chown icinga:apache /etc/icinga" + elog + elog "Also edit /etc/conf.d/apache2 and add a line like" + elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\"" + elog + elog "Icinga web service needs user authentication. If you" + elog "use the base configuration, you need a password file" + elog "with a password for user \"icingaadmin\"" + elog "You can create this file by executing:" + elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin" + elog + elog "you may want to also add apache to the icinga group" + elog "to allow it access to the AuthUserFile" + elog + elif use lighttpd ; then + elog " usermod -G icinga lighttpd " + elog "or" + elog " chown icinga:lighttpd /etc/icinga" + elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'" + fi + elog + elog "That will make icinga's web front end visable via" + elog "http://localhost/icinga/" + elog + else + elog "IMPORTANT: Do not forget to add the user your webserver" + elog "is running as to the icinga group!" + fi + else + ewarn "Please note that you have installed Icinga without web interface." + ewarn "Please don't file any bugs about having no web interface when you do this." + ewarn "Thank you!" + fi + elog + elog "If you want icinga to start at boot time" + elog "remember to execute:" + elog " rc-update add icinga default" + elog + elog "If your kernel has /proc protection, icinga" + elog "will not be happy as it relies on accessing the proc" + elog "filesystem. You can fix this by adding icinga into" + elog "the group wheel, but this is not recomended." + elog + if [ -d "${ROOT}"/var/icinga ] ; then + ewarn + ewarn "/var/icinga was moved to /var/lib/icinga" + ewarn "please move the files if this was an upgrade" + if use idoutils ; then + ewarn "and edit /etc/ido2db.cfg to change the location of the files" + ewarn "it accesses" + ewarn "update your db with the scripts under the directory" + ewarn "/usr/share/icinga/contrib/db/" + fi + ewarn + ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files" + ewarn "remove /var/icinga afterwards to make this warning disappear" + fi +} -- cgit v1.2.3-65-gdbad