- build fixes

diff --git a/community-mysql-dh1024.patch b/community-mysql-dh1024.patch
index fc5492a97400ebab0196edf6c33f3d8a09874def..fe4af4c3b2c2983524ad1d3a5b106dcc7ab552e3 100644 (file)
--- a/community-mysql-dh1024.patch
+++ b/community-mysql-dh1024.patch
@@ -60,4 +60,13 @@ diff -Naur mysql-5.5.28.orig/vio/viosslfactories.c mysql-5.5.28/vio/viosslfactor
 +  dh=get_dh1024();
    SSL_CTX_set_tmp_dh(ptr->ssl_context,dh);
    DH_free(dh);
- 
+
+@@ -389,7 +389,7 @@
+     }
+   }
+   /* DH stuff */
+-  dh=get_dh512();
++  dh=get_dh1024();
+   SSL_CTX_set_tmp_dh(ptr->ssl_context,dh);
+   DH_free(dh);
+   DBUG_RETURN(ptr);

diff --git a/mysql-format.patch b/mysql-format.patch
new file mode 100644 (file)
index 0000000..756384a
--- /dev/null
+++ b/mysql-format.patch
@@ -0,0 +1,39 @@
+--- mysql-4.0.30/sql/log_event.cc~     2007-02-12 20:38:46.000000000 +0100
++++ mysql-4.0.30/sql/log_event.cc      2015-06-24 21:08:16.873356668 +0200
+@@ -1386,7 +1386,7 @@ void Load_log_event::print(FILE* file, b
+     {
+       if (i)
+       fputc(',', file);
+-      fprintf(file, field);
++      fprintf(file, "%s", field);
+         
+       field += field_lens[i]  + 1;
+     }
+--- mysql-4.0.30/innobase/include/ut0dbg.h~    2007-02-12 20:38:39.000000000 +0100
++++ mysql-4.0.30/innobase/include/ut0dbg.h     2015-06-24 21:13:37.501397909 +0200
+@@ -46,9 +46,9 @@ extern ibool         panic_shutdown;
+ } while (0)
+ #define ut_error do {\
+               ut_print_timestamp(stderr);\
+-              fprintf(stderr, ut_dbg_msg_assert_fail,\
++              fprintf(stderr, "%s", ut_dbg_msg_assert_fail,\
+               os_thread_pf(os_thread_get_curr_id()), __FILE__, (ulint)__LINE__);\
+-              fprintf(stderr, ut_dbg_msg_trap);\
++              fprintf(stderr, "%s", ut_dbg_msg_trap);\
+               ut_dbg_stop_threads = TRUE;\
+               if(!panic_shutdown){panic_shutdown = TRUE;\
+               innobase_shutdown_for_mysql();}\
+--- mysql-4.0.30/innobase/include/ut0dbg.h~    2015-06-24 21:13:55.000000000 +0200
++++ mysql-4.0.30/innobase/include/ut0dbg.h     2015-06-24 21:17:21.340368316 +0200
+@@ -74,9 +74,9 @@ extern ibool         panic_shutdown;
+ 
+ #define ut_error do {\
+         ut_print_timestamp(stderr);\
+-      fprintf(stderr, ut_dbg_msg_assert_fail,\
++      fprintf(stderr, "%s", ut_dbg_msg_assert_fail,\
+       os_thread_pf(os_thread_get_curr_id()), __FILE__, (ulint)__LINE__);\
+-      fprintf(stderr, ut_dbg_msg_trap);\
++      fprintf(stderr, "%s", ut_dbg_msg_trap);\
+       ut_dbg_stop_threads = TRUE;\
+       if (*(ut_dbg_null_ptr)) ut_dbg_null_ptr = NULL;\
+ } while (0)

diff --git a/mysql-m4.patch b/mysql-m4.patch
new file mode 100644 (file)
index 0000000..4d7ef98
--- /dev/null
+++ b/mysql-m4.patch
@@ -0,0 +1,91 @@
+--- mysql-4.0.30/acinclude.m4~ 2007-02-12 20:38:39.000000000 +0100
++++ mysql-4.0.30/acinclude.m4  2015-06-24 20:53:49.821878699 +0200
+@@ -282,88 +282,6 @@
+ fi
+ ])
+ 
+-# From fileutils-3.14/aclocal.m4
+-
+-# @defmac AC_PROG_CC_STDC
+-# @maindex PROG_CC_STDC
+-# @ovindex CC
+-# If the C compiler in not in ANSI C mode by default, try to add an option
+-# to output variable @code{CC} to make it so.  This macro tries various
+-# options that select ANSI C on some system or another.  It considers the
+-# compiler to be in ANSI C mode if it defines @code{__STDC__} to 1 and
+-# handles function prototypes correctly.
+-#
+-# Patched by monty to only check if __STDC__ is defined. With the original 
+-# check it's impossible to get things to work with the Sunpro compiler from
+-# Workshop 4.2
+-#
+-# If you use this macro, you should check after calling it whether the C
+-# compiler has been set to accept ANSI C; if not, the shell variable
+-# @code{am_cv_prog_cc_stdc} is set to @samp{no}.  If you wrote your source
+-# code in ANSI C, you can make an un-ANSIfied copy of it by using the
+-# program @code{ansi2knr}, which comes with Ghostscript.
+-# @end defmac
+-
+-AC_DEFUN(AM_PROG_CC_STDC,
+-[AC_REQUIRE([AC_PROG_CC])
+-AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
+-AC_CACHE_VAL(am_cv_prog_cc_stdc,
+-[am_cv_prog_cc_stdc=no
+-ac_save_CC="$CC"
+-# Don't try gcc -ansi; that turns off useful extensions and
+-# breaks some systems' header files.
+-# AIX                 -qlanglvl=ansi
+-# Ultrix and OSF/1    -std1
+-# HP-UX                       -Aa -D_HPUX_SOURCE
+-# SVR4                        -Xc -D__EXTENSIONS__
+-# removed "-Xc -D__EXTENSIONS__" beacause sun c++ does not like it.
+-for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" 
+-do
+-  CC="$ac_save_CC $ac_arg"
+-  AC_TRY_COMPILE(
+-[#if !defined(__STDC__)
+-choke me
+-#endif
+-/* DYNIX/ptx V4.1.3 can't compile sys/stat.h with -Xc -D__EXTENSIONS__. */
+-#ifdef _SEQUENT_
+-# include <sys/types.h>
+-# include <sys/stat.h>
+-#endif
+-], [
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};],
+-[am_cv_prog_cc_stdc="$ac_arg"; break])
+-done
+-CC="$ac_save_CC"
+-])
+-AC_MSG_RESULT($am_cv_prog_cc_stdc)
+-case "x$am_cv_prog_cc_stdc" in
+-  x|xno) ;;
+-  *) CC="$CC $am_cv_prog_cc_stdc" ;;
+-esac
+-])
+-
+-#
+-# Check to make sure that the build environment is sane.
+-#
+-
+-AC_DEFUN(AM_SANITY_CHECK,
+-[AC_MSG_CHECKING([whether build environment is sane])
+-sleep 1
+-echo timestamp > conftestfile
+-# Do this in a subshell so we don't clobber the current shell's
+-# arguments.  FIXME: maybe try `-L' hack like GETLOADAVG test?
+-if (set X `ls -t $srcdir/configure conftestfile`; test "[$]2" = conftestfile)
+-then
+-   # Ok.
+-   :
+-else
+-   AC_MSG_ERROR([newly created file is older than distributed files!
+-Check your system clock])
+-fi
+-rm -f conftest*
+-AC_MSG_RESULT(yes)])
+ 
+ # Orginal from bash-2.0 aclocal.m4, Changed to use termcap last by monty.
+  

diff --git a/mysql.spec b/mysql.spec
index 0189d702cbac8eb29abc6ae5956d2f37343613ea..073a6713b611b7cc2cadcc1e506e15554727196b 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -48,6 +48,8 @@ Patch9:               %{name}-bug-27198.patch
 Patch10:       %{name}-rename-table.patch
 Patch11:       %{name}-sslchain.patch
 Patch12:       community-mysql-dh1024.patch
+Patch13:       %{name}-m4.patch
+Patch14:       %{name}-format.patch
 URL:           http://www.mysql.com/
 BuildRequires: /bin/ps
 #BuildRequires:        ORBit-devel
@@ -371,6 +373,8 @@ Podr
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
 %{__libtoolize}