summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfig/chroot_local-hooks/52-update-rc.d1
-rw-r--r--config/chroot_local-includes/usr/lib/systemd/user/tails-i2p-removal-notify-user.service11
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/tails-documentation5
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/tor-browser7
-rwxr-xr-xconfig/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user60
-rw-r--r--features/documentation.feature3
-rw-r--r--features/localization.feature2
-rw-r--r--po/POTFILES.in1
-rwxr-xr-xrefresh-translations1
-rw-r--r--wiki/src/doc/anonymous_internet/i2p.mdwn13
10 files changed, 97 insertions, 7 deletions
diff --git a/config/chroot_local-hooks/52-update-rc.d b/config/chroot_local-hooks/52-update-rc.d
index de38433..48cfbbb 100755
--- a/config/chroot_local-hooks/52-update-rc.d
+++ b/config/chroot_local-hooks/52-update-rc.d
@@ -52,6 +52,7 @@ systemctl --global enable tails-32-bit-notify-user.service
systemctl --global enable tails-add-GNOME-bookmarks.service
systemctl --global enable tails-configure-keyboard.service
systemctl --global enable tails-create-tor-browser-directories.service
+systemctl --global enable tails-i2p-removal-notify-user.service
systemctl --global enable tails-security-check.service
systemctl --global enable tails-upgrade-frontend.service
systemctl --global enable tails-virt-notify-user.service
diff --git a/config/chroot_local-includes/usr/lib/systemd/user/tails-i2p-removal-notify-user.service b/config/chroot_local-includes/usr/lib/systemd/user/tails-i2p-removal-notify-user.service
new file mode 100644
index 0000000..b630960
--- /dev/null
+++ b/config/chroot_local-includes/usr/lib/systemd/user/tails-i2p-removal-notify-user.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Warn the user that I2P will be removed
+ConditionKernelCommandLine=i2p
+
+[Service]
+Type=oneshot
+ExecStart=/usr/local/lib/tails-i2p-removal-notify-user
+RemainAfterExit=yes
+
+[Install]
+WantedBy=desktop.target
diff --git a/config/chroot_local-includes/usr/local/bin/tails-documentation b/config/chroot_local-includes/usr/local/bin/tails-documentation
index 36932d0..6a99cb6 100755
--- a/config/chroot_local-includes/usr/local/bin/tails-documentation
+++ b/config/chroot_local-includes/usr/local/bin/tails-documentation
@@ -17,4 +17,9 @@ else
FILE="${PAGE}.html"
fi
+if [ -n "${2}" ]; then
+ FILE="${FILE}#${2}"
+fi
+
+export TOR_BROWSER_SKIP_OFFLINE_WARNING=yes
exec /usr/local/bin/tor-browser "file://${WIKI_ROOT}/${FILE}"
diff --git a/config/chroot_local-includes/usr/local/bin/tor-browser b/config/chroot_local-includes/usr/local/bin/tor-browser
index 8024d33..a2d0902 100755
--- a/config/chroot_local-includes/usr/local/bin/tor-browser
+++ b/config/chroot_local-includes/usr/local/bin/tor-browser
@@ -19,6 +19,9 @@ PROFILE="${HOME}/.tor-browser/profile.default"
# Import exec_firefox() and configure_best_tor_browser_locale()
. /usr/local/lib/tails-shell-library/tor-browser.sh
+# Get LIVE_USERNAME
+. /etc/live/config.d/username.conf
+
# Allow Torbutton access to the control port filter (for new identity).
# Setting a password is required, otherwise Torbutton attempts to
# read the authentication cookie file instead, which fails.
@@ -32,8 +35,8 @@ export TOR_NO_DISPLAY_NETWORK_SETTINGS='yes'
ask_for_confirmation() {
- # Skip dialog if user is already running Tor Browser:
- if pgrep -u amnesia -f "${TBB_INSTALL}/firefox" ; then
+ if [ "${TOR_BROWSER_SKIP_OFFLINE_WARNING:-}" = 'yes' ] || \
+ pgrep -u "${LIVE_USERNAME}" -f "${TBB_INSTALL}/firefox"; then
return
fi
diff --git a/config/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user b/config/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user
new file mode 100755
index 0000000..94d479f
--- /dev/null
+++ b/config/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user
@@ -0,0 +1,60 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+#man{{{
+
+=head1 NAME
+
+tails-i2p-removal-notify-user
+
+=head1 VERSION
+
+Version X.XX
+
+=head1 AUTHOR
+
+Tails dev team <amnesia@boum.org>
+See https://tails.boum.org/.
+
+=cut
+
+#}}}
+
+use Desktop::Notify;
+use Locale::gettext;
+use Net::DBus::Reactor;
+use POSIX;
+
+### initialization
+setlocale(LC_MESSAGES, "");
+textdomain("tails");
+
+### callbacks
+
+sub action_cb {
+ my $reactor = shift;
+ exec(
+ '/usr/local/bin/tails-documentation',
+ 'doc/anonymous_internet/i2p',
+ 'removal',
+ );
+ $reactor->shutdown;
+}
+
+### main
+
+my $reactor = Net::DBus::Reactor->main;
+
+my $notify = Desktop::Notify->new();
+$notify->action_callback(sub { action_cb($reactor, @_) });
+$notify->close_callback(sub { $reactor->shutdown; });
+
+my $summary = gettext("Warning: I2P will be removed in Tails 2.12");
+$notify->create(summary => $summary,
+ actions => { 'moreinfo' => gettext('Learn more'), },
+ hints => { 'transient' => 1, },
+ timeout => 0)->show();
+
+$reactor->run;
diff --git a/features/documentation.feature b/features/documentation.feature
index c636b19..f6be5ef 100644
--- a/features/documentation.feature
+++ b/features/documentation.feature
@@ -3,8 +3,5 @@ Feature: Tails documentation
Scenario: The "Report an Error" launcher will open the support documentation
Given I have started Tails from DVD without network and logged in
- And the network is plugged
- And Tor is ready
- And all notifications have disappeared
When I double-click the Report an Error launcher on the desktop
Then the support documentation page opens in Tor Browser
diff --git a/features/localization.feature b/features/localization.feature
index 2f36aa2..2697ff8 100644
--- a/features/localization.feature
+++ b/features/localization.feature
@@ -7,9 +7,7 @@ Feature: Localization
@doc
Scenario: The Report an Error launcher will open the support documentation in supported non-English locales
Given I have started Tails from DVD without network and stopped at Tails Greeter's login screen
- And the network is plugged
And I log in to a new session in German
- And Tor is ready
When I double-click the Report an Error launcher on the desktop
Then the support documentation page opens in Tor Browser
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bb58c7e..57afe71 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,6 +8,7 @@ tmp/pot/tails-32-bit-notify-user.pot
tmp/pot/tails-about.pot
tmp/pot/tails-additional-software.pot
tmp/pot/tails-htp-notify-user.pot
+tmp/pot/tails-i2p-removal-notify-user.pot
tmp/pot/tails-security-check.pot
tmp/pot/tails-spoof-mac.pot
tmp/pot/tails-upgrade-frontend-wrapper.pot
diff --git a/refresh-translations b/refresh-translations
index d0f8c94..15834fb 100755
--- a/refresh-translations
+++ b/refresh-translations
@@ -6,6 +6,7 @@ set -u
PERL_PROGS="/usr/local/bin/tails-security-check \
/usr/local/lib/tails-32-bit-notify-user \
/usr/local/lib/tails-htp-notify-user \
+ /usr/local/lib/tails-i2p-removal-notify-user \
/usr/local/lib/tails-virt-notify-user"
PYTHON_PROGS="/etc/whisperback/config.py \
/usr/local/bin/tails-about /usr/local/sbin/tails-additional-software"
diff --git a/wiki/src/doc/anonymous_internet/i2p.mdwn b/wiki/src/doc/anonymous_internet/i2p.mdwn
index fb3a4c2..6762c1f 100644
--- a/wiki/src/doc/anonymous_internet/i2p.mdwn
+++ b/wiki/src/doc/anonymous_internet/i2p.mdwn
@@ -1,5 +1,18 @@
[[!meta title="Using I2P"]]
+<a id="removal"></a>
+
+<div class="caution">
+
+<p>I2P will be removed in Tails 2.12, which is due on the
+2017-04-18. The reason for this is that we unfortunately have
+[[!tails_ticket 11276 desc="failed to find a developer to maintain I2P in Tails"]]. We
+will [[!tails_ticket 12264 desc="reintroduce I2P"]] if we find such a
+person. If you are a developer and care about I2P in Tails, that
+person could be you!</p>
+
+</div>
+
[I2P](https://geti2p.net/) is an alternative anonymity network to Tor
which supports most common Internet activities like web browsing,
email, filesharing etc. Unlike Tor, whose main focus arguably is on