packages: nagios/nagios.spec, nagios/nagios-doc-usermacros.patch (NEW) - fi...
glen
glen at pld-linux.org
Thu Oct 7 15:38:18 CEST 2010
Author: glen Date: Thu Oct 7 13:38:18 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- fix $USERx$ doc (it is 256 now)
---- Files affected:
packages/nagios:
nagios.spec (1.155 -> 1.156) , nagios-doc-usermacros.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/nagios/nagios.spec
diff -u packages/nagios/nagios.spec:1.155 packages/nagios/nagios.spec:1.156
--- packages/nagios/nagios.spec:1.155 Mon Oct 4 16:24:51 2010
+++ packages/nagios/nagios.spec Thu Oct 7 15:38:13 2010
@@ -12,7 +12,7 @@
Summary(pt_BR.UTF-8): Programa para monitoração de máquinas e serviços
Name: nagios
Version: 3.2.3
-Release: 1
+Release: 2
License: GPL v2+
Group: Networking
Source0: http://downloads.sourceforge.net/nagios/%{name}-%{version}.tar.gz
@@ -35,6 +35,7 @@
Patch4: %{name}-cmd-typo.patch
Patch5: config.patch
Patch6: %{name}-googlemap.patch
+Patch7: nagios-doc-usermacros.patch
URL: http://www.nagios.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -199,6 +200,7 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
find -name .cvsignore -o -name .gitignore | xargs rm
@@ -486,6 +488,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.156 2010/10/07 13:38:13 glen
+- fix $USERx$ doc (it is 256 now)
+
Revision 1.155 2010/10/04 14:24:51 lisu
- up to 3.2.3
================================================================
Index: packages/nagios/nagios-doc-usermacros.patch
diff -u /dev/null packages/nagios/nagios-doc-usermacros.patch:1.1
--- /dev/null Thu Oct 7 15:38:18 2010
+++ packages/nagios/nagios-doc-usermacros.patch Thu Oct 7 15:38:13 2010
@@ -0,0 +1,32 @@
+
+Bring doc up to date:
+
+include/macros.h:
+#define MAX_COMMAND_ARGUMENTS 32 /* maximum number of $ARGx$ macros */
+#define MAX_USER_MACROS 256 /* maximum number of $USERx$ macros */
+
+---
+Signed-Off-By: Elan Ruusamäe <glen at delfi.ee>
+
+--- nagios-3.2.3/html/docs/macrolist.html~ 2010-08-28 18:20:57.000000000 +0300
++++ nagios-3.2.3/html/docs/macrolist.html 2010-10-07 16:31:08.073321978 +0300
+@@ -3444,7 +3444,7 @@
+
+ <td class="MacroName"><a name="user">$USERn$</a></td>
+
+-<td class="MacroDescription">The <i>n</i>th user-definable macro. User macros can be defined in one or more <a href="configmain.html#resource_file">resource files</a>. Nagios supports up to 256 user macros ($USER1$ through $USER32$).</td>
++<td class="MacroDescription">The <i>n</i>th user-definable macro. User macros can be defined in one or more <a href="configmain.html#resource_file">resource files</a>. Nagios supports up to 256 user macros ($USER1$ through $USER256$).</td>
+
+ </tr>
+
+--- nagios-3.2.3/sample-config/resource.cfg.in 2003-09-12 02:57:51.000000000 +0300
++++ nagios-3.2.3/sample-config/resource.cfg.in 2010-10-07 16:33:41.616639353 +0300
+@@ -15,7 +15,7 @@
+ # The CGIs will not attempt to read the contents of resource files, so
+ # you can set restrictive permissions (600 or 660) on them.
+ #
+-# Nagios supports up to 32 $USERx$ macros ($USER1$ through $USER32$)
++# Nagios supports up to 256 $USERx$ macros ($USER1$ through $USER256$)
+ #
+ # Resource files may also be used to store configuration directives for
+ # external data sources like MySQL...
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios/nagios.spec?r1=1.155&r2=1.156&f=u
More information about the pld-cvs-commit
mailing list