packages: nagios-plugin-check_multi/nagios-plugin-check_multi.spec, nagios-...

glen glen at pld-linux.org
Mon Jun 25 21:46:39 CEST 2012 

Author: glen                         Date: Mon Jun 25 19:46:39 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix buggy, directory mode check
- package contrib to examples

---- Files affected:
packages/nagios-plugin-check_multi:
   nagios-plugin-check_multi.spec (1.4 -> 1.5) , issue-6.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec
diff -u packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec:1.4 packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec:1.5
--- packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec:1.4	Mon Jun 25 21:18:35 2012
+++ packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec	Mon Jun 25 21:46:34 2012
@@ -8,13 +8,14 @@
 Summary:	Multi purpose wrapper plugin for Nagios/Icinga
 Name:		nagios-plugin-%{plugin}
 Version:	0.26
-Release:	0.14
+Release:	0.16
 License:	GPL v2
 Group:		Networking
 URL:		http://my-plugin.de/wiki/projects/check_multi/start
 Source0:	http://my-plugin.de/check_multi/%{plugin}-stable-%{version}.tar.gz
 # Source0-md5:	38f822c3911c0cd5e625e859237ff902
 Source1:	%{plugin}.cfg
+Patch0:		issue-6.patch
 BuildRequires:	perl-base
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	sed >= 4.0
@@ -44,6 +45,7 @@
 
 %prep
 %setup -q -n %{plugin}-%{version}
+%patch0 -p1
 
 %{__sed} -i -e '
 	s, at sysconfdir@/send_nsca.cfg,/etc/nagios/send_nsca.cfg,
@@ -75,7 +77,13 @@
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}/{cluster,feed_passive}
 %{__make} install-config \
-	CFGDIR=%{_examplesdir}/%{name}-%{version} \
+	CFGDIR=%{_examplesdir}/%{name}-%{version}/config \
+	DESTDIR=$RPM_BUILD_ROOT
+
+%{__make} install-contrib \
+	CGIDIR=%{_examplesdir}/%{name}-%{version}/contrib \
+	HTMLDIR=%{_examplesdir}/%{name}-%{version}/contrib \
+	LIBEXECDIR=%{_examplesdir}/%{name}-%{version}/contrib \
 	DESTDIR=$RPM_BUILD_ROOT
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
@@ -93,18 +101,20 @@
 %dir %attr(770,root,nagios) /var/spool/nagios/%{plugin}
 %dir %attr(770,root,nagios) /var/spool/nagios/%{plugin}/etc
 
-%dir %{_examplesdir}/%{name}-%{version}
-%{_examplesdir}/%{name}-%{version}/*.cmd
+%{_examplesdir}/%{name}-%{version}/contrib
 
-%dir %{_examplesdir}/%{name}-%{version}/cluster
-%{_examplesdir}/%{name}-%{version}/cluster/*.cfg
-%{_examplesdir}/%{name}-%{version}/cluster/*.cmd
-
-%dir %{_examplesdir}/%{name}-%{version}/feed_passive
-%{_examplesdir}/%{name}-%{version}/feed_passive/*.cfg
-%{_examplesdir}/%{name}-%{version}/feed_passive/*.cmd
-%{_examplesdir}/%{name}-%{version}/feed_passive/*.tpl
-%attr(755,root,root) %{_examplesdir}/%{name}-%{version}/feed_passive/gencfg
+%dir %{_examplesdir}/%{name}-%{version}/config
+%{_examplesdir}/%{name}-%{version}/config/*.cmd
+
+%dir %{_examplesdir}/%{name}-%{version}/config/cluster
+%{_examplesdir}/%{name}-%{version}/config/cluster/*.cfg
+%{_examplesdir}/%{name}-%{version}/config/cluster/*.cmd
+
+%dir %{_examplesdir}/%{name}-%{version}/config/feed_passive
+%{_examplesdir}/%{name}-%{version}/config/feed_passive/*.cfg
+%{_examplesdir}/%{name}-%{version}/config/feed_passive/*.cmd
+%{_examplesdir}/%{name}-%{version}/config/feed_passive/*.tpl
+%attr(755,root,root) %{_examplesdir}/%{name}-%{version}/config/feed_passive/gencfg
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -112,6 +122,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2012/06/25 19:46:34  glen
+- fix buggy, directory mode check
+- package contrib to examples
+
 Revision 1.4  2012/06/25 19:18:35  glen
 - add default nagios plugin config
 - private tmpdir

================================================================
Index: packages/nagios-plugin-check_multi/issue-6.patch
diff -u /dev/null packages/nagios-plugin-check_multi/issue-6.patch:1.1
--- /dev/null	Mon Jun 25 21:46:39 2012
+++ packages/nagios-plugin-check_multi/issue-6.patch	Mon Jun 25 21:46:34 2012
@@ -0,0 +1,31 @@
+--- check_multi-0.26/plugins/check_multi.in~	2012-06-25 21:58:06.000000000 +0300
++++ check_multi-0.26/plugins/check_multi.in	2012-06-25 22:41:23.306027423 +0300
+@@ -477,7 +477,7 @@
+ 		return $UNKNOWN;
+ 	}
+ 	#--- 2. check if tmp_dir has correct permissions
+-	if  ((stat("$opt{set}{tmp_dir}"))[2] != oct("$opt{set}{tmp_dir_permissions}") &&
++	if  (((stat("$opt{set}{tmp_dir}"))[2] & 07777) != oct("$opt{set}{tmp_dir_permissions}") &&
+ 		! chmod(oct("$opt{set}{tmp_dir_permissions}"), "$opt{set}{tmp_dir}") ) {
+ 		print "Error: could not set tmp directory $opt{set}{tmp_dir} permissions to $opt{set}{tmp_dir_permissions} as user $opt{set}{user}\n";
+ 		return $UNKNOWN;
+--- check_multi-0.26/configure.ac~	2011-11-18 21:28:13.000000000 +0200
++++ check_multi-0.26/configure.ac	2012-06-25 22:44:59.861420799 +0300
+@@ -83,7 +83,7 @@
+ AC_ARG_WITH(extinfo_in_status,		[  --with-extinfo_in_status=<0|1>           display check_multi output in status.cgi],extinfo_in_status=$withval,extinfo_in_status=0)
+ AC_ARG_WITH(feed_passive_autocreate,	[  --with-feed_passive_autocreate=<0|1>>    flag, if feed passive service definitions should be created automatically (default:1)],feed_passive_autocreate=$withval,feed_passive_autocreate="1")
+ AC_ARG_WITH(feed_passive_dir,		[  --with-feed_passive_dir=<path>           directory for automatically created feed passive service definitions (default:${sysconfdir}/check_multi/feed_passive)],feed_passive_dir=$withval,feed_passive_dir="${sysconfdir}/check_multi/feed_passive")
+-AC_ARG_WITH(feed_passive_dir_permissions,[  --with-feed_passive_dir_permissions=<octal perms> permissions for feed passive config dir (default:41777)],feed_passive_dir_permissions=$withval,feed_passive_dir_permissions="41777")
++AC_ARG_WITH(feed_passive_dir_permissions,[  --with-feed_passive_dir_permissions=<octal perms> permissions for feed passive config dir (default:41777)],feed_passive_dir_permissions=$withval,feed_passive_dir_permissions="01777")
+ AC_ARG_WITH(findbin,			[  --with-findbin=<0|1>                     use Perl module FindBin for addressing plugins (default:1)],findbin=$withval,findbin=1)
+ AC_ARG_WITH(file_extension,		[  --with-file_extension=<ext>              default extension for check_multi command files (default:"cmd")],file_extension=$withval,file_extension="cmd")
+ AC_ARG_WITH(hostname,			[  --with-hostname=<host>                   hostname of nagios server for mail / web purposes (default:"localhost")],hostname=$withval,hostname="localhost")
+@@ -116,7 +116,7 @@
+ AC_ARG_WITH(tag_notes_link,		[  --with-tag_notes_link=<URL>              documentation URL for child checks (default:"")],tag_notes_link=$withval,tag_notes_link="")
+ AC_ARG_WITH(target,			[  --with-target=<target_frame>             HTML target frame for URLs (default:_self)],target=$withval,target="_self")
+ AC_ARG_WITH(tmp_dir,			[  --with-tmp_dir=<path>                    /path/to/tmp_dir (default:/tmp/check_multi)],tmp_dir=$withval,tmp_dir="/tmp/check_multi")
+-AC_ARG_WITH(tmp_dir_permissions,	[  --with-tmp_dir_permissions=<octal perms> permissions of tmp_dir (default:41777)],tmp_dir_permissions=$withval,tmp_dir_permissions="41777")
++AC_ARG_WITH(tmp_dir_permissions,	[  --with-tmp_dir_permissions=<octal perms> permissions of tmp_dir (default:41777)],tmp_dir_permissions=$withval,tmp_dir_permissions="01777")
+ AC_ARG_WITH(tmp_etc,			[  --with-tmp_etc=<path>                    /path/to/tmp_dir/etc (default:$tmp_dir/etc)],tmp_etc=$withval,tmp_etc="$tmp_dir/etc")
+ AC_ARG_WITH(parent_timeout,		[ 
+ major settings:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec?r1=1.4&r2=1.5

More information about the pld-cvs-commit mailing list