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 2025-04-10 22:00:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cacti-spine (Old)
and /work/SRC/openSUSE:Factory/.cacti-spine.new.1907 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cacti-spine"
Thu Apr 10 22:00:16 2025 rev:43 rq:1268472 version:1.2.30
Changes:
--------
--- /work/SRC/openSUSE:Factory/cacti-spine/cacti-spine.changes 2024-05-15
21:28:00.940673593 +0200
+++ /work/SRC/openSUSE:Factory/.cacti-spine.new.1907/cacti-spine.changes
2025-04-10 22:01:20.293836445 +0200
@@ -1,0 +2,21 @@
+Thu Apr 3 13:46:58 UTC 2025 - Joel Baltazor <o...@mtlfab.com>
+
+- cacti-spine 1.2.30
+ -no changes
+ -Bump/rebuild to match Cacti 1.2.30
+
+-------------------------------------------------------------------
+Tue Feb 11 17:16:54 UTC 2025 - Joel Baltazor <o...@mtlfab.com>
+
+- cacti-spine 1.2.29
+ -no changes
+ -Bump/rebuild to match Cacti 1.2.29
+
+-------------------------------------------------------------------
+Wed Oct 9 16:51:18 UTC 2024 - Joel Baltazor <o...@mtlfab.com>
+
+- cacti-spine 1.2.28
+ -issue#350: When using Ping or SNMP Uptime, host is not always detected
properly
+ -issue#351: Add Ping Method where connection refused assumes host is up
+
+-------------------------------------------------------------------
Old:
----
cacti-spine-1.2.27.tar.gz
New:
----
cacti-spine-1.2.30.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cacti-spine.spec ++++++
--- /var/tmp/diff_new_pack.DkCHEx/_old 2025-04-10 22:01:20.781856825 +0200
+++ /var/tmp/diff_new_pack.DkCHEx/_new 2025-04-10 22:01:20.785856992 +0200
@@ -19,7 +19,7 @@
%{!?make_build: %define make_build make %{?_smp_mflags}}
Name: cacti-spine
-Version: 1.2.27
+Version: 1.2.30
Release: 0
Summary: Threaded poller for Cacti written in C
License: LGPL-2.1-or-later
++++++ cacti-spine-1.2.27.tar.gz -> cacti-spine-1.2.30.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.27/CHANGELOG
new/cacti-spine-1.2.30/CHANGELOG
--- old/cacti-spine-1.2.27/CHANGELOG 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/CHANGELOG 2025-03-23 20:26:39.000000000 +0100
@@ -1,5 +1,15 @@
The Cacti Group | spine
+1.2.30
+-no changes
+
+1.2.29
+-no changes
+
+1.2.28
+-issue#350: When using Ping or SNMP Uptime, host is not always detected
properly
+-issue#351: Add Ping Method where connection refused assumes host is up
+
1.2.27
-issue#349: Removal of AES Privacy Protocol was pre-mature
@@ -634,4 +644,4 @@
-bug: small log file reformatting
-----------------------------------------------
-Copyright (c) 2004-2023 - The Cacti Group, Inc.
+Copyright (c) 2004-2024 - The Cacti Group, Inc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.27/INSTALL
new/cacti-spine-1.2.30/INSTALL
--- old/cacti-spine-1.2.27/INSTALL 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/INSTALL 2025-03-23 20:26:39.000000000 +0100
@@ -147,4 +147,4 @@
-----------------------------------------------
-Copyright (c) 2004-2023 - The Cacti Group, Inc.
\ No newline at end of file
+Copyright (c) 2004-2024 - The Cacti Group, Inc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.27/Makefile.am
new/cacti-spine-1.2.30/Makefile.am
--- old/cacti-spine-1.2.27/Makefile.am 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/Makefile.am 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,5 @@
-## Makefile.am -- Process this file with automake to produce Makefile.in
-#
# +-------------------------------------------------------------------------+
-# | Copyright (C) 2004-2023 The Cacti Group |
+# | Copyright (C) 2004-2024 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 |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.27/Makefile.in
new/cacti-spine-1.2.30/Makefile.in
--- old/cacti-spine-1.2.27/Makefile.in 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/Makefile.in 2025-03-23 20:26:39.000000000 +0100
@@ -1,8 +1,22 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
# +-------------------------------------------------------------------------+
-# | Copyright (C) 2004-2023 The Cacti Group |
+# | Copyright (C) 2004-2024 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 |
@@ -22,22 +36,53 @@
# | 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.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -58,13 +103,20 @@
host_triplet = @host@
bin_PROGRAMS = spine$(EXEEXT)
subdir = .
-DIST_COMMON = README.md $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(top_srcdir)/config/config.h.in \
- $(top_srcdir)/configure LICENSE ChangeLog INSTALL \
- config/config.guess config/config.sub config/depcomp \
- config/install-sh config/ltmain.sh config/missing
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/configure $(am__configure_deps) \
+ $(top_srcdir)/config/config.h.in $(top_srcdir)/config/depcomp \
+ INSTALL config/config.guess config/config.sub config/depcomp \
+ config/install-sh config/missing config/ltmain.sh \
+ $(top_srcdir)/config/config.guess \
+ $(top_srcdir)/config/config.sub \
+ $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
+ $(top_srcdir)/config/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -82,21 +134,51 @@
keywords.$(OBJEXT) error.$(OBJEXT)
spine_OBJECTS = $(am_spine_OBJECTS)
spine_LDADD = $(LDADD)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
SOURCES = $(spine_SOURCES)
DIST_SOURCES = $(spine_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -118,25 +200,57 @@
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
man1dir = $(mandir)/man1
NROFF = nroff
MANS = $(man_MANS)
DATA = $(config_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+CSCOPE = cscope
+AM_RECURSIVE_TARGETS = cscope
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- { test ! -d "$(distdir)" \
- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr "$(distdir)"; }; }
+ if test -d "$(distdir)"; then \
+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -rf "$(distdir)" \
+ || { sleep 5 && rm -rf "$(distdir)"; }; \
+ else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -150,6 +264,7 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -174,6 +289,7 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -186,6 +302,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
@@ -199,6 +316,7 @@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_aux_dir = @ac_aux_dir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -231,7 +349,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -247,6 +364,8 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
spine_SOURCES = sql.c spine.c util.c snmp.c locks.c poller.c nft_popen.c php.c
ping.c keywords.c error.c
configdir = $(sysconfdir)
config_DATA = spine.conf.dist
@@ -255,21 +374,21 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
-am--refresh:
+am--refresh: Makefile
@:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
- $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
+ $(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -291,10 +410,8 @@
$(am__aclocal_m4_deps):
config/config.h: config/stamp-h1
- @if test ! -f $@; then \
- rm -f config/stamp-h1; \
- $(MAKE) $(AM_MAKEFLAGS) config/stamp-h1; \
- else :; fi
+ @if test ! -f $@; then rm -f config/stamp-h1; else :; fi
+ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) config/stamp-h1; else :;
fi
config/stamp-h1: $(top_srcdir)/config/config.h.in $(top_builddir)/config.status
@rm -f config/stamp-h1
@@ -308,14 +425,19 @@
-rm -f config/config.h config/stamp-h1
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p || test -f $$p1; \
- then echo "$$p"; echo "$$p"; else :; fi; \
+ while read p p1; do if test -f $$p \
+ || test -f $$p1 \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
done | \
- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
-e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
sed 'N;N;N;s,\n, ,g' | \
$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -336,7 +458,8 @@
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- -e 's/$$/$(EXEEXT)/' `; \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -349,9 +472,10 @@
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-spine$(EXEEXT): $(spine_OBJECTS) $(spine_DEPENDENCIES)
+
+spine$(EXEEXT): $(spine_OBJECTS) $(spine_DEPENDENCIES)
$(EXTRA_spine_DEPENDENCIES)
@rm -f spine$(EXEEXT)
- $(LINK) $(spine_OBJECTS) $(spine_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(LINK) $(spine_OBJECTS) $(spine_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -372,25 +496,25 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@
$<
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no
@AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF
$(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@'
libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
.c.obj:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@
`$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no
@AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF
$(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@'
libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o
$@ $<
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes
@AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF
$(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@'
libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@ -402,11 +526,18 @@
-rm -f libtool config.lt
install-man1: $(man_MANS)
@$(NORMAL_INSTALL)
- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- @list=''; test -n "$(man1dir)" || exit 0; \
- { for i in $$list; do echo "$$i"; done; \
- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
- sed -n '/\.1[a-z]*$$/p'; \
+ @list1=''; \
+ list2='$(man_MANS)'; \
+ test -n "$(man1dir)" \
+ && test -n "`echo $$list1$$list2`" \
+ || exit 0; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+ { for i in $$list1; do echo "$$i"; done; \
+ if test -n "$$list2"; then \
+ for i in $$list2; do echo "$$i"; done \
+ | sed -n '/\.1[a-z]*$$/p'; \
+ fi; \
} | while read p; do \
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
@@ -435,13 +566,14 @@
sed -n '/\.1[a-z]*$$/p'; \
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
- test -z "$$files" || { \
- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
install-configDATA: $(config_DATA)
@$(NORMAL_INSTALL)
- test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
@list='$(config_DATA)'; test -n "$(configdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -455,30 +587,17 @@
@$(NORMAL_UNINSTALL)
@list='$(config_DATA)'; test -n "$(configdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(configdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
+ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -490,15 +609,11 @@
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -507,24 +622,33 @@
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+ test ! -s cscope.files \
+ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files
$(CSCOPE_ARGS)
+clean-cscope:
+ -rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(DISTFILES)
- @list='$(MANS)'; if test -n "$$list"; then \
- list=`for p in $$list; do \
- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
- if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
- if test -n "$$list" && \
- grep 'ab help2man is required to generate this page' $$list
>/dev/null; then \
- echo "error: found man pages containing the \`missing help2man'
replacement text:" >&2; \
- grep -l 'ab help2man is required to generate this page' $$list |
sed 's/^/ /' >&2; \
- echo " to fix them, install help2man, remove and regenerate
the man pages;" >&2; \
- echo " typically \`make maintainer-clean' will remove them"
>&2; \
- exit 1; \
- else :; fi; \
- else :; fi
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -565,36 +689,36 @@
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c
>$(distdir).tar.gz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c
>$(distdir).tar.bz2
+ $(am__post_remove_distdir)
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
+dist-lzip: distdir
+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9}
>$(distdir).tar.lz
+ $(am__post_remove_distdir)
dist-xz: distdir
- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
- $(am__remove_distdir)
+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c
>$(distdir).tar.xz
+ $(am__post_remove_distdir)
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-shar: distdir
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-zip: distdir
-rm -f $(distdir).zip
zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
-dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c
>$(distdir).tar.gz
- $(am__remove_distdir)
+dist dist-all:
+ $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+ $(am__post_remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
@@ -605,8 +729,8 @@
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.lz*) \
+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
@@ -616,9 +740,9 @@
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod u+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
+ chmod -R a-w $(distdir)
+ chmod u+w $(distdir)
+ mkdir $(distdir)/_build $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e
's,^[^:\\/]:[\\/],/,'` \
@@ -626,6 +750,7 @@
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -649,13 +774,21 @@
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
&& cd "$$am__cwd" \
|| exit 1
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
- @$(am__cd) '$(distuninstallcheck_dir)' \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ @test -n '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: trying to run $@ with an empty' \
+ '$$(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ $(am__cd) '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
echo " (check DESTDIR support)"; \
@@ -688,10 +821,15 @@
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s
\
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s
\
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -780,26 +918,27 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool ctags dist \
- dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \
- dist-xz dist-zip distcheck distclean distclean-compile \
- distclean-generic distclean-hdr distclean-libtool \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-binPROGRAMS install-configDATA install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-man1 install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-binPROGRAMS \
- uninstall-configDATA uninstall-man uninstall-man1
+.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
+ clean-binPROGRAMS clean-cscope clean-generic clean-libtool \
+ cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+ dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
+ distcheck distclean distclean-compile distclean-generic \
+ distclean-hdr distclean-libtool distclean-tags distcleancheck \
+ distdir distuninstallcheck dvi dvi-am html html-am info \
+ info-am install install-am install-binPROGRAMS \
+ install-configDATA install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-man1 install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-configDATA \
+ uninstall-man uninstall-man1
-spine.1: spine.c
+spine.1: $(bin_PROGRAMS)
$(HELP2MAN) --output=$@ --name='Data Collector for Cacti' --no-info
--version-option='--version' ./spine
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.27/README.md
new/cacti-spine-1.2.30/README.md
--- old/cacti-spine-1.2.27/README.md 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/README.md 2025-03-23 20:26:39.000000000 +0100
@@ -137,4 +137,4 @@
these version of MySQL, you must use the --with-reentrant configure flag.
-----------------------------------------------------------------------------
-Copyright (c) 2004-2023 - The Cacti Group, Inc.
+Copyright (c) 2004-2024 - The Cacti Group, Inc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.27/bootstrap
new/cacti-spine-1.2.30/bootstrap
--- old/cacti-spine-1.2.27/bootstrap 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/bootstrap 2025-03-23 20:26:39.000000000 +0100
@@ -1,6 +1,6 @@
#!/bin/sh
# +-------------------------------------------------------------------------+
-# | Copyright (C) 2004-2023 The Cacti Group |
+# | Copyright (C) 2004-2024 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 |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.27/common.h
new/cacti-spine-1.2.30/common.h
--- old/cacti-spine-1.2.27/common.h 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/common.h 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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.27/configure.ac
new/cacti-spine-1.2.30/configure.ac
--- old/cacti-spine-1.2.27/configure.ac 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/configure.ac 2025-03-23 20:26:39.000000000 +0100
@@ -1,5 +1,5 @@
# +-------------------------------------------------------------------------+
-# | Copyright (C) 2004-2023 The Cacti Group |
+# | Copyright (C) 2004-2024 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 |
@@ -20,7 +20,7 @@
# +-------------------------------------------------------------------------+
AC_PREREQ([2.63])
-AC_INIT([Spine Poller],[1.2.27],[http://www.cacti.net/issues.php])
+AC_INIT([Spine Poller],[1.2.30],[http://www.cacti.net/issues.php])
AC_CONFIG_AUX_DIR(config)
AC_SUBST(ac_aux_dir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.27/copyright_year.sh
new/cacti-spine-1.2.30/copyright_year.sh
--- old/cacti-spine-1.2.27/copyright_year.sh 2024-05-12 21:30:55.000000000
+0200
+++ new/cacti-spine-1.2.30/copyright_year.sh 2025-03-23 20:26:39.000000000
+0100
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# +-------------------------------------------------------------------------+
-# | Copyright (C) 2004-2023 The Cacti Group |
+# | Copyright (C) 2004-2024 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 |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.27/debug new/cacti-spine-1.2.30/debug
--- old/cacti-spine-1.2.27/debug 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/debug 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,7 @@
#!/bin/bash
#
# +-------------------------------------------------------------------------+
-# | Copyright (C) 2004-2023 The Cacti Group |
+# | Copyright (C) 2004-2024 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 |
@@ -34,4 +34,4 @@
echo
echo
gdb -quiet -ex run --args ./spine -R -V 6 -C $SPINE_CONFIG
-fi
\ No newline at end of file
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.27/error.c
new/cacti-spine-1.2.30/error.c
--- old/cacti-spine-1.2.27/error.c 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/error.c 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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.27/error.h
new/cacti-spine-1.2.30/error.h
--- old/cacti-spine-1.2.27/error.h 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/error.h 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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.27/keywords.c
new/cacti-spine-1.2.30/keywords.c
--- old/cacti-spine-1.2.27/keywords.c 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/keywords.c 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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.27/keywords.h
new/cacti-spine-1.2.30/keywords.h
--- old/cacti-spine-1.2.27/keywords.h 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/keywords.h 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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.27/locks.c
new/cacti-spine-1.2.30/locks.c
--- old/cacti-spine-1.2.27/locks.c 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/locks.c 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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.27/locks.h
new/cacti-spine-1.2.30/locks.h
--- old/cacti-spine-1.2.27/locks.h 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/locks.h 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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.27/nft_popen.c
new/cacti-spine-1.2.30/nft_popen.c
--- old/cacti-spine-1.2.27/nft_popen.c 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/nft_popen.c 2025-03-23 20:26:39.000000000 +0100
@@ -1,6 +1,6 @@
/*
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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 |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.27/nft_popen.h
new/cacti-spine-1.2.30/nft_popen.h
--- old/cacti-spine-1.2.27/nft_popen.h 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/nft_popen.h 2025-03-23 20:26:39.000000000 +0100
@@ -1,6 +1,6 @@
/*
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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 |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.27/php.c new/cacti-spine-1.2.30/php.c
--- old/cacti-spine-1.2.27/php.c 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/php.c 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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.27/php.h new/cacti-spine-1.2.30/php.h
--- old/cacti-spine-1.2.27/php.h 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/php.h 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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.27/ping.c
new/cacti-spine-1.2.30/ping.c
--- old/cacti-spine-1.2.27/ping.c 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/ping.c 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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 |
@@ -72,7 +72,7 @@
ping_result = ping_icmp(host, ping);
} else if (host->ping_method == PING_UDP) {
ping_result = ping_udp(host, ping);
- } else if (host->ping_method == PING_TCP) {
+ } else if (host->ping_method == PING_TCP ||
host->ping_method == PING_TCP_CLOSED) {
ping_result = ping_tcp(host, ping);
}
} else if (host->availability_method == AVAIL_PING) {
@@ -163,7 +163,7 @@
if (is_debug_device(host->id)) {
SPINE_LOG(("Device[%i] DEBUG: Entering SNMP Ping", host->id));
} else {
- SPINE_LOG_DEBUG(("Device[%i] DEBUG: Entering SNMP Ping",
host->id));
+ SPINE_LOG_DEBUG(("DEBUG: Device[%i] Entering SNMP Ping",
host->id));
}
if (host->snmp_session) {
@@ -283,7 +283,7 @@
if (is_debug_device(host->id)) {
SPINE_LOG(("Device[%i] DEBUG: Entering ICMP Ping", host->id));
} else {
- SPINE_LOG_DEBUG(("Device[%i] DEBUG: Entering ICMP Ping",
host->id));
+ SPINE_LOG_DEBUG(("DEBUG: Device[%i] Entering ICMP Ping",
host->id));
}
/* get ICMP socket */
@@ -390,7 +390,7 @@
if (is_debug_device(host->id)) {
SPINE_LOG(("Device[%i] DEBUG:
Attempting to ping %s, seq %d (Retry %d of %d)", host->id, host->hostname,
icmp->icmp_seq, retry_count, host->ping_retries));
} else {
- SPINE_LOG_DEBUG(("Device[%i] DEBUG:
Attempting to ping %s, seq %d (Retry %d of %d)", host->id, host->hostname,
icmp->icmp_seq, retry_count, host->ping_retries));
+ SPINE_LOG_DEBUG(("DEBUG: Device[%i]
Attempting to ping %s, seq %d (Retry %d of %d)", host->id, host->hostname,
icmp->icmp_seq, retry_count, host->ping_retries));
}
/* decrement the timeout value by the total
time */
@@ -430,7 +430,7 @@
if
(is_debug_device(host->id)) {
SPINE_LOG(("Device[%i] DEBUG: Received EINTR", host->id));
} else {
-
SPINE_LOG_DEBUG(("Device[%i] DEBUG: Received EINTR", host->id));
+
SPINE_LOG_DEBUG(("DEBUG: Device[%i] Received EINTR", host->id));
}
goto keep_listening;
@@ -486,7 +486,7 @@
if (is_debug_device(host->id)) {
SPINE_LOG(("Device[%i] DEBUG:
Exceeded Device Timeout, Retrying", host->id));
} else {
- SPINE_LOG_DEBUG(("Device[%i]
DEBUG: Exceeded Device Timeout, Retrying", host->id));
+ SPINE_LOG_DEBUG(("DEBUG:
Device[%i] Exceeded Device Timeout, Retrying", host->id));
}
}
@@ -575,7 +575,7 @@
if (is_debug_device(host->id)) {
SPINE_LOG(("Device[%i] DEBUG: Entering UDP Ping", host->id));
} else {
- SPINE_LOG_DEBUG(("Device[%i] DEBUG: Entering UDP Ping",
host->id));
+ SPINE_LOG_DEBUG(("DEBUG: Device[%i] Entering UDP Ping",
host->id));
}
/* set total time */
@@ -689,7 +689,7 @@
if (is_debug_device(host->id)) {
SPINE_LOG(("Device[%i] DEBUG: UDP
Timeout, Try Count:%i, Time:%.4f ms", host->id, retry_count+1, (total_time)));
} else {
- SPINE_LOG_DEBUG(("Device[%i] DEBUG: UDP
Timeout, Try Count:%i, Time:%.4f ms", host->id, retry_count+1, (total_time)));
+ SPINE_LOG_DEBUG(("DEBUG: Device[%i] UDP
Timeout, Try Count:%i, Time:%.4f ms", host->id, retry_count+1, (total_time)));
}
retry_count++;
@@ -737,7 +737,7 @@
if (is_debug_device(host->id)) {
SPINE_LOG(("Device[%i] DEBUG: Entering TCP Ping", host->id));
} else {
- SPINE_LOG_DEBUG(("Device[%i] DEBUG: Entering TCP Ping",
host->id));
+ SPINE_LOG_DEBUG(("DEBUG: Device[%i] Entering TCP Ping",
host->id));
}
/* convert the host timeout to a double precision number in seconds */
@@ -781,7 +781,7 @@
/* caculate total time */
total_time = (end_time - begin_time) *
one_thousand;
- if ((return_code == -1 && errno ==
ECONNREFUSED) || return_code == 0) {
+ if ((return_code == -1 && errno == ECONNREFUSED
&& host->ping_method == PING_TCP_CLOSED) || return_code == 0) {
if (is_debug_device(host->id)) {
SPINE_LOG(("Device[%i] INFO:
TCP Device Alive, Try Count:%i, Time:%.4f ms", host->id, retry_count+1,
(total_time)));
} else {
@@ -975,7 +975,7 @@
*/
name_t *get_namebyhost(char *hostname, name_t *name) {
if (name == NULL) {
- SPINE_LOG_DEBUG(("get_namebyhost(%s) - Allocating name_t",
hostname));
+ SPINE_LOG_DEBUG(("DEBUG: get_namebyhost(%s) - Allocating
name_t", hostname));
if (!(name = (name_t *) malloc(sizeof(name_t)))) {
die("ERROR: Fatal malloc error: ping.c
get_namebyhost->name");
@@ -997,45 +997,45 @@
token = strtok(stack, ":");
if (token == NULL) {
- SPINE_LOG_DEBUG(("get_namebyhost(%s) - No delimiter, assume
full hostname", hostname));
+ SPINE_LOG_DEBUG(("DEBUG: get_namebyhost(%s) - No delimiter,
assume full hostname", hostname));
strncopy(name->hostname, hostname, SMALL_BUFSIZE);
}
while (token != NULL && tokens <= 3) {
tokens++;
- SPINE_LOG_DEBUG(("get_namebyhost(%s) - Token #%i - %s",
hostname, tokens, token));
+ SPINE_LOG_DEBUG(("DEBUG: get_namebyhost(%s) - Token #%i - %s",
hostname, tokens, token));
if (tokens == 1) {
if (strlen(token) && token[0] == '[') {
- SPINE_LOG_DEBUG(("get_namebyhost(%s) - Have
TCPv6 method", hostname));
+ SPINE_LOG_DEBUG(("DEBUG: get_namebyhost(%s) -
Have TCPv6 method", hostname));
strncpy(name->hostname, hostname,
sizeof(name->hostname));
break;
} else if (strlen(token) == 3) {
if (strncasecmp(token, "TCP", 3)) {
- SPINE_LOG_DEBUG(("get_namebyhost(%s) -
Have TCPv4 method", hostname));
+ SPINE_LOG_DEBUG(("DEBUG:
get_namebyhost(%s) - Have TCPv4 method", hostname));
name->method = 1;
} else if (strncasecmp(hostname, "UDP", 3)) {
- SPINE_LOG_DEBUG(("get_namebyhost(%s) -
Have UDPv4 method", hostname));
+ SPINE_LOG_DEBUG(("DEBUG:
get_namebyhost(%s) - Have UDPv4 method", hostname));
name->method = 2;
} else {
- SPINE_LOG_DEBUG(("get_namebyhost(%s) -
No matching method for 3 chars: %s", hostname, token));
+ SPINE_LOG_DEBUG(("DEBUG:
get_namebyhost(%s) - No matching method for 3 chars: %s", hostname, token));
// assume we have had a method
tokens++;
}
} else if (strlen(token) == 4) {
if (strncasecmp(token, "TCP6", 3)) {
- SPINE_LOG_DEBUG(("get_namebyhost(%s) -
Have TCPv6 method", hostname));
+ SPINE_LOG_DEBUG(("DEBUG:
get_namebyhost(%s) - Have TCPv6 method", hostname));
name->method = 3;
} else if (strncasecmp(hostname, "UDP6", 3)) {
- SPINE_LOG_DEBUG(("get_namebyhost(%s) -
Have UDPv6 method", hostname));
+ SPINE_LOG_DEBUG(("DEBUG:
get_namebyhost(%s) - Have UDPv6 method", hostname));
name->method = 4;
} else {
- SPINE_LOG_DEBUG(("get_namebyhost(%s) -
No matching method for 4 chars: %s", hostname, token));
+ SPINE_LOG_DEBUG(("DEBUG:
get_namebyhost(%s) - No matching method for 4 chars: %s", hostname, token));
// assume we have had a method
tokens++;
}
} else {
- SPINE_LOG_DEBUG(("get_hostbyname(%s) - No
matching method for %li chars: %s", hostname, strlen(token), token));
+ SPINE_LOG_DEBUG(("DEBUG: get_hostbyname(%s) -
No matching method for %li chars: %s", hostname, strlen(token), token));
// assume we have had a method
tokens++;
@@ -1043,18 +1043,18 @@
}
if (tokens == 2) {
- SPINE_LOG_DEBUG(("get_namebyhost(%s) - Setting
hostname: %s", hostname, token));
+ SPINE_LOG_DEBUG(("DEBUG: get_namebyhost(%s) - Setting
hostname: %s", hostname, token));
strncpy(name->hostname, token, sizeof(name->hostname));
name->hostname[strlen(token)] = '\0';
}
if (tokens == 3 && strlen(token)) {
- SPINE_LOG_DEBUG(("get_namebyhost(%s) - Setting port:
%s", hostname, token));
+ SPINE_LOG_DEBUG(("DEBUG: get_namebyhost(%s) - Setting
port: %s", hostname, token));
name->port = atoi(token);
}
if (tokens > 3) {
- SPINE_LOG_DEBUG(("get_namebyhost(%s) - Unexpected
token: %i", hostname, tokens));
+ SPINE_LOG_DEBUG(("DEBUG: get_namebyhost(%s) -
Unexpected token: %i", hostname, tokens));
}
token = strtok(NULL, ":");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.27/ping.h
new/cacti-spine-1.2.30/ping.h
--- old/cacti-spine-1.2.27/ping.h 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/ping.h 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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.27/poller.c
new/cacti-spine-1.2.30/poller.c
--- old/cacti-spine-1.2.27/poller.c 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/poller.c 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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.27/poller.h
new/cacti-spine-1.2.30/poller.h
--- old/cacti-spine-1.2.27/poller.h 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/poller.h 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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.27/snmp.c
new/cacti-spine-1.2.30/snmp.c
--- old/cacti-spine-1.2.27/snmp.c 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/snmp.c 2025-03-23 20:26:39.000000000 +0100
@@ -1,8 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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 |
@@ -355,7 +354,7 @@
return 0;
#endif
}
-
+
/* set the privacy key to the hashed version. */
SPINE_LOG_MEDIUM(("SNMP: Using privacy protocol(len):
%s(%d)", snmp_priv_protocol, session.securityPrivKeyLen));
if (generate_Ku(session.securityAuthProto,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.27/snmp.h
new/cacti-spine-1.2.30/snmp.h
--- old/cacti-spine-1.2.27/snmp.h 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/snmp.h 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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.27/spine.c
new/cacti-spine-1.2.30/spine.c
--- old/cacti-spine-1.2.27/spine.c 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/spine.c 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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 |
@@ -1165,7 +1165,7 @@
0 /* ENDMARKER */
};
- printf("SPINE %s Copyright 2004-2023 by The Cacti Group\n", VERSION);
+ printf("SPINE %s Copyright 2004-2024 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.27/spine.conf.dist
new/cacti-spine-1.2.30/spine.conf.dist
--- old/cacti-spine-1.2.27/spine.conf.dist 2024-05-12 21:30:55.000000000
+0200
+++ new/cacti-spine-1.2.30/spine.conf.dist 2025-03-23 20:26:39.000000000
+0100
@@ -1,5 +1,5 @@
# +-------------------------------------------------------------------------+
-# | Copyright (C) 2004-2023 The Cacti Group |
+# | Copyright (C) 2004-2024 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.27/spine.h
new/cacti-spine-1.2.30/spine.h
--- old/cacti-spine-1.2.27/spine.h 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/spine.h 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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 |
@@ -279,6 +279,8 @@
#define PING_ICMP 1
#define PING_UDP 2
#define PING_TCP 3
+#define PING_SNMP 4
+#define PING_TCP_CLOSED 5
#define HOST_UNKNOWN 0
#define HOST_DOWN 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cacti-spine-1.2.27/sql.c new/cacti-spine-1.2.30/sql.c
--- old/cacti-spine-1.2.27/sql.c 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/sql.c 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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.27/sql.h new/cacti-spine-1.2.30/sql.h
--- old/cacti-spine-1.2.27/sql.h 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/sql.h 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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.27/util.c
new/cacti-spine-1.2.30/util.c
--- old/cacti-spine-1.2.27/util.c 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/util.c 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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.27/util.h
new/cacti-spine-1.2.30/util.h
--- old/cacti-spine-1.2.27/util.h 2024-05-12 21:30:55.000000000 +0200
+++ new/cacti-spine-1.2.30/util.h 2025-03-23 20:26:39.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:*
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group |
+ | Copyright (C) 2004-2024 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 |
