Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rrdtool for openSUSE:Factory checked
in at 2022-04-16 00:13:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
and /work/SRC/openSUSE:Factory/.rrdtool.new.1941 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rrdtool"
Sat Apr 16 00:13:55 2022 rev:75 rq:969763 version:1.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes 2022-04-02
18:20:47.362107524 +0200
+++ /work/SRC/openSUSE:Factory/.rrdtool.new.1941/rrdtool.changes
2022-04-16 00:14:12.245645483 +0200
@@ -1,0 +2,6 @@
+Wed Apr 13 08:27:59 UTC 2022 - Guillaume GARDET <guillaume.gar...@opensuse.org>
+
+- Add patch to fix segfault (seen in %check on aarch64):
+ * e59f703bbcc0af949ee365206426b6394c340c6f.patch
+
+-------------------------------------------------------------------
New:
----
e59f703bbcc0af949ee365206426b6394c340c6f.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rrdtool.spec ++++++
--- /var/tmp/diff_new_pack.B1gIzI/_old 2022-04-16 00:14:12.865646311 +0200
+++ /var/tmp/diff_new_pack.B1gIzI/_new 2022-04-16 00:14:12.869646316 +0200
@@ -43,6 +43,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
# PATCH-FIX-UPSTREAM -- Prevent possible segfault
Patch3: rrdtool-tclsegfault.patch
# PATCH-FIX-UPSTREAM -- bnc#793636
@@ -212,6 +214,7 @@
%prep
%setup -q
+%patch1 -p1
%patch3
%patch12 -p1
%patch14 -p1
++++++ e59f703bbcc0af949ee365206426b6394c340c6f.patch ++++++
>From e59f703bbcc0af949ee365206426b6394c340c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= <c72...@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 <t...@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 <t...@oetiker.ch>\n"
" Compiled %s %s\n\n"
"Usage: rrdtool [options] command command_options\n");
+#endif
const char *help_list =
N_
