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