rpms/zabbix/EL-6 zabbix-1.8.1-cloexec.patch, NONE, 1.1 zabbix-1.8.2-config.patch, NONE, 1.1 zabbix-1.8.2-fonts-config.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 sources, 1.21, 1.22 zabbix.spec, 1.49, 1.50 zabbix-1.6.4-web-config.patch, 1.1, NONE zabbix-1.6.8-cloexec.patch, 1.1, NONE

Dan Horák sharkcz at fedoraproject.org
Tue May 11 08:39:59 UTC 2010 

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2778

Modified Files:
	.cvsignore sources zabbix.spec 
Added Files:
	zabbix-1.8.1-cloexec.patch zabbix-1.8.2-config.patch 
	zabbix-1.8.2-fonts-config.patch 
Removed Files:
	zabbix-1.6.4-web-config.patch zabbix-1.6.8-cloexec.patch 
Log Message:
import 1.8.2 to EL-6

zabbix-1.8.1-cloexec.patch:
 zbxcomms/comms.c |   28 ++++++++++++++++++++++++----
 zbxnix/pid.c     |    6 +++++-
 2 files changed, 29 insertions(+), 5 deletions(-)

--- NEW FILE zabbix-1.8.1-cloexec.patch ---
diff -up zabbix-1.8.1/src/libs/zbxcomms/comms.c.cloexec zabbix-1.8.1/src/libs/zbxcomms/comms.c
--- zabbix-1.8.1/src/libs/zbxcomms/comms.c.cloexec	2010-01-27 22:22:44.000000000 +0100
+++ zabbix-1.8.1/src/libs/zbxcomms/comms.c	2010-02-01 15:12:47.000000000 +0100
@@ -58,6 +58,10 @@
 #	define ZBX_SOCKADDR struct sockaddr_in
 #endif
 
+#ifndef SOCK_CLOEXEC
+#define SOCK_CLOEXEC 0
+#endif
+
 /******************************************************************************
  *                                                                            *
  * Function: zbx_tcp_strerror                                                 *
@@ -348,11 +352,15 @@ int	zbx_tcp_connect(zbx_sock_t *s,
 		goto out;
 	}
 
-	if (ZBX_SOCK_ERROR == (s->socket = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol))) {
+	if (ZBX_SOCK_ERROR == (s->socket = socket(ai->ai_family, ai->ai_socktype | SOCK_CLOEXEC, ai->ai_protocol))) {
 		zbx_set_tcp_strerror("Cannot create socket [%s]:%d [%s]", ip, port ,strerror_from_system(zbx_sock_last_error()));
 		goto out;
 	}
 
+#if ! SOCK_CLOEXEC
+	fcntl(s->socket, F_SETFD, FD_CLOEXEC);
+#endif
+
 	if (NULL != source_ip)
 	{
 		memset(&hints, 0x00, sizeof(struct addrinfo));
@@ -428,11 +436,15 @@ int	zbx_tcp_connect(zbx_sock_t *s,
 	servaddr_in.sin_addr.s_addr	= ((struct in_addr *)(hp->h_addr))->s_addr;
 	servaddr_in.sin_port		= htons(port);
 
-	if (ZBX_SOCK_ERROR == (s->socket = socket(AF_INET,SOCK_STREAM,0))) {
+	if (ZBX_SOCK_ERROR == (s->socket = socket(AF_INET,SOCK_STREAM | SOCK_CLOEXEC,0))) {
 		zbx_set_tcp_strerror("Cannot create socket [%s:%d] [%s]", ip, port ,strerror_from_system(zbx_sock_last_error()));
 		return FAIL;
 	}
 
+#if ! SOCK_CLOEXEC
+	fcntl(s->socket, F_SETFD, FD_CLOEXEC);
+#endif
+
 	if (NULL != source_ip)
 	{
 		source_addr.sin_family		= AF_INET;
@@ -667,11 +679,15 @@ int zbx_tcp_listen(
 		if((current_ai->ai_family != PF_INET) && (current_ai->ai_family != PF_INET6))
 			continue;
 
-		if((s->sockets[s->num_socks] = socket(current_ai->ai_family, current_ai->ai_socktype, current_ai->ai_protocol)) == ZBX_SOCK_ERROR) {
+		if((s->sockets[s->num_socks] = socket(current_ai->ai_family, current_ai->ai_socktype | SOCK_CLOEXEC, current_ai->ai_protocol)) == ZBX_SOCK_ERROR) {
 			zbx_set_tcp_strerror("socket() failed with error %d: %s", zbx_sock_last_error(), strerror_from_system(zbx_sock_last_error()));
 			continue;
 		}
 
+#if ! SOCK_CLOEXEC
+		fcntl(s->sockets[s->num_socks], F_SETFD, FD_CLOEXEC);
+#endif
+
 		/* Enable address reuse */
 		/* This is to immediately use the address even if it is in TIME_WAIT state */
 		/* http://www-128.ibm.com/developerworks/linux/library/l-sockpit/index.html */
@@ -722,12 +738,16 @@ int zbx_tcp_listen(
 
 	zbx_tcp_clean(s);
 
-	if(ZBX_SOCK_ERROR == (s->socket = socket(AF_INET,SOCK_STREAM,0)))
+	if(ZBX_SOCK_ERROR == (s->socket = socket(AF_INET,SOCK_STREAM | SOCK_CLOEXEC,0)))
 	{
 		zbx_set_tcp_strerror("Cannot create socket [%s:%u] [%s]", listen_ip, listen_port, strerror_from_system(zbx_sock_last_error()));
 		goto out;
 	}
 
+#if ! SOCK_CLOEXEC
+	fcntl(s->socket, F_SETFD, FD_CLOEXEC);
+#endif
+
 	/* Enable address reuse */
 	/* This is to immediately use the address even if it is in TIME_WAIT state */
 	/* http://www-128.ibm.com/developerworks/linux/library/l-sockpit/index.html */
diff -up zabbix-1.8.1/src/libs/zbxnix/pid.c.cloexec zabbix-1.8.1/src/libs/zbxnix/pid.c
--- zabbix-1.8.1/src/libs/zbxnix/pid.c.cloexec	2010-01-27 22:22:44.000000000 +0100
+++ zabbix-1.8.1/src/libs/zbxnix/pid.c	2010-02-01 15:12:47.000000000 +0100
@@ -83,7 +83,11 @@ int	create_pid_file(const char *pidfile)
 	/* lock file */
 	fdpid = fileno(fpid);
 #ifdef HAVE_FCNTL_H
-	if(-1 != fdpid) fcntl(fdpid, F_SETLK, &fl);
+	if(-1 != fdpid)
+	{
+		fcntl(fdpid, F_SETLK, &fl);
+		fcntl(fdpid, F_SETFD, FD_CLOEXEC);
+	}
 #else
 	if(-1 != fdpid) flock(fdpid, LOCK_EX);
 #endif /* HAVE_FCNTL_H */

zabbix-1.8.2-config.patch:
 config.inc.php |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE zabbix-1.8.2-config.patch ---
diff -up zabbix-1.8.2/frontends/php/include/config.inc.php.orig zabbix-1.8.2/frontends/php/include/config.inc.php
--- zabbix-1.8.2/frontends/php/include/config.inc.php.orig	2010-03-29 19:22:45.000000000 +0200
+++ zabbix-1.8.2/frontends/php/include/config.inc.php	2010-03-30 11:11:41.000000000 +0200
@@ -110,8 +110,7 @@ function __autoload($class_name){
 	$ZBX_LOCALNODEID = 0;
 	$ZBX_LOCMASTERID = 0;
 
-	$ZBX_CONFIGURATION_FILE = './conf/zabbix.conf.php';
-	$ZBX_CONFIGURATION_FILE = realpath(dirname($ZBX_CONFIGURATION_FILE)).'/'.basename($ZBX_CONFIGURATION_FILE);
+	$ZBX_CONFIGURATION_FILE = '/etc/zabbix/web/zabbix.conf.php';
 
 	unset($show_setup);
 

zabbix-1.8.2-fonts-config.patch:
 defines.inc.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE zabbix-1.8.2-fonts-config.patch ---
diff -up zabbix-1.8.2/frontends/php/include/defines.inc.php.orig zabbix-1.8.2/frontends/php/include/defines.inc.php
--- zabbix-1.8.2/frontends/php/include/defines.inc.php.orig	2010-03-29 19:22:45.000000000 +0200
+++ zabbix-1.8.2/frontends/php/include/defines.inc.php	2010-03-30 11:16:18.000000000 +0200
@@ -47,7 +47,7 @@
 
 	define('ZBX_POPUP_MAX_ROWS',			20);
 
-	define('ZBX_FONTPATH',					realpath('fonts'));	// where to search for font (GD > 2.0.18)
+	define('ZBX_FONTPATH',					'/usr/share/fonts/dejavu');	// where to search for font (GD > 2.0.18)
 	define('ZBX_GRAPH_FONT_NAME',			'DejaVuSans');		// font file name
 
 	define('ZBX_SCRIPT_TIMEOUT',			360); // in seconds


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-6/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	26 Mar 2010 07:30:14 -0000	1.20
+++ .cvsignore	11 May 2010 08:39:57 -0000	1.21
@@ -1 +1 @@
-zabbix-1.6.9.tar.gz
+zabbix-1.8.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-6/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	26 Mar 2010 07:30:14 -0000	1.21
+++ sources	11 May 2010 08:39:57 -0000	1.22
@@ -1 +1 @@
-22072449b6058944fd5e115c4c8c42e3  zabbix-1.6.9.tar.gz
+fa4be4fa7ac20a33cc0aa5c27b827746  zabbix-1.8.2.tar.gz


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-6/zabbix.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- zabbix.spec	26 Mar 2010 07:30:14 -0000	1.49
+++ zabbix.spec	11 May 2010 08:39:58 -0000	1.50
@@ -6,8 +6,8 @@
 #   various backup files (*.rpm{orig,new,save}, *~ etc) in that dir.
 
 Name:           zabbix
-Version:        1.6.9
-Release:        1%{?dist}
+Version:        1.8.2
+Release:        2%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -20,9 +20,11 @@ Source3:        zabbix-agent.init
 Source4:        zabbix-proxy.init
 Source5:        zabbix-logrotate.in
 # local rules for config files
-Patch0:         zabbix-1.6.4-web-config.patch
+Patch0:         zabbix-1.8.2-config.patch
 # close fd on exec - https://bugzilla.redhat.com/show_bug.cgi?id=559221
-Patch1:         zabbix-1.6.8-cloexec.patch
+Patch1:         zabbix-1.8.1-cloexec.patch
+# local rules for config files - fonts
+Patch2:         zabbix-1.8.2-fonts-config.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,6 +40,9 @@ BuildRequires:   unixODBC-devel
 BuildRequires:   curl-devel >= 7.13.1
 BuildRequires:   OpenIPMI-devel >= 2
 %endif
+%if 0%{?fedora} || 0%{?rhel} >= 6
+BuildRequires:   libssh2-devel
+%endif
 
 Requires:        logrotate
 Requires(pre):   /usr/sbin/useradd
@@ -181,6 +186,12 @@ BuildArch:       noarch
 Requires:        php
 Requires:        php-gd
 Requires:        php-bcmath
+Requires:        php-mbstring
+Requires:        php-xml
+# DejaVu fonts doesn't exist on EL <= 5
+%if 0%{?fedora} || 0%{?rhel} >= 6
+Requires:        dejavu-sans-fonts
+%endif
 Requires:        zabbix = %{version}-%{release}
 Requires:        zabbix-web-database = %{version}-%{release}
 
@@ -239,23 +250,36 @@ Zabbix web frontend for SQLite
 %patch0 -p1
 %patch1 -p1 -b .cloexec
 
-chmod -R a+rX .
+# DejaVu fonts doesn't exist on EL <= 5
+%if 0%{?fedora} || 0%{?rhel} >= 6
+%patch2 -p1
+
+# remove included fonts
+rm -rf frontends/php/fonts
+%endif
 
-# nuke erronious executable permissions
-chmod -x src/zabbix_agent/eventlog.c
+# remove executable permissions
+chmod a-x upgrades/dbpatches/1.8/mysql/upgrade
 
 # fix up some lib64 issues
-%{__perl} -pi.orig -e 's|_LIBDIR=/usr/lib|_LIBDIR=%{_libdir}|g' \
+sed -i.orig -e 's|_LIBDIR=/usr/lib|_LIBDIR=%{_libdir}|g' \
     configure
 
 # kill off .htaccess files, options set in SOURCE1
 rm -f frontends/php/include/.htaccess
 rm -f frontends/php/include/classes/.htaccess
 
+# set timestamp on modified config file and directories
+touch -r frontends/php/css.css frontends/php/include/config.inc.php \
+    frontends/php/include/defines.inc.php \
+    frontends/php/include \
+    frontends/php/include/classes
+
 
 %build
 
 common_flags="
+    --enable-dependency-tracking
     --enable-server
     --enable-agent
     --enable-proxy
@@ -266,7 +290,11 @@ common_flags="
     --with-openipmi
 %endif
     --with-jabber
-    --with-unixodbc"
+    --with-unixodbc
+%if 0%{?fedora} || 0%{?rhel} >= 6
+    --with-ssh2
+%endif
+"
 
 %configure $common_flags --with-mysql
 make %{?_smp_mflags}
@@ -312,27 +340,27 @@ install -m 0644 -p %{SOURCE1} $RPM_BUILD
 
 # fix config file options
 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' \
+    -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/mysql/mysql.sock|g' \
+    -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/mysql/mysql.sock|g' \
     > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/zabbix_server.conf
 
 cat misc/conf/zabbix_proxy.conf | sed \
-    -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix_proxy.pid|g' \
-    -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_proxy.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/mysql/mysql.sock|g' \
+    -e 's|# PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix_proxy.pid|g' \
+    -e 's|^LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_proxy.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/mysql/mysql.sock|g' \
     > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/zabbix_proxy.conf
 
 # install log rotation
@@ -366,12 +394,14 @@ for pkg in proxy server ; do
     cp -p --parents create/data/data.sql $docdir
     cp -p --parents create/data/images_mysql.sql $docdir
     cp -pR --parents upgrades/dbpatches/1.6/mysql $docdir
+    cp -pR --parents upgrades/dbpatches/1.8/mysql $docdir
     docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-$pkg-pgsql-%{version}
     install -dm 755 $docdir
     cp -p --parents create/schema/postgresql.sql $docdir
     cp -p --parents create/data/data.sql $docdir
     cp -p --parents create/data/images_pgsql.sql $docdir
     cp -pR --parents upgrades/dbpatches/1.6/postgresql $docdir
+    cp -pR --parents upgrades/dbpatches/1.8/postgresql $docdir
     docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-$pkg-sqlite3-%{version}
     install -dm 755 $docdir
     cp -p --parents create/schema/sqlite.sql $docdir
@@ -479,13 +509,14 @@ fi
 
 %files docs
 %defattr(-,root,root,-)
-%doc docs/*.pdf
+%doc docs/README
 
 %files server
 %defattr(-,root,root,-)
 %attr(0640,root,zabbix) %config(noreplace) %{_sysconfdir}/zabbix/zabbix_server.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-server
 %{_sysconfdir}/init.d/zabbix-server
+%{_mandir}/man8/zabbix_server.8*
 
 %files server-mysql
 %defattr(-,root,root,-)
@@ -510,14 +541,18 @@ fi
 %{_sysconfdir}/init.d/zabbix-agent
 %{_sbindir}/zabbix_agent
 %{_sbindir}/zabbix_agentd
-%{_sbindir}/zabbix_sender
-%{_sbindir}/zabbix_get
+%{_bindir}/zabbix_sender
+%{_bindir}/zabbix_get
+%{_mandir}/man1/zabbix_sender.1*
+%{_mandir}/man1/zabbix_get.1*
+%{_mandir}/man8/zabbix_agentd.8*
 
 %files proxy
 %defattr(-,root,root,-)
 %attr(0640,root,zabbix) %config(noreplace) %{_sysconfdir}/zabbix/zabbix_proxy.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-proxy
 %{_sysconfdir}/init.d/zabbix-proxy
+%{_mandir}/man8/zabbix_proxy.8*
 
 %files proxy-mysql
 %defattr(-,root,root,-)
@@ -552,18 +587,46 @@ fi
 
 
 %changelog
-* Fri Mar 26 2010 Dan Horák <dan[at]danny.cz> - 1.6.9-1
-- Update to 1.6.9
-- Upstream changelog: http://www.zabbix.com/rn1.6.9.php
+* Thu Apr 29 2010 Dan Horák <dan[at]danny.cz> - 1.8.2-2
+- DejaVu fonts doesn't exist on EL <= 5
+
+* Tue Mar 30 2010 Dan Horák <dan[at]danny.cz> - 1.8.2-1
+- Update to 1.8.2
+
+* Sat Mar 20 2010 Dan Horák <dan[at]danny.cz> - 1.8.1-7
+- web interface needs php-xml (#572413)
+- updated defaults in config files (#573325)
+- built with libssh2 support (#575279)
 
-* Mon Feb  1 2010 Dan Horák <dan[at]danny.cz> - 1.6.8-2
+* Wed Feb 24 2010 Dan Horák <dan[at]danny.cz> - 1.8.1-6
+- use system fonts
+
+* Sun Feb 13 2010 Dan Horák <dan[at]danny.cz> - 1.8.1-5
+- fixed linking with the new --no-add-needed default (#564932)
+
+* Mon Feb  1 2010 Dan Horák <dan[at]danny.cz> - 1.8.1-4
+- enable dependency tracking
+
+* Mon Feb  1 2010 Dan Horák <dan[at]danny.cz> - 1.8.1-3
+- updated the web-config patch
+
+* Mon Feb  1 2010 Dan Horák <dan[at]danny.cz> - 1.8.1-2
 - close fd on exec (#559221)
 
+* Fri Jan 29 2010 Dan Horák <dan[at]danny.cz> - 1.8.1-1
+- Update to 1.8.1
+
+* Tue Jan 26 2010 Dan Horák <dan[at]danny.cz> - 1.8-1
+- Update to 1.8
+
 * Thu Dec 31 2009 Dan Horák <dan[at]danny.cz> - 1.6.8-1
 - Update to 1.6.8
 - Upstream changelog: http://www.zabbix.com/rn1.6.8.php
 - fixes 2 issues from #551331
 
+* Wed Nov 25 2009 Dan Horák <dan[at]danny.cz> - 1.6.6-2
+- rebuilt with net-snmp 5.5
+
 * Sat Aug 29 2009 Dan Horák <dan[at]danny.cz> - 1.6.6-1
 - Update to 1.6.6
 - Upstream changelog: http://www.zabbix.com/rn1.6.6.php


--- zabbix-1.6.4-web-config.patch DELETED ---


--- zabbix-1.6.8-cloexec.patch DELETED ---

More information about the scm-commits mailing list