7 changed files with 1720 additions and 48 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
 SOURCES/php4-r1190.tar.gz
-SOURCES/rrdtool-1.7.2.tar.gz
+SOURCES/rrdtool-1.8.0.tar.gz
--- a/.rrdtool.metadata
+++ b/.rrdtool.metadata
@ -1,2 +1,2 @@
 215b1e335313edb4b7462368d5341502d7824652 SOURCES/php4-r1190.tar.gz
-f0e54258b0f871099623e3a866751928abbb47af SOURCES/rrdtool-1.7.2.tar.gz
+4da6da5e2f789d006c1ccc3b816a5a1ac9123bc8 SOURCES/rrdtool-1.8.0.tar.gz
--- a/SOURCES/rrdtool-1.7.2-python-rpath-fix.patch
+++ b/SOURCES/rrdtool-1.7.2-python-rpath-fix.patch
@ -1,12 +0,0 @@
-diff --git a/bindings/Makefile.am b/bindings/Makefile.am
-index 3632b3c..cd1df6a 100644
--- a/bindings/Makefile.am
-+++ b/bindings/Makefile.am
-@@ -69,7 +69,6 @@ python:
-           && env \
-                ABS_TOP_SRCDIR=${abs_top_srcdir} \
-                ABS_TOP_BUILDDIR=${abs_top_builddir} \
-               LD_RUN_PATH=$(libdir) \
-                $(PYTHON) ${abs_srcdir}/$@/setup.py build_ext $(PYTHON_RPATH) \
-           && env \
-                ABS_TOP_SRCDIR=${abs_top_srcdir} \
--- a/SOURCES/rrdtool-1.8.0-BUILD_DATE-fix.patch
+++ b/SOURCES/rrdtool-1.8.0-BUILD_DATE-fix.patch
@ -0,0 +1,53 @@
+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_
--- a/SOURCES/rrdtool-1.8.0-const-argv.patch
+++ b/SOURCES/rrdtool-1.8.0-const-argv.patch
--- a/SOURCES/rrdtool-configure-c99.patch
+++ b/SOURCES/rrdtool-configure-c99.patch
@ -0,0 +1,35 @@
+commit f3334fcbde0a77aa48938ba38602bff91c09cf85
+Author: Ryan Schmidt <git@ryandesign.com>
+Date:   Sun Mar 20 16:29:10 2022 -0500
+
+    acinclude.m4: Include <stdlib.h> when using exit
+    
+    Fixes:
+    
+    conftest.c:124:33: error: implicitly declaring library function 'exit'
+    with type 'void (int) __attribute__((noreturn))'
+
+diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
+index d9d9eb25..0d6fbf5d 100644
+--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
+@@ -582,7 +582,8 @@ AC_DEFUN([GC_TIMEZONE], [
+         AC_REQUIRE([AC_STRUCT_TM])
+         AC_CACHE_CHECK([tm_gmtoff in struct tm], gq_cv_have_tm_gmtoff,
+                 gq_cv_have_tm_gmtoff=no
+-                AC_TRY_COMPILE([#include <time.h>
+                AC_TRY_COMPILE([#include <stdlib.h>
+                                #include <time.h>
+                                 #include <$ac_cv_struct_tm>
+                                 ],
+                                [struct tm t;
+@@ -595,7 +596,8 @@ AC_DEFUN([GC_TIMEZONE], [
+ 
+         AC_CACHE_CHECK([__tm_gmtoff in struct tm], gq_cv_have___tm_gmtoff,
+                 gq_cv_have___tm_gmtoff=no
+-                AC_TRY_COMPILE([#include <time.h>
+                AC_TRY_COMPILE([#include <stdlib.h>
+                                #include <time.h>
+                                 #include <$ac_cv_struct_tm>
+                                 ],
+                                [struct tm t;
--- a/SPECS/rrdtool.spec
+++ b/SPECS/rrdtool.spec
@ -17,11 +17,12 @@

 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.7.2
-Release: 21%{?dist}
-License: GPLv2+ with exceptions
+Version: 1.8.0
+Release: 20%{?dist}
+# gd license in php bindings isn't by default built-in
+License: gpl-1.0-or-later AND gpl-2.0-or-later AND gpl-2.0-or-later WITH rrdtool-floss-exception-2.0 AND mit AND lgpl-2.0-or-later AND lgpl-2.1-or-later AND bsd-source-code AND snprintf AND bsd-3-clause AND gpl-2.0-only AND licenseref-fedora-public-domain AND gtkbook
 URL: https://oss.oetiker.ch/rrdtool/
-Source0: https://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
+Source0: https://github.com/oetiker/rrdtool-1.x/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Source1: php4-%{svnrev}.tar.gz
 Patch1: rrdtool-1.4.4-php54.patch
 # disable logo for php 5.5.
@ -29,23 +30,41 @@ Patch2: rrdtool-1.4.7-php55.patch
 Patch3: rrdtool-1.6.0-ruby-2-fix.patch
 # enable php bindings on ppc
 Patch4: rrdtool-1.4.8-php-ppc-fix.patch
-Patch5: rrdtool-1.7.2-python-rpath-fix.patch
+# Fix BUILD_DATE in rrdtool help output
+# https://github.com/oetiker/rrdtool-1.x/commit/e59f703
+Patch5: rrdtool-1.8.0-BUILD_DATE-fix.patch
+Patch6: rrdtool-configure-c99.patch
+# gcc-14 fix
+# https://github.com/oetiker/rrdtool-1.x/commit/b76e3c578f1e9f582e9c28f50d82b1f569602075
+Patch7: rrdtool-1.8.0-const-argv.patch

-Requires: dejavu-sans-mono-fonts
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
 BuildRequires: make
-BuildRequires: gcc-c++, openssl-devel, freetype-devel
-BuildRequires: libpng-devel, zlib-devel, intltool >= 0.35.0
-BuildRequires: cairo-devel >= 1.4.6, pango-devel >= 1.17
-BuildRequires: libtool, groff
-BuildRequires: gettext, libxml2-devel, systemd, sed
+BuildRequires: gcc-c++
+BuildRequires: freetype-devel
+BuildRequires: libpng-devel
+BuildRequires: zlib-devel
+BuildRequires: intltool >= 0.35.0
+BuildRequires: cairo-devel >= 1.4.6
+BuildRequires: pango-devel >= 1.17
+BuildRequires: libtool
+BuildRequires: groff
+BuildRequires: gettext
+BuildRequires: libxml2-devel
+BuildRequires: systemd
+BuildRequires: sed
 %if %{with_dbi}
 BuildRequires: libdbi-devel
 %endif
-BuildRequires: perl-ExtUtils-MakeMaker, perl-generators, perl-Pod-Html, perl-devel
-BuildRequires: automake, autoconf
+BuildRequires: perl-ExtUtils-MakeMaker
+BuildRequires: perl-generators
+BuildRequires: perl-Pod-Html
+BuildRequires: perl-devel
+BuildRequires: automake
+BuildRequires: autoconf
+Requires: dejavu-sans-mono-fonts
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd

 %description
 RRD is the Acronym for Round Robin Database. RRD is a system to store and
@ -77,7 +96,6 @@ server load average). This package contains documentation on using RRD.
 %package perl
 Summary: Perl RRDtool bindings
 Requires: %{name} = %{version}-%{release}
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Obsoletes: perl-%{name} < %{version}-%{release}
 Provides: perl-%{name} = %{version}-%{release}

@ -126,7 +144,7 @@ The %{name}-tcl package includes RRDtool bindings for Tcl.
 %endif

 %if %{with_ruby}
-%{!?ruby_vendorarchdir: %global ruby_vendorarchdir %(ruby -rrbconfig -e 'puts Config::CONFIG["vendorarchdir"]')}
+%{!?ruby_vendorarchdir: %global ruby_vendorarchdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"]')}

 %package ruby
 Summary: Ruby RRDtool bindings
@ -166,7 +184,9 @@ The %{name}-lua package includes RRDtool bindings for Lua.
 %patch3 -p1 -b .ruby-2-fix
 %endif
 %patch4 -p1 -b .php-ppc-fix
-%patch5 -p1 -b .python-rpath-fix
+%patch5 -p1 -b .BUILD_DATE-fix
+%patch6 -p1 -b .configure-c99
+%patch7 -p1 -b .const-argv

 # Fix to find correct python dir on lib64
 perl -pi -e 's|get_python_lib\(0,0,prefix|get_python_lib\(1,0,prefix|g' \
@ -345,10 +365,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
 %{_unitdir}/rrdcached.socket
 %{_datadir}/%{name}
 %{_mandir}/man1/*
+%{_mandir}/man3/lib*.3*

 %files devel
 %{_includedir}/*.h
-%exclude %{_libdir}/*.la
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc

@ -358,7 +378,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \

 %files perl
 %doc doc3/html
-%{_mandir}/man3/*
+%{_mandir}/man3/*.3pm*
 %{perl_vendorarch}/*.pm
 %attr(0755,root,root) %{perl_vendorarch}/auto/RRDs/

@ -391,29 +411,96 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
 %if %{with_lua}
 %files lua
 %doc bindings/lua/README
-%exclude %{lualibdir}/*.la
 %{lualibdir}/*
 %endif

 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.7.2-21
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.8.0-20
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Thu Aug 08 2024 Troy Dawson <tdawson@redhat.com> - 1.8.0-19
+- Bump release for Aug 2024 java mass rebuild
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.8.0-18
+- Bump release for June 2024 mass rebuild
+
+* Mon May 27 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 1.8.0-17
+- Added recently approved SPDX exception rrdtool-floss-exception-2.0
+  Resolves: RHEL-38985
+
+* Wed Jan 24 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 1.8.0-16
+- Converted license to SPDX
+
+* Mon Jan 22 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 1.8.0-15
+- Fixed FTBFS with GCC 14
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jan 03 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.8.0-13
+- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jul 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 1.8.0-11
+- Perl 5.38 rebuild

-* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 1.7.2-20
- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 1.8.0-10
+- Rebuilt for Python 3.12
+
+* Mon Apr 17 2023 Florian Weimer <fweimer@redhat.com> - 1.8.0-9
+- Backport upstream patch to fix C99 issue in configure script
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Jan 04 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.8.0-7
+- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2
+
+* Fri Dec 02 2022 Wolfgang Stöggl <c72578@yahoo.de> - 1.8.0-6
+- Fix BUILD_DATE
+  Add patch: rrdtool-1.8.0-BUILD_DATE-fix.patch
+
+* Thu Nov 24 2022 FeRD (Frank Dana) <ferdnyc@gmail.com> - 1.8.0-5
+- Remove excludes for nonexistent .la files
+- Fix Ruby directory lookup
+- Move librrd(3) man page from -perl subpackage to main package
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.8.0-3
+- Rebuilt for Python 3.11
+
+* Wed Jun 01 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.8.0-2
+- Perl 5.36 rebuild
+
+* Tue Mar 22 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 1.8.0-1
+- New version
+  Resolves: rhbz#2065186
+
+* Thu Jan 27 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.7.2-23
+- F-36: rebuild against ruby31
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.2-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.2-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.7.2-20
+- Rebuilt for Python 3.10

 * Wed May 26 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 1.7.2-19
 - Removed rpath from python bindings better way
-  Related: rhbz#1960385

-* Wed May 26 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 1.7.2-18
- Removed rpath from python bindings
-  Resolves: rhbz#1960385
+* Sat May 22 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.2-18
+- Perl 5.34 rebuild

-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.7.2-17
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Thu May 13 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 1.7.2-17
+- Removed rpath from python bindings

 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.2-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild