From c93b482e17b063d2e1f736c0d82f243c913f886371c61d08e3445d99e9f0c98d Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Wed, 13 Apr 2022 12:43:12 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/server:database/rrdtool?expand=0&rev=1 --- ...703bbcc0af949ee365206426b6394c340c6f.patch | 53 ------------------- rrdtool.changes | 6 --- rrdtool.spec | 3 -- 3 files changed, 62 deletions(-) delete mode 100644 e59f703bbcc0af949ee365206426b6394c340c6f.patch diff --git a/e59f703bbcc0af949ee365206426b6394c340c6f.patch b/e59f703bbcc0af949ee365206426b6394c340c6f.patch deleted file mode 100644 index 534716e..0000000 --- a/e59f703bbcc0af949ee365206426b6394c340c6f.patch +++ /dev/null @@ -1,53 +0,0 @@ -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.changes b/rrdtool.changes index df5b32b..9b55f4d 100644 --- a/rrdtool.changes +++ b/rrdtool.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Wed Apr 13 08:27:59 UTC 2022 - Guillaume GARDET - -- Add patch to fix segfault (seen in %check on aarch64): - * e59f703bbcc0af949ee365206426b6394c340c6f.patch - ------------------------------------------------------------------- Tue Mar 29 13:41:16 UTC 2022 - Danilo Spinella diff --git a/rrdtool.spec b/rrdtool.spec index 53fce5b..1f7ff27 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -43,8 +43,6 @@ 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) -Patch1: https://github.com/oetiker/rrdtool-1.x/commit/e59f703bbcc0af949ee365206426b6394c340c6f.patch # PATCH-FIX-UPSTREAM -- Prevent possible segfault Patch3: rrdtool-tclsegfault.patch # PATCH-FIX-UPSTREAM -- bnc#793636 @@ -214,7 +212,6 @@ daemon was written to alleviate these problems. %prep %setup -q -%patch1 -p1 %patch3 %patch12 -p1 %patch14 -p1 From 90d7ff58e66ee6e3b2306f05a4f9de9e9fd038bdbd5af0bc4b94f92ee01ea9e0 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Wed, 13 Apr 2022 13:42:45 +0000 Subject: [PATCH 2/4] Accepting request 969881 from devel:languages:python - Add patch to fix segfault (seen in %check on aarch64): * e59f703bbcc0af949ee365206426b6394c340c6f.patch OBS-URL: https://build.opensuse.org/request/show/969881 OBS-URL: https://build.opensuse.org/package/show/server:database/rrdtool?expand=0&rev=2 --- ...703bbcc0af949ee365206426b6394c340c6f.patch | 53 +++++++++++++++++++ rrdtool.changes | 6 +++ rrdtool.spec | 3 ++ 3 files changed, 62 insertions(+) create mode 100644 e59f703bbcc0af949ee365206426b6394c340c6f.patch diff --git a/e59f703bbcc0af949ee365206426b6394c340c6f.patch b/e59f703bbcc0af949ee365206426b6394c340c6f.patch new file mode 100644 index 0000000..534716e --- /dev/null +++ b/e59f703bbcc0af949ee365206426b6394c340c6f.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.changes b/rrdtool.changes index 9b55f4d..df5b32b 100644 --- a/rrdtool.changes +++ b/rrdtool.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 13 08:27:59 UTC 2022 - Guillaume GARDET + +- Add patch to fix segfault (seen in %check on aarch64): + * e59f703bbcc0af949ee365206426b6394c340c6f.patch + ------------------------------------------------------------------- Tue Mar 29 13:41:16 UTC 2022 - Danilo Spinella diff --git a/rrdtool.spec b/rrdtool.spec index 1f7ff27..53fce5b 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -43,6 +43,8 @@ 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) +Patch1: https://github.com/oetiker/rrdtool-1.x/commit/e59f703bbcc0af949ee365206426b6394c340c6f.patch # PATCH-FIX-UPSTREAM -- Prevent possible segfault Patch3: rrdtool-tclsegfault.patch # PATCH-FIX-UPSTREAM -- bnc#793636 @@ -212,6 +214,7 @@ daemon was written to alleviate these problems. %prep %setup -q +%patch1 -p1 %patch3 %patch12 -p1 %patch14 -p1 From e3053613d5e76509de87dc0d56d5f3f642c3b23cf4ea07ced94da582676dcc97 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 22 Mar 2023 08:32:21 +0000 Subject: [PATCH 3/4] Accepting request 1073636 from home:iznogood:factory - Follow upstream, disable the following, failing tests: rpn1 https://github.com/oetiker/rrdtool-1.x/blob/master/.travis.yml#L30 OBS-URL: https://build.opensuse.org/request/show/1073636 OBS-URL: https://build.opensuse.org/package/show/server:database/rrdtool?expand=0&rev=3 --- rrdtool.changes | 6 ++++++ rrdtool.spec | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/rrdtool.changes b/rrdtool.changes index df5b32b..bbb40ef 100644 --- a/rrdtool.changes +++ b/rrdtool.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 21 18:55:20 UTC 2023 - Bjørn Lie + +- Follow upstream, disable the following, failing tests: rpn1 + https://github.com/oetiker/rrdtool-1.x/blob/master/.travis.yml#L30 + ------------------------------------------------------------------- Wed Apr 13 08:27:59 UTC 2022 - Guillaume GARDET diff --git a/rrdtool.spec b/rrdtool.spec index 53fce5b..5f3c5dc 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -316,7 +316,12 @@ mkdir -p %{buildroot}%{_sbindir} ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcrrdcached %check -make %{?_smp_mflags} 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 \ +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" %pre cached getent group %{rrdcached_group} >/dev/null || groupadd %{rrdcached_group} From 8fa839f676a4ab554367d17b2262a43b4536980d310f2822f04ca43eb09f9c86 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Wed, 22 Mar 2023 12:57:53 +0000 Subject: [PATCH 4/4] - Decouple e59f703bbcc0af949ee365206426b6394c340c6f.patch from github url OBS-URL: https://build.opensuse.org/package/show/server:database/rrdtool?expand=0&rev=4 --- rrdtool.changes | 6 ++++++ rrdtool.spec | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/rrdtool.changes b/rrdtool.changes index bbb40ef..463a5e4 100644 --- a/rrdtool.changes +++ b/rrdtool.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 22 12:56:56 UTC 2023 - Adam Majer + +- Decouple e59f703bbcc0af949ee365206426b6394c340c6f.patch from + github url + ------------------------------------------------------------------- Tue Mar 21 18:55:20 UTC 2023 - Bjørn Lie diff --git a/rrdtool.spec b/rrdtool.spec index 5f3c5dc..7ed9169 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -1,7 +1,7 @@ # # spec file for package rrdtool # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -44,7 +44,8 @@ Source4: rrdcached-systemd-pre Source5: rrdcached.service Source99: %{name}.changes # PATCH-FIX-UPSTREAM -- Fix BUILD_DATE in rrdtool help output (fix segfault) -Patch1: https://github.com/oetiker/rrdtool-1.x/commit/e59f703bbcc0af949ee365206426b6394c340c6f.patch +# 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-UPSTREAM -- bnc#793636