Accepting request 1193354 from server:database

OBS-URL: https://build.opensuse.org/request/show/1193354
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rrdtool?expand=0&rev=79

e59f703bbcc0af949ee365206426b6394c340c6f.patch

@@ -1,53 +0,0 @@
-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_

rrdtool-1.9.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e65385e51f4a7c4b42aa09566396c20e7e1a0a30c272d569ed029a81656e56b
+size 2972593

rrdtool-fix_extra_reference.patch

@@ -1,50 +0,0 @@
-From: Martin Jambor <mjambor@suse.cz>
-Date: Fri, 12 Jul 2024 17:02:04 +0200
-Subject: [PATCH] Fix extra reference of parameters of rrd_fetch_dbi_{long,double}
-Upstream: https://github.com/oetiker/rrdtool-1.x/pull/1255
-Refrences: boo#1225919
-
-Functions rrd_fetch_dbi_long and rrd_fetch_dbi_double currently take
-the first parameter of type "bi_result result *" even though that is
-already a pointer and the use of that parameter suggests the extra
-indirection is not wanted.  What is more, the caller passes just
-"bi_result result" to the corresponding actual arguments which results
-in compile errors with GCC 14 because it now does not accept
-incompatible pointer types by default.
----
- src/rrd_fetch_libdbi.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/rrd_fetch_libdbi.c b/src/rrd_fetch_libdbi.c
-index fe02b0d8..e4eccaa5 100644
---- a/src/rrd_fetch_libdbi.c
-+++ b/src/rrd_fetch_libdbi.c
-@@ -26,13 +26,13 @@ static char* _find_next_separator(char* start,char separator);
- static char* _find_next_separator_twice(char*start,char separator);
- static char _hexcharhelper(char c);
- static int _inline_unescape (char* string);
--static double rrd_fetch_dbi_double(dbi_result *result,int idx);
--static long rrd_fetch_dbi_long(dbi_result *result,int idx);
-+static double rrd_fetch_dbi_double(dbi_result result,int idx);
-+static long rrd_fetch_dbi_long(dbi_result result,int idx);
- 
- /* the real code */
- 
- /* helpers to get correctly converted values from DB*/
--static long rrd_fetch_dbi_long(dbi_result *result,int idx) {
-+static long rrd_fetch_dbi_long(dbi_result result,int idx) {
-   char *ptmp="";
-   long value=DNAN;
-   /* get the attributes for this filed */
-@@ -89,7 +89,7 @@ static long rrd_fetch_dbi_long(dbi_result *result,int idx) {
-   return value;
- }
- 
--static double rrd_fetch_dbi_double(dbi_result *result,int idx) {
-+static double rrd_fetch_dbi_double(dbi_result result,int idx) {
-   char *ptmp="";
-   double value=DNAN;
-   /* get the attributes for this filed */
--- 
-2.45.2
-

rrdtool.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Aug  8 16:56:07 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
+
+- Update to 1.9.0:
+  * For the list of changes, please have a look here:
+    https://github.com/oetiker/rrdtool-1.x/blob/v1.9.0/CHANGES
+- Removed upstreamed patches:
+  * e59f703bbcc0af949ee365206426b6394c340c6f.patch
+  * rrdtool-1.8.0-gcc14.patch
+  * rrdtool-fix_extra_reference.patch
+
 -------------------------------------------------------------------
 Mon Jul 29 07:19:23 UTC 2024 - Martin Pluskal <mpluskal@suse.com>
 

rrdtool.spec

@@ -32,7 +32,7 @@
 %bcond_without  libwrap
 %bcond_with     rados
 Name:           rrdtool
-Version:        1.8.0
+Version:        1.9.0
 Release:        0
 Summary:        Round Robin Database Tool to store and display time-series data
 License:        GPL-2.0-or-later AND LGPL-2.0-or-later
@@ -43,19 +43,13 @@ Source2:        sysconfig.rrdcached
 Source4:        rrdcached-systemd-pre
 Source5:        rrdcached.service
 Source99:       %{name}.changes
-# PATCH-FIX-UPSTREAM -- Fix BUILD_DATE in rrdtool help output (fix segfault)
-# https://github.com/oetiker/rrdtool-1.x/commit/e59f703bbcc0af949ee365206426b6394c340c6f.patch
-Patch1:         e59f703bbcc0af949ee365206426b6394c340c6f.patch
-## PATCH-FIX-UPTREAM -- https://github.com/oetiker/rrdtool-1.x/pull/1242
-Patch2:         rrdtool-1.8.0-gcc14.patch
 # PATCH-FIX-UPTREAM -- Prevent possible segfault
 ## this patch against rrdtool-1.4.5 dates from 2011, seems unneccessary today,
 ## never appeared upstream, and it does no longer apply
 ##Patch3:         rrdtool-tclsegfault.patch
 # PATCH-FIX-UPSTREAM -- bnc#793636
-Patch12:        rrdtool-zero_vs_nothing.patch
+Patch1:         rrdtool-zero_vs_nothing.patch
-Patch14:        harden_rrdcached.service.patch
+Patch2:         harden_rrdcached.service.patch
-Patch15:        rrdtool-fix_extra_reference.patch
 # Needed for tests
 BuildRequires:  bc
 BuildRequires:  cairo-devel >= 1.2