--- rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec	2010/09/02 15:21:09	1.27
+++ rpms/smeserver-zabbix-agent/contribs7/smeserver-zabbix-agent.spec	2012/06/07 16:26:43	1.34
@@ -1,10 +1,10 @@
-# $Id: smeserver-zabbix-agent.spec,v 1.26 2010/08/04 14:19:32 vip-ire Exp $
+# $Id: smeserver-zabbix-agent.spec,v 1.33 2012/06/07 16:23:16 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 %define name smeserver-zabbix-agent
 %define version 0.1
-%define release 45
+%define release 52
 Summary: sme server integration of zabbix agent
 Name: %{name}
 Version: %{version}
@@ -73,6 +73,12 @@ Patch56: smeserver-zabbix-agent-0.1-host
 Patch57: smeserver-zabbix-agent-0.1-userparam_diskio.patch
 Patch58: smeserver-zabbix-agent-0.1-userparam_asterisk.patch
 Patch59: smeserver-zabbix-agent-0.1-userparam_lvm.patch
+Patch60: smeserver-zabbix-agent-0.1-add_usr_sbin_in_path.patch
+Patch61: smeserver-zabbix-agent-0.1-statusmail.patch
+Patch62: smeserver-zabbix-agent-0.1-configure_timeout.patch
+Patch63: smeserver-zabbix-agent-0.1-better_asterisk_monitoring.patch
+Patch64: smeserver-zabbix-agent-0.1-fix_closing_bracket.patch
+Patch65: smeserver-zabbix-agent-0.1-check_crt_expiration.patch
 
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -80,6 +86,9 @@ BuildRoot: /var/tmp/%{name}-%{version}
 Requires: e-smith-release >= 7.0
 Requires: zabbix-agent
 Requires: smeserver-remoteuseraccess
+Requires: perl(IO::Socket)
+Requires: perl(Net::SSLeay)
+Requires: perl(Date::Parse)
 AutoReqProv: no
 
 %description
@@ -88,6 +97,27 @@ Zabbix is an entreprise-class open sourc
 solution
 
 %changelog
+* Thu Jun 7 2012 Daniel B. <daniel@firewall-services.com> - 0.1-52.sme
+- Add missing perl module in dependency
+
+* Thu Jun 7 2012 Daniel B. <daniel@firewall-services.com> - 0.1-51.sme
+- Add certificate expiration script
+
+* Fri Oct 28 2011 Daniel B. <daniel@firewall-services.com> - 0.1-50.sme
+- Fix a closing bracket in templates
+
+* Wed Oct 26 2011 Daniel B. <daniel@firewall-services.com> - 0.1-49.sme
+- Add better asterisk monitoring capabilities
+
+* Fri Jul 08 2011 Daniel B. <daniel@firewall-services.com> - 0.1-48.sme
+- Configure timeout from the DB (prop TimeOut)
+
+* Wed May 04 2011 Daniel B. <daniel@firewall-services.com> 0.1-47
+- Send status mail with some logs and active connexions (StatusMail prop)
+
+* Thu Sep 02 2010 Daniel B. <daniel@firewall-services.com> 0.1-46
+- Add /usr/sbin in path for check_lvm and check_asterisk
+
 * Thu Sep 02 2010 Daniel B. <daniel@firewall-services.com> 0.1-45
 - Add basic asterisk monitoring support
 - Add basic LVM monitoring support
@@ -324,6 +354,12 @@ solution
 %patch57 -p1
 %patch58 -p1
 %patch59 -p1
+%patch60 -p1
+%patch61 -p1
+%patch62 -p1
+%patch63 -p1
+%patch64 -p1
+%patch65 -p1
 
 %build
 %{__mkdir_p} root/var/lib/zabbix/tmp
@@ -343,8 +379,10 @@ rm -f %{name}-%{version}-filelist
 	--file /var/lib/zabbix/bin/parse_mail_in.pl 'attr(0755,root,root)' \
 	--file /var/lib/zabbix/bin/parse_mail_out.pl 'attr(0755,root,root)' \
 	--file /var/lib/zabbix/bin/sensors 'attr(0750,root,zabbix) %config(noreplace)' \
-	--file /var/lib/zabbix/bin/check_asterisk 'attr(0755,root,root)' \
+	--file /var/lib/zabbix/bin/check_asterisk 'attr(0750,root,zabbix)' \
 	--file /var/lib/zabbix/bin/check_lvm 'attr(0755,root,root)' \
+        --file /var/lib/zabbix/bin/mailstatus.pl 'attr(0755,root,root)' \
+        --file /var/lib/zabbix/bin/cert_expire.pl 'attr(0755,root,root)' \
 	--dir /var/lib/zabbix/tmp 'attr(0750,zabbix,zabbix)' \
 	> %{name}-%{version}-filelist