prometheanfire    14/12/09 02:50:06

  Modified:             ChangeLog
  Added:                icinga2-2.2.1.ebuild
  Log:
  multiple fixes :D bug 528962 and bug 528946
  
  fixing bugs 528962 528946
  Thanks florian for the init scripts
  
  (Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 
0x2471eb3e40ac5ac3)

Revision  Changes    Path
1.11                 net-analyzer/icinga2/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/ChangeLog?rev=1.11&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/ChangeLog?rev=1.11&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/ChangeLog?r1=1.10&r2=1.11

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog   3 Nov 2014 13:24:18 -0000       1.10
+++ ChangeLog   9 Dec 2014 02:50:06 -0000       1.11
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/icinga2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.10 
2014/11/03 13:24:18 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.11 
2014/12/09 02:50:06 prometheanfire Exp $
+
+*icinga2-2.2.1 (09 Dec 2014)
+
+  09 Dec 2014; Matthew Thode <[email protected]> +files/icinga2.confd,
+  +files/icinga2.initd, +icinga2-2.2.1.ebuild:
+  multiple fixes :D bug 528962 and bug 528946  fixing bugs 528962 528946 Thanks
+  florian for the init scripts
 
   03 Nov 2014; Aaron W. Swenson <[email protected]> icinga2-2.0.2.ebuild,
   icinga2-2.1.0-r3.ebuild:



1.1                  net-analyzer/icinga2/icinga2-2.2.1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild?rev=1.1&content-type=text/plain

Index: icinga2-2.2.1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1.ebuild,v 
1.1 2014/12/09 02:50:06 prometheanfire Exp $

EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit depend.apache distutils-r1 eutils cmake-utils toolchain-funcs user 
versionator systemd

DESCRIPTION="Distributed, general purpose, network monitoring engine"
HOMEPAGE="http://icinga.org/icinga2";
#PV=$(replace_version_separator 3 '-')
SRC_URI="http://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
#S="${WORKDIR}/${PN}-${PV}"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+mysql postgres classicui nano-syntax +plugins +vim-syntax"

DEPEND="dev-util/cmake
                dev-python/setuptools[${PYTHON_USEDEP}]
                dev-libs/openssl
                >=dev-libs/boost-1.41
                sys-devel/bison
                >=sys-devel/flex-2.5.35
                mysql? ( virtual/mysql )
                postgres? ( virtual/postgresql )"

RDEPEND="${DEPEND}
        plugins? ( net-analyzer/nagios-plugins )
        classicui? ( net-analyzer/icinga[web] )"

REQUIRED_USE="|| ( mysql postgres )"

want_apache2

pkg_setup() {
        enewgroup icinga
        enewgroup icingacmd
        if use plugins ; then
                enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
        else
                enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd"
        fi
}

src_prepare() {
#       epatch "${FILESDIR}/${P}-create_var_cache.patch"
        epatch_user
}

src_configure() {
        local mycmakeargs=(
                -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
        )
        cmake-utils_src_configure
}

src_install() {
        BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
        cd $BUILDDIR

        #if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; 
then

                emake DESTDIR="${D}" install
        #fi

        cd "${WORKDIR}"/icinga2-${PV}
        if ! declare -p DOCS >/dev/null 2>&1 ; then
                local d
                for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS 
BUGS \
                                FAQ CREDITS CHANGELOG ; do
                        [[ -s "${d}" ]] && dodoc "${d}"
                done
        elif declare -p DOCS | grep -q "^declare -a " ; then
                dodoc "${DOCS[@]}"
        else
                dodoc ${DOCS}
        fi

        newinitd "${FILESDIR}"/icinga2.initd icinga
        newconfd "${FILESDIR}"/icinga2.confd icinga

        if use mysql ; then
                docinto schema
                newdoc 
"${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/mysql.sql mysql.sql
                docinto schema/upgrade
                #newdoc 
"${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql 
mysql-upgrade-1.12.0.sql
        elif use postgres ; then
                docinto schema
                newdoc 
"${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/pgsql.sql pgsql.sql
                docinto schema/upgrade
                #newdoc 
"${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql 
pgsql-upgrade-1.12.0.sql
        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

        #remove dirs that shouldn't be installed
        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 || die "Failed chown of /etc/icinga2"
        fowners icinga:icinga /var/lib/icinga2 || die "Failed chown of 
/var/lib/icinga2"
        fowners icinga:icinga /var/spool/icinga2 || die "Failed chown of 
/var/spool/icinga2"
        fowners icinga:icingacmd /var/log/icinga2 || die "Failed chown of 
/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 tools/syntax/vim/ftdetect
                doins -r tools/syntax/vim/syntax
        fi

        if use nano-syntax; then
                insinto /usr/share/nano
                doins 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";
}




Reply via email to