Commit 45fe6558 authored by segfault's avatar segfault

Merge branch 'stable' into bugfix/15794-feedback-on-failure-to-lock

parents 35ba0ec6 23863ff2

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

...@@ -2,7 +2,10 @@ ...@@ -2,7 +2,10 @@
*.mo~ *.mo~
*.po~ *.po~
*.pot~ *.pot~
*.pyc
*.swp *.swp
**/__pycache__
**/.mypy_cache
/*.apt-sources /*.apt-sources
/*.build-manifest /*.build-manifest
/*.buildlog /*.buildlog
......
#!/bin/sh
#
# Copy this hook to .git/hooks/pre-commit
# Called by "git commit" with no arguments. The hook should
# exit with non-zero status after issuing an appropriate message if
# it wants to stop the commit.
set -e
set -u
path=$(git rev-parse --show-toplevel)
# If we try to commit po files, check that they do not contain errors.
if ! "${path}/submodules/jenkins-tools/slaves/lint_po" --cached; then
echo
echo "The po files you're trying to commit contain errors. Please fix them and try again."
echo
exit 1
fi
This diff is collapsed.
...@@ -76,11 +76,6 @@ Package: linux-compiler-* linux-headers-* linux-image-* linux-kbuild-* linux-sou ...@@ -76,11 +76,6 @@ Package: linux-compiler-* linux-headers-* linux-image-* linux-kbuild-* linux-sou
Pin: release o=Debian,n=sid Pin: release o=Debian,n=sid
Pin-Priority: 999 Pin-Priority: 999
Explanation: We ship our custom-built Thunderbird for now, see #6156
Package: thunderbird* calendar-google-provider
Pin: origin deb.tails.boum.org
Pin-Priority: 999
Explanation: src:libdrm Explanation: src:libdrm
Package: libdrm* Package: libdrm*
Pin: release o=Debian,n=stretch-backports Pin: release o=Debian,n=stretch-backports
......
...@@ -13,7 +13,7 @@ echo "Install the Tor Browser" ...@@ -13,7 +13,7 @@ echo "Install the Tor Browser"
# a new browser profile we can simply copy the profile directory # a new browser profile we can simply copy the profile directory
# without duplicating all extensions. # without duplicating all extensions.
. /usr/local/lib/tails-shell-library/tor-browser.sh . /usr/local/lib/tails-shell-library/tor-browser.sh
# Import install_fake_package # Import install_fake_package and strip_nondeterminism_wrapper
. /usr/local/lib/tails-shell-library/build.sh . /usr/local/lib/tails-shell-library/build.sh
download_and_verify_files() { download_and_verify_files() {
...@@ -280,7 +280,7 @@ create_default_profile() { ...@@ -280,7 +280,7 @@ create_default_profile() {
tbb_extensions_dir="${2}" tbb_extensions_dir="${2}"
destination="${3}" destination="${3}"
rsync -a --exclude bookmarks.html --exclude extensions \ rsync -a --exclude extensions \
"${tbb_profile}"/ "${destination}"/ "${tbb_profile}"/ "${destination}"/
mkdir -p "${destination}"/extensions mkdir -p "${destination}"/extensions
......
...@@ -11,14 +11,9 @@ echo "Localize each supported browser locale" ...@@ -11,14 +11,9 @@ echo "Localize each supported browser locale"
# Import language_code_from_locale() # Import language_code_from_locale()
. /usr/local/lib/tails-shell-library/localization.sh . /usr/local/lib/tails-shell-library/localization.sh
# Import strip_nondeterminism_wrapper() and ensure_hook_dependency_is_installed()
. /usr/local/lib/tails-shell-library/build.sh
# Import TAILS_WIKI_SUPPORTED_LANGUAGES # Import TAILS_WIKI_SUPPORTED_LANGUAGES
. /etc/amnesia/environment . /etc/amnesia/environment
ensure_hook_dependency_is_installed p7zip imagemagick
BROWSER_LOCALIZATION_DIR="/usr/share/tails/browser-localization" BROWSER_LOCALIZATION_DIR="/usr/share/tails/browser-localization"
DESCRIPTIONS_FILE="${BROWSER_LOCALIZATION_DIR}/descriptions" DESCRIPTIONS_FILE="${BROWSER_LOCALIZATION_DIR}/descriptions"
LOCALE_PROFILES_DIR="/etc/tor-browser/locale-profiles/" LOCALE_PROFILES_DIR="/etc/tor-browser/locale-profiles/"
...@@ -83,7 +78,7 @@ while IFS=: read MOZILLA_LOCALE LOCATION; do ...@@ -83,7 +78,7 @@ while IFS=: read MOZILLA_LOCALE LOCATION; do
HOMEPAGE="https://tails.boum.org/home/" HOMEPAGE="https://tails.boum.org/home/"
. /etc/os-release # get $TAILS_CHANNEL and $TAILS_DISTRIBUTION . /etc/os-release # get $TAILS_CHANNEL and $TAILS_DISTRIBUTION
if [ "${TAILS_DISTRIBUTION}" = UNRELEASED ] \ if [ "${TAILS_DISTRIBUTION}" = UNRELEASED ] \
|| [ "${TAILS_CHANNEL}" = alpha ]; then || [ "${TAILS_CHANNEL:-stable}" != stable ]; then
HOMEPAGE="${HOMEPAGE}testing/" HOMEPAGE="${HOMEPAGE}testing/"
fi fi
if echo "${TAILS_WIKI_SUPPORTED_LANGUAGES}" | grep -qw "${LANG_CODE}"; then if echo "${TAILS_WIKI_SUPPORTED_LANGUAGES}" | grep -qw "${LANG_CODE}"; then
......
#!/bin/sh
set -e
set -u
echo "Patching the Thunderbird account setup wizard"
# Import strip_nondeterminism_wrapper
. /usr/local/lib/tails-shell-library/build.sh
OMNI_JA=/usr/share/thunderbird/omni.ja
/usr/share/tails/build/patch-thunderbird \
"$OMNI_JA" \
/usr/share/tails/build/thunderbird-patches
strip_nondeterminism_wrapper \
--type zip \
--timestamp "$SOURCE_DATE_EPOCH" \
"$OMNI_JA" 2>/dev/null
...@@ -39,6 +39,8 @@ for modules_dir in /lib/modules/*/extra ; do ...@@ -39,6 +39,8 @@ for modules_dir in /lib/modules/*/extra ; do
fi fi
done done
strip --strip-debug /lib/modules/*/extra/aufs.ko
depmod "${KERNEL_VERSION}-${arch}" depmod "${KERNEL_VERSION}-${arch}"
rm -r /usr/src/aufs4-standalone rm -r /usr/src/aufs4-standalone
rm -r "/usr/src/linux-source-${KERNEL_SOURCE_VERSION}" rm -r "/usr/src/linux-source-${KERNEL_SOURCE_VERSION}"
...@@ -4,18 +4,9 @@ set -e ...@@ -4,18 +4,9 @@ set -e
echo "Set up Tor Browser bookmarks" echo "Set up Tor Browser bookmarks"
# Import ensure_hook_dependency_is_installed()
. /usr/local/lib/tails-shell-library/build.sh
ensure_hook_dependency_is_installed sqlite3
# Create a symlink to places.sqlite in browser profile from a # Create a symlink to places.sqlite in browser profile from a
# dedicated "bookmarks" directory, so that it can be easily made # dedicated "bookmarks" directory, so that it can be easily made
# persistent # persistent
mkdir -p /etc/skel/.mozilla/firefox/bookmarks
ln -s /home/amnesia/.mozilla/firefox/bookmarks/places.sqlite \ ln -s /home/amnesia/.mozilla/firefox/bookmarks/places.sqlite \
/etc/skel/.tor-browser/profile.default/places.sqlite /etc/skel/.tor-browser/profile.default/places.sqlite
# Create the bookmarks database
sqlite3 /etc/skel/.mozilla/firefox/bookmarks/places.sqlite \
< /etc/skel/.mozilla/firefox/bookmarks/places.sqlite.in
rm /etc/skel/.mozilla/firefox/bookmarks/places.sqlite.in
PRAGMA foreign_keys=OFF;
PRAGMA user_version=35;
BEGIN TRANSACTION;
CREATE TABLE moz_places ( id INTEGER PRIMARY KEY, url LONGVARCHAR, title LONGVARCHAR, rev_host LONGVARCHAR, visit_count INTEGER DEFAULT 0, hidden INTEGER DEFAULT 0 NOT NULL, typed INTEGER DEFAULT 0 NOT NULL, favicon_id INTEGER, frecency INTEGER DEFAULT -1 NOT NULL, last_visit_date INTEGER , guid TEXT, foreign_count INTEGER DEFAULT 0 NOT NULL, url_hash INTEGER DEFAULT 0 NOT NULL );
INSERT INTO "moz_places" VALUES(1,'https://tails.boum.org/',NULL,'gro.muob.sliat.',0,0,0,NULL,140,NULL,NULL,1,0);
INSERT INTO "moz_places" VALUES(2,'file:///usr/share/doc/tails/website/index.en.html',NULL,'.',0,0,0,NULL,140,NULL,NULL,1,0);
INSERT INTO "moz_places" VALUES(3,'https://webmail.no-log.org/',NULL,'gro.gol-on.liambew.',0,0,0,NULL,140,NULL,NULL,1,0);
INSERT INTO "moz_places" VALUES(4,'https://mail.riseup.net/',NULL,'ten.puesir.liam.',0,0,0,NULL,140,NULL,NULL,1,0);
INSERT INTO "moz_places" VALUES(5,'https://webmail.boum.org/',NULL,'gro.muob.liambew.',0,0,0,NULL,140,NULL,NULL,1,0);
INSERT INTO "moz_places" VALUES(6,'https://check.torproject.org/',NULL,'gro.tcejorprot.kcehc.',0,0,0,NULL,140,NULL,NULL,1,0);
INSERT INTO "moz_places" VALUES(7,'https://www.torproject.org/',NULL,'gro.tcejorprot.www.',0,0,0,NULL,140,NULL,NULL,1,0);
INSERT INTO "moz_places" VALUES(8,'https://tor.stackexchange.com/',NULL,'moc.egnahcxekcats.rot.',0,0,0,NULL,140,NULL,NULL,1,0);
INSERT INTO "moz_places" VALUES(9,'place:sort=8&maxResults=10',NULL,'.',0,0,0,NULL,0,NULL,NULL,1,0);
INSERT INTO "moz_places" VALUES(10,'place:type=6&sort=14&maxResults=10',NULL,'.',0,0,0,NULL,0,NULL,NULL,1,0);
CREATE TABLE moz_historyvisits ( id INTEGER PRIMARY KEY, from_visit INTEGER, place_id INTEGER, visit_date INTEGER, visit_type INTEGER, session INTEGER);
CREATE TABLE moz_inputhistory ( place_id INTEGER NOT NULL, input LONGVARCHAR NOT NULL, use_count INTEGER, PRIMARY KEY (place_id, input));
CREATE TABLE moz_hosts ( id INTEGER PRIMARY KEY, host TEXT NOT NULL UNIQUE, frecency INTEGER, typed INTEGER NOT NULL DEFAULT 0, prefix TEXT);
INSERT INTO "moz_hosts" VALUES(1,'tails.boum.org',140,0,NULL);
INSERT INTO "moz_hosts" VALUES(2,'webmail.no-log.org',140,0,NULL);
INSERT INTO "moz_hosts" VALUES(3,'mail.riseup.net',140,0,NULL);
INSERT INTO "moz_hosts" VALUES(4,'webmail.boum.org',140,0,NULL);
INSERT INTO "moz_hosts" VALUES(5,'check.torproject.org',140,0,NULL);
INSERT INTO "moz_hosts" VALUES(6,'torproject.org',140,0,NULL);
INSERT INTO "moz_hosts" VALUES(7,'tor.stackexchange.com',140,0,NULL);
CREATE TABLE moz_bookmarks ( id INTEGER PRIMARY KEY, type INTEGER, fk INTEGER DEFAULT NULL, parent INTEGER, position INTEGER, title LONGVARCHAR, keyword_id INTEGER, folder_type TEXT, dateAdded INTEGER, lastModified INTEGER, guid TEXT);
INSERT INTO "moz_bookmarks" VALUES(1,2,NULL,0,0,'',NULL,NULL,0,0,'root________');
INSERT INTO "moz_bookmarks" VALUES(2,2,NULL,1,0,'Bookmarks Menu',NULL,NULL,0,0,'menu________');
INSERT INTO "moz_bookmarks" VALUES(3,2,NULL,1,1,'Bookmarks Toolbar',NULL,NULL,0,0,'toolbar_____');
INSERT INTO "moz_bookmarks" VALUES(4,2,NULL,1,2,'Tags',NULL,NULL,0,0,'tags________');
INSERT INTO "moz_bookmarks" VALUES(5,2,NULL,1,3,'Other Bookmarks',NULL,NULL,0,0,'unfiled_____');
INSERT INTO "moz_bookmarks" VALUES(6,2,NULL,1,4,'mobile',NULL,NULL,0,0,'mobile______');
INSERT INTO "moz_bookmarks" VALUES(7,1,1,2,4,'Tails',NULL,NULL,0,0,NULL);
INSERT INTO "moz_bookmarks" VALUES(8,1,2,2,5,'Tails documentation (offline)',NULL,NULL,0,0,NULL);
INSERT INTO "moz_bookmarks" VALUES(9,2,NULL,2,2,'Webmail',NULL,NULL,0,0,NULL);
INSERT INTO "moz_bookmarks" VALUES(10,1,3,9,0,'no-log.org',NULL,NULL,0,0,NULL);
INSERT INTO "moz_bookmarks" VALUES(11,1,4,9,1,'riseup.net',NULL,NULL,0,0,NULL);
INSERT INTO "moz_bookmarks" VALUES(12,1,5,9,2,'boum.org',NULL,NULL,0,0,NULL);
INSERT INTO "moz_bookmarks" VALUES(13,2,NULL,2,3,'Tor',NULL,NULL,0,0,NULL);
INSERT INTO "moz_bookmarks" VALUES(14,1,6,13,0,'Tor Check',NULL,NULL,0,0,NULL);
INSERT INTO "moz_bookmarks" VALUES(15,1,7,13,1,'Tor Project',NULL,NULL,0,0,NULL);
INSERT INTO "moz_bookmarks" VALUES(16,1,8,13,2,'Tor Stack Exchange',NULL,NULL,0,0,NULL);
INSERT INTO "moz_bookmarks" VALUES(17,1,9,3,0,'Most Visited',NULL,NULL,0,0,NULL);
INSERT INTO "moz_bookmarks" VALUES(18,1,10,2,0,'Recent Tags',NULL,NULL,0,0,NULL);