Commit ff714932 authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'feature/11082-deprecate-liferea' into devel (refs: #11082)

parents 48a05f21 0aa2f083
......@@ -5,7 +5,8 @@ set -e
echo "Wrapping some applications with torsocks"
APPS="gobby-0.5 net.sourceforge.liferea openpgp-applet seahorse"
DBUS_SERVICES="net.sourceforge.liferea org.gnome.seahorse.Application org.fedoraproject.Config.Printing"
DBUS_SERVICES="org.gnome.seahorse.Application org.fedoraproject.Config.Printing"
WRAPPED_DBUS_SERVICES="net.sourceforge.liferea"
for app in $APPS; do
sed -i'' --regexp-extended 's,^Exec=(.*),Exec=torsocks \1,' \
......@@ -17,6 +18,12 @@ for dbus_service in $DBUS_SERVICES; do
"/usr/share/dbus-1/services/${dbus_service}.service"
done
# Wrapped by both torsocks and a binary in /usr/local
for dbus_service in $WRAPPED_DBUS_SERVICES; do
sed -i'' --regexp-extended 's,^Exec=/usr/(.*),Exec=/usr/bin/torsocks /usr/local/\1,' \
"/usr/share/dbus-1/services/${dbus_service}.service"
done
# Redirect to existing wrapper
sed -i'' --regexp-extended 's,^Exec=pidgin$,Exec=/usr/local/bin/pidgin,' \
"/usr/share/applications/pidgin.desktop"
......
#!/usr/bin/env python3
"""
Tails Liferea wrapper
"""
import os
import sh
import sys
from gettext import gettext
LIFEREA = '/usr/bin/liferea'
os.environ['TEXTDOMAIN'] = 'tails'
def main():
disabled_text = gettext('Liferea is deprecated')
question_text = gettext('Do you wish to start Liferea anyway?')
warning_text = gettext(
"Due to security concerns the Liferea feed reader will be removed "
"from Tails by the end of 2018. Please migrate your feeds to "
"Thunderbird."
)
dialog_msg = '<b><big>{}</big></b>\n\n{}\n\n{}\n'.format(
disabled_text,
warning_text,
question_text,
)
exit_text = gettext('_Exit')
launch_text = gettext('_Launch')
# results 0 == True; 1 == False; 5 == Timeout
results = sh.zenity(
'--question',
'--title', '',
'--default-cancel',
'--ok-label', launch_text,
'--cancel-label', exit_text,
'--text', dialog_msg,
_ok_code=[0, 1, 5],
)
if results.exit_code != 0:
return 1
return os.execv(LIFEREA, [LIFEREA] + sys.argv[1:])
if __name__ == '__main__':
sys.exit(main())
......@@ -2,6 +2,7 @@
tmp/pot/60-tor-ready.sh.pot
tmp/pot/config.py.pot
tmp/pot/electrum.pot
tmp/pot/liferea.pot
tmp/pot/status-menu-helper-extension.js.pot
tmp/pot/tails-about.pot
tmp/pot/tails-additional-software.pot
......
......@@ -8,6 +8,7 @@ PERL_PROGS="/usr/local/bin/tails-security-check \
/usr/local/lib/tails-virt-notify-user"
PYTHON_PROGS="/etc/whisperback/config.py \
/usr/local/bin/electrum \
/usr/local/bin/liferea \
/usr/local/bin/tails-about \
/usr/local/bin/tails-screen-locker \
/usr/local/bin/tails-upgrade-frontend-wrapper \
......
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