From fc7f0db63d6b5b19a349e71cf4a6915ed52d4421 Mon Sep 17 00:00:00 2001 From: schwarz Date: Sat, 28 Oct 2006 07:45:51 +0000 Subject: added patches for IRIX 5 --- databases/mysql5-client/distinfo | 12 ++++++++- databases/mysql5-client/patches/patch-ah | 20 +++++++++++++++ databases/mysql5-client/patches/patch-am | 15 +++++++++++ databases/mysql5-client/patches/patch-an | 15 +++++++++++ databases/mysql5-client/patches/patch-ao | 15 +++++++++++ databases/mysql5-client/patches/patch-ap | 14 +++++++++++ databases/mysql5-client/patches/patch-aq | 14 +++++++++++ databases/mysql5-client/patches/patch-ar | 14 +++++++++++ databases/mysql5-client/patches/patch-as | 14 +++++++++++ databases/mysql5-client/patches/patch-at | 15 +++++++++++ databases/mysql5-client/patches/patch-au | 43 ++++++++++++++++++++++++++++++++ 11 files changed, 190 insertions(+), 1 deletion(-) create mode 100644 databases/mysql5-client/patches/patch-ah create mode 100644 databases/mysql5-client/patches/patch-am create mode 100644 databases/mysql5-client/patches/patch-an create mode 100644 databases/mysql5-client/patches/patch-ao create mode 100644 databases/mysql5-client/patches/patch-ap create mode 100644 databases/mysql5-client/patches/patch-aq create mode 100644 databases/mysql5-client/patches/patch-ar create mode 100644 databases/mysql5-client/patches/patch-as create mode 100644 databases/mysql5-client/patches/patch-at create mode 100644 databases/mysql5-client/patches/patch-au (limited to 'databases/mysql5-client') diff --git a/databases/mysql5-client/distinfo b/databases/mysql5-client/distinfo index 7f4acf8ed21..f7918463af4 100644 --- a/databases/mysql5-client/distinfo +++ b/databases/mysql5-client/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2006/10/15 08:59:37 salo Exp $ +$NetBSD: distinfo,v 1.14 2006/10/28 07:45:51 schwarz Exp $ SHA1 (mysql-5.0.26.tar.gz) = 7197159f9214722aa41b82ad80f87b4af5d232ce RMD160 (mysql-5.0.26.tar.gz) = 98ee85457de4bc8c8f8acddc8b6f0dc7687f32c7 @@ -10,8 +10,18 @@ SHA1 (patch-ad) = 47e79812178e022e85ea522d3c15618b6c245318 SHA1 (patch-ae) = f94e786b15089174b33045cdcdc76ba195609f34 SHA1 (patch-af) = fee9e6d92a6657145a197edbaa11be8f331a921e SHA1 (patch-ag) = 52fb37b6f0db7eefd9ca9102451d13a365dd0816 +SHA1 (patch-ah) = 69d3fe4d997b3494ed7237a55efdf1a45970fefa SHA1 (patch-ai) = 242c97ab4658838a6001d9c288e01209abfcee77 SHA1 (patch-aj) = 31c933a03e2b05aeaff1d89d3fa542aad663e96a SHA1 (patch-ak) = a09c2bf961d0e40e328d246e821efc36461dbdf8 SHA1 (patch-al) = 56bb803eecfde5052fecae365d5fcad369ce954c +SHA1 (patch-am) = 3ea8da131278d25d0626e6be244ab47a6dcb7a62 +SHA1 (patch-an) = c64818c07c7f3dc9382aa1deb2e067013ceec13e +SHA1 (patch-ao) = b45f206a4e74f5c271f2582d3c2da3de2bb80efe +SHA1 (patch-ap) = fccb45abcff3c851c9337899560f2f7625d1b42b +SHA1 (patch-aq) = 00725240bad2eee5c6359200d64fe00cffa14739 +SHA1 (patch-ar) = b47e229122e8468014b6428843512f7dceb2a6ad +SHA1 (patch-as) = d1b6e02e428919f2eb8ba9c430da9a262de1e1a4 +SHA1 (patch-at) = d429fed148591ca609efa07146b8e0c9f5015354 +SHA1 (patch-au) = 03a02286c7d9d3d977d2464580cab0b754ecd72a SHA1 (patch-bf) = c63133d40c2008ba57a968af693173a1fd97a927 diff --git a/databases/mysql5-client/patches/patch-ah b/databases/mysql5-client/patches/patch-ah new file mode 100644 index 00000000000..8eb669d0db3 --- /dev/null +++ b/databases/mysql5-client/patches/patch-ah @@ -0,0 +1,20 @@ +$NetBSD: patch-ah,v 1.3 2006/10/28 07:45:51 schwarz Exp $ + +--- include/my_net.h.orig 2006-10-23 21:21:16.000000000 +0200 ++++ include/my_net.h 2006-10-23 21:24:11.000000000 +0200 +@@ -71,6 +71,15 @@ + + #endif + ++#if defined(__sgi) && !defined(SHUT_RDWR) ++ ++/* ++ IRIX 5 does not define SHUT_RDWR ++*/ ++ ++#define SHUT_RDWR 2 ++#endif ++ + /* + On OSes which don't have the in_addr_t, we guess that using uint32 is the best + possible choice. We guess this from the fact that on HP-UX64bit & FreeBSD64bit diff --git a/databases/mysql5-client/patches/patch-am b/databases/mysql5-client/patches/patch-am new file mode 100644 index 00000000000..474c7304c31 --- /dev/null +++ b/databases/mysql5-client/patches/patch-am @@ -0,0 +1,15 @@ +$NetBSD: patch-am,v 1.1 2006/10/28 07:45:51 schwarz Exp $ + +--- sql/sql_string.cc.orig 2006-10-23 23:22:28.000000000 +0200 ++++ sql/sql_string.cc 2006-10-23 23:24:07.000000000 +0200 +@@ -38,6 +38,10 @@ + + #include "sql_string.h" + ++#ifdef NEEDS_BSTRING_H ++#include /* defines bzero() */ ++#endif ++ + /***************************************************************************** + ** String functions + *****************************************************************************/ diff --git a/databases/mysql5-client/patches/patch-an b/databases/mysql5-client/patches/patch-an new file mode 100644 index 00000000000..07751694a25 --- /dev/null +++ b/databases/mysql5-client/patches/patch-an @@ -0,0 +1,15 @@ +$NetBSD: patch-an,v 1.1 2006/10/28 07:45:51 schwarz Exp $ + +--- client/sql_string.cc.orig 2006-10-23 23:26:59.000000000 +0200 ++++ client/sql_string.cc 2006-10-23 23:27:27.000000000 +0200 +@@ -38,6 +38,10 @@ + + #include "sql_string.h" + ++#ifdef NEEDS_BSTRING_H ++#include /* defines bzero() */ ++#endif ++ + /***************************************************************************** + ** String functions + *****************************************************************************/ diff --git a/databases/mysql5-client/patches/patch-ao b/databases/mysql5-client/patches/patch-ao new file mode 100644 index 00000000000..73ef59e5ce6 --- /dev/null +++ b/databases/mysql5-client/patches/patch-ao @@ -0,0 +1,15 @@ +$NetBSD: patch-ao,v 1.1 2006/10/28 07:45:51 schwarz Exp $ + +--- libmysqld/sql_string.cc.orig 2006-10-23 23:29:34.000000000 +0200 ++++ libmysqld/sql_string.cc 2006-10-23 23:29:54.000000000 +0200 +@@ -38,6 +38,10 @@ + + #include "sql_string.h" + ++#ifdef NEEDS_BSTRING_H ++#include /* defines bzero() */ ++#endif ++ + /***************************************************************************** + ** String functions + *****************************************************************************/ diff --git a/databases/mysql5-client/patches/patch-ap b/databases/mysql5-client/patches/patch-ap new file mode 100644 index 00000000000..693bb99fe16 --- /dev/null +++ b/databases/mysql5-client/patches/patch-ap @@ -0,0 +1,14 @@ +$NetBSD: patch-ap,v 1.1 2006/10/28 07:45:51 schwarz Exp $ + +--- client/mysqlbinlog.cc.orig 2006-10-23 23:42:07.000000000 +0200 ++++ client/mysqlbinlog.cc 2006-10-23 23:42:55.000000000 +0200 +@@ -37,6 +37,9 @@ + #include "mysql_priv.h" + #include "log_event.h" + #include "sql_common.h" ++#ifdef NEEDS_BSTRING_H ++#include /* defines bzero() */ ++#endif + + #define BIN_LOG_HEADER_SIZE 4 + #define PROBE_HEADER_LEN (EVENT_LEN_OFFSET+4) diff --git a/databases/mysql5-client/patches/patch-aq b/databases/mysql5-client/patches/patch-aq new file mode 100644 index 00000000000..f0662ac791c --- /dev/null +++ b/databases/mysql5-client/patches/patch-aq @@ -0,0 +1,14 @@ +$NetBSD: patch-aq,v 1.1 2006/10/28 07:45:51 schwarz Exp $ + +--- strings/decimal.c.orig 2006-10-23 23:45:14.000000000 +0200 ++++ strings/decimal.c 2006-10-23 23:45:46.000000000 +0200 +@@ -106,6 +106,9 @@ + #include /* for my_alloca */ + #include + #include ++#ifdef NEEDS_BSTRING_H ++#include /* defines bzero() */ ++#endif + + /* + Internally decimal numbers are stored base 10^9 (see DIG_BASE below) diff --git a/databases/mysql5-client/patches/patch-ar b/databases/mysql5-client/patches/patch-ar new file mode 100644 index 00000000000..1ad34ceb605 --- /dev/null +++ b/databases/mysql5-client/patches/patch-ar @@ -0,0 +1,14 @@ +$NetBSD: patch-ar,v 1.1 2006/10/28 07:45:51 schwarz Exp $ + +--- sql/log_event.cc.orig 2006-10-23 23:49:26.000000000 +0200 ++++ sql/log_event.cc 2006-10-23 23:50:20.000000000 +0200 +@@ -24,6 +24,9 @@ + #include "mysql_priv.h" + #include "slave.h" + #include ++#ifdef NEEDS_BSTRING_H ++#include /* defines bcmp() */ ++#endif + #endif /* MYSQL_CLIENT */ + + #define log_cs &my_charset_latin1 diff --git a/databases/mysql5-client/patches/patch-as b/databases/mysql5-client/patches/patch-as new file mode 100644 index 00000000000..edba7011826 --- /dev/null +++ b/databases/mysql5-client/patches/patch-as @@ -0,0 +1,14 @@ +$NetBSD: patch-as,v 1.1 2006/10/28 07:45:51 schwarz Exp $ + +--- libmysqld/log_event.cc.orig 2006-10-23 23:52:01.000000000 +0200 ++++ libmysqld/log_event.cc 2006-10-23 23:52:30.000000000 +0200 +@@ -24,6 +24,9 @@ + #include "mysql_priv.h" + #include "slave.h" + #include ++#ifdef NEEDS_BSTRING_H ++#include /* defines bzero() */ ++#endif + #endif /* MYSQL_CLIENT */ + + #define log_cs &my_charset_latin1 diff --git a/databases/mysql5-client/patches/patch-at b/databases/mysql5-client/patches/patch-at new file mode 100644 index 00000000000..0fd2f6292fb --- /dev/null +++ b/databases/mysql5-client/patches/patch-at @@ -0,0 +1,15 @@ +$NetBSD: patch-at,v 1.1 2006/10/28 07:45:51 schwarz Exp $ + +--- sql/log_event.h.orig 2006-10-24 00:00:12.000000000 +0200 ++++ sql/log_event.h 2006-10-24 00:00:43.000000000 +0200 +@@ -18,6 +18,10 @@ + #ifndef _log_event_h + #define _log_event_h + ++#ifdef NEEDS_BSTRING_H ++#include /* defines bzero() */ ++#endif ++ + #ifdef __EMX__ + #undef write // remove pthread.h macro definition, conflict with write() class member + #endif diff --git a/databases/mysql5-client/patches/patch-au b/databases/mysql5-client/patches/patch-au new file mode 100644 index 00000000000..c0c31abbefe --- /dev/null +++ b/databases/mysql5-client/patches/patch-au @@ -0,0 +1,43 @@ +$NetBSD: patch-au,v 1.1 2006/10/28 07:45:51 schwarz Exp $ + +--- client/mysql.cc.orig Tue Oct 24 00:24:08 2006 ++++ client/mysql.cc Mon Oct 23 23:11:25 2006 +@@ -38,7 +38,15 @@ + #endif + #include "my_readline.h" + #include ++#ifdef IRIX5 ++#define _MYSQL_END_TYPE (void (*)(...)) ++#else ++#define _MYSQL_END_TYPE ++#endif + #include ++#ifdef NEEDS_BSTRING_H // defines bzero() ++#include ++#endif + + #if defined(USE_LIBEDIT_INTERFACE) && defined(HAVE_LOCALE_H) + #include +@@ -420,10 +428,10 @@ + ignore_errors=1; // Don't abort monitor + + if (opt_sigint_ignore) +- signal(SIGINT, SIG_IGN); ++ signal(SIGINT, _MYSQL_END_TYPE SIG_IGN); + else +- signal(SIGINT, mysql_sigint); // Catch SIGINT to clean up +- signal(SIGQUIT, mysql_end); // Catch SIGQUIT to clean up ++ signal(SIGINT, _MYSQL_END_TYPE mysql_sigint); // Catch SIGINT to clean up ++ signal(SIGQUIT, _MYSQL_END_TYPE mysql_end); // Catch SIGQUIT to clean up + + /* + Run in interactive mode like the ingres/postgres monitor +@@ -495,7 +503,7 @@ + char kill_buffer[40]; + MYSQL *kill_mysql= NULL; + +- signal(SIGINT, mysql_sigint); ++ signal(SIGINT, _MYSQL_END_TYPE mysql_sigint); + + /* terminate if no query being executed, or we already tried interrupting */ + if (!executing_query || interrupted_query++) -- cgit v1.2.3