X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=nagios.spec;h=02314bf698552122e73cca6cd69a0cfd7eea1fe4;hb=bb3c33b3c89836989769207dd4f757233fadbcf2;hp=afa43ace4ab155bff14e19a6abe73b3b0cb26cac;hpb=1911d60003d4cc3a80f8366992a3c4843450f2d8;p=packages%2Fnagios.git diff --git a/nagios.spec b/nagios.spec index afa43ac..02314bf 100644 --- a/nagios.spec +++ b/nagios.spec @@ -1,56 +1,68 @@ # TODO # - /var/log/nagios/archives -> /var/log/archive/nagios +# - bundled jquery in themes # # Conditional build: %bcond_without gd # without statusmap and trends, which require gd library -%bcond_without epn # without Embedded Perl +%bcond_without doc # don't build html docs # reeenable when http://tracker.nagios.org/view.php?id=51 is fixed %bcond_with tests -Summary: Host/service/network monitoring program +Summary: Open Source host, service and network monitoring program Summary(pl.UTF-8): Program do monitorowania serwerów/usług/sieci Summary(pt_BR.UTF-8): Programa para monitoração de máquinas e serviços Name: nagios -Version: 3.3.1 -Release: 1 +Version: 4.3.3 +Release: 2 License: GPL v2+ Group: Networking -Source0: http://downloads.sourceforge.net/nagios/%{name}-%{version}.tar.gz -# Source0-md5: c935354ce0d78a63bfabc3055fa77ad5 +Source0: https://assets.nagios.com/downloads/nagioscore/releases/%{name}-%{version}.tar.gz +# Source0-md5: b733310c87b8eb6ce0f7a5768829c94c Source1: %{name}-apache.conf Source2: %{name}.init Source3: %{name}.sysconfig -Source4: %{name}-config-20090914.tar.bz2 -# Source4-md5: 605f1cd28c00db961dad6f529d849f16 +# http://git.pld-linux.org/projects/nagios-config/ +Source4: %{name}-config-20150805.tar.xz +# Source4-md5: 16683172c72cc2c09662261c82abef40 Source5: %{name}-lighttpd.conf Source6: http://www.google.com/mapfiles/shadow50.png # Source6-md5: eff99f302f21b95a900d321743fce72b Source7: http://www.google.com/mapfiles/marker.png # Source7-md5: edefef4bdfc29e1c953694651f05b466 Source8: googlemap.js +Source9: %{name}wall.php Patch0: %{name}-resources.patch Patch1: %{name}-iconv-in-libc.patch Patch2: %{name}-webapps.patch -Patch3: %{name}-cgi-http_charset.patch + Patch4: %{name}-cmd-typo.patch Patch5: config.patch Patch6: %{name}-googlemap.patch Patch7: %{name}-doc-usermacros.patch Patch8: archivelog-timeformat.patch -Patch9: %{name}-html-Makefile.in.patch -URL: http://www.nagios.org/ + +Patch10: system-jquery.patch +Patch11: do-not-fetch-rss.patch +URL: https://www.nagios.org/projects/nagios-core/ BuildRequires: autoconf BuildRequires: automake +%{?with_doc:BuildRequires: doxygen} +BuildRequires: rpmbuild(macros) >= 1.268 +BuildRequires: sed >= 4.0 +BuildRequires: tar >= 1:1.22 +BuildRequires: xz %if %{with gd} BuildRequires: gd-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel %endif -BuildRequires: rpmbuild(macros) >= 1.268 -BuildRequires: sed >= 4.0 +%if %{with tests} +BuildRequires: perl-HTML-Lint +BuildRequires: perl-Test-WWW-Mechanize-CGI +%endif Requires(post,preun): /sbin/chkconfig Requires: %{name}-common = %{version}-%{release} -Requires: rc-scripts +Requires: rc-scripts >= 0.4.5.5 Requires: sh-utils Suggests: nagios-notify >= 0.13 Suggests: nagios-plugin-check_load @@ -65,6 +77,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define cgidir %{_libdir}/%{name}/cgi %define htmldir %{_prefix}/share/%{name} %define _localstatedir /var/lib/%{name} +%define nagioshome %{_localstatedir} %define _webapps /etc/webapps %define _webapp %{name} @@ -135,6 +148,7 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-imagepaks Requires: %{name}-theme Requires: group(http) +Requires: jquery Requires: webapps Requires: webserver Requires: webserver(access) @@ -155,6 +169,9 @@ Summary: MRTG Graphs: Nagios Statistics Group: Applications/Networking Requires: %{name} = %{version}-%{release} Provides: mrtg-start +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description mrtggraphs This pacakge graphs several Nagios statistics which can be useful for @@ -164,26 +181,46 @@ generate the data. %package doc Summary: HTML Documentation for Nagios Group: Documentation +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif # does not require base %description doc HTML Documentation for Nagios. -%package theme-default -Summary: Default Nagios theme -Summary(pl.UTF-8): Domyślny motyw Nagiosa +%package theme-classicui +Summary: ClassicUI Nagios theme Group: Applications/WWW Requires: %{name}-cgi = %{version}-%{release} Requires: webserver(php) Provides: nagios-theme Obsoletes: nagios-theme +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif -%description theme-default +%description theme-classicui Original theme from Nagios. -%description theme-default -l pl.UTF-8 +%description theme-classicui -l pl.UTF-8 Oryginalny motyw z Nagiosa. +%package theme-default +Summary: Virtual package to handle Nagios theme migration +Group: Applications/WWW +Requires: nagios-theme +Suggests: nagios-theme-classicui +Suggests: nagios-theme-exfoliation +Suggests: nagios-theme-nuvola +Obsoletes: nagios-theme-default < 3.3.1-1.4 +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif + +%description theme-default +Virtual package to handle Nagios theme migration + %package devel Summary: Include files that Nagios-related applications may compile against Summary(pl.UTF-8): Pliki nagłówkowe, wykorzystywane przez aplikacje nagiosa @@ -192,8 +229,10 @@ Group: Development/Libraries # doesn't require base %description devel -This package provides include files that Nagios-related applications -may compile against. +This package contains the header files, static libraries and +development documentation for Nagios. If you are a NEB-module author +or wish to write addons for Nagios using Nagios' own API's, you should +install this package. %description devel -l pl.UTF-8 Ten pakiet dostarcza pliki nagłówkowe, które mogą być wykorzystywane @@ -205,22 +244,23 @@ aplicativos para o Nagios. %prep %setup -qc -a4 -mv %{name}/* . +mv %{name}-%{version}/* . %undos cgi/*.c %undos include/*.h %undos base/* -%undos p1.pl %patch0 -p0 %patch1 -p1 %patch2 -p1 -%patch3 -p1 + #fixed #%patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 + +%patch10 -p1 +%patch11 -p1 find -name .cvsignore -o -name .gitignore | xargs rm @@ -235,10 +275,6 @@ sed -i -e ' s,".*/libexec/eventhandlers,"%{_libdir}/%{name}/eventhandlers, ' $(find contrib/eventhandlers -type f) -%{__sed} -i -e ' - s,/usr/local/nagios/var/,/var/log/%{name}/,g -' p1.pl - sed -e 's,%{_prefix}/lib/,%{_libdir}/,' %{SOURCE1} > apache.conf sed -e 's,%{_prefix}/lib/,%{_libdir}/,' %{SOURCE5} > lighttpd.conf @@ -252,15 +288,19 @@ sed -e 's,%{_prefix}/lib/,%{_libdir}/,' %{SOURCE5} > lighttpd.conf s,=nagiosadmin,=*,g ' sample-config/*.cfg.in -# fixup paths in doc -#%{__sed} -i -e ' -# s,/usr/local/%{name}/var/archives/,/var/log/%{name}/archives/, -#' html/docs/configmain.html +#rm t/611cgistatus-hosturgencies.t %build cp -f /usr/share/automake/config.sub . %{__aclocal} %{__autoconf} +%if %{with tests} +cd tap +%{__libtoolize} +%{__aclocal} +%{__autoconf} +cd .. +%endif %configure \ CFLAGS="%{rpmcflags} %{rpmcppflags}" \ --bindir=%{_sbindir} \ @@ -274,15 +314,12 @@ cp -f /usr/share/automake/config.sub . --with-checkresult-dir=%{_var}/spool/%{name}/checkresults \ --with-ping_command='/bin/ping -n %%s -c %%d' \ %{!?with_gd:--disable-statusmap --disable-trends} \ - %{?with_epn:--enable-embedded-perl --with-perlcache} \ %{?with_tests:--enable-libtap} \ --enable-event-broker %{__make} all -%if %{with epn} -%{__make} -C contrib mini_epn -%endif +%{?with_doc:%{__make} dox} %{?with_tests:%{__make} test} @@ -290,27 +327,18 @@ cp -f /usr/share/automake/config.sub . rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_webapps}/%{_webapp}} \ $RPM_BUILD_ROOT{%{_var}/log/%{name}/archives,%{_localstatedir}/rw} \ - $RPM_BUILD_ROOT%{_sysconfdir}/{plugins,objects} \ + $RPM_BUILD_ROOT%{_sysconfdir}/{plugins,objects,nrpe.d} \ $RPM_BUILD_ROOT%{_libdir}/%{name}/{eventhandlers,plugins,brokers} \ %if "%{_lib}" != "lib" $RPM_BUILD_ROOT%{_prefix}/lib/%{name}/{eventhandlers,plugins} \ %endif -install -d $RPM_BUILD_ROOT%{_includedir}/%{name} -cp -p include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name} - -%{__make} install-unstripped \ +%{__make} install-unstripped install-devel \ DESTDIR=$RPM_BUILD_ROOT \ INSTALL_OPTS="" \ INIT_OPTS="" \ COMMAND_OPTS="" -%if %{with epn} -mv $RPM_BUILD_ROOT{%{_sbindir},%{_libdir}/%{name}}/p1.pl -install -d $RPM_BUILD_ROOT%{_bindir} -install -p contrib/mini_epn $RPM_BUILD_ROOT%{_bindir} -%endif - install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name} @@ -327,6 +355,7 @@ cp -p sample-config/cgi.cfg $RPM_BUILD_ROOT%{_webapps}/%{_webapp} cp -p %{SOURCE6} $RPM_BUILD_ROOT%{htmldir}/images cp -p %{SOURCE7} $RPM_BUILD_ROOT%{htmldir}/images cp -p %{SOURCE8} $RPM_BUILD_ROOT%{htmldir}/images +cp -p %{SOURCE9} $RPM_BUILD_ROOT%{htmldir} > $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/passwd echo 'nagios:' > $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/group @@ -338,16 +367,17 @@ find $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} -name '*.in' | xargs rm # mrtg script install -d $RPM_BUILD_ROOT/etc/mrtg/conf.d -cp -a sample-config/mrtg.cfg $RPM_BUILD_ROOT/etc/mrtg/conf.d/%{name}.cfg +cp -p sample-config/mrtg.cfg $RPM_BUILD_ROOT/etc/mrtg/conf.d/%{name}.cfg # Object data/cache files for i in {objects.{cache,precache},{retention,status}.dat,%{name}.{tmp,pid}}; do > $RPM_BUILD_ROOT%{_localstatedir}/$i done > $RPM_BUILD_ROOT%{_localstatedir}/rw/%{name}.cmd +> $RPM_BUILD_ROOT%{_localstatedir}/rw/%{name}.qh install -d $RPM_BUILD_ROOT%{_docdir}/%{name} -mv $RPM_BUILD_ROOT{%{htmldir}/docs/*,%{_docdir}/%{name}} +%{?with_doc:%{__cp} -a Documentation/html/* $RPM_BUILD_ROOT%{_docdir}/%{name}} %clean rm -rf $RPM_BUILD_ROOT @@ -380,9 +410,14 @@ fi %groupadd -g 72 nagios %groupadd -g 147 -f nagcmd if [ -n "$(id -u netsaint 2>/dev/null)" ] && [ "$(id -u netsaint)" = "72" ]; then - /usr/sbin/usermod -d %{_libdir}/%{name} -l nagios -c "Nagios Daemon" -G nagcmd netsaint + /usr/sbin/usermod -d %{nagioshome} -l nagios -c "Nagios Daemon" -G nagcmd netsaint +fi +%useradd -u 72 -d %{nagioshome} -s /bin/false -c "Nagios Daemon" -g nagios -G nagcmd nagios +# update nagios user home +home=$(IFS=:; set -- $(getent passwd nagios); echo $6) +if [ "$home" != %{nagioshome} ]; then + /usr/sbin/usermod -d %{nagioshome} nagios fi -%useradd -u 72 -d %{_libdir}/%{name} -s /bin/false -c "Nagios Daemon" -g nagios -G nagcmd nagios %postun common if [ "$1" = "0" ]; then @@ -434,6 +469,14 @@ for a in dependencies.cfg services.cfg serviceextinfo.cfg hosts.cfg hostgroups.c done %{__sed} -i -e 's,^check_result_path=.*,check_result_path=%{_var}/spool/%{name}/checkresults,' %{_sysconfdir}/%{name}.cfg + +%triggerpostun -- nagios-common < 4.0.8-2.2 +%banner -e %{name}-common <