commit dc355882e235178d0a1889a7d96c5721faad2716 Author: Georg Koppen gk@torproject.org Date: Fri Jun 15 11:54:02 2018 +0000

Bug 25540: Don't ship sandboxed-tor-browser anymore

sandboxed-tor-browser is not maintained anymore and Yawning requested to not ship it anymore in our alphas once we switch to Firefox 60 ESR. --- projects/goerrors/config | 17 ----------------- projects/gogb/config | 23 ----------------------- projects/gogb/gb-build-dir.patch | 31 ------------------------------- projects/release/build | 3 --- projects/release/config | 7 ------- projects/sandbox/build | 26 -------------------------- projects/sandbox/config | 32 -------------------------------- 7 files changed, 139 deletions(-)

diff --git a/projects/goerrors/config b/projects/goerrors/config deleted file mode 100644 index 3c11fab..0000000 --- a/projects/goerrors/config +++ /dev/null @@ -1,17 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/pkg/errors -git_hash: 248dadf4e9068a0b3e79f02ed0a610d935de5302 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -build: '[% c("projects/go/var/build_go_lib") %]' - -var: - container: - use_container: 1 - go_lib: github.com/pkg/errors - -input_files: - - project: container-image - - name: go - project: go diff --git a/projects/gogb/config b/projects/gogb/config deleted file mode 100644 index dcf30f6..0000000 --- a/projects/gogb/config +++ /dev/null @@ -1,23 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/constabulary/gb -git_hash: 06cc925cce6592e922dcc4839a8b44feb384e71e -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -build: '[% c("projects/go/var/build_go_lib") %]' - -var: - container: - use_container: 1 - go_lib: github.com/constabulary/gb - go_lib_install: github.com/constabulary/gb/cmd/gb - go_lib_deps: - - goerrors - -input_files: - - project: container-image - - name: go - project: go - - name: goerrors - project: goerrors - - filename: gb-build-dir.patch diff --git a/projects/gogb/gb-build-dir.patch b/projects/gogb/gb-build-dir.patch deleted file mode 100644 index a52ca69..0000000 --- a/projects/gogb/gb-build-dir.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a7b198e3a32509197150d7c2767262a7319ff339 Mon Sep 17 00:00:00 2001 -From: Georg Koppen gk@torproject.org -Date: Tue, 6 Dec 2016 21:34:16 +0000 -Subject: [PATCH] Make the gb build directory deterministic - - -diff --git a/context.go b/context.go -index 53c00da..d040082 100644 ---- a/context.go -+++ b/context.go -@@ -3,7 +3,6 @@ package gb - import ( - "fmt" - "io" -- "io/ioutil" - "os" - "os/exec" - "path/filepath" -@@ -136,7 +135,8 @@ func NewContext(p Project, opts ...func(*Context) error) (*Context, error) { - }, - GcToolchain(), - } -- workdir, err := ioutil.TempDir("", "gb") -+ workdir := filepath.Join(os.TempDir(), "gb") -+ err := os.Mkdir(workdir, 0777) - if err != nil { - return nil, err - } --- -2.10.2 - diff --git a/projects/release/build b/projects/release/build index a73f017..882d26d 100644 --- a/projects/release/build +++ b/projects/release/build @@ -20,9 +20,6 @@ mkdir -p "$destdir" [% END -%] [% IF c("var/torbrowser-linux-x86_64") -%] mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ - [% IF ! c("var/release") %] - mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip - [% END %] [% END -%] cd "$destdir" cat > .htaccess <<EOF diff --git a/projects/release/config b/projects/release/config index 2aba446..236325b 100644 --- a/projects/release/config +++ b/projects/release/config @@ -87,13 +87,6 @@ input_files: - '[% c("var/build_target") %]' - 'torbrowser-linux-x86_64[% c("var/debug-build") %]'

- - name: sandbox-linux-x86_64 - project: sandbox - enable: '[% c("var/torbrowser-linux-x86_64") && ! c("var/release") %]' - target: - - '[% c("var/build_target") %]' - - torbrowser-linux-x86_64 - - name: linux-i686 project: tor-browser enable: '[% c("var/torbrowser-linux-i686") %]' diff --git a/projects/sandbox/build b/projects/sandbox/build deleted file mode 100644 index 8a3edb3..0000000 --- a/projects/sandbox/build +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -[% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] -distdir=/var/tmp/dist/[% project %] -mkdir -p $distdir - -tar -C /var/tmp/dist -xf [% c('input_files_by_name/gogb') %] - -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c('version') %] - -# we don't have access to the git repository during the build -sed -i Makefile -e 's|git rev-parse --short HEAD > data/revision|echo [% c("abbrev") %] > data/revision|' -# Unset GOOS and GOARCH as they change some file names, and we don't need -# them as we are only building on x86_64 -unset GOOS -unset GOARCH -make -cp bin/sandboxed-tor-browser $distdir - -cd $distdir/.. -[% c('zip', { - zip_src => [ project ], - zip_args => dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/sandbox/config b/projects/sandbox/config deleted file mode 100644 index 11fe6be..0000000 --- a/projects/sandbox/config +++ /dev/null @@ -1,32 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 0.0.16 -git_url: https://git.torproject.org/tor-browser/sandboxed-tor-browser -git_hash: 'sandboxed-tor-browser-[% c("version") %]' -tag_gpg_id: 1 -gpg_keyring: obfs4.gpg -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - suite: jessie - arch: amd64 - deps: - - libx11-dev - - pkg-config - - libgtk-3-dev - - libnotify-dev - - zip - -targets: - nightly: - git_hash: master - version: '[% c("abbrev") %]' - tag_gpg_id: 0 - -input_files: - - project: container-image - - name: go - project: go - - name: gogb - project: gogb