Hello community, here is the log from the commit of package cacti-spine for openSUSE:Factory checked in at 2020-11-13 18:58:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cacti-spine (Old) and /work/SRC/openSUSE:Factory/.cacti-spine.new.24930 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cacti-spine" Fri Nov 13 18:58:06 2020 rev:30 rq:847923 version:1.2.15 Changes: -------- --- /work/SRC/openSUSE:Factory/cacti-spine/cacti-spine.changes 2020-08-04 20:24:18.141020436 +0200 +++ /work/SRC/openSUSE:Factory/.cacti-spine.new.24930/cacti-spine.changes 2020-11-13 18:58:23.758070292 +0100 @@ -1,0 +2,6 @@ +Wed Nov 11 18:02:18 UTC 2020 - Andreas Stieger <andreas.stie...@gmx.de> + +- cacti-spine 1.2.15: + * Special characters may not always be ignored properly + +------------------------------------------------------------------- Old: ---- cacti-spine-1.2.14.tar.gz New: ---- cacti-spine-1.2.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cacti-spine.spec ++++++ --- /var/tmp/diff_new_pack.icSmzy/_old 2020-11-13 18:58:24.174070748 +0100 +++ /var/tmp/diff_new_pack.icSmzy/_new 2020-11-13 18:58:24.178070752 +0100 @@ -17,7 +17,7 @@ Name: cacti-spine -Version: 1.2.14 +Version: 1.2.15 Release: 0 Summary: Threaded poller for Cacti written in C License: LGPL-2.1-or-later ++++++ cacti-spine-1.2.14.tar.gz -> cacti-spine-1.2.15.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cacti-spine-1.2.14/CHANGELOG new/cacti-spine-1.2.15/CHANGELOG --- old/cacti-spine-1.2.14/CHANGELOG 2020-08-03 00:31:02.000000000 +0200 +++ new/cacti-spine-1.2.15/CHANGELOG 2020-11-02 04:28:32.000000000 +0100 @@ -1,5 +1,9 @@ The Cacti Group | spine +1.2.15 +-issue#166: Special characters may not always be ignored properly +-issue#168: Correct issues with linking under OpenBSD + 1.2.14 -issue#162: Spine not updating rrd_next_step diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cacti-spine-1.2.14/configure.ac new/cacti-spine-1.2.15/configure.ac --- old/cacti-spine-1.2.14/configure.ac 2020-08-03 00:31:02.000000000 +0200 +++ new/cacti-spine-1.2.15/configure.ac 2020-11-02 04:28:32.000000000 +0100 @@ -1,5 +1,5 @@ AC_PREREQ(2.53) -AC_INIT(Spine Poller, 1.2.14, http://www.cacti.net/issues.php) +AC_INIT(Spine Poller, 1.2.15, http://www.cacti.net/issues.php) AC_CONFIG_AUX_DIR(config) AC_SUBST(ac_aux_dir) @@ -257,12 +257,22 @@ fi CFLAGS="-I$MYSQL_INC_DIR $CFLAGS" -AC_CHECK_LIB(mysqlclient, mysql_init, - [ LIBS="-lmysqlclient -lm -ldl $LIBS" - AC_DEFINE(HAVE_MYSQL, 1, MySQL Client API) - HAVE_MYSQL=yes ], - [ HAVE_MYSQL=no ] -) +unamestr=$(uname) +if test $unamestr == 'OpenBSD'; then + AC_CHECK_LIB(mysqlclient, mysql_init, + [ LIBS="-lmysqlclient -lm $LIBS" + AC_DEFINE(HAVE_MYSQL, 1, MySQL Client API) + HAVE_MYSQL=yes ], + [ HAVE_MYSQL=no ] + ) +else + AC_CHECK_LIB(mysqlclient, mysql_init, + [ LIBS="-lmysqlclient -lm -ldl $LIBS" + AC_DEFINE(HAVE_MYSQL, 1, MySQL Client API) + HAVE_MYSQL=yes ], + [ HAVE_MYSQL=no ] + ) +fi if test $MYSQL_REENTRANT = 1 ; then LIBS="-lmysqlclient_r -lm -ldl $LIBS" @@ -274,7 +284,11 @@ LIBS="-lmysqlclient_r -lm -ldl $LIBS" else if test "$HAVE_MYSQL" == "yes"; then - LIBS="-lmysqlclient -lm -ldl $LIBS" + if test $unamestr == 'OpenBSD'; then + LIBS="-lmysqlclient -lm $LIBS" + else + LIBS="-lmysqlclient -lm -ldl $LIBS" + fi else LIBS="-lmariadbclient -lm -ldl $LIBS" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cacti-spine-1.2.14/util.c new/cacti-spine-1.2.15/util.c --- old/cacti-spine-1.2.14/util.c 2020-08-03 00:31:02.000000000 +0200 +++ new/cacti-spine-1.2.15/util.c 2020-11-02 04:28:32.000000000 +0100 @@ -1345,32 +1345,44 @@ * * \return TRUE if the string is valid hex, FALSE otherwise * + * The function is modified where the string needs to include + * at least one of the following string ' ', '-', or ':' + * */ -int is_hexadecimal(const char * str, const short ignore_space) { +int is_hexadecimal(const char * str, const short ignore_special) { int i = 0; + int delim_found = FALSE; if (!str) return FALSE; while (*str) { switch (*str) { - case '0': case '1': case '2': case '3': - case '4': case '5': case '6': case '7': - case '8': case '9': - case 'a': case 'A': case 'b': case 'B': - case 'c': case 'C': case 'd': case 'D': - case 'e': case 'E': case 'f': case 'F': - case '"': - break; - case ' ': case '\t': - if (ignore_space) break; - default: - return FALSE; + case '0': case '1': case '2': case '3': + case '4': case '5': case '6': case '7': + case '8': case '9': + case 'a': case 'A': case 'b': case 'B': + case 'c': case 'C': case 'd': case 'D': + case 'e': case 'E': case 'f': case 'F': + case '"': + break; + case '-': case ':': case ' ': + delim_found = TRUE; + break; + case '\t': + if (ignore_special) { + break; + } + default: + return FALSE; } + str++; i++; } - if (i < 3) return FALSE; + if ((i < 3) || delim_found == FALSE) { + return FALSE; + } return TRUE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cacti-spine-1.2.14/util.h new/cacti-spine-1.2.15/util.h --- old/cacti-spine-1.2.14/util.h 2020-08-03 00:31:02.000000000 +0200 +++ new/cacti-spine-1.2.15/util.h 2020-11-02 04:28:32.000000000 +0100 @@ -51,7 +51,7 @@ extern int is_numeric(char *string); extern int is_ipaddress(const char *string); extern int all_digits(const char *str); -extern int is_hexadecimal(const char * str, const short ignore_space); +extern int is_hexadecimal(const char * str, const short ignore_special); /* determine if a device is a debug device */ extern int is_debug_device(int device_id); _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
