multiple fixes :D bug 528962 and bug 528946

fixing bugs 528962 528946
Thanks florian for the init scripts

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

diff --git a/net-analyzer/icinga2/ChangeLog b/net-analyzer/icinga2/ChangeLog
index 449c5de85d80fd762b00877f88e0cd3da8b3fe8c..f0c2f72bfa97fa5e8875f87b8778415fcab28bcf 100644 (file)
--- a/net-analyzer/icinga2/ChangeLog
+++ b/net-analyzer/icinga2/ChangeLog
@@ -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 <prometheanfire@gentoo.org> +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 <titanofold@gentoo.org> icinga2-2.0.2.ebuild,
   icinga2-2.1.0-r3.ebuild:

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 92b6bf3523dd0028c5d169ad747681bc0b7ea72b..741384f80c8f93bbbffd91c371151672fc2d08a0 100644 (file)
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -2,16 +2,30 @@
 Hash: SHA256
 
 AUX icinga2-2.1.0-create_var_cache.patch 1191 SHA256 350095704b964473a5584d4dc50f043bb075c5a48bf7a12257ba2dfd778b99dc SHA512 803d6b3ec9b23be3934d022d8c2c3c97c1dfb8d8b0786ee979049df205faffd7001258620b852b56dc1dc06a3c9ce45cc8070007137c92e273d25b1ff8c6f80c WHIRLPOOL 6dce723e209307099fab40e028d8062a56ab94d7c688e814fd3fea8179e824a5f165b0277b318f12de8a627313be0b23ad23ee5272c4f7bbdf8184e926992730
+AUX icinga2.confd 241 SHA256 60d89dd179520a17959c933f26d834591e8b8bc3f5eed7bd02706a6c0a7685a2 SHA512 f4a25d3517930b3d0db125d7e93c6fe94c39c71f06c0714e4a396483352b9f079d7562a8b9bbe9f3de07c5c3fa7dcd610613d9ae675209d707df7d819e67f23f WHIRLPOOL 0fcd03fc20727b4d4b13db18f8331a12b383886a71bbec641c38377c99e3ca2fce9bbf164476f91727bb25273d6710c768f189cff1586438d0449bc3ab0c9be6
+AUX icinga2.initd 1227 SHA256 b4210142bfee31e752666bdababeeb2512e8180b2c97431c698e70b75d5036cb SHA512 6987b441d250ad3ee7d8c865deb23300e89262c39a8a5ad6bb28cceb518502b80adf65887a7a51ab3024f749026d8533a6ee2afd0b1949868961fdd4186288e8 WHIRLPOOL 5f0403b90df360d2fa5cccc8e0931a2254a975e5118c2d57a574b630c5bf5b36656433c78c62e4cbf3e1b2eb9a8b8574a8f9b07c88feafe41a2a16dae3b6d033
 DIST icinga2-2.0.2.tar.gz 546107 SHA256 b21c4c4bc2152ed3850d34ef3eed03588e508a9080c10f15750e9a115d856ced SHA512 2d754f605dafbcf0290566241d776c20269f13f243ba509ddf33cf86c012e633c78beb226b904b487c6180a1fe6c5e50816e33960f1cba7c3df901649e4f0c7d WHIRLPOOL 0a5e61343a528fd88828a5b1acd2e704554af71eb750cc52dd92fd7c4cc390a752943041a6723d23d5c79dc23b3bcdcb2eeb42047ba226e4e2c905589502b60c
 DIST icinga2-2.1.0.tar.gz 567861 SHA256 6aad43c69385db3463ca0a3f14f7373d03a967451eb976a89955d1c99f9300e6 SHA512 683bd8944eced5036b328ca7f942b43620ba9d2e1ae2c7ad067416b778c693e97d95e082240cb293826b4e6241de9fd2fe97afacd385c5f578e47b821d358a3d WHIRLPOOL f10844592c0ebc41e15346f49ef3760d69980a8b742cae3c2d5b21f5075e2959c60499890d29d7e4893e740c133f09a5202565b6a91223cabaedc6afe88d49cb
+DIST icinga2-2.2.1.tar.gz 683579 SHA256 3daf73b30cfeca6b29c8ca715c006b4e612324165a0583eb072a51d0925eea6d SHA512 0cf80b67129b989fff9c2faf3e7455fe941b30bc48e337ba1a29294974d18e4b0462b2d1b11b8508add2c76340b7044e4575ef3d189bedb4e1a31daf80dfc2d3 WHIRLPOOL 880e13f9e0ce69433342a564c8a5e5f45a513a30334d40a349d8463c263066986205537a62d279b0ef3894c12dd2ff981a7ac6a0667d76b3fc4c4aebf76c1412
 EBUILD icinga2-2.0.2.ebuild 3308 SHA256 414fc9a46d8f4fc3d8431241209e009e3c2bdf427802e76e45459a7d7e7a92f1 SHA512 c4a1013f864c227a9ec2c342ba666106f4c9e2f7d02e787cbf494d36d556d512e42fd0d1a456a7a5d72d096af7ba703e3ed7ba8c072a644ebe923132ad3b27ed WHIRLPOOL c85eac0059e8e8bea6498712633546be3e39d34c6ee203624cb4e08d9b8d8d7a86f9c67176e2648be55764a9d9f757dec3114973605940b0a3c58f5c13f0546f
 EBUILD icinga2-2.1.0-r3.ebuild 4080 SHA256 22d72e85fcd3db0e8525f7c9c19074b6d0a061831b9e00e8beae67b16d0de457 SHA512 2fac2143445e980f2be841acbdc20dc3e8663ee83d5d9bc1e97a943484c8f919de359285f3a769354c55f16293c01f9b3a386f6f589c3de444b712dca29f2b97 WHIRLPOOL d12cdb58547a05513460bfc6c608b79694d20aef1b519cf4f0374e919daef8e0e597b16669b7a3ae4a580b94c1518c28ea7e68ccdcdffe216a22985748f6d90a
-MISC ChangeLog 1759 SHA256 413185cbf4fb4de10097bbfc50d81fa6a5e1135fdaff8ea0b0f070c047f03a10 SHA512 490e70168ee4a9018792fe6eaacf13dcd812f3941c3ac4120b9aaec1778052da305717f35aac612f15a31a9a1ccbb3d014fbe941ff115a40fb378d10e2a6c032 WHIRLPOOL c6a78cccf5c19859a457bd98bff1e5b92704eb0da36406f90caac1629b3954225e3611498706f7bdf1704611086c5c865374743a80f9408c545ca8f11c7f61a7
+EBUILD icinga2-2.2.1.ebuild 4274 SHA256 6aa64b6f62c62a14ef1ace2a0e36b85dd9808f8f465f5a4e3048cb590c6cc19a SHA512 1979fe85c76de42007a516fdbcbd1639b736d094c4173b7d872776f5b7ec8e5177bff45433238ffb7bd1abb4a4c596a6d1cca9359613ea524aecd1c5919b8b21 WHIRLPOOL 2a88cbff0ed09781f1fc97f0645f68187abeae6e598c2deffb49d244f5fc82c93bb94208bdad003fe7ca600c3fdff5fbb3f579d0b31e9909b85c189e8bd3f132
+MISC ChangeLog 2031 SHA256 71ca6569cb86da440871d1b0502d218a3d05197dde99ef09683ba937ca1a9b18 SHA512 c5b84acdb9e30d7252b318b134b0cfafecf99944ce67dbf1c8aa9618cccdfa7613844b0019b4b9f5c12a73af8625113545853d0bdc1008b7275c28fce646293b WHIRLPOOL 899fff9d8273c9aa284f4d513eadc52a33c485fbe3f7a285608855f76c6cc4c1b52e50734fef250a4c8a5e954a8226dcaf6256592e3a7cc9212f94542ff0580e
 MISC metadata.xml 564 SHA256 daa07d6dcd6d70107892b050d674f083db74476ffa98623ebbe5d22fe752fe93 SHA512 635f538b78ad2e2b18c49959c7b2b7c06582270738522f10bf7bcac0820fd0222761af4e80ab6756d0e98d11fd6a66763cd9cbc1ccd261694d2de25d68817f8f WHIRLPOOL 513a2dd6f6d39994720e9f62275f840e5efedd77115d033b0957de3b5d21b82efb315a8e3efd386a409aeee254ec05f7aa0fff2ec14888a5c45a2533b3e15c7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRXggQACgkQVxOqA9G7/aD/6wD+KPX36ATqhWkV9vC2s6yzlqF6
-wemEzFPCwHLcq4VSHp8BAIU/TfF480/n6G5YIQP2g4RAnIKfw2grBYevglViYSgp
-=o4n3
+iQIcBAEBCAAGBQJUhmOdAAoJECRx6z5ArFrDlikQANsCu3Q0VW3KC9JfFofD6RjV
+V1m76cEcQZpf49tD9x4QDfmPhw8NJXo/nz2DEp6ycwiK6wfcWtwkyosR1tsdLZq+
+bNP91Tq5p1KucDeibZ1t5uaeDM+hjfTGqj43K6jU7wbaImcq8MI54d+X7UHyqrVe
+hNtLoef+HuEvnkn3JoJfNfCnCxVBPGnQJVlken1X2wRXgKkQlf4VM5AdLo94CoQK
+u/ySw9ImjIBmMQ9zrku9F0/0+v9C8lrXi6AZQYJ6tUayzlwXKXwfBXpdKYIoaUc9
+r2TO6sfIKwkmeA1A8td6ExDx/QWwd1SDrpkQxKO4x/6kOgcLkLWjL2SSv8aDD5Ed
++qwnEtny21wrLe+d0Zxs/GHdeXnsdG2Dv+PaNczd2krKSmUw9bvv9gAxjPbnnodn
+Bs2945Rfrk+EChc+q68IQGwD6jn4XFcWviZBMBquTkPerarn5/sWNQGMNtrNGAwE
+mNCGECJz0uLgYgOOmbSXpcPW+kwMW66QuTIrfxjb6/eZoTtpQ3DI9PmF/S0iidxf
+jbBbPbPEbaWWVlY5lMkP2KHxyL+8dULa5VNhj92P8q/FzGnI4PepqktqwvRvp+MG
+ZX772aNWA5xj0NN8IcZI21BTus1rrjDye/sMLPyQhpiPRwYtzRbAAj/3wbbH/Jrb
+h8ZqJ7+TwoMPm2YsKSDa
+=lUdD
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/icinga2/files/icinga2.confd b/net-analyzer/icinga2/files/icinga2.confd
new file mode 100644 (file)
index 0000000..2e82b06
--- /dev/null
+++ b/net-analyzer/icinga2/files/icinga2.confd
@@ -0,0 +1,9 @@
+ICINGA2_ERROR_LOG=/var/log/icinga2/error.log
+ICINGA2_STARTUP_LOG=/var/log/icinga2/startup.log
+ICINGA2_LOG=/var/log/icinga2/icinga2.log
+
+ICINGA2_USER=icinga
+ICINGA2_GROUP=icingacmd
+
+ICINGA2_COMMAND_USER=icinga
+ICINGA2_COMMAND_GROUP=icingacmd

diff --git a/net-analyzer/icinga2/files/icinga2.initd b/net-analyzer/icinga2/files/icinga2.initd
new file mode 100644 (file)
index 0000000..8ef70fc
--- /dev/null
+++ b/net-analyzer/icinga2/files/icinga2.initd
@@ -0,0 +1,59 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/sbin/icinga2
+ICINGA2_CONFIG_FILE=/etc/icinga2/icinga2.conf
+ICINGA2_RUN_DIR=/var/run
+ICINGA2_STATE_DIR=/var
+ICINGA2_PID_FILE="${ICINGA2_RUN_DIR}/icinga2/icinga2.pid"
+ICINGA2_DAEMON_ARGS="
+-c $ICINGA2_CONFIG_FILE \
+-e $ICINGA2_ERROR_LOG \
+-u $ICINGA2_USER \
+-g $ICINGA2_GROUP \
+-d
+"
+
+depend() {
+    need net
+}
+
+checkconfig() {
+    if [ ! -e "$ICINGA2_CONFIG_FILE" ]; then
+       ewarn "Config file '$ICINGA2_CONFIG_FILE' does not exist."
+       eend 1
+    fi
+}
+
+start() {
+    checkconfig
+    ebegin "Starting icinga2"
+    $DAEMON $ICINGA2_DAEMON_ARGS > $ICINGA2_STARTUP_LOG 2>&1
+    local retval=$?
+    if [ $retval -ne 0 ]; then
+        ewarn "Error starting icinga2. '$ICINGA2_STARTUP_LOG' for details."
+    fi
+    eend $retval
+}
+
+stop() {
+    ebegin "Stopping icinga2"
+    start-stop-daemon \
+        --stop \
+        --pidfile $ICINGA2_PID_FILE \
+        --retry "SIGTERM/15 SIGKILL/30" \
+        --progress
+    eend $?
+}
+
+status() {
+    [ ! -f "$ICINGA2_PID_FILE" ] && return 1
+
+    if ps -p $(cat "$ICINGA2_PID_FILE") > /dev/null; then
+        eend 0
+    else
+        eend 1
+    fi
+}
+

diff --git a/net-analyzer/icinga2/icinga2-2.2.1.ebuild b/net-analyzer/icinga2/icinga2-2.2.1.ebuild
new file mode 100644 (file)
index 0000000..078540e
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.2.1.ebuild
@@ -0,0 +1,141 @@
+# 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"
+}