Hello community, here is the log from the commit of package nagios for openSUSE:13.1 checked in at 2013-09-27 17:47:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/nagios (Old) and /work/SRC/openSUSE:13.1/.nagios.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nagios" Changes: -------- --- /work/SRC/openSUSE:13.1/nagios/nagios.changes 2013-09-23 11:01:10.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.nagios.new/nagios.changes 2013-09-27 17:47:48.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Sep 24 16:30:12 UTC 2013 - [email protected] + +- cleanup file list + +------------------------------------------------------------------- +Wed Sep 11 14:32:17 UTC 2013 - [email protected] + +- Recommend monitoring-tools package for those who want to convert + their (real old) nagios configuration (using the subpackage from + icinga) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios.spec ++++++ --- /var/tmp/diff_new_pack.hWi4rH/_old 2013-09-27 17:47:48.000000000 +0200 +++ /var/tmp/diff_new_pack.hWi4rH/_new 2013-09-27 17:47:48.000000000 +0200 @@ -17,11 +17,11 @@ Name: nagios +Version: 3.5.1 +Release: 0 Summary: The Nagios Network Monitor License: GPL-2.0+ Group: System/Monitoring -Version: 3.5.1 -Release: 0 Url: http://www.nagios.org/ Source0: %{name}-%{version}.tar.bz2 Source1: rc%{name} @@ -45,15 +45,6 @@ Patch11: nagios-disable_phone_home.patch # PATCH-FIX-UPSTREAM fix CVE-2013-2214 Patch12: nagios-CVE-2013-2214.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: monitoring_daemon -PreReq: %fillup_prereq -PreReq: %insserv_prereq -PreReq: /bin/logger -PreReq: coreutils -PreReq: grep -PreReq: pwdutils -PreReq: sed BuildRequires: apache2-devel BuildRequires: freetype2-devel BuildRequires: gd-devel @@ -66,16 +57,27 @@ BuildRequires: openssl-devel BuildRequires: pcre-devel BuildRequires: zlib-devel +Requires(pre): %fillup_prereq +Requires(pre): %insserv_prereq +Requires(pre): /bin/logger +Requires(pre): coreutils +Requires(pre): grep +Requires(pre): pwdutils +Requires(pre): sed +Provides: monitoring_daemon +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} < 1010 BuildRequires: XFree86-devel BuildRequires: XFree86-libs BuildRequires: libapr0 Requires: cron %else -BuildRequires: libapr-util1-devel BuildRequires: xorg-x11-devel -Recommends: cron +BuildRequires: pkgconfig(apr-util-1) Recommends: %{name}-www +Recommends: cron +# this package contains shared tools with icinga +Recommends: monitoring-tools # we enable nagios embedded perl, but if people disable it... Recommends: perl = %{perl_version} # as long as it is enabled we need the following requires @@ -109,22 +111,21 @@ This package provides core programs for Nagios. The web interface, documentation, and development files are built as separate packages - %package www Summary: Provides the HTML and CGI files for the Nagios web interface Group: System/Monitoring -Provides: monitoring_webfrontend -PreReq: /bin/logger -PreReq: apache2 -PreReq: coreutils -PreReq: gawk -PreReq: grep -PreReq: pwdutils -PreReq: sed +Requires(pre): /bin/logger +Requires(pre): apache2 +Requires(pre): coreutils +Requires(pre): gawk +Requires(pre): grep +Requires(pre): pwdutils +Requires(pre): sed Requires: %{name} = %{version} Requires: gd Requires: mod_php_any Requires: php +Provides: monitoring_webfrontend %description www Nagios is a program that will monitor hosts and services on your @@ -163,7 +164,6 @@ Please enable the flag "NAGIOSDCH" in the apache configuration. Note: The HTML pages use 'side' and 'main' and frame targets. - %package devel Summary: Development files for Nagios Group: Development/Libraries/C and C++ @@ -181,7 +181,6 @@ This package provides include files that Nagios-related applications may compile against. - %prep %setup -q -n %{name} %patch2 -p0 @@ -239,8 +238,8 @@ # # make daemonchk.cgi and event handlers # -make %{?jobs:-j%jobs} all -make %{?jobs:-j%jobs} -C contrib +make %{?_smp_mflags} all +make %{?_smp_mflags} -C contrib pushd contrib/eventhandlers 1>/dev/null for f in `find . -type f` ; do F=`mktemp temp.XXXXXX` @@ -260,23 +259,23 @@ mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%apache2_sysconfdir/ mkdir -p %{buildroot}%nslockfile_dir -%{__make} install install-commandmode install-config install-webconf install-classicui\ +make install install-commandmode install-config install-webconf install-classicui\ DESTDIR=%{buildroot} \ INSTALL_OPTS="" \ COMMAND_OPTS="" \ CGICFGDIR="%{nagios_sysconfdir}" \ INIT_OPTS="" -%{__make} install -C contrib \ +make install -C contrib \ DESTDIR=%{buildroot} \ INSTALL_OPTS="" # install event handlers -%{__install} -d -m0755 %{buildroot}/%{nagios_eventhandlerdir} -%{__cp} -afpv contrib/eventhandlers/* %{buildroot}%{nagios_eventhandlerdir}/ +install -d -m0755 %{buildroot}/%{nagios_eventhandlerdir} +cp -afpv contrib/eventhandlers/* %{buildroot}%{nagios_eventhandlerdir}/ find %{buildroot}%{nagios_eventhandlerdir}/ -type f -exec chmod +x {} \; # install directory for event brokers like ndoutils -%{__install} -d -m0755 %{buildroot}%{nagios_localstatedir}/brokers +install -d -m0755 %{buildroot}%{nagios_localstatedir}/brokers # install headers for development package -%{__install} -d -m0755 %{buildroot}%{_includedir}/%{name}/ +install -d -m0755 %{buildroot}%{_includedir}/%{name}/ pushd include for file in *.h; do if test "x${file}" != "xconfig.h" -a "x${file}" != "xsnprintf.h" -a "x${file}" != "xcgiutils.h" ; then @@ -299,24 +298,24 @@ # install SuSE specials # # README.SuSE file -sed -e 's@DATADIR@%{_datadir}/%{name}@g' -e 's@SYSCONFDIR@%{nagios_sysconfdir}@g' %{S:10} > %_builddir/%{name}/README.SuSE +sed -e 's@DATADIR@%{_datadir}/%{name}@g' -e 's@SYSCONFDIR@%{nagios_sysconfdir}@g' %{SOURCE10} > %_builddir/%{name}/README.SuSE # init-script -%{__install} -D -m 0755 %{S:1} %{buildroot}%{_sysconfdir}/init.d/%{name} +install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{name} ln -sf ../../etc/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} # sysconfig script -%{__install} -D -m 0644 %{S:3} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} +install -D -m 0644 %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} # install cronjob (gzip' the logfiles) -%{__install} -D -m 0755 %{S:4} %{buildroot}%{_sysconfdir}/cron.weekly/%{name} +install -D -m 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/cron.weekly/%{name} # install htpasswd file -%{__install} -m 0640 %{S:7} %{buildroot}%{_sysconfdir}/%{name}/htpasswd.users +install -m 0640 %{SOURCE7} %{buildroot}%{_sysconfdir}/%{name}/htpasswd.users # important ghost files touch %{buildroot}%{nagios_state_retention_file} touch %{buildroot}%{nagios_status_file} touch %{buildroot}%{nagios_logdir}/config.err touch %{buildroot}%{nslockfile} # install manpages -install -Dm644 %{S:5} %{buildroot}%{_mandir}/man8/%{name}.8 -install -Dm644 %{S:6} %{buildroot}%{_mandir}/man8/nagiostats.8 +install -Dm644 %{SOURCE5} %{buildroot}%{_mandir}/man8/%{name}.8 +install -Dm644 %{SOURCE6} %{buildroot}%{_mandir}/man8/nagiostats.8 # fixing permissions the dirty way.... for file in "README sample-config/README sample-config/template-object/README"; do chmod 644 $RPM_BUILD_DIR/%{name}/$file @@ -342,13 +341,13 @@ EOF mv -f %{buildroot}%{apache2_sysconfdir}/%{name}.conf.in %{buildroot}%{apache2_sysconfdir}/%{name}.conf popd >/dev/null -#delete monitoring-tools because they are provided by icinga-monitoring-tools +# delete monitoring-tools because they are provided by monitoring-tools rm -f %{buildroot}/%{_sbindir}/convertcfg rm -f %{buildroot}/%{_sbindir}/mini_epn rm -f %{buildroot}/%{_sbindir}/new_mini_epn %clean -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} %pre # Create user and group on the system if necessary @@ -489,60 +488,56 @@ %restart_on_update apache2 %files -%defattr(-,root,root) +%defattr(0644,root,root,0755) %doc Changelog LEGAL LICENSE README README.SuSE sample-config/ +%dir %{nagios_libdir} +%dir %{nagios_plugindir} +%dir %{nagios_eventhandlerdir} +%exclude %{nagios_cgidir}/* %{_mandir}/man8/%{name}* -%_sysconfdir/init.d/%name -%ghost %config(missingok,noreplace) %{nagios_logdir}/config.err +%{_sbindir}/rc%{name} +%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} +%attr(0755,root,root) %{_sysconfdir}/init.d/%{name} +%attr(0755,root,root) %{_sysconfdir}/cron.weekly/* +%attr(0755,root,root) %{nagios_eventhandlerdir}/* %config(noreplace) %{nagios_sysconfdir}/*.cfg %config(noreplace) %{nagios_sysconfdir}/objects/*.cfg -%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} -%{_sysconfdir}/cron.weekly/* -%{nagios_localstatedir} +%ghost %config(missingok,noreplace) %{nagios_logdir}/config.err +# directories with special handling: +%attr(0755,root,%{nagios_command_group}) %dir %{nagios_sysconfdir} +%attr(0755,root,%{nagios_command_group}) %dir %{nagios_sysconfdir}/objects +%attr(0775,%{nagios_user},%{nagios_command_group}) %dir %{nagios_spooldir} +%attr(0775,%{nagios_user},%{nagios_command_group}) %dir %{nagios_localstatedir} +%attr(0755,%{nagios_user},%{nagios_group}) %dir %{nagios_logdir} +%attr(0755,%{nagios_user},%{nagios_group}) %dir %{nagios_logdir}/archives +%ghost %dir %{nslockfile_dir} +# files with special handling +%config(noreplace) %attr(0640,root,%{nagios_group}) %{nagios_sysconfdir}/resource.cfg %attr(0755,root,root) %{nagios_libdir}/p1.pl -%exclude %{nagios_cgidir}/* -%{_sbindir}/rc%name -%dir %{nagios_libdir} -%attr(755,root,root) %dir %{nagios_plugindir} -%dir %{nagios_eventhandlerdir} -%{nagios_eventhandlerdir}/* -# defattr change -%defattr(-,%{nagios_user},%{nagios_command_group}) -%dir %{nagios_sysconfdir} -%dir %{nagios_sysconfdir}/objects -%dir %{nagios_spooldir} -# defattr change -%defattr(-,%{nagios_user},%nagios_group) -%dir %{nagios_localstatedir} -%dir %{nagios_logdir} -%dir %{nagios_logdir}/archives -%ghost %dir %nslockfile_dir -%attr(0644,%nagios_user,%nagios_group) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{nslockfile} -%attr(0600,%nagios_user,%nagios_group) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{nagios_state_retention_file} -%attr(0664,%nagios_user,%nagios_group) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{nagios_status_file} +%attr(0644,%{nagios_user},%{nagios_group}) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{nslockfile} +%attr(0600,%{nagios_user},%{nagios_group}) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{nagios_state_retention_file} +%attr(0664,%{nagios_user},%{nagios_group}) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{nagios_status_file} %attr(0750,root,%{nagios_command_group}) %{_sbindir}/%{name} %attr(0750,root,%{nagios_command_group}) %{_sbindir}/nagiostats %files www -%defattr(755,root,root) +%defattr(0644,root,root,0755) %dir %{nagios_cgidir} -%{nagios_cgidir}/* -# defattr change -%defattr(-,root,root) -%{nagios_datadir} +%dir %{nagios_datadir} +%attr(0755,root,root) %{nagios_cgidir}/* +%{nagios_datadir}/* %config(noreplace) %{apache2_sysconfdir}/%{name}.conf %attr(0640,root,%nagios_command_group) %config(missingok,noreplace) %{_sysconfdir}/%{name}/htpasswd.users %exclude %{nagios_datadir}/*.html %exclude %{nagios_datadir}/docs/* %files www-dch -%defattr(-,root,root) +%defattr(0644,root,root,0755) %{nagios_datadir}/*.html -%dir %{nagios_datadir}/docs -%{nagios_datadir}/docs/* +%{nagios_datadir}/docs/ %files devel -%defattr(-,root,root) +%defattr(644,root,root,0755) %{_includedir}/%{name}/ %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
