1 |
commit: 8588e32c1c4dd67e878bee70d1777b8fdb9c2662 |
2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 2 16:00:24 2018 +0000 |
4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 2 16:01:33 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8588e32c |
7 |
|
8 |
net-analyzer/nagios-core: remove nagios-core-4.3.3 to fix CVE-2017-14312. |
9 |
|
10 |
Bug: https://bugs.gentoo.org/629380 |
11 |
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> |
12 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
13 |
|
14 |
net-analyzer/nagios-core/Manifest | 1 - |
15 |
net-analyzer/nagios-core/nagios-core-4.3.3.ebuild | 246 ---------------------- |
16 |
2 files changed, 247 deletions(-) |
17 |
|
18 |
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest |
19 |
index 073ae5bd3c8..1aee223909c 100644 |
20 |
--- a/net-analyzer/nagios-core/Manifest |
21 |
+++ b/net-analyzer/nagios-core/Manifest |
22 |
@@ -1,4 +1,3 @@ |
23 |
-DIST nagios-4.3.3.tar.gz 11101531 BLAKE2B 537d49ecf28b457fbc1e24eaaa9c5d9e8c4db59ed69c91a573c0cacb6cfb6fd2d52c31e87c0cef34b81a69247bb5b9513983d95e7eae3ea7f861742da485d2d4 SHA512 588292a95342cb2d95d7b58f70442b82b99a23dd9fdc1390e9ae0743626a047e5127d77b1d7e6a1d8edd6f34a425e581bcd42459b673a0ddea14125bde4b7d9e |
24 |
DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820 SHA512 f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316 |
25 |
DIST nagios-4.4.2.tar.gz 11301454 BLAKE2B 1b5ffa775bbf147e96d07edd36a387db271802d58cc1a1d1eb867645955aec0044e757785578a60c12549bd4e66e4c95ef06dd0f3f8be3599187d0ef0bcc8a4b SHA512 a6ddb2d8ca1c523d02659a2af0b9c67a3802893c946279bb15be53645dc64c997cd5562b77eab9dae03e756ec6622a9a641f7bd68269aba4ddd56ee21f50959e |
26 |
DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766 |
27 |
|
28 |
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild |
29 |
deleted file mode 100644 |
30 |
index 11e40c1b8e0..00000000000 |
31 |
--- a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,246 +0,0 @@ |
34 |
-# Copyright 1999-2018 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
- |
39 |
-inherit toolchain-funcs user |
40 |
- |
41 |
-MY_P=${PN/-core}-${PV} |
42 |
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation" |
43 |
-HOMEPAGE="https://www.nagios.org/" |
44 |
- |
45 |
-# The name of the directory into which our Gentoo icons will be |
46 |
-# extracted, and also the basename of the archive containing it. |
47 |
-GENTOO_ICONS="${PN}-gentoo-icons-20141125" |
48 |
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz |
49 |
- web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )" |
50 |
- |
51 |
-LICENSE="GPL-2" |
52 |
-SLOT="0" |
53 |
-KEYWORDS="alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86" |
54 |
-IUSE="apache2 classicui lighttpd perl +web vim-syntax" |
55 |
- |
56 |
-# In pkg_postinst(), we change the group of the Nagios configuration |
57 |
-# directory to that of the web server user. It can't belong to both |
58 |
-# apache/lighttpd groups at the same time, so we block this combination |
59 |
-# for our own sanity. |
60 |
-# |
61 |
-# This could be made to work, but we would need a better way to allow |
62 |
-# the web user read-only access to Nagios's configuration directory. |
63 |
-# |
64 |
-REQUIRED_USE="apache2? ( !lighttpd )" |
65 |
- |
66 |
-# sys-devel/libtool dependency is bug #401237. |
67 |
-# |
68 |
-# Note, we require one of the apache2 CGI modules: |
69 |
-# |
70 |
-# * mod_cgi |
71 |
-# * mod_cgid |
72 |
-# * mod_fcgid |
73 |
-# |
74 |
-# We just don't care /which/ one. And of course PHP supports both CGI |
75 |
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the |
76 |
-# dependencies, and expect the user not to do anything /too/ |
77 |
-# stupid. (For example, installing Apache with only FastCGI support, and |
78 |
-# PHP with only CGI support.) |
79 |
-# |
80 |
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to |
81 |
-# extract a snapshot of AngularJS, but that's only needed when USE=web. |
82 |
-# |
83 |
-MOD_ALIAS=apache2_modules_alias |
84 |
-DEPEND="sys-devel/libtool |
85 |
- virtual/mailx |
86 |
- perl? ( dev-lang/perl:= ) |
87 |
- web? ( |
88 |
- app-arch/unzip |
89 |
- media-libs/gd[jpeg,png] |
90 |
- lighttpd? ( www-servers/lighttpd[php] ) |
91 |
- apache2? ( |
92 |
- || ( |
93 |
- >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi] |
94 |
- >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid] |
95 |
- >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] ) |
96 |
- || ( |
97 |
- dev-lang/php:*[apache2] |
98 |
- dev-lang/php:*[cgi] |
99 |
- dev-lang/php:*[fpm] ) |
100 |
- ) |
101 |
- )" |
102 |
-RDEPEND="${DEPEND} |
103 |
- vim-syntax? ( app-vim/nagios-syntax )" |
104 |
- |
105 |
-S="${WORKDIR}/${MY_P}" |
106 |
- |
107 |
-pkg_setup() { |
108 |
- enewgroup nagios |
109 |
- enewuser nagios -1 /bin/bash /var/nagios/home nagios |
110 |
-} |
111 |
- |
112 |
-src_configure() { |
113 |
- local myconf |
114 |
- |
115 |
- if use perl; then |
116 |
- myconf="${myconf} --enable-embedded-perl --with-perlcache" |
117 |
- fi |
118 |
- |
119 |
- if use !apache2 && use !lighttpd ; then |
120 |
- myconf="${myconf} --with-command-group=nagios" |
121 |
- else |
122 |
- if use apache2 ; then |
123 |
- myconf="${myconf} --with-command-group=apache" |
124 |
- myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d" |
125 |
- elif use lighttpd ; then |
126 |
- myconf="${myconf} --with-command-group=lighttpd" |
127 |
- fi |
128 |
- fi |
129 |
- |
130 |
- econf ${myconf} \ |
131 |
- --prefix=/usr \ |
132 |
- --bindir=/usr/sbin \ |
133 |
- --sbindir=/usr/$(get_libdir)/nagios/cgi-bin \ |
134 |
- --datadir=/usr/share/nagios/htdocs \ |
135 |
- --localstatedir=/var/nagios \ |
136 |
- --sysconfdir=/etc/nagios \ |
137 |
- --libexecdir=/usr/$(get_libdir)/nagios/plugins |
138 |
-} |
139 |
- |
140 |
-src_compile() { |
141 |
- emake CC=$(tc-getCC) nagios |
142 |
- |
143 |
- if use web; then |
144 |
- # Only compile the CGIs/HTML when USE=web is set. |
145 |
- emake CC=$(tc-getCC) DESTDIR="${D}" cgis html |
146 |
- fi |
147 |
-} |
148 |
- |
149 |
-src_install() { |
150 |
- dodoc Changelog CONTRIBUTING.md README.asciidoc THANKS UPGRADING |
151 |
- |
152 |
- emake DESTDIR="${D}" install-base |
153 |
- emake DESTDIR="${D}" install-basic |
154 |
- emake DESTDIR="${D}" install-config |
155 |
- emake DESTDIR="${D}" install-commandmode |
156 |
- |
157 |
- if use web; then |
158 |
- emake DESTDIR="${D}" install-cgis |
159 |
- |
160 |
- # install-html installs the new exfoliation theme |
161 |
- emake DESTDIR="${D}" install-html |
162 |
- |
163 |
- if use classicui; then |
164 |
- # This overwrites the already-installed exfoliation theme |
165 |
- emake DESTDIR="${D}" install-classicui |
166 |
- fi |
167 |
- |
168 |
- # Install cute Gentoo icons (bug #388323), setting their |
169 |
- # owner, group, and mode to match those of the rest of Nagios's |
170 |
- # images. |
171 |
- insopts --group=nagios --owner=nagios --mode=0664 |
172 |
- insinto /usr/share/nagios/htdocs/images/logos |
173 |
- doins "${WORKDIR}/${GENTOO_ICONS}"/*.* |
174 |
- insopts --mode=0644 # Back to the default... |
175 |
- fi |
176 |
- |
177 |
- newinitd openrc-init nagios |
178 |
- |
179 |
- if use web ; then |
180 |
- if use apache2 ; then |
181 |
- # Install the Nagios configuration file for Apache. |
182 |
- insinto "/etc/apache2/modules.d" |
183 |
- doins "${FILESDIR}"/99_nagios4.conf |
184 |
- elif use lighttpd ; then |
185 |
- # Install the Nagios configuration file for Lighttpd. |
186 |
- insinto /etc/lighttpd |
187 |
- newins "${FILESDIR}/lighttpd_nagios4.conf" nagios.conf |
188 |
- else |
189 |
- ewarn "${CATEGORY}/${PF} only supports apache or lighttpd" |
190 |
- ewarn "out of the box. Since you are not using one of them, you" |
191 |
- ewarn "will have to configure your webserver yourself." |
192 |
- fi |
193 |
- fi |
194 |
- |
195 |
- for dir in etc/nagios var/nagios ; do |
196 |
- chown -R nagios:nagios "${D}/${dir}" \ |
197 |
- || die "failed chown of ${D}/${dir}" |
198 |
- done |
199 |
- |
200 |
- chown -R root:root "${D}/usr/$(get_libdir)/nagios" \ |
201 |
- || die "failed chown of ${D}/usr/$(get_libdir)/nagios" |
202 |
- |
203 |
- # The following two find...exec statements will die properly as long |
204 |
- # as chmod is only called once (that is, as long as the argument |
205 |
- # list is small enough). |
206 |
- find "${D}/usr/$(get_libdir)/nagios" -type d \ |
207 |
- -exec chmod 755 '{}' + || die 'failed to make nagios dirs traversable' |
208 |
- |
209 |
- if use web; then |
210 |
- find "${D}/usr/$(get_libdir)/nagios/cgi-bin" -type f \ |
211 |
- -exec chmod 755 '{}' + || die 'failed to make cgi-bins executable' |
212 |
- fi |
213 |
- |
214 |
- keepdir /etc/nagios |
215 |
- keepdir /var/nagios |
216 |
- keepdir /var/nagios/archives |
217 |
- keepdir /var/nagios/rw |
218 |
- keepdir /var/nagios/spool/checkresults |
219 |
- |
220 |
- if use !apache2 && use !lighttpd; then |
221 |
- chown -R nagios:nagios "${D}"/var/nagios/rw \ |
222 |
- || die "failed chown of ${D}/var/nagios/rw" |
223 |
- else |
224 |
- if use apache2 ; then |
225 |
- chown -R nagios:apache "${D}"/var/nagios/rw \ |
226 |
- || die "failed chown of ${D}/var/nagios/rw" |
227 |
- elif use lighttpd ; then |
228 |
- chown -R nagios:lighttpd "${D}"/var/nagios/rw \ |
229 |
- || die "failed chown of ${D}/var/nagios/rw" |
230 |
- fi |
231 |
- fi |
232 |
- |
233 |
- chmod ug+s "${D}"/var/nagios/rw || die "failed chmod of ${D}/var/nagios/rw" |
234 |
- chmod 0750 "${D}"/etc/nagios || die "failed chmod of ${D}/etc/nagios" |
235 |
-} |
236 |
- |
237 |
-pkg_postinst() { |
238 |
- |
239 |
- if use web; then |
240 |
- elog "Note that your web server user requires read-only access to" |
241 |
- elog "${ROOT}etc/nagios." |
242 |
- |
243 |
- if use apache2 || use lighttpd ; then |
244 |
- elog |
245 |
- elog "To that end, we have changed the group of ${ROOT}etc/nagios" |
246 |
- elog "to that of your web server user." |
247 |
- elog |
248 |
- if use apache2; then |
249 |
- chown nagios:apache "${ROOT}etc/nagios" \ |
250 |
- || die "failed to change group of ${ROOT}etc/nagios" |
251 |
- |
252 |
- elog "To enable the Nagios web front-end, please edit" |
253 |
- elog "${ROOT}etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\"" |
254 |
- elog "to APACHE2_OPTS. Then Nagios will be available at," |
255 |
- elog |
256 |
- elif use lighttpd; then |
257 |
- chown nagios:lighttpd "${ROOT}etc/nagios" \ |
258 |
- || die "failed to change group of ${ROOT}etc/nagios" |
259 |
- elog "To enable the Nagios web front-end, please add" |
260 |
- elog "'include \"nagios.conf\"' to the lighttpd configuration" |
261 |
- elog "file at ${ROOT}etc/lighttpd/lighttpd.conf. Then Nagios" |
262 |
- elog "will be available at," |
263 |
- elog |
264 |
- fi |
265 |
- |
266 |
- elog " http://localhost/nagios/" |
267 |
- else |
268 |
- elog "Since you're not using either Apache or Lighttpd, you" |
269 |
- elog "will have to grant the necessary permissions yourself." |
270 |
- fi |
271 |
- fi |
272 |
- |
273 |
- elog |
274 |
- elog "If your kernel has /proc protection, nagios" |
275 |
- elog "will not be happy as it relies on accessing the proc" |
276 |
- elog "filesystem. You can fix this by adding nagios into" |
277 |
- elog "the group wheel, but this is not recomended." |
278 |
- elog |
279 |
-} |