[tbb-commits] [tor-browser-build/master] Bug 30319: Drop FTE releated bits
boklm at torproject.org
boklm at torproject.org
Tue May 14 14:06:23 UTC 2019
commit 055266551e5a8e56ca4ea9ec1c3eebe0fb1bba4e
Author: Georg Koppen <gk at torproject.org>
Date: Tue May 14 13:51:25 2019 +0000
Bug 30319: Drop FTE releated bits
Clean up our LICENSE file as well.
---
keyring/obfsproxy.gpg | Bin 2215 -> 0 bytes
keyring/pyptlib.gpg | Bin 2215 -> 0 bytes
keyring/winpython.gpg | Bin 1167 -> 0 bytes
projects/argparse/build | 15 --
projects/argparse/config | 19 --
projects/fteproxy/build | 19 --
projects/fteproxy/config | 24 --
projects/fteproxy/fteproxy.wrapper | 10 -
projects/gmp/build | 18 --
projects/gmp/config | 20 --
projects/libfte/build | 31 ---
projects/libfte/config | 43 ----
projects/obfsproxy/build | 27 --
projects/obfsproxy/config | 38 ---
projects/parsley/build | 16 --
projects/parsley/config | 19 --
projects/pycrypto/build | 25 --
projects/pycrypto/config | 38 ---
projects/pyptlib/build | 16 --
projects/pyptlib/config | 21 --
projects/pyyaml/build | 16 --
projects/pyyaml/config | 19 --
.../Docs/Licenses/PluggableTransports/LICENSE | 278 ---------------------
.../PTConfigs/linux/torrc-defaults-appendix | 3 -
projects/tor-browser/build | 20 +-
projects/tor-browser/config | 3 -
projects/twisted/build | 22 --
projects/twisted/config | 39 ---
projects/txsocksx/build | 21 --
projects/txsocksx/config | 19 --
projects/zope.interface/build | 16 --
projects/zope.interface/config | 19 --
rbm.conf | 3 -
33 files changed, 5 insertions(+), 872 deletions(-)
diff --git a/keyring/obfsproxy.gpg b/keyring/obfsproxy.gpg
deleted file mode 100644
index 4381baa..0000000
Binary files a/keyring/obfsproxy.gpg and /dev/null differ
diff --git a/keyring/pyptlib.gpg b/keyring/pyptlib.gpg
deleted file mode 100644
index 4381baa..0000000
Binary files a/keyring/pyptlib.gpg and /dev/null differ
diff --git a/keyring/winpython.gpg b/keyring/winpython.gpg
deleted file mode 100644
index 97abdc1..0000000
Binary files a/keyring/winpython.gpg and /dev/null differ
diff --git a/projects/argparse/build b/projects/argparse/build
deleted file mode 100644
index 3170601..0000000
--- a/projects/argparse/build
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-[% c("var/set_default_env") -%]
-distdir="/var/tmp/dist/[% project %]"
-[% c("var/set_PTDIR_DOCSDIR") -%]
-mkdir -p $PTDIR
-mkdir -p /var/tmp/build
-tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz
-cd /var/tmp/build/[% project %]-[% c('version') %]
-python2 setup.py build --build-lib build
-cp -a build/argparse.py $PTDIR/
-cd $distdir
-[% c('tar', {
- tar_src => [ '.' ],
- tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
- }) %]
diff --git a/projects/argparse/config b/projects/argparse/config
deleted file mode 100644
index 87f80b0..0000000
--- a/projects/argparse/config
+++ /dev/null
@@ -1,19 +0,0 @@
-# vim: filetype=yaml sw=2
-version: 1.2.1
-filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-
-var:
- container:
- use_container: 1
-
-targets:
- linux:
- var:
- arch_deps:
- - python-setuptools
- - python-dev
-
-input_files:
- - project: container-image
- - URL: 'https://pypi.python.org/packages/source/a/argparse/argparse-[% c("version") %].tar.gz'
- sha256sum: ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
diff --git a/projects/fteproxy/build b/projects/fteproxy/build
deleted file mode 100644
index ea37d05..0000000
--- a/projects/fteproxy/build
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-[% c("var/set_default_env") -%]
-distdir="/var/tmp/dist/[% project %]"
-[% c("var/set_PTDIR_DOCSDIR") -%]
-mkdir -p $PTDIR $DOCSDIR
-tar -C $distdir -xf $rootdir/[% c('input_files_by_name/libfte') %]
-mkdir -p /var/tmp/build
-tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz
-cd /var/tmp/build/[% project %]-[% c('version') %]
-cp -a $rootdir/fteproxy.wrapper $PTDIR/fteproxy.wrapper
-chmod +x $PTDIR/fteproxy.wrapper
-cp -a bin/fteproxy $PTDIR/fteproxy.bin
-cp -ra fteproxy $PTDIR/
-cp -a {COPYING,README.md} $DOCSDIR/
-cd $distdir
-[% c('tar', {
- tar_src => [ '.' ],
- tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
- }) %]
diff --git a/projects/fteproxy/config b/projects/fteproxy/config
deleted file mode 100644
index 9f797c5..0000000
--- a/projects/fteproxy/config
+++ /dev/null
@@ -1,24 +0,0 @@
-# vim: filetype=yaml sw=2
-version: '[% c("abbrev") %]'
-git_url: https://github.com/kpdyer/fteproxy.git
-# tag 0.2.19
-git_hash: 597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0
-filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-
-var:
- container:
- use_container: 1
-
-targets:
- linux:
- var:
- arch_deps:
- - python-setuptools
- - python-dev
-
-input_files:
- - project: container-image
- - project: libfte
- name: libfte
- - filename: fteproxy.wrapper
- enable: '[% c("var/linux") %]'
diff --git a/projects/fteproxy/fteproxy.wrapper b/projects/fteproxy/fteproxy.wrapper
deleted file mode 100644
index ca10086..0000000
--- a/projects/fteproxy/fteproxy.wrapper
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$0")
-libdir=$(cd "$basedir"/fteproxy-lib ; pwd)
-if test -z "$LD_LIBRARY_PATH"
-then
- export LD_LIBRARY_PATH="$libdir"
-else
- export LD_LIBRARY_PATH="$libdir:$LD_LIBRARY_PATH"
-fi
-exec "$basedir/fteproxy.bin" "$@"
diff --git a/projects/gmp/build b/projects/gmp/build
deleted file mode 100644
index 2752afe..0000000
--- a/projects/gmp/build
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-[% c("var/set_default_env") -%]
-[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
-distdir=/var/tmp/dist/[% project %]
-mkdir -p /var/tmp/build
-tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.bz2
-cd /var/tmp/build/[% project %]-[% c('version') %]
-# Even if we are not shipping libgmpxx anymore we still need --enable-xcc
-# during compile time.
-./configure --disable-static --enable-shared --enable-cxx \
- [% c("var/configure_opt") %] [% c("var/configure_opt_gmp") %] --prefix=$distdir
-make -j[% c("buildconf/num_procs") %]
-make install
-cd /var/tmp/dist
-[% c('tar', {
- tar_src => [ project ],
- tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
- }) %]
diff --git a/projects/gmp/config b/projects/gmp/config
deleted file mode 100644
index 41eb630..0000000
--- a/projects/gmp/config
+++ /dev/null
@@ -1,20 +0,0 @@
-# vim: filetype=yaml sw=2
-filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-version: 5.1.3
-
-var:
- container:
- use_container: 1
-
-targets:
- linux:
- var:
- configure_opt_gmp: --enable-fat
-
-input_files:
- - project: container-image
- - name: gmp
- URL: 'https://ftp.gnu.org/gnu/gmp/gmp-[% c("version") %].tar.bz2'
- sha256sum: 752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
- - name: '[% c("var/compiler") %]'
- project: '[% c("var/compiler") %]'
diff --git a/projects/libfte/build b/projects/libfte/build
deleted file mode 100644
index 638df7a..0000000
--- a/projects/libfte/build
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-[% c("var/set_default_env") -%]
-[% c("var/setarch") -%]
-[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
-distdir="/var/tmp/dist/[% project %]"
-[% c("var/set_PTDIR_DOCSDIR") -%]
-mkdir -p $PTDIR $DOCSDIR
-mkdir -p /var/tmp/build
-tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz
-cd /var/tmp/build/[% project %]-[% c('version') %]
-tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/gmp') %]
-ln -s /var/tmp/dist/gmp thirdparty/gmp
-mkdir -p $distdir
-tar -C $distdir -xf $rootdir/[% c('input_files_by_name/obfsproxy') %]
-[% IF c("var/linux-i686") -%]
- export CFLAGS=-m32
- export CXXFLAGS=-m32
- export LDFLAGS=-m32
-[% END -%]
-export PYTHON=python2[% IF c("var/linux-i686") %].7[% END %]
-make
-cp -ra fte $PTDIR/
-mkdir -p $PTDIR/fteproxy-lib
-cp /var/tmp/dist/gmp/lib/libgmp.so.10 $PTDIR/fteproxy-lib
-cp -a {LICENSE,README.md} $DOCSDIR/
-cp -a thirdparty/re2/LICENSE $DOCSDIR/LICENSE.re2
-cd $distdir
-[% c('tar', {
- tar_src => [ '.' ],
- tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
- }) %]
diff --git a/projects/libfte/config b/projects/libfte/config
deleted file mode 100644
index 365ad81..0000000
--- a/projects/libfte/config
+++ /dev/null
@@ -1,43 +0,0 @@
-# vim: filetype=yaml sw=2
-version: '[% c("abbrev") %]'
-git_url: https://github.com/kpdyer/libfte.git
-git_hash: 85ef8ae58dbf0d02ea26b627e343784b5574c428
-filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-
-var:
- container:
- use_container: 1
-
-targets:
- linux-x86_64:
- var:
- arch_deps:
- - python-setuptools
- - python-dev
-
- linux-i686:
- var:
- pre_pkginst: |
- dpkg --add-architecture i386
- # python2.7:i386 cannot be installed because the mime-support package
- # in wheezy is not marked "Multi-Arch: foreign":
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695357
- # We fix this by installing the jessie mime-support package.
- wget http://ftp.debian.org/debian/pool/main/m/mime-support/mime-support_3.58_all.deb
- echo 'c05ebe8f38da4ff19d028c9f4680414149e5c7a746de13bc9db0a562796ed213 mime-support_3.58_all.deb' | sha256sum -c
- dpkg -i mime-support_3.58_all.deb
- post_pkginst: |
- export DEBIAN_FRONTEND=noninteractive
- apt-get install -q -y libpython2.7:i386 python2.7:i386 python2.7-minimal:i386 python2.7-dev:i386
- apt-get install -q -y hardening-wrapper
- apt-get download -q -y python-setuptools python-pkg-resources
- dpkg -i --force-depends python-setuptools*.deb python-pkg-resources*.deb
-
-input_files:
- - project: container-image
- - name: '[% c("var/compiler") %]'
- project: '[% c("var/compiler") %]'
- - project: gmp
- name: gmp
- - project: obfsproxy
- name: obfsproxy
diff --git a/projects/obfsproxy/build b/projects/obfsproxy/build
deleted file mode 100644
index 46f9b7a..0000000
--- a/projects/obfsproxy/build
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-[% c("var/set_default_env") -%]
-distdir="/var/tmp/dist/[% project %]"
-[% c("var/set_PTDIR_DOCSDIR") -%]
-mkdir -p $PTDIR $DOCSDIR
-mkdir -p $distdir
-tar -C $distdir -xf $rootdir/[% c('input_files_by_name/pycrypto') %]
-tar -C $distdir -xf $rootdir/[% c('input_files_by_name/twisted') %]
-tar -C $distdir -xf $rootdir/[% c('input_files_by_name/argparse') %]
-tar -C $distdir -xf $rootdir/[% c('input_files_by_name/parsley') %]
-tar -C $distdir -xf $rootdir/[% c('input_files_by_name/pyptlib') %]
-tar -C $distdir -xf $rootdir/[% c('input_files_by_name/pyyaml') %]
-tar -C $distdir -xf $rootdir/[% c('input_files_by_name/txsocksx') %]
-tar -C $distdir -xf $rootdir/[% c('input_files_by_name/zope.interface') %]
-mkdir -p /var/tmp/build
-tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz
-cd /var/tmp/build/[% project %]-[% c('version') %]
-export PYTHON=python2
-$PYTHON setup.py build --build-lib build
-cp -a build/obfsproxy $PTDIR/
-cp -a bin/obfsproxy $PTDIR/obfsproxy.bin
-cp -a {LICENSE,README} $DOCSDIR
-cd $distdir
-[% c('tar', {
- tar_src => [ '.' ],
- tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
- }) %]
diff --git a/projects/obfsproxy/config b/projects/obfsproxy/config
deleted file mode 100644
index 9616eed..0000000
--- a/projects/obfsproxy/config
+++ /dev/null
@@ -1,38 +0,0 @@
-# vim: filetype=yaml sw=2
-version: 0.2.12
-git_url: https://git.torproject.org/pluggable-transports/obfsproxy.git
-git_hash: 'obfsproxy-[% c("version") %]'
-tag_gpg_id: 1
-gpg_keyring: obfsproxy.gpg
-filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-
-var:
- DOCSDIR_project: Obfsproxy
- container:
- use_container: 1
-
-targets:
- linux:
- var:
- arch_deps:
- - python-setuptools
- - python-dev
-
-input_files:
- - project: container-image
- - project: pycrypto
- name: pycrypto
- - project: twisted
- name: twisted
- - project: argparse
- name: argparse
- - project: parsley
- name: parsley
- - project: pyptlib
- name: pyptlib
- - project: pyyaml
- name: pyyaml
- - project: txsocksx
- name: txsocksx
- - project: zope.interface
- name: zope.interface
diff --git a/projects/parsley/build b/projects/parsley/build
deleted file mode 100644
index e32060b..0000000
--- a/projects/parsley/build
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-[% c("var/set_default_env") -%]
-distdir="/var/tmp/dist/[% project %]"
-[% c("var/set_PTDIR_DOCSDIR") -%]
-mkdir -p $PTDIR
-mkdir -p /var/tmp/build
-tar -C /var/tmp/build -xf $rootdir/Parsley-[% c('version') %].tar.gz
-cd /var/tmp/build/Parsley-[% c('version') %]
-PYTHON=python2
-$PYTHON setup.py build --build-lib build
-cp -a build/parsley.py build/ometa build/terml $PTDIR/
-cd $distdir
-[% c('tar', {
- tar_src => [ '.' ],
- tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
- }) %]
diff --git a/projects/parsley/config b/projects/parsley/config
deleted file mode 100644
index 72d5bfc..0000000
--- a/projects/parsley/config
+++ /dev/null
@@ -1,19 +0,0 @@
-# vim: filetype=yaml sw=2
-version: 1.2
-filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-
-var:
- container:
- use_container: 1
-
-targets:
- linux:
- var:
- arch_deps:
- - python-setuptools
- - python-dev
-
-input_files:
- - project: container-image
- - URL: 'https://pypi.python.org/packages/source/P/Parsley/Parsley-[% c("version") %].tar.gz'
- sha256sum: 50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
diff --git a/projects/pycrypto/build b/projects/pycrypto/build
deleted file mode 100644
index 3162296..0000000
--- a/projects/pycrypto/build
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-set -e
-[% c("var/set_default_env") -%]
-[% c("var/setarch") -%]
-[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
-distdir="/var/tmp/dist/[% project %]"
-[% c("var/set_PTDIR_DOCSDIR") -%]
-mkdir -p $PTDIR
-mkdir -p /var/tmp/build
-tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz
-cd /var/tmp/build/[% project %]-[% c('version') %]
-[% IF c("var/linux-i686") -%]
- export CFLAGS=-m32
- export CXXFLAGS=-m32
- export LDFLAGS=-m32
-[% END -%]
-export PYTHON=python2[% IF c("var/linux-i686") %].7[% END %]
-./configure --build=i686-linux-gnu [% c("var/configure_opt") %]
-$PYTHON setup.py build --build-lib build
-cp -a build/Crypto $PTDIR/
-cd $distdir
-[% c('tar', {
- tar_src => [ '.' ],
- tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
- }) %]
diff --git a/projects/pycrypto/config b/projects/pycrypto/config
deleted file mode 100644
index 56fe397..0000000
--- a/projects/pycrypto/config
+++ /dev/null
@@ -1,38 +0,0 @@
-# vim: filetype=yaml sw=2
-version: 2.6.1
-filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-var:
- container:
- use_container: 1
-
-targets:
- linux-x86_64:
- var:
- arch_deps:
- - python-dev
- - python-setuptools
-
- linux-i686:
- var:
- pre_pkginst: |
- dpkg --add-architecture i386
- # python2.7:i386 cannot be installed because the mime-support package
- # in wheezy is not marked "Multi-Arch: foreign":
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695357
- # We fix this by installing the jessie mime-support package.
- wget http://ftp.debian.org/debian/pool/main/m/mime-support/mime-support_3.58_all.deb
- echo 'c05ebe8f38da4ff19d028c9f4680414149e5c7a746de13bc9db0a562796ed213 mime-support_3.58_all.deb' | sha256sum -c
- dpkg -i mime-support_3.58_all.deb
- post_pkginst: |
- export DEBIAN_FRONTEND=noninteractive
- apt-get install -q -y libpython2.7:i386 python2.7:i386 python2.7-minimal:i386 python2.7-dev:i386
- apt-get install -q -y hardening-wrapper
- apt-get download -q -y python-setuptools python-pkg-resources
- dpkg -i --force-depends python-setuptools*.deb python-pkg-resources*.deb
-
-input_files:
- - project: container-image
- - name: '[% c("var/compiler") %]'
- project: '[% c("var/compiler") %]'
- - URL: 'https://pypi.python.org/packages/source/p/pycrypto/pycrypto-[% c("version") %].tar.gz'
- sha256sum: f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
diff --git a/projects/pyptlib/build b/projects/pyptlib/build
deleted file mode 100644
index 1dc0c07..0000000
--- a/projects/pyptlib/build
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-[% c("var/set_default_env") -%]
-distdir="/var/tmp/dist/[% project %]"
-[% c("var/set_PTDIR_DOCSDIR") -%]
-mkdir -p $PTDIR
-mkdir -p /var/tmp/build
-tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz
-cd /var/tmp/build/[% project %]-[% c('version') %]
-export PYTHON=python2
-$PYTHON setup.py build --build-lib build
-cp -a build/pyptlib $PTDIR/
-cd $distdir
-[% c('tar', {
- tar_src => [ '.' ],
- tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
- }) %]
diff --git a/projects/pyptlib/config b/projects/pyptlib/config
deleted file mode 100644
index e8ca100..0000000
--- a/projects/pyptlib/config
+++ /dev/null
@@ -1,21 +0,0 @@
-# vim: filetype=yaml sw=2
-version: 0.0.6
-git_url: https://git.torproject.org/pluggable-transports/pyptlib.git
-git_hash: 'pyptlib-[% c("version") %]'
-tag_gpg_id: 1
-gpg_keyring: pyptlib.gpg
-filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-
-var:
- container:
- use_container: 1
-
-targets:
- linux:
- var:
- arch_deps:
- - python-setuptools
- - python-dev
-
-input_files:
- - project: container-image
diff --git a/projects/pyyaml/build b/projects/pyyaml/build
deleted file mode 100644
index c10855c..0000000
--- a/projects/pyyaml/build
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-[% c("var/set_default_env") -%]
-distdir="/var/tmp/dist/[% project %]"
-[% c("var/set_PTDIR_DOCSDIR") -%]
-mkdir -p $PTDIR
-mkdir -p /var/tmp/build
-tar -C /var/tmp/build -xf $rootdir/PyYAML-[% c('version') %].tar.gz
-cd /var/tmp/build/PyYAML-[% c('version') %]
-export PYTHON=python2
-$PYTHON setup.py build --build-lib build
-cp -a build/yaml $PTDIR/
-cd $distdir
-[% c('tar', {
- tar_src => [ '.' ],
- tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
- }) %]
diff --git a/projects/pyyaml/config b/projects/pyyaml/config
deleted file mode 100644
index 5324c10..0000000
--- a/projects/pyyaml/config
+++ /dev/null
@@ -1,19 +0,0 @@
-# vim: filetype=yaml sw=2
-version: 3.11
-filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-
-var:
- container:
- use_container: 1
-
-targets:
- linux:
- var:
- arch_deps:
- - python-setuptools
- - python-dev
-
-input_files:
- - project: container-image
- - URL: 'https://pypi.python.org/packages/source/P/PyYAML/PyYAML-[% c("version") %].tar.gz'
- sha256sum: c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8
diff --git a/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE b/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE
index c6efd2c..8bf0661 100644
--- a/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE
+++ b/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE
@@ -145,284 +145,6 @@ OpenSSL
===============================================================================
-M2Crypto
-
-Copyright (c) 1999-2004 Ng Pheng Siong. All rights reserved.
-
-Portions copyright (c) 2004-2006 Open Source Applications Foundation.
-All rights reserved.
-
-Portions copyright (c) 2005-2006 Vrije Universiteit Amsterdam.
-All rights reserved.
-
-Copyright (c) 2008-2010 Heikki Toivonen. All rights reserved.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation.
-
-THE AUTHOR PROVIDES THIS SOFTWARE ``AS IS'' AND ANY EXPRESSED OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-===============================================================================
-
-py2exe
-
-Windows binary packages are built using py2exe.
-
-Copyright (c) 2000-2008 Thomas Heller, Mark Hammond, Jimmy Retzlaff
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-===============================================================================
-
-pyptlib
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
- * Neither the names of the copyright owners nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-===============================================================================
-
-PyCrypto
-
-To the best of our knowledge, with the exceptions noted below or
-within the files themselves, the files that constitute PyCrypto are in
-the public domain. Most are distributed with the following notice:
-
- The contents of this file are dedicated to the public domain. To
- the extent that dedication to the public domain is not available,
- everyone is granted a worldwide, perpetual, royalty-free,
- non-exclusive license to exercise all rights associated with the
- contents of this file for any purpose whatsoever.
- No rights are reserved.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
-
-Exceptions:
-
- - Portions of HMAC.py and setup.py are derived from Python 2.2, and
- are therefore Copyright (c) 2001, 2002, 2003 Python Software
- Foundation (All Rights Reserved). They are licensed by the PSF
- under the terms of the Python 2.2 license. (See the file
- LEGAL/copy/LICENSE.python-2.2 for details.)
-
- - The various GNU autotools (autoconf, automake, aclocal, etc.) are
- used during the build process. This includes macros from
- autoconf-archive, which are located in the m4/ directory. As is
- customary, some files from the GNU autotools are included in the
- source tree (in the root directory, and in the build-aux/
- directory). These files are merely part of the build process, and
- are not included in binary builds of the software.
-
-EXPORT RESTRICTIONS:
-
-Note that the export or re-export of cryptographic software and/or
-source code may be subject to regulation in your jurisdiction.
-
-===============================================================================
-
-Twisted
-
-Copyright (c) 2001-2013
-Allen Short
-Andy Gayton
-Andrew Bennetts
-Antoine Pitrou
-Apple Computer, Inc.
-Benjamin Bruheim
-Bob Ippolito
-Canonical Limited
-Christopher Armstrong
-David Reid
-Donovan Preston
-Eric Mangold
-Eyal Lotem
-Itamar Turner-Trauring
-James Knight
-Jason A. Mobarak
-Jean-Paul Calderone
-Jessica McKellar
-Jonathan Jacobs
-Jonathan Lange
-Jonathan D. Simms
-Jürgen Hermann
-Kevin Horn
-Kevin Turner
-Mary Gardiner
-Matthew Lefkowitz
-Massachusetts Institute of Technology
-Moshe Zadka
-Paul Swartz
-Pavel Pergamenshchik
-Ralph Meijer
-Sean Riley
-Software Freedom Conservancy
-Travis B. Hartwell
-Thijs Triemstra
-Thomas Herve
-Timothy Allen
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-===============================================================================
-
-zope.interface
-
-# Copyright (c) 2006 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-
-Zope Public License (ZPL) Version 2.1
--------------------------------------
-
-A copyright notice accompanies this license document that
-identifies the copyright holders.
-
-This license has been certified as open source. It has also
-been designated as GPL compatible by the Free Software
-Foundation (FSF).
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the
-following conditions are met:
-
-1. Redistributions in source code must retain the
- accompanying copyright notice, this list of conditions,
- and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the accompanying
- copyright notice, this list of conditions, and the
- following disclaimer in the documentation and/or other
- materials provided with the distribution.
-
-3. Names of the copyright holders must not be used to
- endorse or promote products derived from this software
- without prior written permission from the copyright
- holders.
-
-4. The right to distribute this software or to use it for
- any purpose does not give you the right to use
- Servicemarks (sm) or Trademarks (tm) of the copyright
- holders. Use of them is covered by separate agreement
- with the copyright holders.
-
-5. If any files are modified, you must cause the modified
- files to carry prominent notices stating that you changed
- the files and the date of any change.
-
-Disclaimer
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
- AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- NO EVENT SHALL THE COPYRIGHT HOLDERS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- DAMAGE.
-
-===============================================================================
-
-argparse
-
-argparse is (c) 2006-2009 Steven J. Bethard <steven.bethard at gmail.com>.
-
-The argparse module was contributed to Python as of Python 2.7 and thus
-was licensed under the Python license. Same license applies to all files in
-the argparse package project.
-
-For details about the Python License, please see LICENSE.PYTHON.
-
-===============================================================================
-
goptlib
To the extent possible under law, the authors have dedicated all
diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix
index d9988fb..75d5c5e 100644
--- a/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix
+++ b/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix
@@ -1,6 +1,3 @@
-## fteproxy configuration
-ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.wrapper --managed
-
## obfs4proxy configuration
ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy
diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index 45dbb53..1f155d1 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -60,10 +60,6 @@ mv "$TBDIR/meek-http-helper at bamsoftware.com.xpi" "$TBDIR/$MEEKPROFILEPATH/extens
tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%]
[% END -%]
-[% IF c("var/fteproxy") -%]
- tar -C "$TBDIR" -xf [% c('input_files_by_name/fteproxy') %]
-[% END -%]
-
tar -C "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]" -xf [% c('input_files_by_name/fonts') %]
[% IF c("var/linux") %]
@@ -119,24 +115,18 @@ cp -a Bundle-Data/Docs/* "$TBDIR/$DOCSPATH"
tar -C Bundle-Data/[% bundledata_osname %] -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -x
cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$TBDIR/$TORCONFIGPATH/torrc-defaults"
-[% IF c("var/linux") -%]
+[% IF c("var/linux") || c("var/osx") -%]
[% IF ! c("var/snowflake") %]
grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \
- >> "$GENERATEDPREFSPATH"
+ >> "$GENERATEDPREFSPATH"
[% ELSE %]
cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH"
[% END %]
[% END -%]
[% IF c("var/windows") -%]
- # We don't have snowflake and FTE available on Windows (yet).
- grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js | \
- grep -v 'default_bridge\.fte' >> "$GENERATEDPREFSPATH"
-[% END -%]
-[% IF c("var/osx") -%]
- # FTE is temporarily removed due to bug 18495.
- grep -Ev 'default_bridge\.fte' Bundle-Data/PTConfigs/bridge_prefs.js \
- [% IF ! c("var/snowflake") %]| grep -v 'default_bridge\.snowflake' [% END %] \
- >> "$GENERATEDPREFSPATH"
+ # We don't have snowflake available on Windows (yet).
+ grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \
+ >> "$GENERATEDPREFSPATH"
[% END -%]
cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> "$TBDIR/$MEEKPROFILEPATH/user.js"
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index ad382e2..ee62944 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -74,9 +74,6 @@ input_files:
- project: obfs4
name: obfs4
enable: '[% ! c("var/android") %]'
- - project: fteproxy
- name: fteproxy
- enable: '[% c("var/fteproxy") %]'
- project: snowflake
name: snowflake
enable: '[% c("var/snowflake") %]'
diff --git a/projects/twisted/build b/projects/twisted/build
deleted file mode 100644
index 3ce2eb0..0000000
--- a/projects/twisted/build
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-[% c("var/set_default_env") -%]
-distdir="/var/tmp/dist/[% project %]"
-[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
-[% c("var/set_PTDIR_DOCSDIR") -%]
-mkdir -p $PTDIR
-mkdir -p /var/tmp/build
-tar -C /var/tmp/build -xf $rootdir/Twisted-[% c('version') %].tar.bz2
-cd /var/tmp/build/Twisted-[% c('version') %]
-[% IF c("var/linux-i686") -%]
- export CFLAGS=-m32
- export CXXFLAGS=-m32
- export LDFLAGS=-m32
-[% END -%]
-export PYTHON=python2[% IF c("var/linux-i686") %].7[% END %]
-$PYTHON setup.py build --build-lib build
-cp -a build/twisted $PTDIR/
-cd $distdir
-[% c('tar', {
- tar_src => [ '.' ],
- tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
- }) %]
diff --git a/projects/twisted/config b/projects/twisted/config
deleted file mode 100644
index bbe3fc5..0000000
--- a/projects/twisted/config
+++ /dev/null
@@ -1,39 +0,0 @@
-# vim: filetype=yaml sw=2
-version: 13.2.0
-filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-
-var:
- container:
- use_container: 1
-
-targets:
- linux-x86_64:
- var:
- arch_deps:
- - python-setuptools
- - python-dev
-
- linux-i686:
- var:
- pre_pkginst: |
- dpkg --add-architecture i386
- # python2.7:i386 cannot be installed because the mime-support package
- # in wheezy is not marked "Multi-Arch: foreign":
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695357
- # We fix this by installing the jessie mime-support package.
- wget http://ftp.debian.org/debian/pool/main/m/mime-support/mime-support_3.58_all.deb
- echo 'c05ebe8f38da4ff19d028c9f4680414149e5c7a746de13bc9db0a562796ed213 mime-support_3.58_all.deb' | sha256sum -c
- dpkg -i mime-support_3.58_all.deb
- post_pkginst: |
- export DEBIAN_FRONTEND=noninteractive
- apt-get install -q -y libpython2.7:i386 python2.7:i386 python2.7-minimal:i386 python2.7-dev:i386
- apt-get install -q -y hardening-wrapper
- apt-get download -q -y python-setuptools python-pkg-resources
- dpkg -i --force-depends python-setuptools*.deb python-pkg-resources*.deb
-
-input_files:
- - project: container-image
- - URL: 'https://pypi.python.org/packages/source/T/Twisted/Twisted-[% c("version") %].tar.bz2'
- sha256sum: 095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3
- - name: '[% c("var/compiler") %]'
- project: '[% c("var/compiler") %]'
diff --git a/projects/txsocksx/build b/projects/txsocksx/build
deleted file mode 100644
index 3491a26..0000000
--- a/projects/txsocksx/build
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-[% c("var/set_default_env") -%]
-distdir="/var/tmp/dist/[% project %]"
-[% c("var/set_PTDIR_DOCSDIR") -%]
-mkdir -p $PTDIR
-mkdir -p /var/tmp/build
-tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz
-cd /var/tmp/build/[% project %]-[% c('version') %]
-# Let's pretend we have the setup dependency already as we don't want to get
-# it downloaded during building. Just pretending and thus avoiding another
-# dependency should be fine here as txsocksx catches the exception due to
-# missing __version__ and __sha__ .
-mkdir vcversioner-1.14.1.1-py2.7.egg
-export PYTHON=python2
-$PYTHON setup.py build --build-lib build
-cp -a build/txsocksx $PTDIR/
-cd $distdir
-[% c('tar', {
- tar_src => [ '.' ],
- tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
- }) %]
diff --git a/projects/txsocksx/config b/projects/txsocksx/config
deleted file mode 100644
index 6142943..0000000
--- a/projects/txsocksx/config
+++ /dev/null
@@ -1,19 +0,0 @@
-# vim: filetype=yaml sw=2
-version: '[% c("abbrev") %]'
-git_url: https://github.com/habnabit/txsocksx.git
-git_hash: 216eb0894a1755872f4789f9458aa6cf543b8433
-filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-
-var:
- container:
- use_container: 1
-
-targets:
- linux:
- var:
- arch_deps:
- - python-setuptools
- - python-dev
-
-input_files:
- - project: container-image
diff --git a/projects/zope.interface/build b/projects/zope.interface/build
deleted file mode 100644
index 23501a3..0000000
--- a/projects/zope.interface/build
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-[% c("var/set_default_env") -%]
-distdir="/var/tmp/dist/[% project %]"
-[% c("var/set_PTDIR_DOCSDIR") -%]
-mkdir -p $PTDIR
-mkdir -p /var/tmp/build
-unzip -d /var/tmp/build $rootdir/[% project %]-[% c('version') %].zip
-cd /var/tmp/build/[% project %]-[% c('version') %]
-export PYTHON=python2
-$PYTHON setup.py build --build-lib build
-cp -a build/zope $PTDIR/
-cd $distdir
-[% c('tar', {
- tar_src => [ '.' ],
- tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
- }) %]
diff --git a/projects/zope.interface/config b/projects/zope.interface/config
deleted file mode 100644
index 9743b79..0000000
--- a/projects/zope.interface/config
+++ /dev/null
@@ -1,19 +0,0 @@
-# vim: filetype=yaml sw=2
-version: 4.0.5
-filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-
-var:
- container:
- use_container: 1
-
-targets:
- linux:
- var:
- arch_deps:
- - python-setuptools
- - python-dev
-
-input_files:
- - project: container-image
- - URL: 'https://pypi.python.org/packages/source/z/zope.interface/zope.interface-[% c("version") %].zip'
- sha256sum: 1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc
diff --git a/rbm.conf b/rbm.conf
index 2202776..b6b2acf 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -196,7 +196,6 @@ targets:
# API 16 is the minimum we currently support for Tor Browser on Android
android_min_api: 16
snowflake: 0
- fteproxy: 0
container:
suite: stretch
arch: amd64
@@ -237,7 +236,6 @@ targets:
# We only build snowflake for linux and macOS on the alpha and nightly
# channels for now.
snowflake: '[% c("var/alpha") || c("var/nightly") %]'
- fteproxy: 1
container:
suite: wheezy
arch: amd64
@@ -297,7 +295,6 @@ targets:
LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_HEASLR") %] [% c("var/flag_mwindows") %]'
flag_mwindows: '-mwindows'
compiler: mingw-w64
- fteproxy: 0
deps:
- build-essential
- python
More information about the tbb-commits
mailing list