Merge branch 'v4-0-stable' into newmaster

6 files changed, 31 insertions, 44 deletions

diff --git a/WHATSNEW4.txt b/WHATSNEW4.txt
index fe5274d19a..200e47edf6 100644
--- a/WHATSNEW4.txt
+++ b/WHATSNEW4.txt
@@ -1,4 +1,4 @@
-What's new in Samba 4 alpha12
+What's new in Samba 4 alpha13
 =============================
 
 Samba 4 is the ambitious next version of the Samba suite that is being
@@ -6,13 +6,16 @@ developed in parallel to the stable 3.x series. The main emphasis in
 this branch is support for the Active Directory logon protocols used
 by Windows 2000 and above.
 
-Samba4 alpha11 follows on from the alpha release series we have been
-publishing since September 2007
+Samba4 alpha13 follows on from the alpha release series we have been
+publishing since September 2007. Since this file has referred to alpha 12
+for a while before any release happened and since Debian packages
+have been published that presumed the existance of a alpha12 release
+we are skipping alpha12 and going straight to alpha13.
 
 WARNINGS
 ========
 
-Samba4 alpha12 is not a final Samba release.  That is more a reference
+Samba4 alpha13 is not a final Samba release.  That is more a reference
 to Samba4's lack of the features we expect you will need than a
 statement of code quality, but clearly it hasn't seen a broad
 deployment yet.  If you were to upgrade Samba3 (or indeed Windows) to
@@ -28,7 +31,7 @@ automated basis, we have found Samba4 to be very stable in it's
 behaviour.  We have to recommend against upgrading production servers
 from Samba 3 to Samba 4 at this stage, because there may be the features on
 which you may rely that are not present, or the mapping of
-your configuration and user database may not be complete. 
+your configuration and user database may not be complete.
 
 If you are upgrading, or looking to develop, test or deploy Samba4, you should
 backup all configuration and data.
@@ -71,7 +74,7 @@ AD implementation and therefore achieved also this time big steps forward.
 Our progress on DRS is being tracked in the Samba wiki:
 http://wiki.samba.org/index.php/Samba4_DRS_TODO_List
 
-Beside this the release includes:
+Beside this the release includes (among a lot of other things):
 
 * a new build system based on WAF
 Andrew Tridgell (tridge) invested much time to bring this up. He achieved a
@@ -162,7 +165,7 @@ real code patches - all is appreciated if it meets our quality criterias. Here
 you can find further references:
 
 Bugs can be filed at https://bugzilla.samba.org/ but please be aware
-that many features are simply not expected to work at this stage.  
+that many features are simply not expected to work at this stage.
 
 The Samba Wiki at http://wiki.samba.org should detail some of these
 development plans.
diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py
index 54ca6c9e96..7cd4d54b01 100644
--- a/buildtools/wafsamba/samba_dist.py
+++ b/buildtools/wafsamba/samba_dist.py
@@ -167,7 +167,7 @@ def DIST_DIRS(dirs):
 
 @conf
 def DIST_BLACKLIST(blacklist):
-    '''set the directories to package, relative to top srcdir'''
+    '''set the files to exclude from packaging, relative to top srcdir'''
     global dist_blacklist
     if not dist_blacklist:
         dist_blacklist = blacklist
diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py
index 0128670bab..82f882f646 100644
--- a/buildtools/wafsamba/samba_version.py
+++ b/buildtools/wafsamba/samba_version.py
@@ -27,9 +27,9 @@ also accepted as dictionary entries here
             else:
                 setattr(self, a, b)
 
-        if self.IS_GIT_SNAPSHOT is "yes":
+        if self.IS_GIT_SNAPSHOT == "yes":
             self.IS_GIT_SNAPSHOT=True
-        elif self.IS_GIT_SNAPSHOT is "no":
+        elif self.IS_GIT_SNAPSHOT == "no":
             self.IS_GIT_SNAPSHOT=False
                 
  ##
diff --git a/source4/VERSION b/source4/VERSION
index 76e66da6bd..350367982e 100644
--- a/source4/VERSION
+++ b/source4/VERSION
@@ -57,7 +57,7 @@ SAMBA_VERSION_TP_RELEASE=
 # e.g. SAMBA_VERSION_ALPHA_RELEASE=1                   #
 #  ->  "4.0.0alpha1"                                   #
 ########################################################
-SAMBA_VERSION_ALPHA_RELEASE=12
+SAMBA_VERSION_ALPHA_RELEASE=13
 
 ########################################################
 # For 'pre' releases the version will be               #
@@ -89,7 +89,7 @@ SAMBA_VERSION_RC_RELEASE=
 # e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes               #
 #  ->  "3.0.0-SVN-build-199"                           #
 ########################################################
-SAMBA_VERSION_IS_GIT_SNAPSHOT=yes
+SAMBA_VERSION_IS_GIT_SNAPSHOT=no
 
 ########################################################
 # This is for specifying a release nickname            #
diff --git a/source4/script/mkrelease.sh b/source4/script/mkrelease.sh
index 6fc17714f7..4c0d9e01eb 100755
--- a/source4/script/mkrelease.sh
+++ b/source4/script/mkrelease.sh
@@ -6,38 +6,21 @@ if [ ! -d ".git" -o `dirname $0` != "./source4/script" ]; then
 	exit 1
 fi
 
-echo "WARNING:  This script prepares an autotools based release, which has known problems!"
+cd source4
+../buildtools/bin/waf dist
+
+TGZFILE="`echo *.tar.gz`"
+gunzip $TGZFILE
+TARFILE="`echo *.tar`"
+tar xf $TARFILE
+DIRN="`echo -n $TARFILE | sed -e 's/\.tar//'`"
+cd $DIRN/source4 && ./autogen.sh && cd ../..
+tar cf $TARFILE $DIRN
+rm -r "$DIRN"
 
-OUTDIR=`mktemp -d samba-XXXXX`
-(git archive --format=tar HEAD | (cd $OUTDIR/ && tar xf -))
-
-#Prepare the tarball for a Samba4 release, with some generated files,
-#but without Samba3 stuff (to avoid confusion)
-( cd $OUTDIR/ || exit 1
- rm -rf README Manifest Read-Manifest-Now Roadmap source3 packaging docs-xml examples swat WHATSNEW.txt MAINTAINERS || exit 1
- cd source4 || exit 1
- ./autogen-autotools.sh || exit 1
- ./configure || exit 1
- make dist  || exit 1
-) || exit 1
-
-VERSION_FILE=$OUTDIR/source4/version.h
-if [ ! -f $VERSION_FILE ]; then
-    echo "Cannot find version.h at $VERSION_FILE"
-    exit 1;
-fi
-
-VERSION=`sed -n 's/^SAMBA_VERSION_STRING=//p' $VERSION_FILE`
-echo "Version: $VERSION"
-mv $OUTDIR samba-$VERSION || exit 1
-tar -cf samba-$VERSION.tar samba-$VERSION || (rm -rf samba-$VERSION; exit 1)
-rm -rf samba-$VERSION || exit 1
 echo "Now run: "
-echo "gpg --detach-sign --armor samba-$VERSION.tar"
-echo "gzip samba-$VERSION.tar" 
+echo "gpg --detach-sign --armor $TARFILE"
+echo "gzip $TARFILE"
 echo "And then upload "
-echo "samba-$VERSION.tar.gz samba-$VERSION.tar.asc" 
+echo "$TARFILE.gz $TARFILE.asc" 
 echo "to pub/samba/samba4/ on samba.org"
-
-
-
diff --git a/source4/selftest/slow b/source4/selftest/slow
index 6501a0cbf0..7c2090c0e6 100644
--- a/source4/selftest/slow
+++ b/source4/selftest/slow
@@ -1,4 +1,4 @@
-# This file contains regexes matching tests that are very slow and 
+# This file contains regexes matching tests that are very slow and
 # should be skipped during a normal test run.
 .*base.bench.holdcon.*			# Slow
 raw.bench.lookup				# Slow
@@ -6,3 +6,4 @@ base.utable						# Slow
 base.smb						# Slow
 rpc.scanner						# Slow
 ntvfs.cifs.base.delaywrite	# It's a slow test and having it on the proxy share is not needed
+.*stress.*						# Slow