From 3e3c5ce1fcbf587b12064aeb755ba7b86d83d2ee Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Wed, 23 Nov 2016 17:34:35 -0600 Subject: net-analyzer/icinga2: bup Package-Manager: portage-2.3.0 --- net-analyzer/icinga2/Manifest | 2 - net-analyzer/icinga2/icinga2-2.4.1-r4.ebuild | 162 ------------------------- net-analyzer/icinga2/icinga2-2.4.10-r1.ebuild | 165 -------------------------- net-analyzer/icinga2/icinga2-9999.ebuild | 25 ++-- 4 files changed, 18 insertions(+), 336 deletions(-) delete mode 100644 net-analyzer/icinga2/icinga2-2.4.1-r4.ebuild delete mode 100644 net-analyzer/icinga2/icinga2-2.4.10-r1.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest index bcdd96df184d..047e607111b7 100644 --- a/net-analyzer/icinga2/Manifest +++ b/net-analyzer/icinga2/Manifest @@ -1,4 +1,2 @@ -DIST icinga2-2.4.1.tar.gz 1342073 SHA256 0cd3f52ec283fbad1e68fe9c6cf91e870e0161336f1108c2d7ea044c4db934f0 SHA512 53d93d7db090d478d93a4142e495438306582a5bd75fb69242053ba1213cbfefb4bfba560392cccb532623b3885cc1357b0ffdd9259215c34d681dcd072b52f0 WHIRLPOOL 57cbac7586f309373ed1662b3a12398d71318239f4dc70252905c8b770e240425832e9f38414d0a952ae9039db29474643f4d0b50d24e5a97c1af906b896dd20 -DIST icinga2-2.4.10.tar.gz 1768052 SHA256 c2963430503c382cc4d5083b05731c0b965b5ffa960e900c0827b83789f0425e SHA512 de04d2236b05d33becad1b4e68a4b5ae553b43da9576f9b88f77a037800e6679840516777f32ce71680e81dd99feb850db8861ea2496b9acb1e0da9ce2ce3bd6 WHIRLPOOL 608fcd9caddc9aad5a5e36e9d6f6e0080fa61e6a640118d7aa269c5d435ebb9895d99067a875be50833fbaf7207f0ede058654b83e9f84706475da2813713e7c DIST icinga2-2.4.4.tar.gz 1361983 SHA256 ce19ed52c447929f5f9dae11b75d080b76b7aa680ee930c59db4202a2218d6b5 SHA512 117c4ce3c6fe34bf41ae6c51d1ba35d4eb2e96e8e1f856f01e416752a40c5cb16d7d0443b9bda05c774369b827b757416279635f946bc589ec9cb9d65306b3cf WHIRLPOOL 032a080835640f19ca56918af8d451fe5f95dd483fd76f7bd5ff719d8676e2d245aad1e16eacc2f006d2b3c13f7b1f79b075e2216e21f330e3690e6bd397c050 DIST icinga2-2.5.4.tar.gz 2493864 SHA256 f22ca17cd9951598ab6a1bc27c1ef82b9f1bb49795f69066ccd4d499faa240fc SHA512 0fca05d3eb6722cedecaba1da78ebb7268482257f28e37831f6356c618cbd059304a9e27e1f786799f253940e3dcf8ffa7399060f3e0e15765594796657b3be4 WHIRLPOOL a2a4af45a15cc4ed197151cc4e3355fa5f28ba227269990704f2cce47fe1990fb38932aa0bfefa8034492b379e04213d1eb514437e13aca3fe751592aff99afd diff --git a/net-analyzer/icinga2/icinga2-2.4.1-r4.ebuild b/net-analyzer/icinga2/icinga2-2.4.1-r4.ebuild deleted file mode 100644 index d628f3985041..000000000000 --- a/net-analyzer/icinga2/icinga2-2.4.1-r4.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit cmake-utils depend.apache eutils systemd toolchain-funcs user - -DESCRIPTION="Distributed, general purpose, network monitoring engine" -HOMEPAGE="http://icinga.org/icinga2" -SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+mysql postgres classicui console lto mail minimal nano-syntax +plugins studio +vim-syntax" - -CDEPEND=" - dev-libs/openssl:0 - >=dev-libs/boost-1.41 - console? ( dev-libs/libedit ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql:= )" - -DEPEND=" - ${CDEPEND} - sys-devel/bison - >=sys-devel/flex-2.5.35" - -RDEPEND=" - ${CDEPEND} - plugins? ( || ( - net-analyzer/monitoring-plugins - net-analyzer/nagios-plugins - ) ) - mail? ( virtual/mailx ) - classicui? ( net-analyzer/icinga[web] ) - studio? ( x11-libs/wxGTK:2.9 )" - -REQUIRED_USE="!minimal? ( || ( mysql postgres ) )" - -want_apache2 - -pkg_setup() { - depend.apache_pkg_setup - enewgroup icinga - enewgroup icingacmd - enewgroup nagios # for plugins - enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios" -} - -src_configure() { - sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die - local mycmakeargs=( - -DICINGA2_UNITY_BUILD=FALSE - -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_BUILD_TYPE=None - -DCMAKE_INSTALL_PREFIX=/usr - -DCMAKE_INSTALL_SYSCONFDIR=/etc - -DCMAKE_INSTALL_LOCALSTATEDIR=/var - -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 - -DICINGA2_USER=icinga - -DICINGA2_GROUP=icingacmd - -DICINGA2_COMMAND_USER=icinga - -DICINGA2_COMMAND_GROUP=icingacmd - -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes - ) - # default to off if minimal, allow the flags to be set otherwise - if use minimal; then - mycmakeargs+=( - -DICINGA2_WITH_MYSQL=OFF - -DICINGA2_WITH_PGSQL=OFF - ) - else - mycmakeargs+=( - -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF) - -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF) - ) - fi - # LTO - if use lto; then - mycmakeargs+=( - -DICINGA2_LTO_BUILD=ON - ) - else - mycmakeargs+=( - -DICINGA2_LTO_BUILD=OFF - ) - fi - # STUDIO - if use studio; then - mycmakeargs+=( - -DICINGA2_WITH_STUDIO=ON - ) - else - mycmakeargs+=( - -DICINGA2_WITH_STUDIO=OFF - ) - fi - - cmake-utils_src_configure -} - -src_install() { - BUILDDIR="${WORKDIR}"/icinga2-${PV}_build - cd "${BUILDDIR}" || die - - emake DESTDIR="${D}" install - - einstalldocs - - newinitd "${FILESDIR}"/icinga2.initd icinga2 - newconfd "${FILESDIR}"/icinga2.confd icinga2 - - if use mysql ; then - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* - elif use postgres ; then - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/* - fi - - keepdir /etc/icinga2 - keepdir /var/lib/icinga2/api/zones - keepdir /var/lib/icinga2/api/repository - keepdir /var/lib/icinga2/api/log - keepdir /var/spool/icinga2/perfdata - - rm -r "${D}/var/run" || die "failed to remove /var/run" - rm -r "${D}/var/cache" || die "failed to remove /var/cache" - - fowners icinga:icinga /etc/icinga2 - fowners icinga:icinga /var/lib/icinga2 - fowners icinga:icinga /var/spool/icinga2 - fowners icinga:icingacmd /var/lib/icinga2/api - fowners icinga:icinga /var/spool/icinga2/perfdata - fowners icinga:icingacmd /var/log/icinga2 - - fperms ug+rwX,o-rwx /etc/icinga2 - fperms ug+rwX,o-rwx /var/lib/icinga2 - fperms ug+rwX,o-rwx /var/spool/icinga2 - fperms ug+rwX,o-rwx /var/log/icinga2 - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax - fi - - if use nano-syntax; then - insinto /usr/share/nano - doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc - fi -} - -pkg_postinst() { - elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database" - elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909" -} diff --git a/net-analyzer/icinga2/icinga2-2.4.10-r1.ebuild b/net-analyzer/icinga2/icinga2-2.4.10-r1.ebuild deleted file mode 100644 index a1a287f21170..000000000000 --- a/net-analyzer/icinga2/icinga2-2.4.10-r1.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit cmake-utils depend.apache eutils systemd toolchain-funcs user - -DESCRIPTION="Distributed, general purpose, network monitoring engine" -HOMEPAGE="http://icinga.org/icinga2" -SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax" - -CDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - >=dev-libs/boost-1.41 - console? ( dev-libs/libedit ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql:= )" - -DEPEND=" - ${CDEPEND} - sys-devel/bison - >=sys-devel/flex-2.5.35" - -RDEPEND=" - ${CDEPEND} - plugins? ( || ( - net-analyzer/monitoring-plugins - net-analyzer/nagios-plugins - ) ) - mail? ( virtual/mailx ) - classicui? ( net-analyzer/icinga[web] ) - studio? ( x11-libs/wxGTK:2.9 )" - -REQUIRED_USE="!minimal? ( || ( mysql postgres ) )" - -PATCHES=( "${FILESDIR}/logrotate.patch" ) - -want_apache2 - -pkg_setup() { - depend.apache_pkg_setup - enewgroup icinga - enewgroup icingacmd - enewgroup nagios # for plugins - enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios" -} - -src_configure() { - sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die - local mycmakeargs=( - -DICINGA2_UNITY_BUILD=FALSE - -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_BUILD_TYPE=None - -DCMAKE_INSTALL_PREFIX=/usr - -DCMAKE_INSTALL_SYSCONFDIR=/etc - -DCMAKE_INSTALL_LOCALSTATEDIR=/var - -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 - -DICINGA2_USER=icinga - -DICINGA2_GROUP=icingacmd - -DICINGA2_COMMAND_USER=icinga - -DICINGA2_COMMAND_GROUP=icingacmd - -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes - ) - # default to off if minimal, allow the flags to be set otherwise - if use minimal; then - mycmakeargs+=( - -DICINGA2_WITH_MYSQL=OFF - -DICINGA2_WITH_PGSQL=OFF - ) - else - mycmakeargs+=( - -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF) - -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF) - ) - fi - # LTO - if use lto; then - mycmakeargs+=( - -DICINGA2_LTO_BUILD=ON - ) - else - mycmakeargs+=( - -DICINGA2_LTO_BUILD=OFF - ) - fi - # STUDIO - if use studio; then - mycmakeargs+=( - -DICINGA2_WITH_STUDIO=ON - ) - else - mycmakeargs+=( - -DICINGA2_WITH_STUDIO=OFF - ) - fi - - cmake-utils_src_configure -} - -src_install() { - BUILDDIR="${WORKDIR}"/icinga2-${PV}_build - cd "${BUILDDIR}" || die - - emake DESTDIR="${D}" install - - einstalldocs - - newinitd "${FILESDIR}"/icinga2.initd icinga2 - newconfd "${FILESDIR}"/icinga2.confd icinga2 - - if use mysql ; then - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* - elif use postgres ; then - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/* - fi - - keepdir /etc/icinga2 - keepdir /var/lib/icinga2/api/zones - keepdir /var/lib/icinga2/api/repository - keepdir /var/lib/icinga2/api/log - keepdir /var/spool/icinga2/perfdata - - rm -r "${D}/var/run" || die "failed to remove /var/run" - rm -r "${D}/var/cache" || die "failed to remove /var/cache" - - fowners icinga:icinga /etc/icinga2 - fowners icinga:icinga /var/lib/icinga2 - fowners icinga:icinga /var/spool/icinga2 - fowners -R icinga:icingacmd /var/lib/icinga2/api - fowners icinga:icinga /var/spool/icinga2/perfdata - fowners icinga:icingacmd /var/log/icinga2 - - fperms ug+rwX,o-rwx /etc/icinga2 - fperms ug+rwX,o-rwx /var/lib/icinga2 - fperms ug+rwX,o-rwx /var/spool/icinga2 - fperms ug+rwX,o-rwx /var/log/icinga2 - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax - fi - - if use nano-syntax; then - insinto /usr/share/nano - doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc - fi -} - -pkg_postinst() { - elog "DB IDO schema upgrade could be required. See the following for more information." - elog "http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2" -} diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild index 533f3a909a2b..e5ea6490fe15 100644 --- a/net-analyzer/icinga2/icinga2-9999.ebuild +++ b/net-analyzer/icinga2/icinga2-9999.ebuild @@ -3,17 +3,24 @@ # $Id$ EAPI=5 -inherit cmake-utils depend.apache eutils git-2 systemd toolchain-funcs user +if [[ ${PV} != 9999 ]]; then + inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets + SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +else + inherit cmake-utils depend.apache eutils git-2 systemd toolchain-funcs user wxwidgets + EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" + EGIT_BRANCH="master" + KEYWORDS="" +fi DESCRIPTION="Distributed, general purpose, network monitoring engine" HOMEPAGE="http://icinga.org/icinga2" -EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" -EGIT_BRANCH="master" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax" +WX_GTK_VER="3.0" CDEPEND=" !libressl? ( dev-libs/openssl:0= ) @@ -36,7 +43,7 @@ RDEPEND=" ) ) mail? ( virtual/mailx ) classicui? ( net-analyzer/icinga[web] ) - studio? ( x11-libs/wxGTK:2.9 )" + studio? ( x11-libs/wxGTK:3.0 )" REQUIRED_USE="!minimal? ( || ( mysql postgres ) )" @@ -44,6 +51,7 @@ want_apache2 pkg_setup() { depend.apache_pkg_setup + setup-wxwidgets enewgroup icinga enewgroup icingacmd enewgroup nagios # for plugins @@ -65,6 +73,7 @@ src_configure() { -DICINGA2_COMMAND_USER=icinga -DICINGA2_COMMAND_GROUP=icingacmd -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes + -DLOGROTATE_HAS_SU=ON ) # default to off if minimal, allow the flags to be set otherwise if use minimal; then @@ -159,6 +168,8 @@ src_install() { } pkg_postinst() { - elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database" - elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909" + if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then + elog "DB IDO schema upgrade may be required required. + http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2" + fi } -- cgit v1.2.3-65-gdbad