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

[Karolin Seeger]

The branch, v4-0-test has been updated
       via  e5288a2 Correct the name of the nss_winbind module for FreeBSD by creating a symlink from the FreeBSD required name to the built module.
       via  4fdc786 build: Do not force a specific perl from ${PERL} when running pod2man
       via  e837f2b selftest: also skip raw.search as it also spins
       via  58f393d selftest: skip base.dir2 tests as they just spin on modern ext4
      from  e4cd11d vfs_catia: add my copyright

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit e5288a2d228a68483fd1bc0dc679b44b327dc0fe
Author: Richard Sharpe <realrichardsharpe at gmail.com>
Date:   Thu Mar 7 17:36:37 2013 -0800

    Correct the name of the nss_winbind module for FreeBSD by creating a symlink from the FreeBSD required name to the built module.
    
    Signed-off-by: Timur Bakeyev <timur at FreeBSD.org>
    Reviewed-by: Andrew Bartlett <abartlett at samba.org>
    Reviewed-by: Richard Sharpe <realrichardsharpe at gmail.com>
    
    Autobuild-User(master): Richard Sharpe <sharpe at samba.org>
    Autobuild-Date(master): Fri Mar  8 05:04:04 CET 2013 on sn-devel-104
    (cherry picked from commit 11d128632357c9ae89d67aaf23c429fae83a1b29)
    
    Fix bug #9704 - Fix nss_winbind name on FreeBSD.
    
    Autobuild-User(v4-0-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-0-test): Tue Mar 12 10:43:32 CET 2013 on sn-devel-104

commit 4fdc78674955fd798b927758b17b4cd3075e5b40
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Feb 8 09:12:20 2013 +1100

    build: Do not force a specific perl from ${PERL} when running pod2man
    
    pod2man should have the right #!/usr/bin/perl line already, and forcing it may
    cause us to use the wrong perl.
    
    Essentially treat this like any other system binary, rather than forcing
    it to use the first perl we found.
    
    This essentially reverts e80f576db66ad04592ac436ed74ceb9b96452060.
    Current SLES11 does not seem to have the issue this was added to
    address.
    
    Andrew Bartlett
    
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Thu Feb 28 02:14:25 CET 2013 on sn-devel-104
    (cherry picked from commit 1da22ab994822acacf9a0378c68b15cd32535390)
    
    Fix bug #9703 - Fix build on solaris8: Do not force a specific perl on pod2man.

commit e837f2ba45d5901c040374854167a5ef89c9b32d
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sun Jan 13 13:03:13 2013 +1100

    selftest: also skip raw.search as it also spins
    
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit b40d134bc1866dd7e5b5e7dfc5bf01f6d55b1c1f)
    
    The last 2 patches fix bug #9663 - make test hangs.

commit 58f393d500cc6b5d26436665d6728793614c97b1
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Jan 11 08:26:07 2013 +1100

    selftest: skip base.dir2 tests as they just spin on modern ext4
    
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit a8c745a28c3278e9fbee6f802dc340fe660f27ca)

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

Summary of changes:
 nsswitch/wscript_build |    2 +-
 pidl/wscript           |    2 +-
 selftest/skip          |    2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 1efee55..a7d6489 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -42,7 +42,7 @@ elif (host_os.rfind('freebsd') > -1):
 	bld.SAMBA_LIBRARY('nss_winbind',
 			  source='winbind_nss_linux.c winbind_nss_freebsd.c',
 			  deps='winbind-client',
-			  realname='libnss_winbind.so.1',
+			  realname='nss_winbind.so.1',
 			  vnum='1')
 
 elif (host_os.rfind('netbsd') > -1):
diff --git a/pidl/wscript b/pidl/wscript
index e60ca20..7a25734 100644
--- a/pidl/wscript
+++ b/pidl/wscript
@@ -49,7 +49,7 @@ def build(bld):
     bld.SET_BUILD_GROUP('final')
     if 'POD2MAN' in bld.env and bld.env['POD2MAN'] != '':
         for src, manpage in pidl_manpages.iteritems():
-            bld(rule='${PERL} ${POD2MAN} -c "Samba Documentation" ${SRC} ${TGT}',
+            bld(rule='${POD2MAN} -c "Samba Documentation" ${SRC} ${TGT}',
                 shell=True,
                 source=src,
                 install_path=os.path.dirname(bld.EXPAND_VARIABLES('${MANDIR}/'+manpage)),
diff --git a/selftest/skip b/selftest/skip
index f1fc690..48d9ba6 100644
--- a/selftest/skip
+++ b/selftest/skip
@@ -106,3 +106,5 @@ bench # don't run benchmarks in our selftest
 ^samba4.drs.delete_object.python # flakey test
 ^samba4.rpc.unixinfo # This contains a server-side getpwuid call which hangs the server when nss_winbindd is in use
 ^samba.tests.dcerpc.unix  # This contains a server-side getpwuid call which hangs the server when nss_winbindd is in use
+base.dir2 # This test spins on modern ext4, so we have to skip it
+raw.search # This test spins on modern ext4, so we have to skip it


-- 
Samba Shared Repository