Thu Aug 22 11:09:46 2013 UTC ()
don't use gethostbyname_r unless there is a prototype in scope.


(christos)
diff -r1.28 -r1.29 pkgsrc/databases/mysql51-server/distinfo
diff -r1.2 -r1.3 pkgsrc/databases/mysql51-server/patches/patch-ae
diff -r0 -r1.1 pkgsrc/databases/mysql51-server/patches/patch-include_my__net.h
diff -r0 -r1.1 pkgsrc/databases/mysql51-server/patches/patch-mysys_my__net.c
diff -r0 -r1.1 pkgsrc/databases/mysql51-server/patches/patch-mysys_my__thr__init.c
cvs diff -r1.28 -r1.29 pkgsrc/databases/mysql51-server/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-server/Attic/distinfo 2013/08/04 10:20:24 1.28
+++ pkgsrc/databases/mysql51-server/Attic/distinfo 2013/08/22 11:09:46 1.29
@@ -1,29 +1,32 @@ @@ -1,29 +1,32 @@
1$NetBSD: distinfo,v 1.28 2013/08/04 10:20:24 adam Exp $ 1$NetBSD: distinfo,v 1.29 2013/08/22 11:09:46 christos Exp $
2 2
3SHA1 (mysql-5.1.71.tar.gz) = a71c77c43aa8374ccb6e09f0ad7f225846af59e6 3SHA1 (mysql-5.1.71.tar.gz) = a71c77c43aa8374ccb6e09f0ad7f225846af59e6
4RMD160 (mysql-5.1.71.tar.gz) = 4077b4aab7297a48b5dc180acf35c9a94bce366c 4RMD160 (mysql-5.1.71.tar.gz) = 4077b4aab7297a48b5dc180acf35c9a94bce366c
5Size (mysql-5.1.71.tar.gz) = 24033179 bytes 5Size (mysql-5.1.71.tar.gz) = 24033179 bytes
6SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506 6SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506
7SHA1 (patch-ab) = 4c485a74d55553d63fc3dbc0350d0aa0068e1fcf 7SHA1 (patch-ab) = 4c485a74d55553d63fc3dbc0350d0aa0068e1fcf
8SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c 8SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c
9SHA1 (patch-ad) = 5fd4db0e04a97289f38a5467bbae5041f4082b51 9SHA1 (patch-ad) = 5fd4db0e04a97289f38a5467bbae5041f4082b51
10SHA1 (patch-ae) = e682e8c7a260706cbfd802885bfe100c0e0d31be 10SHA1 (patch-ae) = 3b9a0822b2fab21dea57b12d005eeae0ef9f66be
11SHA1 (patch-af) = 1e13ba542b4fc2a1d59fc822d06c76bc4e92dc23 11SHA1 (patch-af) = 1e13ba542b4fc2a1d59fc822d06c76bc4e92dc23
12SHA1 (patch-ag) = 85df1a0080376c5aff1a963e5532cb2c1ec5949d 12SHA1 (patch-ag) = 85df1a0080376c5aff1a963e5532cb2c1ec5949d
13SHA1 (patch-ah) = a608060cee7aadaf8bcde84016a73131a75dea32 13SHA1 (patch-ah) = a608060cee7aadaf8bcde84016a73131a75dea32
14SHA1 (patch-ai) = 4c5acf2b0e05765a1fe9e30558d163886e1aa492 14SHA1 (patch-ai) = 4c5acf2b0e05765a1fe9e30558d163886e1aa492
15SHA1 (patch-aj) = b8f35d3a1bc45eb5336ae6a842898b257d2660db 15SHA1 (patch-aj) = b8f35d3a1bc45eb5336ae6a842898b257d2660db
16SHA1 (patch-ak) = 3c740b78afacfe05aa082c5b235c10c51ac94641 16SHA1 (patch-ak) = 3c740b78afacfe05aa082c5b235c10c51ac94641
17SHA1 (patch-al) = ca9406a8b01dffb3f515f132fa7aaef66c78f2be 17SHA1 (patch-al) = ca9406a8b01dffb3f515f132fa7aaef66c78f2be
18SHA1 (patch-am) = 2cf10915f5dc3caf11bb8c7c7255842da646b247 18SHA1 (patch-am) = 2cf10915f5dc3caf11bb8c7c7255842da646b247
19SHA1 (patch-an) = 7b627ceb6212641b7e0de9fd7142bc95e4dcb8cb 19SHA1 (patch-an) = 7b627ceb6212641b7e0de9fd7142bc95e4dcb8cb
20SHA1 (patch-ao) = 7895abad117d5c6901c2241209c5747e6c490e7d 20SHA1 (patch-ao) = 7895abad117d5c6901c2241209c5747e6c490e7d
21SHA1 (patch-ap) = f356d4d26acdf0532fe70a49d0292878f600ff51 21SHA1 (patch-ap) = f356d4d26acdf0532fe70a49d0292878f600ff51
22SHA1 (patch-aq) = 8e6029d36b290b9ffd964c38afe4352a9107be40 22SHA1 (patch-aq) = 8e6029d36b290b9ffd964c38afe4352a9107be40
23SHA1 (patch-ar) = ed9c062adce41a840db1e908ab0657db6de540ae 23SHA1 (patch-ar) = ed9c062adce41a840db1e908ab0657db6de540ae
24SHA1 (patch-as) = 8167416a083a011ded19d176bc488c94d9eb7abf 24SHA1 (patch-as) = 8167416a083a011ded19d176bc488c94d9eb7abf
25SHA1 (patch-at) = 307a0785190f8bc175226ce83288cc85f7da4631 25SHA1 (patch-at) = 307a0785190f8bc175226ce83288cc85f7da4631
26SHA1 (patch-au) = 51291771b994d199fb6de6a17dd7809a7bf39b68 26SHA1 (patch-au) = 51291771b994d199fb6de6a17dd7809a7bf39b68
27SHA1 (patch-ax) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a 27SHA1 (patch-ax) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a
 28SHA1 (patch-include_my__net.h) = 5cfe4c14ea39ce806c615a87a13c74b48d159ffa
 29SHA1 (patch-mysys_my__net.c) = 1ee22921d62ccefc41bc9a81b96a576ce391f054
 30SHA1 (patch-mysys_my__thr__init.c) = ee03f554b38b1477ab13912333e09cab340b5f56
28SHA1 (patch-sql_ha_ndbcluster.cc) = eb076bbce9d1d671331b41f50cf0be220cca7c6b 31SHA1 (patch-sql_ha_ndbcluster.cc) = eb076bbce9d1d671331b41f50cf0be220cca7c6b
29SHA1 (patch-vio_viossl.c) = ad922587684a635a82c2fa662be7431c63063909 32SHA1 (patch-vio_viossl.c) = ad922587684a635a82c2fa662be7431c63063909
cvs diff -r1.2 -r1.3 pkgsrc/databases/mysql51-server/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-server/patches/Attic/patch-ae 2010/08/13 14:25:35 1.2
+++ pkgsrc/databases/mysql51-server/patches/Attic/patch-ae 2013/08/22 11:09:46 1.3
@@ -1,24 +1,33 @@ @@ -1,24 +1,33 @@
1$NetBSD: patch-ae,v 1.2 2010/08/13 14:25:35 taca Exp $ 1$NetBSD: patch-ae,v 1.3 2013/08/22 11:09:46 christos Exp $
2 2
3* check sizeof time_t. 3* check sizeof time_t.
4* check existence of sigsend(). 4* check existence of sigsend().
 5* check gethosybyname_r declaration
5 6
6--- configure.in.orig 2010-07-09 12:34:57.000000000 +0000 7--- configure.in.orig 2013-07-11 16:39:36.000000000 +0300
7+++ configure.in 8+++ configure.in 2013-08-22 11:15:43.000000000 +0300
8@@ -1946,6 +1946,7 @@ if test "$ac_cv_sizeof_off_t" -eq 0 9@@ -861,6 +861,7 @@
 10 AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
 11 AC_CHECK_LIB(nsl, gethostbyname_r))
 12 AC_CHECK_FUNC(gethostbyname_r)
 13+AC_CHECK_DECLS([gethostbyname_r],[],[],[#include <netdb.h>])
 14
 15 AC_SEARCH_LIBS(setsockopt, socket)
 16 # This may get things to compile even if bind-8 is installed
 17@@ -1902,6 +1903,7 @@
9 then 18 then
10 AC_MSG_ERROR("MySQL needs a off_t type.") 19 AC_MSG_ERROR("MySQL needs a off_t type.")
11 fi 20 fi
12+AC_CHECK_SIZEOF(time_t, 4) 21+AC_CHECK_SIZEOF(time_t, 4)
13  22
14 dnl 23 dnl
15 dnl check if time_t is unsigned 24 dnl check if time_t is unsigned
16@@ -2039,7 +2040,7 @@ AC_CHECK_HEADERS(varargs.h stdarg.h dire 25@@ -2004,7 +2006,7 @@
17 paths.h semaphore.h) 26 paths.h semaphore.h)
18  27
19 # Already-done: strcasecmp 28 # Already-done: strcasecmp
20-AC_CHECK_FUNCS(lstat putenv select setenv setlocale strcoll tcgetattr) 29-AC_CHECK_FUNCS(lstat putenv select setenv setlocale strcoll tcgetattr)
21+AC_CHECK_FUNCS(lstat putenv select setenv setlocale sigsend strcoll tcgetattr) 30+AC_CHECK_FUNCS(lstat putenv select setenv setlocale sigsend strcoll tcgetattr)
22  31
23 AC_STAT_MACROS_BROKEN 32 AC_STAT_MACROS_BROKEN
24 MYSQL_SIGNAL_CHECK 33 MYSQL_SIGNAL_CHECK
File Added: pkgsrc/databases/mysql51-server/patches/Attic/patch-include_my__net.h
$NetBSD: patch-include_my__net.h,v 1.1 2013/08/22 11:09:46 christos Exp $

Only use gethostbyname_r if we have a declaration for it.

--- include/my_net.h.orig	2013-07-11 16:39:36.000000000 +0300
+++ include/my_net.h	2013-08-22 11:17:08.000000000 +0300
@@ -89,7 +89,7 @@
 #if !defined(HPUX10)
 struct hostent;
 #endif /* HPUX */
-#if !defined(HAVE_GETHOSTBYNAME_R)
+#if !defined(HAVE_GETHOSTBYNAME_R) || !HAVE_DECL_GETHOSTBYNAME_R
 struct hostent *my_gethostbyname_r(const char *name,
 				   struct hostent *result, char *buffer,
 				   int buflen, int *h_errnop);
File Added: pkgsrc/databases/mysql51-server/patches/Attic/patch-mysys_my__net.c
$NetBSD: patch-mysys_my__net.c,v 1.1 2013/08/22 11:09:46 christos Exp $

Only use gethostbyname_r if we have a declaration for it.

--- mysys/my_net.c.orig	2013-07-11 16:39:36.000000000 +0300
+++ mysys/my_net.c	2013-08-22 12:14:50.000000000 +0300
@@ -51,7 +51,7 @@
   usage of getbostbyname_r simpler.
 */
 
-#if defined(HAVE_GETHOSTBYNAME_R)
+#if defined(HAVE_GETHOSTBYNAME_R) && HAVE_DECL_GETHOSTBYNAME_R
 
 #if defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE)
File Added: pkgsrc/databases/mysql51-server/patches/Attic/patch-mysys_my__thr__init.c
$NetBSD: patch-mysys_my__thr__init.c,v 1.1 2013/08/22 11:09:46 christos Exp $

Check for the gethostbyname declaration before using it.

--- mysys/my_thr_init.c.orig	2013-07-11 16:39:36.000000000 +0300
+++ mysys/my_thr_init.c	2013-08-22 12:56:33.000000000 +0300
@@ -42,7 +42,7 @@
 #if !defined(HAVE_LOCALTIME_R) || !defined(HAVE_GMTIME_R)
 pthread_mutex_t LOCK_localtime_r;
 #endif
-#ifndef HAVE_GETHOSTBYNAME_R
+#if !defined(HAVE_GETHOSTBYNAME_R) || !HAVE_DECL_GETHOSTBYNAME_R
 pthread_mutex_t LOCK_gethostbyname_r;
 #endif
 #ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
@@ -162,7 +162,7 @@
 #if !defined(HAVE_LOCALTIME_R) || !defined(HAVE_GMTIME_R)
   pthread_mutex_init(&LOCK_localtime_r,MY_MUTEX_INIT_SLOW);
 #endif
-#ifndef HAVE_GETHOSTBYNAME_R
+#if !defined(HAVE_GETHOSTBYNAME_R) || !HAVE_DECL_GETHOSTBYNAME_R
   pthread_mutex_init(&LOCK_gethostbyname_r,MY_MUTEX_INIT_SLOW);
 #endif
   if (my_thread_init())
@@ -229,7 +229,7 @@
 #if !defined(HAVE_LOCALTIME_R) || !defined(HAVE_GMTIME_R)
   pthread_mutex_destroy(&LOCK_localtime_r);
 #endif
-#ifndef HAVE_GETHOSTBYNAME_R
+#if !defined(HAVE_GETHOSTBYNAME_R) || !HAVE_DECL_GETHOSTBYNAME_R
   pthread_mutex_destroy(&LOCK_gethostbyname_r);
 #endif
 }