SF.net SVN: gar:[25245] csw/mgar/pkg/samba/branches/samba4
janholzh at users.sourceforge.net
janholzh at users.sourceforge.net
Fri Sep 18 14:42:09 CEST 2015
Revision: 25245
http://sourceforge.net/p/gar/code/25245
Author: janholzh
Date: 2015-09-18 12:42:08 +0000 (Fri, 18 Sep 2015)
Log Message:
-----------
samba/branches/samba4: wip 4.3.0 does build fine now
Modified Paths:
--------------
csw/mgar/pkg/samba/branches/samba4/Makefile
csw/mgar/pkg/samba/branches/samba4/files/0001-fix-xml.patch
Added Paths:
-----------
csw/mgar/pkg/samba/branches/samba4/files/idmap_fix
Modified: csw/mgar/pkg/samba/branches/samba4/Makefile
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/Makefile 2015-09-16 15:25:41 UTC (rev 25244)
+++ csw/mgar/pkg/samba/branches/samba4/Makefile 2015-09-18 12:42:08 UTC (rev 25245)
@@ -31,7 +31,7 @@
BUILD_DEP_PKGS += CSWlibiconv-dev
BUILD_DEP_PKGS += CSWlibgcrypt-dev
-#PATCHFILES += 0001-fix-xml.patch
+PATCHFILES += 0001-fix-xml.patch
# From https://bugzilla.samba.org/show_bug.cgi?id=7588
PATCHFILES += nss_winbind.patch
PATCHFILES += smbd_patch_for_setgroups.patch
@@ -59,6 +59,10 @@
#From https://bugzilla.samba.org/show_bug.cgi?id=11512
PATCHFILES +=fix_bugid_11512
+#fix build problems with idmap patch not in 4.3 but master
+#https://git.samba.org/?p=samba.git;a=patch;h=5134d29cbb2edcc2326de8896c5465afb3a0f392
+PATCHFILES +=idmap_fix
+
NOGITPATCH += 1
# Filesystem layout
@@ -79,9 +83,7 @@
SMB_VFS_MODULES_F = vfs_acl_xattr,vfs_acl_tdb,vfs_smb_traffic_analyzer,vfs_dirsort,vfs_scannedonly,vfs_crossrename
SMB_VFS_MODULES_G = vfs_time_audit,vfs_media_harmony,vfs_dfs_samba4
SMB_VFS_MODULES = $(SMB_VFS_MODULES_A),$(SMB_VFS_MODULES_B),$(SMB_VFS_MODULES_C),$(SMB_VFS_MODULES_D),$(SMB_VFS_MODULES_E),$(SMB_VFS_MODULES_F),$(SMB_VFS_MODULES_G)
-# Some IPMAPS don't build e.g idmap_autorid
-#SMB_IDMAP_MODULES = idmap_ad,idmap_adex,idmap_autorid,idmap_hash,idmap_ldap,idmap_nss,idmap_rid,idmap_tdb,idmap_tdb2
-SMB_IDMAP_MODULES = idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex
+SMB_IDMAP_MODULES = idmap_ad,idmap_adex,idmap_autorid,idmap_hash,idmap_ldap,idmap_nss,idmap_rid,idmap_tdb,idmap_tdb2
SMB_PDB_MODULES = pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4
SMB_AUTH_MODULES = auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4
SMB_MODULES = $(SMB_VFS_MODULES),$(SMB_IDMAP_MODULES),$(SMB_PDB_MODULES),$(SMB_AUTH_MODULES)
Modified: csw/mgar/pkg/samba/branches/samba4/files/0001-fix-xml.patch
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/files/0001-fix-xml.patch 2015-09-16 15:25:41 UTC (rev 25244)
+++ csw/mgar/pkg/samba/branches/samba4/files/0001-fix-xml.patch 2015-09-18 12:42:08 UTC (rev 25245)
@@ -1,25 +1,25 @@
-From a38fbe7bb3660add428675ec662c46583cdee354 Mon Sep 17 00:00:00 2001
+From d59033403b12b85393129ef115acaead994d0347 Mon Sep 17 00:00:00 2001
From: Jan Holzhueter <jh at opencsw.org>
-Date: Thu, 7 Feb 2013 10:12:04 +0100
-Subject: [PATCH] fix-xml
+Date: Wed, 16 Sep 2015 16:14:25 +0200
+Subject: [PATCH] fix_xml
---
buildtools/wafsamba/wafsamba.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
-index dcbb047..bb4b3b2 100644
+index c27241e..15752b3 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
-@@ -790,7 +790,7 @@ def SAMBAMANPAGES(bld, manpages):
- '''build and install manual pages'''
+@@ -892,7 +892,7 @@ def SAMBAMANPAGES(bld, manpages, extra_source=None):
bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/expand-sambadoc.xsl'
bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl'
-- bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file:///usr/local/share/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
-+ bld.env.SAMBA_CATALOGS = 'file:///etc/opt/csw/xml/catalog file:///usr/local/share/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
+ bld.env.SAMBA_CATALOG = bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
+- bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file:///usr/local/share/xml/catalog file://' + bld.env.SAMBA_CATALOG
++ bld.env.SAMBA_CATALOGS = 'file:///etc/opt/csw/xml/catalog file:///usr/local/share/xml/catalog file://' + bld.env.SAMBA_CATALOG
for m in manpages.split():
source = m + '.xml'
--
-1.8.1
+2.4.0
Added: csw/mgar/pkg/samba/branches/samba4/files/idmap_fix
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/files/idmap_fix (rev 0)
+++ csw/mgar/pkg/samba/branches/samba4/files/idmap_fix 2015-09-18 12:42:08 UTC (rev 25245)
@@ -0,0 +1,115 @@
+From 5134d29cbb2edcc2326de8896c5465afb3a0f392 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze at samba.org>
+Date: Thu, 13 Aug 2015 15:04:14 +0200
+Subject: [PATCH] s3:wscript: fix the build without any idmap module
+
+Signed-off-by: Stefan Metzmacher <metze at samba.org>
+Reviewed-by: Ralph Boehme <slow at samba.org>
+---
+ source3/winbindd/wscript_build | 15 ++++++++-------
+ source3/wscript | 4 ++--
+ source3/wscript_build | 1 +
+ 3 files changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
+index 2f7e74d..7fce463 100644
+--- a/source3/winbindd/wscript_build
++++ b/source3/winbindd/wscript_build
+@@ -2,7 +2,7 @@
+
+ bld.SAMBA3_LIBRARY('idmap',
+ source='idmap.c idmap_util.c',
+- deps='samba-util',
++ deps='samba-util pdb',
+ allow_undefined_symbols=True,
+ private_library=True)
+
+@@ -16,12 +16,13 @@ bld.SAMBA3_SUBSYSTEM('IDMAP_TDB_COMMON',
+
+ bld.SAMBA3_SUBSYSTEM('IDMAP_HASH',
+ source='idmap_hash/idmap_hash.c idmap_hash/mapfile.c',
+- deps='samba-util krb5samba')
++ deps='samba-util krb5samba',
++ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_hash'))
+
+ bld.SAMBA3_SUBSYSTEM('IDMAP_AD',
+ source='idmap_ad.c',
+ deps='ads nss_info',
+- enabled=bld.CONFIG_SET("HAVE_LDAP"))
++ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad'))
+
+ bld.SAMBA3_MODULE('idmap_ad',
+ subsystem='idmap',
+@@ -30,7 +31,7 @@ bld.SAMBA3_MODULE('idmap_ad',
+ deps='IDMAP_AD',
+ init_function='',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
+- enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.CONFIG_SET("HAVE_LDAP"))
++ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad'))
+
+ bld.SAMBA3_MODULE('idmap_rfc2307',
+ subsystem='idmap',
+@@ -39,7 +40,7 @@ bld.SAMBA3_MODULE('idmap_rfc2307',
+ init_function='',
+ deps='ads',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_rfc2307'),
+- enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_rfc2307') and bld.CONFIG_SET("HAVE_LDAP"))
++ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_rfc2307'))
+
+ bld.SAMBA3_MODULE('idmap_rid',
+ subsystem='idmap',
+@@ -141,7 +142,7 @@ bld.SAMBA3_MODULE('nss_info_rfc2307',
+ allow_undefined_symbols=True,
+ init_function='',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
+- enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.CONFIG_SET("HAVE_LDAP"))
++ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad'))
+
+ bld.SAMBA3_MODULE('nss_info_sfu20',
+ subsystem='nss_info',
+@@ -150,7 +151,7 @@ bld.SAMBA3_MODULE('nss_info_sfu20',
+ allow_undefined_symbols=True,
+ init_function='',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
+- enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.CONFIG_SET("HAVE_LDAP"))
++ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad'))
+
+ bld.SAMBA3_MODULE('nss_info_sfu',
+ subsystem='nss_info',
+diff --git a/source3/wscript b/source3/wscript
+index 4e940fa..8dcde59 100644
+--- a/source3/wscript
++++ b/source3/wscript
+@@ -797,6 +797,7 @@ msg.msg_accrightslen = sizeof(fd);
+ conf.DEFINE('WITH_ADS', '1')
+ conf.env['HAVE_ADS'] = '1'
+ Logs.info("Building with Active Directory support.")
++ default_shared_modules.extend(TO_LIST('idmap_ad idmap_rfc2307'))
+ elif Options.options.with_ads == False:
+ Logs.info("Building without Active Directory support (--without-ads).")
+ else:
+@@ -1589,9 +1590,8 @@ main() {
+ vfs_worm
+ vfs_crossrename vfs_linux_xfs_sgid
+ vfs_time_audit idmap_autorid idmap_tdb2
+- idmap_ad
+ idmap_script
+- idmap_rid idmap_hash idmap_rfc2307'''))
++ idmap_rid idmap_hash'''))
+
+ if Options.options.developer:
+ default_static_modules.extend(TO_LIST('charset_weird'))
+diff --git a/source3/wscript_build b/source3/wscript_build
+index ace4b99..6a0762f 100755
+--- a/source3/wscript_build
++++ b/source3/wscript_build
+@@ -1310,6 +1310,7 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
+ LOCKING
+ NDR_OPEN_FILES
+ idmap
++ IDMAP_TDB_COMMON
+ samba-cluster-support
+ ''',
+ cflags='-DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,
+--
+1.9.1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list