- tbb-commits - lists.torproject.org

[rbm/master] Bug 25004: rename abbrev_lenght to abbrev_length
by gk＠torproject.org 24 Jan '18

24 Jan '18

commit b83c74ca4b91732f64011f0255a1594f7747b340 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 24 17:34:49 2018 +0100 Bug 25004: rename abbrev_lenght to abbrev_length --- NEWS | 2 +- doc/options_misc.asc | 4 ++-- lib/RBM/DefaultConfig.pm | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index d517840..256cad9 100644 --- a/NEWS +++ b/NEWS @@ -39,7 +39,7 @@ - Add support for external input files, documented in burps_input_files(7) -- Add the abbrev and abbrev_lenght options +- Add the abbrev and abbrev_length options - Add the tar option, to create deterministic tar files diff --git a/doc/options_misc.asc b/doc/options_misc.asc index 3b3b877..876768b 100644 --- a/doc/options_misc.asc +++ b/doc/options_misc.asc @@ -17,8 +17,8 @@ abbrev:: This option returns the abbreviated commit hash of the +git_hash+ or +hg_hash+ commit. -abbrev_lenght:: - This option sets the lenght of the abbreviated commits, when +abbrev_length:: + This option sets the length of the abbreviated commits, when using the +abbrev+ option. tar:: diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index d0d893a..4121264 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -129,10 +129,10 @@ our %default_config = ( build_log_append => '1', notmpl => [ qw(projects_dir) ], describe => \&git_describe, - abbrev_lenght => '12', + abbrev_length => '12', abbrev => '[% IF c("git_url"); - exec("git log -1 --abbrev=" _ c("abbrev_lenght") _ " --format=%h " _ c("git_hash")); + exec("git log -1 --abbrev=" _ c("abbrev_length") _ " --format=%h " _ c("git_hash")); ELSE; exec(c("hg") _ " id -i -r " _ c("hg_hash")); END;

1 0

[rbm/master] Bug 24982: add script to help updating the website
by gk＠torproject.org 24 Jan '18

24 Jan '18

commit 213fad5a8fe04272359c33778626a2802efc4ebc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 23 19:01:13 2018 +0100 Bug 24982: add script to help updating the website This script will create a tarball containing the website and print commands that can be used to upload it. --- doc/make-rbm-docs-tar.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/make-rbm-docs-tar.sh b/doc/make-rbm-docs-tar.sh new file mode 100755 index 0000000..5a1b576 --- /dev/null +++ b/doc/make-rbm-docs-tar.sh @@ -0,0 +1,14 @@ +#!/bin/sh +set -e +docsdir=$(pwd) +tmpdir=$(mktemp -d) +make clean +make install-web webdir="$tmpdir" +cd "$tmpdir" +chmod 664 * +tar -cf "$docsdir"/rbm-docs.tar * +cd - +rm -Rf "$tmpdir" +echo "You can now update the web site with:" +echo " ssh staticiforme.torproject.org tar --overwrite -p -C /srv/rbm-master.torproject.org/htdocs -xf - < rbm-docs.tar" +echo " ssh staticiforme.torproject.org static-update-component rbm.torproject.org"

1 0

[rbm/master] Bug 24982: update url in README.md
by gk＠torproject.org 24 Jan '18

24 Jan '18

commit 0eb1f12241ed067ef9c013ef0f72e9cca89ee5e6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 23 19:00:40 2018 +0100 Bug 24982: update url in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3b6862d..e3ab848 100644 --- a/README.md +++ b/README.md @@ -8,5 +8,5 @@ to allow reproducing the build. For more information, visit the website : - https://people.torproject.org/~boklm/rbm/ + https://rbm.torproject.org/

1 0

[tor-browser-build/maint-7.5] Bug 24999: Hash our *.tar.gz files as well
by boklm＠torproject.org 24 Jan '18

24 Jan '18

commit 7dfd54aab191dfc1b55250569e45840d589f7caf Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 24 11:02:55 2018 +0000 Bug 24999: Hash our *.tar.gz files as well --- projects/release/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/build b/projects/release/build index 3940504..a73f017 100644 --- a/projects/release/build +++ b/projects/release/build @@ -32,7 +32,7 @@ RewriteRule ^sha256sums.txt.asc$ sha256sums-unsigned-build.txt.asc RewriteRule ^sha256sums.incrementals.txt$ sha256sums-unsigned-build.incrementals.txt RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incrementals.txt.asc EOF -sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt +sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt [% IF c("var/sign_build") -%] gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-unsigned-build.txt [% END -%]

1 0

[tor-browser-build/master] Bug 24999: Hash our *.tar.gz files as well
by boklm＠torproject.org 24 Jan '18

24 Jan '18

commit d2dee352354ee77cd26ac37bef41322df2729ff8 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 24 11:02:55 2018 +0000 Bug 24999: Hash our *.tar.gz files as well --- projects/release/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/build b/projects/release/build index 3940504..a73f017 100644 --- a/projects/release/build +++ b/projects/release/build @@ -32,7 +32,7 @@ RewriteRule ^sha256sums.txt.asc$ sha256sums-unsigned-build.txt.asc RewriteRule ^sha256sums.incrementals.txt$ sha256sums-unsigned-build.incrementals.txt RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incrementals.txt.asc EOF -sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt +sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt [% IF c("var/sign_build") -%] gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-unsigned-build.txt [% END -%]

1 0

[tor-browser-build/master] Pick up Firefox changes
by gk＠torproject.org 19 Jan '18

19 Jan '18

commit 980115dae789978ea0050a50a8c74a9e8f745ebb Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 19 07:27:58 2018 +0000 Pick up Firefox changes Use tor-browser -2 and build number bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 ++-- rbm.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index c433deb..4157500 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg @@ -28,7 +28,7 @@ targets: torbrowser_update_channel: release nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' tag_gpg_id: 0 var: torbrowser_update_channel: default diff --git a/rbm.conf b/rbm.conf index abe0547..12b1fd0 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0a1' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 7.5a10 project_name: tor-browser

1 0

[tor-browser-build/maint-7.5] Picking up newer Firefox changes
by gk＠torproject.org 19 Jan '18

19 Jan '18

commit 61257a0f6a3a06f894dd50ca38165beab3f3f605 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 19 07:16:19 2018 +0000 Picking up newer Firefox changes Use branch -2 and build number bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- rbm.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 374ade7..962f340 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index a70778b..9e18b53 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 7.0.11 project_name: tor-browser

1 0

[tor-browser-build/maint-7.5] Bump build tag
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit 670dd59f827203277130d3999c9193eadb1b6022 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 12:56:44 2018 +0000 Bump build tag --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index b966705..a70778b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 7.0.11 project_name: tor-browser

1 0

[tor-browser-build/maint-7.5] Bug 24930: update keyring path used to debootstrap precise images
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit e9fb651a29f6b649929bbeced662dcad4c1d6fc4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jan 18 13:24:43 2018 +0100 Bug 24930: update keyring path used to debootstrap precise images After switching the image we use for debootstrapping from 17.04 to 16.04.3 (in #24924), the path containing the keys for precise changed. --- projects/debootstrap-image/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index a06cc53..2c470be 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -44,13 +44,13 @@ targets: container: suite: precise arch: amd64 - debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg + debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg precise-i386: var: container: suite: precise arch: i386 - debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg + debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg utopic-amd64: var: container:

1 0

[tor-browser-build/master] Bump tbb build tag
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit 8643124e7deac88282ce0c071e1b1c6ee7548985 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 12:05:44 2018 +0000 Bump tbb build tag --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 2d8fd60..abe0547 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0a1' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 7.5a10 project_name: tor-browser

1 0