1 |
commit: 0f5fd7448b1180caddce77fde2105ea451442dbe |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 24 16:59:04 2020 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 24 16:59:20 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f5fd744 |
7 |
|
8 |
net-analyzer/icinga2: 2.12.3 stable amd64/x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
net-analyzer/icinga2/Manifest | 1 - |
14 |
net-analyzer/icinga2/icinga2-2.12.2.ebuild | 149 ----------------------------- |
15 |
net-analyzer/icinga2/icinga2-2.12.3.ebuild | 2 +- |
16 |
3 files changed, 1 insertion(+), 151 deletions(-) |
17 |
|
18 |
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest |
19 |
index 12422003c7a..a70f7885063 100644 |
20 |
--- a/net-analyzer/icinga2/Manifest |
21 |
+++ b/net-analyzer/icinga2/Manifest |
22 |
@@ -1,4 +1,3 @@ |
23 |
DIST icinga2-2.11.6.tar.gz 7480970 BLAKE2B d247a4c0272227e0dfa2df46f91d84c7630c56df8d77d7de30aea715509b68fddbe74ef58c9b50acb4965e7108c3f9c23cf4e9c0f1a572763c34dd87cfaae1ec SHA512 e455d10612721ef6090256618c5a87e2f06e6284c2b2d137b85058bb5cdc30f3524fbcab5559acbe891e37d90f862c1b117115451bb3b59b8a2f67bb9d027e6e |
24 |
DIST icinga2-2.12.1.tar.gz 7532104 BLAKE2B addb3bb6f81cb41e1ec23e989d6151af6f39fdded5a76a791806114cc2ba46c786b5d6674e9e0e86eb701cb5132f766cdf3cbdfbbcc0f9263db3a7ba844705c6 SHA512 8c266db67fb7aa27dc86e9dc28fa0e1ff7b11260ed529d3963c5cf25a5230fc9f02d7d44076948fbde6e39e2cb02f2d99c2c5b72396154baf95aaa5eba461529 |
25 |
-DIST icinga2-2.12.2.tar.gz 7534173 BLAKE2B 58aa25be81cfd9d674371dcd17043fbdd8fd9f03b2fdbe994101dfe6088ed289e64c213bb5ec1c62863fc2a5d015f2ee928a4bd45343eeead62aea3472faf187 SHA512 db61843f0ea0e05ea8c0ae035e6fdaf1ebc03115b0690a0465ef1847426656acd8ffc108e36056a46cfbc4eb9538c612bbb5adff2db72c9cc51330fcdd62c136 |
26 |
DIST icinga2-2.12.3.tar.gz 7534454 BLAKE2B 021f940b3885c90cc43b4708c83430685fdb692d5ce95ed0f667a95b7dd2f4817b30fb7b05f1e214ba3aa31cef806af0f83e68447ece94916d806fb95f66526e SHA512 28b87e03a8ffeb7a1d19ddf9555151b826f7bf1fd33b0139c2fc8abe7c89d66d96089d5b32d0aaccc3876040514b2bfbde9970416d5ec4ea3b023b17c0fb1799 |
27 |
|
28 |
diff --git a/net-analyzer/icinga2/icinga2-2.12.2.ebuild b/net-analyzer/icinga2/icinga2-2.12.2.ebuild |
29 |
deleted file mode 100644 |
30 |
index 8ec76ee82fa..00000000000 |
31 |
--- a/net-analyzer/icinga2/icinga2-2.12.2.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,149 +0,0 @@ |
34 |
-# Copyright 1999-2020 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
- |
39 |
-inherit cmake systemd |
40 |
- |
41 |
-if [[ ${PV} != 9999 ]]; then |
42 |
- SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
43 |
- KEYWORDS="~amd64 ~arm64 ~x86" |
44 |
-else |
45 |
- inherit git-r3 |
46 |
- EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" |
47 |
-fi |
48 |
- |
49 |
-DESCRIPTION="Distributed, general purpose, network monitoring engine" |
50 |
-HOMEPAGE="https://icinga.com/" |
51 |
- |
52 |
-LICENSE="GPL-2" |
53 |
-SLOT="0" |
54 |
-IUSE="console jumbo-build libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" |
55 |
- |
56 |
-# Add accounts to DEPEND because of fowners in src_install |
57 |
-DEPEND=" |
58 |
- !libressl? ( dev-libs/openssl:0= ) |
59 |
- libressl? ( dev-libs/libressl:0= ) |
60 |
- >=dev-libs/boost-1.66.0:=[context] |
61 |
- console? ( dev-libs/libedit ) |
62 |
- mariadb? ( dev-db/mariadb-connector-c:= ) |
63 |
- mysql? ( dev-db/mysql-connector-c:= ) |
64 |
- postgres? ( dev-db/postgresql:= ) |
65 |
- dev-libs/yajl:= |
66 |
- acct-user/icinga |
67 |
- acct-group/icinga |
68 |
- acct-group/icingacmd" |
69 |
-BDEPEND=" |
70 |
- sys-devel/bison |
71 |
- >=sys-devel/flex-2.5.35" |
72 |
-RDEPEND=" |
73 |
- ${DEPEND} |
74 |
- plugins? ( || ( |
75 |
- net-analyzer/monitoring-plugins |
76 |
- net-analyzer/nagios-plugins |
77 |
- ) ) |
78 |
- mail? ( virtual/mailx ) |
79 |
- acct-group/nagios" |
80 |
- |
81 |
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" |
82 |
- |
83 |
-PATCHES=( |
84 |
- # https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875 |
85 |
- "${FILESDIR}/${PN}-2.12.1-boost-1.74.0.patch" |
86 |
-) |
87 |
- |
88 |
-src_configure() { |
89 |
- local mycmakeargs=( |
90 |
- -DICINGA2_UNITY_BUILD=$(usex jumbo-build) |
91 |
- -DCMAKE_INSTALL_SYSCONFDIR=/etc |
92 |
- -DCMAKE_INSTALL_LOCALSTATEDIR=/var |
93 |
- -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 |
94 |
- -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins" |
95 |
- -DICINGA2_USER=icinga |
96 |
- -DICINGA2_GROUP=icingacmd |
97 |
- -DICINGA2_COMMAND_GROUP=icingacmd |
98 |
- -DICINGA2_RUNDIR=/run |
99 |
- -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON |
100 |
- -DUSE_SYSTEMD=$(usex systemd) |
101 |
- -DLOGROTATE_HAS_SU=ON |
102 |
- -DICINGA2_LTO_BUILD=$(usex lto) |
103 |
- ) |
104 |
- # default to off if minimal, allow the flags to be set otherwise |
105 |
- if use minimal; then |
106 |
- mycmakeargs+=( |
107 |
- -DICINGA2_WITH_MYSQL=OFF |
108 |
- -DICINGA2_WITH_PGSQL=OFF |
109 |
- ) |
110 |
- else |
111 |
- mycmakeargs+=( |
112 |
- -DICINGA2_WITH_PGSQL=$(usex postgres) |
113 |
- -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb)) |
114 |
- ) |
115 |
- fi |
116 |
- |
117 |
- cmake_src_configure |
118 |
-} |
119 |
- |
120 |
-src_install() { |
121 |
- cmake_src_install |
122 |
- |
123 |
- newinitd "${FILESDIR}"/icinga2.initd-3 icinga2 |
124 |
- |
125 |
- if use mysql || use mariadb; then |
126 |
- docinto schema |
127 |
- newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql |
128 |
- docinto schema/upgrade |
129 |
- dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* |
130 |
- fi |
131 |
- if use postgres; then |
132 |
- docinto schema |
133 |
- newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql |
134 |
- docinto schema/upgrade |
135 |
- dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/* |
136 |
- fi |
137 |
- |
138 |
- keepdir /etc/icinga2 |
139 |
- keepdir /var/lib/icinga2/api/zones |
140 |
- keepdir /var/lib/icinga2/api/repository |
141 |
- keepdir /var/lib/icinga2/api/log |
142 |
- keepdir /var/spool/icinga2/perfdata |
143 |
- |
144 |
- rm -r "${D}/run" || die "failed to remove /run" |
145 |
- rm -r "${D}/var/cache" || die "failed to remove /var/cache" |
146 |
- |
147 |
- fowners root:icinga /etc/icinga2 |
148 |
- fperms 0750 /etc/icinga2 |
149 |
- fowners icinga:icinga /var/lib/icinga2 |
150 |
- fowners icinga:icinga /var/spool/icinga2 |
151 |
- fowners -R icinga:icingacmd /var/lib/icinga2/api |
152 |
- fowners icinga:icinga /var/spool/icinga2/perfdata |
153 |
- fowners icinga:icingacmd /var/log/icinga2 |
154 |
- |
155 |
- fperms ug+rwX,o-rwx /etc/icinga2 |
156 |
- fperms ug+rwX,o-rwx /var/lib/icinga2 |
157 |
- fperms ug+rwX,o-rwx /var/spool/icinga2 |
158 |
- fperms ug+rwX,o-rwx /var/log/icinga2 |
159 |
- |
160 |
- if use vim-syntax; then |
161 |
- insinto /usr/share/vim/vimfiles |
162 |
- doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect |
163 |
- doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax |
164 |
- fi |
165 |
- |
166 |
- if use nano-syntax; then |
167 |
- insinto /usr/share/nano |
168 |
- doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc |
169 |
- fi |
170 |
-} |
171 |
- |
172 |
-pkg_postinst() { |
173 |
- if [[ "${PV}" != 9999 ]]; then |
174 |
- local v |
175 |
- for v in ${REPLACING_VERSIONS}; do |
176 |
- if ver_test "${PV}" -gt "${v}"; then |
177 |
- elog "DB IDO schema upgrade may be required." |
178 |
- elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/" |
179 |
- fi |
180 |
- done |
181 |
- fi |
182 |
-} |
183 |
|
184 |
diff --git a/net-analyzer/icinga2/icinga2-2.12.3.ebuild b/net-analyzer/icinga2/icinga2-2.12.3.ebuild |
185 |
index 8ec76ee82fa..ad2f31c9b0f 100644 |
186 |
--- a/net-analyzer/icinga2/icinga2-2.12.3.ebuild |
187 |
+++ b/net-analyzer/icinga2/icinga2-2.12.3.ebuild |
188 |
@@ -7,7 +7,7 @@ inherit cmake systemd |
189 |
|
190 |
if [[ ${PV} != 9999 ]]; then |
191 |
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
192 |
- KEYWORDS="~amd64 ~arm64 ~x86" |
193 |
+ KEYWORDS="amd64 ~arm64 x86" |
194 |
else |
195 |
inherit git-r3 |
196 |
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" |