[pkgsrc/trunk]: pkgsrc/net/samba4 samba4: Avoid conflict with host s_addr.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/61aec6f5a5dd
branches:  trunk
changeset: 432876:61aec6f5a5dd
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue May 26 13:11:01 2020 +0000

description:
samba4: Avoid conflict with host s_addr.

diffstat:

 net/samba4/distinfo                                 |   4 ++-
 net/samba4/patches/patch-lib_tsocket_tsocket.h      |  22 ++++++++++++++++++++
 net/samba4/patches/patch-lib_tsocket_tsocket__bsd.c |  23 +++++++++++++++++++++
 3 files changed, 48 insertions(+), 1 deletions(-)

diffs (71 lines):

diff -r 4e49ee5b76be -r 61aec6f5a5dd net/samba4/distinfo
--- a/net/samba4/distinfo       Tue May 26 12:52:59 2020 +0000
+++ b/net/samba4/distinfo       Tue May 26 13:11:01 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2020/05/19 16:51:43 adam Exp $
+$NetBSD: distinfo,v 1.48 2020/05/26 13:11:01 jperkin Exp $
 
 SHA1 (samba-4.12.3.tar.gz) = 08109949a70c88010dd4b53d1ae088b7e1a282eb
 RMD160 (samba-4.12.3.tar.gz) = 9d4a4d7d1da5367a1f442ba0ff3ea8abde1ba69e
@@ -17,6 +17,8 @@
 SHA1 (patch-lib_tevent_tevent.c) = 4a20506e2bfbab85bad664299b884575326e73fd
 SHA1 (patch-lib_tevent_tevent__threads.c) = 14867888dd0b7c4613914752ab368c39bfdbb943
 SHA1 (patch-lib_tevent_wscript) = fbbe2024096b57d651d90064f53489a974db9d7a
+SHA1 (patch-lib_tsocket_tsocket.h) = d8699b21a591a4c531ee91e7fa45bfe269164da6
+SHA1 (patch-lib_tsocket_tsocket__bsd.c) = 3143adde8c4711599608592f737cbe0fab912fa0
 SHA1 (patch-lib_util_smb__threads.h) = 93bbc4276ad927ad6faf305af093064f47c09254
 SHA1 (patch-lib_util_tfork.c) = cd70dcff5f2ce94ffe642e0f029f03ee07dff27d
 SHA1 (patch-libcli_dns_wscript__build) = 4103a144aa1bb4662fd7a62270941f1a3d01fe89
diff -r 4e49ee5b76be -r 61aec6f5a5dd net/samba4/patches/patch-lib_tsocket_tsocket.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/samba4/patches/patch-lib_tsocket_tsocket.h    Tue May 26 13:11:01 2020 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-lib_tsocket_tsocket.h,v 1.1 2020/05/26 13:11:01 jperkin Exp $
+
+Avoid conflict with host s_addr.
+
+--- lib/tsocket/tsocket.h.orig 2020-01-31 10:25:36.000000000 +0000
++++ lib/tsocket/tsocket.h
+@@ -1000,12 +1000,12 @@ int tsocket_address_bsd_from_samba_socka
+                                       struct tsocket_address **t_addr);
+ #else
+ int _tsocket_address_bsd_from_samba_sockaddr(TALLOC_CTX *mem_ctx,
+-                                       const struct samba_sockaddr *s_addr,
++                                       const struct samba_sockaddr *samba_s_addr,
+                                        struct tsocket_address **t_addr,
+                                        const char *location);
+ 
+-#define tsocket_address_bsd_from_samba_sockaddr(mem_ctx, s_addr, t_addr) \
+-      _tsocket_address_bsd_from_samba_sockaddr(mem_ctx, s_addr, t_addr, \
++#define tsocket_address_bsd_from_samba_sockaddr(mem_ctx, samba_s_addr, t_addr) \
++      _tsocket_address_bsd_from_samba_sockaddr(mem_ctx, samba_s_addr, t_addr, \
+                                                __location__)
+ #endif
+ 
diff -r 4e49ee5b76be -r 61aec6f5a5dd net/samba4/patches/patch-lib_tsocket_tsocket__bsd.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/samba4/patches/patch-lib_tsocket_tsocket__bsd.c       Tue May 26 13:11:01 2020 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-lib_tsocket_tsocket__bsd.c,v 1.1 2020/05/26 13:11:01 jperkin Exp $
+
+Avoid conflict with host s_addr.
+
+--- lib/tsocket/tsocket_bsd.c.orig     2020-01-31 10:25:36.000000000 +0000
++++ lib/tsocket/tsocket_bsd.c
+@@ -282,13 +282,13 @@ int _tsocket_address_bsd_from_sockaddr(T
+ }
+ 
+ int _tsocket_address_bsd_from_samba_sockaddr(TALLOC_CTX *mem_ctx,
+-                                       const struct samba_sockaddr *s_addr,
++                                       const struct samba_sockaddr *samba_s_addr,
+                                        struct tsocket_address **t_addr,
+                                        const char *location)
+ {
+       return _tsocket_address_bsd_from_sockaddr(mem_ctx,
+-                                                &s_addr->u.sa,
+-                                                s_addr->sa_socklen,
++                                                &samba_s_addr->u.sa,
++                                                samba_s_addr->sa_socklen,
+                                                 t_addr,
+                                                 location);
+ }