Commit df5c5538 authored by intrigeri's avatar intrigeri

Merge remote-tracking branch 'origin/master' into stable

parents 415f92e3 fb636474
......@@ -209,29 +209,39 @@ When a Git *main* branch (`devel`, `testing`, `stable`,
`feature/jessie`) is merged into another *main* branch, the corresponding
operation must be done on the APT suites.
0. Set some environment variables:
WORKDIR=$(mktemp -d)
# the branch you want to merge
SRC=stable
# the branch you want to merge _into_
DST=devel
1. Save the list of packages currently present in the APT suite we
want to merge *into*, e.g. `reprepro list devel`.
want to merge *into*:
ssh reprepro@incoming.deb.tails.boum.org \
reprepro list "$DST" \
> "$WORKDIR/$DST.orig.list"
2. Make sure you are not going to overwrite newer packages with
older ones (hint: use the `tails-diff-suites` script).
older ones:
3. Merge the APT suites:
ssh reprepro@incoming.deb.tails.boum.org \
tails-diff-suites "$SRC" "$DST"
1. Set some environment variables:
… and look for packages that are newer in `$DST` than in `$SRC`.
# the branch you want to merge
SRC=stable
# the branch you want to merge _into_
DST=devel
3. Merge the APT suites:
2. Merge in Git and APT:
1. Merge in Git and APT:
git checkout "$DST" && \
git merge "$SRC" && \
ssh reprepro@incoming.deb.tails.boum.org \
tails-merge-suite "$SRC" "$DST"
3. Restore the `config/base_branch` if needed:
2. Restore the `config/base_branch` if needed:
echo "${DST}" > config/base_branch && \
git commit config/base_branch -m "Restore ${DST}'s base branch." || :
......
......@@ -1441,7 +1441,7 @@ this, and skip what does not make sense for a RC.
1. If you just released a new stable release, remove the previous
stable release from:
- our rsync server:
`ssh rsync.lizard rm -rf /srv/rsync/tails/tails/stable/tails-amd64-${PREVIOUS_VERSION:?}/`
`ssh rsync.lizard sudo rm -rf /srv/rsync/tails/tails/stable/tails-amd64-${PREVIOUS_VERSION:?}/`
- our Bittorrent seed: get the previous release's _Transmission_ IDs
(ISO and USB image)
with `ssh bittorrent.lizard transmission-remote --list` and then
......@@ -1464,7 +1464,7 @@ this, and skip what does not make sense for a RC.
- then actually delete the files:
ssh rsync.lizard /bin/sh -c \
\"find /srv/rsync/tails/tails/alpha \
\"sudo find /srv/rsync/tails/tails/alpha \
/srv/rsync/tails/tails/stable \
-type f -name '*.iuk' -mtime '+270' \
-not -name '*~test_*~test.iuk' -delete \
......@@ -1510,11 +1510,6 @@ this, and skip what does not make sense for a RC.
APT repository documentation. This includes some git operations,
like creating an appropriate _"dummy changelog entry"_ in the
`debian/changelog` file.
1. Make sure there are upgrade-description files for any new versions
that were added in the `debian/changelog` file since the last
release. Background: From time to time the UDF generation/update
step isn't perfect and entries might be missing from
`wiki/src/upgrade/v1/Tails/<VERSION>/<ARCH>/<CHANNEL>`.
1. Verify that the snapshots used in the release branch are ok,
e.g. they use the correct snapshots, and they were bumped
appropriately (they should expire after the next planned major release date).
......
[[!meta date="Mon, 11 Jan 2019 12:34:56 +0100"]]
[[!meta date="Mon, 11 Feb 2019 12:34:56 +0100"]]
[[!meta title="Numerous security holes in Tails 3.12"]]
[[!tag security/fixed]]
......@@ -12,4 +12,4 @@ We **strongly** encourage you to
- LibreOffice: [[!debsa2019 4381]]
- cURL: [[!debsa2019 4386]]
- Qt 5: [[!debsa2019 4374]]
- OpenSSH [[!debsa2019 4387]]
- OpenSSH: [[!debsa2019 4387]]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment