rpms
/
rrdtool
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

import rrdtool-1.8.0-19.el10

Browse Source
i10c-beta changed/i10c-beta/rrdtool-1.8.0-19.el10
MSVSphere Packaging Team 3 months ago
commit 9fc1c4edf5
Signed by: sys_gitsync
GPG Key ID: B2B0B9F29E528FE8
10 changed files with 3024 additions and 0 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape View File

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

2
.rrdtool.metadata
Unescape View File

@ -0,0 +1,2 @@
215b1e335313edb4b7462368d5341502d7824652 SOURCES/php4-r1190.tar.gz
4da6da5e2f789d006c1ccc3b816a5a1ac9123bc8 SOURCES/rrdtool-1.8.0.tar.gz

100
SOURCES/rrdtool-1.4.4-php54.patch
Unescape 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
Unescape 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
Unescape 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
Unescape 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:

53
SOURCES/rrdtool-1.8.0-BUILD_DATE-fix.patch
Unescape View File

@ -0,0 +1,53 @@
From e59f703bbcc0af949ee365206426b6394c340c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= <c72578@yahoo.de>
Date: Wed, 23 Mar 2022 17:58:45 +0100
Subject: [PATCH] Fix BUILD_DATE in rrdtool help output
- This is a followup to #1102
- Fixes segfault when running "rrdtool --help"
- Change DATE_FMT to the same date format as the __DATE__ macro [1]:
mmm dd yyyy
[1] https://gcc.gnu.org/onlinedocs/cpp/Standard-Predefined-Macros.html
---
configure.ac | 2 +-
src/rrd_tool.c | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 4d234585..5169b0d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -695,7 +695,7 @@ AC_MSG_RESULT(${COMP_PERL:-No Perl Modules will be built})
# Use reproducible build date and time
if test "$SOURCE_DATE_EPOCH"; then
- DATE_FMT="%d %b %Y %H:%M:%S"
+ DATE_FMT="%b %d %Y %H:%M:%S"
BUILD_DATE=$(LC_ALL=C date -u -d "@$SOURCE_DATE_EPOCH" "+$DATE_FMT")
AC_DEFINE_UNQUOTED([BUILD_DATE], ["$BUILD_DATE"], [Use reproducible build date])
fi
diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index 930d0827..cc6119d9 100644
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -45,11 +45,19 @@ static void PrintUsage(
char *cmd)
{
+#ifdef BUILD_DATE
+ const char *help_main =
+ N_("RRDtool %s"
+ " Copyright by Tobias Oetiker <tobi@oetiker.ch>\n"
+ " Compiled %s\n\n"
+ "Usage: rrdtool [options] command command_options\n");
+#else
const char *help_main =
N_("RRDtool %s"
" Copyright by Tobias Oetiker <tobi@oetiker.ch>\n"
" Compiled %s %s\n\n"
"Usage: rrdtool [options] command command_options\n");
+#endif
const char *help_list =
N_

1509
SOURCES/rrdtool-1.8.0-const-argv.patch
View File

File diff suppressed because it is too large Load Diff

35
SOURCES/rrdtool-configure-c99.patch
Unescape View File

@ -0,0 +1,35 @@
commit f3334fcbde0a77aa48938ba38602bff91c09cf85
Author: Ryan Schmidt <git@ryandesign.com>
Date: Sun Mar 20 16:29:10 2022 -0500
acinclude.m4: Include <stdlib.h> when using exit
Fixes:
conftest.c:124:33: error: implicitly declaring library function 'exit'
with type 'void (int) __attribute__((noreturn))'
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
index d9d9eb25..0d6fbf5d 100644
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
@@ -582,7 +582,8 @@ AC_DEFUN([GC_TIMEZONE], [
AC_REQUIRE([AC_STRUCT_TM])
AC_CACHE_CHECK([tm_gmtoff in struct tm], gq_cv_have_tm_gmtoff,
gq_cv_have_tm_gmtoff=no
- AC_TRY_COMPILE([#include <time.h>
+ AC_TRY_COMPILE([#include <stdlib.h>
+ #include <time.h>
#include <$ac_cv_struct_tm>
],
[struct tm t;
@@ -595,7 +596,8 @@ AC_DEFUN([GC_TIMEZONE], [
AC_CACHE_CHECK([__tm_gmtoff in struct tm], gq_cv_have___tm_gmtoff,
gq_cv_have___tm_gmtoff=no
- AC_TRY_COMPILE([#include <time.h>
+ AC_TRY_COMPILE([#include <stdlib.h>
+ #include <time.h>
#include <$ac_cv_struct_tm>
],
[struct tm t;

1203
SPECS/rrdtool.spec
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save