1 |
dertobi123 07/10/22 18:29:09 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: nagios-core-2.10.ebuild |
5 |
Removed: nagios-core-2.9-r1.ebuild |
6 |
Log: |
7 |
Version bump |
8 |
(Portage version: 2.1.3.15) |
9 |
|
10 |
Revision Changes Path |
11 |
1.104 net-analyzer/nagios-core/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nagios-core/ChangeLog?rev=1.104&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nagios-core/ChangeLog?rev=1.104&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nagios-core/ChangeLog?r1=1.103&r2=1.104 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v |
20 |
retrieving revision 1.103 |
21 |
retrieving revision 1.104 |
22 |
diff -u -r1.103 -r1.104 |
23 |
--- ChangeLog 1 Aug 2007 21:00:26 -0000 1.103 |
24 |
+++ ChangeLog 22 Oct 2007 18:29:08 -0000 1.104 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for net-analyzer/nagios-core |
27 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.103 2007/08/01 21:00:26 marineam Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.104 2007/10/22 18:29:08 dertobi123 Exp $ |
30 |
+ |
31 |
+*nagios-core-2.10 (22 Oct 2007) |
32 |
+ |
33 |
+ 22 Oct 2007; Tobias Scherbaum <dertobi123@g.o> |
34 |
+ -nagios-core-2.9-r1.ebuild, +nagios-core-2.10.ebuild: |
35 |
+ Version bump |
36 |
|
37 |
01 Aug 2007; Michael Marineau <marineam@g.o> |
38 |
nagios-core-2.9-r1.ebuild: |
39 |
|
40 |
|
41 |
|
42 |
1.1 net-analyzer/nagios-core/nagios-core-2.10.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.10.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.10.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: nagios-core-2.10.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2007 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.10.ebuild,v 1.1 2007/10/22 18:29:08 dertobi123 Exp $ |
52 |
|
53 |
inherit eutils apache-module toolchain-funcs |
54 |
|
55 |
MY_P=${PN/-core}-${PV/_} |
56 |
DESCRIPTION="Nagios Core - Check daemon, CGIs, docs" |
57 |
HOMEPAGE="http://www.nagios.org/" |
58 |
SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz |
59 |
mirror://gentoo/nagios-2.0b.cfg-sample.gz" |
60 |
|
61 |
LICENSE="GPL-2" |
62 |
SLOT="0" |
63 |
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" |
64 |
IUSE="noweb perl debug" |
65 |
# mysql postgres |
66 |
DEPEND="virtual/mailx |
67 |
!noweb? ( |
68 |
>=media-libs/jpeg-6b-r3 |
69 |
>=media-libs/libpng-1.2.5-r4 |
70 |
>=media-libs/gd-1.8.3-r5 |
71 |
${NEED_APACHE_DEPEND} |
72 |
perl? ( net-analyzer/traceroute ) |
73 |
) |
74 |
perl? ( >=dev-lang/perl-5.6.1-r7 )" |
75 |
|
76 |
S="${WORKDIR}/${MY_P}" |
77 |
|
78 |
pkg_setup() { |
79 |
# Check if gd has been compiled with jpeg and png support |
80 |
if ! use noweb; then |
81 |
if ! built_with_use media-libs/gd jpeg png; then |
82 |
eerror "Your gd has been compiled without jpeg and/or png support." |
83 |
eerror "Please re-emerge gd:" |
84 |
eerror "# USE="jpeg png" emerge gd" |
85 |
die "pkg_setup failed" |
86 |
fi |
87 |
fi |
88 |
|
89 |
enewgroup nagios |
90 |
enewuser nagios -1 /bin/bash /var/nagios/home nagios |
91 |
} |
92 |
|
93 |
src_unpack() { |
94 |
unpack ${A} |
95 |
cd "${S}" |
96 |
|
97 |
epatch "${FILESDIR}"/2.x-series-nsca.patch |
98 |
|
99 |
local strip="$(echo '$(MAKE) strip-post-install')" |
100 |
sed -i -e "s:${strip}::" {cgi,base}/Makefile.in || die "sed failed in Makefile.in" |
101 |
} |
102 |
|
103 |
src_compile() { |
104 |
local myconf |
105 |
|
106 |
if use perl |
107 |
then |
108 |
myconf="${myconf} --enable-embedded-perl --with-perlcache" |
109 |
fi |
110 |
|
111 |
if use debug; then |
112 |
myconf="${myconf} --enable-DEBUG0" |
113 |
myconf="${myconf} --enable-DEBUG1" |
114 |
myconf="${myconf} --enable-DEBUG2" |
115 |
myconf="${myconf} --enable-DEBUG3" |
116 |
myconf="${myconf} --enable-DEBUG4" |
117 |
myconf="${myconf} --enable-DEBUG5" |
118 |
fi |
119 |
|
120 |
if use noweb; then |
121 |
myconf="${myconf} --with-command-grp=nagios" |
122 |
else |
123 |
myconf="${myconf} --with-command-grp=apache" |
124 |
fi |
125 |
|
126 |
econf ${myconf} \ |
127 |
--prefix=/usr/nagios \ |
128 |
--localstatedir=/var/nagios \ |
129 |
--sysconfdir=/etc/nagios \ |
130 |
--datadir=/usr/nagios/share \ |
131 |
|| die "./configure failed" |
132 |
|
133 |
emake CC=$(tc-getCC) nagios || die "make failed" |
134 |
|
135 |
if use !noweb ; then |
136 |
# Only compile the CGI's if "noweb" useflag is not set. |
137 |
make CC=$(tc-getCC) DESTDIR="${D}" cgis || die |
138 |
fi |
139 |
|
140 |
emake -C contrib all || "contrib make filed" |
141 |
|
142 |
} |
143 |
|
144 |
src_install() { |
145 |
dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING |
146 |
docinto contrib |
147 |
dodoc contrib/README |
148 |
|
149 |
if use noweb; then |
150 |
sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due to noweb use flag/' \ |
151 |
-e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due to noweb use flag/' \ |
152 |
Makefile |
153 |
fi |
154 |
|
155 |
sed -i -e 's/^contactgroups$//g' Makefile |
156 |
|
157 |
make DESTDIR="${D}" install |
158 |
make DESTDIR="${D}" install-config |
159 |
make DESTDIR="${D}" install-commandmode |
160 |
|
161 |
docinto sample-configs |
162 |
dodoc "${D}"/etc/nagios/* |
163 |
rm "${D}"/etc/nagios/* |
164 |
|
165 |
newdoc "${WORKDIR}"/nagios-2.0b.cfg-sample nagios.cfg-sample |
166 |
|
167 |
#contribs are not configured by the configure script, we'll configure them overselves... |
168 |
find "${S}"/contrib/ -type f | xargs sed -e 's:/usr/local/nagios/var/rw:/var/nagios/rw:; |
169 |
s:/usr/local/nagios/libexec:/usr/nagios/libexec:; |
170 |
s:/usr/local/nagios/etc:/etc/nagios:; |
171 |
s:/usr/local/nagios/sbin:/usr/nagios/sbin:;' -i |
172 |
|
173 |
insinto /usr/share/doc/${PF}/contrib |
174 |
doins -r contrib/eventhandlers |
175 |
|
176 |
doinitd "${FILESDIR}"/nagios |
177 |
newconfd "${FILESDIR}"/conf.d nagios |
178 |
|
179 |
chmod 644 "${S}"/contrib/*.cgi |
180 |
into /usr/nagios |
181 |
for bin in `find contrib/ -type f -perm 0755 -maxdepth 1` ; do |
182 |
dobin "$bin" |
183 |
done |
184 |
|
185 |
# Apache Module |
186 |
if use !noweb; then |
187 |
insinto "${APACHE2_MODULES_CONFDIR}" |
188 |
doins "${FILESDIR}"/99_nagios.conf |
189 |
|
190 |
if use perl; then |
191 |
into /usr/nagios ; dosbin contrib/traceroute.cgi |
192 |
fi |
193 |
fi |
194 |
|
195 |
for dir in etc/nagios var/nagios ; do |
196 |
chown -R nagios:nagios "${D}/${dir}" || die "Failed chown of ${D}/${dir}" |
197 |
done |
198 |
|
199 |
chown -R root:root "${D}"/usr/nagios |
200 |
find "${D}"/usr/nagios -type d -print0 | xargs -0 chmod 755 |
201 |
find "${D}"/usr/nagios/*bin -type f -print0 | xargs -0 chmod 755 |
202 |
find "${D}"/usr/nagios/share -type f -print0 | xargs -0 chmod 644 |
203 |
|
204 |
keepdir /etc/nagios |
205 |
keepdir /var/nagios |
206 |
keepdir /var/nagios/archives |
207 |
keepdir /usr/nagios/share/ssi |
208 |
keepdir /var/nagios/rw |
209 |
|
210 |
if use noweb; then |
211 |
chown -R nagios:nagios "${D}"/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw" |
212 |
else |
213 |
chown -R nagios:apache "${D}"/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw" |
214 |
fi |
215 |
|
216 |
chmod ug+s "${D}"/var/nagios/rw || die "Failed Chmod of ${D}/var/nagios/rw" |
217 |
chmod 0750 "${D}"/etc/nagios || die "Failed chmod of ${D}/etc/nagios" |
218 |
|
219 |
cat << EOF > "${T}"/55-nagios-core-revdep |
220 |
SEARCH_DIRS="/usr/nagios/bin /usr/nagios/libexec" |
221 |
EOF |
222 |
|
223 |
insinto /etc/revdep-rebuild |
224 |
doins "${T}"/55-nagios-core-revdep |
225 |
} |
226 |
|
227 |
pkg_postinst() { |
228 |
einfo |
229 |
einfo "The example config files are located at /usr/share/doc/${PF}/sample-configs/." |
230 |
einfo |
231 |
einfo "Also, if you want nagios to start at boot time" |
232 |
einfo "remember to execute:" |
233 |
einfo " rc-update add nagios default" |
234 |
einfo |
235 |
|
236 |
if use !noweb; then |
237 |
einfo "This does not include cgis that are perl-dependent" |
238 |
einfo "Currently traceroute.cgi is perl-dependent" |
239 |
einfo "To have ministatus.cgi requires copying of ministatus.c" |
240 |
einfo "to cgi directory for compiling." |
241 |
|
242 |
einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\"" |
243 |
|
244 |
einfo |
245 |
einfo "That will make nagios's web front end visable via" |
246 |
einfo "http://localhost/nagios/" |
247 |
einfo |
248 |
einfo "Note that the user your webserver is running at needs" |
249 |
einfo "read-access to /etc/nagios. There are several possible" |
250 |
einfo "solutions to accomplish this, choose the one you are" |
251 |
einfo "most comfortable with:" |
252 |
einfo " usermod -G nagios apache" |
253 |
einfo "or" |
254 |
einfo " chown nagios:apache /etc/nagios" |
255 |
|
256 |
else |
257 |
einfo "Please note that you have installed Nagios without web interface." |
258 |
einfo "Please don't file any bugs about having no web interface when you do this." |
259 |
einfo "Thank you!" |
260 |
fi |
261 |
|
262 |
einfo |
263 |
einfo "If your kernel has /proc protection, nagios" |
264 |
einfo "will not be happy as it relies on accessing the proc" |
265 |
einfo "filesystem. You can fix this by adding nagios into" |
266 |
einfo "the group wheel, but this is not recomended." |
267 |
einfo |
268 |
|
269 |
einfo |
270 |
ewarn "Use /usr/nagios/bin/convertcfg for configuration file conversion" |
271 |
} |
272 |
|
273 |
pkg_prerm() { |
274 |
/etc/init.d/nagios stop |
275 |
} |
276 |
|
277 |
|
278 |
|
279 |
-- |
280 |
gentoo-commits@g.o mailing list |