Commit 49b4b32d authored by anonym's avatar anonym
Browse files

Merge branch 'stable' into devel

parents 9fd47d24 975245bb
......@@ -7,3 +7,17 @@ echo "Selecting our preferred pinentry"
for alternative in pinentry pinentry-x11 ; do
update-alternatives --set "$alternative" /usr/bin/pinentry-gtk-2
done
# XXX:Buster remove once Debian bug #869416 is fixed
mkdir -p /usr/lib/pinentry
dpkg-divert --add --rename --divert \
/usr/lib/pinentry/pinentry-gtk-2 \
/usr/bin/pinentry-gtk-2
cat > /usr/bin/pinentry-gtk-2 << 'EOF'
#!/bin/sh
. /usr/local/lib/tails-shell-library/gnome.sh
export_gnome_env
exec /usr/lib/pinentry/pinentry-gtk-2 "$@"
EOF
chmod 755 /usr/bin/pinentry-gtk-2
......@@ -4,6 +4,12 @@ tails (3.2) UNRELEASED; urgency=medium
-- Tails developers <tails@boum.org> Mon, 12 Jun 2017 18:39:31 +0000
tails (3.1.1) UNRELEASED; urgency=medium
* Dummy entry for next release.
-- Tails developers <tails@boum.org> Wed, 09 Aug 2017 15:24:41 +0200
tails (3.1) unstable; urgency=medium
* Security fixes
......
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