January 2014 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Build pycrypto for mac.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 54b61f18ffdf786498ce20b3c3f5789e38e5932b Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 12 06:32:58 2013 +0000 Build pycrypto for mac. --- .../descriptors/mac/gitian-pluggable-transports.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 08885ee..b0c7870 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -18,6 +18,7 @@ remotes: - "url": "https://git.torproject.org/pluggable-transports/pyptlib.git" "dir": "pyptlib" files: +- "pycrypto.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -37,8 +38,11 @@ script: | #export CXXFLAGS=$CFLAGS #export LDFLAGS=$CFLAGS export PATH="$PATH:/usr/apple-osx/bin/" - export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" - export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + export CC=/usr/apple-osx/bin/i686-apple-darwin11-gcc + # http://bugs.python.org/issue9437 + export LDSHARED="$CC -pthread -shared" + export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5" + export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5" # mkdir -p $PTDIR/ mkdir -p $OUTDIR/ @@ -56,6 +60,16 @@ script: | cp -a build/pyptlib $PTDIR/ cd .. # + tar xzf pycrypto.tar.gz + cd pycrypto-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + # https://bugs.launchpad.net/pycrypto/+bug/1096207 for ac_cv_func_malloc_0_nonnull. + ac_cv_func_malloc_0_nonnull=yes sh configure --host=i686-apple-darwin11 + LDSHARED="$LDSHARED -framework Python" python setup.py build_ext --build-lib build -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Python.framework/Headers + python setup.py build --build-lib build + cp -a build/Crypto $PTDIR/ + cd .. + # cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" CC=cc ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin-i386-cc --prefix=$INSTDIR/openssl

1 0

[tor-browser-bundle/master] Add gitian-pluggable-transports.yml for mac.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit b59cfb3a28cb4e0874f784390d1e6d45b0636a6e Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 11 08:57:04 2013 +0000 Add gitian-pluggable-transports.yml for mac. Empty except for copied openssl build from gitian-tor.yml. --- .../mac/gitian-pluggable-transports.yml | 60 ++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml new file mode 100644 index 0000000..1a6b933 --- /dev/null +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -0,0 +1,60 @@ +--- +name: "pluggable-transports-mac" +suites: +- "precise" +architectures: +- "i386" +packages: +- "git-core" +- "zip" +- "faketime" +- "libtool" +#- "libssl0.9.8" +reference_datetime: "2000-01-01 00:00:00" +remotes: +- "url": "https://github.com/nmathewson/openssl.git" + "dir": "openssl" +files: +- "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" +- "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" +- "dzip.sh" +#- "apple-x86-gcc_4.2.1~5646.1flosoft2_i386.deb" +#- "apple-x86-odcctools_758.159-0flosoft11_i386.deb" +script: | + INSTDIR="$HOME/install" + PTDIR="$INSTDIR/TorBrowserBundle.app/Tor/PluggableTransports" + export LIBRARY_PATH="$INSTDIR/lib" + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + export FAKETIME=$REFERENCE_DATETIME + export TZ=UTC + export LC_ALL=C + umask 0022 + # + #export CFLAGS="-isysroot /usr/lib/apple/SDKs/MacOSX10.6.sdk/" + #export CXXFLAGS=$CFLAGS + #export LDFLAGS=$CFLAGS + export PATH="$PATH:/usr/apple-osx/bin/" + export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + # + mkdir -p $PTDIR/ + mkdir -p $OUTDIR/ + # + sudo dpkg -i *.deb + cd /usr + sudo tar -Jxvf /home/ubuntu/build/multiarch-darwin*tar.xz + cd ~/build + # For OpenSSL + sudo ln -s /usr/apple-osx/bin/apple-osx-gcc /usr/apple-osx/bin/i686-apple-darwin11-cc + # + cd openssl + find -type f | xargs touch --date="$REFERENCE_DATETIME" + CC=cc ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin-i386-cc --prefix=$INSTDIR/openssl + make # SHARED_LDFLAGS="-shared -dynamiclib -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/" + make install + #cp $INSTDIR/openssl/lib/*.dylib $INSTDIR/TorBrowserBundle.app/Tor/ + cd .. + # + cd $INSTDIR + ~/build/dzip.sh pluggable-transports-mac$GBUILD_BITS-gbuilt.zip TorBrowserBundle.app + cp pluggable-transports-mac$GBUILD_BITS-gbuilt.zip $OUTDIR/

1 0

[tor-browser-bundle/master] Build flashproxy for linux.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 1d09aeda2aa58a80cb14ce155c849ec9b64ec1d2 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 11 08:00:32 2013 +0000 Build flashproxy for linux. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 10 ++++++++++ gitian/mkbundle-linux.sh | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 85c5bc9..7d6a8b9 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -22,6 +22,8 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" +- "url": "https://git.torproject.org/flashproxy.git" + "dir": "flashproxy" files: - "pycrypto.tar.gz" - "argparse.tar.gz" @@ -108,6 +110,14 @@ script: | cp -a build/M2Crypto $PTDIR/ cd .. # + cd flashproxy + find -type f | xargs touch --date="$REFERENCE_DATETIME" + make dist DISTNAME=flashproxy-client + cp -a dist/flashproxy-client/{flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ + mkdir -p $INSTDIR/Docs/FlashProxy + cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy + cd .. + # cd $INSTDIR # ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-gbuilt.zip Tor/ Docs/ diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 64b3fa4..9ef0910 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -128,7 +128,7 @@ then echo "****** Starting Pluggable Transports Component of Linux Bundle (3/4 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S`

1 0

[tor-browser-bundle/master] Call gitian-pluggable-transports.yml from mkbundle-mac.sh.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit df29471f5287656bd58d7bda6e773edfe6f72e41 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 11 09:01:16 2013 +0000 Call gitian-pluggable-transports.yml from mkbundle-mac.sh. --- gitian/mkbundle-mac.sh | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index edd3846..3b40142 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -79,7 +79,7 @@ cd $GITIAN_DIR if [ ! -f $GITIAN_DIR/inputs/tor-mac32-gbuilt.zip ]; then echo - echo "****** Starting Tor Component of Mac Bundle (1/3 for Mac) ******" + echo "****** Starting Tor Component of Mac Bundle (1/4 for Mac) ******" echo ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/mac/gitian-tor.yml @@ -93,14 +93,14 @@ then #cp -a result/tor-mac-res.yml $GITIAN_DIR/inputs/ else echo - echo "****** SKIPPING already built Tor Component of Mac Bundle (1/3 for Mac) ******" + echo "****** SKIPPING already built Tor Component of Mac Bundle (1/4 for Mac) ******" echo fi if [ ! -f $GITIAN_DIR/inputs/tor-browser-mac32-gbuilt.zip ]; then echo - echo "****** Starting TorBrowser Component of Mac Bundle (2/3 for Mac) ******" + echo "****** Starting TorBrowser Component of Mac Bundle (2/4 for Mac) ******" echo ./bin/gbuild -j $NUM_PROCS --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/mac/gitian-firefox.yml @@ -114,7 +114,28 @@ then #cp -a result/torbrowser-mac-res.yml $GITIAN_DIR/inputs/ else echo - echo "****** SKIPPING already built TorBrowser Component of Mac Bundle (2/3 for Mac) ******" + echo "****** SKIPPING already built TorBrowser Component of Mac Bundle (2/4 for Mac) ******" + echo +fi + +if [ ! -f $GITIAN_DIR/inputs/pluggable-transports-mac32-gbuilt.zip ]; +then + echo + echo "****** Starting Pluggable Transports Component of Mac Bundle (3/4 for Mac) ******" + echo + + ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + if [ $? -ne 0 ]; + then + #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` + exit 1 + fi + + cp -a build/out/pluggable-transports-mac*-gbuilt.zip $GITIAN_DIR/inputs/ + #cp -a result/pluggable-transports-mac-res.yml $GITIAN_DIR/inputs/ +else + echo + echo "****** SKIPPING already built Pluggable Transports Component of Mac Bundle (3/4 for Mac) ******" echo fi @@ -122,7 +143,7 @@ fi if [ ! -f $GITIAN_DIR/inputs/bundle-mac.gbuilt ]; then echo - echo "****** Starting Bundling+Localization Component of Mac Bundle (3/3 for Mac) ******" + echo "****** Starting Bundling+Localization Component of Mac Bundle (4/4 for Mac) ******" echo cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR @@ -140,7 +161,7 @@ then touch $GITIAN_DIR/inputs/bundle-mac.gbuilt else echo - echo "****** SKIPPING already built Bundling+Localization Component of Mac Bundle (3/3 for Mac) ******" + echo "****** SKIPPING already built Bundling+Localization Component of Mac Bundle (4/4 for Mac) ******" echo fi

1 0

[tor-browser-bundle/master] Install pluggable-transports into mac bundle.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 66e9d1d9239c317cdf7a09807d8bcbf52e9d5ce8 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 11 09:31:23 2013 +0000 Install pluggable-transports into mac bundle. --- gitian/descriptors/mac/gitian-bundle.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index b71bdcc..c991428 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -23,6 +23,7 @@ files: # TODO: Can we use an env for this file+version?? - "tor-browser-mac32-gbuilt.zip" - "tor-mac32-gbuilt.zip" +- "pluggable-transports-mac32-gbuilt.zip" - "relativelink-src.zip" - "mac-skeleton.zip" - "mac-langpacks.zip" @@ -94,6 +95,7 @@ script: | cd .. # unzip ~/build/tor-mac$GBUILD_BITS-gbuilt.zip + unzip ~/build/pluggable-transports-mac$GBUILD_BITS-gbuilt.zip cd TorBrowserBundle.app unzip ~/build/mac-skeleton.zip unzip ~/build/tbb-docs.zip

1 0

[tor-browser-bundle/master] Build zope.interface for mac.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 1a00092edf8ee63c4502e8cfbc5fd87f677f3f78 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 12 06:34:47 2013 +0000 Build zope.interface for mac. --- gitian/descriptors/mac/gitian-pluggable-transports.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 096f09b..4d4ba6d 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -6,6 +6,7 @@ architectures: - "i386" packages: - "git-core" +- "unzip" - "zip" - "python-setuptools" - "faketime" @@ -20,6 +21,7 @@ remotes: files: - "pycrypto.tar.gz" - "argparse.tar.gz" +- "zope.interface.zip" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -78,6 +80,13 @@ script: | cp -a build/argparse.py $PTDIR/ cd .. # + unzip zope.interface.zip + cd zope.interface-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + python setup.py build --build-lib build + cp -a build/zope $PTDIR/ + cd .. + # cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" CC=cc ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin-i386-cc --prefix=$INSTDIR/openssl

1 0

[tor-browser-bundle/master] Build obfsproxy for mac.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 3b8a3ce0131b803e5b09647e69387a4b5856ac88 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 12 06:37:15 2013 +0000 Build obfsproxy for mac. --- gitian/descriptors/mac/gitian-pluggable-transports.yml | 11 +++++++++++ gitian/mkbundle-mac.sh | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index e9bd238..2ba29c8 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -18,6 +18,8 @@ remotes: "dir": "openssl" - "url": "https://git.torproject.org/pluggable-transports/pyptlib.git" "dir": "pyptlib" +- "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" + "dir": "obfsproxy" files: - "pycrypto.tar.gz" - "argparse.tar.gz" @@ -96,6 +98,15 @@ script: | cp -a build/twisted $PTDIR/ cd .. # + cd obfsproxy + find -type f | xargs touch --date="$REFERENCE_DATETIME" + python setup.py build --build-lib build + cp -a build/obfsproxy $PTDIR/ + cp -a bin/obfsproxy $PTDIR/obfsproxy.bin + mkdir -p $INSTDIR/TorBrowserBundle.app/Docs/Obfsproxy + cp -a {LICENSE,README} $INSTDIR/TorBrowserBundle.app/Docs/Obfsproxy + cd .. + # cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" CC=cc ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin-i386-cc --prefix=$INSTDIR/openssl diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index debc170..5a7e1d2 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -124,7 +124,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (3/4 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S`

1 0

[tor-browser-bundle/master] Build twisted for mac.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit ecc9f55f5d48409162edfc82d905e521705c6f69 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 12 06:35:35 2013 +0000 Build twisted for mac. --- gitian/descriptors/mac/gitian-pluggable-transports.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 4d4ba6d..e9bd238 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -22,6 +22,7 @@ files: - "pycrypto.tar.gz" - "argparse.tar.gz" - "zope.interface.zip" +- "twisted.tar.bz2" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -87,6 +88,14 @@ script: | cp -a build/zope $PTDIR/ cd .. # + tar xjf twisted.tar.bz2 + cd Twisted-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + LDSHARED="$LDSHARED -framework Python" python setup.py build_ext --build-lib build -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Python.framework/Headers + python setup.py build --build-lib build + cp -a build/twisted $PTDIR/ + cd .. + # cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" CC=cc ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin-i386-cc --prefix=$INSTDIR/openssl

1 0

[tor-browser-bundle/master] Build m2crypto for mac.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 6130d6499ab0238ad801d83c827d9e1530319f94 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 12 06:38:59 2013 +0000 Build m2crypto for mac. --- gitian/descriptors/mac/gitian-pluggable-transports.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 2ba29c8..c05d563 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -8,6 +8,7 @@ packages: - "git-core" - "unzip" - "zip" +- "swig" - "python-setuptools" - "faketime" - "libtool" @@ -25,6 +26,7 @@ files: - "argparse.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" +- "m2crypto.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -115,6 +117,20 @@ script: | #cp $INSTDIR/openssl/lib/*.dylib $INSTDIR/TorBrowserBundle.app/Tor/ cd .. # + tar xzf m2crypto.tar.gz + cd M2Crypto-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + # We have to put $INSTDIR/openssl at the beginning of the header and library + # search paths (build_ext otherwise puts it at the end, after CFLAGS and + # LDFLAGS). The reason for this is that /usr/lib/apple/SDKs/MacOSX10.6.sdk/usr + # (part of CFLAGS and LDFLAGS) has its own openssl headers and library files. + # It also has necessary headers like stdio.h, so we can't remove it + # completely, but our locally built openssl must take precedence. + CFLAGS="-I$INSTDIR/openssl/include $CFLAGS" LDFLAGS="-L$INSTDIR/openssl/lib $LDFLAGS" LDSHARED="$LDSHARED -framework Python" python setup.py build_ext --build-lib build --openssl $INSTDIR/openssl -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Python.framework/Headers $SDK_INCLUDES + python setup.py build --build-lib build + cp -a build/M2Crypto $PTDIR/ + cd .. + # cd $INSTDIR ~/build/dzip.sh pluggable-transports-mac$GBUILD_BITS-gbuilt.zip TorBrowserBundle.app cp pluggable-transports-mac$GBUILD_BITS-gbuilt.zip $OUTDIR/

1 0

[tor-browser-bundle/master] Build flashproxy for mac.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit e85b8ace5509920d1a24b3240b9da0407463d8b6 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 12 06:41:11 2013 +0000 Build flashproxy for mac. --- gitian/descriptors/mac/gitian-pluggable-transports.yml | 10 ++++++++++ gitian/mkbundle-mac.sh | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index c05d563..1824fcd 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -21,6 +21,8 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" +- "url": "https://git.torproject.org/flashproxy.git" + "dir": "flashproxy" files: - "pycrypto.tar.gz" - "argparse.tar.gz" @@ -131,6 +133,14 @@ script: | cp -a build/M2Crypto $PTDIR/ cd .. # + cd flashproxy + find -type f | xargs touch --date="$REFERENCE_DATETIME" + make dist DISTNAME=flashproxy-client + cp -a dist/flashproxy-client/{flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ + mkdir -p $INSTDIR/TorBrowserBundle.app/Docs/FlashProxy + cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/TorBrowserBundle.app/Docs/FlashProxy + cd .. + # cd $INSTDIR ~/build/dzip.sh pluggable-transports-mac$GBUILD_BITS-gbuilt.zip TorBrowserBundle.app cp pluggable-transports-mac$GBUILD_BITS-gbuilt.zip $OUTDIR/ diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 5a7e1d2..191b1e1 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -124,7 +124,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (3/4 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S`

1 0