[SCM] Samba Shared Repository - branch v4-2-test updated

[Karolin Seeger]

The branch, v4-2-test has been updated
       via  5d3a3c8b ctdb-build: fix build without xsltproc
       via  c0d778c packaging: Include CTDB man pages in the tarball
       via  6c01512 ctdb-build: Fix the installation of config files for top-level build
       via  d09a0e0 ctdb-build: Fix the indentation
      from  27219c0 libcli/smb: only force signing of smb2 session setups when binding a new session

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-2-test


- Log -----------------------------------------------------------------
commit 5d3a3c8b712dfa1b18aad02f963e025b7eefa46a
Author: Björn Baumbach <bb at sernet.de>
Date:   Mon Dec 1 13:28:13 2014 +0100

    ctdb-build: fix build without xsltproc
    
    Check for XSLTPROC_MANPAGES before trying to build the docs.
    
    Signed-off-by: Björn Baumbach <bb at sernet.de>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 8d5f58120b6eeb73d1dc3c4df2ec6e12170888aa)
    
    The last 4 patches address
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11014
    Top level build does not install CTDB configuration files.
    
    Autobuild-User(v4-2-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-2-test): Wed Dec 17 23:45:20 CET 2014 on sn-devel-104

commit c0d778c580e7f81fd27a1581ddf5d04700a94787
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Mon Dec 15 00:07:33 2014 +1100

    packaging: Include CTDB man pages in the tarball
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 0f7aae85804889e586c0ce88563af0720e55bd3f)

commit 6c015129d34a3d68cc3fa840436ca8b9904fdf6a
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Mon Dec 15 21:15:24 2014 +1100

    ctdb-build: Fix the installation of config files for top-level build
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit be241207c29357c3cbda2eddb1002930d2e0592c)

commit d09a0e0e0bb904e24c2f69af2831bd9710133d5f
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Mon Dec 15 21:14:44 2014 +1100

    ctdb-build: Fix the indentation
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 641bb5eab344fe85fb93898d5a8bc08d35e11fdc)

-----------------------------------------------------------------------

Summary of changes:
 ctdb/wscript | 18 ++++++++++++------
 wscript      |  3 +++
 2 files changed, 15 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/wscript b/ctdb/wscript
index 788aa5e..3e2a992 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -433,9 +433,10 @@ def build(bld):
         bld.INSTALL_FILES('${CTDB_PMDADIR}', 'utils/pmda/README',
                           destname='README')
 
-    bld.MANPAGES('''doc/onnode.1 doc/ctdbd_wrapper.1 doc/ctdbd.conf.5
-                    doc/ctdb.7 doc/ctdb-statistics.7 doc/ctdb-tunables.7''',
-                 True)
+    if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
+        bld.MANPAGES('''doc/onnode.1 doc/ctdbd_wrapper.1 doc/ctdbd.conf.5
+                        doc/ctdb.7 doc/ctdb-statistics.7 doc/ctdb-tunables.7''',
+                     True)
 
     bld.INSTALL_FILES('${BINDIR}', 'tools/onnode',
                       destname='onnode', chmod=0755)
@@ -451,7 +452,7 @@ def build(bld):
                 continue
             mode = os.lstat(fl).st_mode & 0777
             if arg['trim_path']:
-                    fl = samba_utils.os_path_relpath(fl, arg['trim_path'])
+                fl = samba_utils.os_path_relpath(fl, arg['trim_path'])
             arg['file_list'].append([fl, mode])
 
     def SUBDIR_MODE(path, trim_path=None):
@@ -464,8 +465,13 @@ def build(bld):
         'nfs-rpc-checks.d'
     ]
 
+    if bld.env.standalone_ctdb:
+        configdir = 'config'
+    else:
+        configdir = 'ctdb/config'
+
     for t in etc_subdirs:
-        files = SUBDIR_MODE('config/%s' % t, trim_path='config')
+        files = SUBDIR_MODE('%s/%s' % (configdir, t), trim_path=configdir)
         for fmode in files:
             bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % fmode[0],
                               destname=fmode[0], chmod=fmode[1])
@@ -483,7 +489,7 @@ def build(bld):
     ]
 
     for t in etc_scripts:
-        bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/' + t,
+        bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % t,
                           destname=t, chmod=0755)
 
     bld.INSTALL_FILES('${SYSCONFDIR}/sudoers.d', 'config/ctdb.sudoers',
diff --git a/wscript b/wscript
index 236603e..ad2e2a8 100644
--- a/wscript
+++ b/wscript
@@ -305,6 +305,9 @@ def dist():
     '''makes a tarball for distribution'''
     sambaversion = samba_version.load_version(env=None)
 
+    os.system("make -C ctdb/doc")
+    samba_dist.DIST_FILES('ctdb/doc:ctdb/doc', extend=True)
+
     os.system(srcdir + "/release-scripts/build-manpages-nogit")
     samba_dist.DIST_FILES('bin/docs:docs', extend=True)
 


-- 
Samba Shared Repository