CVS commit: pkgsrc/net/samba4

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jun 28 17:13:51 UTC 2019

Modified Files:
        pkgsrc/net/samba4: Makefile distinfo
Added Files:
        pkgsrc/net/samba4/patches: patch-libcli_dns_wscript__build

Log Message:
samba4: Build fixes for SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 pkgsrc/net/samba4/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/net/samba4/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/samba4/patches/patch-libcli_dns_wscript__build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/samba4/Makefile
diff -u pkgsrc/net/samba4/Makefile:1.71 pkgsrc/net/samba4/Makefile:1.72
--- pkgsrc/net/samba4/Makefile:1.71     Sat Jun 22 16:11:49 2019
+++ pkgsrc/net/samba4/Makefile  Fri Jun 28 17:13:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2019/06/22 16:11:49 jmcneill Exp $
+# $NetBSD: Makefile,v 1.72 2019/06/28 17:13:50 jperkin Exp $
 
 DISTNAME=      samba-4.10.5
 PKGREVISION=   1
@@ -115,7 +115,7 @@ LDFLAGS+=           ${COMPILER_RPATH_FLAG}${SMB_P
 CFLAGS.SunOS+=         -DHAVE_SOLARIS_GETGRENT_R
 # workaround https://bugzilla.samba.org/show_bug.cgi?id=12502 for now
 CFLAGS.SunOS+=         -DMSG_NOSIGNAL=0
-LDFLAGS.SunOS+=                -lsocket -lnsl
+LDFLAGS.SunOS+=                -lsocket -lnsl -lsendfile
 
 .include "options.mk"
 

Index: pkgsrc/net/samba4/distinfo
diff -u pkgsrc/net/samba4/distinfo:1.31 pkgsrc/net/samba4/distinfo:1.32
--- pkgsrc/net/samba4/distinfo:1.31     Sat Jun 22 13:27:12 2019
+++ pkgsrc/net/samba4/distinfo  Fri Jun 28 17:13:50 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2019/06/22 13:27:12 jmcneill Exp $
+$NetBSD: distinfo,v 1.32 2019/06/28 17:13:50 jperkin Exp $
 
 SHA1 (samba-4.10.5.tar.gz) = 9444a1a0cafd2c734eab39d76908c5344421df99
 RMD160 (samba-4.10.5.tar.gz) = c6ebda08f6dba92446383b18d0f3cce3a2199312
@@ -14,6 +14,7 @@ SHA1 (patch-dynconfig_wscript) = 1858e5f
 SHA1 (patch-lib_param_loadparm.h) = 0216b69d33d1e17260a446e11bee764116c52b18
 SHA1 (patch-lib_replace_wscript) = 2a754e7310850b376d5881b82a8467041284fce9
 SHA1 (patch-lib_tevent_wscript) = fbbe2024096b57d651d90064f53489a974db9d7a
+SHA1 (patch-libcli_dns_wscript__build) = 40e6f864e2fb1b6abb198f1a51bb2c95bc8c6fb2
 SHA1 (patch-nsswitch_winbind__nss__netbsd.c) = 71d8acd0aa4c297d75555fba650461c778495caa
 SHA1 (patch-nsswitch_wscript__build) = e8a6251e031ffa13d6347fade8891f7afd65d3eb
 SHA1 (patch-source4_dsdb_samdb_ldb__modules_wscript__build__server) = c322cf56995192039fa22548d6d6e50641c4c796

Added files:

Index: pkgsrc/net/samba4/patches/patch-libcli_dns_wscript__build
diff -u /dev/null pkgsrc/net/samba4/patches/patch-libcli_dns_wscript__build:1.1
--- /dev/null   Fri Jun 28 17:13:51 2019
+++ pkgsrc/net/samba4/patches/patch-libcli_dns_wscript__build   Fri Jun 28 17:13:51 2019
@@ -0,0 +1,22 @@
+$NetBSD: patch-libcli_dns_wscript__build,v 1.1 2019/06/28 17:13:51 jperkin Exp $
+
+Don't build resolvconftest on SunOS (lacks fmemopen).
+
+--- libcli/dns/wscript_build.orig      2019-05-07 08:38:21.000000000 +0000
++++ libcli/dns/wscript_build
+@@ -1,11 +1,14 @@
+ #!/usr/bin/env python
+ 
++import sys
++
+ bld.SAMBA_LIBRARY('clidns',
+         source='dns.c resolvconf.c',
+         public_deps='LIBTSOCKET tevent-util ndr-standard',
+         private_library=True)
+ 
+-bld.SAMBA_BINARY('resolvconftest',
++if not sys.platform.startswith('sunos'):
++  bld.SAMBA_BINARY('resolvconftest',
+                   source='resolvconftest.c',
+                   deps='clidns',
+                   install=False)