Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cacti-spine for openSUSE:Factory
checked in at 2023-02-28 12:49:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cacti-spine (Old)
and /work/SRC/openSUSE:Factory/.cacti-spine.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cacti-spine"
Tue Feb 28 12:49:05 2023 rev:39 rq:1068076 version:1.2.24
Changes:
--------
--- /work/SRC/openSUSE:Factory/cacti-spine/cacti-spine.changes 2023-01-03
15:05:33.522577570 +0100
+++ /work/SRC/openSUSE:Factory/.cacti-spine.new.31432/cacti-spine.changes
2023-02-28 12:49:24.984765362 +0100
@@ -1,0 +2,6 @@
+Mon Feb 27 22:55:55 UTC 2023 - Andreas Stieger <andreas.stie...@gmx.de>
+
+- cacti-spine 1.2.24:
+ * Fix segfault when ignoring older OIDs
+
+-------------------------------------------------------------------
Old:
----
cacti-spine-1.2.23.tar.gz
New:
----
cacti-spine-1.2.24.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cacti-spine.spec ++++++
--- /var/tmp/diff_new_pack.lFgjhE/_old 2023-02-28 12:49:25.384767559 +0100
+++ /var/tmp/diff_new_pack.lFgjhE/_new 2023-02-28 12:49:25.388767581 +0100
@@ -18,7 +18,7 @@
%{!?make_build: %define make_build make %{?_smp_mflags}}
Name: cacti-spine
-Version: 1.2.23
+Version: 1.2.24
Release: 0
Summary: Threaded poller for Cacti written in C
License: LGPL-2.1-or-later
++++++ cacti-spine-1.2.23.tar.gz -> cacti-spine-1.2.24.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/CHANGELOG
new/cacti-spine-1.2.24/CHANGELOG
--- old/cacti-spine-1.2.23/CHANGELOG 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/CHANGELOG 2023-02-27 14:59:43.000000000 +0100
@@ -1,8 +1,12 @@
The Cacti Group | spine
+1.2.24
+-issue#296: When ignoring older OIDs, segmentation faults can be caused
+
1.2.23
-issue#287: Unexpected reindexing occurs when using uptime as the reindex
method
-issue#279: spine does not compile with SQL TLS deactivated
+-issue#298: Odd Cacti log format issue when script server timeout happened
-feature#277: Spine should prevent the script server from connecting to remote
when offline
-feature#292: Improve Script Server Timeout Logging
-feature#293: Add SQL_NO_CACHE to Spine Queries
@@ -601,3 +605,6 @@
-bug: fixed issue that prevented multi ds item RRD?s from updating
-bug: fixed invalid string length calculation that was truncating output over
4 characters
-bug: small log file reformatting
+
+-----------------------------------------------
+Copyright (c) 2004-2023 - The Cacti Group, Inc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/INSTALL
new/cacti-spine-1.2.24/INSTALL
--- old/cacti-spine-1.2.23/INSTALL 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/INSTALL 2023-02-27 14:59:43.000000000 +0100
@@ -144,3 +144,7 @@
3. On older MySQL versions, different libraries had to be used to make MySQL
thread
safe. MySQL versions 5.0 and 5.1 require this flag. If you are using these
version
of MySQL, you must use the --with-reentrant configure flag.
+
+
+-----------------------------------------------
+Copyright (c) 2004-2023 - The Cacti Group, Inc.
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/Makefile.am
new/cacti-spine-1.2.24/Makefile.am
--- old/cacti-spine-1.2.23/Makefile.am 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/Makefile.am 2023-02-27 14:59:43.000000000 +0100
@@ -1,4 +1,25 @@
## Makefile.am -- Process this file with automake to produce Makefile.in
+#
+# +-------------------------------------------------------------------------+
+# | Copyright (C) 2004-2023 The Cacti Group |
+# | |
+# | This program is free software; you can redistribute it and/or |
+# | modify it under the terms of the GNU General Public License |
+# | as published by the Free Software Foundation; either version 2 |
+# | of the License, or (at your option) any later version. |
+# | |
+# | This program is distributed in the hope that it will be useful, |
+# | but WITHOUT ANY WARRANTY; without even the implied warranty of |
+# | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
+# | GNU General Public License for more details. |
+# +-------------------------------------------------------------------------+
+# | Cacti: The Complete RRDtool-based Graphing Solution |
+# +-------------------------------------------------------------------------+
+# | This code is designed, written, and maintained by the Cacti Group. See |
+# | about.php and/or the AUTHORS file for specific developer information. |
+# +-------------------------------------------------------------------------+
+# | http://www.cacti.net/ |
+# +-------------------------------------------------------------------------+
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/Makefile.in
new/cacti-spine-1.2.24/Makefile.in
--- old/cacti-spine-1.2.23/Makefile.in 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/Makefile.in 2023-02-27 14:59:43.000000000 +0100
@@ -1,6 +1,27 @@
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
+# +-------------------------------------------------------------------------+
+# | Copyright (C) 2004-2023 The Cacti Group |
+# | |
+# | This program is free software; you can redistribute it and/or |
+# | modify it under the terms of the GNU General Public License |
+# | as published by the Free Software Foundation; either version 2 |
+# | of the License, or (at your option) any later version. |
+# | |
+# | This program is distributed in the hope that it will be useful, |
+# | but WITHOUT ANY WARRANTY; without even the implied warranty of |
+# | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
+# | GNU General Public License for more details. |
+# +-------------------------------------------------------------------------+
+# | Cacti: The Complete RRDtool-based Graphing Solution |
+# +-------------------------------------------------------------------------+
+# | This code is designed, written, and maintained by the Cacti Group. See |
+# | about.php and/or the AUTHORS file for specific developer information. |
+# +-------------------------------------------------------------------------+
+# | http://www.cacti.net/ |
+# +-------------------------------------------------------------------------+
+
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
# Inc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/README.md
new/cacti-spine-1.2.24/README.md
--- old/cacti-spine-1.2.23/README.md 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/README.md 2023-02-27 14:59:43.000000000 +0100
@@ -133,3 +133,6 @@
3. On older MySQL versions, different libraries had to be used to make MySQL
thread safe. MySQL versions 5.0 and 5.1 require this flag. If you are using
these version of MySQL, you must use the --with-reentrant configure flag.
+
+-----------------------------------------------------------------------------
+Copyright (c) 2004-2023 - The Cacti Group, Inc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/bootstrap
new/cacti-spine-1.2.24/bootstrap
--- old/cacti-spine-1.2.23/bootstrap 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/bootstrap 2023-02-27 14:59:43.000000000 +0100
@@ -1,4 +1,26 @@
#!/bin/sh
+<?php
+# +-------------------------------------------------------------------------+
+# | Copyright (C) 2004-2023 The Cacti Group |
+# | |
+# | This program is free software; you can redistribute it and/or |
+# | modify it under the terms of the GNU General Public License |
+# | as published by the Free Software Foundation; either version 2 |
+# | of the License, or (at your option) any later version. |
+# | |
+# | This program is distributed in the hope that it will be useful, |
+# | but WITHOUT ANY WARRANTY; without even the implied warranty of |
+# | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
+# | GNU General Public License for more details. |
+# +-------------------------------------------------------------------------+
+# | Cacti: The Complete RRDtool-based Graphing Solution |
+# +-------------------------------------------------------------------------+
+# | This code is designed, written, and maintained by the Cacti Group. See |
+# | about.php and/or the AUTHORS file for specific developer information. |
+# +-------------------------------------------------------------------------+
+# | http://www.cacti.net/ |
+# +-------------------------------------------------------------------------+
+
#
# ----------------------------------------------------------
# Name: bootstrap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/common.h
new/cacti-spine-1.2.24/common.h
--- old/cacti-spine-1.2.23/common.h 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/common.h 2023-02-27 14:59:43.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2021 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU Lesser General Public |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/configure.ac
new/cacti-spine-1.2.24/configure.ac
--- old/cacti-spine-1.2.23/configure.ac 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/configure.ac 2023-02-27 14:59:43.000000000 +0100
@@ -1,5 +1,26 @@
+# +-------------------------------------------------------------------------+
+# | Copyright (C) 2004-2023 The Cacti Group |
+# | |
+# | This program is free software; you can redistribute it and/or |
+# | modify it under the terms of the GNU General Public License |
+# | as published by the Free Software Foundation; either version 2 |
+# | of the License, or (at your option) any later version. |
+# | |
+# | This program is distributed in the hope that it will be useful, |
+# | but WITHOUT ANY WARRANTY; without even the implied warranty of |
+# | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
+# | GNU General Public License for more details. |
+# +-------------------------------------------------------------------------+
+# | Cacti: The Complete RRDtool-based Graphing Solution |
+# +-------------------------------------------------------------------------+
+# | This code is designed, written, and maintained by the Cacti Group. See |
+# | about.php and/or the AUTHORS file for specific developer information. |
+# +-------------------------------------------------------------------------+
+# | http://www.cacti.net/ |
+# +-------------------------------------------------------------------------+
+
AC_PREREQ([2.63])
-AC_INIT([Spine Poller],[1.2.23],[http://www.cacti.net/issues.php])
+AC_INIT([Spine Poller],[1.2.24],[http://www.cacti.net/issues.php])
AC_CONFIG_AUX_DIR(config)
AC_SUBST(ac_aux_dir)
@@ -180,7 +201,7 @@
test -f /usr/include/$file && CAPLOC=$file && break
done
-AC_CHECK_HEADER($CAPLOC, [FOUND_SYS_CAPABILITY_H=yes],
+AC_CHECK_HEADER($CAPLOC, [FOUND_SYS_CAPABILITY_H=yes],
[FOUND_SYS_CAPABILITY_H=no])
# If we should use the Linux Capabilities support
@@ -280,10 +301,10 @@
if test $MYSQL_REENTRANT = 1 ; then
LIBS="-lmysqlclient_r -lm -ldl $LIBS"
-else
+else
if test -f $MYSQL_LIB_DIR/libmysqlclient_r.a -o -f
$MYSQL_LIB_DIR/libmysqlclient_r.$ShLib; then
LIBS="-lmysqlclient_r -lm -ldl $LIBS"
- else
+ else
if test -f $MYSQL_LIB_DIR/libmysqlclient_r.a -o -f
$MYSQL_LIB_DIR/libmysqlclient_r.$ShLib ; then
LIBS="-lmysqlclient_r -lm -ldl $LIBS"
else
@@ -364,7 +385,7 @@
],[AC_MSG_RESULT(no)
])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <net-snmp-config.h>
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <net-snmp-config.h>
#include <net-snmp/utilities.h>
#include <net-snmp/net-snmp-includes.h>
#include <net-snmp/config_api.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/copyright_year.sh
new/cacti-spine-1.2.24/copyright_year.sh
--- old/cacti-spine-1.2.23/copyright_year.sh 1970-01-01 01:00:00.000000000
+0100
+++ new/cacti-spine-1.2.24/copyright_year.sh 2023-02-27 14:59:43.000000000
+0100
@@ -0,0 +1,119 @@
+#!/usr/bin/env bash
+# +-------------------------------------------------------------------------+
+# | Copyright (C) 2004-2023 The Cacti Group |
+# | |
+# | This program is free software; you can redistribute it and/or |
+# | modify it under the terms of the GNU General Public License |
+# | as published by the Free Software Foundation; either version 2 |
+# | of the License, or (at your option) any later version. |
+# | |
+# | This program is distributed in the hope that it will be useful, |
+# | but WITHOUT ANY WARRANTY; without even the implied warranty of |
+# | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
+# | GNU General Public License for more details. |
+# +-------------------------------------------------------------------------+
+# | Cacti: The Complete RRDTool-based Graphing Solution |
+# +-------------------------------------------------------------------------+
+# | This code is designed, written, and maintained by the Cacti Group. See |
+# | about.php and/or the AUTHORS file for specific developer information. |
+# +-------------------------------------------------------------------------+
+# | http://www.cacti.net/ |
+# +-------------------------------------------------------------------------+
+
+update_copyright() {
+ local file=$1
+ file=${file/$SCRIPT_BASE/}
+ printf -v line "%60s" "$file"
+ if [[ -z "$ERRORS_ONLY" ]]; then
+ echo -n "$line"
+ line=
+ fi
+
+ old_reg="20[0-9][0-9][ ]*-[ ]*20[0-9][0-9]"
+ old_data=$(grep -c -e "$old_reg" "$1" 2>/dev/null)
+ new_reg="2004-$YEAR"
+ result=$?
+
+ if [[ $old_data -eq 0 ]]; then
+ old_reg="(Copyright.*) 20[0-9][0-9] "
+ old_data=$(grep -c -e "$old_reg" "$1" 2>/dev/null)
+ new_reg="\1 2004-$YEAR"
+ result=$?
+ fi
+
+ if [[ $old_data -gt 0 ]]; then
+ old_data=$(grep -e "$old_reg" "$1" 2>/dev/null)
+ new_data=$(echo "$old_data" | sed -r s/"$old_reg"/"$new_reg"/g)
+ if [[ "$old_data" == "$new_data" ]]; then
+ if [[ -z "$ERRORS_ONLY" ]]; then
+ echo "$line Skipping Copyright Data"
+ fi
+ else
+ echo "$line Updating Copyright Data"
+ printf "%60s %s\n" "=============================="
"===================="
+ printf "%60s %s\n" "$old_data" "=>"
+ printf "%60s %s\n" "$new_data" ""
+ sed -i -r s/"$old_reg"/"$new_reg"/g $1
+ printf "%60s %s\n" "=============================="
"===================="
+ fi
+ else
+ echo "$line Copyright not found!"
+ SCRIPT_ERR=1
+ fi
+}
+
+SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
+SCRIPT_BASE=$(realpath "${SCRIPT_DIR}/")/
+
+BAD_FOLDERS="\.git include/vendor \*\*/vendor include/fa cache include/js
scripts"
+SCRIPT_EXCLUSION=
+for f in $BAD_FOLDERS; do
+ SCRIPT_EXCLUSION="$SCRIPT_EXCLUSION -not -path ${SCRIPT_BASE}$f/\* "
+done
+
+SCRIPT_ERR=0
+YEAR=$(date +"%Y")
+EXT="" # "sh sql php js md conf c h ac dist"
+ERRORS_ONLY=1
+while [ -n "$1" ]; do
+ case $1 in
+ "--help")
+ echo "NOTE: Checks all Cacti pages for this years copyright"
+ echo ""
+ echo "usage: copyright_year.sh [-a]"
+ echo ""
+ ;;
+ "-E" | "-e")
+ shift
+ EXT="$1"
+ ;;
+ "-A" | "-a")
+ ERRORS_ONLY=
+ echo "Searching..."
+ ;;
+ *) ;;
+
+ esac
+ shift
+done
+
+# ----------------------------------------------
+# PHP / JS / MD Files
+# ----------------------------------------------
+SCRIPT_INCLUSION=
+SCRIPT_SEPARATOR=
+for ext in $EXT; do
+ if [ -n "$SCRIPT_INCLUSION" ]; then
+ SCRIPT_SEPARATOR="-o "
+ fi
+ SCRIPT_INCLUSION="$SCRIPT_INCLUSION $SCRIPT_SEPARATOR-name \*.$ext"
+done
+
+if [[ -n "$SCRIPT_INCLUSION" ]]; then
+ SCRIPT_INCLUSION="\( $SCRIPT_INCLUSION \)"
+fi
+
+SCRIPT_CMD="find ${SCRIPT_BASE} -type f $SCRIPT_INCLUSION $SCRIPT_EXCLUSION
-print0"
+bash -c "$SCRIPT_CMD" | while IFS= read -r -d '' file; do
+ update_copyright "${file}"
+done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/debug new/cacti-spine-1.2.24/debug
--- old/cacti-spine-1.2.23/debug 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/debug 2023-02-27 14:59:43.000000000 +0100
@@ -1,7 +1,32 @@
+#!/bin/bash
+#
+# +-------------------------------------------------------------------------+
+# | Copyright (C) 2004-2023 The Cacti Group |
+# | |
+# | This program is free software; you can redistribute it and/or |
+# | modify it under the terms of the GNU General Public License |
+# | as published by the Free Software Foundation; either version 2 |
+# | of the License, or (at your option) any later version. |
+# | |
+# | This program is distributed in the hope that it will be useful, |
+# | but WITHOUT ANY WARRANTY; without even the implied warranty of |
+# | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
+# | GNU General Public License for more details. |
+# +-------------------------------------------------------------------------+
+# | Cacti: The Complete RRDtool-based Graphing Solution |
+# +-------------------------------------------------------------------------+
+# | This code is designed, written, and maintained by the Cacti Group. See |
+# | about.php and/or the AUTHORS file for specific developer information. |
+# +-------------------------------------------------------------------------+
+# | http://www.cacti.net/ |
+# +-------------------------------------------------------------------------+
+
if [[ -z $SPINE_CONFIG ]]; then
export SPINE_CONFIG="/etc/spine.conf";
fi
+
make
+
if [[ $? -eq 0 ]]; then
echo
echo ------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/error.c
new/cacti-spine-1.2.24/error.c
--- old/cacti-spine-1.2.23/error.c 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/error.c 2023-02-27 14:59:43.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2021 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU Lesser General Public |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/error.h
new/cacti-spine-1.2.24/error.h
--- old/cacti-spine-1.2.23/error.h 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/error.h 2023-02-27 14:59:43.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2021 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU Lesser General Public |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/keywords.c
new/cacti-spine-1.2.24/keywords.c
--- old/cacti-spine-1.2.23/keywords.c 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/keywords.c 2023-02-27 14:59:43.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2021 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU Lesser General Public |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/keywords.h
new/cacti-spine-1.2.24/keywords.h
--- old/cacti-spine-1.2.23/keywords.h 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/keywords.h 2023-02-27 14:59:43.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2021 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU Lesser General Public |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/locks.c
new/cacti-spine-1.2.24/locks.c
--- old/cacti-spine-1.2.23/locks.c 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/locks.c 2023-02-27 14:59:43.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2021 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU Lesser General Public |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/locks.h
new/cacti-spine-1.2.24/locks.h
--- old/cacti-spine-1.2.23/locks.h 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/locks.h 2023-02-27 14:59:43.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2021 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU Lesser General Public |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/nft_popen.c
new/cacti-spine-1.2.24/nft_popen.c
--- old/cacti-spine-1.2.23/nft_popen.c 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/nft_popen.c 2023-02-27 14:59:43.000000000 +0100
@@ -1,3 +1,26 @@
+/*
+ +-------------------------------------------------------------------------+
+ | Copyright (C) 2004-2023 The Cacti Group |
+ | |
+ | This program is free software; you can redistribute it and/or |
+ | modify it under the terms of the GNU General Public License |
+ | as published by the Free Software Foundation; either version 2 |
+ | of the License, or (at your option) any later version. |
+ | |
+ | This program is distributed in the hope that it will be useful, |
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
+ | GNU General Public License for more details. |
+ +-------------------------------------------------------------------------+
+ | Cacti: The Complete RRDtool-based Graphing Solution |
+ +-------------------------------------------------------------------------+
+ | This code is designed, written, and maintained by the Cacti Group. See |
+ | about.php and/or the AUTHORS file for specific developer information. |
+ +-------------------------------------------------------------------------+
+ | http://www.cacti.net/ |
+ +-------------------------------------------------------------------------+
+*/
+
/*******************************************************************************
ex: set tabstop=4 shiftwidth=4 autoindent:
* (C) Xenadyne Inc. 2002. All Rights Reserved
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/nft_popen.h
new/cacti-spine-1.2.24/nft_popen.h
--- old/cacti-spine-1.2.23/nft_popen.h 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/nft_popen.h 2023-02-27 14:59:43.000000000 +0100
@@ -1,20 +1,43 @@
+/*
+ +-------------------------------------------------------------------------+
+ | Copyright (C) 2004-2023 The Cacti Group |
+ | |
+ | This program is free software; you can redistribute it and/or |
+ | modify it under the terms of the GNU General Public License |
+ | as published by the Free Software Foundation; either version 2 |
+ | of the License, or (at your option) any later version. |
+ | |
+ | This program is distributed in the hope that it will be useful, |
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
+ | GNU General Public License for more details. |
+ +-------------------------------------------------------------------------+
+ | Cacti: The Complete RRDtool-based Graphing Solution |
+ +-------------------------------------------------------------------------+
+ | This code is designed, written, and maintained by the Cacti Group. See |
+ | about.php and/or the AUTHORS file for specific developer information. |
+ +-------------------------------------------------------------------------+
+ | http://www.cacti.net/ |
+ +-------------------------------------------------------------------------+
+*/
+
/******************************************************************************
ex: set tabstop=4 shiftwidth=4 autoindent:
*
* (C) Copyright Xenadyne, Inc. 2002 All rights reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software for
- * any purpose and without fee is hereby granted, provided that the
+ * any purpose and without fee is hereby granted, provided that the
* above copyright notice appears in all copies.
- *
- * XENADYNE INC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
- * IN NO EVENT SHALL XENADYNE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM THE
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ *
+ * XENADYNE INC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
+ * IN NO EVENT SHALL XENADYNE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM THE
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
+ *
* File: nft_popen.h
*
* PURPOSE
@@ -32,7 +55,7 @@
* used with select() or poll(), or the caller can use fdopen() if a stdio
* FILE* is preferable.
*
- * The mode argument is defined as in standard popen().
+ * The mode argument is defined as in standard popen().
*
* On success, returns a file descriptor, or -1 on error.
* On failure, returns -1, with errno set to one of:
@@ -48,10 +71,10 @@
* nft_pchild
*
* Get the pid of the child process for an fd created by ntf_popen().
- *
+ *
* On success, the pid of the child process is returned.
* On failure, nft_pchild() returns -1, with errno set to:
- *
+ *
* EBADF The fd is not an active nft_popen() file descriptor.
*/
extern int nft_pchild(int fd);
@@ -60,10 +83,10 @@
* nft_pclose
*
* Close the pipe and wait for the status of the child process.
- *
+ *
* On success, the exit status of the child process is returned.
* On failure, nft_pclose() returns -1, with errno set to:
- *
+ *
* EBADF The fd is not an active popen() file descriptor.
* ECHILD waitpid() failed.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/php.c new/cacti-spine-1.2.24/php.c
--- old/cacti-spine-1.2.23/php.c 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/php.c 2023-02-27 14:59:43.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2021 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU Lesser General Public |
@@ -241,7 +241,9 @@
php_init(php_process);
break;
case 0:
- SPINE_LOG(("WARNING: SS[%i] The PHP Script Server did not
respond in time for Timeout[%0.2f], Command[%s] and will therefore be
restarted", php_process, end_time - start_time, command));
+ /* record end time */
+ end_time = get_time_as_double();
+ SPINE_LOG(("WARNING: SS[%i] The PHP Script Server did not
respond in time for Timeout[%0.2f], Command[%s] and will therefore be
restarted", php_process, end_time - begin_time, command));
SET_UNDEFINED(result_string);
/* kill script server because it is misbehaving */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/php.h new/cacti-spine-1.2.24/php.h
--- old/cacti-spine-1.2.23/php.h 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/php.h 2023-02-27 14:59:43.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2021 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU Lesser General Public |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/ping.c
new/cacti-spine-1.2.24/ping.c
--- old/cacti-spine-1.2.23/ping.c 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/ping.c 2023-02-27 14:59:43.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2021 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU Lesser General Public |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/ping.h
new/cacti-spine-1.2.24/ping.h
--- old/cacti-spine-1.2.23/ping.h 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/ping.h 2023-02-27 14:59:43.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2021 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU Lesser General Public |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/poller.c
new/cacti-spine-1.2.24/poller.c
--- old/cacti-spine-1.2.23/poller.c 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/poller.c 2023-02-27 14:59:43.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2021 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU Lesser General Public |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/poller.h
new/cacti-spine-1.2.24/poller.h
--- old/cacti-spine-1.2.23/poller.h 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/poller.h 2023-02-27 14:59:43.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2021 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU Lesser General Public |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/snmp.c
new/cacti-spine-1.2.24/snmp.c
--- old/cacti-spine-1.2.23/snmp.c 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/snmp.c 2023-02-27 14:59:43.000000000 +0100
@@ -1,8 +1,8 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2021 The Cacti Group |
- | Copyright (C) 2004-2020 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU Lesser General Public |
@@ -388,16 +388,17 @@
char *result_string;
char temp_result[RESULTS_BUFFER];
- if (current_host->ignore_host) {
- SPINE_LOG_HIGH(("WARNING: Skipped oid '%s' for Device[%d] as
host ignore flag is active", snmp_oid, current_host->id));
- return NULL;
- }
-
if (!(result_string = (char *) malloc(RESULTS_BUFFER))) {
die("ERROR: Fatal malloc error: snmp.c snmp_get!");
}
result_string[0] = '\0';
+ if (current_host->ignore_host) {
+ SPINE_LOG_HIGH(("WARNING: Skipped oid '%s' for Device[%d] as
host ignore flag is active", snmp_oid, current_host->id));
+ SET_UNDEFINED(result_string);
+ return result_string;
+ }
+
status = STAT_DESCRIP_ERROR;
if (current_host->snmp_session != NULL) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/snmp.h
new/cacti-spine-1.2.24/snmp.h
--- old/cacti-spine-1.2.23/snmp.h 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/snmp.h 2023-02-27 14:59:43.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2021 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU Lesser General Public |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/spine.c
new/cacti-spine-1.2.24/spine.c
--- old/cacti-spine-1.2.23/spine.c 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/spine.c 2023-02-27 14:59:43.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2021 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU Lesser General Public |
@@ -1127,7 +1127,7 @@
0 /* ENDMARKER */
};
- printf("SPINE %s Copyright 2004-2021 by The Cacti Group\n", VERSION);
+ printf("SPINE %s Copyright 2004-2023 by The Cacti Group\n", VERSION);
if (only_version == FALSE) {
printf("\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/spine.conf.dist
new/cacti-spine-1.2.24/spine.conf.dist
--- old/cacti-spine-1.2.23/spine.conf.dist 2023-01-02 15:48:31.000000000
+0100
+++ new/cacti-spine-1.2.24/spine.conf.dist 2023-02-27 14:59:43.000000000
+0100
@@ -1,5 +1,5 @@
# +-------------------------------------------------------------------------+
-# | Copyright (C) 2004-2019 The Cacti Group |
+# | Copyright (C) 2004-2023 The Cacti Group |
# | |
# | This program is free software; you can redistribute it and/or |
# | modify it under the terms of the GNU Lesser General Public License |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/spine.h
new/cacti-spine-1.2.24/spine.h
--- old/cacti-spine-1.2.23/spine.h 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/spine.h 2023-02-27 14:59:43.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2021 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU Lesser General Public |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/sql.c new/cacti-spine-1.2.24/sql.c
--- old/cacti-spine-1.2.23/sql.c 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/sql.c 2023-02-27 14:59:43.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2021 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU Lesser General Public |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/sql.h new/cacti-spine-1.2.24/sql.h
--- old/cacti-spine-1.2.23/sql.h 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/sql.h 2023-02-27 14:59:43.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2021 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU Lesser General Public |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/util.c
new/cacti-spine-1.2.24/util.c
--- old/cacti-spine-1.2.23/util.c 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/util.c 2023-02-27 14:59:43.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2021 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU Lesser General Public |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.23/util.h
new/cacti-spine-1.2.24/util.h
--- old/cacti-spine-1.2.23/util.h 2023-01-02 15:48:31.000000000 +0100
+++ new/cacti-spine-1.2.24/util.h 2023-02-27 14:59:43.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:*
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2021 The Cacti Group |
+ | Copyright (C) 2004-2023 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU Lesser General Public |
