diff --git a/Fix_the_difference_at_the_macro_definition_using_clock_gettime_instead_of_gettimeofda.patch b/Fix_the_difference_at_the_macro_definition_using_clock_gettime_instead_of_gettimeofda.patch new file mode 100644 index 0000000000000000000000000000000000000000..de4837fb6a50a71364bc20ad295a08de33b61825 --- /dev/null +++ b/Fix_the_difference_at_the_macro_definition_using_clock_gettime_instead_of_gettimeofda.patch @@ -0,0 +1,30 @@ +From 33bf90331b48c7378316c141e5e9acb2862dd0ac Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Witold=20Kr=C4=99cicki?= +Date: Sun, 9 Dec 2018 00:41:21 +0100 +Subject: [PATCH] use clock_gettime() instead of gettimeofday() for isc_itme + functions + +--- + lib/isc/unix/time.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/lib/isc/unix/time.c b/lib/isc/unix/time.c +index 9828250..c2ae60e 100644 +--- a/lib/isc/unix/time.c ++++ b/lib/isc/unix/time.c +@@ -38,7 +38,11 @@ + #define NS_PER_MS 1000000 /*%< Nanoseconds per millisecond. */ + #define US_PER_S 1000000 /*%< Microseconds per second. */ + +-#define CLOCKSOURCE CLOCK_MONOTONIC ++#ifdef CLOCK_REALTIME_COARSE ++#define CLOCKSOURCE CLOCK_REALTIME_COARSE ++#else ++#define CLOCKSOURCE CLOCK_REALTIME ++#endif + + /*% + *** Intervals +-- +2.23.0 + diff --git a/bind.spec b/bind.spec index 5ee401d9821b5fd51ba00b494a7ecfe88ccbc110..fa9e04d9e3598f186427035cef78ef93579472ef 100644 --- a/bind.spec +++ b/bind.spec @@ -19,7 +19,7 @@ Name: bind Summary: Domain Name System (DNS) Server (named) License: MPLv2.0 Version: 9.11.21 -Release: 5 +Release: 6 Epoch: 32 Url: https://www.isc.org/downloads/bind/ Source0: https://ftp.isc.org/isc/bind9/9.11.21/bind-%{version}.tar.gz @@ -160,7 +160,7 @@ Patch190: Use-clock_gettime-instead-of-gettimeofday.patch Patch191: CVE-2020-8622.patch Patch192: CVE-2020-8623.patch Patch193: CVE-2020-8624.patch - +Patch194: Fix_the_difference_at_the_macro_definition_using_clock_gettime_instead_of_gettimeofda.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch Patch12: bind-9.10-sdb.patch @@ -363,6 +363,7 @@ are used for building ISC DHCP. %patch191 -p1 %patch192 -p1 %patch193 -p1 +%patch194 -p1 mkdir lib/dns/tests/testdata/dstrandom cp -a %{SOURCE29} lib/dns/tests/testdata/dstrandom/random.data @@ -1170,6 +1171,12 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed Dec 9 2020 hanzhijun - 9.11.21-6 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Fix the difference at the macro definition using clock gettime instead of gettimeofda + * Tue Dec 15 2020 xihaochen - 9.11.21-5 - Type:requirement - ID:NA