From 4685616d8a6b668c0fbaf8a12d1c9ec74fc92e27 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 15:31:57 +0000 Subject: [PATCH] import UBI rrdtool-1.8.0-20.el10 --- .gitignore | 6 +- gating.yaml | 6 - rrdtool-1.7.0-fix-configure-parameters.patch | 49 - rrdtool-1.8.0-BUILD_DATE-fix.patch | 53 + rrdtool-1.8.0-const-argv.patch | 1509 ++++++++++++++++++ rrdtool-configure-c99.patch | 35 + rrdtool.spec | 329 ++-- sources | 2 +- 8 files changed, 1814 insertions(+), 175 deletions(-) delete mode 100644 gating.yaml delete mode 100644 rrdtool-1.7.0-fix-configure-parameters.patch create mode 100644 rrdtool-1.8.0-BUILD_DATE-fix.patch create mode 100644 rrdtool-1.8.0-const-argv.patch create mode 100644 rrdtool-configure-c99.patch diff --git a/.gitignore b/.gitignore index af45027..0f029e6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -SOURCES/php4-r1190.tar.gz -SOURCES/rrdtool-1.7.0.tar.gz -/php4-r1190.tar.gz -/rrdtool-1.7.0.tar.gz +php4-r1190.tar.gz +rrdtool-1.8.0.tar.gz diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index eb7c84f..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} diff --git a/rrdtool-1.7.0-fix-configure-parameters.patch b/rrdtool-1.7.0-fix-configure-parameters.patch deleted file mode 100644 index 97747f7..0000000 --- a/rrdtool-1.7.0-fix-configure-parameters.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- ./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]) diff --git a/rrdtool-1.8.0-BUILD_DATE-fix.patch b/rrdtool-1.8.0-BUILD_DATE-fix.patch new file mode 100644 index 0000000..548efe8 --- /dev/null +++ b/rrdtool-1.8.0-BUILD_DATE-fix.patch @@ -0,0 +1,53 @@ +From e59f703bbcc0af949ee365206426b6394c340c6f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= +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 \n" ++ " Compiled %s\n\n" ++ "Usage: rrdtool [options] command command_options\n"); ++#else + const char *help_main = + N_("RRDtool %s" + " Copyright by Tobias Oetiker \n" + " Compiled %s %s\n\n" + "Usage: rrdtool [options] command command_options\n"); ++#endif + + const char *help_list = + N_ diff --git a/rrdtool-1.8.0-const-argv.patch b/rrdtool-1.8.0-const-argv.patch new file mode 100644 index 0000000..7401cde --- /dev/null +++ b/rrdtool-1.8.0-const-argv.patch @@ -0,0 +1,1509 @@ +diff --git a/bindings/lua/rrdlua.c b/bindings/lua/rrdlua.c +index d1a7006..2095c3b 100644 +--- a/bindings/lua/rrdlua.c ++++ b/bindings/lua/rrdlua.c +@@ -37,8 +37,8 @@ + extern void rrd_freemem(void *mem); + + extern int luaopen_rrd (lua_State * L); +-typedef int (*RRD_FUNCTION)(int, char **); +-typedef rrd_info_t *(RRD_FUNCTION_V)(int, char **); ++typedef int (*RRD_FUNCTION)(int, const char **); ++typedef rrd_info_t *(RRD_FUNCTION_V)(int, const char **); + + /**********************************************************/ + +@@ -49,9 +49,9 @@ static void reset_rrd_state(void) + rrd_clear_error(); + } + +-static char **make_argv(const char *cmd, lua_State * L) ++static const char **make_argv(const char *cmd, lua_State * L) + { +- char **argv; ++ const char **argv; + int i; + int argc = lua_gettop(L) + 1; + +@@ -60,13 +60,12 @@ static char **make_argv(const char *cmd, lua_State * L) + luaL_error(L, "Can't allocate memory for arguments array", cmd); + + /* fprintf(stderr, "Args:\n"); */ +- argv[0] = (char *) cmd; /* Dummy arg. Cast to (char *) because rrd */ +- /* functions don't expect (const * char) */ ++ argv[0] = cmd; + /* fprintf(stderr, "%s\n", argv[0]); */ + for (i=1; i + #include "../../src/rrd_tool.h" + #include "../../src/rrd_format.h" ++#include "../../src/unused.h" + + /* support pre-8.4 tcl */ + +@@ -41,47 +42,39 @@ extern int Tclrrd_SafeInit( + * Hence, we need to do some preparation before + * calling the rrd library functions. + */ +-static char **getopt_init( ++static const char **getopt_init( + int argc, + CONST84 char *argv[]) + { +- char **argv2; ++ const char **argv2; + int i; + + argv2 = calloc(argc, sizeof(char *)); + for (i = 0; i < argc; i++) { +- argv2[i] = strdup(argv[i]); ++ argv2[i] = argv[i]; + } + return argv2; + } + + static void getopt_cleanup( +- int argc, +- char **argv2) ++ int UNUSED(argc), ++ const char **argv2) + { +- int i; +- +- for (i = 0; i < argc; i++) { +- if (argv2[i] != NULL) { +- free(argv2[i]); +- } +- } +- free(argv2); ++ free((void *)argv2); + } + + static void getopt_free_element( +- char *argv2[], ++ const char *argv2[], + int argn) + { + if (argv2[argn] != NULL) { +- free(argv2[argn]); + argv2[argn] = NULL; + } + } + + static void getopt_squieeze( + int *argc, +- char *argv2[]) ++ const char *argv2[]) + { + int i, null_i = 0, argc_tmp = *argc; + +@@ -104,7 +97,7 @@ static int Rrd_Create( + CONST84 char *argv[]) + { + int argv_i; +- char **argv2; ++ const char **argv2; + char *parsetime_error = NULL; + time_t last_up = time(NULL) - 10; + long int long_tmp; +@@ -295,7 +288,7 @@ static int Rrd_Flushcached( + return TCL_ERROR; + } + +- rrd_flushcached(argc, (char**)argv); ++ rrd_flushcached(argc, argv); + + if (rrd_test_error()) { + Tcl_AppendResult(interp, "RRD Error: ", +@@ -380,7 +373,7 @@ static int Rrd_Update( + CONST84 char *argv[]) + { + int argv_i; +- char **argv2, *template = NULL; ++ const char **argv2, *template = NULL; + + argv2 = getopt_init(argc, argv); + +@@ -391,16 +384,10 @@ static int Rrd_Update( + Tcl_AppendResult(interp, "RRD Error: option '", + argv2[argv_i - 1], "' needs an argument", + (char *) NULL); +- if (template != NULL) { +- free(template); +- } + getopt_cleanup(argc, argv2); + return TCL_ERROR; + } +- if (template != NULL) { +- free(template); +- } +- template = strdup(argv2[argv_i]); ++ template = argv2[argv_i]; + getopt_free_element(argv2, argv_i - 1); + getopt_free_element(argv2, argv_i); + } else if (!strcmp(argv2[argv_i], "--")) { +@@ -409,9 +396,6 @@ static int Rrd_Update( + } else if (argv2[argv_i][0] == '-') { + Tcl_AppendResult(interp, "RRD Error: unknown option '", + argv2[argv_i], "'", (char *) NULL); +- if (template != NULL) { +- free(template); +- } + getopt_cleanup(argc, argv2); + return TCL_ERROR; + } +@@ -422,18 +406,12 @@ static int Rrd_Update( + if (argc < 2) { + Tcl_AppendResult(interp, "RRD Error: needs rrd filename", + (char *) NULL); +- if (template != NULL) { +- free(template); +- } + getopt_cleanup(argc, argv2); + return TCL_ERROR; + } + + rrd_update_r(argv2[1], template, argc - 2, (const char **)argv2 + 2); + +- if (template != NULL) { +- free(template); +- } + getopt_cleanup(argc, argv2); + + if (rrd_test_error()) { +@@ -454,7 +432,6 @@ static int Rrd_Info( + { + int status = TCL_OK; + rrd_info_t *data; +- char **argv2; + + /* TODO: support for rrdcached */ + if (argc != 2) { +@@ -463,9 +440,7 @@ static int Rrd_Info( + return TCL_ERROR; + } + +- argv2 = getopt_init(argc, argv); +- +- data = rrd_info_r(argv2[1]); ++ data = rrd_info_r(argv[1]); + + if (data) { + Tcl_SetObjResult(interp, convert_info(data)); +@@ -477,7 +452,6 @@ static int Rrd_Info( + status = TCL_ERROR; + } + +- getopt_cleanup(argc, argv2); + return status; + } + +@@ -488,7 +462,6 @@ static int Rrd_Lastupdate( + CONST84 char *argv[]) + { + time_t last_update; +- char **argv2; + char **ds_namv; + char **last_ds; + char s[30]; +@@ -502,8 +475,7 @@ static int Rrd_Lastupdate( + return TCL_ERROR; + } + +- argv2 = getopt_init(argc, argv); +- if (rrd_lastupdate_r(argv2[1], &last_update, ++ if (rrd_lastupdate_r(argv[1], &last_update, + &ds_cnt, &ds_namv, &last_ds) == 0) { + listPtr = Tcl_GetObjResult(interp); + for (i = 0; i < ds_cnt; i++) { +@@ -527,7 +499,6 @@ static int Rrd_Lastupdate( + free(ds_namv); + } + } +- getopt_cleanup(argc, argv2); + return TCL_OK; + } + +@@ -543,10 +514,8 @@ static int Rrd_Fetch( + char **ds_namv; + Tcl_Obj *listPtr; + char s[30]; +- char **argv2; + +- argv2 = getopt_init(argc, argv); +- if (rrd_fetch(argc, argv2, &start, &end, &step, ++ if (rrd_fetch(argc, argv, &start, &end, &step, + &ds_cnt, &ds_namv, &data) != -1) { + datai = data; + listPtr = Tcl_GetObjResult(interp); +@@ -562,7 +531,6 @@ static int Rrd_Fetch( + free(ds_namv); + free(data); + } +- getopt_cleanup(argc, argv2); + + if (rrd_test_error()) { + Tcl_AppendResult(interp, "RRD Error: ", +@@ -590,7 +558,7 @@ static int Rrd_Graph( + int rc, xsize, ysize; + double ymin, ymax; + char dimensions[50]; +- char **argv2; ++ const char **argv2; + CONST84 char *save; + + /* +@@ -692,11 +660,7 @@ static int Rrd_Tune( + int argc, + CONST84 char *argv[]) + { +- char **argv2; +- +- argv2 = getopt_init(argc, argv); +- rrd_tune(argc, argv2); +- getopt_cleanup(argc, argv2); ++ rrd_tune(argc, argv); + + if (rrd_test_error()) { + Tcl_AppendResult(interp, "RRD Error: ", +@@ -716,11 +680,7 @@ static int Rrd_Resize( + int argc, + CONST84 char *argv[]) + { +- char **argv2; +- +- argv2 = getopt_init(argc, argv); +- rrd_resize(argc, argv2); +- getopt_cleanup(argc, argv2); ++ rrd_resize(argc, argv); + + if (rrd_test_error()) { + Tcl_AppendResult(interp, "RRD Error: ", +@@ -740,11 +700,7 @@ static int Rrd_Restore( + int argc, + CONST84 char *argv[]) + { +- char **argv2; +- +- argv2 = getopt_init(argc, argv); +- rrd_restore(argc, argv2); +- getopt_cleanup(argc, argv2); ++ rrd_restore(argc, argv); + + if (rrd_test_error()) { + Tcl_AppendResult(interp, "RRD Error: ", +diff --git a/src/optparse.c b/src/optparse.c +index 9040ba8..79a3efe 100644 +--- a/src/optparse.c ++++ b/src/optparse.c +@@ -10,7 +10,7 @@ + #define options_argv(i) \ + ((i) < options->argc ? options->argv[i] : NULL) + +-void optparse_init(struct optparse *options, int argc, char **argv) ++void optparse_init(struct optparse *options, int argc, const char **argv) + { + options->argv = argv; + options->argc = argc; +@@ -42,7 +42,7 @@ is_longopt(const char *arg) + static void + permute(struct optparse *options, int index) + { +- char *nonoption = options->argv[index]; ++ const char *nonoption = options->argv[index]; + for (int i = index; i < options->optind - 1; i++) + options->argv[i] = options->argv[i + 1]; + options->argv[options->optind - 1] = nonoption; +@@ -67,7 +67,7 @@ int optparse(struct optparse *options, const char *optstring) + options->errmsg[0] = '\0'; + options->optopt = 0; + options->optarg = NULL; +- char *option = options_argv(options->optind); ++ const char *option = options_argv(options->optind); + if (option == NULL) { + return -1; + } else if (is_dashdash(option)) { +@@ -88,7 +88,7 @@ int optparse(struct optparse *options, const char *optstring) + option += options->subopt + 1; + options->optopt = option[0]; + int type = argtype(optstring, option[0]); +- char *next = options_argv(options->optind + 1); ++ const char *next = options_argv(options->optind + 1); + switch (type) { + case -1: + opterror(options, "invalid option -- '%c'", option[0]); +@@ -128,10 +128,10 @@ int optparse(struct optparse *options, const char *optstring) + return 0; + } + +-char *optparse_arg(struct optparse *options) ++const char *optparse_arg(struct optparse *options) + { + options->subopt = 0; +- char *option = options->argv[options->optind]; ++ const char *option = options->argv[options->optind]; + if (option != NULL) + options->optind++; + return option; +@@ -222,7 +222,7 @@ optparse_long(struct optparse *options, + int *longindex) + { + // printf("%i < %i\n",options->optind,options->argc); +- char *option = options_argv(options->optind); ++ const char *option = options_argv(options->optind); + if (option == NULL) { + return -1; + } else if (is_dashdash(option)) { +diff --git a/src/optparse.h b/src/optparse.h +index c4b0ec1..7a0bb38 100644 +--- a/src/optparse.h ++++ b/src/optparse.h +@@ -44,7 +44,7 @@ + */ + + struct optparse { +- char **argv; ++ const char **argv; + int argc; + int permute; + int optind; +@@ -65,7 +65,7 @@ struct optparse_long { + /** + * Initializes the parser state. + */ +-void optparse_init(struct optparse *options, int argc, char **argv); ++void optparse_init(struct optparse *options, int argc, const char **argv); + + /** + * Read the next option in the argv array. +@@ -98,6 +98,6 @@ optparse_long(struct optparse *options, + * subcommand returned by optparse_arg(). This function allows you to + * ignore the value of optind. + */ +-char *optparse_arg(struct optparse *options); ++const char *optparse_arg(struct optparse *options); + + #endif +diff --git a/src/rrd.h b/src/rrd.h +index 8439413..4f0e566 100644 +--- a/src/rrd.h ++++ b/src/rrd.h +@@ -155,10 +155,10 @@ extern "C" { + /* main function blocks */ + int rrd_create( + int, +- char **); ++ const char **); + rrd_info_t *rrd_info( + int, +- char **); ++ const char **); + rrd_info_t *rrd_info_push( + rrd_info_t *, + char *, +@@ -170,19 +170,19 @@ extern "C" { + rrd_info_t *); + char *rrd_list( + int, +- char **); ++ const char **); + char *rrd_list_r( + int, +- char *dirname); ++ const char *dirname); + int rrd_update( + int, +- char **); ++ const char **); + rrd_info_t *rrd_update_v( + int, +- char **); ++ const char **); + int rrd_graph( + int, +- char **, ++ const char **, + char ***, + int *, + int *, +@@ -191,11 +191,11 @@ extern "C" { + double *); + rrd_info_t *rrd_graph_v( + int, +- char **); ++ const char **); + + int rrd_fetch( + int, +- char **, ++ const char **, + time_t *, + time_t *, + unsigned long *, +@@ -204,32 +204,32 @@ extern "C" { + rrd_value_t **); + int rrd_restore( + int, +- char **); ++ const char **); + int rrd_dump( + int, +- char **); ++ const char **); + int rrd_tune( + int, +- char **); ++ const char **); + time_t rrd_last( + int, +- char **); ++ const char **); + int rrd_lastupdate( + int argc, +- char **argv); ++ const char **argv); + time_t rrd_first( + int, +- char **); ++ const char **); + int rrd_resize( + int, +- char **); ++ const char **); + char *rrd_strversion( + void); + double rrd_version( + void); + int rrd_xport( + int, +- char **, ++ const char **, + int *, + time_t *, + time_t *, +@@ -239,7 +239,7 @@ extern "C" { + rrd_value_t **); + int rrd_flushcached( + int argc, +- char **argv); ++ const char **argv); + + void rrd_freemem( + void *mem); +@@ -309,7 +309,7 @@ extern "C" { + const char **argv); + int rrd_dump_opt_r( + const char *filename, +- char *outname, ++ const char *outname, + int opt_noheader); + int rrd_dump_r( + const char *filename, +diff --git a/src/rrd_cgi.c b/src/rrd_cgi.c +index e7eb5be..bc007b2 100644 +--- a/src/rrd_cgi.c ++++ b/src/rrd_cgi.c +@@ -100,7 +100,7 @@ static char *rrdstrip( + static char *scanargs( + char *line, + int *argc, +- char ***args); ++ const char ***args); + + /* format at-time specified times using strftime */ + static char *printstrftime( +@@ -315,7 +315,7 @@ static const char *putvar( + } + + /* expand those RRD:* directives that can be used recursively */ +-static char *rrd_expand_vars( ++static const char *rrd_expand_vars( + char *buffer) + { + int i; +@@ -432,7 +432,7 @@ static int readfile( + + int main( + int argc, +- char *argv[]) ++ const char *argv[]) + { + char *buffer; + long i; +@@ -924,7 +924,7 @@ static char *drawgraph( + } + calfree(); + if (rrd_graph +- (argc + 1, (char **) args - 1, &calcpr, &xsize, &ysize, NULL, &ymin, ++ (argc + 1, args - 1, &calcpr, &xsize, &ysize, NULL, &ymin, + &ymax) != -1) { + return stralloc(calcpr[0]); + } else { +@@ -971,7 +971,7 @@ static char *printtimelast( + /* not raising argc in step with args - 1 since the last argument + will be used below for strftime */ + +- last = rrd_last(argc, (char **) args - 1); ++ last = rrd_last(argc, args - 1); + if (rrd_test_error()) { + char err[4096]; + +@@ -1025,7 +1025,7 @@ static char *printtimenow( + static char *scanargs( + char *line, + int *argument_count, +- char ***arguments) ++ const char ***arguments) + { + char *getP; /* read cursor */ + char *putP; /* write cursor */ +@@ -1037,8 +1037,8 @@ static char *scanargs( + + /* local array of arguments while parsing */ + int argc = 1; +- char **argv; +- char **argv_tmp; /* temp variable for realloc() */ ++ const char **argv; ++ const char **argv_tmp; /* temp variable for realloc() */ + + #ifdef DEBUG_PARSER + printf("<-- scanargs(%s) -->\n", line); +@@ -1049,7 +1049,7 @@ static char *scanargs( + + /* create initial argument array of char pointers */ + argsz = 32; +- argv = (char **) malloc(argsz * sizeof(char *)); ++ argv = malloc(argsz * sizeof(char *)); + if (!argv) { + return NULL; + } +@@ -1144,7 +1144,7 @@ static char *scanargs( + if (argc == argsz - 2) { + /* resize argument array */ + argsz *= 2; +- argv_tmp = (char **) rrd_realloc(argv, argsz * sizeof(char *)); ++ argv_tmp = rrd_realloc(argv, argsz * sizeof(char *)); + if (*argv_tmp == NULL) { + return NULL; + } +@@ -1211,7 +1211,7 @@ static int parse( + /* the name of the vairable ... */ + char *val; + long valln; +- char **args; ++ const char **args; + char *end; + long end_offset; + int argc; +@@ -1262,7 +1262,7 @@ static int parse( + /* make sure we do not shrink the mallocd block */ + size_t newbufsize = i + strlen(end) + valln + 1; + +- *buf = (char *) rrd_realloc(*buf, newbufsize); ++ *buf = rrd_realloc(*buf, newbufsize); + + if (*buf == NULL) { + perror("Realoc buf:"); +diff --git a/src/rrd_create.c b/src/rrd_create.c +index 0cb5b78..984c438 100644 +--- a/src/rrd_create.c ++++ b/src/rrd_create.c +@@ -76,7 +76,7 @@ static void parseGENERIC_DS( + + int rrd_create( + int argc, +- char **argv) ++ const char **argv) + { + struct optparse_long longopts[] = { + {"start", 'b', OPTPARSE_REQUIRED}, +diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c +index cf12547..5831c1b 100644 +--- a/src/rrd_daemon.c ++++ b/src/rrd_daemon.c +@@ -1796,7 +1796,7 @@ static int handle_request_tune( + HANDLER_PROTO) + { /* {{{ */ + int status; +- char** argv = NULL; ++ const char** argv = NULL; + int argc, argc_tmp; + char* i; + int rc; +@@ -1835,7 +1835,7 @@ static int handle_request_tune( + goto done; + } + +- if ((argv = (char **) malloc(argc * sizeof(char*))) == NULL) { ++ if ((argv = malloc(argc * sizeof(char*))) == NULL) { + rc = send_response(sock, RESP_ERR, "%s\n", rrd_strerror(ENOMEM)); + goto done; + } +@@ -1846,7 +1846,7 @@ static int handle_request_tune( + argc_tmp += 1; + } + +- status = rrd_tune_r(file, argc, (const char **)argv); ++ status = rrd_tune_r(file, argc, argv); + if (status != 0) { + rc = send_response(sock, RESP_ERR, "Got error %s\n", rrd_get_error()); + goto done; +@@ -1854,7 +1854,7 @@ static int handle_request_tune( + rc = send_response(sock, RESP_OK, "Success\n"); + done: + free(file); +- free(argv); ++ free((void *)argv); + return rc; + } + +@@ -4418,7 +4418,7 @@ static int cleanup( + + static int read_options( + int argc, +- char **argv) ++ const char **argv) + { /* {{{ */ + struct optparse_long longopts[] = { + {NULL, 'a', OPTPARSE_REQUIRED}, +@@ -4963,7 +4963,7 @@ static int read_options( + + int main( + int argc, +- char **argv) ++ const char **argv) + { + int status; + +diff --git a/src/rrd_dump.c b/src/rrd_dump.c +index 4f616fc..991cdcd 100644 +--- a/src/rrd_dump.c ++++ b/src/rrd_dump.c +@@ -472,7 +472,7 @@ static size_t rrd_dump_opt_cb_fileout( + + int rrd_dump_opt_r( + const char *filename, +- char *outname, ++ const char *outname, + int opt_noheader) + { + FILE *out_file; +@@ -512,7 +512,7 @@ int rrd_dump_r( + + int rrd_dump( + int argc, +- char **argv) ++ const char **argv) + { + int opt; + struct optparse_long longopts[] = { +diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c +index aa05cd0..e0c4f4f 100644 +--- a/src/rrd_fetch.c ++++ b/src/rrd_fetch.c +@@ -61,7 +61,7 @@ + + int rrd_fetch( + int argc, +- char **argv, ++ const char **argv, + time_t *start, + time_t *end, /* which time frame do you want ? + * will be changed to represent reality */ +diff --git a/src/rrd_first.c b/src/rrd_first.c +index 6279524..7ecc4f1 100644 +--- a/src/rrd_first.c ++++ b/src/rrd_first.c +@@ -13,7 +13,7 @@ + + time_t rrd_first( + int argc, +- char **argv) ++ const char **argv) + { + struct optparse_long longopts[] = { + {"rraindex", 129, OPTPARSE_REQUIRED}, +diff --git a/src/rrd_flushcached.c b/src/rrd_flushcached.c +index 090bca7..3bf6cd2 100644 +--- a/src/rrd_flushcached.c ++++ b/src/rrd_flushcached.c +@@ -22,7 +22,7 @@ + #include "rrd_tool.h" + #include "rrd_client.h" + +-int rrd_flushcached (int argc, char **argv) ++int rrd_flushcached (int argc, const char **argv) + { + struct optparse_long longopts[] = { + {"daemon", 'd', OPTPARSE_REQUIRED}, +diff --git a/src/rrd_graph.c b/src/rrd_graph.c +index c0ce6d4..fa8b4c4 100644 +--- a/src/rrd_graph.c ++++ b/src/rrd_graph.c +@@ -4606,7 +4606,7 @@ int scan_for_col( + /* Now just a wrapper around rrd_graph_v */ + int rrd_graph( + int argc, +- char **argv, ++ const char **argv, + char ***prdata, + int *xsize, + int *ysize, +@@ -4689,7 +4689,7 @@ int rrd_graph( + + rrd_info_t *rrd_graph_v( + int argc, +- char **argv) ++ const char **argv) + { + image_desc_t im; + rrd_info_t *grinfo; +@@ -4952,7 +4952,7 @@ void rrd_graph_init( + + void rrd_graph_options( + int argc, +- char *argv[], ++ const char **argv, + struct optparse *poptions, + image_desc_t *im) + { +diff --git a/src/rrd_graph.h b/src/rrd_graph.h +index 4df32ec..083cf38 100644 +--- a/src/rrd_graph.h ++++ b/src/rrd_graph.h +@@ -473,12 +473,12 @@ void time_clean( + + void rrd_graph_options( + int, +- char **, ++ const char **, + struct optparse *, + image_desc_t *); + void rrd_graph_script( + int, +- char **, ++ const char **, + image_desc_t *const, + int); + int rrd_graph_color( +diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c +index f88893b..dda0069 100644 +--- a/src/rrd_graph_helper.c ++++ b/src/rrd_graph_helper.c +@@ -1952,7 +1952,7 @@ static int parse_xport( + + void rrd_graph_script( + int argc, +- char *argv[], ++ const char **argv, + image_desc_t *const im, + int optno) + { +diff --git a/src/rrd_info.c b/src/rrd_info.c +index 76277e8..f1b4313 100644 +--- a/src/rrd_info.c ++++ b/src/rrd_info.c +@@ -82,7 +82,7 @@ rrd_info_t + + rrd_info_t *rrd_info( + int argc, +- char **argv) ++ const char **argv) + { + struct optparse_long longopts[] = { + {"daemon", 'd', OPTPARSE_REQUIRED}, +diff --git a/src/rrd_last.c b/src/rrd_last.c +index 2e05886..4b6a79f 100644 +--- a/src/rrd_last.c ++++ b/src/rrd_last.c +@@ -11,7 +11,7 @@ + + time_t rrd_last( + int argc, +- char **argv) ++ const char **argv) + { + char *opt_daemon = NULL; + time_t lastupdate; +diff --git a/src/rrd_lastupdate.c b/src/rrd_lastupdate.c +index 31ab3f7..28211da 100644 +--- a/src/rrd_lastupdate.c ++++ b/src/rrd_lastupdate.c +@@ -14,7 +14,7 @@ + #include "rrd_client.h" + #include + +-int rrd_lastupdate (int argc, char **argv) ++int rrd_lastupdate (int argc, const char **argv) + { + struct optparse_long longopts[] = { + {"daemon", 'd', OPTPARSE_REQUIRED}, +diff --git a/src/rrd_list.c b/src/rrd_list.c +index e743b9b..6e96220 100644 +--- a/src/rrd_list.c ++++ b/src/rrd_list.c +@@ -37,7 +37,7 @@ static char *move_past_prefix(const char *prefix, const char *string) + return (char *)&(string[index]); + } + +-static char *rrd_list_rec(int recursive, char *root, char *dirname) ++static char *rrd_list_rec(int recursive, const char *root, const char *dirname) + { + #define SANE_ASPRINTF2(_dest_str, _format, ...) \ + if (asprintf(&_dest_str, _format, __VA_ARGS__) == -1) { \ +@@ -138,7 +138,7 @@ static char *rrd_list_rec(int recursive, char *root, char *dirname) + return out; + } + +-char *rrd_list_r(int recursive, char *dirname) ++char *rrd_list_r(int recursive, const char *dirname) + { + #define SANE_ASPRINTF(_dest_str, _format, ...) \ + if (asprintf(&_dest_str, _format, __VA_ARGS__) == -1) { \ +@@ -240,7 +240,7 @@ char *rrd_list_r(int recursive, char *dirname) + return rrd_list_rec(recursive, dirname, dirname); + } + +-char *rrd_list(int argc, char **argv) ++char *rrd_list(int argc, const char **argv) + { + char *opt_daemon = NULL; + int status; +diff --git a/src/rrd_modify.c b/src/rrd_modify.c +index 6de7926..d43fec2 100644 +--- a/src/rrd_modify.c ++++ b/src/rrd_modify.c +@@ -1297,7 +1297,7 @@ done: + } + + int handle_modify(const rrd_t *in, const char *outfilename, +- int argc, char **argv, int optidx, ++ int argc, const char **argv, int optidx, + int newstep) { + // parse add/remove options + int rc = -1; +diff --git a/src/rrd_modify.h b/src/rrd_modify.h +index d78d961..8596801 100644 +--- a/src/rrd_modify.h ++++ b/src/rrd_modify.h +@@ -28,7 +28,7 @@ typedef struct { + } rra_mod_op_t; + + int handle_modify(const rrd_t *in, const char *outfilename, +- int argc, char **argv, int optind, ++ int argc, const char **argv, int optind, + int newstep); + + typedef union { +diff --git a/src/rrd_resize.c b/src/rrd_resize.c +index 44c1ee5..5236cd6 100644 +--- a/src/rrd_resize.c ++++ b/src/rrd_resize.c +@@ -12,9 +12,9 @@ + + int rrd_resize( + int argc, +- char **argv) ++ const char **argv) + { +- char *infilename, outfilename[11] = "resize.rrd"; ++ const char *infilename, outfilename[11] = "resize.rrd"; + rrd_t rrdold, rrdnew; + rrd_value_t buffer; + int version; +diff --git a/src/rrd_restore.c b/src/rrd_restore.c +index 14b9446..19975da 100644 +--- a/src/rrd_restore.c ++++ b/src/rrd_restore.c +@@ -1378,7 +1378,7 @@ int write_file( + + int rrd_restore( + int argc, +- char **argv) ++ const char **argv) + { + struct optparse_long longopts[] = { + {"range-check", 'r', OPTPARSE_NONE}, +diff --git a/src/rrd_tool.c b/src/rrd_tool.c +index 71e2263..ddbae96 100644 +--- a/src/rrd_tool.c ++++ b/src/rrd_tool.c +@@ -22,16 +22,16 @@ + + + static void PrintUsage( +- char *cmd); ++ const char *cmd); + static int CountArgs( + char *aLine); + static int CreateArgs( ++ const char *, + char *, +- char *, +- char **); ++ const char **); + static int HandleInputLine( + int, +- char **, ++ const char **, + FILE *); + int RemoteMode = 0; + int ChangeRoot = 0; +@@ -42,7 +42,7 @@ int ChangeRoot = 0; + + + static void PrintUsage( +- char *cmd) ++ const char *cmd) + { + + #ifdef BUILD_DATE +@@ -443,11 +443,11 @@ static char *fgetslong( + + int main( + int argc, +- char *argv[]) ++ const char *argv[]) + { +- char **myargv; ++ const char **myargv; + char *aLine; +- char *firstdir = ""; ++ const char *firstdir = ""; + + #ifdef MUST_DISABLE_SIGFPE + signal(SIGFPE, SIG_IGN); +@@ -526,7 +526,7 @@ int main( + printf("ERROR: not enough arguments\n"); + continue; + } +- if ((myargv = (char **) malloc((argc + 1) * ++ if ((myargv = malloc((argc + 1) * + sizeof(char *))) == NULL) { + perror("malloc"); + exit(1); +@@ -572,7 +572,7 @@ int main( + resolving them portably is not really simple. */ + static int HandleInputLine( + int argc, +- char **argv, ++ const char **argv, + FILE * out) + { + #if defined(HAVE_OPENDIR) && defined (HAVE_READDIR) +@@ -887,12 +887,12 @@ static int CountArgs( + * CreateArgs - take a string (aLine) and tokenize + */ + static int CreateArgs( +- char *pName, ++ const char *pName, + char *aLine, +- char **argv) ++ const char **argv) + { + char *getP, *putP; +- char **pargv = argv; ++ const char **pargv = argv; + char Quote = 0; + int inArg = 0; + int len; +diff --git a/src/rrd_tune.c b/src/rrd_tune.c +index 3374dd1..dfa8a86 100644 +--- a/src/rrd_tune.c ++++ b/src/rrd_tune.c +@@ -71,7 +71,7 @@ static int set_hwsmootharg( + + int rrd_tune( + int argc, +- char **argv) ++ const char **argv) + { + char *opt_daemon = NULL; + const char *in_filename = NULL; +diff --git a/src/rrd_update.c b/src/rrd_update.c +index 831b8ee..8989f3f 100644 +--- a/src/rrd_update.c ++++ b/src/rrd_update.c +@@ -299,7 +299,7 @@ static void initialize_time( + + rrd_info_t *rrd_update_v( + int argc, +- char **argv) ++ const char **argv) + { + struct optparse_long longopts[] = { + {"template", 't', OPTPARSE_REQUIRED}, +@@ -668,7 +668,7 @@ error: + + int rrd_update( + int argc, +- char **argv) ++ const char **argv) + { + struct optparse_long longopts[] = { + {"template", 't', OPTPARSE_REQUIRED}, +diff --git a/src/rrd_xport.c b/src/rrd_xport.c +index eb814fb..405c9d8 100644 +--- a/src/rrd_xport.c ++++ b/src/rrd_xport.c +@@ -72,7 +72,7 @@ static int rrd_xport_format_addprints( + + int rrd_xport( + int argc, +- char **argv, ++ const char **argv, + int UNUSED(*xsize), + time_t *start, + time_t *end, /* which time frame do you want ? +diff --git a/src/rrdupdate.c b/src/rrdupdate.c +index 340ef5b..6b51530 100644 +--- a/src/rrdupdate.c ++++ b/src/rrdupdate.c +@@ -20,19 +20,20 @@ int main( + int argc, + char **argv) + { ++ const char **cargv = (const char **)argv; + char *name=basename(argv[0]); + rrd_info_t *info; + + if (!strcmp(name, "rrdcreate")) { +- rrd_create(argc, argv); ++ rrd_create(argc, cargv); + } + else if (!strcmp(name, "rrdinfo")) { +- info=rrd_info(argc, argv); ++ info=rrd_info(argc, cargv); + rrd_info_print(info); + rrd_info_free(info); + } + else { +- rrd_update(argc, argv); ++ rrd_update(argc, cargv); + } + + if (rrd_test_error()) { diff --git a/rrdtool-configure-c99.patch b/rrdtool-configure-c99.patch new file mode 100644 index 0000000..127e3e4 --- /dev/null +++ b/rrdtool-configure-c99.patch @@ -0,0 +1,35 @@ +commit f3334fcbde0a77aa48938ba38602bff91c09cf85 +Author: Ryan Schmidt +Date: Sun Mar 20 16:29:10 2022 -0500 + + acinclude.m4: Include 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 ++ AC_TRY_COMPILE([#include ++ #include + #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 ++ AC_TRY_COMPILE([#include ++ #include + #include <$ac_cv_struct_tm> + ], + [struct tm t; diff --git a/rrdtool.spec b/rrdtool.spec index 5f9f9f7..618bebe 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -1,9 +1,3 @@ -%if 0%{?rhel} > 7 -%global with_python2 %{?_without_python2: 0} %{?!_without_python2: 0} -%else -%global with_python2 %{?_without_python2: 0} %{?!_without_python2: 1} -%endif - %global with_python3 %{?_without_python3: 0} %{?!_without_python3: 1} %global with_php %{?_without_php: 0} %{?!_without_php: 0} %global with_tcl %{?_without_tcl: 0} %{?!_without_tcl: 1} @@ -23,12 +17,12 @@ Summary: Round Robin Database Tool to store and display time-series data Name: rrdtool -Version: 1.7.0 -Release: 16%{?dist} -License: GPLv2+ with exceptions -Group: Applications/Databases -URL: http://oss.oetiker.ch/rrdtool/ -Source0: http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz +Version: 1.8.0 +Release: 20%{?dist} +# gd license in php bindings isn't by default built-in +License: gpl-1.0-or-later AND gpl-2.0-or-later AND gpl-2.0-or-later WITH rrdtool-floss-exception-2.0 AND mit AND lgpl-2.0-or-later AND lgpl-2.1-or-later AND bsd-source-code AND snprintf AND bsd-3-clause AND gpl-2.0-only AND licenseref-fedora-public-domain AND gtkbook +URL: https://oss.oetiker.ch/rrdtool/ +Source0: https://github.com/oetiker/rrdtool-1.x/releases/download/v%{version}/%{name}-%{version}.tar.gz Source1: php4-%{svnrev}.tar.gz Patch1: rrdtool-1.4.4-php54.patch # disable logo for php 5.5. @@ -36,23 +30,41 @@ Patch2: rrdtool-1.4.7-php55.patch Patch3: rrdtool-1.6.0-ruby-2-fix.patch # enable php bindings on ppc Patch4: rrdtool-1.4.8-php-ppc-fix.patch -# https://github.com/oetiker/rrdtool-1.x/issues/861 -Patch5: rrdtool-1.7.0-fix-configure-parameters.patch +# Fix BUILD_DATE in rrdtool help output +# https://github.com/oetiker/rrdtool-1.x/commit/e59f703 +Patch5: rrdtool-1.8.0-BUILD_DATE-fix.patch +Patch6: rrdtool-configure-c99.patch +# gcc-14 fix +# https://github.com/oetiker/rrdtool-1.x/commit/b76e3c578f1e9f582e9c28f50d82b1f569602075 +Patch7: rrdtool-1.8.0-const-argv.patch +BuildRequires: make +BuildRequires: gcc-c++ +BuildRequires: freetype-devel +BuildRequires: libpng-devel +BuildRequires: zlib-devel +BuildRequires: intltool >= 0.35.0 +BuildRequires: cairo-devel >= 1.4.6 +BuildRequires: pango-devel >= 1.17 +BuildRequires: libtool +BuildRequires: groff +BuildRequires: gettext +BuildRequires: libxml2-devel +BuildRequires: systemd +BuildRequires: sed +%if %{with_dbi} +BuildRequires: libdbi-devel +%endif +BuildRequires: perl-ExtUtils-MakeMaker +BuildRequires: perl-generators +BuildRequires: perl-Pod-Html +BuildRequires: perl-devel +BuildRequires: automake +BuildRequires: autoconf Requires: dejavu-sans-mono-fonts Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -BuildRequires: gcc-c++, openssl-devel, freetype-devel -BuildRequires: libpng-devel, zlib-devel, intltool >= 0.35.0 -BuildRequires: cairo-devel >= 1.4.6, pango-devel >= 1.17 -BuildRequires: libtool, groff -BuildRequires: gettext, libxml2-devel, systemd -%if %{with_dbi} -BuildRequires: libdbi-devel -%endif -BuildRequires: perl-ExtUtils-MakeMaker, perl-generators, perl-Pod-Html, perl-devel -BuildRequires: automake, autoconf %description RRD is the Acronym for Round Robin Database. RRD is a system to store and @@ -65,7 +77,6 @@ put a friendly user interface on it. %package devel Summary: RRDtool libraries and header files -Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig @@ -76,7 +87,6 @@ server load average). This package allow you to use directly this library. %package doc Summary: RRDtool documentation -Group: Documentation %description doc RRD is the Acronym for Round Robin Database. RRD is a system to store and @@ -85,63 +95,27 @@ server load average). This package contains documentation on using RRD. %package perl Summary: Perl RRDtool bindings -Group: Development/Languages Requires: %{name} = %{version}-%{release} -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Obsoletes: perl-%{name} < %{version}-%{release} Provides: perl-%{name} = %{version}-%{release} %description perl The Perl RRDtool bindings -%if %{with_python2} -# Make sure the runtime python is newer than the build one; -# give a default value to handle parsing in cases when python is not present: -%{!?rrd_python_version: %global rrd_python_version %(%{__python2} -c 'import sys; print sys.version.split(" ")[0]' || echo "3.14")} - -%package -n python2-rrdtool -%{?python_provide:%python_provide python2-rrdtool} -# Remove before F30 -Provides: %{name}-python = %{version}-%{release} -Provides: %{name}-python%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python < %{version}-%{release} -Summary: Python RRDtool bindings -Group: Development/Languages -BuildRequires: python2-devel, python2-setuptools -Requires: python2 >= %{rrd_python_version} -Requires: %{name} = %{version}-%{release} -Obsoletes: python-%{name} < %{version}-%{release} -Provides: python-%{name} = %{version}-%{release} - -%description -n python2-rrdtool -Python RRDtool bindings. -%endif - -%if %{with_python3} -# Make sure the runtime python is newer than the build one; -# give a default value to handle parsing in cases when python is not present: -%{!?rrd_python3_version: %global rrd_python3_version %(%{__python3} -c 'import sys; print(sys.version.split(" ")[0])' || echo "3.14")} %package -n python3-rrdtool %{?python_provide:%python_provide python3-rrdtool} Summary: Python RRDtool bindings -Group: Development/Languages BuildRequires: python3-devel, python3-setuptools +%{?__python3:Requires: %{__python3}} Requires: %{name} = %{version}-%{release} -%if 0%{?rhel} > 7 -Requires: platform-python >= %{rrd_python3_version} -%else -Requires: python3 >= %{rrd_python3_version} -%endif %description -n python3-rrdtool Python RRDtool bindings. -%endif %if %{with_php} %package php Summary: PHP RRDtool bindings -Group: Development/Languages BuildRequires: php-devel >= 4.0 Requires: php >= 4.0 Requires: %{name} = %{version}-%{release} @@ -159,7 +133,6 @@ RRDtool bindings to the PHP HTML-embedded scripting language. %if %{with_tcl} %package tcl Summary: Tcl RRDtool bindings -Group: Development/Languages BuildRequires: tcl-devel >= 8.0 Requires: tcl >= 8.0 Requires: %{name} = %{version}-%{release} @@ -171,11 +144,10 @@ The %{name}-tcl package includes RRDtool bindings for Tcl. %endif %if %{with_ruby} -%{!?ruby_vendorarchdir: %global ruby_vendorarchdir %(ruby -rrbconfig -e 'puts Config::CONFIG["vendorarchdir"]')} +%{!?ruby_vendorarchdir: %global ruby_vendorarchdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"]')} %package ruby Summary: Ruby RRDtool bindings -Group: Development/Languages BuildRequires: ruby, ruby-devel Requires: %{name} = %{version}-%{release} @@ -190,7 +162,6 @@ The %{name}-ruby package includes RRDtool bindings for Ruby. %package lua Summary: Lua RRDtool bindings -Group: Development/Languages BuildRequires: lua, lua-devel %if "%{luaver}" != "" Requires: lua(abi) = %{luaver} @@ -213,7 +184,9 @@ The %{name}-lua package includes RRDtool bindings for Lua. %patch3 -p1 -b .ruby-2-fix %endif %patch4 -p1 -b .php-ppc-fix -%patch5 -p1 -b .fix-configure-parameters +%patch5 -p1 -b .BUILD_DATE-fix +%patch6 -p1 -b .configure-c99 +%patch7 -p1 -b .const-argv # Fix to find correct python dir on lib64 perl -pi -e 's|get_python_lib\(0,0,prefix|get_python_lib\(1,0,prefix|g' \ @@ -231,7 +204,7 @@ perl -pi.orig -e 's|1.299907080300|1.29990708|' \ # # fix config files for php4 bindings # workaround needed due to https://bugzilla.redhat.com/show_bug.cgi?id=211069 -cp -p /usr/lib/rpm/config.{guess,sub} php4/ +cp -p /usr/lib/rpm/redhat/config.{guess,sub} php4/ %build ./bootstrap @@ -244,7 +217,7 @@ cp -p /usr/lib/rpm/config.{guess,sub} php4/ %else --disable-tcl \ %endif -%if %{with_python2} || %{with_python3} +%if %{with_python3} --enable-python \ %else --disable-python \ @@ -280,27 +253,20 @@ perl Makefile.PL INSTALLDIRS=vendor perl -pi.orig -e 's|/lib/perl|/%{_lib}/perl|g' Makefile popd -#{__make} %{?_smp_mflags} -make +%{make_build} # Build the php module, the tmp install is required %if %{with_php} %global rrdtmp %{_tmppath}/%{name}-%{version}-tmpinstall -make install DESTDIR="%{rrdtmp}" +%{__make} install DESTDIR="%{rrdtmp}" pushd php4/ -%if %{with_python2} -export PYTHON=%{__python2} -%endif -%if %{with_python3} export PYTHON=%{__python3} -%endif %configure \ --with-rrdtool="%{rrdtmp}%{_prefix}" \ --disable-static -#{__make} %{?_smp_mflags} -make PYTHON="$PYTHON" +%{make_build} PYTHON="$PYTHON" popd rm -rf %{rrdtmp} %endif @@ -313,22 +279,12 @@ find examples/ -name "*.pl" \ # Rebuild python pushd bindings/python -%if %{with_python2} -%py2_build -%endif -%if %{with_python3} %py3_build -%endif popd %install -%if %{with_python2} -export PYTHON=%{__python2} -%endif -%if %{with_python3} export PYTHON=%{__python3} -%endif -make DESTDIR="$RPM_BUILD_ROOT" PYTHON="$PYTHON" install +%{make_install} PYTHON="$PYTHON" # Install the php module %if %{with_php} @@ -367,12 +323,7 @@ find examples/ -type f -exec chmod 0644 {} \; # Reinstall python pushd bindings/python -%if %{with_python2} -%py2_install -%endif -%if %{with_python3} %py3_install -%endif popd # Clean up the buildroot @@ -414,10 +365,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \ %{_unitdir}/rrdcached.socket %{_datadir}/%{name} %{_mandir}/man1/* +%{_mandir}/man3/lib*.3* %files devel %{_includedir}/*.h -%exclude %{_libdir}/*.la %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc @@ -427,23 +378,15 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \ %files perl %doc doc3/html -%{_mandir}/man3/* +%{_mandir}/man3/*.3pm* %{perl_vendorarch}/*.pm %attr(0755,root,root) %{perl_vendorarch}/auto/RRDs/ -%if %{with_python2} -%files -n python2-rrdtool -%doc bindings/python/COPYING bindings/python/README.md -%{python2_sitearch}/rrdtool.so -%{python2_sitearch}/rrdtool-*.egg-info -%endif -%if %{with_python3} %files -n python3-rrdtool %doc bindings/python/COPYING bindings/python/README.md %{python3_sitearch}/rrdtool*.so %{python3_sitearch}/rrdtool-*.egg-info -%endif %if %{with_php} %files php @@ -468,22 +411,178 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \ %if %{with_lua} %files lua %doc bindings/lua/README -%exclude %{lualibdir}/*.la %{lualibdir}/* %endif %changelog -* Thu Dec 6 2018 Jaroslav Škarvada - 1.7.0-16 -- Rebuilt to fix broken build - Related: rhbz#1636795 +* Tue Oct 29 2024 Troy Dawson - 1.8.0-20 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 -* Wed Dec 5 2018 Jaroslav Škarvada - 1.7.0-15 +* Thu Aug 08 2024 Troy Dawson - 1.8.0-19 +- Bump release for Aug 2024 java mass rebuild + +* Mon Jun 24 2024 Troy Dawson - 1.8.0-18 +- Bump release for June 2024 mass rebuild + +* Mon May 27 2024 Jaroslav Škarvada - 1.8.0-17 +- Added recently approved SPDX exception rrdtool-floss-exception-2.0 + Resolves: RHEL-38985 + +* Wed Jan 24 2024 Jaroslav Škarvada - 1.8.0-16 +- Converted license to SPDX + +* Mon Jan 22 2024 Jaroslav Škarvada - 1.8.0-15 +- Fixed FTBFS with GCC 14 + +* Mon Jan 22 2024 Fedora Release Engineering - 1.8.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jan 03 2024 Mamoru TASAKA - 1.8.0-13 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3 + +* Fri Jul 21 2023 Fedora Release Engineering - 1.8.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 Jitka Plesnikova - 1.8.0-11 +- Perl 5.38 rebuild + +* Tue Jun 13 2023 Python Maint - 1.8.0-10 +- Rebuilt for Python 3.12 + +* Mon Apr 17 2023 Florian Weimer - 1.8.0-9 +- Backport upstream patch to fix C99 issue in configure script + +* Fri Jan 20 2023 Fedora Release Engineering - 1.8.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jan 04 2023 Mamoru TASAKA - 1.8.0-7 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2 + +* Fri Dec 02 2022 Wolfgang Stöggl - 1.8.0-6 +- Fix BUILD_DATE + Add patch: rrdtool-1.8.0-BUILD_DATE-fix.patch + +* Thu Nov 24 2022 FeRD (Frank Dana) - 1.8.0-5 +- Remove excludes for nonexistent .la files +- Fix Ruby directory lookup +- Move librrd(3) man page from -perl subpackage to main package + +* Sat Jul 23 2022 Fedora Release Engineering - 1.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 1.8.0-3 +- Rebuilt for Python 3.11 + +* Wed Jun 01 2022 Jitka Plesnikova - 1.8.0-2 +- Perl 5.36 rebuild + +* Tue Mar 22 2022 Jaroslav Škarvada - 1.8.0-1 +- New version + Resolves: rhbz#2065186 + +* Thu Jan 27 2022 Mamoru TASAKA - 1.7.2-23 +- F-36: rebuild against ruby31 + +* Fri Jan 21 2022 Fedora Release Engineering - 1.7.2-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.7.2-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 1.7.2-20 +- Rebuilt for Python 3.10 + +* Wed May 26 2021 Jaroslav Škarvada - 1.7.2-19 +- Removed rpath from python bindings better way + +* Sat May 22 2021 Jitka Plesnikova - 1.7.2-18 +- Perl 5.34 rebuild + +* Thu May 13 2021 Jaroslav Škarvada - 1.7.2-17 +- Removed rpath from python bindings + +* Wed Jan 27 2021 Fedora Release Engineering - 1.7.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 06 2021 Mamoru TASAKA - 1.7.2-15 +- F-34: rebuild against ruby 3.0 + +* Sat Aug 01 2020 Fedora Release Engineering - 1.7.2-14 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.7.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jul 23 2020 Jaroslav Škarvada - 1.7.2-12 +- Used macros for make + +* Tue Jun 30 2020 Miro Hrončok - 1.7.2-11 +- Rebuilt for Lua 5.4 + +* Thu Jun 25 2020 Jitka Plesnikova - 1.7.2-10 +- Perl 5.32 rebuild + +* Mon Jun 8 2020 Jaroslav Škarvada - 1.7.2-9 +- Fixed FTBFS + Resolves: rhbz#1845126 + +* Tue May 26 2020 Miro Hrončok - 1.7.2-8 +- Rebuilt for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 1.7.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jan 18 2020 Mamoru TASAKA - 1.7.2-6 +- F-32: rebuild against ruby27 + +* Fri Aug 30 2019 Miro Hrončok - 1.7.2-5 +- Subpackage python2-rrdtool has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + +* Mon Aug 19 2019 Miro Hrončok - 1.7.2-4 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 1.7.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Jun 01 2019 Jitka Plesnikova - 1.7.2-2 +- Perl 5.30 rebuild + +* Mon May 27 2019 Jaroslav Škarvada - 1.7.2-1 +- New version + Resolves: rhbz#1714347 +- Dropped compile-fix patch (upstreamed) + +* Tue Feb 5 2019 Jaroslav Škarvada - 1.7.1-1 +- New version + Resolves: rhbz#1672309 +- Dropped fix-configure-parameters patch (upstreamed) + +* Sat Feb 02 2019 Fedora Release Engineering - 1.7.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Jan 21 2019 Mamoru TASAKA - 1.7.0-20 +- F-30: rebuild against ruby26 + +* Wed Dec 5 2018 Jaroslav Škarvada - 1.7.0-19 - Dropped useless Makefile in examples/rrdcached - Resolves: rhbz#1636795 -* Tue Sep 25 2018 Tomas Orsava - 1.7.0-14 -- Require Platform-Python on RHEL -- Resolves: rhbz#1633608 +* Thu Sep 27 2018 Jaroslav Škarvada - 1.7.0-18 +- Introduced python3 change requested by python team + +* Sat Jul 14 2018 Fedora Release Engineering - 1.7.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Jul 04 2018 Petr Pisar - 1.7.0-16 +- Perl 5.28 rebuild + +* Mon Jul 02 2018 Miro Hrončok - 1.7.0-15 +- Rebuilt for Python 3.7 + +* Fri Jun 29 2018 Jitka Plesnikova - 1.7.0-14 +- Perl 5.28 rebuild * Tue Jun 19 2018 Jaroslav Škarvada - 1.7.0-13 - Added support for python3 diff --git a/sources b/sources index a9d11ef..4ad093c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (php4-r1190.tar.gz) = 5fe8f3798abe50553a825ca8358c0d44af389ce5e5ae219c26da70e39f982fce95ad49ef620d03dd4a4a575e7a75d2f569c2013a250f2bcd16c3b2a5322a8eb7 -SHA512 (rrdtool-1.7.0.tar.gz) = 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f +SHA512 (rrdtool-1.8.0.tar.gz) = 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1