Hello community, here is the log from the commit of package nagios-plugins checked in at Fri Nov 17 19:05:41 CET 2006. -------- --- nagios-plugins/nagios-plugins.changes 2006-11-16 10:34:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/nagios-plugins/nagios-plugins.changes 2006-11-17 12:45:22.000000000 +0100 @@ -1,0 +2,9 @@ +Fri Nov 17 11:47:31 CET 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 + +------------------------------------------------------------------- Old: ---- autoconf.patch New: ---- nagios-plugins-1.4.5-autoconf.patch nagios-plugins-1.4.5-check_fping.c.patch nagios-plugins-1.4.5-check_http.c.patch nagios-plugins-1.4.5-check_icmp.c.patch nagios-plugins-1.4.5-check_ldap.c.patch nagios-plugins-1.4.5-check_mysql.c.patch nagios-plugins-1.4.5-check_mysql_query.c.patch nagios-plugins-1.4.5-check_procs.c.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios-plugins.spec ++++++ --- /var/tmp/diff_new_pack.3wJvk9/_old 2006-11-17 19:05:33.000000000 +0100 +++ /var/tmp/diff_new_pack.3wJvk9/_new 2006-11-17 19:05:33.000000000 +0100 @@ -13,13 +13,20 @@ BuildRequires: fping iputils krb5-devel libsmbclient libsmbclient-devel mysql-devel nagios net-snmp-devel openldap2 openldap2-devel openssh perl-Net-SNMP postfix postgresql-devel python-devel radiusclient samba-client xntp Summary: The Nagios Plug-Ins Version: 1.4.5 -Release: 2 +Release: 3 URL: http://nagiosplug.sourceforge.net/ License: GNU General Public License (GPL) Group: System/Monitoring Autoreqprov: on Source0: nagios-plugins-%{version}.tar.bz2 -Patch1: autoconf.patch +Patch1: nagios-plugins-1.4.5-autoconf.patch +Patch2: nagios-plugins-1.4.5-check_http.c.patch +Patch3: nagios-plugins-1.4.5-check_icmp.c.patch +Patch4: nagios-plugins-1.4.5-check_ldap.c.patch +Patch5: nagios-plugins-1.4.5-check_procs.c.patch +Patch6: nagios-plugins-1.4.5-check_fping.c.patch +Patch7: nagios-plugins-1.4.5-check_mysql.c.patch +Patch8: nagios-plugins-1.4.5-check_mysql_query.c.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: perl-Net-SNMP %define libexecdir %{_prefix}/lib/nagios/plugins @@ -53,6 +60,13 @@ %prep %setup -q %patch1 +%patch2 +%patch3 +%patch4 +%patch5 +%patch6 +%patch7 +%patch8 %build %{?suse_update_config:%{suse_update_config}} @@ -153,6 +167,12 @@ %{libexecdir}/check_apt %changelog -n nagios-plugins +* 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 - update to version 1.4.5 * check_udp2 removed. check_udp is now linked to check_tcp.c ++++++ nagios-plugins-1.4.5-autoconf.patch ++++++ --- configure.in 2006-11-16 10:09:02.000000000 +0100 +++ configure.in 2006-11-16 10:04:25.000000000 +0100 @@ -1627,7 +1627,7 @@ #endif], [va_list args;], [AC_MSG_RESULT(yes)], - [NEED_VA_LIST=-DNEED_VA_LIST + [NEED_VA_LIST=-DNEED_VA_LIST; AC_SUBST(NEED_VA_LIST) AC_MSG_RESULT(no)]) ++++++ nagios-plugins-1.4.5-check_fping.c.patch ++++++ --- 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"); - printf (" %s\n", _("size of ICMP packet (default: %d)"),PACKET_SIZE); + printf (" %s (default: %d)\n", _("size of ICMP packet"),PACKET_SIZE); printf (" %s\n", "-n, --number=INTEGER"); - printf (" %s\n", _("number of ICMP packets to send (default: %d)"),PACKET_COUNT); + printf (" %s (default: %d)\n", _("number of ICMP packets to send"),PACKET_COUNT); printf (_(UT_VERBOSE)); printf ("\n"); printf (" %s\n", _("THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel time (ms)")); ++++++ nagios-plugins-1.4.5-check_http.c.patch ++++++ --- plugins/check_http.c 2006-10-26 22:51:24.000000000 +0200 +++ plugins/check_http.c 2006-11-17 10:01:20.000000000 +0100 @@ -1277,7 +1277,7 @@ printf (" %s\n", _("String to expect in the content")); printf (" %s\n", "-u, --url=PATH"); printf (" %s\n", _("URL to GET or POST (default: /)")); - printf (" %s\n," "-P, --post=STRING"); + printf (" %s\n", "-P, --post=STRING"); printf (" %s\n", _("URL encoded http POST data")); printf (" %s\n", "-N, --no-body"); printf (" %s\n", _("Don't wait for document body: stop reading after headers.")); ++++++ nagios-plugins-1.4.5-check_icmp.c.patch ++++++ --- plugins-root/check_icmp.c 2006-10-24 23:54:06.000000000 +0200 +++ plugins-root/check_icmp.c 2006-11-17 10:16:11.000000000 +0100 @@ -1201,7 +1201,7 @@ printf ("%0.3fms,%u%%)\n", (float)warn.rta / 1000 , warn.pl / 1000); printf (" %s\n", "-c"); printf (" %s", _("critical threshold (currently ")); - printf ("%0.3fms,%u%%)\n", (float)crit.rta), crit.pl; + printf ("%0.3fms,%u%%)\n", (float)crit.rta, crit.pl); printf (" %s\n", "-n"); printf (" %s", _("number of packets to send (currently ")); printf ("%u)\n",packets); ++++++ nagios-plugins-1.4.5-check_ldap.c.patch ++++++ --- plugins/check_ldap.c 2006-10-23 00:24:27.000000000 +0200 +++ plugins/check_ldap.c 2006-11-17 13:06:45.000000000 +0100 @@ -378,9 +378,9 @@ printf (" %s\n", _("ldap attribute to search (default: "(objectclass=*)"")); printf (" %s\n", "-b [--base]"); printf (" %s\n", _("ldap base (eg. ou=my unit, o=my org, c=at")); - printf (" %s\n," "-D [--bind]"); + printf (" %s\n", "-D [--bind]"); printf (" %s\n", _("ldap bind DN (if required)")); - printf (" %s\n," "-P [--pass]"); + printf (" %s\n", "-P [--pass]"); printf (" %s\n", _("ldap password (if required)")); #ifdef HAVE_LDAP_SET_OPTION @@ -410,7 +410,7 @@ { printf (_("Usage:")); printf (" %s -H <host> -b <base_dn> [-p <port>] [-a <attr>] [-D <binddn>]",progname); - printf ("[-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]\n", + printf ("[-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]\n" #ifdef HAVE_LDAP_SET_OPTION " [-2|-3] [-4|-6]" #else ++++++ nagios-plugins-1.4.5-check_mysql.c.patch ++++++ --- 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) - db_pass == strdup(""); + db_pass = strdup(""); if (db == NULL) db = strdup(""); ++++++ nagios-plugins-1.4.5-check_mysql_query.c.patch ++++++ --- 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) - db_pass == strdup(""); + db_pass = strdup(""); if (db == NULL) db = strdup(""); ++++++ nagios-plugins-1.4.5-check_procs.c.patch ++++++ --- 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> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org