[SCM] Samba Shared Repository - branch master updated

Stefan Metzmacher metze at samba.org
Wed Sep 12 17:36:02 MDT 2012


The branch, master has been updated
       via  9158423 VERSION: Bump version up to 4.1.0pre1
       via  2050b48 VERSION: Release Samba 4.0.0rc1
       via  e75e768 WHATSNEW: prepare release notes for 4.0.0rc1
       via  e2accc4 build:dist: call source3/autogen.sh and packaged generated files
       via  6895875 build:dist: call build-manpages-nogit for make dist and package generated files
       via  d28f36d build:dist: extend meaning of DIST_FILES to also recurse into directories
       via  36b2732 build:dist: make use of file / distfile more obvious in handling of DIST_FILES in "make dist"
       via  3821def build:dist: for snapshot builds, call DIST_DIRS with extend=True
       via  8ea2a46 build:dist: extend samba_dist.DIST_FILES() to take optional parameter extend(=False)
       via  4989a9d build:waf dist: factor out function to add list of files to the tarball
       via  c33643e s3:build: rewrite autogen.sh to be called from any directory
       via  b938979 release-scripts: run build-manpages-nogit with bash
       via  3c5d2d5 release-scripts: run build-manpages-git with bash
       via  cfdab79 release-scripts: let build-manpages-nogit store generated docs under ./bin/docs
       via  068ae48 release-scripts: let build-manpages-git store generated docs under bin/docs/
      from  f5a2379 In vfs modules, don't use 'conn->origpath' when we really mean 'conn->cwd'.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 915842333e641190035c2911940f08870abd221f
Author: Michael Adam <obnox at samba.org>
Date:   Wed Sep 12 15:34:29 2012 +0200

    VERSION: Bump version up to 4.1.0pre1
    
    Pair-Programmed-With: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Thu Sep 13 01:35:33 CEST 2012 on sn-devel-104

commit 2050b48dd4b05265e04029dbdfd9a22c2ccdb038
Author: Michael Adam <obnox at samba.org>
Date:   Wed Sep 12 15:30:24 2012 +0200

    VERSION: Release Samba 4.0.0rc1
    
    Pair-Programmed-With: Stefan Metzmacher <metze at samba.org>

commit e75e768f981d5766a098852dd5d100d496c6336b
Author: Michael Adam <obnox at samba.org>
Date:   Wed Sep 12 15:27:48 2012 +0200

    WHATSNEW: prepare release notes for 4.0.0rc1
    
    Pair-Programmed-With: Stefan Metzmacher <metze at samba.org>

commit e2accc4ef8c274eea09304d6f9211e3d5af3f73c
Author: Michael Adam <obnox at samba.org>
Date:   Wed Sep 12 17:11:28 2012 +0200

    build:dist: call source3/autogen.sh and packaged generated files
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

commit 6895875bf80df7f321a5853b591ba5b5a8d4f4d6
Author: Michael Adam <obnox at samba.org>
Date:   Wed Sep 12 17:10:31 2012 +0200

    build:dist: call build-manpages-nogit for make dist and package generated files
    
    so that we always have generated manpages under docs/manpages in the release
    tarball
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

commit d28f36d16e515fb1280b21b04bb5bb113647f247
Author: Michael Adam <obnox at samba.org>
Date:   Wed Sep 12 17:06:23 2012 +0200

    build:dist: extend meaning of DIST_FILES to also recurse into directories
    
    Pair-Programmed-With: Stefan Metzmacher <metze at samba.org>

commit 36b2732426c4301bdbea99bb34fccdd767af044d
Author: Michael Adam <obnox at samba.org>
Date:   Wed Sep 12 23:45:50 2012 +0200

    build:dist: make use of file / distfile more obvious in handling of DIST_FILES in "make dist"
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

commit 3821defe2a76663ddef59e9591dffa42a08764bf
Author: Michael Adam <obnox at samba.org>
Date:   Wed Sep 12 17:04:50 2012 +0200

    build:dist: for snapshot builds, call DIST_DIRS with extend=True
    
    to allow the distversion file to be an addition to the list
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

commit 8ea2a468c38d07c62d094e2bd4c1dc42f9c47949
Author: Michael Adam <obnox at samba.org>
Date:   Wed Sep 12 17:02:39 2012 +0200

    build:dist: extend samba_dist.DIST_FILES() to take optional parameter extend(=False)
    
    This allows to do multpile DIST_FILES() calls that will extend the list
    rather than only setting it initially.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

commit 4989a9dd7c89e446e59e9faf7cbe4a9a6b0083a8
Author: Michael Adam <obnox at samba.org>
Date:   Wed Sep 12 17:01:40 2012 +0200

    build:waf dist: factor out function to add list of files to the tarball
    
    Pair-Programmed-With: Stefan Metzmacher <metze at samba.org>

commit c33643ebb354637f8651c5356b8e7445f0931ce8
Author: Michael Adam <obnox at samba.org>
Date:   Wed Sep 12 17:48:12 2012 +0200

    s3:build: rewrite autogen.sh to be called from any directory
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

commit b9389798314bc1163be7ea8fc89823c2666ecd78
Author: Michael Adam <obnox at samba.org>
Date:   Wed Sep 12 17:38:04 2012 +0200

    release-scripts: run build-manpages-nogit with bash
    
    On debian/ubuntu, the "dash" which is sh, does not
    provide pushd/popd...
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

commit 3c5d2d5bcf973c4e21407559ef934044930c500e
Author: Michael Adam <obnox at samba.org>
Date:   Wed Sep 12 17:37:17 2012 +0200

    release-scripts: run build-manpages-git with bash
    
    On debian/ubuntu, the "dash" which is sh, does not
    provide pushd/popd...
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

commit cfdab79729e8507a7504b0224c60454d3bc40ffc
Author: Michael Adam <obnox at samba.org>
Date:   Wed Sep 12 15:46:35 2012 +0200

    release-scripts: let build-manpages-nogit store generated docs under ./bin/docs
    
    not under ./docs
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

commit 068ae4824afc04138e02d1e4dc7fdc166ead3de3
Author: Michael Adam <obnox at samba.org>
Date:   Wed Sep 12 15:45:59 2012 +0200

    release-scripts: let build-manpages-git store generated docs under bin/docs/
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

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

Summary of changes:
 VERSION                              |    6 +-
 WHATSNEW.txt                         |  105 ++++++++++++++--------------------
 buildtools/wafsamba/samba_dist.py    |   76 +++++++++++++++---------
 release-scripts/build-manpages-git   |    4 +-
 release-scripts/build-manpages-nogit |    4 +-
 source3/autogen.sh                   |   25 +++++++--
 wscript                              |   12 ++++-
 7 files changed, 128 insertions(+), 104 deletions(-)


Changeset truncated at 500 lines:

diff --git a/VERSION b/VERSION
index fa77135..766989c 100644
--- a/VERSION
+++ b/VERSION
@@ -24,7 +24,7 @@
 #  ->  "3.0.0"                                         #
 ########################################################
 SAMBA_VERSION_MAJOR=4
-SAMBA_VERSION_MINOR=0
+SAMBA_VERSION_MINOR=1
 SAMBA_VERSION_RELEASE=0
 
 ########################################################
@@ -67,7 +67,7 @@ SAMBA_VERSION_ALPHA_RELEASE=
 # e.g. SAMBA_VERSION_BETA_RELEASE=1                    #
 #  ->  "4.0.0beta1"                                    #
 ########################################################
-SAMBA_VERSION_BETA_RELEASE=9
+SAMBA_VERSION_BETA_RELEASE=
 
 ########################################################
 # For 'pre' releases the version will be               #
@@ -77,7 +77,7 @@ SAMBA_VERSION_BETA_RELEASE=9
 # e.g. SAMBA_VERSION_PRE_RELEASE=1                     #
 #  ->  "2.2.9pre1"                                     #
 ########################################################
-SAMBA_VERSION_PRE_RELEASE=
+SAMBA_VERSION_PRE_RELEASE=1
 
 ########################################################
 # For 'rc' releases the version will be                #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index e8e2613..b594e0e 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,4 @@
-What's new in Samba 4.0 beta8
+What's new in Samba 4.0.0 rc1
 =============================
 
 Samba 4.0 will be the next version of the Samba suite and incorporates
@@ -11,7 +11,7 @@ and above.
 WARNINGS
 ========
 
-Samba 4.0 beta8 is not a final Samba release, however we are now making
+Samba 4.0.0 rc1 is not a final Samba release, however we are now making
 good progress towards a Samba 4.0 release.  However, this is expected to be the
 last beta release before we start on our release candidate series.
 
@@ -56,7 +56,7 @@ as the internal dns server (SAMBA_INTERNAL) is the default now.
 NEW FEATURES
 ============
 
-Samba 4.0 beta supports the server-side of the Active Directory logon
+Samba 4.0 supports the server-side of the Active Directory logon
 environment used by Windows 2000 and later, so we can do full domain
 join and domain logon operations with these clients.
 
@@ -105,71 +105,50 @@ internal workings of the DC code is now implemented in python.
 CHANGES SINCE beta8
 ===================
 
-The smbd file server now offers SMB3 as the maximum protocol
-by default. Samba can negotiate version 3 of the SMB protocol
-and supports the required features, including all required
-features of SMB 2.1 and SMB 2.0. Note that this does not imply
-that Samba implements all features of SMB3 since many of them
-are optional capabilities. Examples of features that Samba does
-not implement yet are leases (SMB 2.1) and multi-channel (SMB 3).
-
-Samba now offers an initial support for SMB2 durable file handles.
-These are enabled by default and can be turned off on a per share
-basis by setting "durable handles = no" on the share configuration.
-Note that in order to prevent conflicts with other applications
-accessing the same files, durable handles are only granted on
-shares that are configured for CIFS/SMB2-only access, i.e. more
-explicitly shares that are configured for minimal interoperability
-with these settings:
-
-  kernel oplocks = no
-  kernel share modes = no
-  posix locking = no
-
-The option "kernel share modes" has been introduced to be able
-to turn the translation of SMB share modes into kernel flocks
-off.
-
-The 'provision' script was merged into 'samba-tool'
-as 'samba-tool domain provision' the arguments are still
-the same.
-
-The 'updateprovision' script was renamed to 'samba_upgradeprovision'.
-
-We changed the default dns implementation to the internal dns server
-(SAMBA_INTERNAL). BIND9_FLATFILE and BIND9_DLZ are still available,
-but you'll have to add '-dns' to the 'server services' option
-to disable the internal dns server.
-The default for 'allow dns updates' has changed to 'secure only'.
-
-CHANGES SINCE beta7
-=====================
-
-For a list of changes since beta7, please see the git log.
+For a list of changes since beta8, please see the git log.
 
 $ git clone git://git.samba.org/samba.git
 $ cd samba.git
-$ git log samba-4.0.0beta7..samba-4.0.0beta8
+$ git log samba-4.0.0beta8..samba-4.0.0rc1
 
 Some major user-visible changes include:
 
-- A fix for a segfault/abort on startup of the 'samba' binary in the
-  credentials_secrets code. 
-
-- A fix for samba-tool classicupgrade of pdb_ldap-based domains
-
-- A fix for samba-tool domain exportkeyab only exporting DES keys
-
-- Printing is now enabled on the AD DC
-
-- Fix bug #9124 - Samba fails to set "inherited" bit on inherited ACE's.
-
-- We now avoid printing secret attributes (such as unicodePwd and
-  suppliementalCredentials) in ldb trace logs
-
-- s3-printing: fix bug 9123 lprng job tracking errors
-
-- A fix for building with MIT Kerberos
+- The smbd file server now offers SMB3 as the maximum protocol
+  by default. Samba can negotiate version 3 of the SMB protocol
+  and supports the required features, including all required
+  features of SMB 2.1 and SMB 2.0. Note that this does not imply
+  that Samba implements all features of SMB3 since many of them
+  are optional capabilities. Examples of features that Samba does
+  not implement yet are leases (SMB 2.1) and multi-channel (SMB 3).
+
+  Samba now offers an initial support for SMB2 durable file handles.
+  These are enabled by default and can be turned off on a per share
+  basis by setting "durable handles = no" on the share configuration.
+  Note that in order to prevent conflicts with other applications
+  accessing the same files, durable handles are only granted on
+  shares that are configured for CIFS/SMB2-only access, i.e. more
+  explicitly shares that are configured for minimal interoperability
+  with these settings:
+
+    kernel oplocks = no
+    kernel share modes = no
+    posix locking = no
+
+  The option "kernel share modes" has been introduced to be able
+  to turn the translation of SMB share modes into kernel flocks
+  off.
+
+- The 'provision' script was merged into 'samba-tool'
+  as 'samba-tool domain provision' the arguments are still
+  the same.
+
+- The 'updateprovision' script was renamed to 'samba_upgradeprovision'.
+
+- We changed the default dns implementation to the internal dns server
+  (SAMBA_INTERNAL). BIND9_FLATFILE and BIND9_DLZ are still available,
+  but you'll have to add '-dns' to the 'server services' option
+  to disable the internal dns server.
+  The default for 'allow dns updates' has changed to 'secure only'.
 
 KNOWN ISSUES
 ============
@@ -202,7 +181,7 @@ KNOWN ISSUES
 - Replication may fail on FreeBSD due to getaddrinfo() rejecting names
   containing _.  A workaround will be in a future beta.
 
-- upgradeprovision should not be run when upgrading to this release
+- samba_upgradeprovision should not be run when upgrading to this release
   from a recent release.  No important database format changes have
   been made since alpha16.  
 
diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py
index 1f56f2e..82492e1 100644
--- a/buildtools/wafsamba/samba_dist.py
+++ b/buildtools/wafsamba/samba_dist.py
@@ -99,6 +99,42 @@ def vcs_dir_contents(path):
 
 
 def dist(appname='',version=''):
+
+    def add_files_to_tarball(tar, srcdir, srcsubdir, dstdir, dstsubdir, blacklist, files):
+        if blacklist == None:
+            blacklist = []
+        for f in files:
+            abspath = os.path.join(srcdir, f)
+
+            if srcsubdir != '.':
+                f = f[len(srcsubdir)+1:]
+
+            # Remove files in the blacklist
+            if f in blacklist:
+                continue
+            blacklisted = False
+            # Remove directories in the blacklist
+            for d in blacklist:
+                if f.startswith(d):
+                    blacklisted = True
+            if blacklisted:
+                continue
+            if os.path.isdir(abspath):
+                continue
+            if dstsubdir != '.':
+                f = dstsubdir + '/' + f
+            fname = dstdir + '/' + f
+            add_tarfile(tar, fname, abspath, srcsubdir)
+
+
+    def list_directory_files(abspath):
+        out_files = []
+        for root, dirs, files in os.walk(abspath):
+            for f in files:
+                out_files.append(os.path.join(root, f))
+        return out_files
+
+
     if not isinstance(appname, str) or not appname:
         # this copes with a mismatch in the calling arguments for dist()
         appname = Utils.g_module.APPNAME
@@ -135,28 +171,7 @@ def dist(appname='',version=''):
         except Exception, e:
             Logs.error('unable to get contents of %s: %s' % (absdir, e))
             sys.exit(1)
-        for f in files:
-            abspath = os.path.join(srcdir, f)
-
-            if dir != '.':
-                f = f[len(dir)+1:]
-
-            # Remove files in the blacklist
-            if f in blacklist:
-                continue
-            blacklisted = False
-            # Remove directories in the blacklist
-            for d in blacklist:
-                if f.startswith(d):
-                    blacklisted = True
-            if blacklisted:
-                continue
-            if os.path.isdir(abspath):
-                continue
-            if destdir != '.':
-                f = destdir + '/' + f
-            fname = dist_base + '/' + f
-            add_tarfile(tar, fname, abspath, dir)
+        add_files_to_tarball(tar, srcdir, dir, dist_base, destdir, blacklist, files)
 
     if dist_files:
         for file in dist_files.split():
@@ -168,11 +183,14 @@ def dist(appname='',version=''):
 
             absfile = os.path.join(srcdir, file)
 
-            if destfile != file:
-                file = destfile
-
-            fname = dist_base + '/' + file
-            add_tarfile(tar, fname, absfile, file)
+            if os.path.isdir(absfile):
+                destdir = destfile
+                dir = file
+                files = list_directory_files(dir)
+                add_files_to_tarball(tar, srcdir, dir, dist_base, destdir, blacklist, files)
+            else:
+                fname = dist_base + '/' + destfile
+                add_tarfile(tar, fname, absfile, destfile)
 
     tar.close()
 
@@ -212,11 +230,13 @@ def DIST_DIRS(dirs):
         dist_dirs = dirs
 
 @conf
-def DIST_FILES(files):
+def DIST_FILES(files, extend=False):
     '''set additional files for packaging, relative to top srcdir'''
     global dist_files
     if not dist_files:
         dist_files = files
+    elif extend:
+        dist_files = dist_files + " " + files
 
 @conf
 def DIST_BLACKLIST(blacklist):
diff --git a/release-scripts/build-manpages-git b/release-scripts/build-manpages-git
index 3ba05c7..af4734d 100755
--- a/release-scripts/build-manpages-git
+++ b/release-scripts/build-manpages-git
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Copyright (C) Michael Adam 2010
 #
@@ -24,7 +24,7 @@ _exit() {
 
 DIRNAME=$(dirname $0)
 DOCS_XML_DIR=${DIRNAME}/../docs-xml
-DOCS_DIR=${DIRNAME}/../docs
+DOCS_DIR=${DIRNAME}/../bin/docs
 
 pushd ${DOCS_XML_DIR} || exit 1
 
diff --git a/release-scripts/build-manpages-nogit b/release-scripts/build-manpages-nogit
index fc9ddc0..e5d51ef 100755
--- a/release-scripts/build-manpages-nogit
+++ b/release-scripts/build-manpages-nogit
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Copyright (C) Michael Adam 2010
 #
@@ -24,7 +24,7 @@ _exit() {
 
 DIRNAME=$(dirname $0)
 DOCS_XML_DIR=${DIRNAME}/../docs-xml
-DOCS_DIR=${DIRNAME}/../docs
+DOCS_DIR=${DIRNAME}/../bin/docs
 
 pushd ${DOCS_XML_DIR} || exit 1
 
diff --git a/source3/autogen.sh b/source3/autogen.sh
index 2238efb..4f39e10 100755
--- a/source3/autogen.sh
+++ b/source3/autogen.sh
@@ -2,6 +2,20 @@
 
 # Run this script to build samba from GIT.
 
+
+_exit() {
+	echo $@ >&2
+	cd ${OLD_DIR}
+	exit 1
+}
+
+OLD_DIR=$(pwd)
+BASE_DIR=$(dirname $0)
+SCRIPT_NAME=$(basename $0)
+
+cd ${BASE_DIR} || exit 1
+
+
 while true; do
     case $1 in
 	--version-file)
@@ -55,8 +69,7 @@ done
 ## do we have it?
 ##
 if test "$AUTOCONFFOUND" = "0" -o "$AUTOHEADERFOUND" = "0"; then
-	echo "$0: need autoconf 2.53 or later to build samba from GIT" >&2
-	exit 1
+	_exit "$0: need autoconf 2.53 or later to build samba from GIT"
 fi
 
 echo "$0: running script/mkversion.sh"
@@ -68,10 +81,10 @@ rm -f configure include/config.h*
 IPATHS="-Im4 -I../m4 -I../lib/replace"
 
 echo "$0: running $AUTOHEADER $IPATHS"
-$AUTOHEADER $IPATHS || exit 1
+$AUTOHEADER $IPATHS || _exit "ERROR running autoheader"
 
 echo "$0: running $AUTOCONF $IPATHS"
-$AUTOCONF $IPATHS || exit 1
+$AUTOCONF $IPATHS || _exit "ERROR running autoconf"
 
 rm -rf autom4te*.cache
 
@@ -81,7 +94,7 @@ rm -rf autom4te*.cache
   echo "$0: running $AUTOCONF in ../examples/VFS/"
   $AUTOCONF || exit 1
   rm -rf autom4te*.cache
-) || exit 1
+) || _exit "ERROR running autoheader/autoconf in examples/VFS"
 
 
 if gcc -E tests/preproc-dummy.c -o /dev/null ;
@@ -102,5 +115,7 @@ perl ../source4/script/mkproto.pl ../lib/param/loadparm.c ../lib/param/param_fun
 perl ../script/mks3param.pl ../lib/param/loadparm.c ../lib/param/param_functions.c --file autoconf/lib/param/s3_param.h
 
 echo "Now run ./configure (or ./configure.developer) and then make."
+
+cd ${OLD_DIR}
 exit 0
 
diff --git a/wscript b/wscript
index 64aaaf2..4f82310 100755
--- a/wscript
+++ b/wscript
@@ -237,6 +237,16 @@ def dist():
     '''makes a tarball for distribution'''
     sambaversion = samba_version.load_version(env=None)
 
+    os.system(srcdir + "/release-scripts/build-manpages-nogit")
+    samba_dist.DIST_FILES('bin/docs:docs', extend=True)
+
+    os.system(srcdir + "/source3/autogen.sh")
+    samba_dist.DIST_FILES('source3/configure', extend=True)
+    samba_dist.DIST_FILES('source3/autoconf', extend=True)
+    samba_dist.DIST_FILES('source3/include/autoconf', extend=True)
+    samba_dist.DIST_FILES('examples/VFS/configure', extend=True)
+    samba_dist.DIST_FILES('examples/VFS/module_config.h.in', extend=True)
+
     if sambaversion.IS_SNAPSHOT:
         # write .distversion file and add to tar
         if not os.path.isdir(blddir):
@@ -246,7 +256,7 @@ def dist():
             distveroption = field + '=' + str(sambaversion.vcs_fields[field])
             distversionf.write(distveroption + '\n')
         distversionf.flush()
-        samba_dist.DIST_FILES('%s:.distversion' % distversionf.name)
+        samba_dist.DIST_FILES('%s:.distversion' % distversionf.name, extend=True)
 
         samba_dist.dist()
         distversionf.close()


-- 
Samba Shared Repository


More information about the samba-cvs mailing list