Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rrdtool for openSUSE:Factory checked in at 2024-07-30 11:53:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rrdtool (Old) and /work/SRC/openSUSE:Factory/.rrdtool.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rrdtool" Tue Jul 30 11:53:39 2024 rev:78 rq:1190169 version:1.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes 2023-12-26 18:27:11.493231750 +0100 +++ /work/SRC/openSUSE:Factory/.rrdtool.new.1882/rrdtool.changes 2024-07-30 11:53:55.624222430 +0200 @@ -1,0 +2,20 @@ +Mon Jul 29 07:19:23 UTC 2024 - Martin Pluskal <mplus...@suse.com> + +- Remove disabled patch rrdtool-tclsegfault.patch +- Small spec file modernisation + +------------------------------------------------------------------- +Fri Jul 12 15:12:22 UTC 2024 - Martin Jambor <mjam...@suse.com> + +- Added rrdtool-fix_extra_reference.patch to fix pointer type + incompatibility and allow the package to be built with GCC 14 + without explicitely demoting errors to warnings. [boo#1225919] + +------------------------------------------------------------------- +Fri Jul 5 20:30:43 UTC 2024 - Friedrich Haubensak <hs...@mail.de> + +- add rrdtool-1.8.0-gcc14.patch from upstream to fix build with + gcc-14 +- disable rrdtool-tclsegfault.patch, does not apply and seems + unneccessary +------------------------------------------------------------------- Old: ---- rrdtool-tclsegfault.patch New: ---- rrdtool-1.8.0-gcc14.patch rrdtool-fix_extra_reference.patch BETA DEBUG BEGIN: Old: - Remove disabled patch rrdtool-tclsegfault.patch - Small spec file modernisation BETA DEBUG END: BETA DEBUG BEGIN: New: - add rrdtool-1.8.0-gcc14.patch from upstream to fix build with gcc-14 New: - Added rrdtool-fix_extra_reference.patch to fix pointer type incompatibility and allow the package to be built with GCC 14 BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rrdtool.spec ++++++ --- /var/tmp/diff_new_pack.2wmbZI/_old 2024-07-30 11:53:56.292249382 +0200 +++ /var/tmp/diff_new_pack.2wmbZI/_new 2024-07-30 11:53:56.292249382 +0200 @@ -1,7 +1,7 @@ # # spec file for package rrdtool # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -46,11 +46,16 @@ # 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-UPSTREAM -- Prevent possible segfault -Patch3: rrdtool-tclsegfault.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 Patch14: harden_rrdcached.service.patch +Patch15: rrdtool-fix_extra_reference.patch # Needed for tests BuildRequires: bc BuildRequires: cairo-devel >= 1.2 @@ -267,7 +272,7 @@ --with-gnu-ld \ --with-systemdsystemunitdir=%{_unitdir} -make %{?_smp_mflags} +%make_build %install make \ @@ -315,7 +320,7 @@ %check # Follow upstream, disable the following, failing tests: rpn1 # https://github.com/oetiker/rrdtool-1.x/blob/master/.travis.yml#L30 -make %{?_smp_mflags} check TESTS="modify1 modify2 modify3 modify4 modify5 rpn2 xport1 \ +%make_build check TESTS="modify1 modify2 modify3 modify4 modify5 rpn2 xport1 \ tune1 tune2 graph1 rrdcreate dump-restore create-with-source-1 create-with-source-2 \ create-with-source-3 create-with-source-4 create-with-source-and-mapping-1 \ create-from-template-1 dcounter1 vformatter1 list1 pdp-calc1" ++++++ rrdtool-1.8.0-gcc14.patch ++++++ ++++ 1587 lines (skipped) ++++++ rrdtool-fix_extra_reference.patch ++++++ From: Martin Jambor <mjam...@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
