summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-03-06 13:16:30 +0100
committerStefan Metzmacher <metze@samba.org>2008-03-06 13:16:30 +0100
commit47d7767065df0da031cdcf70afa426daab83b8b7 (patch)
tree9232e697e830e29cb2d841ad47c156a00741d71f
parent23cd8e5ea7f2aac6cfdcb52666ba4e925740f63f (diff)
parent3785b898178bda8e2aff763d462f21d105aa350d (diff)
downloadsamba-47d7767065df0da031cdcf70afa426daab83b8b7.tar.gz
samba-47d7767065df0da031cdcf70afa426daab83b8b7.tar.bz2
samba-47d7767065df0da031cdcf70afa426daab83b8b7.zip
Merge commit 'origin/v3-2-stable' into v3-2-test
This brings the release-3-2-0pre2 tag into the v3-2-test history. I skipped the source/VERSION changes. metze (This used to be commit 6761fed30821b30246a0f25874566f8a6019abde)
-rw-r--r--WHATSNEW.txt15
-rwxr-xr-xrelease-scripts/create-tarball21
2 files changed, 25 insertions, 11 deletions
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index f984f62c7c..3928e6d181 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -49,7 +49,7 @@ Major enhancements in Samba 3.2.0 include:
Documentation:
- o Inclusion of an HTLM version of the 3rd edition of "Using Samba"
+ o Inclusion of an HTML version of the 3rd edition of "Using Samba"
from O'Reilly Publishing.
@@ -185,6 +185,7 @@ smb.conf changes
ldap debug level New 0
ldap debug threshold New 10
mangle map Removed
+ min receive file size New 0
open files database hashsize Removed
read bmpx Removed
registry shares New No
@@ -292,7 +293,7 @@ o Steve Langasek <vorlon@debian.org>
for better adherence to the FHS standard.
-o Volker Lendecke <vl@samba.org>
+o Volker Lendecke <vl@samba.org>
* Add talloc_stackframe() and talloc_pool() features.
* Removal of pstring data type.
* Add generic a in-memory cache.
@@ -310,13 +311,13 @@ o Derrell Lipman <derrell@samba.org>
while adding new features to libsmbclient.
o Stefan Metzmacher <metze@samba.org>
- * Fixes for libreplace.
+ * Refactor Winbind internal parent-child interface tables
+ to achieve better unit testing support.
+ * Add nss_wrapper API for local Winbind unit tests.
+ * Networking fixes to the libreplace library.
* Pidl fixes.
+ * Remove unused Winbind pipe calls.
* Build fixes.
- * Add nss_wrapper support.
- * Start and test winbindd by 'make test'.
- * Split up child_dispatch_table into domain, idmap and locator tables
- in winbindd.
* Fix for a crash bug in pidl generated client code.
This could have happend with [in,out,unique] pointers
when the client sends a valid pointer, but the server
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index 459227262d..a689e693af 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -19,7 +19,7 @@ if [ $? -ne 0 ]; then
fi
VER_H=source/include/version.h
-(cd source && ./autogen.sh)
+(cd source && ./script/mkversion.sh)
if [ ! -f $VER_H ]; then
echo "Failed to find $VER_H! Exiting...."
@@ -27,7 +27,10 @@ if [ ! -f $VER_H ]; then
fi
version=`grep SAMBA_VERSION_OFFICIAL_STRING $VER_H | awk '{print $3}'`
-version="$version-`grep SAMBA_VERSION_VENDOR_SUFFIX $VER_H | awk '{print $3}'`"
+vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX $VER_H | awk '{print $3}'`
+if [ -n "$vendor_version" ]; then
+ version="$version-$vendor_version"
+fi
version=`echo $version | sed 's/\"//g'`
echo "Creating release tarball for Samba $version"
@@ -49,7 +52,7 @@ if [ "x$docsdir" != "x" ]; then
/bin/rm -rf docs
mkdir docs
- rsync -a $docsdir/ docs/
+ rsync -a --exclude=.svn $docsdir/ docs/
cd docs
/bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test
@@ -58,6 +61,10 @@ if [ "x$docsdir" != "x" ]; then
cd ..
fi
+cd source
+./autogen.sh
+cd ..
+
cd ..
tar cf samba-${version}.tar --exclude=.git* --exclude=CVS --exclude=.svn samba-${version}
gpg --detach-sign --armor samba-${version}.tar
@@ -78,7 +85,13 @@ if [ "x$tagname" != "x" ]; then
fi
fi
- git-tag -s ${tagname}
+ echo -n "Enter the keyid:"
+ read keyid
+ if [ x"$keyid" = x"" ];then
+ echo "no keyid"
+ exit 1
+ fi
+ git-tag -u $keyid ${tagname}
fi
echo "Done!"