Attachment #138049 for bug #183885

View | Details | Raw Unified | Return to bug 183885
Collapse All | Expand All

Lines 3-9 Link Here

(-)samba4-with-mDNSResponder/Makefile (-2 / +13 lines)
3		3
4	PORTNAME?= ${SAMBA4_PORTNAME}	4	PORTNAME?= ${SAMBA4_PORTNAME}
5	PORTVERSION?= ${SAMBA4_VERSION}	5	PORTVERSION?= ${SAMBA4_VERSION}
6	PORTREVISION?= 0	6	PORTREVISION?= 1
7	CATEGORIES?= net	7	CATEGORIES?= net
8	MASTER_SITES= ${MASTER_SITE_SAMBA}	8	MASTER_SITES= ${MASTER_SITE_SAMBA}
9	MASTER_SITE_SUBDIR= samba/stable samba/rc	9	MASTER_SITE_SUBDIR= samba/stable samba/rc
Lines 111-117 Link Here
111	SAMBA4_BUNDLED_LIBS+= !ldb	111	SAMBA4_BUNDLED_LIBS+= !ldb
112	##############################################################################	112	##############################################################################
113	# Options	113	# Options
114	OPTIONS_DEFINE= ACL_SUPPORT ADS AIO_SUPPORT AVAHI CUPS DEBUG \	114	OPTIONS_DEFINE= ACL_SUPPORT ADS AIO_SUPPORT CUPS DEBUG \
115	DNSUPDATE FAM_SUPPORT LDAP PAM_SMBPASS \	115	DNSUPDATE FAM_SUPPORT LDAP PAM_SMBPASS \
116	PTHREADPOOL QUOTAS SWAT SYSLOG UTMP WINBIND	116	PTHREADPOOL QUOTAS SWAT SYSLOG UTMP WINBIND
117		117
Lines 135-140 Link Here
135		135
136	DEVELOPER_DESC= With development support	136	DEVELOPER_DESC= With development support
137		137
		138	OPTIONS_RADIO= ZEROCONF
		139	OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER
		140	OPTIONS_DEFAULT+= AVAHI
		141
138	OPTIONS_SINGLE= DNS	142	OPTIONS_SINGLE= DNS
139	OPTIONS_SINGLE_DNS= NSUPDATE BIND98 BIND99	143	OPTIONS_SINGLE_DNS= NSUPDATE BIND98 BIND99
140		144
Lines 256-261 Link Here
256	CONFIGURE_ARGS+= --disable-avahi	260	CONFIGURE_ARGS+= --disable-avahi
257	.endif	261	.endif
258		262
		263	.if ${PORT_OPTIONS:MMDNSRESPONDER}
		264	LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder
		265	CONFIGURE_ARGS+= --enable-dnssd
		266	.else
		267	CONFIGURE_ARGS+= --disable-dnssd
		268	.endif
		269
259	.if ${PORT_OPTIONS:MCUPS}	270	.if ${PORT_OPTIONS:MCUPS}
260	LIB_DEPENDS+= cups:${PORTSDIR}/print/cups-client	271	LIB_DEPENDS+= cups:${PORTSDIR}/print/cups-client
261	CONFIGURE_ARGS+= --enable-cups --enable-iprint	272	CONFIGURE_ARGS+= --enable-cups --enable-iprint

Line 0 Link Here

(-)samba4-with-mDNSResponder/files/patch-source3__client__dnsbrowse.c (+11 lines)
	1	--- source3/client/dnsbrowse.c.orig 2013-11-12 10:20:03.145351798 +0100
	2	+++ source3/client/dnsbrowse.c 2013-11-12 10:20:11.762761273 +0100
	3	@@ -91,7 +91,7 @@
	4	}
	5	}
	6
	7	- TALLOC_FREE(fdset);
	8	+ TALLOC_FREE(ctx);
	9	DNSServiceRefDeallocate(mdns_conn_sdref);
	10	}
	11

Lines 1-6 Link Here

(-)samba4-with-mDNSResponder/files/patch-source3__wscript (-9 / +35 lines)
1	--- ./source3/wscript.orig 2013-02-05 12:25:26.000000000 +0000	1	--- source3/wscript.orig 2013-05-21 08:48:46.000000000 +0200
2	+++ ./source3/wscript 2013-02-15 17:54:40.099886239 +0000	2	+++ source3/wscript 2013-11-12 10:07:31.657183050 +0100
3	@@ -475,7 +475,7 @@	3	@@ -35,6 +35,7 @@
		4	opt.SAMBA3_ADD_OPTION('utmp')
		5	opt.SAMBA3_ADD_OPTION('pthreadpool', with_name="enable", without_name="disable", default=True)
		6	opt.SAMBA3_ADD_OPTION('avahi', with_name="enable", without_name="disable")
		7	+ opt.SAMBA3_ADD_OPTION('dnssd', with_name="enable", without_name="disable")
		8	opt.SAMBA3_ADD_OPTION('iconv')
		9	opt.SAMBA3_ADD_OPTION('acl-support')
		10	opt.SAMBA3_ADD_OPTION('dnsupdate')
		11	@@ -502,7 +503,7 @@
4	conf.CHECK_CODE('struct aiocb a; return aio_return(&a);', 'HAVE_AIO_RETURN', msg='Checking for aio_return', headers='aio.h', lib='aio rt')	12	conf.CHECK_CODE('struct aiocb a; return aio_return(&a);', 'HAVE_AIO_RETURN', msg='Checking for aio_return', headers='aio.h', lib='aio rt')
5	conf.CHECK_CODE('struct aiocb a; return aio_error(&a);', 'HAVE_AIO_ERROR', msg='Checking for aio_error', headers='aio.h', lib='aio rt')	13	conf.CHECK_CODE('struct aiocb a; return aio_error(&a);', 'HAVE_AIO_ERROR', msg='Checking for aio_error', headers='aio.h', lib='aio rt')
6	conf.CHECK_CODE('struct aiocb a; return aio_cancel(1, &a);', 'HAVE_AIO_CANCEL', msg='Checking for aio_cancel', headers='aio.h', lib='aio rt')	14	conf.CHECK_CODE('struct aiocb a; return aio_cancel(1, &a);', 'HAVE_AIO_CANCEL', msg='Checking for aio_cancel', headers='aio.h', lib='aio rt')
Lines 9-15 Link Here
9	if not conf.CONFIG_SET('HAVE_AIO'):	17	if not conf.CONFIG_SET('HAVE_AIO'):
10	conf.DEFINE('HAVE_NO_AIO', '1')	18	conf.DEFINE('HAVE_NO_AIO', '1')
11	else:	19	else:
12	@@ -1644,26 +1644,8 @@	20	@@ -812,6 +813,17 @@
		21	conf.SET_TARGET_TYPE('avahi-common', 'EMPTY')
		22	conf.SET_TARGET_TYPE('avahi-client', 'EMPTY')
		23
		24	+ if Options.options.with_dnssd:
		25	+ conf.env.with_dnssd = True
		26	+ if not conf.CHECK_HEADERS('dns_sd.h'):
		27	+ conf.env.with_dnssd = False
		28	+ if not conf.CHECK_FUNCS_IN('DNSServiceRegister', 'dns_sd'):
		29	+ conf.env.with_dnssd = False
		30	+ if conf.env.with_dnssd:
		31	+ conf.DEFINE('WITH_DNSSD_SUPPORT', 1)
		32	+ else:
		33	+ conf.SET_TARGET_TYPE('dns_sd', 'EMPTY')
		34	+
		35	if Options.options.with_iconv:
		36	conf.env.with_iconv = True
		37	if not conf.CHECK_FUNCS_IN('iconv_open', 'iconv', headers='iconv.h'):
		38	@@ -1671,26 +1683,8 @@
13		39
14	if PTHREAD_LDFLAGS == 'error':	40	if PTHREAD_LDFLAGS == 'error':
15	if conf.CHECK_FUNCS_IN('pthread_attr_init', 'pthread'):	41	if conf.CHECK_FUNCS_IN('pthread_attr_init', 'pthread'):
Lines 37-43 Link Here
37		63
38	if PTHREAD_CFLAGS != 'error' and PTHREAD_LDFLAGS != 'error':	64	if PTHREAD_CFLAGS != 'error' and PTHREAD_LDFLAGS != 'error':
39	conf.ADD_CFLAGS(PTHREAD_CFLAGS)	65	conf.ADD_CFLAGS(PTHREAD_CFLAGS)
40	@@ -1693,8 +1675,8 @@	66	@@ -1720,8 +1714,8 @@
41	auth_script vfs_readahead vfs_xattr_tdb vfs_posix_eadb	67	auth_script vfs_readahead vfs_xattr_tdb vfs_posix_eadb
42	vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb	68	vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb
43	vfs_smb_traffic_analyzer vfs_preopen vfs_catia vfs_scannedonly	69	vfs_smb_traffic_analyzer vfs_preopen vfs_catia vfs_scannedonly
Lines 48-54 Link Here
48	vfs_crossrename vfs_linux_xfs_sgid	74	vfs_crossrename vfs_linux_xfs_sgid
49	vfs_time_audit idmap_autorid idmap_tdb2	75	vfs_time_audit idmap_autorid idmap_tdb2
50	idmap_rid idmap_hash'''))	76	idmap_rid idmap_hash'''))
51	@@ -1707,7 +1689,7 @@	77	@@ -1734,7 +1728,7 @@
52		78
53	if Options.options.enable_selftest or Options.options.developer:	79	if Options.options.enable_selftest or Options.options.developer:
54	default_shared_modules.extend(TO_LIST('vfs_fake_acls'))	80	default_shared_modules.extend(TO_LIST('vfs_fake_acls'))
Lines 57-68 Link Here
57		83
58	if conf.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):	84	if conf.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
59	default_static_modules.extend(TO_LIST('pdb_samba_dsdb auth_samba4 vfs_dfs_samba4'))	85	default_static_modules.extend(TO_LIST('pdb_samba_dsdb auth_samba4 vfs_dfs_samba4'))
60	@@ -1740,7 +1722,7 @@	86	@@ -1767,7 +1761,7 @@
61	default_static_modules.extend(TO_LIST('charset_macosxfs'))	87	default_static_modules.extend(TO_LIST('charset_macosxfs'))
62		88
63	if conf.CONFIG_SET('HAVE_GPFS'):	89	if conf.CONFIG_SET('HAVE_GPFS'):
64	- default_shared_modules.extend(TO_LIST('vfs_gpfs'))	90	- default_shared_modules.extend(TO_LIST('vfs_gpfs'))
65	+ default_shared_modules.extend(TO_LIST('vfs_gpfs'))	91	+ default_shared_modules.extend(TO_LIST('vfs_gpfs'))
66		92
67	explicit_shared_modules = TO_LIST(Options.options.shared_modules, delimiter=',')	93	if conf.CONFIG_SET('SAMBA_FAM_LIBS'):
68	explicit_static_modules = TO_LIST(Options.options.static_modules, delimiter=',')	94	default_shared_modules.extend(TO_LIST('vfs_notify_fam'))




--- 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
 

                   source=WINBIND_WINS_NSS_SRC,
                   deps='''param libsmb LIBTSOCKET''',
                   realname='libnss_wins.so.2',
@@ -972,10 +982,12 @@
                     LIBAFS_SETTOKEN
                     RPC_SERVER
                     NDR_SMBXSRV

                     NDR_SMB_ACL
                     netapi
+                    inotify
+                    dns_sd
                     ''' + bld.env['dmapi_lib'],
                     private_library=True,
                     vars=locals())
@@ -1277,6 +1289,7 @@
                  libsmb
                  msrpc3
                  RPC_NDR_SRVSVC
+                 dns_sd
                  cli_smb_common''')
 
 bld.SAMBA3_BINARY('net',
@@ -1629,7 +1642,7 @@
 
 bld.SAMBA3_PYTHON('pylibsmb',
                   source='libsmb/pylibsmb.c',

Return to bug 183885

Lines 1-5 Link Here

(-)samba4-with-mDNSResponder/files/patch-source3__wscript_build (-4 / +13 lines)
1	--- ./source3/wscript_build.orig 2012-12-11 17:10:13.000000000 +0000	1	--- source3/wscript_build.orig 2013-07-01 09:15:40.000000000 +0200
2	+++ ./source3/wscript_build 2013-02-05 04:25:57.199878484 +0000	2	+++ source3/wscript_build 2013-11-12 10:13:36.004046408 +0100
3	@@ -1,7 +1,8 @@	3	@@ -1,7 +1,8 @@
4	#!/usr/bin/env python	4	#!/usr/bin/env python
5		5
Lines 28-34 Link Here
28	source=WINBIND_WINS_NSS_SRC,	28	source=WINBIND_WINS_NSS_SRC,
29	deps='''param libsmb LIBTSOCKET''',	29	deps='''param libsmb LIBTSOCKET''',
30	realname='libnss_wins.so.2',	30	realname='libnss_wins.so.2',
31	@@ -972,10 +982,11 @@	31	@@ -972,10 +982,12 @@
32	LIBAFS_SETTOKEN	32	LIBAFS_SETTOKEN
33	RPC_SERVER	33	RPC_SERVER
34	NDR_SMBXSRV	34	NDR_SMBXSRV
Lines 38-47 Link Here
38	NDR_SMB_ACL	38	NDR_SMB_ACL
39	netapi	39	netapi
40	+ inotify	40	+ inotify
		41	+ dns_sd
41	''' + bld.env['dmapi_lib'],	42	''' + bld.env['dmapi_lib'],
42	private_library=True,	43	private_library=True,
43	vars=locals())	44	vars=locals())
44	@@ -1629,7 +1640,7 @@	45	@@ -1277,6 +1289,7 @@
		46	libsmb
		47	msrpc3
		48	RPC_NDR_SRVSVC
		49	+ dns_sd
		50	cli_smb_common''')
		51
		52	bld.SAMBA3_BINARY('net',
		53	@@ -1629,7 +1642,7 @@
45		54
46	bld.SAMBA3_PYTHON('pylibsmb',	55	bld.SAMBA3_PYTHON('pylibsmb',
47	source='libsmb/pylibsmb.c',	56	source='libsmb/pylibsmb.c',