summaryrefslogtreecommitdiffstats
path: root/wiki/src/contribute/release_process/tor-browser.mdwn
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-08-26 21:12:29 +0000
committerintrigeri <intrigeri@boum.org>2016-08-26 21:12:29 +0000
commit6149b6f8e1cb2d569fb3990a4051fd3b9dceda0f (patch)
tree354b4d9bb12754641c66cb943c0d6c7c3452cce3 /wiki/src/contribute/release_process/tor-browser.mdwn
parent1288c86aca5bf1095cbbb582f19cbdc250b8f52f (diff)
Tor Browser "release" process: also import 64-bit tarballs.
refs: #8183
Diffstat (limited to 'wiki/src/contribute/release_process/tor-browser.mdwn')
-rw-r--r--wiki/src/contribute/release_process/tor-browser.mdwn50
1 files changed, 40 insertions, 10 deletions
diff --git a/wiki/src/contribute/release_process/tor-browser.mdwn b/wiki/src/contribute/release_process/tor-browser.mdwn
index c141d1d..e83df1a 100644
--- a/wiki/src/contribute/release_process/tor-browser.mdwn
+++ b/wiki/src/contribute/release_process/tor-browser.mdwn
@@ -84,6 +84,16 @@ Lastly, commit:
git commit config/chroot_local-includes/usr/share/tails/tbb-*.txt \
-m "Upgrade Tor Browser to ${VERSION}."
+Then do the same operation for the 64-bit tarballs:
+
+ git checkout feature/8183-64bit-userspace && \
+ grep --color=never "\<tor-browser-linux64-.*\.tar.xz$" sha256sums-unsigned-build.txt > \
+ config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt && \
+ echo "${DIST_URL}" | sed "s,^https://,http://," > \
+ config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt && \
+ git commit config/chroot_local-includes/usr/share/tails/tbb-*.txt \
+ -m "Upgrade Tor Browser to ${VERSION}."
+
<div class="caution">
<p>
If this new Tor Browser is meant to be included in a Tails
@@ -149,24 +159,39 @@ Set up environment variables
TORBROWSER_ARCHIVE="$HOME/tails/torbrowser-archive"
+4. Make `TORBROWSER_IMPORT_BRANCH` point to the branch where you want to
+ import the new Tor Browser's metadata, for example:
+
+ TORBROWSER_IMPORT_BRANCH=feature/123456-torbrowser-42.3.4
+
Import a new set of Tor Browser tarballs
----------------------------------------
1. Download and verify all the tarballs we need:
TMPDIR=$(mktemp -d)
- CHROOT_INCLUDES="${TAILS_GIT_REPO}/config/chroot_local-includes"
+ CHROOT_INCLUDES="config/chroot_local-includes"
TBB_SHA256SUMS_FILE="${CHROOT_INCLUDES}/usr/share/tails/tbb-sha256sums.txt"
TBB_DIST_URL_FILE="${CHROOT_INCLUDES}/usr/share/tails/tbb-dist-url.txt"
+ cd "$TAILS_GIT_REPO" && git checkout "$TORBROWSER_IMPORT_BRANCH"
TBB_TARBALLS_BASE_URL="$(cat "${TBB_DIST_URL_FILE}" | sed "s,^http://,https://,")"
- cat "$TBB_SHA256SUMS_FILE" | while read expected_sha256 tarball; do
+ current_branch=$(git -C "$TAILS_GIT_REPO" branch | awk '/^\* / { print $2 }')
+ for branch in "$current_branch" feature/8183-64bit-userspace ; do
+ git -C "$TAILS_GIT_REPO" show "$branch:$TBB_SHA256SUMS_FILE" \
+ | while read expected_sha256 tarball; do
+ (
+ cd "$TMPDIR"
+ echo "Retrieving '${TBB_TARBALLS_BASE_URL}/${tarball}'..."
+ curl --remote-name --continue-at - \
+ "${TBB_TARBALLS_BASE_URL}/${tarball}"
+ )
+ done
(
- cd "$TMPDIR"
- curl --remote-name --continue-at - \
- "${TBB_TARBALLS_BASE_URL}/${tarball}"
+ cd "$TMPDIR" && \
+ git -C "$TAILS_GIT_REPO" show "$branch:$TBB_SHA256SUMS_FILE" \
+ | sha256sum -c -
)
done
- (cd "$TMPDIR" && sha256sum -c "$TBB_SHA256SUMS_FILE")
3. Move the tarballs into your local Git annex:
@@ -198,7 +223,12 @@ Adjust the URL in the main Git repository
-----------------------------------------
cd "$TAILS_GIT_REPO" && \
- echo "http://torbrowser-archive.tails.boum.org/${VERSION}/" > \
- config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt && \
- git commit config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt \
- -m "Fetch Tor Browser from our own archive."
+ git checkout "$TORBROWSER_IMPORT_BRANCH"
+ current_branch=$(git branch | awk '/^\* / { print $2 }')
+ for branch in "$current_branch" feature/8183-64bit-userspace ; do
+ git checkout "$branch" && \
+ echo "http://torbrowser-archive.tails.boum.org/${VERSION}/" > \
+ config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt && \
+ git commit config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt \
+ -m "Fetch Tor Browser from our own archive." && \
+ done