package/rrdtool: bump version to 1.9.0
For release note, see: https://github.com/oetiker/rrdtool-1.x/releases/tag/v1.9.0 The commit also removes the package patches which are included in this version. Signed-off-by: Julien Olivain <ju.o@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
c4a88263bd
commit
23ea1c3317
4 changed files with 2 additions and 1645 deletions
|
|
@ -1,57 +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
|
||||
|
||||
Upstream: https://github.com/oetiker/rrdtool-1.x/commit/e59f703bbcc0af949ee365206426b6394c340c6f
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
src/rrd_tool.c | 8 ++++++++
|
||||
2 files changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 4d2345855..5169b0d49 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 930d08272..cc6119d9a 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_
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,4 +1,4 @@
|
|||
# Locally calculated
|
||||
sha256 bd37614137d7a8dc523359648eb2a81631a34fd91a82ed5581916a52c08433f4 rrdtool-1.8.0.tar.gz
|
||||
sha256 5e65385e51f4a7c4b42aa09566396c20e7e1a0a30c272d569ed029a81656e56b rrdtool-1.9.0.tar.gz
|
||||
sha256 ab6b4646e9e01f1ec287c29c351c886c4cb7f945c11efc0a1be9f6e5e6cc5320 COPYRIGHT
|
||||
sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 LICENSE
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
RRDTOOL_VERSION = 1.8.0
|
||||
RRDTOOL_VERSION = 1.9.0
|
||||
RRDTOOL_SITE = https://github.com/oetiker/rrdtool-1.x/releases/download/v$(RRDTOOL_VERSION)
|
||||
RRDTOOL_LICENSE = GPL-2.0+ with FLOSS license exceptions as explained in COPYRIGHT
|
||||
RRDTOOL_LICENSE_FILES = COPYRIGHT LICENSE
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue