Various build and install fixes for Darwin.

4 files changed, 55 insertions, 28 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 5b28ed3b7fd..330e5465c53 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.256 2015/10/23 19:07:58 tnn Exp $
+# $NetBSD: Makefile,v 1.257 2016/02/29 17:13:06 jperkin Exp $
 
 DISTNAME=	samba-${VERSION}
 CATEGORIES=	net
@@ -76,7 +76,6 @@ CONFIGURE_ARGS+=	--enable-merged-build=no
 .include "../../net/samba/options.mk"
 
 .if ${_OPSYS_SHLIB_TYPE} == "dylib"
-CHECK_SHLIBS_SKIP+=	lib/samba/*/*.dylib lib/security/pam_winbind.dylib
 PLIST_SUBST+=	LIBEXT=dylib
 SAMBA_LIBEXT=	dylib
 .else
@@ -152,6 +151,11 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/script/updatesmbpasswd.sh \
 		${DESTDIR}${PREFIX}/${EGDIR}
 	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/include/*.h
+.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+	cd ${DESTDIR}${PREFIX}; ${FIND} lib/samba lib/security -name "*.dylib" | while read lib; do \
+		install_name_tool -id ${PREFIX}/$${lib} $${lib}; \
+	done
+.endif
 
 .include "../../net/samba/Makefile.mirrors"
 
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 47c275ad5ee..86cf9146c9d 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.104 2015/11/04 00:35:36 agc Exp $
+$NetBSD: distinfo,v 1.105 2016/02/29 17:13:06 jperkin Exp $
 
 SHA1 (samba-3.6.25.tar.gz) = 86fbfcfe80454cc7dbe510e7d58c02922cac3efa
 RMD160 (samba-3.6.25.tar.gz) = 4df673ddac2a3fc8590820c8651e10f0dac90281
@@ -9,7 +9,7 @@ SHA1 (patch-ab) = eb680f72ab0118e57d1b322aba869ac798b27e17
 SHA1 (patch-ac) = 25edbd616199b7dcb41f87aa1374d0bdf19cafec
 SHA1 (patch-ad) = 750b0c08d9975a257bec09088cb38414a1299070
 SHA1 (patch-ae) = de70580b293f4b964bc39b95c6a27511faaf088a
-SHA1 (patch-af) = 433379f00214ef066043c6c6763cab41a39f3e18
+SHA1 (patch-af) = 380980f6c7d3f9ca6b472cfd2142d6d8bdb0f390
 SHA1 (patch-ag) = d84aeab73f22e372f0d275276f4a1160b240199c
 SHA1 (patch-ah) = d4dc5c01fae6b72fb8902b32c0c5b668a918ce49
 SHA1 (patch-ai) = 2161f55d4f1ffe13fa24387349bb9ac71dae5521
@@ -25,7 +25,6 @@ SHA1 (patch-at) = dcfbe79496065559380e5713a758816e538e728b
 SHA1 (patch-au) = f94b27a5792acfa3742b4c07b23b3395b73eba84
 SHA1 (patch-av) = ee4652f6278eea9b2208dacfba9b075bd60dd54b
 SHA1 (patch-aw) = 772678763cfc9df298eb6d0a65c24a8372852309
-SHA1 (patch-ba) = 64d88570f2e15db4f8769c7865e0793eb8909c2b
 SHA1 (patch-bb) = bfc730bc2f82aff61bdf1000ab33333368a162bd
 SHA1 (patch-bc) = 857e2400c8852f3c878f8d82857e80f214be2aea
 SHA1 (patch-bd) = b78324305bbf67fa4a7dd627e0af1618d2bf7b47
diff --git a/net/samba/patches/patch-af b/net/samba/patches/patch-af
index 066d3ea2197..dd1f2d950b9 100644
--- a/net/samba/patches/patch-af
+++ b/net/samba/patches/patch-af
@@ -1,8 +1,48 @@
-$NetBSD: patch-af,v 1.12 2013/08/12 02:45:55 taca Exp $
+$NetBSD: patch-af,v 1.13 2016/02/29 17:13:06 jperkin Exp $
 
---- configure.orig	2013-07-29 18:57:14.000000000 +0000
+Fix HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS test, from upstream.
+
+--- configure.orig	2015-02-22 14:16:23.000000000 +0000
 +++ configure
-@@ -19513,6 +19513,7 @@ $as_echo "#define DARWINOS 1" >>confdefs
+@@ -15277,20 +15277,24 @@ else
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-#include <stdio.h>
+-int
+-main ()
+-{
+-
+-		if (0) {
+-		   this_function_does_not_exist();
+-		} else {
+-		  return 1;
+-		}
+-
++#include <sys/types.h>
++size_t __unsafe_string_function_usage_here_size_t__(void);
++#define CHECK_STRING_SIZE(d, len) (sizeof(d) != (len) && sizeof(d) != sizeof(char *))
++static size_t push_string_check_fn(void *dest, const char *src, size_t dest_len) {
++    return 0;
++}
+ 
+-  ;
+-  return 0;
++#define push_string_check(dest, src, dest_len) \
++    (CHECK_STRING_SIZE(dest, dest_len) \
++    ? __unsafe_string_function_usage_here_size_t__()	\
++    : push_string_check_fn(dest, src, dest_len))
++
++int main(int argc, char **argv) {
++    char outbuf[1024];
++    char *p = outbuf;
++    const char *foo = "bar";
++    p += 31 + push_string_check(p + 31, foo, sizeof(outbuf) - (p + 31 - outbuf));
++    return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+@@ -19513,6 +19517,7 @@ $as_echo "#define DARWINOS 1" >>confdefs
  
  			BLDSHARED="true"
  			LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress"
@@ -10,7 +50,7 @@ $NetBSD: patch-af,v 1.12 2013/08/12 02:45:55 taca Exp $
  			CFLAGS="$CFLAGS -fno-common"
  			SHLD="\${CC}"
  			SHLIBEXT="dylib"
-@@ -19562,7 +19563,7 @@ fi
+@@ -19562,7 +19567,7 @@ fi
  
  if test "x$enable_as_needed" != xno; then
      saved_before_as_needed_ldflags="$LDFLAGS"
@@ -19,7 +59,7 @@ $NetBSD: patch-af,v 1.12 2013/08/12 02:45:55 taca Exp $
  	saved_ldflags="$LDFLAGS"
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $flags works" >&5
  $as_echo_n "checking if $flags works... " >&6; }
-@@ -26638,9 +26639,9 @@ LIBS="-lcrypto $KRB5_LIBS  $LIBS"
+@@ -26638,9 +26643,9 @@ LIBS="-lcrypto $KRB5_LIBS  $LIBS"
  
  
  
@@ -32,7 +72,7 @@ $NetBSD: patch-af,v 1.12 2013/08/12 02:45:55 taca Exp $
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -26652,31 +26653,31 @@ else
+@@ -26652,31 +26657,31 @@ else
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -72,7 +112,7 @@ $NetBSD: patch-af,v 1.12 2013/08/12 02:45:55 taca Exp $
  _ACEOF
  
  fi
-@@ -36043,31 +36044,39 @@ case "$host_os" in
+@@ -36049,31 +36054,39 @@ case "$host_os" in
  		NSSSONAMEVERSIONSUFFIX=".2"
  		WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o"
  		;;
diff --git a/net/samba/patches/patch-ba b/net/samba/patches/patch-ba
deleted file mode 100644
index 23ae512629d..00000000000
--- a/net/samba/patches/patch-ba
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ba,v 1.11 2013/08/12 02:45:55 taca Exp $
-
---- configure.in.orig	2013-07-29 18:55:18.000000000 +0000
-+++ configure.in
-@@ -6541,6 +6541,11 @@ AC_CHECK_MEMBER(struct passwd.pw_age,
- 		AC_DEFINE(HAVE_PASSWD_PW_AGE, 1, [Defined if struct passwd has pw_age field]),,
- 		[#include <pwd.h>])
- 
-+# NetBSD
-+AC_CHECK_MEMBER(struct passwd.pw_class,
-+		AC_DEFINE(HAVE_PASSWD_PW_CLASS, 1, [Defined if struct passwd has pw_class field]),,
-+		[#include <pwd.h>])
-+
- # AIX 4.3.x and 5.1 do not have as many members in
- # struct secmethod_table as AIX 5.2
- AC_CHECK_MEMBERS([struct secmethod_table.method_attrlist], , ,