1 |
commit: 6b5a4d045a85ae13a0157de5b9e53048900a038b |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 29 18:07:23 2017 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 29 18:08:05 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b5a4d04 |
7 |
|
8 |
net-analyzer/icinga2: 2.6.3 bup |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
net-analyzer/icinga2/Manifest | 3 +- |
13 |
net-analyzer/icinga2/icinga2-2.6.0.ebuild | 176 --------------------- |
14 |
.../{icinga2-2.6.1.ebuild => icinga2-2.6.3.ebuild} | 0 |
15 |
3 files changed, 1 insertion(+), 178 deletions(-) |
16 |
|
17 |
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest |
18 |
index 66c839af347..6a127b2873e 100644 |
19 |
--- a/net-analyzer/icinga2/Manifest |
20 |
+++ b/net-analyzer/icinga2/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
DIST icinga2-2.5.4.tar.gz 2493864 SHA256 f22ca17cd9951598ab6a1bc27c1ef82b9f1bb49795f69066ccd4d499faa240fc SHA512 0fca05d3eb6722cedecaba1da78ebb7268482257f28e37831f6356c618cbd059304a9e27e1f786799f253940e3dcf8ffa7399060f3e0e15765594796657b3be4 WHIRLPOOL a2a4af45a15cc4ed197151cc4e3355fa5f28ba227269990704f2cce47fe1990fb38932aa0bfefa8034492b379e04213d1eb514437e13aca3fe751592aff99afd |
23 |
-DIST icinga2-2.6.0.tar.gz 2353930 SHA256 b04627d7508dda4bb7b75b74501586d34b5d3d8752291c56682ba1137af03270 SHA512 70b44b3072b20799f5efd39c3e6692b9ae84f3d85886fe072ab67b34a5e4c53f5b6a7f9238d9fbdc663a6491c8c22dd79c71ddc06fa70bd95d2cb737896b3a91 WHIRLPOOL 32fcf3b442183527d3934a38fb1d0bfba7c2bb6336eb335b6810060c11e8c85184fe7d21d67b6aa29edf4c33f996adc7d949c87cb9fe5ab08c8606beec209480 |
24 |
-DIST icinga2-2.6.1.tar.gz 2357267 SHA256 783d35c7fcd1b8fa7914633dc376dfad864ccd648b773bb5ef61bb2a1e86b425 SHA512 7882fb5d4360e00f97329052f41e98f55386312e835292b2e0f736b34db14c1d0290722d09a6bd4b29b16d2b54ce3d8f9974018559e73e42ead3e70f64d36af8 WHIRLPOOL 2976812686be60fade1f381dc16e93307d9690e95bd1dd1009a060d733d795b4de9fcccf565254bd461772d4fa72b9a83d2cc9cbc869f14d66fc6d5a74fd5a0a |
25 |
DIST icinga2-2.6.2.tar.gz 2357220 SHA256 c2058c0e6c39860c52a57b8ce79224729f34b48bc96fb7b1ae2b742909e9b71b SHA512 733370fb120b79bbe3bdbf3d4b640083ff26d2a872c545f4efcd23be3462435f75e0b43b269b770296cb6de4a0529f2369fb766e06444d3fdb56f04db6a3dd03 WHIRLPOOL 0d28a429e5068a490a85ebced3b102780327519968f0cdc7eb3d939d91b6199ee285e0ca524d8596681b2c82832d8fc1909974f5f7e2ecbf0b7fe2ffc908327d |
26 |
+DIST icinga2-2.6.3.tar.gz 2360602 SHA256 83d44871a70d1b368b1af717873ff9b1b185344d23fc79b83118e47a85da6d90 SHA512 c6512411689951611b19a5e80bf360b4cf5ddbf95dcb47cb393f90798e36c052c68b79a5a33a72cd6205ab58d4bb3ac44ec4cd82f9d1d17dc3c0e550723272b3 WHIRLPOOL 9e2c116be306cce35d780387cd2487a7a33b5819166308b83bb26d17cb856094f67d80ea110370b13e7fa19d84463b73da1a65fbf0de60663f2ad53e25c19108 |
27 |
|
28 |
diff --git a/net-analyzer/icinga2/icinga2-2.6.0.ebuild b/net-analyzer/icinga2/icinga2-2.6.0.ebuild |
29 |
deleted file mode 100644 |
30 |
index 36d3970dc4e..00000000000 |
31 |
--- a/net-analyzer/icinga2/icinga2-2.6.0.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,176 +0,0 @@ |
34 |
-# Copyright 1999-2017 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=5 |
38 |
-if [[ ${PV} != 9999 ]]; then |
39 |
- inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets |
40 |
- SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
41 |
- KEYWORDS="amd64 ~arm ~arm64 x86" |
42 |
-else |
43 |
- inherit cmake-utils depend.apache eutils git-2 systemd toolchain-funcs user wxwidgets |
44 |
- EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" |
45 |
- EGIT_BRANCH="master" |
46 |
- KEYWORDS="" |
47 |
-fi |
48 |
- |
49 |
-DESCRIPTION="Distributed, general purpose, network monitoring engine" |
50 |
-HOMEPAGE="http://icinga.org/icinga2" |
51 |
- |
52 |
-LICENSE="GPL-2" |
53 |
-SLOT="0" |
54 |
-IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax" |
55 |
-WX_GTK_VER="3.0" |
56 |
- |
57 |
-CDEPEND=" |
58 |
- !libressl? ( dev-libs/openssl:0= ) |
59 |
- libressl? ( dev-libs/libressl:0= ) |
60 |
- >=dev-libs/boost-1.58-r1 |
61 |
- console? ( dev-libs/libedit ) |
62 |
- mysql? ( virtual/mysql ) |
63 |
- postgres? ( dev-db/postgresql:= )" |
64 |
- |
65 |
-DEPEND=" |
66 |
- ${CDEPEND} |
67 |
- sys-devel/bison |
68 |
- >=sys-devel/flex-2.5.35" |
69 |
- |
70 |
-RDEPEND=" |
71 |
- ${CDEPEND} |
72 |
- plugins? ( || ( |
73 |
- net-analyzer/monitoring-plugins |
74 |
- net-analyzer/nagios-plugins |
75 |
- ) ) |
76 |
- mail? ( virtual/mailx ) |
77 |
- classicui? ( net-analyzer/icinga[web] ) |
78 |
- studio? ( x11-libs/wxGTK:3.0 )" |
79 |
- |
80 |
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )" |
81 |
- |
82 |
-want_apache2 |
83 |
- |
84 |
-pkg_setup() { |
85 |
- depend.apache_pkg_setup |
86 |
- if use studio ; then |
87 |
- setup-wxwidgets |
88 |
- fi |
89 |
- enewgroup icinga |
90 |
- enewgroup icingacmd |
91 |
- enewgroup nagios # for plugins |
92 |
- enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios" |
93 |
-} |
94 |
- |
95 |
-src_configure() { |
96 |
- sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die |
97 |
- local mycmakeargs=( |
98 |
- -DICINGA2_UNITY_BUILD=FALSE |
99 |
- -DCMAKE_VERBOSE_MAKEFILE=ON |
100 |
- -DCMAKE_BUILD_TYPE=None |
101 |
- -DCMAKE_INSTALL_PREFIX=/usr |
102 |
- -DCMAKE_INSTALL_SYSCONFDIR=/etc |
103 |
- -DCMAKE_INSTALL_LOCALSTATEDIR=/var |
104 |
- -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 |
105 |
- -DICINGA2_USER=icinga |
106 |
- -DICINGA2_GROUP=icingacmd |
107 |
- -DICINGA2_COMMAND_USER=icinga |
108 |
- -DICINGA2_COMMAND_GROUP=icingacmd |
109 |
- -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes |
110 |
- -DLOGROTATE_HAS_SU=ON |
111 |
- ) |
112 |
- # default to off if minimal, allow the flags to be set otherwise |
113 |
- if use minimal; then |
114 |
- mycmakeargs+=( |
115 |
- -DICINGA2_WITH_MYSQL=OFF |
116 |
- -DICINGA2_WITH_PGSQL=OFF |
117 |
- ) |
118 |
- else |
119 |
- mycmakeargs+=( |
120 |
- -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF) |
121 |
- -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF) |
122 |
- ) |
123 |
- fi |
124 |
- # LTO |
125 |
- if use lto; then |
126 |
- mycmakeargs+=( |
127 |
- -DICINGA2_LTO_BUILD=ON |
128 |
- ) |
129 |
- else |
130 |
- mycmakeargs+=( |
131 |
- -DICINGA2_LTO_BUILD=OFF |
132 |
- ) |
133 |
- fi |
134 |
- # STUDIO |
135 |
- if use studio; then |
136 |
- mycmakeargs+=( |
137 |
- -DICINGA2_WITH_STUDIO=ON |
138 |
- ) |
139 |
- else |
140 |
- mycmakeargs+=( |
141 |
- -DICINGA2_WITH_STUDIO=OFF |
142 |
- ) |
143 |
- fi |
144 |
- |
145 |
- cmake-utils_src_configure |
146 |
-} |
147 |
- |
148 |
-src_install() { |
149 |
- BUILDDIR="${WORKDIR}"/icinga2-${PV}_build |
150 |
- cd "${BUILDDIR}" || die |
151 |
- |
152 |
- emake DESTDIR="${D}" install |
153 |
- |
154 |
- einstalldocs |
155 |
- |
156 |
- newinitd "${FILESDIR}"/icinga2.initd icinga2 |
157 |
- newconfd "${FILESDIR}"/icinga2.confd icinga2 |
158 |
- |
159 |
- if use mysql ; then |
160 |
- docinto schema |
161 |
- newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql |
162 |
- docinto schema/upgrade |
163 |
- dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* |
164 |
- elif use postgres ; then |
165 |
- docinto schema |
166 |
- newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql |
167 |
- docinto schema/upgrade |
168 |
- dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/* |
169 |
- fi |
170 |
- |
171 |
- keepdir /etc/icinga2 |
172 |
- keepdir /var/lib/icinga2/api/zones |
173 |
- keepdir /var/lib/icinga2/api/repository |
174 |
- keepdir /var/lib/icinga2/api/log |
175 |
- keepdir /var/spool/icinga2/perfdata |
176 |
- |
177 |
- rm -r "${D}/var/run" || die "failed to remove /var/run" |
178 |
- rm -r "${D}/var/cache" || die "failed to remove /var/cache" |
179 |
- |
180 |
- fowners icinga:icinga /etc/icinga2 |
181 |
- fowners icinga:icinga /var/lib/icinga2 |
182 |
- fowners icinga:icinga /var/spool/icinga2 |
183 |
- fowners -R icinga:icingacmd /var/lib/icinga2/api |
184 |
- fowners icinga:icinga /var/spool/icinga2/perfdata |
185 |
- fowners icinga:icingacmd /var/log/icinga2 |
186 |
- |
187 |
- fperms ug+rwX,o-rwx /etc/icinga2 |
188 |
- fperms ug+rwX,o-rwx /var/lib/icinga2 |
189 |
- fperms ug+rwX,o-rwx /var/spool/icinga2 |
190 |
- fperms ug+rwX,o-rwx /var/log/icinga2 |
191 |
- |
192 |
- if use vim-syntax; then |
193 |
- insinto /usr/share/vim/vimfiles |
194 |
- doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect |
195 |
- doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax |
196 |
- fi |
197 |
- |
198 |
- if use nano-syntax; then |
199 |
- insinto /usr/share/nano |
200 |
- doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc |
201 |
- fi |
202 |
-} |
203 |
- |
204 |
-pkg_postinst() { |
205 |
- if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then |
206 |
- elog "DB IDO schema upgrade may be required required. |
207 |
- http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2" |
208 |
- fi |
209 |
-} |
210 |
|
211 |
diff --git a/net-analyzer/icinga2/icinga2-2.6.1.ebuild b/net-analyzer/icinga2/icinga2-2.6.3.ebuild |
212 |
similarity index 100% |
213 |
rename from net-analyzer/icinga2/icinga2-2.6.1.ebuild |
214 |
rename to net-analyzer/icinga2/icinga2-2.6.3.ebuild |