pkgs/servers/mail/dspam/mariadb.patch

   1 diff -ur dspam-3.10.2.orig/configure dspam-3.10.2/configure
   2 --- dspam-3.10.2.orig/configure 2012-04-24 02:53:49.000000000 +0900
   3 +++ dspam-3.10.2/configure      2019-05-24 01:59:06.557890494 +0900
   4 @@ -13280,7 +13280,7 @@
   5      #include <mysql.h>
   6      #include <mysqld_error.h>
   7      #include <errmsg.h>
   8 -    #if defined(PROTOCOL_VERSION) && defined(ER_LOCK_DEADLOCK) && defined(ER_LOCK_WAIT_TIMEOUT) && defined(ER_LOCK_OR_ACTIVE_TRANSACTION) && defined(CR_ERROR_FIRST)
   9 +    #if defined(PROTOCOL_VERSION) && defined(ER_LOCK_DEADLOCK) && defined(ER_LOCK_WAIT_TIMEOUT) && defined(ER_LOCK_OR_ACTIVE_TRANSACTION) && defined(CR_MIN_ERROR)
  10      /* Success */
  11      #else
  12      #error Unsupported version of MySQL
  13 @@ -13293,7 +13293,7 @@
  14
  15                  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  16  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  17 -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)
  18 +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)
  19  See \`config.log' for more details" "$LINENO" 5; }
  20                  mysql_headers_success=no
  21
  22 diff -ur dspam-3.10.2.orig/m4/mysql_drv.m4 dspam-3.10.2/m4/mysql_drv.m4
  23 --- dspam-3.10.2.orig/m4/mysql_drv.m4   2011-08-17 07:38:30.000000000 +0900
  24 +++ dspam-3.10.2/m4/mysql_drv.m4        2019-05-24 02:00:08.301217506 +0900
  25 @@ -80,7 +80,7 @@
  26      #include <mysql.h>
  27      #include <mysqld_error.h>
  28      #include <errmsg.h>
  29 -    #if defined(PROTOCOL_VERSION) && defined(ER_LOCK_DEADLOCK) && defined(ER_LOCK_WAIT_TIMEOUT) && defined(ER_LOCK_OR_ACTIVE_TRANSACTION) && defined(CR_ERROR_FIRST)
  30 +    #if defined(PROTOCOL_VERSION) && defined(ER_LOCK_DEADLOCK) && defined(ER_LOCK_WAIT_TIMEOUT) && defined(ER_LOCK_OR_ACTIVE_TRANSACTION) && defined(CR_MIN_ERROR)
  31      /* Success */
  32      #else
  33      #error Unsupported version of MySQL
  34 @@ -88,7 +88,7 @@
  35              ]])],
  36              [],
  37              [
  38 -                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)])
  39 +                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)])
  40                  mysql_headers_success=no
  41              ])
  42  fi