Hello community, here is the log from the commit of package nagios-plugins checked in at Mon Mar 10 15:15:42 CET 2008. -------- --- nagios-plugins/nagios-plugins.changes 2008-01-04 10:22:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/nagios-plugins/nagios-plugins.changes 2008-01-31 12:48:44.000000000 +0100 @@ -1,0 +2,14 @@ +Wed Jan 30 16:03:40 CET 2008 - lrupp@suse.de + +- enabled check_apt and check_game (in extras package) +- rpcinfo-, qstat- and apt-get-command need pathnames + (to avoid extra BuildRequires) +- make all plugins executable +- package commands.cfg to /etc/nagios +- package CODING file in docdir +- check_radius is currently broken +- BuildRequire nagios-devel +- build parallel +- added gnutls to BuildRequires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios-plugins.spec ++++++ --- /var/tmp/diff_new_pack.n19095/_old 2008-03-10 15:15:29.000000000 +0100 +++ /var/tmp/diff_new_pack.n19095/_new 2008-03-10 15:15:29.000000000 +0100 @@ -10,8 +10,19 @@ # norootforbuild + Name: nagios-plugins -BuildRequires: bind-utils dhcp-devel fping iputils libsmbclient-devel mysql-devel nagios net-snmp-devel openldap2 openldap2-devel openssh perl-Net-SNMP postfix postgresql-devel procps python-devel samba-client +Summary: The Nagios Plug-Ins +Version: 1.4.11 +Release: 23 +Url: http://nagiosplug.sourceforge.net/ +License: GPL v2 or later +Group: System/Monitoring +BuildRequires: bind-utils dhcp-devel fping iputils libsmbclient libsmbclient-devel +BuildRequires: mysql-devel net-snmp-devel openldap2-devel openssh perl-Net-SNMP +BuildRequires: gnutls-devel postfix postgresql-devel procps python-devel samba-client +BuildRequires: gnutls +BuildRequires: nagios %if 0%{?suse_version} %if 0%{?suse_version} > 1020 BuildRequires: freeradius-client-devel @@ -24,13 +35,6 @@ %else BuildRequires: krb5-devel %endif -Summary: The Nagios Plug-Ins -Version: 1.4.11 -Release: 1 -Url: http://nagiosplug.sourceforge.net/ -License: GPL v2 or later -Group: System/Monitoring -AutoReqProv: on Source0: nagios-plugins-%{version}.tar.bz2 Patch1: nagios-plugins-1.4.5-check_procs.c.patch Patch2: nagios-plugins-1.4.5-check_fping.c.patch @@ -44,7 +48,7 @@ Patch11: nagios-plugins.check_snmp.arrayaddress.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: perl-Net-SNMP -%define libexecdir %{_prefix}/lib/nagios/plugins +%define libexecdir %_prefix/lib/nagios/plugins %description Nagios is a program that will monitor hosts and services on your @@ -67,7 +71,7 @@ %package extras Summary: Nagios Plug-Ins which depend on additional packages Group: System/Monitoring -Requires: nagios-plugins net-snmp fping +Requires: %name net-snmp fping %description extras These are additional plug-ins for Nagios. @@ -83,118 +87,137 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch6 -p1 -%patch7 -p1 +%patch1 +%patch2 +%patch3 +%patch4 +%patch6 %patch8 -p1 +#patch7 %patch9 -p1 %patch10 -p1 -%patch11 -p1 +%patch11 %build -autoconf -CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED" \ -CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED" \ -./configure \ - --prefix=%{_prefix} \ - --libexecdir=%{libexecdir} \ +export CFLAGS="%optflags -fno-strict-aliasing -DLDAP_DEPRECATED" +%configure \ + --libexecdir=%libexecdir \ --with-cgiurl=/nagios/cgi-bin \ - --with-fping-command=/usr/sbin/fping \ + --sysconfdir=%_sysconfdir/nagios \ + --enable-static=no \ + --with-fping-command=%_sbindir/fping \ + --with-apt-get-command=%_bindir/apt-get \ + --with-qstat-command=%_bindir/qstat \ + --with-rpcinfo-command=%_sbindir/rpcinfo \ --with-mysql -make all + #--enable-perl-modules +make all %{?jobs:-j%jobs} %install -make DESTDIR=${RPM_BUILD_ROOT} install -install -d $RPM_BUILD_ROOT/etc/nagios +%makeinstall +install -D -m 664 command.cfg %buildroot/%_sysconfdir/nagios/command.cfg +%find_lang %name %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %buildroot -%files +%files -f %name.lang %defattr(-,root,root) -%dir /etc/nagios -%doc ACKNOWLEDGEMENTS AUTHORS BUGS COPYING ChangeLog NEWS README FAQ SUPPORT +%doc ACKNOWLEDGEMENTS AUTHORS BUGS CODING COPYING ChangeLog NEWS README FAQ SUPPORT %doc REQUIREMENTS THANKS LEGAL -%dir /usr/lib/nagios -%dir %{libexecdir} -%{libexecdir}/check_breeze -%{libexecdir}/check_by_ssh -%{libexecdir}/check_clamd -%{libexecdir}/check_cluster -%attr(0755,root,root) %{libexecdir}/check_dhcp -%{libexecdir}/check_dig -%{libexecdir}/check_disk -%{libexecdir}/check_disk_smb -%{libexecdir}/check_dns -%{libexecdir}/check_dummy -%{libexecdir}/check_file_age -%{libexecdir}/check_flexlm -%{libexecdir}/check_ftp -%{libexecdir}/check_http -%attr(0755,root,root) %{libexecdir}/check_icmp -%{libexecdir}/check_ide_smart -%{libexecdir}/check_ifoperstatus -%{libexecdir}/check_ifstatus -%{libexecdir}/check_imap -%{libexecdir}/check_ircd -%{libexecdir}/check_load -%{libexecdir}/check_log -%{libexecdir}/check_mailq -%{libexecdir}/check_mrtg -%{libexecdir}/check_mrtgtraf -%{libexecdir}/check_nagios -%{libexecdir}/check_nntp -%{libexecdir}/check_nt -%{libexecdir}/check_ntp -%{libexecdir}/check_ntp_peer -%{libexecdir}/check_ntp_time -%{libexecdir}/check_nwstat -%{libexecdir}/check_oracle -%{libexecdir}/check_overcr -%{libexecdir}/check_ping -%{libexecdir}/check_pop -%{libexecdir}/check_procs -%{libexecdir}/check_real -%{libexecdir}/check_rpc -%{libexecdir}/check_sensors -%{libexecdir}/check_smtp -%{libexecdir}/check_ssh -%{libexecdir}/check_swap -%{libexecdir}/check_tcp -%{libexecdir}/check_time -%{libexecdir}/check_udp -%{libexecdir}/check_ups -%{libexecdir}/check_users -%{libexecdir}/check_wave -%{libexecdir}/negate -%{libexecdir}/urlize -%{libexecdir}/utils.pm -%{libexecdir}/utils.sh -/usr/share/locale/*/LC_MESSAGES/* +%dir %_sysconfdir/nagios +%dir %_prefix/lib/nagios +%dir %libexecdir +%config(missingok,noreplace) %_sysconfdir/nagios/command.cfg +%defattr(0755,root,root) +%libexecdir/check_breeze +%libexecdir/check_by_ssh +%libexecdir/check_clamd +%libexecdir/check_cluster +# FIXME: add to /etc/permissins - check_dhcp seems to need this +# %attr(4755,root,root) %libexecdir/check_dhcp +%libexecdir/check_dhcp +%libexecdir/check_dig +%libexecdir/check_disk +%libexecdir/check_disk_smb +%libexecdir/check_dns +%libexecdir/check_dummy +%libexecdir/check_file_age +%libexecdir/check_flexlm +%libexecdir/check_ftp +%libexecdir/check_http +%libexecdir/check_icmp +%libexecdir/check_ide_smart +%libexecdir/check_ifoperstatus +%libexecdir/check_ifstatus +%libexecdir/check_imap +%libexecdir/check_ircd +%libexecdir/check_load +%libexecdir/check_log +%libexecdir/check_mailq +%libexecdir/check_mrtg +%libexecdir/check_mrtgtraf +%libexecdir/check_nagios +%libexecdir/check_nntp +%libexecdir/check_nt +%libexecdir/check_ntp +%libexecdir/check_ntp_peer +%libexecdir/check_ntp_time +%libexecdir/check_nwstat +%libexecdir/check_oracle +%libexecdir/check_overcr +%libexecdir/check_ping +%libexecdir/check_pop +%libexecdir/check_procs +%libexecdir/check_real +%libexecdir/check_rpc +%libexecdir/check_sensors +%libexecdir/check_smtp +%libexecdir/check_ssh +%libexecdir/check_swap +%libexecdir/check_tcp +%libexecdir/check_time +%libexecdir/check_udp +%libexecdir/check_ups +%libexecdir/check_users +%libexecdir/check_wave +%libexecdir/negate +%libexecdir/urlize +%libexecdir/utils.sh +%attr(0644,root,root) %libexecdir/utils.pm %files extras -%defattr(-,root,root) -%attr(0755,root,root) %{libexecdir}/check_fping -%{libexecdir}/check_hpjd -%{libexecdir}/check_ldap -%{libexecdir}/check_ldaps -%{libexecdir}/check_mysql -%{libexecdir}/check_mysql_query -%{libexecdir}/check_pgsql -%{libexecdir}/check_radius -%{libexecdir}/check_snmp -%{libexecdir}/check_jabber -%{libexecdir}/check_nntps -%{libexecdir}/check_simap -%{libexecdir}/check_spop -%{libexecdir}/check_ssmtp -%{libexecdir}/check_apt +%defattr(0755,root,root) +%libexecdir/check_fping +%libexecdir/check_hpjd +%libexecdir/check_ldap +%libexecdir/check_ldaps +%libexecdir/check_mysql +%libexecdir/check_mysql_query +%libexecdir/check_pgsql +#%libexecdir/check_radius +%libexecdir/check_snmp +%libexecdir/check_jabber +%libexecdir/check_nntps +%libexecdir/check_simap +%libexecdir/check_spop +%libexecdir/check_ssmtp +%libexecdir/check_apt +%libexecdir/check_game %changelog -* Fri Jan 04 2008 - olh@suse.de +* Wed Jan 30 2008 lrupp@suse.de +- enabled check_apt and check_game (in extras package) +- rpcinfo-, qstat- and apt-get-command need pathnames + (to avoid extra BuildRequires) +- make all plugins executable +- package commands.cfg to /etc/nagios +- package CODING file in docdir +- check_radius is currently broken +- BuildRequire nagios-devel +- build parallel +- added gnutls to BuildRequires +* Fri Jan 04 2008 olh@suse.de - update to version 1.4.11 * Fix check_http regression in 1.4.10 where following redirects to relative URLs on virtual hosts failed if both "-H" and "-I" were used @@ -209,12 +232,12 @@ * Fix check_disk reporting OK if disk usage grows over 100%% (bug #1348746). The problem happens to be in Gnulib but a workaround have been implemented in check_disk.c * Fix check_load argument handling when not passing triplets (bug #1831890) -* Fri Oct 26 2007 - olh@suse.de +* Fri Oct 26 2007 olh@suse.de - fix possible buffer overflow in check_snmp with snmpget replies (336002) fix possible buffer overflow in check_http with redirects (331728) -* Mon Oct 08 2007 - olh@suse.de +* Mon Oct 08 2007 olh@suse.de - fix string check in check_snmp -* Mon Oct 08 2007 - olh@suse.de +* Mon Oct 08 2007 olh@suse.de - update to version 1.4.10 (331728) * Fix check_http buffer overflow vulnerability when following HTTP redirects * check_http now explicitly asks HTTP/1.1 servers to close the connection @@ -249,9 +272,9 @@ * Check_by_ssh now supports multiline output * IPv6 support can now be disabled using ./configure --without-ipv6 * Fix check_ntp now honor ntp flags -* Wed Aug 15 2007 - olh@suse.de +* Wed Aug 15 2007 olh@suse.de - require freeradius-client-devel only in openSuSE > 10.2 -* Wed Aug 15 2007 - olh@suse.de +* Wed Aug 15 2007 olh@suse.de - fix a few compile warnings - update to version 1.4.9 * Inclusion of contrib/check_cluster2 as check_cluster with some improvements @@ -281,15 +304,15 @@ * check_sybase from contrib now maintained in NagiosExchange * --with-nagios-user/group reinstated ./configure option * New --without-world-permissions ./configure option -* Fri Mar 30 2007 - ro@suse.de +* Fri Mar 30 2007 ro@suse.de - added procps,bind-utils to buildreq -* Thu Mar 15 2007 - ro@suse.de +* Thu Mar 15 2007 ro@suse.de - disable radius plugin for now, needs porting to freeradius-client -* Thu Mar 15 2007 - ro@suse.de +* Thu Mar 15 2007 ro@suse.de - make it build as non-root - check_dhcp and check_ are still not installed suid, but they were not suid before this change -* Mon Mar 12 2007 - tsieden@suse.de +* Mon Mar 12 2007 tsieden@suse.de - update to version 1.4.6 * Reduced number of DNS lookups in check_ping and netutils.c for IPv6 configurations @@ -306,15 +329,15 @@ - removed ntp from BuildRequires - adapted from BuildService: * added more distribution-specific BuildRequires from mge@suse.de -* Wed Jan 10 2007 - olh@suse.de +* Wed Jan 10 2007 olh@suse.de - remove outdated and unused command.cfg -* Fri Nov 17 2006 - tsieden@suse.de +* Fri Nov 17 2006 tsieden@suse.de - fix build * typos in check_http.c, check_icmp.c and check_ldap.c * added missing include to check_procs.c * fix more gcc warnings in check_fping.c, check_mysql.c and check_mysql_query.c -* Thu Nov 16 2006 - tsieden@suse.de +* Thu Nov 16 2006 tsieden@suse.de - update to version 1.4.5 * check_udp2 removed. check_udp is now linked to check_tcp.c * new check_apt plugin @@ -326,89 +349,89 @@ non-zero return code. this would appear as if mailqs were okay when the nagios user could not query the mail-queues * compile problems with check_snmp fixed -* Wed Jun 21 2006 - stark@suse.de +* Wed Jun 21 2006 stark@suse.de - update to version 1.4.3 * check_mysql_query added to run arbitrary SQL commands, with threshold checking * new check_clamd -* Fri Jun 16 2006 - schwab@suse.de +* Sat Jun 17 2006 schwab@suse.de - Fix syntax error in configure script. -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Mon Dec 19 2005 - ro@suse.de +* Mon Dec 19 2005 ro@suse.de - added previously unpackaged symlinks to extras package -* Tue Oct 25 2005 - rhafer@suse.de +* Tue Oct 25 2005 rhafer@suse.de - added LDAP_DEPRECATED to CFLAGS to build correctly with OpenLDAP 2.3 -* Tue Sep 20 2005 - stark@suse.de +* Tue Sep 20 2005 stark@suse.de - update to version 1.4.2 -* Tue Aug 02 2005 - stark@suse.de +* Tue Aug 02 2005 stark@suse.de - update to version 1.4.1 -* Tue May 17 2005 - stark@suse.de +* Tue May 17 2005 stark@suse.de - fixed overwriting a buffer -* Tue May 17 2005 - stark@suse.de +* Tue May 17 2005 stark@suse.de - fixed ps syntax (bug 75699) -* Fri Feb 04 2005 - stark@suse.de +* Fri Feb 04 2005 stark@suse.de - update to version 1.4 -* Wed May 26 2004 - ro@suse.de +* Wed May 26 2004 ro@suse.de - add some return values to non-void functions -* Thu Dec 18 2003 - stark@suse.de +* Thu Dec 18 2003 stark@suse.de - adopted to new ping output format (iputils-ss021109) (#33710) -* Mon Nov 10 2003 - ro@suse.de +* Mon Nov 10 2003 ro@suse.de - use net-snmp instead of ucdsnmp -* Fri Jul 18 2003 - stark@suse.de +* Fri Jul 18 2003 stark@suse.de - update to 1.3.1 -* Thu Jun 19 2003 - stark@suse.de +* Thu Jun 19 2003 stark@suse.de - added missing directories to filelist -* Tue May 27 2003 - stark@suse.de +* Tue May 27 2003 stark@suse.de - update to 1.3.0 * added check_nt -* Mon Dec 02 2002 - stark@suse.de +* Mon Dec 02 2002 stark@suse.de - update to 1.3.0beta2 * included SNMPv3 patch -* Thu Nov 21 2002 - ro@suse.de +* Thu Nov 21 2002 ro@suse.de - work around autoconf problem -* Wed Oct 09 2002 - stark@suse.de +* Wed Oct 09 2002 stark@suse.de - added nagios to neededforbuild (Bug #20557) -* Sun Oct 06 2002 - stark@suse.de +* Sun Oct 06 2002 stark@suse.de - moved Requires: perl-Net-SNMP from extras to "normal" package (Bug #20559) - removed Requires: nagios because it is also possible to use it with nagios-nrpe -* Thu Aug 01 2002 - ro@suse.de +* Thu Aug 01 2002 ro@suse.de - use openldap2 as neededforbuild -* Tue Jul 09 2002 - stark@suse.de +* Tue Jul 09 2002 stark@suse.de - added patch to be able to connect via SNMPv3 (check_snmp) -* Mon Jul 01 2002 - ro@suse.de +* Mon Jul 01 2002 ro@suse.de - find mysql on lib64 -* Wed Jun 19 2002 - stark@suse.de +* Wed Jun 19 2002 stark@suse.de - switched to nagiosplug 1.3beta1 (is stated as beta but should be usable in almost all cases) -* Fri Jun 14 2002 - stepan@suse.de +* Fri Jun 14 2002 stepan@suse.de - add mysql-client to neededforbuild -* Mon Apr 29 2002 - stark@suse.de +* Mon Apr 29 2002 stark@suse.de - changed Requires to nagios -* Tue Jan 15 2002 - stark@suse.de +* Tue Jan 15 2002 stark@suse.de - fixed check_ping to fit new ping output (#12769) -* Wed Nov 07 2001 - stark@suse.de +* Wed Nov 07 2001 stark@suse.de - use AM_INIT_AUTOMAKE -* Mon Aug 27 2001 - ro@suse.de +* Mon Aug 27 2001 ro@suse.de - fix for current ping output (round-trip is called rtt now) - bzip source -* Mon Jul 30 2001 - stark@suse.de +* Mon Jul 30 2001 stark@suse.de - added openssl to #neededforbuild -* Fri Jul 27 2001 - kukuk@suse.de +* Fri Jul 27 2001 kukuk@suse.de - change postgresql-lib -> postgresql-libs -* Mon Jul 16 2001 - stark@suse.de +* Mon Jul 16 2001 stark@suse.de - added mysql-shared to #neededforbuild -* Tue Jul 10 2001 - stark@suse.de +* Tue Jul 10 2001 stark@suse.de - package splitted (netsaint-plugins-extras for dependent functions - added check_fping -* Mon Jul 09 2001 - stark@suse.de +* Mon Jul 09 2001 stark@suse.de - fixed #ifdef in check_mrtg.c, check_nwstat.c, check_by_ssh.c -* Mon Jun 18 2001 - stark@suse.de +* Mon Jun 18 2001 stark@suse.de - removed openldap-client from neededforbuild -* Mon May 14 2001 - stark@suse.de +* Mon May 14 2001 stark@suse.de - update to release 1.2.9-4 -* Thu Apr 19 2001 - stark@suse.de +* Thu Apr 19 2001 stark@suse.de - initial package 1.2.9-3 ++++++ nagios-plugins-1.4.5-check_fping.c.patch ++++++ --- /var/tmp/diff_new_pack.n19095/_old 2008-03-10 15:15:29.000000000 +0100 +++ /var/tmp/diff_new_pack.n19095/_new 2008-03-10 15:15:29.000000000 +0100 @@ -1,10 +1,6 @@ ---- - plugins/check_fping.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/plugins/check_fping.c -+++ b/plugins/check_fping.c -@@ -389,9 +389,9 @@ print_help (void) +--- plugins/check_fping.c ++++ plugins/check_fping.c +@@ -389,9 +389,9 @@ printf (" %s\n", "-c, --critical=THRESHOLD"); printf (" %s\n", _("critical threshold pair")); printf (" %s\n", "-b, --bytes=INTEGER"); ++++++ nagios-plugins-1.4.5-check_mysql.c.patch ++++++ --- /var/tmp/diff_new_pack.n19095/_old 2008-03-10 15:15:29.000000000 +0100 +++ /var/tmp/diff_new_pack.n19095/_new 2008-03-10 15:15:29.000000000 +0100 @@ -1,10 +1,6 @@ ---- - plugins/check_mysql.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/plugins/check_mysql.c -+++ b/plugins/check_mysql.c -@@ -351,7 +351,7 @@ validate_arguments (void) +--- plugins/check_mysql.c 2006-10-19 02:25:16.000000000 +0200 ++++ plugins/check_mysql.c 2006-11-17 13:02:47.000000000 +0100 +@@ -351,7 +351,7 @@ db_host = strdup(""); if (db_pass == NULL) ++++++ nagios-plugins-1.4.5-check_mysql_query.c.patch ++++++ --- /var/tmp/diff_new_pack.n19095/_old 2008-03-10 15:15:29.000000000 +0100 +++ /var/tmp/diff_new_pack.n19095/_new 2008-03-10 15:15:29.000000000 +0100 @@ -1,10 +1,6 @@ ---- - plugins/check_mysql_query.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/plugins/check_mysql_query.c -+++ b/plugins/check_mysql_query.c -@@ -265,7 +265,7 @@ validate_arguments (void) +--- plugins/check_mysql_query.c 2006-10-19 02:25:16.000000000 +0200 ++++ plugins/check_mysql_query.c 2006-11-17 12:57:41.000000000 +0100 +@@ -265,7 +265,7 @@ db_host = strdup(""); if (db_pass == NULL) ++++++ nagios-plugins-1.4.5-check_procs.c.patch ++++++ --- /var/tmp/diff_new_pack.n19095/_old 2008-03-10 15:15:29.000000000 +0100 +++ /var/tmp/diff_new_pack.n19095/_new 2008-03-10 15:15:29.000000000 +0100 @@ -1,14 +1,10 @@ ---- - plugins/check_procs.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/plugins/check_procs.c -+++ b/plugins/check_procs.c -@@ -44,6 +44,7 @@ const char *email = "nagiosplug-devel@li +--- plugins/check_procs.c 2006-10-23 00:03:31.000000000 +0200 ++++ plugins/check_procs.c 2006-11-17 11:11:22.000000000 +0100 +@@ -43,6 +43,7 @@ #include "common.h" #include "popen.h" #include "utils.h" +#include "dirname.h" - + #include <pwd.h> - + ++++++ nagios-plugins-1.4.6-freeradius.patch ++++++ --- /var/tmp/diff_new_pack.n19095/_old 2008-03-10 15:15:29.000000000 +0100 +++ /var/tmp/diff_new_pack.n19095/_new 2008-03-10 15:15:29.000000000 +0100 @@ -1,34 +1,27 @@ ---- - configure.in | 6 +++--- - plugins/check_radius.c | 3 ++- - 2 files changed, 5 insertions(+), 4 deletions(-) - ---- a/configure.in -+++ b/configure.in -@@ -218,10 +218,10 @@ if test "$ac_cv_lib_radiusclient_rc_read - RADIUSLIBS="-lradiusclient" +--- configure.in ++++ configure.in +@@ -196,10 +196,10 @@ + + dnl Check for radius libraries + _SAVEDLIBS="$LIBS" +-AC_CHECK_LIB(radiusclient,rc_read_config) +-if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then ++AC_CHECK_LIB(freeradius-client,rc_read_config) ++if test "$ac_cv_lib_freeradius_client_rc_read_config" = "yes"; then + EXTRAS="$EXTRAS check_radius" +- RADIUSLIBS="-lradiusclient" ++ RADIUSLIBS="-lfreeradius-client" AC_SUBST(RADIUSLIBS) else -- AC_CHECK_LIB(radiusclient-ng,rc_read_config) -- if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then -+ AC_CHECK_LIB(freeradius-client,rc_read_config) -+ if test "$ac_cv_lib_freeradius_client_rc_read_config" = "yes"; then - EXTRAS="$EXTRAS check_radius" -- RADIUSLIBS="-lradiusclient-ng" -+ RADIUSLIBS="-lfreeradius-client" - AC_SUBST(RADIUSLIBS) - else - AC_MSG_WARN([Skipping radius plugin]) ---- a/plugins/check_radius.c -+++ b/plugins/check_radius.c -@@ -43,8 +43,9 @@ const char *email = "nagiosplug-devel@li + AC_MSG_WARN([Skipping radius plugin]) +--- plugins/check_radius.c ++++ plugins/check_radius.c +@@ -43,7 +43,7 @@ #include "utils.h" #include "netutils.h" -+#define HAVE_LIBRADIUSCLIENT_NG - #ifdef HAVE_LIBRADIUSCLIENT_NG --#include <radiusclient-ng.h> +-#include <radiusclient.h> +#include <freeradius-client.h> - rc_handle *rch = NULL; - #else - #include <radiusclient.h> + + int process_arguments (int, char **); + void print_help (void); ++++++ nagios-plugins-1.4.6-no_chown.patch ++++++ --- /var/tmp/diff_new_pack.n19095/_old 2008-03-10 15:15:29.000000000 +0100 +++ /var/tmp/diff_new_pack.n19095/_new 2008-03-10 15:15:29.000000000 +0100 @@ -1,11 +1,6 @@ ---- - plugins-root/Makefile.am | 8 ++++---- - plugins-root/Makefile.in | 9 ++++----- - 2 files changed, 8 insertions(+), 9 deletions(-) - ---- a/plugins-root/Makefile.am -+++ b/plugins-root/Makefile.am -@@ -36,7 +36,6 @@ INSTALL_SUID = \ +--- plugins-root/Makefile.am ++++ plugins-root/Makefile.am +@@ -36,7 +36,6 @@ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \ echo " chown root $(DESTDIR)$(libexecdir)/$$p"; \ @@ -13,7 +8,7 @@ echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \ chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \ done -@@ -55,11 +54,12 @@ install-exec-local: $(noinst_PROGRAMS) +@@ -55,11 +54,12 @@ && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \ && can_create_suid_root_executable=yes; \ rm -f $$TMPFILE; \ @@ -29,9 +24,9 @@ fi # /* Author Coreutils team sub-citation */ ---- a/plugins-root/Makefile.in -+++ b/plugins-root/Makefile.in -@@ -371,7 +371,6 @@ INSTALL_SUID = \ +--- plugins-root/Makefile.in ++++ plugins-root/Makefile.in +@@ -366,7 +366,6 @@ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \ echo " chown root $(DESTDIR)$(libexecdir)/$$p"; \ @@ -39,7 +34,7 @@ echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \ chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \ done -@@ -734,11 +733,11 @@ install-exec-local: $(noinst_PROGRAMS) +@@ -729,11 +728,11 @@ && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \ && can_create_suid_root_executable=yes; \ rm -f $$TMPFILE; \ ++++++ nagios-plugins.asprintf.patch ++++++ --- /var/tmp/diff_new_pack.n19095/_old 2008-03-10 15:15:29.000000000 +0100 +++ /var/tmp/diff_new_pack.n19095/_new 2008-03-10 15:15:29.000000000 +0100 @@ -5,18 +5,18 @@ --- a/plugins/check_http.c +++ b/plugins/check_http.c -@@ -43,6 +43,8 @@ const char *revision = "$Revision: 1861 +@@ -43,6 +43,8 @@ const char *revision = "$Revision: 1.104 const char *copyright = "1999-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; +#define _GNU_SOURCE +#include <stdio.h> #include <ctype.h> - - #include <ctype.h> + #include "common.h" + #include "netutils.h" --- a/plugins/check_tcp.c +++ b/plugins/check_tcp.c -@@ -37,6 +37,8 @@ const char *revision = "$Revision: 1729 +@@ -37,6 +37,8 @@ const char *revision = "$Revision: 1.92 const char *copyright = "1999-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; ++++++ nagios-plugins.check_dhcp-char.patch ++++++ --- /var/tmp/diff_new_pack.n19095/_old 2008-03-10 15:15:30.000000000 +0100 +++ /var/tmp/diff_new_pack.n19095/_new 2008-03-10 15:15:30.000000000 +0100 @@ -4,7 +4,7 @@ --- a/plugins-root/check_dhcp.c +++ b/plugins-root/check_dhcp.c -@@ -155,7 +155,7 @@ typedef struct dhcp_packet_struct{ +@@ -145,7 +145,7 @@ typedef struct dhcp_packet_struct{ unsigned char chaddr [MAX_DHCP_CHADDR_LENGTH]; /* hardware address of this machine */ char sname [MAX_DHCP_SNAME_LENGTH]; /* name of DHCP server */ char file [MAX_DHCP_FILE_LENGTH]; /* boot file name (used for diskless booting?) */ @@ -13,7 +13,7 @@ }dhcp_packet; -@@ -847,7 +847,7 @@ int add_dhcp_offer(struct in_addr source +@@ -783,7 +783,7 @@ int add_dhcp_offer(struct in_addr source for(x=4;x<MAX_DHCP_OPTIONS_LENGTH;){ /* end of options (0 is really just a pad, but bail out anyway) */ ++++++ nagios-plugins.check_snmp.arrayaddress.patch ++++++ --- /var/tmp/diff_new_pack.n19095/_old 2008-03-10 15:15:30.000000000 +0100 +++ /var/tmp/diff_new_pack.n19095/_new 2008-03-10 15:15:30.000000000 +0100 @@ -1,11 +1,10 @@ -check_snmp.c:362: warning: the address of 'type' will always evaluate as 'true' ---- - plugins/check_snmp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +# check_snmp.c:373: warning: the address of 'type' will always evaluate as 'true' ---- a/plugins/check_snmp.c -+++ b/plugins/check_snmp.c -@@ -370,7 +370,7 @@ main (int argc, char **argv) +Index: plugins/check_snmp.c +=================================================================== +--- plugins/check_snmp.c.orig ++++ plugins/check_snmp.c +@@ -370,7 +370,7 @@ strncat(perfstr, "=", sizeof(perfstr)-strlen(perfstr)-1); strncat(perfstr, show, sizeof(perfstr)-strlen(perfstr)-1); ++++++ nagios-plugins.ctypes.patch ++++++ --- /var/tmp/diff_new_pack.n19095/_old 2008-03-10 15:15:30.000000000 +0100 +++ /var/tmp/diff_new_pack.n19095/_new 2008-03-10 15:15:30.000000000 +0100 @@ -5,9 +5,9 @@ --- a/plugins/check_http.c +++ b/plugins/check_http.c -@@ -45,6 +45,7 @@ const char *email = "nagiosplug-devel@li - - #include <ctype.h> +@@ -43,6 +43,7 @@ const char *revision = "$Revision: 1.104 + const char *copyright = "1999-2006"; + const char *email = "nagiosplug-devel@lists.sourceforge.net"; +#include <ctype.h> #include "common.h" @@ -15,7 +15,7 @@ #include "utils.h" --- a/plugins/check_tcp.c +++ b/plugins/check_tcp.c -@@ -37,6 +37,7 @@ const char *revision = "$Revision: 1729 +@@ -37,6 +37,7 @@ const char *revision = "$Revision: 1.92 const char *copyright = "1999-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org