summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-includes/usr/local/bin
diff options
context:
space:
mode:
Diffstat (limited to 'config/chroot_local-includes/usr/local/bin')
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/connect-socks2
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/electrum35
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/git2
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/gpgApplet4
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/tails-add-bookmark-for-persistent-directory7
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/tails-security-check8
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/tails-virt-notify-user2
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/totem2
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/wget8
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/whois2
10 files changed, 59 insertions, 13 deletions
diff --git a/config/chroot_local-includes/usr/local/bin/connect-socks b/config/chroot_local-includes/usr/local/bin/connect-socks
index fc39517..663e8fa 100755
--- a/config/chroot_local-includes/usr/local/bin/connect-socks
+++ b/config/chroot_local-includes/usr/local/bin/connect-socks
@@ -1,4 +1,4 @@
#!/bin/sh
SOCKS5_USER="${SOCKS5_USER:-}" \
SOCKS5_PASSWORD="${SOCKS5_PASSWORD:-}" \
- connect-proxy -s $*
+ connect-proxy -s "$@"
diff --git a/config/chroot_local-includes/usr/local/bin/electrum b/config/chroot_local-includes/usr/local/bin/electrum
new file mode 100755
index 0000000..a0299c4
--- /dev/null
+++ b/config/chroot_local-includes/usr/local/bin/electrum
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+. gettext.sh
+TEXTDOMAIN="tails"
+export TEXTDOMAIN
+
+CONF_DIR="${HOME}"/.electrum
+
+electrum_config_is_persistent() {
+ [ "$(findmnt --noheadings --output SOURCE --target "${CONF_DIR}")" = "/dev/mapper/TailsData_unlocked[/electrum]" ]
+}
+
+verify_start () {
+ local dialog_msg="<b><big>`gettext \"Persistence is disabled for Electrum\"`</big></b>
+
+`gettext \"When you reboot Tails, all of Electrum's data will be lost, including your Bitcoin wallet. It is strongly recommended to only run Electrum when its persistence feature is activated.\"`
+
+`gettext \"Do you want to start Electrum anyway?\"`
+"
+ local launch="`gettext \"_Launch\"`"
+ local exit="`gettext \"_Exit\"`"
+ # Since zenity can't set the default button to cancel, we switch the
+ # labels and interpret the return value as its negation.
+ if zenity --question --title "" --ok-label "${exit}" \
+ --cancel-label "${launch}" --text "${dialog_msg}"; then
+ return 1
+ fi
+}
+
+if ! electrum_config_is_persistent; then
+ verify_start || exit 0
+fi
+
+exec /usr/bin/electrum "${@}"
+
diff --git a/config/chroot_local-includes/usr/local/bin/git b/config/chroot_local-includes/usr/local/bin/git
new file mode 100755
index 0000000..3e8a790
--- /dev/null
+++ b/config/chroot_local-includes/usr/local/bin/git
@@ -0,0 +1,2 @@
+#!/bin/sh
+TSOCKS_CONF_FILE=/etc/tor/tor-tsocks-git.conf exec /usr/bin/tsocks.distrib /usr/bin/git "$@"
diff --git a/config/chroot_local-includes/usr/local/bin/gpgApplet b/config/chroot_local-includes/usr/local/bin/gpgApplet
index c8b6cfd..4777738 100755
--- a/config/chroot_local-includes/usr/local/bin/gpgApplet
+++ b/config/chroot_local-includes/usr/local/bin/gpgApplet
@@ -151,9 +151,9 @@ b) the "Artistic License" which comes with Perl.
'wrap-license' => 1,
'website' => 'https://tails.boum.org/',
)});
- $menu->append($mexit);
- $menu->append(Gtk2::SeparatorMenuItem->new);
$menu->append($mabout);
+ $menu->append(Gtk2::SeparatorMenuItem->new);
+ $menu->append($mexit);
$icon->signal_connect('popup-menu', sub {
my $ticon = shift;
diff --git a/config/chroot_local-includes/usr/local/bin/tails-add-bookmark-for-persistent-directory b/config/chroot_local-includes/usr/local/bin/tails-add-bookmark-for-persistent-directory
deleted file mode 100755
index c652f76..0000000
--- a/config/chroot_local-includes/usr/local/bin/tails-add-bookmark-for-persistent-directory
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-PERSISTENT_DIRECTORY="${HOME}/Persistent"
-
-if mountpoint -q "$PERSISTENT_DIRECTORY" 2>/dev/null ; then
- echo "file://$PERSISTENT_DIRECTORY" >> "${HOME}/.gtk-bookmarks"
-fi
diff --git a/config/chroot_local-includes/usr/local/bin/tails-security-check b/config/chroot_local-includes/usr/local/bin/tails-security-check
index 6611623..2d80e5e 100755
--- a/config/chroot_local-includes/usr/local/bin/tails-security-check
+++ b/config/chroot_local-includes/usr/local/bin/tails-security-check
@@ -46,9 +46,15 @@ use XML::Atom::Feed;
use IO::Socket::SSL;
use Net::SSLeay;
BEGIN {
+ my $cafile = $ENV{HTTPS_CA_FILE};
+ $cafile //= '/usr/local/etc/ssl/certs/tails.boum.org-CA.pem';
+ assert(-e $cafile);
+ assert(-f $cafile);
+ assert(-r $cafile);
+ assert(-s $cafile);
IO::Socket::SSL::set_ctx_defaults(
verify_mode => Net::SSLeay->VERIFY_PEER(),
- ca_file => '/etc/ssl/certs/UTN_USERFirst_Hardware_Root_CA.pem',
+ ca_file => $cafile,
);
}
use LWP::UserAgent; # needs to be *after* IO::Socket::SSL's initialization
diff --git a/config/chroot_local-includes/usr/local/bin/tails-virt-notify-user b/config/chroot_local-includes/usr/local/bin/tails-virt-notify-user
index 32f4fc7..ef61683 100755
--- a/config/chroot_local-includes/usr/local/bin/tails-virt-notify-user
+++ b/config/chroot_local-includes/usr/local/bin/tails-virt-notify-user
@@ -54,7 +54,7 @@ my $summary = gettext("Warning: virtual machine detected!");
my $body =
gettext("Both the host operating system and the virtualization software are able to monitor what you are doing in Tails.")
. " "
- . gettext("<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Learn more...</a>")
+ . gettext("<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Learn more...</a>")
. " "; # Workaround: else the last line of the notification is not displayed
$notify->create(summary => $summary,
diff --git a/config/chroot_local-includes/usr/local/bin/totem b/config/chroot_local-includes/usr/local/bin/totem
new file mode 100755
index 0000000..cb72b21
--- /dev/null
+++ b/config/chroot_local-includes/usr/local/bin/totem
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec torsocks /usr/bin/totem "$@"
diff --git a/config/chroot_local-includes/usr/local/bin/wget b/config/chroot_local-includes/usr/local/bin/wget
new file mode 100755
index 0000000..0d94b53
--- /dev/null
+++ b/config/chroot_local-includes/usr/local/bin/wget
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+unset http_proxy
+unset HTTP_PROXY
+unset https_proxy
+unset HTTPS_PROXY
+
+exec torsocks /usr/bin/wget "$@"
diff --git a/config/chroot_local-includes/usr/local/bin/whois b/config/chroot_local-includes/usr/local/bin/whois
index f125f17..0bfe673 100755
--- a/config/chroot_local-includes/usr/local/bin/whois
+++ b/config/chroot_local-includes/usr/local/bin/whois
@@ -1,2 +1,2 @@
#!/bin/sh
-exec torify /usr/bin/whois $*
+exec torsocks /usr/bin/whois "$@"