bup

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

3 files changed, 179 insertions, 15 deletions

diff --git a/net-analyzer/icinga2/ChangeLog b/net-analyzer/icinga2/ChangeLog
index 4ba57b7be629..e8130d3c23e3 100644
--- a/net-analyzer/icinga2/ChangeLog
+++ b/net-analyzer/icinga2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/icinga2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.40 2015/07/16 05:50:37 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.41 2015/07/20 22:51:23 prometheanfire Exp $
+
+*icinga2-2.3.8 (20 Jul 2015)
+
+  20 Jul 2015; Matthew Thode <prometheanfire@gentoo.org> +icinga2-2.3.8.ebuild:
+  bup
 
 *icinga2-2.3.7 (16 Jul 2015)
 
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 0cecbb4f5a1a..443f98eebaf6 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -6,25 +6,27 @@ AUX icinga2.initd 2275 SHA256 0d1d55bf83141c22390017b5701fd57b4c335ac7f910aaa567
 DIST icinga2-2.3.5.tar.gz 804780 SHA256 712d13e997fc6fbf02f8c2046851b1fda1291305f0d3d6792cbebf5fb1558225 SHA512 9302ee2360cbc69ff9bc06092b4ebe9fb77901d9d60eb073f41f781e2917f398ccbddb617bb306631c9d4d0dbe0312cdab6fc1369b2c2691cf116d7af04b1ea7 WHIRLPOOL a73f8ab1136b35283c343281d65e4ea3e78ecdc52a6d1775f3202374a0f5dc9927709e2aa705243243d3c8751e313c60b4d88b1d0f15d1514a50e8a4483d94f6
 DIST icinga2-2.3.6.tar.gz 816718 SHA256 96453fbfa418329b74d45bd2a202302add03d907fac28644e1228d869c478093 SHA512 bb16546bce387f4d828c1bba7dc0e5e1e89ca9c8a4bbb931d9fabd3fb0089329751814bee883b3320e0a7a0b2dd26c1e5b2970b2c33fc8172c3e73784d92a960 WHIRLPOOL 21d410a401ac8ada2857640061ede691b0c41b54aca49409fb3e7002195b1975c653351afffd06a375b6a78948ee96e875dcc982971d3332a994752ccc4c80af
 DIST icinga2-2.3.7.tar.gz 817712 SHA256 067335129daf464d800f48d75bf2fde6ae63c99db6a5126d3d322b6562dfdf28 SHA512 46c940b8081dc3e064121acdab366ba28c1156fc563064022099c3186e310d20bcc1743b643046e0579f42e8ea90b9dfa1f868b28df3eedcd18926c7f65c98f6 WHIRLPOOL 5363191df2c5a57d135866589fe683ea53623c3b0583c299e248e32e4822d1f0bb7806ad573ee9ecd402edecb80dc1ced5850550c595b97562126670b74977f9
+DIST icinga2-2.3.8.tar.gz 817951 SHA256 43bf41a7afc03c1527c82139e74cce17c5b3609a8ec14bb0db1f8df193a14054 SHA512 2536725b50ef158ed7447631fe3480dade1f44a86f40d633138cf83a624fee5f605edf075392a68858f5eebfb9ef89cb5ca811d3120ede7a103df9a448cefa55 WHIRLPOOL c768ad6b62a09e1db05220dd91e5c937db792bf1e512385780a613556a9623b9e3b4d2fe355505d674407ed1a4d693bb554f84d1ca03aa08c04743e29a544423
 EBUILD icinga2-2.3.5.ebuild 4247 SHA256 962f9226cfd366e0db55836989c0b7339a99fa97b28efaf9da88c0c0e59a00fc SHA512 1a99a476c07ac5ab658faf5dee748821d564380fb2b302013ee0785a5c5da130a9ea45f6de56e6f89965d34a2e0b9fd04e19a223b535d64733d2f348eaeed8c0 WHIRLPOOL aa7857d3df2da5ed22610349d5687065ccfe9030cb33199ef43ba4612ea4a2f56f1ea66c29576869d906862c81e9b2e3ed96bc6cf4d3f92160e48cb7e11ed166
 EBUILD icinga2-2.3.6.ebuild 4231 SHA256 66fdcad82e4bb4f3388216f59d427df05e792bfe65f0591d07df04c50d39ed48 SHA512 8365152b95cd9931f596d8ce23c8499cf5556c3d1b228e65a59e392bff7e9ad48504887cbca269e9e95f4eea3897c440a721750f0508be8ef711a6a2ff771a15 WHIRLPOOL 6b0ab00b9559fcaf24ae49a994b53859b5dd03edf656b7045f530b960e1253def41508bc56d4070dc16963caae5ec78bcbc4b6cfce95ee05dce11e9d41a720d3
 EBUILD icinga2-2.3.7.ebuild 4231 SHA256 d252644d9548b468a61f2c6da874d5d74e1ef37c5bf36839e9972b3673acd3c2 SHA512 e55ab44ba940d38a43c6efa50842ec50e3a6afb5c43e71e64f838640da05305313dbf228b7ecbe99fa133003e7616946841ede22029175b1e39244dacaebf6f3 WHIRLPOOL bed3f174cbfdf50eda51f0bb769f50703a333a93f035a46703877413fac880d1c16ebf64c13e5f248992bae3587c5a4bb5cd9cb9329e7e0a6dbcc403b9f176a1
+EBUILD icinga2-2.3.8.ebuild 4231 SHA256 d7e1d50571db4f42cd45849aa0419ec0e7a6a651c5b7a4cca0fe77e24b59824c SHA512 46b186a73be050375f2837cbd865f95e94d74cc21dc90efe768cbdb9ea12915c5e2bec4a35777fb72cfb7def02f2a832e1a82a1fdb3aa3361f24c07c1efa963a WHIRLPOOL 49abb2b517f9996d7c7db1189e57a91996e33c6d938822ca3e8cca3e07d253a8653164d3b67543fd58f5886b194573d03c741a27082157a8b3d85bdc07e951d6
 EBUILD icinga2-9999.ebuild 4219 SHA256 e044708bd50055e98630d6ce593b5e5f8a26d2390f77d601c72e9089901475f2 SHA512 7cb98f31ab6cecbd28fd41af82ad72904af3dcd43025e5fd2aed5d4ef9a819367ad5f8592ba364f4e6d13f1c4e1cf6bbc4ec743b338c740e1bc0852db4974150 WHIRLPOOL f499d38e2caa205fbd8bf3b224e54edf785853c73dcba3e36cf9d296a27dc53a8122d1e31ec98afb9903d5c25c009b4b30428301cbf055ae3186e40a2192c8cd
-MISC ChangeLog 6396 SHA256 784eb0d6c485fd02dc804097afbf0aef95aae8f96f75cd0a8931045092106a21 SHA512 a078e5c83e3a17d192f397c5fff1f66210aff5bcc4d419be42ec1eae4192296ce9a692cad7d0ba55f53b431ba05686731512907ab3ca34d38512fdbab05c29b9 WHIRLPOOL de89b33f0f10fc34f84092941b51c1c0f1beb47c427fbc949a52aa08abeb6f806a4614d7ec21701262137ceaaa5ef4c4e66ae8c228c3cce59a956998a80e3361
+MISC ChangeLog 6513 SHA256 fc90fa7e403064edf17d0aa2d54923968f894ab24e604589e39234a6e03eb777 SHA512 1d63442c3260983d081ac38167b2a6b457a6cd8d7222419bb1b66c55d4aa26c409f868a6f8d949ec40c2d937cc535caab261f4b518ff71328c705bd8313c5798 WHIRLPOOL e36e66a37a57aa90400680579884c2c4334381157cc87afcc42f11f6461f095a89454dd2b750b7a8e81b6439f94f94e4bf281f1f25402c035985b35358a67155
 MISC metadata.xml 460 SHA256 54f38cf1099a4bcab2120d5802f1915549718b4ac2b20b1b0245754919659101 SHA512 c860be59be0782980a7546f1d5e324a33b8310bf6c5e473457bdaa99bbdef52397c05d5f264c77e329ef7b2d1776bd2a027569946d787e04d2aa475b82cc33c6 WHIRLPOOL b37e6784f1fb6d06e357529db586311e745e20513f559864993fd640b9df611af0fb8aff57f4b5164596d949f3e428d400fb0cc789d8c1c0135da37deaabcad4
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAEBCAAGBQJVp0ZrAAoJEGSje+quGaTov/gQAIWxmUS7f5q2mzWzphvVColH
-uST6pJHNLpkFmUTpyxX6PnbaDa4e3Qr1VbdiADvY3IZRSGGRPFDtbN+8AIEbweCY
-h+1Rt1bJfEGyJFHCDNitJLq3n+DwvrjsvPg6zt0rS2LazGeArfJnYknow/Tz1PhU
-qg+3mMRjAxq250Y7Pv959fq+l2X8t7wMOQLLSVKW0w4cWdY4KBSA3OhCGoafhbjZ
-WMKH8mtKaSap7+6Wnmt7yugQuVD0ZeGPU56HI+RxqgPvcdiX6e7zqHV6Yc8NgVcK
-BLjecPw1/QIuPIVCj4Ol/K2td+yw2KpB/4Lp7gcehlB9s7keUzVymD7kHYPbc+3s
-Ebow91pwngWOfsTpd8PdKzhHztAhvcS0xJMb0UZErJK9akfeF/m//WlVbeRln7EA
-qQr8GeFLkqUhpEHLRZXq9KkTgMzNWtUQZ1nk+/a6CL3FHgwrXjbuQPHHhunpCfaa
-jBDUMP4loF3vSyAhRbLvwqtLZXJmeG6BXBHYNRnFaGTIcbZfJKOomMI14AGESprd
-IWQn5GmhTChHTV0/eDa11ukiWfGMvijT1LEpgkmMhFUYekD//E6RONR302b9eZUF
-NT1+YGJkWcNVf5lqEyCWRRw65ebaOATgrm0ftBjzBxZhvCtrsMOUDySQuFMTCxjU
-W27ese7++VHQeVAQf+W1
-=uTHb
+iQIcBAEBCAAGBQJVrXusAAoJEGSje+quGaToE44P/jVDo+mN+hDPKuv8jR1zTbXr
+hAOKStnE3y7jsB+yXdlzY6InKzrZ6DeJIVta6TKmG6mnj/nK/+qhvCtYw0BPsxjx
+JLpgLoooj/G+MzZ/3nHUyqqCHOdA6i0yv0qWI3Z8yyAmym5g3TStcuGmdahxXAF9
+wE8q/8YKYSgCNH0M7OEzuKroONqq8Amgk6QM/yorfo/GPQgDtopjv/SjZTY51O2m
+ya43mcygz/z7VbBHw+ARcsXY0NN4WvnhNTC35fuSqwFv7vrTWSnRj7N9HehrNNhj
+X8cJ+CpCgIWq1X9XjETvLypUriKOMyeKy8mef/AV9kV/wWltRklwJiDSX1Oim9Wy
++/wtvmGmcCPnSkITnAPTOyEQjdy0CAU+nyRDACJcXb2vf4uTnJBsL1PF4jSrv+Tr
+34odzDp7oNg/SNt2wtWl1LPTBrMucOE9/v6kEek1cOMbTJ5CTmrU9gc/PGh+F1hj
+uWKencXWzR41RGWxt1q1hl8itUKeoR2a5wKk7VUjq5am8CJ3MoXeuGG/E5HuY2IT
+ZKO+utmEV1i4uuyhrdnl4wI41XNwFS4wChxSmzZQ4cuybmQe/uixsBRe9yf1tQV1
+2DDl+lIE6MhqIHEIyk9oSsAiS74LnrVBhLZS0loc8CkIlFlCni8p4x7cOjScVqxw
+b6hK/NdPMBDQZXQUEzYq
+=z2SO
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga2/icinga2-2.3.8.ebuild b/net-analyzer/icinga2/icinga2-2.3.8.ebuild
new file mode 100644
index 000000000000..d9f8c7d5ce11
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.3.8.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.3.8.ebuild,v 1.1 2015/07/20 22:51:23 prometheanfire Exp $
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user versionator
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="http://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
+
+DEPEND="
+	dev-libs/openssl:=
+	>=dev-libs/boost-1.41
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	enewgroup icinga
+	enewgroup icingacmd
+	enewgroup nagios  # for plugins
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_prepare() {
+#	epatch "${FILESDIR}/${P}-create_var_cache.patch"
+	epatch_user
+}
+
+src_configure() {
+	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
+	)
+	if use postgres; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	fi
+	if use mysql; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+		)
+	fi
+	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 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
+		#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}/lib/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
+
+	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: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 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"
+}