Commit c85cef39 authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'devel' into feature/10658-clean-up-path

parents 62ff914f d65485f1
......@@ -80,18 +80,13 @@ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -wildcards -ef chroot/usr/share/amnesi
export MKSQUASHFS_OPTIONS
# get git branch or tag so we can set the basename appropriately, i.e.:
# * if we build from a tag: tails-$ARCH-$TAG.iso
# * if we build from a branch: tails-$ARCH-$BRANCH-$VERSION-$DATE.iso
# * if Jenkins builds from a branch: tails-$ARCH-$BRANCH-$VERSION-$TIME-$COMMIT.iso
# * if we build from a tag: tails-$ARCH-$TAG.iso
# * otherwise: tails-$ARCH-$BRANCH-$VERSION-$TIME-$COMMIT.iso
if GIT_REF="$(git symbolic-ref HEAD)"; then
GIT_BRANCH="${GIT_REF#refs/heads/}"
CLEAN_GIT_BRANCH=$(echo "$GIT_BRANCH" | sed 's,/,_,g')
if [ -n "$JENKINS_URL" ]; then
GIT_SHORT_ID="$(git rev-parse --short HEAD)"
BUILD_BASENAME="tails-${LB_ARCHITECTURE}-${CLEAN_GIT_BRANCH}-${AMNESIA_VERSION}-${AMNESIA_NOW}-${GIT_SHORT_ID}"
else
BUILD_BASENAME="tails-${LB_ARCHITECTURE}-${CLEAN_GIT_BRANCH}-${AMNESIA_VERSION}-${AMNESIA_TODAY}"
fi
GIT_SHORT_ID="$(git rev-parse --short HEAD)"
BUILD_BASENAME="tails-${LB_ARCHITECTURE}-${CLEAN_GIT_BRANCH}-${AMNESIA_VERSION}-${AMNESIA_NOW}-${GIT_SHORT_ID}"
else
GIT_CURRENT_COMMIT="$(git rev-parse HEAD)"
if GIT_TAG="$(git describe --tags --exact-match ${GIT_CURRENT_COMMIT})"; then
......
This diff is collapsed.
Package: apparmor-profiles-extra
Pin: release o=Debian Backports,n=jessie-backports
Pin-Priority: 999
Package: b43-fwcutter
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: electrum
Pin: release o=Debian Backports,n=jessie-backports
Pin-Priority: 999
Package: firmware-amd-graphics
Pin: release o=Debian,a=unstable
Pin-Priority: 999
......@@ -130,6 +138,10 @@ Package: obfs4proxy
Pin: release o=TorProject,n=obfs4proxy
Pin-Priority: 990
Package: python-electrum
Pin: release o=Debian Backports,n=jessie-backports
Pin-Priority: 999
Package: ttdnsd
Pin: release o=TorProject,a=unstable
Pin-Priority: 999
......
......@@ -4,12 +4,13 @@ set -e
echo "Checking for .orig files"
DOT_ORIG_WHITELIST=<<EOF
DOT_ORIG_WHITELIST=$(cat <<EOF
/bin/hostname.orig
/etc/resolv.conf.orig
/lib/systemd/system/alsa-utils.service.orig
/sbin/start-stop-daemon.orig
EOF
)
DOT_ORIG_FILES=$(find / -type f -name *.orig | grep -v -F "$DOT_ORIG_WHITELIST" || :)
......
......@@ -8,8 +8,12 @@ if [ $1 = "lo" ]; then
exit 0
fi
# Run whenever an interface gets "up", not otherwise:
if [ $2 != "up" ]; then
if [ $2 = "up" ]; then
: # go on, that's what this script is for
elif [ "${2}" = "down" ]; then
systemctl --no-block stop tails-tor-has-bootstrapped.target
exit 0
else
exit 0
fi
......@@ -26,6 +30,10 @@ systemctl stop tor@default.service
# tordate/20-time.sh), so deleting it seems like a Good Thing(TM).
rm -f "${TOR_LOG}"
# Let the rest of the system know that Tor is not working at the moment.
# This matters e.g. if we have already bootstrapped.
systemctl --no-block restart tails-tor-has-bootstrapped.target
# The Tor syscall sandbox is not compatible with managed proxies.
# We could possibly detect whether the user has configured any such
# thing via Tor Launcher later (e.g. in 60-tor-ready.sh),
......
......@@ -86,4 +86,4 @@ hinting = 'slight'
[org/gnome/shell]
enabled-extensions = ['alternative-status-menu@gnome-shell-extensions.gcampax.github.com', 'topIcons@adel.gadllah@gmail.com', 'shutdown-helper@tails.boum.org']
favorite-apps=['tor-browser.desktop', 'claws-mail.desktop', 'pidgin.desktop', 'keepassx.desktop', 'gnome-terminal.desktop']
favorite-apps=['tor-browser.desktop', 'icedove.desktop', 'pidgin.desktop', 'keepassx.desktop', 'gnome-terminal.desktop']
{
'protocol': 's',
'auto_cycle': True,
'server': 'electrum.coinwallet.me:50002:s',
'proxy': {'host': 'localhost', 'mode': 'socks5', 'port': '9050'},
"proxy": "socks5:localhost:9050",
}
user_pref("extensions.enigmail.configuredVersion", "1.7.2");
user_pref("extensions.enigmail.configuredVersion", "1.8.2");
......@@ -27,7 +27,7 @@ pref("app.update.enabled", false);
// Adblock Plus preferences
pref("extensions.adblockplus.correctTypos", false);
pref("extensions.adblockplus.currentVersion", "2.1");
pref("extensions.adblockplus.currentVersion", "2.6.6");
pref("extensions.adblockplus.savestats", false);
pref("extensions.adblockplus.showinaddonbar", false);
pref("extensions.adblockplus.showintoolbar", false);
......
[Service]
# obfs4proxy can't start otherwise
NoNewPrivileges=no
[Service]
# Tor Launcher needs to make Tor modify its configuration
ProtectSystem=yes
ReadWriteDirectories=-/etc/tor
#!/bin/sh
set -e
set -u
. gettext.sh
TEXTDOMAIN="tails"
export TEXTDOMAIN
CLAWSMAIL_DIR="${HOME}/.claws-mail"
PROFILE="${HOME}/.icedove/profile.default"
claws_mail_config_is_persistent() {
[ "$(findmnt --noheadings --output SOURCE --target "${CLAWSMAIL_DIR}")" = "/dev/mapper/TailsData_unlocked[/claws-mail]" ]
}
warn_about_claws_mail_persistence() {
local dialog_msg="<b><big>`gettext \"The <b>Claws Mail</b> persistence feature is activated.\"`</big></b>
`gettext \"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your data</a> before starting <b>Icedove</b>.\"`"
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
}
start_icedove() {
# Give Icedove its own temp directory, similar rationale to a1fd1f0f & #9558.
TMPDIR="${PROFILE}/tmp"
......@@ -16,4 +40,8 @@ start_icedove() {
/usr/bin/icedove --class "Icedove" -profile "${PROFILE}" "${@}"
}
if claws_mail_config_is_persistent && [ -f "${CLAWSMAIL_DIR}/accountrc" ]; then
warn_about_claws_mail_persistence || exit 0
fi
start_icedove "${@}"
......@@ -23,9 +23,8 @@ stop_and_disable_NM() {
NetworkManager.service; do
systemctl stop "${s}"
systemctl disable "${s}"
ln -s /dev/null "/etc/systemd/system/${s}"
systemctl mask "${s}"
done
systemctl daemon-reload
log "Networking disabled"
}
......
......@@ -18,6 +18,12 @@ clear_tor_log() {
rm -f /var/log/tor/log
}
vidalia_was_running=no
if pgrep "\<vidalia\>" >/dev/null 2>&1; then
vidalia_was_running=yes
killall -SIGKILL vidalia
fi
clear_tor_log
systemctl restart tor@default.service
......@@ -54,14 +60,6 @@ maybe_restart_tor() {
try_for 270 maybe_restart_tor
if pgrep "\<vidalia\>" >/dev/null; then
killall -SIGKILL vidalia
# Since Tor just restarted we wait for a while until the
# ControlPort hopefully is up.
counter=0
until [ "${counter}" -ge 10 ] || nc -z localhost 9051 2>/dev/null; do
sleep 1
counter=$((${counter}+1))
done
if [ "${vidalia_was_running}" = yes ]; then
restart-vidalia
fi
......@@ -10,10 +10,9 @@ tweak_sysctl() {
echo 3 > /proc/sys/kernel/printk
echo 3 > /proc/sys/vm/drop_caches
echo 256 > /proc/sys/vm/min_free_kbytes
echo 1 > /proc/sys/vm/overcommit_memory
echo 1 > /proc/sys/vm/oom_kill_allocating_task
echo 0 > /proc/sys/vm/overcommit_memory
echo 0 > /proc/sys/vm/oom_kill_allocating_task
echo 0 > /proc/sys/vm/oom_dump_tasks
}
......@@ -29,8 +28,14 @@ if [ -n "${sdmem}" ] ; then
if [ -z "${sdmemopts}" ] ; then
sdmemopts="v"
fi
for i in $(seq 0 30) ; do /usr/bin/sdmem "-${sdmemopts}" & done
# Wait for sdmem jobs to complete.
# We run one instance of sdmem per 2 GiB of RAM to deal with the
# x86 per-process memory limitation.
mem=$(free | awk '/Mem:/ { print $2 }')
instances=$((${mem}/(2*1024*1024)+1))
for i in $(seq 1 "${instances}") ; do
( /usr/bin/sdmem "-${sdmemopts}" ; killall sdmem >/dev/null 2>&1 ) &
done
# Wait for sdmem jobs to finish.
wait
fi
......
http://torbrowser-archive.tails.boum.org/5.0.4/
http://torbrowser-archive.tails.boum.org/5.0.6/
c4d38b8a0d42f19f4883f2ecc58bcc0ae2f1abe6d707442821ddc2de844fc0a6 tor-browser-linux32-5.0.4_ar.tar.xz
ff441589c7a01f051092430405fdd1bccb61f6dcc0a3191018c427297acc30a9 tor-browser-linux32-5.0.4_de.tar.xz
3d0fd640693c91ddc9ffce744695b9a46e4cfc4b4aecd5d57b9044c1fa335c0f tor-browser-linux32-5.0.4_en-US.tar.xz
e70fd621f9fcec94b1c015d041031e73df2f0c84eba024a26adb39168ee50ad1 tor-browser-linux32-5.0.4_es-ES.tar.xz
4dd0ed35bcafde800fc0f87ec3d7b66b74d743e4fe95693d880efce1cf4d7611 tor-browser-linux32-5.0.4_fa.tar.xz
5402d358075782db6419bd7af014e158a06926be216a6ac603dbec3074828dbe tor-browser-linux32-5.0.4_fr.tar.xz
6d274dcc6ae4ee7b3da062fb1ad3266efb50f917e75f18d9c48b4c1431a84f9d tor-browser-linux32-5.0.4_it.tar.xz
69a5f26328a4ae43d2132434700d422583919068e2da9863dc14355ff78bc8da tor-browser-linux32-5.0.4_ko.tar.xz
a666205eccb8f745ed1ce5d80df5a61c2c9f555e807c37f018294caef52d0a99 tor-browser-linux32-5.0.4_nl.tar.xz
a5b8e423b28742f7c0bf8eb94739131820eec4a54a1b42ea3ed346a8ce3603b4 tor-browser-linux32-5.0.4_pl.tar.xz
19c65d9c8ec0cb56c3afa7d97a076a0f7b891503e77c484381e0c03bd69e3307 tor-browser-linux32-5.0.4_pt-PT.tar.xz
c635438b8dbaef18da891f6b298f61a31babe6925a0e208fae390b9d995498d6 tor-browser-linux32-5.0.4_ru.tar.xz
c3597cbfdfb625f3f9135b629b8713cb9fcdfd49a93bffbfe5d5aa0cd3cb2775 tor-browser-linux32-5.0.4_tr.tar.xz
adb8bc1db36490e07c0302e22bf0a5252dbda44d107c214e6205bd5bdce31560 tor-browser-linux32-5.0.4_vi.tar.xz
aff2788ef059cef86c12cfa0a83e5857cb38b876d4d05a9915a05f0f03130d92 tor-browser-linux32-5.0.4_zh-CN.tar.xz
935f0b1ccda7752b05101ca05304e0e0932d7f420e75949b329e148254149ef1 tor-browser-linux32-5.0.6_ar.tar.xz
a9939b9f23c1246408173924432dc7ad19815659c4f30b34d4dcc6d15fc98b0d tor-browser-linux32-5.0.6_de.tar.xz
d06b0a05a5491a7a519ffacf7c775bcce36f61ab26262915d13dc8de4372b5e0 tor-browser-linux32-5.0.6_en-US.tar.xz
1f282b088b959faf7b9af06ca101ac2aed206bb0d554f1a0442c56bf9295711f tor-browser-linux32-5.0.6_es-ES.tar.xz
1533301f5c9b87becbae09c709671f56a078ea17a0e81c6e00b737d5ec9542c0 tor-browser-linux32-5.0.6_fa.tar.xz
00b86427270b81990fa849205c8b78ca0b4bc257d2b48b76d4abc6e53b42ae00 tor-browser-linux32-5.0.6_fr.tar.xz
31fcba4c8d3224f74db282350aa5663683bd0b1e93be4cced46bc2bcba15ef97 tor-browser-linux32-5.0.6_it.tar.xz
ec5448c96b2dd6e5ee489f910473cbf42580bffdc6711bbbcc7caa21ba4a5410 tor-browser-linux32-5.0.6_ko.tar.xz
03927f9cb12a8aeb25aaa74e7285bb3c587ade3250c7b9e11e4dd7d56374024c tor-browser-linux32-5.0.6_nl.tar.xz
980bb8414285acb49aedcc50471478742e8eb842b94f7009344d4a23abd04021 tor-browser-linux32-5.0.6_pl.tar.xz
8d5e6bf621be343ca7fd097e6b0dcd5669d206c7820baca3803639cd22061abb tor-browser-linux32-5.0.6_pt-PT.tar.xz
8bdec5227204f7dcbcc8312d80090f1524e0e33b51fbdac3f2eb30ae47397071 tor-browser-linux32-5.0.6_ru.tar.xz
60162e0ec72e4d2b93b727f064b55d11d24d1fc3afc429a6b11bf37cc4459c85 tor-browser-linux32-5.0.6_tr.tar.xz
39e7a0e2281a9277d7a65303b1c60589bae58cd268276cefd247ed879781346f tor-browser-linux32-5.0.6_vi.tar.xz
ceb2366a13eb3916efdfda883d12762e9c7f6caeba41f05078730f132c6efa16 tor-browser-linux32-5.0.6_zh-CN.tar.xz
--- a/etc/apparmor.d/usr.bin.pidgin 2015-06-04 12:37:02.453412928 +0000
+++ b/etc/apparmor.d/usr.bin.pidgin 2015-06-04 12:37:40.309205204 +0000
@@ -11,7 +11,7 @@
#include <abstractions/enchant>
@@ -13,7 +13,7 @@
#include <abstractions/gnome>
#include <abstractions/gstreamer>
#include <abstractions/ibus>
- #include <abstractions/launchpad-integration>
+ # #include <abstractions/launchpad-integration>
#include <abstractions/nameservice>
#include <abstractions/private-files-strict>
#include <abstractions/ssl_certs>
@@ -44,6 +44,7 @@
@@ -68,6 +68,7 @@
/usr/bin/gvfs-open rmix,
/usr/bin/pidgin r,
/usr/bin/xdg-open rmix,
+ /usr/local/bin/tor-browser rmUx,
/usr/share/gnome/applications/ r,
/usr/share/glib-2.0/schemas/gschemas.compiled r,
/etc/purple/prefs.xml r,
Supports Markdown
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