threads supports for OpenBSD (not completed yet)

PR pkg/48786

2 files changed, 106 insertions, 8 deletions

diff --git a/net/libbind/distinfo b/net/libbind/distinfo
index 8fe5700bf79..89ce8c45f2a 100644
--- a/net/libbind/distinfo
+++ b/net/libbind/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2012/03/12 04:39:16 joerg Exp $
+$NetBSD: distinfo,v 1.4 2014/05/10 09:53:43 obache Exp $
 
 SHA1 (libbind-6.0.tar.gz) = 4664646238cd3602df168da1e9bc9591d3f566b2
 RMD160 (libbind-6.0.tar.gz) = bfafac89a455a05202763f6e10f292978085d811
 Size (libbind-6.0.tar.gz) = 757162 bytes
 SHA1 (patch-aa) = 7bd66d73d20420d67f6d6850d77d3762cd594499
-SHA1 (patch-ab) = 6f7ced345bb6edbf37c2aa5bef4971447f02dc0f
+SHA1 (patch-ab) = 6a62d2605e55385fe61cd6a2dc2224883987559e
 SHA1 (patch-doc_Makefile.in) = ec7c158664cd5c8edc501a9b74ac956c06ac4df7
diff --git a/net/libbind/patches/patch-ab b/net/libbind/patches/patch-ab
index 9ea9475607d..dea1c016c4f 100644
--- a/net/libbind/patches/patch-ab
+++ b/net/libbind/patches/patch-ab
@@ -1,8 +1,106 @@
-$NetBSD: patch-ab,v 1.1 2010/12/31 14:36:07 obache Exp $
+$NetBSD: patch-ab,v 1.2 2014/05/10 09:53:43 obache Exp $
 
---- include/netdb.h.orig	2008-02-28 05:34:17.000000000 +0000
+--- include/netdb.h.orig	Thu Feb 28 05:34:17 2008
 +++ include/netdb.h
-@@ -492,7 +492,7 @@ int		innetgr_r __P((const char *, const 
+@@ -262,7 +262,7 @@ struct	addrinfo {
+ 
+ 
+ #ifdef _REENTRANT
+-#if defined (__hpux) || defined(__osf__) || defined(_AIX)
++#if defined (__hpux) || defined(__osf__) || defined(_AIX) || defined(__OpenBSD__)
+ #define	_MAXALIASES	35
+ #define	_MAXLINELEN	1024
+ #define	_MAXADDRS	35
+@@ -328,7 +328,14 @@ struct	protoent_data {
+ #ifdef __hpux
+ 	char	line[_MAXLINELEN+1];
+ #endif
++#ifdef __OpenBSD__
++	char	**aliases;
++	int	maxaliases;
++	int	stayopen;
++	char*	line;
++#else
+ 	char	*proto_aliases[_MAXALIASES];
++#endif
+ #ifdef __osf__
+ 	int	_proto_stayopen;
+ 	int	svc_getprotoflag;
+@@ -423,19 +430,31 @@ int		innetgr __P((const char *, const char *, const ch
+ #endif
+ 
+ #ifdef _REENTRANT
+-#if defined(__hpux) || defined(__osf__) || defined(_AIX)
++#if defined(__hpux) || defined(__osf__) || defined(_AIX) || defined(__OpenBSD__)
++#if defined(__OpenBSD__)
++struct hostent * gethostbyaddr_r __P((const char *, int, int, struct hostent *,
++		         char *, int, int *));
++struct hostent * gethostbyname_r __P((const char *, struct hostent *,
++		        char *, int, int *));
++struct hostent * gethostent_r __P((struct hostent *, char *, int, int *));
++#else
+ int		gethostbyaddr_r __P((const char *, int, int, struct hostent *,
+ 					struct hostent_data *));
+ int		gethostbyname_r __P((const char *, struct hostent *, 
+ 					struct hostent_data *));
+ int		gethostent_r __P((struct hostent *, struct hostent_data *));
++#endif
+ #if defined(_AIX)
+ void		sethostent_r __P((int, struct hostent_data *));
++#elif defined(__OpenBSD__)
++void		sethostent_r __P((int));
+ #else
+ int		sethostent_r __P((int, struct hostent_data *));
+ #endif 
+ #if defined(__hpux)
+ int		endhostent_r __P((struct hostent_data *));
++#elif defined(__OpenBSD__)
++void		endhostent_r __P((void));
+ #else
+ void		endhostent_r __P((struct hostent_data *));
+ #endif
+@@ -443,16 +462,28 @@ void		endhostent_r __P((struct hostent_data *));
+ #if defined(__hpux) || defined(__osf__)
+ int		getnetbyaddr_r __P((int, int,
+ 				struct netent *, struct netent_data *));
++#elif defined(__OpenBSD__)
++struct netent *	getnetbyaddr_r __P((long, int,
++				struct netent *, char *, int));
+ #else
+ int		getnetbyaddr_r __P((long, int,
+ 				struct netent *, struct netent_data *));
+ #endif
++#if defined(__OpenBSD__)
++struct netent *	getnetbyname_r __P((const char *,
++				struct netent *, char *, int));
++struct netent *	getnetent_r __P((struct netent *, char *, int));
++void		setnetent_r __P((int));
++#else
+ int		getnetbyname_r __P((const char *,
+ 				struct netent *, struct netent_data *));
+ int		getnetent_r __P((struct netent *, struct netent_data *));
+ int		setnetent_r __P((int, struct netent_data *));
++#endif
+ #ifdef __hpux
+ int		endnetent_r __P((struct netent_data *buffer));
++#elif defined(__OpenBSD__)
++void		endnetent_r __P((void));
+ #else
+ void		endnetent_r __P((struct netent_data *buffer));
+ #endif
+@@ -462,7 +493,11 @@ int		getprotobyname_r __P((const char *,
+ int		getprotobynumber_r __P((int,
+ 				struct protoent *, struct protoent_data *));
+ int		getprotoent_r __P((struct protoent *, struct protoent_data *));
++#ifdef __OpenBSD__
++void		setprotoent_r __P((int, struct protoent_data *));
++#else
+ int		setprotoent_r __P((int, struct protoent_data *));
++#endif
+ #ifdef __hpux
+ int		endprotoent_r __P((struct protoent_data *));
+ #else
+@@ -492,7 +527,7 @@ int		innetgr_r __P((const char *, const char *, const 
  #endif
  #else
   /* defined(sun) || defined(bsdi) */
@@ -11,7 +109,7 @@ $NetBSD: patch-ab,v 1.1 2010/12/31 14:36:07 obache Exp $
  int gethostbyaddr_r __P((const char *, int, int, struct hostent *,
  		         char *, size_t, struct hostent **, int *));
  int gethostbyname_r __P((const char *, struct hostent *,
-@@ -509,7 +509,7 @@ struct hostent	*gethostent_r __P((struct
+@@ -509,7 +544,7 @@ struct hostent	*gethostent_r __P((struct hostent *, ch
  void		sethostent_r __P((int));
  void		endhostent_r __P((void));
  
@@ -20,7 +118,7 @@ $NetBSD: patch-ab,v 1.1 2010/12/31 14:36:07 obache Exp $
  int getnetbyname_r __P((const char *, struct netent *,
  			char *, size_t, struct netent **, int*));
  int getnetbyaddr_r __P((unsigned long int, int, struct netent *,
-@@ -525,7 +525,7 @@ struct netent	*getnetent_r __P((struct n
+@@ -525,7 +560,7 @@ struct netent	*getnetent_r __P((struct netent *, char 
  void		setnetent_r __P((int));
  void		endnetent_r __P((void));
  
@@ -29,7 +127,7 @@ $NetBSD: patch-ab,v 1.1 2010/12/31 14:36:07 obache Exp $
  int getprotobyname_r __P((const char *, struct protoent *, char *,
  			  size_t, struct protoent **));
  int getprotobynumber_r __P((int, struct protoent *, char *, size_t,
-@@ -541,7 +541,7 @@ struct protoent	*getprotoent_r __P((stru
+@@ -541,7 +576,7 @@ struct protoent	*getprotoent_r __P((struct protoent *,
  void		setprotoent_r __P((int));
  void		endprotoent_r __P((void));