commit 284fefda30a778a9220cd0bd5155fc784ee1b0a9
Author: Nathanael d. Noblet <nathanael@xxxxxxxxx>
Date: Mon Jan 19 11:23:30 2015 -0700
fix bug 1183256
dspam-cron | 6 +++---
dspam.spec | 6 +++++-
2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/dspam-cron b/dspam-cron
index ad92777..54abb56 100644
--- a/dspam-cron
+++ b/dspam-cron
@@ -128,15 +128,15 @@ clean_mysql_drv() {
read_dspam_params MySQLServer${PROFILE} MySQLPort${PROFILE} MySQLUser${PROFILE} MySQLPass${PROFILE} MySQLDb${PROFILE} MySQLCompress${PROFILE} && \
[ -n "${MySQLServer}" -a -n "${MySQLUser}" -a -n "${MySQLDb}" ]
then
- if [ ! -e "${MYSQL_BIN_DIR}/mysql_config" ]
+ if [ ! -e "${MYSQL_BIN_DIR}/mysql" ]
then
echo "Can not run MySQL purge script:"
- echo " ${MYSQL_BIN_DIR}/mysql_config does not exist"
+ echo " ${MYSQL_BIN_DIR}/mysql does not exist"
return 1
fi
DSPAM_MySQL_PURGE_SQL=
DSPAM_MySQL_PURGE_SQL_FILES=
- DSPAM_MySQL_VER=$(${MYSQL_BIN_DIR}/mysql_config --version | sed "s:[^0-9.]*::g")
+ DSPAM_MySQL_VER=$(${MYSQL_BIN_DIR}/mysql --version | sed -n "s:^.*[\t ]Distrib[^0-9]*\([0-9.]*\).*:\1:p")
DSPAM_MySQL_MAJOR=$(echo "${DSPAM_MySQL_VER}" | cut -d. -f1)
DSPAM_MySQL_MINOR=$(echo "${DSPAM_MySQL_VER}" | cut -d. -f2)
DSPAM_MySQL_MICRO=$(echo "${DSPAM_MySQL_VER}" | cut -d. -f3)
diff --git a/dspam.spec b/dspam.spec
index f4cf354..559b13b 100644
--- a/dspam.spec
+++ b/dspam.spec
@@ -12,7 +12,7 @@
Summary: A library and Mail Delivery Agent for Bayesian SPAM filtering
Name: dspam
Version: 3.10.2
-Release: 13%{?dist}
+Release: 14%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -371,6 +371,10 @@ exit 0
%config(noreplace) %{_sysconfdir}/httpd/conf.d/dspam-web.conf
%changelog
+* Mon Jan 19 2015 Nathanael Noblet <nathanael@xxxxxxx> - 3.10.2-14
+- Update cron script to not require mysql_config which is not provided by mariadb
+- Fixes bug #1183256
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 3.10.2-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
