Attachment 151717 Details for Bug 196791 – Update to 4.1.16 and etc.

[patch] Update to 4.1.16 and etc.

patch-net_samba41 (text/plain), 4.29 KB, created by Yasuhiro Kimura on 2015-01-16 02:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2015-01-16 02:00:01 UTC

Size: 4.29 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 377060)
>+++ Makefile	(working copy)
>@@ -18,7 +18,7 @@
> 
> SAMBA4_BASENAME=	samba
> SAMBA4_PORTNAME=	${SAMBA4_BASENAME}4
>-SAMBA4_VERSION=		4.1.14
>+SAMBA4_VERSION=		4.1.16
> 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 @@
> 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}
>@@ -140,10 +140,11 @@
> 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>
>@@ -165,6 +166,9 @@
> .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=""
>Index: distinfo
>===================================================================
>--- distinfo	(revision 377060)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (samba-4.1.14.tar.gz) = 5ea14baaca997292355d368918879e3d639def92b54efef2279cf5abe8db2cba
>-SIZE (samba-4.1.14.tar.gz) = 19527260
>+SHA256 (samba-4.1.16.tar.gz) = 12a09c167bfa25f50b82775bcbeda94c71c5d71d3b0d1210f6dae0f23020a87b
>+SIZE (samba-4.1.16.tar.gz) = 19534236
>Index: files/patch-source3__wscript_build
>===================================================================
>--- files/patch-source3__wscript_build	(revision 377060)
>+++ files/patch-source3__wscript_build	(working copy)
>@@ -1,34 +1,6 @@
>---- source3/wscript_build.orig	2013-09-06 09:39:57.000000000 +0000
>-+++ source3/wscript_build	2013-11-20 00:35:51.687173831 +0000
>-@@ -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
>-@@ -654,7 +655,16 @@
>-                     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',
>-@@ -976,11 +986,13 @@
>+--- source3/wscript_build.orig	2015-01-12 16:43:53.000000000 +0900
>++++ source3/wscript_build	2015-01-16 09:37:10.672408793 +0900
>+@@ -970,11 +970,13 @@
>                      LIBAFS_SETTOKEN
>                      RPC_SERVER
>                      NDR_SMBXSRV
>@@ -44,7 +16,7 @@
>                      ''' + bld.env['dmapi_lib'],
>                      private_library=True,
>                      vars=locals())
>-@@ -1261,6 +1273,7 @@
>+@@ -1259,6 +1261,7 @@
>                   libsmb
>                   msrpc3
>                   RPC_NDR_SRVSVC
>@@ -52,7 +24,7 @@
>                   cli_smb_common''')
>  
>  bld.SAMBA3_BINARY('net',
>-@@ -1613,7 +1626,7 @@
>+@@ -1611,7 +1614,7 @@
>  
>  bld.SAMBA3_PYTHON('pylibsmb',
>                    source='libsmb/pylibsmb.c',
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 377060)
>+++ pkg-plist	(working copy)
>@@ -211,7 +211,6 @@
> lib/libwbclient.so.0
> lib/mit_samba.so
> lib/nss_winbind.so.1
>-lib/nss_wins.so.1
> %%SMBPASS%%lib/pam_smbpass.so
> lib/pam_winbind.so
> lib/winbind_krb5_locator.so

Actions: View | Diff

Attachments on bug 196791: 151717