Hello community,
here is the log from the commit of package cacti-spine for openSUSE:Factory checked in at 2019-04-01 12:40:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cacti-spine (Old)
and /work/SRC/openSUSE:Factory/.cacti-spine.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cacti-spine"
Mon Apr 1 12:40:37 2019 rev:20 rq:690273 version:1.2.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/cacti-spine/cacti-spine.changes 2019-03-01 16:46:44.929814474 +0100
+++ /work/SRC/openSUSE:Factory/.cacti-spine.new.25356/cacti-spine.changes 2019-04-01 12:40:57.253990032 +0200
@@ -1,0 +2,7 @@
+Mon Apr 1 08:29:05 UTC 2019 - David Liedke
+
+-Update to version 1.2.3
+ * issue#76: Spine unhandled exception signal
+ * issue: More recent versions of MariaDB require different client library
+
+-------------------------------------------------------------------
Old:
----
1.2.2.tar.gz
New:
----
1.2.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cacti-spine.spec ++++++
--- /var/tmp/diff_new_pack.19nj5s/_old 2019-04-01 12:40:57.821990307 +0200
+++ /var/tmp/diff_new_pack.19nj5s/_new 2019-04-01 12:40:57.821990307 +0200
@@ -17,7 +17,7 @@
Name: cacti-spine
-Version: 1.2.2
+Version: 1.2.3
Release: 0
Url: https://github.com/Cacti/spine
Source: https://github.com/Cacti/spine/archive/release/%{version}.tar.gz
++++++ 1.2.2.tar.gz -> 1.2.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spine-release-1.2.2/.github/ISSUE_TEMPLATE/bug_report.md new/spine-release-1.2.3/.github/ISSUE_TEMPLATE/bug_report.md
--- old/spine-release-1.2.2/.github/ISSUE_TEMPLATE/bug_report.md 1970-01-01 01:00:00.000000000 +0100
+++ new/spine-release-1.2.3/.github/ISSUE_TEMPLATE/bug_report.md 2019-03-31 00:37:19.000000000 +0100
@@ -0,0 +1,42 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Server (please complete the following information):**
+ - OS: [e.g. CentOS 7]
+ - Version [e.g. 22]
+
+**Compiling (please complete the following information):**
+
+ - compiler: [e.g. clang or gcc 5.4.0]
+ - autoconf: [e.g. autoconf 2.69]
+ - glibc: [e.g. 2.23]
+ - source: [e.g. release or github]
+
+*Note: you can find glibc version by running `ldd --version`*
+
+*Note: if source is github, please include last commit reference*
+
+**Additional context**
+Add any other context about the problem here including logs and command line output
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spine-release-1.2.2/.github/ISSUE_TEMPLATE/feature_request.md new/spine-release-1.2.3/.github/ISSUE_TEMPLATE/feature_request.md
--- old/spine-release-1.2.2/.github/ISSUE_TEMPLATE/feature_request.md 1970-01-01 01:00:00.000000000 +0100
+++ new/spine-release-1.2.3/.github/ISSUE_TEMPLATE/feature_request.md 2019-03-31 00:37:19.000000000 +0100
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spine-release-1.2.2/.travis.yml new/spine-release-1.2.3/.travis.yml
--- old/spine-release-1.2.2/.travis.yml 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/.travis.yml 2019-03-31 00:37:19.000000000 +0100
@@ -1,29 +1,26 @@
language: c
compiler:
- - gcc
+- gcc
before_install:
- - sudo apt-get -qq update
- - sudo apt-get install -y tofrodos libmysqlclient-dev libsnmp-dev help2man
- - sudo ln -s /usr/bin/fromdos /usr/bin/dos2unix
- - sudo ln -s /usr/bin/todos /usr/bin/unix2dos
+- sudo apt-get -qq update
+- sudo apt-get install -y tofrodos libmysqlclient-dev libsnmp-dev help2man
+- sudo ln -s /usr/bin/fromdos /usr/bin/dos2unix
+- sudo ln -s /usr/bin/todos /usr/bin/unix2dos
install:
- - "./bootstrap"
+- "./bootstrap"
script:
- - ./configure
- - make
+- "./configure"
+- make
notifications:
email:
on_success: change
on_failure: always
recipients:
- - developers@cacti.net
+ - developers@cacti.net
slack:
- on_success: always
- on_failure: always
- rooms:
- secure: XsyAxzfbf5GjQjNCxsDzLD8L33g1idUglYbcZy/y917Z1zeKTR6qYqJRf90vHB0o8H37aM4iSqsg4V1B4ZlNuHTQ2Ju+BYWugWno6apJ/NIDA8jK3+JIN7/h43eHmI1jgedGMqsEZwE0U6pjZDeFNh2JtznH72RFK5dyrU15bWEcCBQhsWrWTCKtQbrxhGXcflTuV0+4nqKPJDR0+77XhkkXbZsbTEC0MJQFghWVIJZXEtTpYxONEe4t6hEXhIZAgRoHyvGitjIDuEFIzGwtjbSF4KcxdAZWtBDpY+NZ4FMng+B+APs9Z7m8+1CgetXLWcGfc5LY73gNWs8041yHenP2S8Rko21bXrtYUlw9x0bnQOkNKHpTQmM09lPbmjOnPwGhVzdajPKVun7msFrwFDqzw5+tDUYaU+lP/E32MvJ4xEbGNr7Q1XmEg+4bHRTDbmaAEKis27Qo44UyOH+orZ/lhS3aleZ267uhwQKtpNG7ylCTCZMpQ+C5rtlNOs06leNcgLN5DC/0+5LWrMPlA0+xLyfvHoL+EGlv4qBD/hX6RD5Bd/JrKmM0txUA6HBXLUqBqOqNO8AQl74rQwLs2S8dgdEnfSA84FnbrUjPZMN15rqOxXFIRYacJBBm1N8iMqAEHFavA136/zeBhacsd2Ko3fWApM4RqvaGLg0Pbsw=
+ secure: 2FRfCvHDhN0kX4zsqOiz9EL106enqQyQE4+iawOyBXFKDM1QZLMWRIRu2B8GEW8w1OBBFHD7e1S0BawVlpvN++hIkaZl7rdnTuk0CRwpktQ7uVQyyybcs0zWctEIhbgzAfMRX5cez1EWPeHgqXjDbEgFA64Vu2XrRbFIe8hYUkpYxFe8dMEkAr/JCFYSWC4oOKA2OdYhs55AJ0ydZzFt/j83wKWHZ18DXgO3Y+opzDfUkY/EEUefcLmdyv7sKvqLC1QG1FhMpN2ZBGNz1umbL2WouZHZzAyw0moNSRYsOt9za5eWnLHvtoHvv0RTwe9aeab+8v7OMeeqHW/4pUocSBh/QMW5NLTPKvnMpVx0VsnVxKk0Q6e4FfpC1RioxTd+3f7v/5O6cwGOi/1SKJ7TKUX/mihHJiy3VUubcYWXhL6vymcSpM34ejOxNo9tQtnGVWz9OgqfzsNtmwMwrEGv7qeGjhIDsGmN2jOIqT/6ZA6bOyFRkQuQXWxYdngRFIUXqaGaPw1GRPAburBa4tE53b+wRXFKIH1mLsAwzk3r3db6wpVraSfxQHtpVgTU8esM7dsH3RgBDMYoiwXafJ1/GcgdfPRXZr5RAB4JOIxWJEHcULX6k+ktisPFUXzipBeXIQhXsui6d+l0WVjuy/AM3HrHFhN345flJCpHNhkUPFc=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spine-release-1.2.2/CHANGELOG new/spine-release-1.2.3/CHANGELOG
--- old/spine-release-1.2.2/CHANGELOG 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/CHANGELOG 2019-03-31 00:37:19.000000000 +0100
@@ -1,5 +1,9 @@
The Cacti Group | spine
+1.2.3
+-issue#76: Spine unhandled exception signal
+-issue: More recent versions of MariaDB require different client library
+
1.2.2
-feature: release to match Cacti release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spine-release-1.2.2/common.h new/spine-release-1.2.3/common.h
--- old/spine-release-1.2.2/common.h 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/common.h 2019-03-31 00:37:19.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2018 The Cacti Group |
+ | Copyright (C) 2004-2019 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/spine-release-1.2.2/configure.ac new/spine-release-1.2.3/configure.ac
--- old/spine-release-1.2.2/configure.ac 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/configure.ac 2019-03-31 00:37:19.000000000 +0100
@@ -1,5 +1,5 @@
AC_PREREQ(2.53)
-AC_INIT(Spine Poller, 1.2.2, http://www.cacti.net/issues.php)
+AC_INIT(Spine Poller, 1.2.3, http://www.cacti.net/issues.php)
AC_CONFIG_AUX_DIR(config)
AC_SUBST(ac_aux_dir)
@@ -121,6 +121,7 @@
AC_CHECK_LIB(nls, gethostbyname_r)
AC_CHECK_LIB(socket, socket)
AC_CHECK_LIB(m, floor)
+AC_CHECK_LIB(dl, dlclose)
AC_CHECK_LIB(pthread, pthread_exit)
# Some builds of MySQL require libz - try to detect
@@ -259,21 +260,27 @@
MYSQL_LIB_CHK($i/lib/mysql)
done
+AC_PATH_PROG([MARIADB], [mariadb_config], [])
+
if test -n "$MYSQL_LIB_DIR" ; then
LDFLAGS="-L$MYSQL_LIB_DIR $LDFLAGS"
fi
CFLAGS="-I$MYSQL_INC_DIR $CFLAGS"
if test $MYSQL_REENTRANT = 1 ; then
- LIBS="-lmysqlclient_r $LIBS"
+ LIBS="-lmysqlclient_r -lm -ldl $LIBS"
else
if test -f $MYSQL_LIB_DIR/libmysqlclient_r.a -o -f $MYSQL_LIB_DIR/libmysqlclient_r.$ShLib; then
- LIBS="-lmysqlclient_r $LIBS"
+ LIBS="-lmysqlclient_r -lm -ldl $LIBS"
else
if test -f $MYSQL_LIB_DIR/libmysqlclient_r.a -o -f $MYSQL_LIB_DIR/libmysqlclient_r.$ShLib ; then
- LIBS="-lmysqlclient_r $LIBS"
+ LIBS="-lmysqlclient_r -lm -ldl $LIBS"
else
- LIBS="-lmysqlclient $LIBS"
+ if test "x$MARIADB" != "x"; then
+ LIBS="-lmariadbclient -lm -ldl $LIBS"
+ else
+ LIBS="-lmysqlclient -lm -ldl $LIBS"
+ fi
fi
fi
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spine-release-1.2.2/error.c new/spine-release-1.2.3/error.c
--- old/spine-release-1.2.2/error.c 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/error.c 2019-03-31 00:37:19.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2018 The Cacti Group |
+ | Copyright (C) 2004-2019 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/spine-release-1.2.2/error.h new/spine-release-1.2.3/error.h
--- old/spine-release-1.2.2/error.h 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/error.h 2019-03-31 00:37:19.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2018 The Cacti Group |
+ | Copyright (C) 2004-2019 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/spine-release-1.2.2/keywords.c new/spine-release-1.2.3/keywords.c
--- old/spine-release-1.2.2/keywords.c 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/keywords.c 2019-03-31 00:37:19.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2018 The Cacti Group |
+ | Copyright (C) 2004-2019 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/spine-release-1.2.2/keywords.h new/spine-release-1.2.3/keywords.h
--- old/spine-release-1.2.2/keywords.h 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/keywords.h 2019-03-31 00:37:19.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2018 The Cacti Group |
+ | Copyright (C) 2004-2019 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/spine-release-1.2.2/locks.c new/spine-release-1.2.3/locks.c
--- old/spine-release-1.2.2/locks.c 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/locks.c 2019-03-31 00:37:19.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2018 The Cacti Group |
+ | Copyright (C) 2004-2019 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/spine-release-1.2.2/locks.h new/spine-release-1.2.3/locks.h
--- old/spine-release-1.2.2/locks.h 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/locks.h 2019-03-31 00:37:19.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2018 The Cacti Group |
+ | Copyright (C) 2004-2019 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/spine-release-1.2.2/package new/spine-release-1.2.3/package
--- old/spine-release-1.2.2/package 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/package 2019-03-31 00:37:19.000000000 +0100
@@ -73,11 +73,11 @@
./bootstrap
# Check working directory
-cd ..
+cd ${TMP_DIR}/
# Package it
echo "INFO: Packaging..."
-tar -zcf cacti-spine-${VERSION}.tar.gz cacti-spine-${VERSION}
+tar -zcf cacti-spine-${VERSION}.tar.gz cacti-spine-${VERSION}
[ $? -gt 1 ] && echo "ERROR: Unable to package" && exit -1
# Change working directory
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spine-release-1.2.2/php.c new/spine-release-1.2.3/php.c
--- old/spine-release-1.2.2/php.c 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/php.c 2019-03-31 00:37:19.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2018 The Cacti Group |
+ | Copyright (C) 2004-2019 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/spine-release-1.2.2/php.h new/spine-release-1.2.3/php.h
--- old/spine-release-1.2.2/php.h 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/php.h 2019-03-31 00:37:19.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2018 The Cacti Group |
+ | Copyright (C) 2004-2019 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/spine-release-1.2.2/ping.c new/spine-release-1.2.3/ping.c
--- old/spine-release-1.2.2/ping.c 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/ping.c 2019-03-31 00:37:19.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2018 The Cacti Group |
+ | Copyright (C) 2004-2019 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/spine-release-1.2.2/ping.h new/spine-release-1.2.3/ping.h
--- old/spine-release-1.2.2/ping.h 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/ping.h 2019-03-31 00:37:19.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2018 The Cacti Group |
+ | Copyright (C) 2004-2019 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/spine-release-1.2.2/poller.c new/spine-release-1.2.3/poller.c
--- old/spine-release-1.2.2/poller.c 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/poller.c 2019-03-31 00:37:19.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2017 The Cacti Group |
+ | Copyright (C) 2004-2019 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/spine-release-1.2.2/poller.h new/spine-release-1.2.3/poller.h
--- old/spine-release-1.2.2/poller.h 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/poller.h 2019-03-31 00:37:19.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2018 The Cacti Group |
+ | Copyright (C) 2004-2019 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/spine-release-1.2.2/snmp.c new/spine-release-1.2.3/snmp.c
--- old/spine-release-1.2.2/snmp.c 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/snmp.c 2019-03-31 00:37:19.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2018 The Cacti Group |
+ | Copyright (C) 2004-2019 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/spine-release-1.2.2/snmp.h new/spine-release-1.2.3/snmp.h
--- old/spine-release-1.2.2/snmp.h 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/snmp.h 2019-03-31 00:37:19.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2018 The Cacti Group |
+ | Copyright (C) 2004-2019 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/spine-release-1.2.2/spine.c new/spine-release-1.2.3/spine.c
--- old/spine-release-1.2.2/spine.c 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/spine.c 2019-03-31 00:37:19.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2018 The Cacti Group |
+ | Copyright (C) 2004-2019 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 |
@@ -943,7 +943,7 @@
0 /* ENDMARKER */
};
- printf("SPINE %s Copyright 2004-2017 by The Cacti Group\n", VERSION);
+ printf("SPINE %s Copyright 2004-2019 by The Cacti Group\n", VERSION);
if (only_version == FALSE) {
printf("\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spine-release-1.2.2/spine.conf.dist new/spine-release-1.2.3/spine.conf.dist
--- old/spine-release-1.2.2/spine.conf.dist 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/spine.conf.dist 2019-03-31 00:37:19.000000000 +0100
@@ -1,5 +1,5 @@
# +-------------------------------------------------------------------------+
-# | Copyright (C) 2004-2018 The Cacti Group |
+# | Copyright (C) 2004-2019 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/spine-release-1.2.2/spine.h new/spine-release-1.2.3/spine.h
--- old/spine-release-1.2.2/spine.h 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/spine.h 2019-03-31 00:37:19.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2018 The Cacti Group |
+ | Copyright (C) 2004-2019 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/spine-release-1.2.2/sql.c new/spine-release-1.2.3/sql.c
--- old/spine-release-1.2.2/sql.c 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/sql.c 2019-03-31 00:37:19.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2018 The Cacti Group |
+ | Copyright (C) 2004-2019 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 |
@@ -326,7 +326,9 @@
*
*/
void db_disconnect(MYSQL *mysql) {
- mysql_close(mysql);
+ if (mysql != NULL) {
+ mysql_close(mysql);
+ }
}
/*! \fn int append_hostrange(char *obuf, const char *colname, const config_t *set)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spine-release-1.2.2/sql.h new/spine-release-1.2.3/sql.h
--- old/spine-release-1.2.2/sql.h 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/sql.h 2019-03-31 00:37:19.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2018 The Cacti Group |
+ | Copyright (C) 2004-2019 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/spine-release-1.2.2/util.c new/spine-release-1.2.3/util.c
--- old/spine-release-1.2.2/util.c 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/util.c 2019-03-31 00:37:19.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2018 The Cacti Group |
+ | Copyright (C) 2004-2019 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/spine-release-1.2.2/util.h new/spine-release-1.2.3/util.h
--- old/spine-release-1.2.2/util.h 2019-02-24 14:42:54.000000000 +0100
+++ new/spine-release-1.2.3/util.h 2019-03-31 00:37:19.000000000 +0100
@@ -1,7 +1,7 @@
/*
ex: set tabstop=4 shiftwidth=4 autoindent:*
+-------------------------------------------------------------------------+
- | Copyright (C) 2004-2018 The Cacti Group |
+ | Copyright (C) 2004-2019 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 |