Commit 97e14beb authored by intrigeri's avatar intrigeri
Browse files

Merge remote-tracking branch 'origin/devel' into feature/15309-linux-4.15

… and thus convert the changes introduced by feature/15309-linux-4.15
to ensure_hook_dependency_is_installed.
parents 05220a47 41daf2ff
......@@ -11,12 +11,14 @@ echo "Localize each supported browser locale"
# Import language_code_from_locale()
. /usr/local/lib/tails-shell-library/localization.sh
# Import strip_nondeterminism_wrapper()
# Import strip_nondeterminism_wrapper() and ensure_hook_dependency_is_installed()
. /usr/local/lib/tails-shell-library/build.sh
# Import TAILS_WIKI_SUPPORTED_LANGUAGES
. /etc/amnesia/environment
ensure_hook_dependency_is_installed p7zip imagemagick
TBB_LOCALIZED_SEARCHPLUGINS_DIR="${TBB_INSTALL}/distribution/searchplugins/locale/"
BROWSER_LOCALIZATION_DIR="/usr/share/tails/browser-localization"
DESCRIPTIONS_FILE="${BROWSER_LOCALIZATION_DIR}/descriptions"
......
......@@ -4,7 +4,10 @@ set -e
echo "Converting uBlock database dump into sqlite blob"
apt-get install --yes sqlite3
# Import ensure_hook_dependency_is_installed()
. /usr/local/lib/tails-shell-library/build.sh
ensure_hook_dependency_is_installed sqlite3
DUMP="/usr/share/tails/ublock-origin/ublock0.dump"
DATABASE="/etc/tor-browser/profile/extension-data/ublock0.sqlite"
......@@ -18,5 +21,3 @@ mkdir -p "$(dirname "${DATABASE}")"
sed ':a;N;$!ba;s_\r\n__g' "${DUMP}" | sqlite3 "${DATABASE}"
echo "Created uBlock sqlite blob successfully"
apt-get purge --yes sqlite3
......@@ -8,13 +8,14 @@ echo "Setting up a build environment for kernel modules"
. /usr/share/amnesia/build/variables
# Import install_fake_package
. /usr/local/lib/tails-shell-library/build.sh
# Import ensure_hook_dependency_is_installed() and
# install_fake_package()
/usr/local/lib/tails-shell-library/build.sh
# Install gcc-6 and fake linux-compiler-gcc-7-x86
# (linux-headers-4.14+ depends on it, but Stretch hasn't GCC 7)
# XXX:Buster: remove this hack.
apt-get install --yes gcc-6
ensure_hook_dependency_is_installed gcc-6
NEWEST_INSTALLED_KERNEL_VERSION="$(
dpkg-query --showformat '${Version}\n' --show 'linux-image-*-amd64' \
| sort --version-sort | tail -n1
......@@ -24,9 +25,9 @@ install_fake_package \
"${NEWEST_INSTALLED_KERNEL_VERSION}~0tails1"
ln -s /usr/bin/gcc-6 /usr/bin/gcc-7
apt-get install --yes \
ensure_hook_dependency_is_installed \
build-essential \
libelf-dev
apt-get install --yes \
ensure_hook_dependency_is_installed \
"linux-headers-${KERNEL_VERSION}-amd64"
......@@ -7,7 +7,10 @@ echo "Building the aufs module"
. /usr/share/amnesia/build/variables
apt-get install --yes \
# Import ensure_hook_dependency_is_installed()
. /usr/local/lib/tails-shell-library/build.sh
ensure_hook_dependency_is_installed \
"linux-source-${KERNEL_SOURCE_VERSION}"
# aufs build needs fs/mount.h, which is in linux-source-* but not
......
......@@ -4,6 +4,11 @@ set -e
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
# dedicated "bookmarks" directory, so that it can be easily made
# persistent
......@@ -11,8 +16,6 @@ ln -s /home/amnesia/.mozilla/firefox/bookmarks/places.sqlite \
/etc/skel/.tor-browser/profile.default/places.sqlite
# Create the bookmarks database
apt install --yes sqlite3
sqlite3 /etc/skel/.mozilla/firefox/bookmarks/places.sqlite \
< /etc/skel/.mozilla/firefox/bookmarks/places.sqlite.in
apt purge --yes sqlite3
rm /etc/skel/.mozilla/firefox/bookmarks/places.sqlite.in
......@@ -4,6 +4,11 @@ set -e
echo "Installing AppArmor profiles for Tor Browser"
# Import ensure_hook_dependency_is_installed()
. /usr/local/lib/tails-shell-library/build.sh
ensure_hook_dependency_is_installed patch
PATCH='/usr/share/tails/torbrowser-AppArmor-profile.patch'
### Functions
......
......@@ -7,5 +7,10 @@ set -e
echo "Updating the system DConf databases"
# Import ensure_hook_dependency_is_installed()
. /usr/local/lib/tails-shell-library/build.sh
ensure_hook_dependency_is_installed dconf-cli
dconf update
chmod 0644 /etc/dconf/db/local
......@@ -8,10 +8,13 @@ echo "Building VirtualBox guest modules"
. /usr/share/amnesia/build/variables
# Import ensure_hook_dependency_is_installed()
. /usr/local/lib/tails-shell-library/build.sh
# Any -dkms package must be installed *after* dkms to be properly registered
apt-get install --yes dkms
ensure_hook_dependency_is_installed dkms
apt-get install --yes \
ensure_hook_dependency_is_installed \
virtualbox-guest-dkms
for log in $(ls /var/lib/dkms/*/*/build/make.log); do
......
......@@ -6,12 +6,13 @@ set -e
echo "Compiling and installing a custom udev-watchdog program"
apt-get install --yes build-essential binutils libudev-dev
# Import ensure_hook_dependency_is_installed()
. /usr/local/lib/tails-shell-library/build.sh
ensure_hook_dependency_is_installed build-essential binutils libudev-dev
SRC="/usr/src/udev-watchdog.c"
DST="/usr/local/sbin/udev-watchdog"
gcc -o "$DST" "$SRC" -Wall -ludev -lrt
strip --strip-all "$DST"
apt-get --yes purge libudev-dev
......@@ -4,6 +4,11 @@ set -e
echo "Registering and tweaking menus"
# Import ensure_hook_dependency_is_installed()
. /usr/local/lib/tails-shell-library/build.sh
ensure_hook_dependency_is_installed xdg-utils
for app in tails-installer tails-persistence-delete tails-persistence-setup tails-about tails-documentation; do
xdg-desktop-menu install --novendor \
/usr/share/desktop-directories/Tails.directory \
......
......@@ -2,7 +2,8 @@
set -e
# Make syslinux 6.x packaging play well with live-build 2.x
echo 'Adapting syslinux 6.x packaging to play well with live-build 2.x'
cp -a /usr/lib/syslinux/modules/bios/ifcpu64.c32 \
/usr/lib/syslinux/modules/bios/vesamenu.c32 \
/usr/lib/ISOLINUX/isolinux.bin \
......
#!/bin/sh
set -e
echo 'Configuring wget'
# We don't want the real binary to be in $PATH:
# Also note that wget uses the executable name in some help/error messages,
# so wget-real/etc. should be avoided.
......
......@@ -18,9 +18,6 @@ rm $POTFILES_DOT_IN
# (by the 10-tbb hook)
rm /usr/share/tails/tbb-*.txt
# This shell library is only used during build
rm /usr/local/lib/tails-shell-library/build.sh
# Remove the snakeoil SSL key pair generated by ssl-cert
find /etc/ssl/certs /etc/ssl/private |
while read f; do
......
......@@ -14,9 +14,7 @@ echo "Removing unwanted packages"
apt-get --yes purge \
'^linux-compiler-*' \
'^linux-kbuild-*' \
'^linux-headers-*' \
'^linux-source-*' \
build-essential debhelper dkms dpkg-dev \
debhelper dpkg-dev \
gcc gcc-6 \
intltool-debian \
libc6-dev \
......@@ -25,8 +23,7 @@ apt-get --yes purge \
make \
po-debconf \
rsyslog \
libdvdcss-dev \
equivs virtualbox-guest-dkms
libdvdcss-dev
### Deinstall a few unwanted packages that were pulled by tasksel
### since they have Priority: standard.
......
......@@ -4,6 +4,11 @@ set -e
echo "Configuring compression of the initramfs"
# Import ensure_hook_dependency_is_installed()
. /usr/local/lib/tails-shell-library/build.sh
ensure_hook_dependency_is_installed initramfs-tools xz-utils
# Compress the initramfs using a more size-wise efficient algorithm.
OPTS_FILE='/etc/initramfs-tools/initramfs.conf'
......
......@@ -29,7 +29,17 @@ rm /var/lib/systemd/catalog/database
# Delete non-deterministically generated files, that should not be shared among
# all Tails systems anyway. We don't ship SSHd, so we don't bother generating
# them at boot.
rm -r /var/lib/monkeysphere/authentication/
# We remove with -f due to a suspected race condition: it seems that
# .../authentication/sphere/S.gpg-agent can be removed (by gpg-agent?)
# *right after* `rm -r` has listed it, so that when `rm` tries to
# remove it, it doesn't exist any more and it fails.
if [ -d /var/lib/monkeysphere/authentication/ ]; then
rm -rf /var/lib/monkeysphere/authentication/
else
echo 'Cannot remove /var/lib/monkeysphere/authentication/:' \
'directory does not exist' >&2
exit 1
fi
# Empty non-deterministically generated file. If it exists and is empty, systemd
# will automatically set up a new unique ID. But if does not exist, systemd
......
......@@ -8,7 +8,7 @@ Import_GnuPG_key ()
echo "- importing Tails' GnuPG signing key into tails-iuk's trusted keyring"
gpg --batch --homedir /usr/share/tails-iuk/trusted_gnupg_homedir \
--import /usr/share/doc/tails/website/tails-signing.key
chmod -R go+rX /usr/share/tails-iuk/trusted_gnupg_homedir/*
chmod -R go+rX /usr/share/tails-iuk
echo "- importing Tails help desk's GnuPG key into WhisperBack's keyring"
gpg --batch --no-default-keyring \
......
# Type Path Mode UID GID Age Argument
d /run/tails-upgrader 00775 root tails-upgrade-frontend - -
d /usr/share/tails-iuk/trusted_gnupg_homedir 00755 root root - -
d /usr/share/tails-iuk/trusted_gnupg_homedir 00700 root root - -
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