From 75767c74fb96c321bfcf3eb7d126c256a39fe87b Mon Sep 17 00:00:00 2001 From: netniV Date: Thu, 14 Feb 2019 09:54:57 +0000 Subject: [PATCH 1/3] Rename 'until' variable as gcc 8.0 complains about it --- spine.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spine.c b/spine.c index 03edcb98..bb7c45a1 100644 --- a/spine.c +++ b/spine.c @@ -198,7 +198,7 @@ int main(int argc, char *argv[]) { int device_threads; sem_t thread_init_sem; int a_threads_value; - struct timespec until; + struct timespec until_spec; #ifdef HAVE_LCAP if (geteuid() == 0) { @@ -660,8 +660,8 @@ int main(int argc, char *argv[]) { sem_init(&thread_init_sem, 0, 1); /* specify the point of timeout for timedwait semaphores */ - until.tv_sec = (time_t)(set.poller_interval + begin_time - 0.2); - until.tv_nsec = 0; + until_spec.tv_sec = (time_t)(set.poller_interval + begin_time - 0.2); + until_spec.tv_nsec = 0; sem_getvalue(&active_threads, &a_threads_value); SPINE_LOG_MEDIUM(("DEBUG: Initial Value of Active Threads is %i", set.threads - a_threads_value)); @@ -742,7 +742,7 @@ int main(int argc, char *argv[]) { retry1: - if (sem_timedwait(&active_threads, &until) == -1) { + if (sem_timedwait(&active_threads, &until_spec) == -1) { if (errno == ETIMEDOUT) { SPINE_LOG(("ERROR: Spine Timed Out While Processing Devices Internal")); canexit = TRUE; From 5390e2020b4ae2f36ad2ac76b3cf895d3bd3eb77 Mon Sep 17 00:00:00 2001 From: netniV Date: Sun, 24 Feb 2019 13:39:20 +0000 Subject: [PATCH 2/3] Update CHANGELOG --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 39eaca89..24c69ccc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,8 @@ The Cacti Group | spine +1.2.2 +-feature: release to match Cacti release + 1.2.1 -feature: release to match Cacti release From 86a8c13a4ae0d5553d1a3adc59011495f68030a4 Mon Sep 17 00:00:00 2001 From: netniV Date: Sun, 24 Feb 2019 13:40:35 +0000 Subject: [PATCH 3/3] Update version for release --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 37beedcb..45c0373b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.53) -AC_INIT(Spine Poller, 1.2.1, http://www.cacti.net/issues.php) +AC_INIT(Spine Poller, 1.2.2, http://www.cacti.net/issues.php) AC_CONFIG_AUX_DIR(config) AC_SUBST(ac_aux_dir)