rpms/zabbix/EL-4 .cvsignore, 1.10, 1.11 sources, 1.11, 1.12 zabbix-agent.init, 1.2, 1.3 zabbix-server.init, 1.2, 1.3 zabbix.spec, 1.19, 1.20

[Jeffrey C. Ollie (jcollie)]

Author: jcollie

Update of /cvs/pkgs/rpms/zabbix/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15976

Modified Files:
	.cvsignore sources zabbix-agent.init zabbix-server.init 
	zabbix.spec 
Log Message:
* Fri Jul 25 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.6-1
- Update to 1.4.6
- Synchronize with rawhide.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	26 Mar 2008 04:32:32 -0000	1.10
+++ .cvsignore	30 Jul 2008 02:35:08 -0000	1.11
@@ -1 +1 @@
-zabbix-1.4.5.tar.gz
+zabbix-1.4.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	2 May 2008 20:55:39 -0000	1.11
+++ sources	30 Jul 2008 02:35:08 -0000	1.12
@@ -1 +1 @@
-f87d73852fdab33f99beebfd16c21c63  zabbix-1.4.5.tar.gz
+4fbea19748b7e9a894a18f4e11b988ca  zabbix-1.4.6.tar.gz


Index: zabbix-agent.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/zabbix-agent.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zabbix-agent.init	20 Sep 2007 15:30:42 -0000	1.2
+++ zabbix-agent.init	30 Jul 2008 02:35:08 -0000	1.3
@@ -4,6 +4,16 @@
 # description: zabbix agent daemon
 #
 
+### BEGIN INIT INFO
+# Provides: zabbix-agent
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Default-Start:
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: start and stop zabbix agent
+# Description: Zabbix Agent
+### END INIT INFO
+
 # zabbix details
 ZABBIX_AGENTD=/usr/sbin/zabbix_agentd
 CONF=/etc/zabbix/zabbix_agentd.conf
@@ -18,8 +28,8 @@
 # Check that networking is up.
 [ ${NETWORKING} = "no" ] && exit 0
 
-[ -x $ZABBIX_AGENTD ] || exit 0
-[ -e $CONF ] || exit 0
+[ -x $ZABBIX_AGENTD ] || exit 5
+[ -e $CONF ] || exit 6
 
 RETVAL=0
 


Index: zabbix-server.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/zabbix-server.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zabbix-server.init	20 Sep 2007 15:30:42 -0000	1.2
+++ zabbix-server.init	30 Jul 2008 02:35:08 -0000	1.3
@@ -4,6 +4,16 @@
 # description: zabbix server daemon
 #
 
+### BEGIN INIT INFO
+# Provides: zabbix
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Default-Start:
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: start and stop zabbix server
+# Description: Zabbix Server
+### END INIT INFO
+
 # zabbix details
 ZABBIX=/usr/sbin/zabbix_server
 CONF=/etc/zabbix/zabbix_server.conf
@@ -18,8 +28,8 @@
 # Check that networking is up.
 [ ${NETWORKING} = "no" ] && exit 0
 
-[ -x $ZABBIX ] || exit 0
-[ -e $CONF ] || exit 0
+[ -x $ZABBIX ] || exit 5
+[ -e $CONF ] || exit 6
 
 RETVAL=0
 


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/zabbix.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- zabbix.spec	2 May 2008 20:55:39 -0000	1.19
+++ zabbix.spec	30 Jul 2008 02:35:08 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           zabbix
-Version:        1.4.5
-Release:        2%{?dist}
+Version:        1.4.6
+Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -11,8 +11,8 @@
 Source2:        zabbix-server.init
 Source3:        zabbix-agent.init
 Source4:        zabbix-logrotate.in
-Patch0:		zabbix-1.4.2-netsnmp-x86_64.patch
-Patch1:		zabbix-1.4.2-cpustats.patch
+Patch0:         zabbix-1.4.2-netsnmp-x86_64.patch
+Patch1:         zabbix-1.4.2-cpustats.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define database mysql
@@ -141,10 +141,12 @@
 cat misc/conf/zabbix_agentd.conf | sed \
     -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix_agentd.pid|g' \
     -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_agentd.log|g' \
+    -e 's|#LogFileSize=.*|LogFileSize=0|g' \
     > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/zabbix_agentd.conf
 cat misc/conf/zabbix_server.conf | sed \
     -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix.pid|g' \
     -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_server.log|g' \
+    -e 's|#LogFileSize=.*|LogFileSize=0|g' \
     -e 's|AlertScriptsPath=/home/zabbix/bin/|AlertScriptsPath=%{_localstatedir}/lib/zabbix/|g' \
     -e 's|DBUser=root|DBUser=zabbix|g' \
     -e 's|DBSocket=/tmp/mysql.sock|DBSocket=%{_localstatedir}/lib/%{zdb}/%{zdb}.sock|g' \
@@ -254,6 +256,10 @@
 %{_datadir}/%{name}/js/*
 
 %changelog
+* Fri Jul 25 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.6-1
+- Update to 1.4.6
+- Synchronize with rawhide.
+
 * Fri May 02 2008 Jarod Wilson <jwilson at redhat.com> - 1.4.5-2
 - Seems the zabbix folks replaced the original 1.4.5 tarball with
   an updated tarball or something -- it actually does contain a
@@ -356,4 +362,3 @@
 
 * Tue Jul 11 2006 Jarod Wilson <jwilson at redhat.com> 1.1-1
 - Initial build for Fedora Extras
-