Update ports net/samba4 and net/samba41 to address recent security issue with

the elevation of privilege to ADDC.

Security:	CVE-2014-8143

4 files changed, 40 insertions, 35 deletions

diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 1d8691c843f3..d899572a776c 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=		${SAMBA4_BASENAME}4
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		1
+PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	samba/stable samba/rc
@@ -18,7 +18,7 @@ CONFLICTS?=		*samba3[2-6]-3.* samba41-4.1.*
 
 SAMBA4_BASENAME=	samba
 SAMBA4_PORTNAME=	${SAMBA4_BASENAME}4
-SAMBA4_VERSION=		4.0.23
+SAMBA4_VERSION=		4.0.24
 SAMBA4_DISTNAME=	${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=		${WRKDIR}/${DISTNAME}
@@ -64,7 +64,7 @@ DESTDIRNAME=		--destdir
 CONFIGURE_ENV+=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 			PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
 
-USES=			compiler cpe execinfo fam iconv perl5 pkgconfig \
+USES=			compiler cpe execinfo iconv perl5 pkgconfig \
 			python:2 readline shebangfix
 USE_PERL5=		build
 USE_LDCONFIG=		${SAMBA4_LIBDIR}
@@ -137,10 +137,11 @@ DEVELOPER_DESC=		With development support
 MANPAGES_DESC=		Build manpages from DOCBOOK templates
 
 OPTIONS_RADIO=		DNS ZEROCONF
-OPTIONS_RADIO_DNS=	NSUPDATE BIND99
+OPTIONS_RADIO_DNS=	NSUPDATE BIND99 BIND910
 OPTIONS_RADIO_ZEROCONF=	AVAHI MDNSRESPONDER
 
 BIND99_DESC=		Use bind99 as AD DC DNS server frontend
+BIND910_DESC=		Use bind910 as AD DC DNS server frontend
 NSUPDATE_DESC=		Use samba NSUPDATE utility for AD DC
 
 .include <bsd.port.options.mk>
@@ -162,6 +163,9 @@ CFLAGS+=		-fno-omit-frame-pointer
 .if ${PORT_OPTIONS:MBIND99}
 RUN_DEPENDS+=		bind99>=9.9.0.0:${PORTSDIR}/dns/bind99
 SUB_LIST+=		NSUPDATE="@comment "
+.elif ${PORT_OPTIONS:MBIND910}
+RUN_DEPENDS+=		bind910>=9.10.0.0:${PORTSDIR}/dns/bind910
+SUB_LIST+=		NSUPDATE="@comment "
 .elif ${PORT_OPTIONS:MNSUPDATE}
 RUN_DEPENDS+=		samba-nsupdate:${PORTSDIR}/dns/samba-nsupdate
 SUB_LIST+=		NSUPDATE=""
diff --git a/net/samba4/distinfo b/net/samba4/distinfo
index dcc5b0d696f8..7190cec08a49 100644
--- a/net/samba4/distinfo
+++ b/net/samba4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (samba-4.0.23.tar.gz) = 47d7b9d0caf76ea111794c6181db2fed5c15fd496a5a9eaa8ed4323302c72118
-SIZE (samba-4.0.23.tar.gz) = 22140738
+SHA256 (samba-4.0.24.tar.gz) = e1e4068c65684848d8cb17c8997c91be426ff75ccd617f647878307817af615a
+SIZE (samba-4.0.24.tar.gz) = 22148369
diff --git a/net/samba4/files/patch-nsswitch__wscript_build b/net/samba4/files/patch-nsswitch__wscript_build
new file mode 100644
index 000000000000..8efdb86d3a26
--- /dev/null
+++ b/net/samba4/files/patch-nsswitch__wscript_build
@@ -0,0 +1,15 @@
+--- nsswitch/wscript_build.orig	2015-01-15 23:07:01.654902807 +0000
++++ nsswitch/wscript_build	2015-01-15 23:11:43.587388779 +0000
+@@ -57,6 +57,12 @@
+ 			  realname='nss_winbind.so.1',
+ 			  vnum='1')
+ 
++	bld.SAMBA3_LIBRARY('nss_wins',
++			  source='wins.c wins_freebsd.c',
++			  deps='''param libsmb LIBTSOCKET''',
++			  realname='nss_wins.so.1',
++			  vnum='1')
++
+ elif (host_os.rfind('netbsd') > -1):
+ 	# NetBSD winbind client is implemented as a wrapper
+ 	# around the Linux version. It needs getpwent_r() to
diff --git a/net/samba4/files/patch-source3__wscript_build b/net/samba4/files/patch-source3__wscript_build
index 1a22b5590346..b5d6aca6f785 100644
--- a/net/samba4/files/patch-source3__wscript_build
+++ b/net/samba4/files/patch-source3__wscript_build
@@ -1,34 +1,20 @@
---- source3/wscript_build.orig	2013-07-01 09:15:40.000000000 +0200
-+++ source3/wscript_build	2013-11-12 10:13:36.004046408 +0100
-@@ -1,7 +1,8 @@
- #!/usr/bin/env python
- 
- from samba_utils import *
--import samba_version, samba3
-+import samba_version, samba3, sys
-+host_os = sys.platform
- 
- TDB_LIB_SRC = '''
- 	  lib/dbwrap/dbwrap_open.c
-@@ -651,7 +652,16 @@
+--- source3/wscript_build.orig	2014-12-08 07:46:38.000000000 +0000
++++ source3/wscript_build	2015-01-16 00:11:55.966511894 +0000
+@@ -653,13 +653,6 @@
                      vnum='0',
                      vars=locals())
  
 -bld.SAMBA3_LIBRARY('nss_wins',
-+if (host_os.rfind('freebsd') > -1):
-+        # FreeBSD winbind client is implemented as a wrapper around
-+        # the Linux version.
-+        bld.SAMBA3_LIBRARY('nss_wins',
-+                  source=' '.join([WINBIND_WINS_NSS_SRC, '../nsswitch/wins_freebsd.c']),
-+                  deps='''param libsmb LIBTSOCKET''',
-+                  realname='nss_wins.so.1',
-+                  vnum='1')
-+else:
-+        bld.SAMBA3_LIBRARY('nss_wins',
-                   source=WINBIND_WINS_NSS_SRC,
-                   deps='''param libsmb LIBTSOCKET''',
-                   realname='libnss_wins.so.2',
-@@ -972,10 +982,12 @@
+-                  source=WINBIND_WINS_NSS_SRC,
+-                  deps='''param libsmb LIBTSOCKET''',
+-                  realname='libnss_wins.so.2',
+-                  soname='libnss_wins.so',
+-                  vnum='2')
+-
+ bld.SAMBA3_LIBRARY('gse',
+                    source='librpc/crypto/gse_krb5.c librpc/crypto/gse.c',
+                    deps='krb5samba gensec param KRBCLIENT secrets3',
+@@ -975,10 +968,12 @@
                      LIBAFS_SETTOKEN
                      RPC_SERVER
                      NDR_SMBXSRV
@@ -42,7 +28,7 @@
                      ''' + bld.env['dmapi_lib'],
                      private_library=True,
                      vars=locals())
-@@ -1277,6 +1289,7 @@
+@@ -1284,6 +1279,7 @@
                   libsmb
                   msrpc3
                   RPC_NDR_SRVSVC
@@ -50,7 +36,7 @@
                   cli_smb_common''')
  
  bld.SAMBA3_BINARY('net',
-@@ -1629,7 +1642,7 @@
+@@ -1636,7 +1632,7 @@
  
  bld.SAMBA3_PYTHON('pylibsmb',
                    source='libsmb/pylibsmb.c',