Merge remote-tracking branch 'origin/master' into f27
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
This commit is contained in:
commit
5c812c7dea
@ -1,10 +0,0 @@
|
||||
--- a/src/lookups/mysql.c 2017-06-30 18:14:16.681819941 +0200
|
||||
+++ b/src/lookups/mysql.c 2017-06-30 18:14:29.776921269 +0200
|
||||
@@ -13,6 +13,7 @@
|
||||
#include "lf_functions.h"
|
||||
|
||||
#include <mysql.h> /* The system header */
|
||||
+#include <mysql_version.h>
|
||||
|
||||
|
||||
/* Structure and anchor for caching connections. */
|
73
exim-4.89-mariadb-macro-fix.patch
Normal file
73
exim-4.89-mariadb-macro-fix.patch
Normal file
@ -0,0 +1,73 @@
|
||||
diff --git a/src/lookups/mysql.c b/src/lookups/mysql.c
|
||||
index 5cf15af..b5133bc 100644
|
||||
--- a/src/lookups/mysql.c
|
||||
+++ b/src/lookups/mysql.c
|
||||
@@ -14,6 +14,53 @@ functions. */
|
||||
|
||||
#include <mysql.h> /* The system header */
|
||||
|
||||
+/* We define symbols for *_VERSION_ID (numeric), *_VERSION_STR (char*)
|
||||
+and *_BASE_STR (char*). It's a bit of guesswork. Especially for mariadb
|
||||
+with versions before 10.2, as they do not define there there specific symbols.
|
||||
+*/
|
||||
+
|
||||
+// Newer (>= 10.2) MariaDB
|
||||
+#if defined MARIADB_VERSION_ID
|
||||
+#define EXIM_MxSQL_VERSION_ID MARIADB_VERSION_ID
|
||||
+
|
||||
+// MySQL defines MYSQL_VERSION_ID, and MariaDB does so
|
||||
+// https://dev.mysql.com/doc/refman/5.7/en/c-api-server-client-versions.html
|
||||
+#elif defined LIBMYSQL_VERSION_ID
|
||||
+#define EXIM_MxSQL_VERSION_ID LIBMYSQL_VERSION_ID
|
||||
+#elif defined MYSQL_VERSION_ID
|
||||
+#define EXIM_MxSQL_VERSION_ID MYSQL_VERSION_ID
|
||||
+
|
||||
+#else
|
||||
+#define EXIM_MYSQL_VERSION_ID 0
|
||||
+#endif
|
||||
+
|
||||
+// Newer (>= 10.2) MariaDB
|
||||
+#ifdef MARIADB_CLIENT_VERSION_STR
|
||||
+#define EXIM_MxSQL_VERSION_STR MARIADB_CLIENT_VERSION_STR
|
||||
+
|
||||
+// Mysql uses MYSQL_SERVER_VERSION
|
||||
+#elif defined LIBMYSQL_VERSION
|
||||
+#define EXIM_MxSQL_VERSION_STR LIBMYSQL_VERSION
|
||||
+#elif defined MYSQL_SERVER_VERSION
|
||||
+#define EXIM_MxSQL_VERSION_STR MYSQL_SERVER_VERSION
|
||||
+
|
||||
+#else
|
||||
+#define EXIM_MxSQL_VERSION_STR "N.A."
|
||||
+#endif
|
||||
+
|
||||
+#if defined MARIADB_BASE_VERSION
|
||||
+#define EXIM_MxSQL_BASE_STR MARIADB_BASE_VERSION
|
||||
+
|
||||
+#elif defined MARIADB_PACKAGE_VERSION
|
||||
+#define EXIM_MxSQL_BASE_STR "mariadb"
|
||||
+
|
||||
+#elif defined MYSQL_BASE_VERSION
|
||||
+#define EXIM_MxSQL_BASE_STR MYSQL_BASE_VERSION
|
||||
+
|
||||
+#else
|
||||
+#define EXIM_MxSQL_BASE_STR "n.A."
|
||||
+#endif
|
||||
+
|
||||
|
||||
/* Structure and anchor for caching connections. */
|
||||
|
||||
@@ -432,10 +479,10 @@ return quoted;
|
||||
void
|
||||
mysql_version_report(FILE *f)
|
||||
{
|
||||
-fprintf(f, "Library version: MySQL: Compile: %s [%s]\n"
|
||||
- " Runtime: %s\n",
|
||||
- MYSQL_SERVER_VERSION, MYSQL_COMPILATION_COMMENT,
|
||||
- mysql_get_client_info());
|
||||
+fprintf(f, "Library version: MySQL: Compile: %lu %s [%s]\n"
|
||||
+ " Runtime: %lu %s\n",
|
||||
+ (long)EXIM_MxSQL_VERSION_ID, EXIM_MxSQL_VERSION_STR, EXIM_MxSQL_BASE_STR,
|
||||
+ mysql_get_client_version(), mysql_get_client_info());
|
||||
#ifdef DYNLOOKUP
|
||||
fprintf(f, " Exim version %s\n", EXIM_VERSION_STR);
|
||||
#endif
|
13
exim.spec
13
exim.spec
@ -62,14 +62,13 @@ Patch25: exim-4.87-dynlookup-config.patch
|
||||
# Upstream ticket: http://bugs.exim.org/show_bug.cgi?id=1584
|
||||
Patch26: exim-4.85-pic.patch
|
||||
Patch27: exim-4.89-environment.patch
|
||||
# https://github.com/Exim/exim/pull/56
|
||||
Patch28: exim-4.89-mariadb-10.2-compile-fix.patch
|
||||
# Backported from upstream:
|
||||
# https://github.com/Exim/exim/commit/65e061b76867a9ea7aeeb535341b790b90ae6c21
|
||||
Patch29: exim-4.89-CVE-2017-1000369.patch
|
||||
Patch28: exim-4.89-CVE-2017-1000369.patch
|
||||
# Backported from upstream:
|
||||
# https://git.exim.org/exim.git/commitdiff/14de8063d82edc5bf003ed50abdea55ac542679b
|
||||
Patch30: exim-4.89-calloutsize.patch
|
||||
Patch29: exim-4.89-calloutsize.patch
|
||||
Patch30: exim-4.89-mariadb-macro-fix.patch
|
||||
Patch31: exim-4.89-CVE-2017-16943.patch
|
||||
|
||||
Requires: /etc/pki/tls/certs /etc/pki/tls/private
|
||||
@ -217,9 +216,9 @@ greylisting unconditional.
|
||||
%patch25 -p1 -b .dynconfig
|
||||
%patch26 -p1 -b .fpic
|
||||
%patch27 -p1 -b .environment
|
||||
%patch28 -p1 -b .mariadb-10.2-compile-fix
|
||||
%patch29 -p1 -b .CVE-2017-1000369
|
||||
%patch30 -p1 -b .calloutsize
|
||||
%patch28 -p1 -b .CVE-2017-1000369
|
||||
%patch29 -p1 -b .calloutsize
|
||||
%patch30 -p1 -b .mariadb-macro-fix
|
||||
%patch31 -p1 -b .CVE-2017-16943
|
||||
|
||||
cp src/EDITME Local/Makefile
|
||||
|
Loading…
Reference in New Issue
Block a user