From cfad5de71ef8a9fd5d6029965d318e5eb46d25ba Mon Sep 17 00:00:00 2001
From: "Nathanael d. Noblet" <nathan...@noblet.ca>
Date: Sat, 15 Jul 2017 21:42:33 -0600
Subject: fix bug #1467703 - FTBFS when compiled against mariadb
---
dspam-mariadb.patch | 40 ++++++++++++++++++++++++++++++++++++++++
dspam.spec | 7 ++++++-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 dspam-mariadb.patch
diff --git a/dspam-mariadb.patch b/dspam-mariadb.patch
new file mode 100644
index 0000000..ffbd2de
--- /dev/null
+++ b/dspam-mariadb.patch
@@ -0,0 +1,40 @@
+--- configure.orig 2017-07-04 18:14:50.830438947 +0200
++++ configure 2017-07-04 18:16:02.697004594 +0200
+@@ -13280,7 +13280,7 @@
+ #include <mysql.h>
+ #include <mysqld_error.h>
+ #include <errmsg.h>
+- #if defined(PROTOCOL_VERSION) && defined(ER_LOCK_DEADLOCK) &&
defined(ER_LOCK_WAIT_TIMEOUT) && defined(ER_LOCK_OR_ACTIVE_TRANSACTION) &&
defined(CR_ERROR_FIRST)
++ #if defined(PROTOCOL_VERSION) && defined(ER_LOCK_DEADLOCK) &&
defined(ER_LOCK_WAIT_TIMEOUT) && defined(ER_LOCK_OR_ACTIVE_TRANSACTION) &&
defined(CR_MIN_ERROR)
+ /* Success */
+ #else
+ #error Unsupported version of MySQL
+@@ -13293,7 +13293,7 @@
+
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in
\`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "Unsupported version of MySQL (no PROTOCOL_VERSION or
ER_LOCK_DEADLOCK or ER_LOCK_WAIT_TIMEOUT or ER_LOCK_OR_ACTIVE_TRANSACTION or
CR_ERROR_FIRST defined)
++as_fn_error $? "Unsupported version of MySQL (no PROTOCOL_VERSION or
ER_LOCK_DEADLOCK or ER_LOCK_WAIT_TIMEOUT or ER_LOCK_OR_ACTIVE_TRANSACTION or
CR_MIN_ERROR defined)
+ See \`config.log' for more details" "$LINENO" 5; }
+ mysql_headers_success=no
+
+--- m4/mysql_drv.m4.orig 2017-07-04 18:22:08.359882653 +0200
++++ m4/mysql_drv.m4 2017-07-04 18:17:59.545924287 +0200
+@@ -80,7 +80,7 @@
+ #include <mysql.h>
+ #include <mysqld_error.h>
+ #include <errmsg.h>
+- #if defined(PROTOCOL_VERSION) && defined(ER_LOCK_DEADLOCK) &&
defined(ER_LOCK_WAIT_TIMEOUT) && defined(ER_LOCK_OR_ACTIVE_TRANSACTION) &&
defined(CR_ERROR_FIRST)
++ #if defined(PROTOCOL_VERSION) && defined(ER_LOCK_DEADLOCK) &&
defined(ER_LOCK_WAIT_TIMEOUT) && defined(ER_LOCK_OR_ACTIVE_TRANSACTION) &&
defined(CR_MIN_ERROR)
+ /* Success */
+ #else
+ #error Unsupported version of MySQL
+@@ -88,7 +88,7 @@
+ ]])],
+ [],
+ [
+- AC_MSG_FAILURE([Unsupported version of MySQL (no
PROTOCOL_VERSION or ER_LOCK_DEADLOCK or ER_LOCK_WAIT_TIMEOUT or
ER_LOCK_OR_ACTIVE_TRANSACTION or CR_ERROR_FIRST defined)])
++ AC_MSG_FAILURE([Unsupported version of MySQL (no
PROTOCOL_VERSION or ER_LOCK_DEADLOCK or ER_LOCK_WAIT_TIMEOUT or
ER_LOCK_OR_ACTIVE_TRANSACTION or CR_MIN_ERROR defined)])
+ mysql_headers_success=no
+ ])
+ fi
diff --git a/dspam.spec b/dspam.spec
index 5ef8b30..34b65e3 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: 21%{?dist}
+Release: 22%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source0:
http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -29,6 +29,7 @@ Patch3: dspam-default-server-port.patch
Patch4: dspam-3.10.2.exim.patch
Patch5: dspam-recipient-corruption.patch
Patch6: dspam-sqlite3_drv.patch
+Patch7: dspam-mariadb.patch
URL: http://www.nuclearelephant.com/
# kept to be able to build EPEL versions
@@ -146,6 +147,7 @@ Web-based interface for DSPAM's powerful Anti-Spam engine.
%patch4 -p0
%patch5 -p1
%patch6 -p0
+%patch7 -p0
%build
@@ -375,6 +377,9 @@ exit 0
%config(noreplace) %{_sysconfdir}/httpd/conf.d/dspam-web.conf
%changelog
+* Sat Jul 15 2017 Nathanael Noblet <nathan...@gnat.ca> - 3.10.2-22
+- Fixed FTBFS Bug #1467703 when compiling against mariadb
+
* Fri Feb 10 2017 Fedora Release Engineering <rel...@fedoraproject.org> -
3.10.2-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
--
cgit v1.1
https://src.fedoraproject.org/cgit/dspam.git/commit/?h=master&id=cfad5de71ef8a9fd5d6029965d318e5eb46d25ba
_______________________________________________
perl-devel mailing list -- perl-devel@lists.fedoraproject.org
To unsubscribe send an email to perl-devel-le...@lists.fedoraproject.org
