Only apply masks on non-default ACL entries when setting the ACL.

[samba.git] / release-scripts / create-tarball

diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index 04728d835d3fbde9708b38e0b0d699343eec236a..8a02d2bdb36d1172a8ff4d4c9dd64fd2dd78f591 100755 (executable)
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -116,6 +116,19 @@ function buildDocs
        rsync -av "${OPT_DOCSDIR}"/ docs/
        exitOnError $? "Failed top copy docs from ${OPT_DOCSDIR}"
 
+       cd docs/
+       /bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test
+       if [ -d manpages-3 ]; then
+               mv manpages-3 manpages
+       fi
+       if [ -d htmldocs/manpages-3 ]; then
+               mv htmldocs/manpages-3 htmldocs/manpages
+       fi
+       # Sync thanks, history and registry/ into the docs dir
+       rsync -Ca --exclude=.svn ../../$OPT_BRANCH/docs-xml/registry ../docs/
+       rsync -Ca --exclude=.svn ../../$OPT_BRANCH/docs-xml/archives/ ../docs/
+       cd ../
+
        return 0
     fi
 
@@ -137,7 +150,7 @@ function createReleaseTag
        return 0
     fi
 
-    if [ "x`git-tag -l ${OPT_TAG}`" != "x" ]; then
+    if [ "x`git tag -l ${OPT_TAG}`" != "x" ]; then
        echo -n "Tag exists.  Do you wish to overwrite? (y/N): "
        read answer
 
@@ -155,7 +168,7 @@ function createReleaseTag
        fi
     fi
 
-    git-tag -u ${OPT_KEYID} ${OPT_TAG}
+    git tag -u ${OPT_KEYID} ${OPT_TAG}
     exitOnError $? "Failed to create tag"
 
     return 0
@@ -170,7 +183,7 @@ function main
 
     cd $TOPDIR
 
-    git-checkout ${OPT_BRANCH}
+    git checkout ${OPT_BRANCH}
     exitOnError $? "Invalid branch name \"${OPT_BRANCH}\""
 
     (cd source3 && ./script/mkversion.sh)
@@ -183,16 +196,28 @@ function main
     if [ -n "$vendor_version" ]; then
        version="$version-$vendor_version"
     fi
+    vendor_patch=`grep "define SAMBA_VERSION_VENDOR_PATCH_STRING" $VER_H | awk '{print $3}'`
+    if [ -n "$vendor_patch" ]; then
+       version="$version-$vendor_patch"
+    fi
     version=`echo $version | sed 's/\"//g'`
 
     echo "Creating release tarball for Samba $version"
 
     /bin/rm -rf ../samba-${version}
-    git-archive --format=tar --prefix=samba-${version}/ HEAD | (cd .. && tar xf -)
+    git archive --format=tar --prefix=samba-${version}/ HEAD | (cd .. && tar xf -)
     exitOnError $? "Failed to create release directory tree"
 
     pushd ../samba-${version}
 
+    # Remove RFCs as they are non-free content (with a strict interpretation of
+    # the DFSG)
+
+    #if [ -d source4 ]; then
+    #  echo "Removing RFCs"
+    #  find source4/ -name "rfc*.txt" -exec rm -f {} \;
+    #fi
+
     packaging/bin/update-pkginfo ${version} 1 ""
 
     buildDocs