[SCM] Samba Shared Repository - branch master updated

Andrew Bartlett abartlet at samba.org
Tue Jul 3 09:21:01 MDT 2012


The branch, master has been updated
       via  a8acaee ldb: bump version due to header and internal implementation changes
       via  6612bca WHATSNEW: Spell out version, avoid samba4 except to refer to the past
       via  f48f65e wafsamba: samba_version: add samba version suffix to vcs_fields
       via  ec3d1f0 build: Run distcheck in the correct directory
      from  abda9d3 s3: Fix Coverity ID 709217 Dereference after null check

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


- Log -----------------------------------------------------------------
commit a8acaeebb6336f608c5104122f79cea90c706a4b
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Jul 3 21:46:51 2012 +1000

    ldb: bump version due to header and internal implementation changes
    
    We need this version, not the previous release, for Samba.
    
    Andrew Bartlett
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Tue Jul  3 17:20:32 CEST 2012 on sn-devel-104

commit 6612bca57d9369c1f38453fe654ab532b779f58c
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Jul 3 12:41:56 2012 +1000

    WHATSNEW: Spell out version, avoid samba4 except to refer to the past

commit f48f65e695da57cb12e68a5b1d82d05874863344
Author: Björn Baumbach <bb at sernet.de>
Date:   Thu Jun 14 19:07:23 2012 +0200

    wafsamba: samba_version: add samba version suffix to vcs_fields
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>

commit ec3d1f09fa7ad50297e832cd25e2859cafbf00c5
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Jul 3 11:57:22 2012 +1000

    build: Run distcheck in the correct directory
    
    This is a leftover from the move to the top level build.
    
    Andrew Bartlett

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

Summary of changes:
 WHATSNEW.txt                                       |    6 ++--
 buildtools/wafsamba/samba_dist.py                  |   24 ++++++++++++
 buildtools/wafsamba/samba_version.py               |   38 ++++++++++++++++++++
 lib/ldb/ABI/{ldb-1.1.6.sigs => ldb-1.1.7.sigs}     |    0
 ...pyldb-util-1.1.2.sigs => pyldb-util-1.1.7.sigs} |    0
 lib/ldb/wscript                                    |    2 +-
 wscript                                            |   15 +++++++-
 7 files changed, 79 insertions(+), 6 deletions(-)
 copy lib/ldb/ABI/{ldb-1.1.6.sigs => ldb-1.1.7.sigs} (100%)
 copy lib/ldb/ABI/{pyldb-util-1.1.2.sigs => pyldb-util-1.1.7.sigs} (100%)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index b41f3a3..7e78adb 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,4 @@
-What's new in Samba 4 beta3
+What's new in Samba 4.0 beta3
 =============================
 
 Samba 4.0 will be the next version of the Samba suite and incorporates
@@ -11,14 +11,14 @@ and above.
 WARNINGS
 ========
 
-Samba4 beta3 is not a final Samba release, however we are now making
+Samba 4.0 beta3 is not a final Samba release, however we are now making
 good progress towards a Samba 4.0 release, of which this is a preview.
 Be aware the this release contains the best of all of Samba's
 technology parts, both a file server (that you can reasonably expect
 to upgrade existing Samba 3.x releases to) and the AD domain
 controller work previously known as 'samba4'.
 
-Samba4 is subjected to an awesome battery of tests on an automated
+Samba 4.0 is subjected to an awesome battery of tests on an automated
 basis, we have found Samba 4.0 to be very stable in it's behavior.
 However, we still recommend against upgrading production servers from
 Samba 3.x release to Samba 4.0 beta at this stage.
diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py
index 79cb721..1f56f2e 100644
--- a/buildtools/wafsamba/samba_dist.py
+++ b/buildtools/wafsamba/samba_dist.py
@@ -5,6 +5,7 @@ import Utils, os, sys, tarfile, stat, Scripting, Logs, Options
 from samba_utils import *
 
 dist_dirs = None
+dist_files = None
 dist_blacklist = ""
 
 def add_symlink(tar, fname, abspath, basedir):
@@ -157,6 +158,22 @@ def dist(appname='',version=''):
             fname = dist_base + '/' + f
             add_tarfile(tar, fname, abspath, dir)
 
+    if dist_files:
+        for file in dist_files.split():
+            if file.find(':') != -1:
+                destfile = file.split(':')[1]
+                file = file.split(':')[0]
+            else:
+                destfile = file
+
+            absfile = os.path.join(srcdir, file)
+
+            if destfile != file:
+                file = destfile
+
+            fname = dist_base + '/' + file
+            add_tarfile(tar, fname, absfile, file)
+
     tar.close()
 
     if Options.options.SIGN_RELEASE:
@@ -195,6 +212,13 @@ def DIST_DIRS(dirs):
         dist_dirs = dirs
 
 @conf
+def DIST_FILES(files):
+    '''set additional files for packaging, relative to top srcdir'''
+    global dist_files
+    if not dist_files:
+        dist_files = files
+
+ at conf
 def DIST_BLACKLIST(blacklist):
     '''set the files to exclude from packaging, relative to top srcdir'''
     global dist_blacklist
diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py
index 9dae23a..e82fd47 100644
--- a/buildtools/wafsamba/samba_version.py
+++ b/buildtools/wafsamba/samba_version.py
@@ -92,6 +92,41 @@ def git_version_summary(path, env=None):
     return (ret, fields)
 
 
+def distversion_version_summary(path):
+    #get version from .distversion file
+    f = open(path + '/.distversion', 'r')
+    suffix = None
+    fields = {}
+
+    for line in f:
+        line = line.strip()
+        if line == '':
+            continue
+        if line.startswith("#"):
+            continue
+        try:
+            split_line = line.split("=")
+            if split_line[1] != "":
+                key = split_line[0]
+                value = split_line[1]
+                if key == "SUFFIX":
+                    suffix = value
+                    continue
+                fields[key] = value
+        except:
+            print("Failed to parse line %s from .distversion file." % (line))
+            raise
+    f.close()
+
+    if "COMMIT_TIME" in fields:
+        fields["COMMIT_TIME"] = int(fields["COMMIT_TIME"])
+
+    if suffix is None:
+        return ("UNKNOWN", fields)
+
+    return (suffix, fields)
+
+
 class SambaVersion(object):
 
     def __init__(self, version_dict, path, env=None, is_install=True):
@@ -167,9 +202,12 @@ also accepted as dictionary entries here
                 suffix, self.vcs_fields = git_version_summary(path, env=env)
             elif os.path.exists(os.path.join(path, ".bzr")):
                 suffix, self.vcs_fields = bzr_version_summary(path)
+            elif os.path.exists(os.path.join(path, ".distversion")):
+                suffix, self.vcs_fields = distversion_version_summary(path)
             else:
                 suffix = "UNKNOWN"
                 self.vcs_fields = {}
+            self.vcs_fields["SUFFIX"] = suffix
             SAMBA_VERSION_STRING += "-" + suffix
         else:
             self.vcs_fields = {}
diff --git a/lib/ldb/ABI/ldb-1.1.6.sigs b/lib/ldb/ABI/ldb-1.1.7.sigs
similarity index 100%
copy from lib/ldb/ABI/ldb-1.1.6.sigs
copy to lib/ldb/ABI/ldb-1.1.7.sigs
diff --git a/lib/ldb/ABI/pyldb-util-1.1.2.sigs b/lib/ldb/ABI/pyldb-util-1.1.7.sigs
similarity index 100%
copy from lib/ldb/ABI/pyldb-util-1.1.2.sigs
copy to lib/ldb/ABI/pyldb-util-1.1.7.sigs
diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index 6cdddb3..5880233 100755
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 APPNAME = 'ldb'
-VERSION = '1.1.6'
+VERSION = '1.1.7'
 
 blddir = 'bin'
 
diff --git a/wscript b/wscript
index e77d35a..1238eb6 100755
--- a/wscript
+++ b/wscript
@@ -239,7 +239,18 @@ def wafdocs(ctx):
 
 def dist():
     '''makes a tarball for distribution'''
-    samba_version.load_version(env=None)
+    sambaversion = samba_version.load_version(env=None)
+
+    if sambaversion.IS_SNAPSHOT:
+        # write .distversion file and add to tar
+        f = '.distversion'
+        distversionf = open(f, 'w')
+        for field in sambaversion.vcs_fields:
+            distveroption = field + '=' + str(sambaversion.vcs_fields[field])
+            distversionf.write(distveroption + '\n')
+        distversionf.close()
+        samba_dist.DIST_FILES('.distversion')
+
     samba_dist.dist()
 
 def distcheck():
@@ -247,7 +258,7 @@ def distcheck():
     samba_version.load_version(env=None)
     import Scripting
     d = Scripting.distcheck
-    d(subdir='source4')
+    d()
 
 def wildcard_cmd(cmd):
     '''called on a unknown command'''


-- 
Samba Shared Repository


More information about the samba-cvs mailing list