[tbb-commits] [tor-browser-build/master] Bug 22499: Add fteproxy, obfsproxy, and dependencies, for Linux

boklm at torproject.org boklm at torproject.org
Mon Jul 24 08:58:46 UTC 2017


commit 7ebcf64903bf540504ff96dbe5324284957e1524
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Mon Jul 24 10:47:43 2017 +0200

    Bug 22499: Add fteproxy, obfsproxy, and dependencies, for Linux
---
 keyring/obfsproxy.gpg          | Bin 0 -> 2215 bytes
 keyring/pyptlib.gpg            | Bin 0 -> 2215 bytes
 projects/argparse/build        |  16 ++++++++++++++++
 projects/argparse/config       |  19 +++++++++++++++++++
 projects/fteproxy/build        |  16 ++++++++++++++++
 projects/fteproxy/config       |  20 ++++++++++++++++++++
 projects/libfte/build          |  22 ++++++++++++++++++++++
 projects/libfte/config         |  23 +++++++++++++++++++++++
 projects/obfsproxy/build       |  18 ++++++++++++++++++
 projects/obfsproxy/config      |  22 ++++++++++++++++++++++
 projects/parsley/build         |  16 ++++++++++++++++
 projects/parsley/config        |  19 +++++++++++++++++++
 projects/pycrypto/build        |  24 ++++++++++++++++++++++++
 projects/pycrypto/config       |  20 ++++++++++++++++++++
 projects/pyptlib/build         |  16 ++++++++++++++++
 projects/pyptlib/config        |  21 +++++++++++++++++++++
 projects/pyyaml/build          |  16 ++++++++++++++++
 projects/pyyaml/config         |  19 +++++++++++++++++++
 projects/twisted/build         |  16 ++++++++++++++++
 projects/twisted/config        |  19 +++++++++++++++++++
 projects/txsocksx/build        |  21 +++++++++++++++++++++
 projects/txsocksx/config       |  19 +++++++++++++++++++
 projects/zope.interface/build  |  16 ++++++++++++++++
 projects/zope.interface/config |  19 +++++++++++++++++++
 24 files changed, 417 insertions(+)

diff --git a/keyring/obfsproxy.gpg b/keyring/obfsproxy.gpg
new file mode 100644
index 0000000..4381baa
Binary files /dev/null and b/keyring/obfsproxy.gpg differ
diff --git a/keyring/pyptlib.gpg b/keyring/pyptlib.gpg
new file mode 100644
index 0000000..4381baa
Binary files /dev/null and b/keyring/pyptlib.gpg differ
diff --git a/projects/argparse/build b/projects/argparse/build
new file mode 100644
index 0000000..938c5e9
--- /dev/null
+++ b/projects/argparse/build
@@ -0,0 +1,16 @@
+#!/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/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
new file mode 100644
index 0000000..87f80b0
--- /dev/null
+++ b/projects/argparse/config
@@ -0,0 +1,19 @@
+# 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
new file mode 100644
index 0000000..b33c3a5
--- /dev/null
+++ b/projects/fteproxy/build
@@ -0,0 +1,16 @@
+#!/bin/bash
+[% c("var/set_default_env") -%]
+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') %]
+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
new file mode 100644
index 0000000..059381b
--- /dev/null
+++ b/projects/fteproxy/config
@@ -0,0 +1,20 @@
+# 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
diff --git a/projects/libfte/build b/projects/libfte/build
new file mode 100644
index 0000000..fc7b9f6
--- /dev/null
+++ b/projects/libfte/build
@@ -0,0 +1,22 @@
+#!/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
+export PYTHON=python2
+make
+cp -ra fte $PTDIR/
+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
new file mode 100644
index 0000000..e2219a7
--- /dev/null
+++ b/projects/libfte/config
@@ -0,0 +1,23 @@
+# 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:
+    var:
+      arch_deps:
+        - python-setuptools
+        - python-dev
+
+input_files:
+  - project: container-image
+  - name: '[% c("var/compiler") %]'
+    project: '[% c("var/compiler") %]'
+  - project: gmp
+    name: gmp
diff --git a/projects/obfsproxy/build b/projects/obfsproxy/build
new file mode 100644
index 0000000..841c608
--- /dev/null
+++ b/projects/obfsproxy/build
@@ -0,0 +1,18 @@
+#!/bin/bash
+[% c("var/set_default_env") -%]
+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') %]
+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
new file mode 100644
index 0000000..ad436dd
--- /dev/null
+++ b/projects/obfsproxy/config
@@ -0,0 +1,22 @@
+# 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: Obsfproxy
+  container:
+    use_container: 1
+
+targets:
+  linux:
+    var:
+      arch_deps:
+        - python-setuptools
+        - python-dev
+
+input_files:
+  - project: container-image
diff --git a/projects/parsley/build b/projects/parsley/build
new file mode 100644
index 0000000..ea5f19a
--- /dev/null
+++ b/projects/parsley/build
@@ -0,0 +1,16 @@
+#!/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') %]
+export 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
new file mode 100644
index 0000000..72d5bfc
--- /dev/null
+++ b/projects/parsley/config
@@ -0,0 +1,19 @@
+# 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
new file mode 100644
index 0000000..9b005ab
--- /dev/null
+++ b/projects/pycrypto/build
@@ -0,0 +1,24 @@
+#!/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
+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
+[% IF c("var/linux-i686") -%]
+  export CFLAGS=-m32
+  export CXXFLAGS=-m32
+  export LDFLAGS=-m32
+[% 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
new file mode 100644
index 0000000..3a9f24b
--- /dev/null
+++ b/projects/pycrypto/config
@@ -0,0 +1,20 @@
+# 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:
+    var:
+      arch_deps:
+        - python-dev
+        - python-setuptools
+
+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
new file mode 100644
index 0000000..1dc0c07
--- /dev/null
+++ b/projects/pyptlib/build
@@ -0,0 +1,16 @@
+#!/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
new file mode 100644
index 0000000..e8ca100
--- /dev/null
+++ b/projects/pyptlib/config
@@ -0,0 +1,21 @@
+# 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
new file mode 100644
index 0000000..c10855c
--- /dev/null
+++ b/projects/pyyaml/build
@@ -0,0 +1,16 @@
+#!/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
new file mode 100644
index 0000000..5324c10
--- /dev/null
+++ b/projects/pyyaml/config
@@ -0,0 +1,19 @@
+# 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/twisted/build b/projects/twisted/build
new file mode 100644
index 0000000..acc5c9d
--- /dev/null
+++ b/projects/twisted/build
@@ -0,0 +1,16 @@
+#!/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/Twisted-[% c('version') %].tar.bz2
+cd /var/tmp/build/Twisted-[% c('version') %]
+export PYTHON=python2
+$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
new file mode 100644
index 0000000..f2f7de8
--- /dev/null
+++ b/projects/twisted/config
@@ -0,0 +1,19 @@
+# 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:
+    var:
+      arch_deps:
+        - python-setuptools
+        - python-dev
+
+input_files:
+  - project: container-image
+  - URL: 'https://pypi.python.org/packages/source/T/Twisted/Twisted-[% c("version") %].tar.bz2'
+    sha256sum: 095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3
diff --git a/projects/txsocksx/build b/projects/txsocksx/build
new file mode 100644
index 0000000..3491a26
--- /dev/null
+++ b/projects/txsocksx/build
@@ -0,0 +1,21 @@
+#!/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
new file mode 100644
index 0000000..6142943
--- /dev/null
+++ b/projects/txsocksx/config
@@ -0,0 +1,19 @@
+# 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
new file mode 100644
index 0000000..23501a3
--- /dev/null
+++ b/projects/zope.interface/build
@@ -0,0 +1,16 @@
+#!/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
new file mode 100644
index 0000000..9743b79
--- /dev/null
+++ b/projects/zope.interface/config
@@ -0,0 +1,19 @@
+# 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



More information about the tbb-commits mailing list