[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  9f5a842 update-external.sh: Update upstream URLs for testtools and subunit.
       via  c4022cb Fix path to zlib in update-external.sh.
       via  d04659f Update zlib using update-external.sh.
      from  ee9d075 nss_wrapper: check for nss.h

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


- Log -----------------------------------------------------------------
commit 9f5a842922776afdaaab8188159cb1a9aee13137
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Sep 27 15:05:54 2014 +0200

    update-external.sh: Update upstream URLs for testtools and subunit.
    
    Change-Id: Iaba422aa5dec30c3a4953907d9d73e018206e0e6
    Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Thu Oct 16 01:35:19 CEST 2014 on sn-devel-104

commit c4022cba7f4ec251c0a886a84daa8ddc854a0abd
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Sep 27 15:01:16 2014 +0200

    Fix path to zlib in update-external.sh.
    
    Change-Id: I25f308d037cc47bacd3a371cafca9c3e22f4a92d
    Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit d04659fad29c319c6c7fb7f9b315996937dd0361
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Jul 17 01:20:35 2014 +0200

    Update zlib using update-external.sh.
    
    Change-Id: I9465ef84084a70187f693fea4762f3d68274fe99
    Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

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

Summary of changes:
 lib/update-external.sh |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/update-external.sh b/lib/update-external.sh
index ea563ba..95e33bc 100755
--- a/lib/update-external.sh
+++ b/lib/update-external.sh
@@ -2,27 +2,38 @@
 # Pull in a new snapshot of external projects that are included in 
 # our source tree for users that don't have them installed on their system
 
-TARGETDIR="`dirname $0`"
+# Third party directory
+THIRD_PARTY_DIR="`dirname $0`/../third_party"
+# Library directory where projects live that haven't been migrated to
+# $THIRD_PARTY_DIR yet.
+LIBDIR="`dirname $0`"
 WORKDIR="`mktemp -d`"
 
 echo "Updating subunit..."
-bzr export "$WORKDIR/subunit" lp:subunit 
+git clone git://github.com/testing-cabal/subunit "$WORKDIR/subunit"
+rm -rf "$WORKDIR/subunit/.git"
 # Preserve wscript file
-cp "$TARGETDIR/subunit/c/wscript" "$WORKDIR/subunit/c/wscript"
-rsync -avz --delete "$WORKDIR/subunit/" "$TARGETDIR/subunit/"
+cp "$LIBDIR/subunit/c/wscript" "$WORKDIR/subunit/c/wscript"
+rsync -avz --delete "$WORKDIR/subunit/" "$LIBDIR/subunit/"
 
 echo "Updating testtools..."
-bzr export "$WORKDIR/testtools" lp:testtools 
-rsync -avz --delete "$WORKDIR/testtools/" "$TARGETDIR/testtools/"
+git clone git://github.com/testing-cabal/testtools "$WORKDIR/testtools"
+rm -rf "$WORKDIR/testtools/.git"
+rsync -avz --delete "$WORKDIR/testtools/" "$LIBDIR/testtools/"
 
 echo "Updating dnspython..."
 git clone git://www.dnspython.org/dnspython.git "$WORKDIR/dnspython"
 rm -rf "$WORKDIR/dnspython/.git"
-rsync -avz --delete "$WORKDIR/dnspython/" "$TARGETDIR/dnspython/"
+rsync -avz --delete "$WORKDIR/dnspython/" "$LIBDIR/dnspython/"
 
 echo "Updating pep8..."
 git clone git://github.com/jcrocholl/pep8 "$WORKDIR/pep8"
 rm -rf "$WORKDIR/pep8/.git"
-rsync -avz --delete "$WORKDIR/pep8/" "$TARGETDIR/pep8/"
+rsync -avz --delete "$WORKDIR/pep8/" "$LIBDIR/pep8/"
+
+echo "Updating zlib..."
+git clone git://github.com/madler/zlib "$WORKDIR/zlib"
+rm -rf "$WORKDIR/zlib/.git"
+rsync --exclude=wscript -avz --delete "$WORKDIR/zlib/" "$THIRD_PARTY_DIR/zlib/"
 
 rm -rf "$WORKDIR"


-- 
Samba Shared Repository