public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Matthew Thode" <prometheanfire@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
Date: Mon, 29 Nov 2021 02:51:07 +0000 (UTC)	[thread overview]
Message-ID: <1638154261.f0e78a5a586bc856254ed40ffed7d2c0b10da4e3.prometheanfire@gentoo> (raw)

commit:     f0e78a5a586bc856254ed40ffed7d2c0b10da4e3
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 29 02:49:53 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Nov 29 02:51:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0e78a5a

net-analyzer/icinga2: fix non-unity builds

Closes: https://bugs.gentoo.org/825578
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 net-analyzer/icinga2/Manifest                 |   1 +
 net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild | 149 ++++++++++++++++++++++++++
 2 files changed, 150 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 4365b10d153a..5408437a5ecf 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1,3 @@
 DIST icinga2-2.13.1.tar.gz 7585070 BLAKE2B 5a81d627728f8afb0c19761972d45606db246c132dfeb92d2fb32479631add8aaeb1d0dea66f354d3638ca346a3e8bcc266e8397e5246f984566f75c2b5e8003 SHA512 450df3ee36457006c78ca244331d111f65642ba5e232be28e60f189de998f5bb8ed70f2e1d46ea61374ae7bd6a5cf950e487bada1c7af7064970a149cc86baa7
+DIST icinga2-2.13.2-9092.patch 1118 BLAKE2B c63342b8eff6afead9bf3ccec5c6df6583c2e327edb1433731ca14743ce9c6b0bde0797c6f251480e3bbfb5e6cdaae3444ea6ae6f6740bc228bd6aae5380044d SHA512 1056ff8bd66f2da86afb9664e3415d713be03b80def6d256b6db57f0864d150bc26c0fd3ce05d836da126a2616f2c70ecce05a83bb5425c25f6204d7e522ef94
 DIST icinga2-2.13.2.tar.gz 7589357 BLAKE2B 6e1ba570e0286f09f37b3cea3b1cd833fd3005c5788e24b750edb100346c46958e97ed5df05947dc47c2bbf856cc6090d661e741072f473b8308aee5e1c0e94e SHA512 39a6f996bca671a2a22fc04e5995714b874e027888a7c9e479d5b526b23104915b7f99afb1220d440af482013043e5b969b0a0145041ac55009d1a81053e2906

diff --git a/net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild b/net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild
new file mode 100644
index 000000000000..a6919631d7f1
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/Icinga/icinga2/commit/8cde21ddfd66a0fcfac704544a0fd7990cfc94ec.patch -> ${P}-9092.patch"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+	dev-libs/openssl:0=
+	>=dev-libs/boost-1.66.0:=[context]
+	console? ( dev-libs/libedit )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	dev-libs/yajl:=
+	acct-user/icinga
+	acct-group/icinga
+	acct-group/icingacmd"
+BDEPEND="
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	mail? ( virtual/mailx )
+	acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+PATCHES=(
+	# https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
+	"${DISTDIR}/${P}-9092.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DICINGA2_RUNDIR=/run
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+		-DUSE_SYSTEMD=$(usex systemd)
+		-DLOGROTATE_HAS_SU=ON
+		-DICINGA2_LTO_BUILD=$(usex lto)
+	)
+	# 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)
+			-DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+	if use mysql || use mariadb; 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/*
+	fi
+	if 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}/run" || die "failed to remove /run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners root:icinga /etc/icinga2
+	fperms 0750 /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() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}


             reply	other threads:[~2021-11-29  2:51 UTC|newest]

Thread overview: 176+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-29  2:51 Matthew Thode [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-12 17:51 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/ Matthew Thode
2024-03-18 16:01 Matthew Thode
2024-02-21 20:17 Matthew Thode
2024-02-21 20:17 Matthew Thode
2024-02-18 23:10 Matthew Thode
2024-01-21 17:09 Matthew Thode
2024-01-21 17:09 Matthew Thode
2024-01-19  1:28 Matthew Thode
2024-01-12 19:08 Michał Górny
2023-12-21 22:02 Matthew Thode
2023-12-21 22:02 Matthew Thode
2023-09-13 18:52 Matthew Thode
2023-08-13 20:29 Matthew Thode
2023-07-13 16:19 Matthew Thode
2023-04-20 15:46 Matthew Thode
2023-03-18 16:45 Matthew Thode
2023-03-18 16:37 Matthew Thode
2023-03-18 16:37 Matthew Thode
2023-02-18  3:10 Sam James
2023-02-17 18:55 Matthew Thode
2023-02-01 19:27 Andreas Sturmlechner
2023-01-14 22:47 Sam James
2023-01-14 22:47 Sam James
2023-01-07 19:34 Matthew Thode
2022-12-07 19:17 Matthew Thode
2022-11-08 16:57 Matthew Thode
2022-10-14 16:47 Matthew Thode
2022-09-13 16:31 Matthew Thode
2022-08-31 15:38 Matthew Thode
2022-08-16 16:46 Matthew Thode
2022-08-01  3:13 Matthew Thode
2022-06-30 21:16 Matthew Thode
2022-06-14 22:33 Matthew Thode
2022-05-17 17:34 Matthew Thode
2022-04-14 16:26 Matthew Thode
2022-01-15 17:54 Matthew Thode
2022-01-03 15:58 Matthew Thode
2021-12-29 17:20 Matthew Thode
2021-12-29 17:20 Matthew Thode
2021-12-14 17:54 Matthew Thode
2021-11-29  2:51 Matthew Thode
2021-11-14  2:24 Matthew Thode
2021-11-12  4:07 Matthew Thode
2021-10-20 15:34 Matthew Thode
2021-09-20 21:34 Matthew Thode
2021-08-20 17:05 Matthew Thode
2021-08-03 20:23 Matthew Thode
2021-06-29  2:54 Matthew Thode
2021-05-28 19:46 Matthew Thode
2021-05-28 15:52 Matthew Thode
2021-04-30 18:46 Mikle Kolyada
2021-01-24 19:15 Matthew Thode
2020-12-24 16:59 Matthew Thode
2020-12-20 19:57 Matthew Thode
2020-12-15 20:12 Matthew Thode
2020-11-24 21:50 Matthew Thode
2020-11-14 23:03 Matthew Thode
2020-10-16 11:53 Louis Sautier
2020-10-16 11:49 Louis Sautier
2020-10-16 11:49 Louis Sautier
2020-10-14 18:10 Matthew Thode
2020-09-04  2:35 Matthew Thode
2020-09-04  2:35 Matthew Thode
2020-08-04 21:51 Matthew Thode
2020-07-18 22:12 Matthew Thode
2020-06-19 15:50 Matthew Thode
2020-04-04 21:05 Matthew Thode
2020-03-04 17:11 Matthew Thode
2020-02-17 23:37 Matthew Thode
2020-02-08 17:06 David Seifert
2019-12-16 17:37 Matthew Thode
2019-11-22 16:10 Matthew Thode
2019-10-18 16:03 Matthew Thode
2019-09-23 15:23 Matthew Thode
2019-09-22  6:07 Matthew Thode
2019-09-21 16:28 Matthew Thode
2019-09-20 21:07 Matthew Thode
2019-09-17 15:44 Matthew Thode
2019-09-01 18:47 Matthew Thode
2019-07-31 15:36 Matthew Thode
2019-06-24  0:15 Matthew Thode
2019-05-24 18:13 Matthew Thode
2019-03-26 15:54 Matthew Thode
2019-03-20 23:35 Matthew Thode
2019-02-26 23:33 Matthew Thode
2018-12-13 17:11 Matthew Thode
2018-11-14 11:22 Matthew Thode
2018-10-22 16:08 Matthew Thode
2018-10-19 19:38 Matthew Thode
2018-10-12  2:54 Matthew Thode
2018-09-26 17:49 Matt Thode
2018-09-12 18:25 Matt Thode
2018-09-12 18:10 Matt Thode
2018-09-12 17:43 Matt Thode
2018-09-04  1:18 Matt Thode
2018-08-18  2:46 Matt Thode
2018-08-07  7:33 Matt Thode
2018-08-04 20:47 Matt Thode
2018-07-24 16:25 Matt Thode
2018-07-17 16:02 Matt Thode
2018-05-23 18:05 Matt Thode
2018-04-26  2:29 Matt Thode
2018-04-25  2:40 Matt Thode
2018-03-22 17:17 Matt Thode
2018-03-22 15:25 Matt Thode
2018-03-19 23:24 Sergei Trofimovich
2018-03-19 22:39 Sergei Trofimovich
2018-01-18 18:04 Matt Thode
2017-12-03  4:09 Matt Thode
2017-11-29 18:52 Thomas Deutschmann
2017-11-29 13:38 Agostino Sarubbo
2017-11-17  3:31 Matt Thode
2017-11-12 15:28 Matt Thode
2017-10-17  1:42 Matt Thode
2017-09-21 16:28 Matt Thode
2017-08-28  2:11 Matt Thode
2017-08-04 19:31 Matt Thode
2017-08-02 18:52 Matt Thode
2017-07-24  2:03 Matt Thode
2017-07-24  1:57 Matt Thode
2017-05-16 22:05 Michael Weber
2017-04-28 17:00 Matt Thode
2017-03-29 18:08 Matt Thode
2017-02-24 17:39 Matt Thode
2017-02-13 15:51 Matt Thode
2017-01-31 15:45 Matt Thode
2017-01-26 15:38 Matt Thode
2017-01-06 22:53 Matt Thode
2016-12-13 16:14 Matt Thode
2016-11-27 20:03 Matt Thode
2016-11-24  0:59 Matt Thode
2016-11-24  0:59 Matt Thode
2016-11-24  0:59 Matt Thode
2016-11-23 23:35 Matt Thode
2016-09-25 16:11 Matt Thode
2016-08-31 13:00 Matt Thode
2016-08-25 14:40 Matt Thode
2016-08-24 22:22 Matt Thode
2016-08-24 13:11 Matt Thode
2016-08-23 22:58 Matt Thode
2016-07-13 17:36 Anthony G. Basile
2016-05-19 17:05 Matt Thode
2016-04-30  3:08 Matt Thode
2016-04-30  3:06 Matt Thode
2016-04-21 14:43 Matt Thode
2016-04-20 18:28 Matt Thode
2016-04-20 15:54 Matt Thode
2016-03-26 18:06 Agostino Sarubbo
2016-03-18 12:50 Matt Thode
2016-03-17 20:45 Matt Thode
2016-03-16 16:33 Matt Thode
2016-02-24 16:38 Matt Thode
2016-02-23 19:58 Matt Thode
2016-01-25 15:44 Agostino Sarubbo
2016-01-21  3:06 Matt Thode
2016-01-18 17:04 Matt Thode
2016-01-18 16:50 Matt Thode
2016-01-05 15:31 Matt Thode
2016-01-05 15:26 Matt Thode
2015-12-25 20:20 Matt Thode
2015-11-28 20:19 Matt Thode
2015-11-28 20:12 Matt Thode
2015-11-20  1:04 Matt Thode
2015-11-16 16:04 Matt Thode
2015-11-16  8:30 Mikle Kolyada
2015-10-19 22:29 Matt Thode
2015-10-19 16:04 Matt Thode
2015-09-29 14:52 Matt Thode
2015-09-28 17:35 Matt Thode
2015-09-28 17:14 Mikle Kolyada
2015-09-28 10:12 Agostino Sarubbo
2015-09-08  1:29 Matt Thode
2015-09-05 20:33 Matt Thode
2015-09-02  3:55 Matt Thode
2015-08-26 15:05 Matt Thode

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1638154261.f0e78a5a586bc856254ed40ffed7d2c0b10da4e3.prometheanfire@gentoo \
    --to=prometheanfire@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox