diff --git a/.abf.yml b/.abf.yml index 9c01c30..e03ac2e 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,3 @@ sources: "nagios-3.2.3.tar.gz": fcb2c016c1b803bac71442d0ee8375b737906421 + "nagios-3.4.1.tar.gz": 728d3a7f601cfbc0686afa27cb02a2cb212cc5ac diff --git a/nagios.spec b/nagios.spec index c5e9c75..97898d9 100644 --- a/nagios.spec +++ b/nagios.spec @@ -5,11 +5,11 @@ Summary: Host/service/network monitoring program Name: nagios -Version: 3.2.3 +Version: 3.4.1 %if %mdkversion < 201000 %define subrel 1 %endif -Release: %mkrel 2 +Release: %mkrel 1 License: GPLv2 Group: Networking/Other URL: http://www.nagios.org/ @@ -113,10 +113,10 @@ compile against. %prep %setup -q -%patch1 -p0 -%patch5 -p0 -%patch6 -p0 -%patch8 -p1 +#%patch1 -p0 +#%patch5 -p0 +#%patch6 -p0 +#%patch8 -p1 cp %{SOURCE1} nagios.init cp %{SOURCE4} mergecfg @@ -582,400 +582,3 @@ rm -rf %{buildroot} %changelog -* Sat Feb 05 2011 Funda Wang 1:3.2.3-2mdv2011.0 -+ Revision: 636326 -- tighten BR - -* Wed Oct 06 2010 Guillaume Rousse 1:3.2.3-1mdv2011.0 -+ Revision: 583635 -- new version -- drop format error patch, merged upstream - -* Sun Sep 05 2010 Guillaume Rousse 1:3.2.2-1mdv2011.0 -+ Revision: 576159 -- new version - -* Wed Aug 11 2010 Guillaume Rousse 1:3.2.1-2mdv2011.0 -+ Revision: 569136 -- rebuild for new perl -- fix binaries perms - -* Sat Mar 27 2010 Thierry Vignaud 1:3.2.1-1mdv2010.1 -+ Revision: 528045 -- new release - -* Wed Feb 17 2010 Guillaume Rousse 1:3.2.0-7mdv2010.1 -+ Revision: 507286 -- rely on filetrigger for reloading apache configuration begining with 2010.1, rpm-helper macros otherwise -- switch to "open to all" default access policy - -* Sat Jan 16 2010 Funda Wang 1:3.2.0-6mdv2010.1 -+ Revision: 492259 -- rebuild for new libjpeg v8 - -* Fri Dec 04 2009 Guillaume Rousse 1:3.2.0-5mdv2010.1 -+ Revision: 473483 -- better apache configuration - -* Mon Nov 30 2009 Guillaume Rousse 1:3.2.0-4mdv2010.1 -+ Revision: 472077 -- restrict default access permissions to localhost only, as per new policy - -* Wed Sep 09 2009 Frederik Himpe 1:3.2.0-3mdv2010.0 -+ Revision: 435783 -- Rebuild for new perl - -* Mon Aug 17 2009 Oden Eriksson 1:3.2.0-2mdv2010.0 -+ Revision: 417293 -- rebuilt against libjpeg v7 - -* Thu Aug 13 2009 Oden Eriksson 1:3.2.0-1mdv2010.0 -+ Revision: 416025 -- 3.2.0 - -* Sun Jul 19 2009 Guillaume Rousse 1:3.1.2-2mdv2010.0 -+ Revision: 397904 -- merge README.mandriva and README.urpmi in a single README.mdv file, and use an herein document for it -- drop old 2006.0 menu entr -- cleanup %%files section -- drop overcomplex password generation at install-time, and ship a minimal apache configuration file, admins are supposed smart enough to configure suited protection themselves -- drop useless explicit dependencies -- spec cleanup -- build mini_epn -- allow translations in initscript -- drop useless optflag patch -- use make argument instead of a patch to avoid stripping -- no need to regenerate autotools suite - -* Wed Jul 01 2009 Oden Eriksson 1:3.1.2-1mdv2010.0 -+ Revision: 391239 -- bump release -- 3.1.2 - - + Guillaume Rousse - - fix default physical_html_path in cgi.cfg - -* Sun Jan 25 2009 Oden Eriksson 1:3.1.0-1mdv2009.1 -+ Revision: 333546 -- 3.1.0 -- fix build with -Werror=format-security (P7) -- don't activate the check_for_updates feature per default (P8) - -* Tue Dec 30 2008 Guillaume Rousse 1:3.0.6-3mdv2009.1 -+ Revision: 321471 -- enable embedded perl -- substitute files only, not directories -- fix more file perms -- move web pages under %%{_datadir}/nagios/www, to avoid having plugins under web root - -* Mon Dec 15 2008 Guillaume Rousse 1:3.0.6-2mdv2009.1 -+ Revision: 314622 -- add file triggers to reload nagios when adding plugins -- rename apache configuration file according to webapps policy, while - moving old one to avoid #45963 -- rediff patch 0 for no fuzz -- fix init script logic: cmd and pid files should be deleted if present, not if missing - - + Oden Eriksson - - lowercase ImageMagick - -* Tue Dec 02 2008 Oden Eriksson 1:3.0.6-1mdv2009.1 -+ Revision: 309178 -- 3.0.6 (Minor security fixes) - -* Mon Nov 24 2008 Oden Eriksson 1:3.0.5-2mdv2009.1 -+ Revision: 306324 -- fix #45963 (Move of configuration file breaks custom configurations) - -* Wed Nov 05 2008 Guillaume Rousse 1:3.0.5-1mdv2009.1 -+ Revision: 300019 -- new version -- don't version apache configuration file - -* Thu Oct 16 2008 Oden Eriksson 1:3.0.4-1mdv2009.1 -+ Revision: 294138 -- 3.0.4 - -* Fri Jul 04 2008 Guillaume Rousse 1:3.0.3-2mdv2009.0 -+ Revision: 231681 -- yet another event handlers fix - -* Thu Jun 26 2008 Oden Eriksson 1:3.0.3-1mdv2009.0 -+ Revision: 229226 -- 3.0.3 - - + Pixel - - rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas - -* Wed May 21 2008 Oden Eriksson 1:3.0.2-0.1mdv2009.0 -+ Revision: 209800 -- 3.0.2 - -* Thu May 15 2008 Guillaume Rousse 1:3.0.1-2mdv2009.0 -+ Revision: 207546 -- change the dependency in initscript from mysql to ndo2db - -* Wed Apr 02 2008 Guillaume Rousse 1:3.0.1-1mdv2008.1 -+ Revision: 191564 -- new version (bugfix release) - -* Fri Mar 14 2008 Guillaume Rousse 1:3.0-1mdv2008.1 -+ Revision: 187806 -- final version - -* Wed Feb 27 2008 Guillaume Rousse 1:3.0-0.0.rc3.1mdv2008.1 -+ Revision: 175745 -- new version - -* Thu Feb 14 2008 Oden Eriksson 1:3.0-0.0.rc2.3mdv2008.1 -+ Revision: 168479 -- make it build on cs4 - -* Mon Feb 11 2008 Oden Eriksson 1:3.0-0.0.rc2.2mdv2008.1 -+ Revision: 165278 -- fix deps - -* Wed Jan 30 2008 Oden Eriksson 1:3.0-0.0.rc2.1mdv2008.1 -+ Revision: 160236 -- 3.0rc2 -- drop P2, it's implemented upstream -- fix #36663 (Error message when installing any nagios plug-in) -- make it back portable (old menu system) -- added a README.Mandriva file that hopefully explains more... -- require a new nagios-conf package for tailoring nagios -- partly fix #36662 -- fix #36650 (no LSB tags in init script) - - + Thierry Vignaud - - drop old menu - - + Olivier Blin - - restore BuildRoot - - + Guillaume Rousse - - own cgi dir, otherwise a restricted root umask make them unusable - -* Tue Dec 18 2007 Oden Eriksson 1:3.0-0.0.rc1.1mdv2008.1 -+ Revision: 132454 -- 3.0rc1 -- fix a %%postun error -- 3.0b7 -- rediffed P6 -- fix the apache config (duh!) - - + Thierry Vignaud - - kill re-definition of %%buildroot on Pixel's request - - buildrequires X11-devel instead of XFree86-devel - -* Thu Nov 01 2007 Oden Eriksson 1:3.0-0.0.b6.1mdv2008.1 -+ Revision: 104437 -- 3.0b6 - -* Fri Oct 12 2007 Oden Eriksson 1:3.0-0.0.b5.1mdv2008.1 -+ Revision: 97364 -- 3.0b5 - -* Fri Sep 28 2007 Oden Eriksson 1:3.0-0.0.b4.1mdv2008.0 -+ Revision: 93545 -- 3.0b4 -- drop P3, it was allready applied - -* Sun Sep 09 2007 Oden Eriksson 1:3.0-0.0.b3.4mdv2008.0 -+ Revision: 83456 -- whoops!, it was the other way around :) - -* Sun Sep 09 2007 Oden Eriksson 1:3.0-0.0.b3.3mdv2008.0 -+ Revision: 83454 -- fix the apache config -- fix the %%pre and %%post scriptlets - -* Fri Sep 07 2007 Oden Eriksson 1:3.0-0.0.b3.2mdv2008.0 -+ Revision: 81569 -- fix correct path to checkresults - -* Sat Sep 01 2007 Oden Eriksson 1:3.0-0.0.b3.1mdv2008.0 -+ Revision: 77372 -- 3.0b3 -- rediffed patches - -* Thu Aug 23 2007 Thierry Vignaud 1:2.9-5mdv2008.0 -+ Revision: 70376 -- fileutils, sh-utils & textutils have been obsoleted by coreutils a long time ago - -* Tue Jul 24 2007 Oden Eriksson 1:2.9-4mdv2008.0 -+ Revision: 55004 -- use the new %%serverbuild macro - -* Mon Jun 25 2007 Oden Eriksson 1:2.9-3mdv2008.0 -+ Revision: 43826 -- fix deps - -* Thu Jun 14 2007 Oden Eriksson 1:2.9-2mdv2008.0 -+ Revision: 39298 -- use distro conditional -fstack-protector - -* Tue Apr 17 2007 Oden Eriksson 1:2.9-1mdv2008.0 -+ Revision: 13743 -- 2.9 -- 2.9 - - -* Thu Jan 25 2007 Oden Eriksson 2.7-1mdv2007.0 -+ Revision: 113174 -- 2.7 -- make it backportable - -* Thu Nov 30 2006 Oden Eriksson 1:2.6-1mdv2007.1 -+ Revision: 89047 -- 2.6 -- remove obsolete patches and add one new one -- remove obsolete sources -- generate a password if needed for the nagios web user -- added a README.urpmi file outlining the changes - -* Wed Nov 15 2006 Oden Eriksson 1:2.5-5mdv2007.1 -+ Revision: 84428 -- Import nagios - -* Wed Nov 15 2006 Oden Eriksson 1:2.5-6mdv2007.1 -- use the www-browser script instead -- fix the xdg menu -- remove conditional build switches for unsupported distros -- bunzip sources - -* Thu Sep 07 2006 Oden Eriksson 1:2.5-5mdv2007.0 -- don't enforce ssl redirect - -* Fri Aug 04 2006 Oden Eriksson 1:2.5-4mdv2007.0 -- fix typo - -* Thu Aug 03 2006 Oden Eriksson 1:2.5-3mdv2007.0 -- fix xdg menu stuff - -* Thu Aug 03 2006 Oden Eriksson 1:2.5-2mdv2007.0 -- fix deps - -* Sat Jul 15 2006 Oden Eriksson 1:2.5-1mdv2007.0 -- 2.5 (Minor bugfixes) - -* Mon Jul 03 2006 Emmanuel Andry 1:2.4-2mdv2007.0 -- fix buildrequires - -* Fri Jun 02 2006 Oden Eriksson 1:2.4-1mdv2007.0 -- 2.4 (Minor bugfixes) -- rediffed P8 - -* Wed May 17 2006 Oden Eriksson 1:2.3.1-1mdk -- 2.3.1 (Major security fixes) - -* Sun May 14 2006 Oden Eriksson 1:2.3-3mdk -- fix better apache config - -* Thu May 11 2006 Oden Eriksson 1:2.3-2mdk -- fix deps -- relocate the /admin/nagios url to /nagios -- fix better apache config -- fix a menuentry - -* Fri May 05 2006 Oden Eriksson 1:2.3-1mdk -- 2.3 (Minor security fixes) - -* Sun Apr 09 2006 Oden Eriksson 2.2-1mdk -- 2.2 (Minor bugfixes) - -* Sat Apr 08 2006 Oden Eriksson 1:2.1-2mdk -- fix deps and #20711 - -* Tue Mar 28 2006 Oden Eriksson 1:2.1-1mdk -- 2.1 (Minor bugfixes) - -* Thu Feb 23 2006 Oden Eriksson 1:2.0-3mdk -- install the apache config depending on distro - -* Tue Feb 14 2006 Oden Eriksson 1:2.0-2mdk -- fix deps - -* Wed Feb 08 2006 Oden Eriksson 1:2.0-1mdk -- 2.0 (Minor bugfixes) - -* Wed Jan 11 2006 Oden Eriksson 2.0rc2-1mdk -- 2.0rc2 (Minor bugfixes) -- rediffed P2 - -* Thu Dec 01 2005 Oden Eriksson 2.0b6-1mdk -- 2.0b5 (Minor bugfixes) - -* Tue Nov 15 2005 Oden Eriksson 2.0b5-1mdk -- 2.0b5 (Minor bugfixes) -- remove strip calls (P8) - -* Wed Oct 19 2005 Oden Eriksson 2.0b4-2mdk -- fix #19312 - -* Thu Aug 04 2005 Oden Eriksson 2.0b4-1mdk -- 2.0b4 (Minor bugfixes) -- fix %%post and %%postun for the nagios-www package -- fix deps - -* Tue May 31 2005 Oden Eriksson 2.0b4-0.20050530.1mdk -- use a recent snap (20050530) -- added a nice favicon.ico patch by PLD (S5 & P6) -- added a patch by Andreas Ericsson (P7) - -* Thu May 26 2005 Oden Eriksson 2.0b3-2mdk -- fix #13814 - -* Tue Apr 05 2005 Oden Eriksson 2.0b3-1mdk -- 2.0b3 -- added P5 to make the shipped minimalistic config work again - -* Mon Apr 04 2005 Oden Eriksson 2.0b2-4mdk -- use the %%mkrel macro - -* Sat Feb 19 2005 Oden Eriksson 2.0b2-3mdk -- added P4 to bring back some missing stuff -- handle the %%postun better - -* Fri Feb 18 2005 Oden Eriksson 2.0b2-2mdk -- spec file cleanups, remove the ADVX-build stuff - -* Thu Feb 10 2005 Oden Eriksson 2.0b2-1mdk -- 2.0b2 -- rediffed P0 -- make it compile on x86_64 - -* Thu Feb 10 2005 Oden Eriksson 2.0a1-0.20041024.3mdk -- set LC_ALL=C in the initscript in an attempt to fix #12740 like future issues -- fix deps and conditional %%multiarch - -* Mon Nov 29 2004 Oden Eriksson 2.0a1-0.20041024.2mdk -- added S2 -- enhanced the init scipt a bit (S1) - -* Mon Oct 25 2004 Oden Eriksson 2.0a1-0.20041024.1mdk -- 20041024 - -* Mon Oct 04 2004 Oden Eriksson 2.0a1-0.20041002.2mdk -- fix one typo - -* Mon Oct 04 2004 Oden Eriksson 2.0a1-0.20041002.1mdk -- cvs snap 20041002 of 2.0a1 -- added the long forgotten eventhandlers -- new S2 -- added P2 & P3 -- misc spec file fixes - -* Tue Jul 06 2004 Oden Eriksson 1.2-4mdk -- added P1 to make it recognize the correct gd stuff - -* Sat Jun 12 2004 Oden Eriksson 1.2-3mdk -- rebuilt against new gd - -* Sun May 16 2004 Oden Eriksson 1.2-2mdk -- fix #9762 (revert changes in 1.2-1mdk) -- fix deps - -* Wed Mar 03 2004 Tibor Pittich 1.2-1mdk -- 1.2 -- fixed 12_nagios.conf -