Backports and changelog for 0.12.1 #4262
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
heartsucker
requested review from
conorsch,
emkll,
kushaldas,
msheiny and
redshiftzero
as code owners
eloquence
changed the title
heartsucker
force-pushed
the
backports-for-0.12.1
branch
from
b95da20 to
c07059f
Compare
emkll
reviewed
Mar 14, 2019
heartsucker
force-pushed
the
backports-for-0.12.1
branch
from
c07059f to
9e373bf
Compare
emkll
reviewed
Mar 14, 2019
admin/securedrop_admin/__init__.py
Outdated
| @@ -642,7 +642,7 @@ def check_for_updates(args): | |||
|
|
|||
|
|
|||
| def get_release_key_from_keyserver(args, keyserver=None, timeout=45): | |||
| gpg_recv = ['timeout', str(timeout), 'gpg', '--recv-key'] | |||
| gpg_recv = ['timeout', str(timeout), 'gpg', '--batch', '--no-tty', '--recv-key'] | |||
There was a problem hiding this comment.
it seems like the -x option was not used when cherry-picking this commit?
There was a problem hiding this comment.
This wasn't a cherry-pick. I had to add this to get the lint to pass.
heartsucker
force-pushed
the
backports-for-0.12.1
branch
from
9e373bf to
588db95
Compare
emkll
force-pushed
the
backports-for-0.12.1
branch
2 times, most recently
from
8ef515d to
816c75c
Compare
redshiftzero
approved these changes
Mar 14, 2019
Wireless-related packages are not required for SecureDrop App and Mon servers. `gcc` and dpkg-dev` however are required, as they are listed dependencies for `libgcc1`, a dependency for very large number of packages including `apt`. These packages are installed by default in Trusty, and will remain if an instance is upgraded to Xenial. (cherry picked from commit 1517e28)
you don't have an interactive prompt in the gui-updater, so you
shouldn't use a tty and --batch or --no-tty is meant for such tings.
--no-tty
Make sure that the TTY (terminal) is never used for any output.
This option is needed in some cases because
GnuPG sometimes prints warnings to the TTY if if --batch is used.
--batch
Use batch mode. Never ask, do not allow interactive commands.
The test, which uses a subshell, is looking for errors on the cli, this
should be changed.
(cherry picked from commit 6143a17)
The commit from @KwadroNaut added a few options, and flake8 was characteristically opinionated about whitespace surrounding the change. Updated the whitespace, without changes to the logic as written by @KwadroNaut. (cherry picked from commit 1a3e22b)
If in the course of an ssh/tmux session the tmux package is upgraded and the ssh connection broken, the next ssh attempt will encounter an error because of the tmux protocol version mismatch. The old tmux can be used to reattach by searching for the tmux process under /proc and using its reference to the old tmux executable. This change attempts to do that automatically if a first "tmux attach" attempt fails, but we can see that a previous session still exists. (cherry picked from commit 79bc089)
emkll
force-pushed
the
backports-for-0.12.1
branch
2 times, most recently
from
f6af5e2 to
3143cfa
Compare
Comment the tmux_attach_via_proc function in securedrop_additions.sh. Fix version check in builder-trusty/tests/vars.yml. Fix test_sudoers_config so that it requires explicit content in securedrop_additions.sh, instead of just checking that the installed file exactly matches whatever's in the current revision. (cherry picked from commit 1e77724)
At build time, let's ensure: - no conffiles are present so that files in /etc are properly squashed - securedrop-config contains the expected files (cherry picked from commit 690f0e3)
To avoid non-English system locales from breaking tasks that parse command output expecting English, set the environment variable LC_ALL=C in each play of securedrop-prod.yml. (cherry picked from commit f445d83)
Add configuration test to check locale is set for all plays there and in securedrop-prod. (cherry picked from commit 75d6965)
emkll
force-pushed
the
backports-for-0.12.1
branch
from
3143cfa to
6995d18
Compare
emkll
force-pushed
the
backports-for-0.12.1
branch
from
6995d18 to
2346b62
Compare
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Status
Ready for review
Description of Changes
Backports the currently closed tickets of the 0.12.1 milestone into the 0.12.0 release branch. Updates the changelog.