diff --git a/rrdtool-configure-c99.patch b/rrdtool-configure-c99.patch new file mode 100644 index 0000000000000000000000000000000000000000..127e3e44abd8d801bd526d2bb423c6e668b0b844 --- /dev/null +++ b/rrdtool-configure-c99.patch @@ -0,0 +1,35 @@ +commit f3334fcbde0a77aa48938ba38602bff91c09cf85 +Author: Ryan Schmidt +Date: Sun Mar 20 16:29:10 2022 -0500 + + acinclude.m4: Include 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 ++ AC_TRY_COMPILE([#include ++ #include + #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 ++ AC_TRY_COMPILE([#include ++ #include + #include <$ac_cv_struct_tm> + ], + [struct tm t; diff --git a/rrdtool.spec b/rrdtool.spec index 93b7bc42d930b1f1dd6c97b6810f88db11c78e4e..c94eb05d001e8e59e61fdc1b5d6ec985b916275c 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -1,4 +1,4 @@ -%define anolis_release 4 +%define anolis_release 5 %global with_python3 %{?_without_python3: 0} %{?!_without_python3: 1} %global with_php %{?_without_php: 0} %{?!_without_php: 0} @@ -19,12 +19,12 @@ Summary: Round Robin Database Tool to store and display time-series data Name: rrdtool -Version: 1.8.0 +Version: 1.8.0 Release: %{anolis_release}%{?dist} License: GPLv2+ with exceptions URL: https://oss.oetiker.ch/rrdtool/ -Source0: https://github.com/oetiker/rrdtool-1.x/releases/download/v%{version}/%{name}-%{version}.tar.gz -Source1: php4-%{svnrev}.tar.gz +Source0: https://github.com/oetiker/rrdtool-1.x/releases/download/v1.8.0/rrdtool-1.8.0.tar.gz +Source1: php4-r1190.tar.gz Patch1: rrdtool-1.4.4-php54.patch # disable logo for php 5.5. Patch2: rrdtool-1.4.7-php55.patch @@ -34,6 +34,7 @@ Patch4: rrdtool-1.4.8-php-ppc-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 BuildRequires: make BuildRequires: gcc-c++ @@ -416,6 +417,8 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \ %endif %changelog +* Mon Nov 17 2025 wenyuzifang - 1.8.0-5 +- Fix compilation errors on strict compilers by ensuring proper declaration of exit(). * Tue Apr 01 2025 Xiaoping Liu - 1.8.0-4 - Rebuild with new ruby