Author: glen Date: Mon Dec 6 14:32:14 2010 GMT Module: packages Tag: HEAD ---- Log message: - ignore custom fields
---- Files affected: packages/nagios-nagtail: nagios-nagtail.spec (1.2 -> 1.3) , custom_fields.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/nagios-nagtail/nagios-nagtail.spec diff -u packages/nagios-nagtail/nagios-nagtail.spec:1.2 packages/nagios-nagtail/nagios-nagtail.spec:1.3 --- packages/nagios-nagtail/nagios-nagtail.spec:1.2 Thu Dec 2 15:29:24 2010 +++ packages/nagios-nagtail/nagios-nagtail.spec Mon Dec 6 15:32:09 2010 @@ -9,6 +9,7 @@ Source0: http://www.vanheusden.com/nagtail/%{pkgname}-%{version}.tgz # Source0-md5: 57bc082f9555c6736e5bc8c4d41fa4aa Patch0: default-statuslog.patch +Patch1: custom_fields.patch URL: http://www.vanheusden.com/nagtail/ BuildRequires: libstdc++-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -19,6 +20,7 @@ %prep %setup -q -n %{pkgname}-%{version} %patch0 -p1 +%patch1 -p1 %build %{__make} nagtail \ @@ -48,6 +50,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.3 2010/12/06 14:32:09 glen +- ignore custom fields + Revision 1.2 2010/12/02 14:29:24 glen - fix default log path ================================================================ Index: packages/nagios-nagtail/custom_fields.patch diff -u /dev/null packages/nagios-nagtail/custom_fields.patch:1.1 --- /dev/null Mon Dec 6 15:32:14 2010 +++ packages/nagios-nagtail/custom_fields.patch Mon Dec 6 15:32:09 2010 @@ -0,0 +1,15 @@ +--- nagtail-0.0.31/pl.cpp~ 2009-10-18 18:18:53.000000000 +0300 ++++ nagtail-0.0.31/pl.cpp 2010-12-06 16:30:32.448003000 +0200 +@@ -308,7 +310,11 @@ + char *par = is + 1; + *is = 0x00; + +- if ((index = v2_0_find_entry_type(cmd)) != -1) ++ // nagios 3.0 custom params start with two underscore ++ if (strncmp(cmd, "__", 2) == 0) { ++ // skip custom command ++ } ++ else if ((index = v2_0_find_entry_type(cmd)) != -1) + { + switch(v2_0_config_elements[index].type) + { ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-nagtail/nagios-nagtail.spec?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
