From: Matt Thode Date: Wed, 25 Mar 2015 18:53:06 +0000 (+0000) Subject: adding minimal use flag bug 543484 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=313a3364abce88b816c984d09e3c0d338910b5df;p=gentoo.git adding minimal use flag bug 543484 Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x33ED3FD25AFC78BA --- diff --git a/net-analyzer/icinga2/ChangeLog b/net-analyzer/icinga2/ChangeLog index c674bf3c23db..3014bfb2bc61 100644 --- a/net-analyzer/icinga2/ChangeLog +++ b/net-analyzer/icinga2/ChangeLog @@ -1,6 +1,12 @@ # 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.32 2015/03/13 21:11:38 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.33 2015/03/25 18:53:01 prometheanfire Exp $ + +*icinga2-2.3.2-r1 (25 Mar 2015) + + 25 Mar 2015; Matthew Thode + +icinga2-2.3.2-r1.ebuild: + adding minimal use flag bug 543484 13 Mar 2015; Matthew Thode icinga2-9999.ebuild: fixing fowners for 9999 diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest index 4e31ee2b3d2c..38e5959a78b0 100644 --- a/net-analyzer/icinga2/Manifest +++ b/net-analyzer/icinga2/Manifest @@ -10,24 +10,25 @@ DIST icinga2-2.3.2.tar.gz 770910 SHA256 014dafd6f4061bcc4da42bd742f3c5c6d3da5264 EBUILD icinga2-2.2.1-r2.ebuild 4252 SHA256 61eaecea0bbf1bcd0ba39a848b391f328e116692d81e9d9613887923c654045c SHA512 41115eb7e64f1fff55382b5244a42a3ec711308b1e68132937c860009525b36e4ed0dc0602799910d0949b8c98c4e0e312a52d729bc28b338f93368705920ad2 WHIRLPOOL f72927eedf8f81b612ebc5e4cca035e309ffed8693c65bd24d7dcad6095983a381786b3cf7415623f912e06cab65af2cdef8080c0d1973e18c739ac8fc4d3faf EBUILD icinga2-2.2.3-r1.ebuild 4169 SHA256 9936d2b3991c5bc1fab9f1fdd9c2d5ac6f010cd64be9a87a14cb9527bf70f9ea SHA512 cb1dfae4f8596cbbfd9b74b950f450761e16bf27c9efd48a9811e111112aa99843420d53890bbb1f12168bf6a07710dd9dd887226fcf4be4e49c90c446c9ea25 WHIRLPOOL add533e360290fd6a254e2be6e34ab0089e303a943bf0cd2446d48dda72172a3eef4b93aa495a5d0089da93dcd0f180a6f800c2d968c4af55b1b2ad317168de8 EBUILD icinga2-2.2.4.ebuild 4210 SHA256 ca18a937a205a53743e4fd886d41ee966c70a32b1a22e64493b2197a975e42c5 SHA512 0fbbda1340b564320d5dcd378e544d776d964ac53ed17842e86f8b41ccf8d347015eac8a3285c0c08ec07916efc704b4ddc0bd045171433284bb48af9199fe80 WHIRLPOOL a83951df66b52f1a7647e0ce858bdbbdfc952f8a6938e99a47a950b9ee918b67e22be01fd8d5737c71d346a72ab44cee2e6967a96227841769202f175855b3c5 +EBUILD icinga2-2.3.2-r1.ebuild 4283 SHA256 d5865ab057d21eece4b5561462c3ceaca39907e297395ba7140b2402cb7b7fce SHA512 58cb9c0210a3d54a6038702cd7370adc326c0ab470827e5b53ac75da725a355ea797f84c2d8a9ea6fa0c3138f9c71e6bc57cc795e56f52b0408d528b4bd5a902 WHIRLPOOL 2af1289d9c99d04cbb885ccf7480dfe1a394d8a52e7dea8246763ca487f85d4a4ab6312336c8922da4e92eb58f72dabac22d03039db9a5503ccce4d0326ca6b6 EBUILD icinga2-2.3.2.ebuild 4260 SHA256 885dcf236c27195a5b075bd7aec604ad47499ceb438d95c6018f3ac37987d216 SHA512 aac276a2dd36d8b15e5af948e13951b0b248177043fa74e0e8b2bcc9f77796313e59e6e8a695d1335d9c80b13b52f43af37f1efd33495b8f5ac98159d0523c1f WHIRLPOOL aafd6c2c245f60535dd89e3123b267d4cef31ee3883e0e1fd7928880887fd97ee9ae12aeb3448936fd0041b05f551b9b9554cefe12bb4aa61af775a5242a2f34 EBUILD icinga2-9999.ebuild 4182 SHA256 517b4dc0ffc70a4c428c242c3532bb60e9ef80235f0c32c6f3cc01a3a0801d35 SHA512 ceac4339be7adfc57df9f2e91dcc41a3c61ba2a5a3d7a87488291bde2daebfcd476cec4a2c5c7bacb18ed41050b3df133b6f27a3017d4f5059aefe2e7f3ca58a WHIRLPOOL a2316699399d6c44df83379cd6033e50de3448670610fb5843b40d64bcf3208ad059aa3baa61a711bede98ab8e74a0efc2145a68b32800512321564cc146f680 -MISC ChangeLog 5187 SHA256 011147fc46cb2003f3c5fa6bfad440831ff2f5b7ea55a723646734978bfb05e4 SHA512 722d6456d64620de701d1e02fbacaae37cea7d7b6ce08305b950e1cb0e3d22ddbc375587b4439810129c588783b3f6d318f95883f744dccd85d20be93fc31ca2 WHIRLPOOL d78cd0e10a4ef283474a56b2afa5ca1072fbbfac7464c45409cc7586868340f6e5e0607a05d6d68a448a0808ad5bdeac606977c70064d4b3a71a20c3aa1605bb +MISC ChangeLog 5343 SHA256 f285cd9bc9d318726a58519f3983c9315d59426c8e3e8a0ff294f2e3cd9e08e1 SHA512 0ee9e19314f78b81ff85f09cb8720b3aaff468556c63b1ced2cf9f3692f65fb1aa5cdb198d23adab34c2c48e944f0b33f99f70f092ced815797fb503a4c3e45f WHIRLPOOL 21aefc01a7cd8840734a117c50bf08ed6d1654393b831144d8001f17c13e33eb5e7bab64098e44d44170fc53fc70ede345966fceffc502fb6b8182ae3abd9346 MISC metadata.xml 460 SHA256 54f38cf1099a4bcab2120d5802f1915549718b4ac2b20b1b0245754919659101 SHA512 c860be59be0782980a7546f1d5e324a33b8310bf6c5e473457bdaa99bbdef52397c05d5f264c77e329ef7b2d1776bd2a027569946d787e04d2aa475b82cc33c6 WHIRLPOOL b37e6784f1fb6d06e357529db586311e745e20513f559864993fd640b9df611af0fb8aff57f4b5164596d949f3e428d400fb0cc789d8c1c0135da37deaabcad4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVA1KNAAoJEGSje+quGaTo2SkP/j8fRQeyzaGurwpYom+zF+ti -SzvUKc6Xe2IH7r+ECJJopC0KBwSmi06ybM/VFOQh527iFsCW5BCTKbrswlQIY8qo -7hI8mQJtlyEP580CFU3mwFL94Vik83RfEc3s7yP1ybsGyjYmorp0ZSqdC1boudIW -bQFLHlM9l7OofJEdvqFvf8hG/gTrfQlfOR54VIe68E1anhs4RYgjpQ8GXCK+Pc38 -Mn+xL0t1IOXZr8obgVVBpoPVpy5ppL6K73KXUPqk/DBARKP321AnTgTrKFJXsl9u -4LmO7WYm/h62iNIkRtod31oi+sZXW/jz4Y02qLTTUof9yU6Y8AgclaS2QZiP1TQi -Hcpe6ZNNWaORISKsRJPih+CM5st+ftbJAT9kRTGn+ScLI66ZFSQGxQh70jTCi2iO -px9dTV2wBGNaDj8Gx4ReA/QJoFfMWYL9v675ioGhe+BgoCAowAuJxsN9M25i7yyP -5+FZoOmfW5OuHS+j28mLfte9QFF5sdoShdUvL8kmM56znqzSy2EcoiMPW83NucBD -UgdjjxmhjuMUGhFCnJeA/sRovgj6gom7KDkzvFOOAj4J2HqapgNu8gQGiovh8koC -mePGm2RXGkLyKbrk0teJNHaeSc4ezS1fV9VV2oKkQCcwgpPmFibR8qgLw8ksg9s3 -Crd1Nxqa/CBcMOd7Tqla -=1wdt +iQIcBAEBCAAGBQJVEwQZAAoJEGSje+quGaToLggP/jFiFAO2r6Itbd59+N40G99c +nKUSGXXUYO5unnBNymJOxhgw01EPi+isEcvo4oraISWhXaCq3wi1UQBxOrcMt8XK +bm4bbbTvXHn6GMp8lt/erOuccsz/0r6I0CMcxNAfmUI2LvEYSuWHWFmcHd5ismj5 +1N8w3tjSERxdZW46DzwtU3/CkygMphSKTq6NeqnPcGJSz3I2sixS5LHpLEioKrJB +daC/D9FqNeVMhEqtaX5uDZAaUbh+YBcxuX4Hfp/vbAXlvtDRxG3YEa3guDvcrljx +w9tRUA9hMECQbd/XClTWEo/D9GcloM/0JSQbFoGQ9RI8fOyr3udhuPqLgVA1cVqu +INq7vRqcmhQc6oh9dd6UHd2fBa7DbSClN9G5pE+rMxWsj0BeQVeeSm7wphJrqf7v +FzNMimF8JuPy/XcWiL50/QC3ZJzVReHgFUkGxp7STQMx+SxKsUo6Fcb17BaVPBJ9 +TneCheM2UVUMrpKwbRm/fY+jvzD/7hOVHe0K+xJh//zRrp96eoiHqe70uhHAt9wB +vpNDoWesss9Td4b+L21hoqA5JW2s2TEzWFg7EPUQGKBL+sruZxOy5kZceFQKYDW/ +p47OrPJ3IYg4PLlLGFBNpaC0KcgXHKiSeJkmJyYy/KHjIIuorXig+WlZW3c3BJwX +fSpFY9y1+UVbQ1N7RS9H +=Kx3f -----END PGP SIGNATURE----- diff --git a/net-analyzer/icinga2/icinga2-2.3.2-r1.ebuild b/net-analyzer/icinga2/icinga2-2.3.2-r1.ebuild new file mode 100644 index 000000000000..acd469cb5dd8 --- /dev/null +++ b/net-analyzer/icinga2/icinga2-2.3.2-r1.ebuild @@ -0,0 +1,159 @@ +# 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.2-r1.ebuild,v 1.1 2015/03/25 18:53:01 prometheanfire Exp $ + +EAPI=5 +inherit depend.apache 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 minimal nano-syntax +plugins +vim-syntax" + +DEPEND=" + dev-util/cmake + 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=( + -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" +}