rpms/rrdtool/EL-5 rrdtool-fix-rrd_update-in-php-bindings.patch, NONE, 1.1 rrdtool.spec, 1.35, 1.36

Jarod Wilson (jwilson) fedora-extras-commits at redhat.com
Sun Apr 6 03:51:52 UTC 2008


Author: jwilson

Update of /cvs/pkgs/rpms/rrdtool/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9918

Modified Files:
	rrdtool.spec 
Added Files:
	rrdtool-fix-rrd_update-in-php-bindings.patch 
Log Message:
* Sat Apr 05 2008 Jarod Wilson <jwilson at redhat.com> 1.2.27-3
- Fix use of rrd_update in php bindings (#437558)


rrdtool-fix-rrd_update-in-php-bindings.patch:

--- NEW FILE rrdtool-fix-rrd_update-in-php-bindings.patch ---
diff -Naurp rrdtool.orig/php4/rrdtool.c rrdtool/php4/rrdtool.c
--- rrdtool.orig/php4/rrdtool.c	2007-06-16 01:32:23.000000000 -0400
+++ rrdtool/php4/rrdtool.c	2008-04-05 23:37:04.000000000 -0400
@@ -381,7 +381,7 @@ PHP_FUNCTION(rrd_update)
 		argv[3] = estrdup(opt->value.str.val);
 
 		optind = 0; opterr = 0;
-		if ( rrd_update(3, &argv[1]) != -1 )
+		if ( rrd_update(2, &argv[2]) != -1 )
 		{
 			RETVAL_TRUE;
 		}


Index: rrdtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/EL-5/rrdtool.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- rrdtool.spec	16 Mar 2008 01:15:07 -0000	1.35
+++ rrdtool.spec	6 Apr 2008 03:51:12 -0000	1.36
@@ -8,13 +8,14 @@
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.2.27
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://oss.oetiker.ch/rrdtool/
 Source0: http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
 Source1: php4-svn%{php_rrd_svn}.tar.gz
 Patch0: rrdtool-1.2.13-php.patch
+Patch1: rrdtool-fix-rrd_update-in-php-bindings.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-c++, openssl-devel, freetype-devel
 BuildRequires: libpng-devel, zlib-devel, libart_lgpl-devel >= 2.0
@@ -130,6 +131,7 @@
 # Patch based on http://oss.oetiker.ch/rrdtool/pub/contrib/php_rrdtool.tgz
 %if %{with_php}
 %patch0 -p0 -b .php
+%patch1 -p1 -b .rrd_update
 %{__perl} -pi -e 's|../config.h|../rrd_config.h|g' php4/rrdtool.c
 %endif
 
@@ -300,6 +302,9 @@
 %endif
 
 %changelog
+* Sat Apr 05 2008 Jarod Wilson <jwilson at redhat.com> 1.2.27-3
+- Fix use of rrd_update in php bindings (#437558)
+
 * Sat Mar 15 2008 Jarod Wilson <jwilson at redhat.com> 1.2.27-2
 - Drop php abi stuff, apparently not wired up in el5
 - Turn ppc64 php bits back on




More information about the fedora-extras-commits mailing list