rpms/rrdtool
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import rrdtool-1.7.0-16.el8

Browse Source
This commit is contained in:
CentOS Sources 2019-08-01 08:54:21 -04:00 committed by Stepan Oksanichenko
commit c8817a38f5
8 changed files with 1378 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
SOURCES/php4-r1190.tar.gz
SOURCES/rrdtool-1.7.0.tar.gz

2
.rrdtool.metadata Normal file
View File

@ -0,0 +1,2 @@
215b1e335313edb4b7462368d5341502d7824652 SOURCES/php4-r1190.tar.gz
15a2009e2ee67eb41a2598d1a0f1f7cf1a651c78 SOURCES/rrdtool-1.7.0.tar.gz

100
SOURCES/rrdtool-1.4.4-php54.patch Normal file
View File

@ -0,0 +1,100 @@
diff -up rrdtool-1.4.4/php4/rrdtool.c.php54 rrdtool-1.4.4/php4/rrdtool.c
--- rrdtool-1.4.4/php4/rrdtool.c.php54 2011-12-29 08:57:00.790784347 +0100
+++ rrdtool-1.4.4/php4/rrdtool.c 2011-12-29 09:00:55.960794927 +0100
@@ -39,7 +39,7 @@
ZEND_DECLARE_MODULE_GLOBALS(rrdtool)
*/
-function_entry rrdtool_functions[] = {
+zend_function_entry rrdtool_functions[] = {
PHP_FE(rrd_graph, NULL)
PHP_FE(rrd_fetch, NULL)
PHP_FE(rrd_error, NULL)
@@ -119,8 +119,8 @@ PHP_MINFO_FUNCTION(rrdtool)
Creates a graph based on options passed via an array */
PHP_FUNCTION(rrd_graph)
{
- pval *file, *args, *p_argc;
- pval *entry;
+ zval *file, *args, *p_argc;
+ zval *entry;
zval *p_calcpr;
HashTable *args_arr;
int i, xsize, ysize, argc;
@@ -155,7 +155,7 @@ PHP_FUNCTION(rrd_graph)
for (i = 3; i < argc; i++)
{
- pval **dataptr;
+ zval **dataptr;
if ( zend_hash_get_current_data(args_arr, (void *) &dataptr) == FAILURE )
continue;
@@ -216,9 +216,8 @@ PHP_FUNCTION(rrd_graph)
Fetch info from an RRD file */
PHP_FUNCTION(rrd_fetch)
{
- pval *file, *args, *p_argc;
- pval *entry;
- pval *p_start, *p_end, *p_step, *p_ds_cnt;
+ zval *file, *args, *p_argc;
+ zval *entry;
HashTable *args_arr;
zval *p_ds_namv, *p_data;
int i, j, argc;
@@ -254,7 +253,7 @@ PHP_FUNCTION(rrd_fetch)
for (i = 3; i < argc; i++)
{
- pval **dataptr;
+ zval **dataptr;
if ( zend_hash_get_current_data(args_arr, (void *) &dataptr) == FAILURE )
continue;
@@ -361,7 +360,7 @@ PHP_FUNCTION(rrd_clear_error)
Update an RRD file with values specified */
PHP_FUNCTION(rrd_update)
{
- pval *file, *opt;
+ zval *file, *opt;
char **argv;
if ( rrd_test_error() )
@@ -404,7 +403,7 @@ PHP_FUNCTION(rrd_update)
Gets last update time of an RRD file */
PHP_FUNCTION(rrd_last)
{
- pval *file;
+ zval *file;
unsigned long retval;
char **argv = (char **) emalloc(3 * sizeof(char *));
@@ -439,8 +438,8 @@ PHP_FUNCTION(rrd_last)
Create an RRD file with the options passed (passed via array) */
PHP_FUNCTION(rrd_create)
{
- pval *file, *args, *p_argc;
- pval *entry;
+ zval *file, *args, *p_argc;
+ zval *entry;
char **argv;
HashTable *args_arr;
int argc, i;
@@ -449,7 +448,7 @@ PHP_FUNCTION(rrd_create)
rrd_clear_error();
if ( ZEND_NUM_ARGS() == 3 &&
- getParameters(ht, 3, &file, &args, &p_argc) == SUCCESS )
+ zend_get_parameters(ht, 3, &file, &args, &p_argc) == SUCCESS )
{
if ( args->type != IS_ARRAY )
{
@@ -473,7 +472,7 @@ PHP_FUNCTION(rrd_create)
for (i = 3; i < argc; i++)
{
- pval **dataptr;
+ zval **dataptr;
if ( zend_hash_get_current_data(args_arr, (void *) &dataptr) == FAILURE )
continue;

83
SOURCES/rrdtool-1.4.7-php55.patch Normal file
View File

@ -0,0 +1,83 @@
--- rrdtool-1.4.7/php4/rrdtool.c.orig 2013-03-22 14:54:18.520877577 +0100
+++ rrdtool-1.4.7/php4/rrdtool.c 2013-03-22 14:59:23.056303502 +0100
@@ -20,13 +20,11 @@
/* PHP Includes */
#include "php.h"
-#include "php_logos.h"
#include "ext/standard/info.h"
#include "SAPI.h"
/* rrdtool includes */
#include "php_rrdtool.h"
-#include "rrdtool_logo.h"
#include <rrd.h>
#ifdef HAVE_CONFIG_H
@@ -48,7 +46,6 @@
PHP_FE(rrd_last, NULL)
PHP_FE(rrd_create, NULL)
PHP_FE(rrdtool_info, NULL)
- PHP_FE(rrdtool_logo_guid, NULL)
{NULL, NULL, NULL}
};
@@ -83,8 +80,6 @@
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(rrdtool)
{
- php_register_info_logo(RRDTOOL_LOGO_GUID , "image/gif", rrdtool_logo , sizeof(rrdtool_logo));
-
return SUCCESS;
}
/* }}} */
@@ -92,8 +87,6 @@
/* {{{ PHP_MSHUTDOWN_FUNCTION */
PHP_MSHUTDOWN_FUNCTION(rrdtool)
{
- php_unregister_info_logo(RRDTOOL_LOGO_GUID);
-
return SUCCESS;
}
/* }}} */
@@ -102,11 +95,6 @@
PHP_MINFO_FUNCTION(rrdtool)
{
php_info_print_box_start(1);
- PUTS("<a href=\"http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/\" target=\"rrdtool\"><img border=\"0\" src=\"");
- if (SG(request_info).request_uri) {
- PUTS(SG(request_info).request_uri);
- }
- PUTS("?="RRDTOOL_LOGO_GUID"\" alt=\"ClamAV logo\" /></a>\n");
php_printf("<h1 class=\"p\">rrdtool Version %s</h1>\n", PHP_RRD_VERSION_STRING);
php_info_print_box_end();
php_info_print_table_start();
@@ -548,11 +536,6 @@
PUTS("<body><div class=\"center\">\n");
php_info_print_box_start(1);
- PUTS("<a href=\"http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/\" target=\"rrdtool\"><img border=\"0\" src=\"");
- if (SG(request_info).request_uri) {
- PUTS(SG(request_info).request_uri);
- }
- PUTS("?="RRDTOOL_LOGO_GUID"\" alt=\"ClamAV logo\" /></a>\n");
php_printf("<h1 class=\"p\">rrdtool Version %s</h1>\n", PHP_RRD_VERSION_STRING);
php_info_print_box_end();
php_info_print_table_start();
@@ -590,16 +573,6 @@
}
/* }}} */
-PHP_FUNCTION(rrdtool_logo_guid)
-{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
- }
-
- RETURN_STRINGL(RRDTOOL_LOGO_GUID, sizeof(RRDTOOL_LOGO_GUID)-1, 1);
-}
-/* }}} */
-
#endif /* HAVE_RRDTOOL */
/*

11
SOURCES/rrdtool-1.4.8-php-ppc-fix.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/php4/ltconfig 2014-08-11 13:01:13.020065855 +0000
+++ a/php4/ltconfig 2014-08-11 13:01:23.870060274 +0000
@@ -1939,7 +1939,7 @@
else
# Only the GNU ld.so supports shared libraries on MkLinux.
case "$host_cpu" in
- powerpc*) dynamic_linker=no ;;
+# powerpc*) dynamic_linker=no ;;
*) dynamic_linker='Linux ld.so' ;;
esac
fi

26
SOURCES/rrdtool-1.6.0-ruby-2-fix.patch Normal file
View File

@ -0,0 +1,26 @@
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 54f5c23..ee85c23 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -35,8 +35,9 @@ install-data-local:
&& $(MAKE) install ) \
|| true
$(AM_V_GEN)test -f ${builddir}/ruby/Makefile \
- && ( cd ${builddir}/ruby \
- && $(MAKE) EPREFIX=$(DESTDIR)$(exec_prefix) $(RUBY_MAKE_OPTIONS) install ) \
+ && ( $(MKDIR_P) $(DESTDIR)$(libdir)/ruby/vendor_ruby && cd ${builddir}/ruby \
+ && $(MAKE) EPREFIX=$(DESTDIR)$(exec_prefix) $(RUBY_MAKE_OPTIONS) \
+ hdrdir="$(includedir)" rubyhdrdir="$(includedir)" includedir="$(includedir)" install ) \
|| true
$(AM_V_GEN)test -d ${builddir}/python/build \
&& ( cd ${builddir}/python \
@@ -57,7 +58,8 @@ ruby:
EPREFIX=$(exec_prefix) \
ABS_TOP_SRCDIR=${abs_top_srcdir} \
ABS_TOP_BUILDDIR=${abs_top_builddir} \
- $(RUBY_MAKE_OPTIONS) RUBYARCHDIR= )
+ $(RUBY_MAKE_OPTIONS) hdrdir="$(includedir)" \
+ rubyhdrdir="$(includedir)" includedir="$(includedir)" RUBYARCHDIR= )
# rules for building the python module
python:

49
SOURCES/rrdtool-1.7.0-fix-configure-parameters.patch Normal file
View File

@ -0,0 +1,49 @@
--- ./configure.ac.orig 2017-05-16 10:32:11.000000000 +0200
+++ ./configure.ac 2018-01-05 14:00:09.261806009 +0100
@@ -512,7 +512,11 @@
have_libdbi=no
-AC_ARG_ENABLE(libdbi,AS_HELP_STRING([--disable-libdbi],[do not build in support for libdbi]),[],[
+AC_ARG_ENABLE(libdbi,AS_HELP_STRING([--disable-libdbi],[do not build in support for libdbi]),
+[],
+[enable_libdbi=yes])
+
+AS_IF([test "x$enable_libdbi" != xno], [
AC_CHECK_HEADER(dbi/dbi.h, [
AC_CHECK_LIB(dbi, dbi_initialize, [
AC_DEFINE(HAVE_LIBDBI,[1],[have got libdbi installed])
@@ -526,7 +530,11 @@
have_librados=no
-AC_ARG_ENABLE(librados,AS_HELP_STRING([--disable-librados],[do not build in support for librados]),[],[
+AC_ARG_ENABLE(librados,AS_HELP_STRING([--disable-librados],[do not build in support for librados]),
+[],
+[enable_librados=yes])
+
+AS_IF([test "x$enable_librados" != xno], [
AC_CHECK_HEADER(rados/librados.h, [
AC_DEFINE(HAVE_LIBRADOS,[1],[have got librados installed])
LIBS="${LIBS} -lrados"
@@ -538,7 +546,11 @@
have_libwrap=no
-AC_ARG_ENABLE(libwrap, AS_HELP_STRING([--disable-libwrap], [do not build in support for libwrap (tcp wrapper)]),[],[
+AC_ARG_ENABLE(libwrap, AS_HELP_STRING([--disable-libwrap], [do not build in support for libwrap (tcp wrapper)]),
+[],
+[enable_libwrap=yes])
+
+AS_IF([test "x$enable_libwrap" != xno], [
AC_CHECK_HEADER(tcpd.h,[
AC_CHECK_FUNCS(hosts_access, [
AC_DEFINE(HAVE_LIBWRAP,[1],[have got libwrap installed])
@@ -554,7 +566,6 @@
])
])
-
AM_CONDITIONAL(BUILD_LIBWRAP,[test $have_libwrap != no])
AM_CONDITIONAL(BUILD_RRDGRAPH,[test $enable_rrd_graph != no])

1105
SPECS/rrdtool.spec Normal file
View File

File diff suppressed because it is too large Load Diff