From e87d35cd00c7fa71035c36c9c87a937b3b3dc439 Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Mon, 6 Jan 2020 00:47:43 +0000 Subject: [PATCH 01/11] gobtcd/gobtcd2: Bump to 0.20.1 --- projects/gobtcd/config | 4 ++-- projects/gobtcd2/config | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/gobtcd/config b/projects/gobtcd/config index 79c359d..4aa0819 100644 --- a/projects/gobtcd/config +++ b/projects/gobtcd/config @@ -1,6 +1,6 @@ -version: '[% c("abbrev") %]' +version: 0.20.1 git_url: https://github.com/namecoin/btcd.git -git_hash: 6cfad711d4ee7367b3ab9dc572097438dbca56eb +git_hash: a271c34c473209705917e75ea9656972bd32da1a filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/gobtcd2/config b/projects/gobtcd2/config index 03d3150..f5848fb 100644 --- a/projects/gobtcd2/config +++ b/projects/gobtcd2/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' +version: '[% pc("gobtcd", "version") %]' git_url: '[% pc("gobtcd", "git_url") %]' git_hash: '[% pc("gobtcd", "git_hash") %]' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' From 80168fc4b7842fdcfb689155d3fa95a7830b43c7 Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Mon, 6 Jan 2020 00:49:32 +0000 Subject: [PATCH 02/11] gobtcutil: Bump to 2019 12 19 --- projects/gobtcutil/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/gobtcutil/config b/projects/gobtcutil/config index 63a8f90..597824a 100644 --- a/projects/gobtcutil/config +++ b/projects/gobtcutil/config @@ -1,6 +1,6 @@ version: '[% c("abbrev") %]' git_url: https://github.com/btcsuite/btcutil.git -git_hash: 9e5f4b9a998d263e3ce9c56664a7816001ac8000 +git_hash: e17c9730c422e7c745002430f2782b948b59c1c2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From c48441813ba362de7e85640f53e898000d64823a Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Mon, 6 Jan 2020 00:51:03 +0000 Subject: [PATCH 03/11] godns: Bump to 1.1.27 --- projects/godns/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/godns/config b/projects/godns/config index a49f32e..4b7699d 100644 --- a/projects/godns/config +++ b/projects/godns/config @@ -1,6 +1,6 @@ -version: 1.1.22 +version: 1.1.27 git_url: https://github.com/miekg/dns.git -git_hash: 1e224ff5dead8366ed6fcdcb832794be42e73f0e +git_hash: 6c0c4e6581f8e173cc562c8b3363ab984e4ae071 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From 99f97bd79a48c61b664075da301b8cf8d369f975 Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Mon, 6 Jan 2020 00:52:35 +0000 Subject: [PATCH 04/11] gogroupcache: Bump to 2019 12 27 --- projects/gogroupcache/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/gogroupcache/config b/projects/gogroupcache/config index 5646737..4cd4775 100644 --- a/projects/gogroupcache/config +++ b/projects/gogroupcache/config @@ -1,6 +1,6 @@ version: '[% c("abbrev") %]' git_url: https://github.com/golang/groupcache.git -git_hash: 611e8accdfc92c4187d399e95ce826046d4c8d73 +git_hash: 215e87163ea771ffa998a96c611387313bb5a403 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From e1374d7d30289363536c8e3ad37e7c19cd9f2731 Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Mon, 6 Jan 2020 00:53:51 +0000 Subject: [PATCH 05/11] goisatty: Bump to 0.0.11 --- projects/goisatty/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/goisatty/config b/projects/goisatty/config index debbe95..7d0c3e7 100644 --- a/projects/goisatty/config +++ b/projects/goisatty/config @@ -1,6 +1,6 @@ -version: 0.0.10 +version: 0.0.11 git_url: https://github.com/mattn/go-isatty.git -git_hash: 88ba11cfdc67c7588b30042edf244b2875f892b6 +git_hash: 31745d66dd679ac0ac4f8d3ecff168fce6170c6a filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From d719b1c192ef8b66ffe845c8cb5db78c571044be Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Mon, 6 Jan 2020 00:56:03 +0000 Subject: [PATCH 06/11] gopretty: Bump to 0.2.0 --- projects/gopretty/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/gopretty/config b/projects/gopretty/config index a2ceecf..e2baabd 100644 --- a/projects/gopretty/config +++ b/projects/gopretty/config @@ -1,6 +1,6 @@ -version: '[% c("abbrev") %]' +version: 0.2.0 git_url: https://github.com/kr/pretty.git -git_hash: 71e7e49937503c662b9b636fd6b2c14b1aa818a5 +git_hash: 4e0886370c3a67530192c6a238cff68f56c141b0 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From 0823c5e8a8929977bb26d601581eca6e2219fd4f Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Mon, 6 Jan 2020 00:58:19 +0000 Subject: [PATCH 07/11] ncdns: Bump to 0.0.10 --- projects/ncdns/config | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/projects/ncdns/config b/projects/ncdns/config index 90efd11..3c39042 100644 --- a/projects/ncdns/config +++ b/projects/ncdns/config @@ -1,13 +1,6 @@ -#version: 0.0.9 -# Using latest master branch because we need the stream isolation and -# disable_namecoin_tlsa features. Once they're in a tagged release, we'll go -# back to using a version number here. -version: '[% c("abbrev") %]' +version: 0.0.10 git_url: https://github.com/namecoin/ncdns.git -# Using latest master branch because we need the stream isolation and -# disable_namecoin_tlsa features. Once they're in a tagged release, we'll go -# back to using a hash that corresponds to a tag here. -git_hash: '7c39b77cca1e949097759019bcfa4444cbd0ab76' +git_hash: 'ca0fe5552806a4275f38468c4d3fbcb2cba1cb79' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: From 448c2c93327025d1699cdd1dfdee1781b0407ea7 Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Mon, 6 Jan 2020 01:02:17 +0000 Subject: [PATCH 08/11] Travis: only use Tor tags that include "tbb" This is to avoid accepting tags like "test_bug_30480-t4". --- .travis/check-tbb-tags | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/check-tbb-tags b/.travis/check-tbb-tags index c5844ae..c495399 100755 --- a/.travis/check-tbb-tags +++ b/.travis/check-tbb-tags @@ -9,7 +9,7 @@ GIT_TAG=$(git submodule status tor-browser-build | awk '{print $3}') GIT_URL=https://git.torproject.org/builders/tor-browser-build.git -LATEST_TAG=$(git ls-remote --tags "${GIT_URL}" | grep -v '\^{}' | awk '{print $2}' | awk -F"/" '{print $3}' | sort -V | tail --lines=1) +LATEST_TAG=$(git ls-remote --tags "${GIT_URL}" | grep 'tbb' | grep -v '\^{}' | awk '{print $2}' | awk -F"/" '{print $3}' | sort -V | tail --lines=1) if [ "${GIT_TAG}" != "(${LATEST_TAG})" ] then FAIL=1 From cb6adf03b2b2172bbf9c6144e59a674285da110d Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Mon, 6 Jan 2020 01:45:32 +0000 Subject: [PATCH 09/11] goqlib: Bump to 0.0.3 --- projects/goqlib/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/goqlib/config b/projects/goqlib/config index b2b4f2a..c765f0a 100644 --- a/projects/goqlib/config +++ b/projects/goqlib/config @@ -1,6 +1,6 @@ -version: '0.0.2' +version: 0.0.3 git_url: https://github.com/namecoin/qlib.git -git_hash: 'e40392470b81d18021cf5b11bd68f7814af7d2fd' +git_hash: 'e32f7c7654197d3f3835128d23a19290493877e7' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From d32f845181ae8c2c241ae9077ed71e2273622cca Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Mon, 6 Jan 2020 01:46:59 +0000 Subject: [PATCH 10/11] gotlsrestrictnss: Bump to 0.0.4 --- projects/gotlsrestrictnss/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/gotlsrestrictnss/config b/projects/gotlsrestrictnss/config index 91e751a..7747a24 100644 --- a/projects/gotlsrestrictnss/config +++ b/projects/gotlsrestrictnss/config @@ -1,6 +1,6 @@ -version: '0.0.3' +version: '0.0.4' git_url: https://github.com/namecoin/tlsrestrictnss.git -git_hash: '01a37997e55de687f4b5228e0e9315a6d698bd2a' +git_hash: '47cee47a6fa9c12f19a360b0b67e20e721135ed6' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From e94f800258a04b693260f349033579a92d4fb4ec Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Mon, 6 Jan 2020 02:22:37 +0000 Subject: [PATCH 11/11] Bump tor-browser-build to tbb-9.5a4-build1 Also update Makefile and rbm.conf to sync with upstream changes --- .gitignore | 1 - rbm.conf | 2 +- tor-browser-build | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index efd3840..8239960 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ /out /release /alpha -/alpha_nightly /nightly /testbuild /rbm.local.conf diff --git a/rbm.conf b/rbm.conf index 753a73a..c4f73e5 100644 --- a/rbm.conf +++ b/rbm.conf @@ -40,7 +40,7 @@ var: [% END -%] input_files: [% c("input_files_id") %] build: - [% c("build", { filename => 'f', output_dir => '/out' }) %] + [% c("build", { filename => 'f', output_dir => '/out', norec => {} }) %] container: dir: '[% c("rbm_tmp_dir") %]/rbm-containers/[% sha256(c("build_id")) %]' user: rbm diff --git a/tor-browser-build b/tor-browser-build index 95bc7fd..637e37b 160000 --- a/tor-browser-build +++ b/tor-browser-build @@ -1 +1 @@ -Subproject commit 95bc7fde8230aab8fdb3cc87a1d8143f400c25e4 +Subproject commit 637e37bff412b587970791dafdb3174eb359d6b3