diff options
Diffstat (limited to 'package/dovecot')
| -rw-r--r-- | package/dovecot/0002-fix-static-build.patch | 24 | ||||
| -rw-r--r-- | package/dovecot/0003-fix-static-build.patch | 24 |
2 files changed, 48 insertions, 0 deletions
diff --git a/package/dovecot/0002-fix-static-build.patch b/package/dovecot/0002-fix-static-build.patch new file mode 100644 index 0000000000..be646bc6a4 --- /dev/null +++ b/package/dovecot/0002-fix-static-build.patch @@ -0,0 +1,24 @@ +Fix static build + +MODULE_SUFFIX is undefined when building statically; don't used it. + +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +--- +Patch status: sent upstream +(http://dovecot.org/pipermail/dovecot/2014-November/098694.html) + +diff -Nuar dovecot-2.2.15-orig/src/lib/module-dir.c dovecot-2.2.15/src/lib/module-dir.c +--- dovecot-2.2.15-orig/src/lib/module-dir.c 2014-10-18 00:10:15.000000000 +0300 ++++ dovecot-2.2.15/src/lib/module-dir.c 2014-11-13 19:27:29.417786313 +0200 +@@ -621,7 +621,11 @@ + if (*p == '_') + fname = p + 1; + ++#ifdef MODULE_SUFFIX + p = strstr(fname, MODULE_SUFFIX); ++#else ++ p = NULL; ++#endif + if (p == NULL) + return fname; + diff --git a/package/dovecot/0003-fix-static-build.patch b/package/dovecot/0003-fix-static-build.patch new file mode 100644 index 0000000000..c5dd9d1389 --- /dev/null +++ b/package/dovecot/0003-fix-static-build.patch @@ -0,0 +1,24 @@ +Fix symbol conflict in static build with MySQL enabled + +Compile error log: +http://autobuild.buildroot.net/results/9b5/9b536926b3b2bf82c683b48e9697a220f1b4bf33/build-end.log + +Patch suggested by Timo Sirainen: +http://www.dovecot.org/list/dovecot/2014-November/098787.html + +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> + +diff -uNr dovecot-2.2.15.org/src/lib/strnum.h dovecot-2.2.15/src/lib/strnum.h +--- dovecot-2.2.15.org/src/lib/strnum.h 2014-07-02 17:21:24.000000000 +0200 ++++ dovecot-2.2.15/src/lib/strnum.h 2014-11-21 19:26:42.316225982 +0100 +@@ -1,6 +1,10 @@ + #ifndef STRNUM_H + #define STRNUM_H + ++/* libmysqlclient really should try to keep its internal stuff internal so ++ they won't conflict with the actual programs that are trying to use it. */ ++#define str_to_time str_to_time_libmysqlclient_craps_all_over ++ + /* Return TRUE if all characters in string are numbers. + Stop when `end_char' is found from string. */ + bool str_is_numeric(const char *str, char end_char) ATTR_PURE; |
