Commit ec636046 authored by sajolida's avatar sajolida
Browse files

Merge remote-tracking branch 'origin/devel' into doc/15660-usb-images

parents a33295f3 fe986b4a
......@@ -26,7 +26,7 @@ AMNESIA_ISOHYBRID_OPTS="-h 255 -s 63 --id 42 --verbose"
REQUIRED_SYSLINUX_UTILS_UPSTREAM_VERSION="6.03~pre20"
# Kernel version
KERNEL_VERSION='4.17.0-3'
KERNEL_VERSION='4.18.0-2'
KERNEL_SOURCE_VERSION=$(
echo "$KERNEL_VERSION" \
| perl -p -E 's{\A (\d+ [.] \d+) [.] .*}{$1}xms'
......
......@@ -499,7 +499,7 @@ etc/modprobe.d/amd64-microcode-blacklist.conf 32065
lib/modprobe.d/fbdev-blacklist.conf 32064
etc/modprobe.d/intel-microcode-blacklist.conf 32063
etc/modprobe.d/loop.conf 32062
lib/modules/4.17.0-3-amd64/modules.softdep 32061
lib/modules/4.18.0-2-amd64/modules.softdep 32061
etc/modprobe.d/no-bluetooth.conf 32060
etc/modprobe.d/no-conntrack-helper.conf 32059
etc/modprobe.d/no-mei.conf 32058
......@@ -507,10 +507,10 @@ etc/modprobe.d/no-n-hdlc.conf 32057
etc/modprobe.d/no-pc-speaker.conf 32056
lib/modprobe.d/systemd.conf 32055
etc/modprobe.d/uncommon-network-protocols.conf 32054
lib/modules/4.17.0-3-amd64/modules.dep.bin 32053
lib/modules/4.17.0-3-amd64/modules.alias.bin 32052
lib/modules/4.17.0-3-amd64/modules.symbols.bin 32051
lib/modules/4.17.0-3-amd64/modules.builtin.bin 32050
lib/modules/4.18.0-2-amd64/modules.dep.bin 32053
lib/modules/4.18.0-2-amd64/modules.alias.bin 32052
lib/modules/4.18.0-2-amd64/modules.symbols.bin 32051
lib/modules/4.18.0-2-amd64/modules.builtin.bin 32050
lib/systemd/network/99-default.link 32049
etc/udev/rules.d/00-mac-spoof.rules 32048
lib/udev/rules.d/40-usb_modeswitch.rules 32047
......@@ -609,18 +609,18 @@ sbin/plymouthd 31953
lib/x86_64-linux-gnu/libply-splash-core.so.4.0.0 31952
etc/adjtime 31950
usr/bin/dbus-daemon 31948
lib/modules/4.17.0-3-amd64/kernel/drivers/cpufreq/acpi-cpufreq.ko 31943
lib/modules/4.18.0-2-amd64/kernel/drivers/cpufreq/acpi-cpufreq.ko 31943
run/udev/tags/seat/+input:input4 31934
run/udev/tags/seat/+input:input6 31927
lib/modules/4.17.0-3-amd64/kernel/drivers/char/hw_random/rng-core.ko 31923
lib/modules/4.17.0-3-amd64/kernel/drivers/acpi/battery.ko 31910
lib/modules/4.17.0-3-amd64/kernel/net/rfkill/rfkill.ko 31908
lib/modules/4.17.0-3-amd64/kernel/drivers/acpi/ac.ko 31906
lib/modules/4.18.0-2-amd64/kernel/drivers/char/hw_random/rng-core.ko 31923
lib/modules/4.18.0-2-amd64/kernel/drivers/acpi/battery.ko 31910
lib/modules/4.18.0-2-amd64/kernel/net/rfkill/rfkill.ko 31908
lib/modules/4.18.0-2-amd64/kernel/drivers/acpi/ac.ko 31906
run/udev/tags/seat/+input:input3 31899
run/udev/tags/seat/+input:input2 31894
lib/modules/4.17.0-3-amd64/kernel/drivers/cpufreq/pcc-cpufreq.ko 31892
lib/modules/4.17.0-3-amd64/kernel/drivers/input/evdev.ko 31888
lib/modules/4.17.0-3-amd64/kernel/drivers/char/tpm/tpm.ko 31880
lib/modules/4.18.0-2-amd64/kernel/drivers/cpufreq/pcc-cpufreq.ko 31892
lib/modules/4.18.0-2-amd64/kernel/drivers/input/evdev.ko 31888
lib/modules/4.18.0-2-amd64/kernel/drivers/char/tpm/tpm.ko 31880
run/udev/tags/seat/c226:0 31872
run/udev/tags/master-of-seat/c226:0 31871
run/udev/tags/seat/+drm:card0-DP-1 31867
......@@ -631,7 +631,7 @@ run/udev/tags/seat/+drm:card0-DP-2 31859
run/udev/tags/master-of-seat/+drm:card0-DP-2 31858
run/udev/tags/seat/+drm:card0-HDMI-A-1 31855
run/udev/tags/master-of-seat/+drm:card0-HDMI-A-1 31854
lib/modules/4.17.0-3-amd64/kernel/drivers/char/tpm/tpm_tis_core.ko 31848
lib/modules/4.18.0-2-amd64/kernel/drivers/char/tpm/tpm_tis_core.ko 31848
run/udev/tags/seat/+drm:card0-LVDS-1 31844
run/udev/tags/master-of-seat/+drm:card0-LVDS-1 31843
run/udev/tags/seat/+drm:card0-HDMI-A-2 31840
......@@ -646,15 +646,15 @@ bin/true 31812
lib/udev/lmt-udev 31811
lib/x86_64-linux-gnu/libdbus-1.so.3.14.15 31810
run/udev/tags/seat/c189:512 31806
lib/modules/4.17.0-3-amd64/kernel/drivers/char/tpm/tpm_tis.ko 31804
lib/modules/4.18.0-2-amd64/kernel/drivers/char/tpm/tpm_tis.ko 31804
run/udev/tags/seat/c189:256 31800
usr/sbin/laptop_mode 31798
lib/x86_64-linux-gnu/libsystemd.so.0.21.0 31796
lib/modules/4.17.0-3-amd64/kernel/sound/soundcore.ko 31795
lib/modules/4.18.0-2-amd64/kernel/sound/soundcore.ko 31795
lib/x86_64-linux-gnu/libapparmor.so.1.4.0 31794
usr/share/dbus-1/system.conf 31792
lib/modules/4.17.0-3-amd64/kernel/drivers/pci/hotplug/shpchp.ko 31791
lib/modules/4.17.0-3-amd64/kernel/net/wireless/cfg80211.ko 31783
lib/modules/4.18.0-2-amd64/kernel/drivers/pci/hotplug/shpchp.ko 31791
lib/modules/4.18.0-2-amd64/kernel/net/wireless/cfg80211.ko 31783
usr/share/dbus-1/system.d/org.freedesktop.hostname1.conf 31782
usr/share/dbus-1/system.d/org.freedesktop.locale1.conf 31781
usr/share/dbus-1/system.d/org.freedesktop.login1.conf 31780
......@@ -730,8 +730,8 @@ usr/share/dbus-1/system-services/org.freedesktop.resolve1.service 31693
usr/share/dbus-1/system-services/org.freedesktop.systemd1.service 31692
usr/share/dbus-1/system-services/org.freedesktop.timedate1.service 31691
usr/share/dbus-1/system-services/org.opensuse.CupsPkHelper.Mechanism.service 31690
lib/modules/4.17.0-3-amd64/kernel/drivers/mfd/lpc_ich.ko 31689
lib/modules/4.17.0-3-amd64/kernel/sound/core/snd.ko 31688
lib/modules/4.18.0-2-amd64/kernel/drivers/mfd/lpc_ich.ko 31689
lib/modules/4.18.0-2-amd64/kernel/sound/core/snd.ko 31688
bin/uname 31686
usr/lib/accountsservice/accounts-daemon 31685
lib/systemd/systemd-logind 31684
......@@ -756,15 +756,15 @@ sbin/start-stop-daemon 31647
usr/sbin/rngd 31646
usr/bin/tail 31645
usr/local/lib/onion-grater 31643
lib/modules/4.17.0-3-amd64/kernel/sound/core/snd-timer.ko 31642
lib/modules/4.18.0-2-amd64/kernel/sound/core/snd-timer.ko 31642
bin/udevadm 31641
usr/share/tor/tor-service-defaults-torrc 31640
lib/modules/4.17.0-3-amd64/kernel/drivers/char/nvram.ko 31639
lib/modules/4.18.0-2-amd64/kernel/drivers/char/nvram.ko 31639
usr/local/bin/tails-get-bootinfo 31638
usr/local/lib/tails-set-wireless-devices-state 31635
lib/modules/4.17.0-3-amd64/kernel/sound/core/snd-pcm.ko 31632
lib/modules/4.18.0-2-amd64/kernel/sound/core/snd-pcm.ko 31632
etc/crontab 31630
lib/modules/4.17.0-3-amd64/kernel/drivers/platform/x86/thinkpad_acpi.ko 31628
lib/modules/4.18.0-2-amd64/kernel/drivers/platform/x86/thinkpad_acpi.ko 31628
run/systemd/generator.late/speech-dispatcher.service 31622
lib/systemd/systemd-backlight 31620
lib/systemd/system-preset/90-systemd.preset 31617
......@@ -775,7 +775,7 @@ usr/bin/env 31610
usr/share/gdm/generate-config 31608
usr/bin/eject 31605
usr/bin/logger 31604
lib/modules/4.17.0-3-amd64/kernel/sound/core/snd-hwdep.ko 31603
lib/modules/4.18.0-2-amd64/kernel/sound/core/snd-hwdep.ko 31603
bin/sleep 31602
usr/lib/python3.5/argparse.py 31601
usr/bin/basename 31597
......@@ -784,11 +784,11 @@ usr/share/laptop-mode-tools/modules/ac97-powersave 31595
usr/share/laptop-mode-tools/modules/battery-level-polling 31592
usr/local/sbin/udev-watchdog 31591
usr/bin/unmkinitramfs 31590
lib/modules/4.17.0-3-amd64/kernel/drivers/scsi/sg.ko 31589
lib/modules/4.17.0-3-amd64/kernel/drivers/platform/x86/wmi-bmof.ko 31588
lib/modules/4.17.0-3-amd64/kernel/sound/hda/snd-hda-core.ko 31587
lib/modules/4.18.0-2-amd64/kernel/drivers/scsi/sg.ko 31589
lib/modules/4.18.0-2-amd64/kernel/drivers/platform/x86/wmi-bmof.ko 31588
lib/modules/4.18.0-2-amd64/kernel/sound/hda/snd-hda-core.ko 31587
usr/lib/x86_64-linux-gnu/libdconf.so.1.0.0 31586
lib/modules/4.17.0-3-amd64/kernel/drivers/input/serio/serio_raw.ko 31585
lib/modules/4.18.0-2-amd64/kernel/drivers/input/serio/serio_raw.ko 31585
usr/share/laptop-mode-tools/modules/bluetooth 31574
run/udev/links/\x2frtc/c252:0 31570
usr/bin/getopt 31568
......@@ -801,7 +801,7 @@ usr/lib/python3.5/__pycache__/glob.cpython-35.pyc 31560
lib/live/mount/overlay/usr/lib/python3.5/__pycache__/fnmatch.cpython-35.pyc 31559
usr/lib/python3.5/__pycache__/fnmatch.cpython-35.pyc 31558
usr/lib/python3.5/ipaddress.py 31556
lib/modules/4.17.0-3-amd64/kernel/virt/lib/irqbypass.ko 31555
lib/modules/4.18.0-2-amd64/kernel/virt/lib/irqbypass.ko 31555
usr/share/laptop-mode-tools/modules/configuration-file-control 31554
usr/share/laptop-mode-tools/modules/cpufreq 31552
usr/share/laptop-mode-tools/modules/cpuhotplug 31551
......@@ -818,7 +818,7 @@ usr/share/laptop-mode-tools/modules/hdparm 31457
usr/share/laptop-mode-tools/modules/intel-hda-powersave 31425
run/udev/tags/seat/+input:input5 31418
run/udev/tags/seat/+input:input0 31399
lib/modules/4.17.0-3-amd64/kernel/arch/x86/kvm/kvm.ko 31391
lib/modules/4.18.0-2-amd64/kernel/arch/x86/kvm/kvm.ko 31391
usr/share/laptop-mode-tools/modules/intel-sata-powermgmt 31353
sbin/ethtool 31352
usr/share/laptop-mode-tools/modules/intel_pstate 31265
......@@ -897,14 +897,14 @@ usr/share/laptop-mode-tools/modules/sched-mc-power-savings 31148
usr/share/laptop-mode-tools/modules/sched-smt-power-savings 31147
sbin/on_ac_power 31146
bin/loginctl 31145
lib/modules/4.17.0-3-amd64/kernel/sound/pci/hda/snd-hda-codec.ko 31144
lib/modules/4.18.0-2-amd64/kernel/sound/pci/hda/snd-hda-codec.ko 31144
etc/hdparm.conf 31143
lib/modules/4.17.0-3-amd64/kernel/sound/pci/hda/snd-hda-intel.ko 31142
lib/modules/4.18.0-2-amd64/kernel/sound/pci/hda/snd-hda-intel.ko 31142
bin/kmod 31141
lib/modules/4.17.0-3-amd64/kernel/sound/pci/hda/snd-hda-codec-generic.ko 31140
lib/modules/4.18.0-2-amd64/kernel/sound/pci/hda/snd-hda-codec-generic.ko 31140
usr/lib/x86_64-linux-gnu/libgudev-1.0.so.0.2.0 31137
usr/share/laptop-mode-tools/modules/start-stop-programs 31136
lib/modules/4.17.0-3-amd64/kernel/sound/pci/hda/snd-hda-codec-conexant.ko 31135
lib/modules/4.18.0-2-amd64/kernel/sound/pci/hda/snd-hda-codec-conexant.ko 31135
run/udev/links/\x2fdisk\x2fby-id\x2fata-HITACHI_HTS723216L9SA60_100120FC1220NCJHDEVG-part1/b8:1 31134
run/udev/links/\x2fdisk\x2fby-id\x2fwwn-0x5000cca586e32f4c-part1/b8:1 31133
run/udev/links/\x2fdisk\x2fby-partuuid\x2f95fbd1e1-01/b8:1 31132
......@@ -947,8 +947,8 @@ usr/share/laptop-mode-tools/modules/wireless-power 31088
usr/lib/python3.5/calendar.py 31087
lib/systemd/system-shutdown/tails 31086
bin/cpio 31085
lib/modules/4.17.0-3-amd64/kernel/drivers/watchdog/iTCO_vendor_support.ko 31084
lib/modules/4.17.0-3-amd64/kernel/arch/x86/kvm/kvm-intel.ko 31082
lib/modules/4.18.0-2-amd64/kernel/drivers/watchdog/iTCO_vendor_support.ko 31084
lib/modules/4.18.0-2-amd64/kernel/arch/x86/kvm/kvm-intel.ko 31082
lib/systemd/systemd-shutdown 31081
sbin/iw 31080
usr/lib/python3.5/queue.py 31079
......@@ -990,7 +990,7 @@ usr/lib/python3/dist-packages/stem/descriptor/extrainfo_descriptor.py 31043
usr/lib/python3/dist-packages/stem/exit_policy.py 31042
usr/lib/x86_64-linux-gnu/libffi.so.6.0.4 31041
usr/lib/x86_64-linux-gnu/libgmodule-2.0.so.0.5000.3 31040
lib/modules/4.17.0-3-amd64/kernel/drivers/watchdog/iTCO_wdt.ko 31025
lib/modules/4.18.0-2-amd64/kernel/drivers/watchdog/iTCO_wdt.ko 31025
lib/systemd/system/sound.target 31011
usr/lib/x86_64-linux-gnu/gio/modules/giomodule.cache 30999
usr/sbin/alsactl 30998
......@@ -1006,7 +1006,7 @@ usr/lib/x86_64-linux-gnu/libpolkit-backend-1.so.0.0.0 30975
usr/lib/x86_64-linux-gnu/polkit-1/extensions/libnullbackend.so 30974
etc/polkit-1/nullbackend.conf.d/50-nullbackend.conf 30973
etc/gdm3/daemon.conf 30972
lib/modules/4.17.0-3-amd64/kernel/drivers/hwmon/coretemp.ko 30971
lib/modules/4.18.0-2-amd64/kernel/drivers/hwmon/coretemp.ko 30971
usr/lib/python3/dist-packages/stem/util/tor_tools.py 30970
usr/lib/python3/dist-packages/stem/version.py 30969
usr/lib/python3/dist-packages/stem/descriptor/networkstatus.py 30968
......@@ -1032,7 +1032,7 @@ usr/lib/x86_64-linux-gnu/libX11.so.6.3.0 30944
usr/lib/python3/dist-packages/stem/response/events.py 30943
usr/lib/python3/dist-packages/yaml/__init__.py 30942
sbin/blockdev 30941
lib/modules/4.17.0-3-amd64/kernel/drivers/thermal/intel_powerclamp.ko 30939
lib/modules/4.18.0-2-amd64/kernel/drivers/thermal/intel_powerclamp.ko 30939
usr/lib/python3/dist-packages/yaml/error.py 30938
usr/lib/python3/dist-packages/yaml/tokens.py 30937
usr/lib/python3/dist-packages/yaml/events.py 30936
......@@ -3327,10 +3327,10 @@ usr/lib/x86_64-linux-gnu/perl5/5.24/Class/XSAccessor.pm 28381
usr/lib/x86_64-linux-gnu/perl5/5.24/Class/XSAccessor/Heavy.pm 28380
usr/lib/x86_64-linux-gnu/perl5/5.24/auto/Class/XSAccessor/XSAccessor.so 28355
lib/systemd/system/systemd-udev-settle.service 28346
lib/modules/4.17.0-3-amd64/kernel/drivers/net/ethernet/intel/e1000e/e1000e.ko 28330
lib/modules/4.18.0-2-amd64/kernel/drivers/net/ethernet/intel/e1000e/e1000e.ko 28330
usr/share/perl5/Moo/Role.pm 28323
usr/share/perl5/Role/Tiny.pm 28322
lib/modules/4.17.0-3-amd64/kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko 28318
lib/modules/4.18.0-2-amd64/kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko 28318
usr/share/perl5/GnuPG/HashInit.pm 28307
usr/share/perl5/Type/Utils.pm 28300
usr/share/perl5/Type/Library.pm 28299
......@@ -3348,7 +3348,7 @@ usr/share/perl/5.24.1/SelfLoader.pm 28275
usr/share/perl5/Types/Standard.pm 28271
usr/lib/x86_64-linux-gnu/perl5/5.24/Sub/Name.pm 28269
usr/lib/x86_64-linux-gnu/perl5/5.24/auto/Sub/Name/Name.so 28268
lib/modules/4.17.0-3-amd64/kernel/net/mac80211/mac80211.ko 28265
lib/modules/4.18.0-2-amd64/kernel/net/mac80211/mac80211.ko 28265
usr/share/perl5/Type/Coercion.pm 28263
usr/share/perl5/GnuPG/Interface.pm 28246
usr/share/perl/5.24.1/English.pm 28240
......@@ -3363,7 +3363,7 @@ usr/share/perl/5.24.1/autodie/Scope/GuardStack.pm 28221
usr/share/perl/5.24.1/autodie/Scope/Guard.pm 28220
usr/share/perl/5.24.1/Class/Struct.pm 28122
usr/share/perl/5.24.1/Math/BigInt.pm 28077
lib/modules/4.17.0-3-amd64/kernel/drivers/net/wireless/intel/iwlwifi/dvm/iwldvm.ko 28050
lib/modules/4.18.0-2-amd64/kernel/drivers/net/wireless/intel/iwlwifi/dvm/iwldvm.ko 28050
usr/local/lib/tails-spoof-mac 28039
usr/local/lib/tails-shell-library/hardware.sh 28038
usr/local/lib/tails-shell-library/log.sh 28037
......@@ -3372,7 +3372,7 @@ usr/share/perl/5.24.1/Math/BigInt/Calc.pm 28035
lib/crda/setregdomain 28033
lib/systemd/systemd-rfkill 28032
etc/default/crda 28031
lib/modules/4.17.0-3-amd64/kernel/crypto/arc4.ko 28029
lib/modules/4.18.0-2-amd64/kernel/crypto/arc4.ko 28029
usr/bin/macchanger 28027
usr/share/perl/5.24.1/integer.pm 28026
usr/share/macchanger/OUI.list 28025
......
......@@ -96,10 +96,6 @@ Package: tails-installer
Pin: origin deb.tails.boum.org
Pin-Priority: 999
Package: tor tor-geoipdb
Pin: release o=TorProject,n=tor-experimental-0.3.4.x-stretch
Pin-Priority: 999
Package: virtualbox*
Pin: release o=Debian,n=stretch-backports
Pin-Priority: 999
......@@ -109,7 +105,8 @@ Package: vulcan* libvulkan*
Pin: release o=Debian,n=stretch-backports
Pin-Priority: 999
Package: wayland-protocols
Explanation: src:wayland and src:wayland-protocols
Package: libwayland* wayland-protocols
Pin: release o=Debian,n=stretch-backports
Pin-Priority: 999
......
......@@ -2,9 +2,17 @@
set -e
# Free the fixed GIDs and UIDs we're using.
echo "Set fixed GIDs and UIDs"
echo "Change GIDs and UIDs"
Debug_gids_and_uids () {
for file in passwd group; do
diff -Naur "/usr/share/tails/build/${file}" "/etc/${file}" >&2 || :
echo >&2
echo "Content of '/etc/${file}':" >&2
cat "/etc/${file}" >&2
echo >&2
done
}
Change_uid () {
NAME="$1"
......@@ -13,7 +21,10 @@ Change_uid () {
if [ -n "$OLD" ]; then
echo "Changing UID for $NAME ($OLD -> $NEW)"
usermod --uid "$NEW" "$NAME"
if ! usermod --uid "$NEW" "$NAME"; then
Debug_gids_and_uids
exit 1
fi
find / -wholename /proc -prune -o \( \! -type l -a -uid "$OLD" -exec chown "$NEW" '{}' \; \)
fi
}
......@@ -25,27 +36,48 @@ Change_gid () {
if [ -n "$OLD" ]; then
echo "Changing GID for $NAME ($OLD -> $NEW)"
groupmod --gid "$NEW" "$NAME"
if ! groupmod --gid "$NEW" "$NAME"; then
Debug_gids_and_uids
exit 1
fi
find / -wholename /proc -prune -o \( \! -type l -a -gid "$OLD" -exec chgrp "$NEW" '{}' \; \)
fi
}
Change_uid tails-persistent-setup 150
Change_gid tails-persistent-setup 150
### Ensure GIDs are stable accross releases
# ... otherwise, things such as tor@service are broken
# after applying an automatic upgrade (#15695, #15424, #13426, #15407)
# Temporarily give these groups a GID that's out of the way, to avoid collisions
Change_gid messagebus 1050
Change_gid ssh 1090
Change_gid memlockd 1100
Change_gid ssl-cert 1110
Change_gid vboxsf 1120
Change_gid monkeysphere 1130
Change_gid debian-tor 1140
Change_gid lpadmin 1150
Change_gid scanner 1160
Change_gid colord 1170
Change_gid saned 1180
Change_gid pulse 1190
Change_gid pulse-access 1200
Change_gid Debian-gdm 1210
Change_gid kvm 1500
# Finally, give these groups the desired GID
Change_gid messagebus 105
Change_gid ssh 109
Change_gid memlockd 110
Change_gid ssl-cert 111
Change_gid vboxsf 112
Change_gid monkeysphere 113
Change_gid debian-tor 114
Change_gid lpadmin 115
Change_gid scanner 116
Change_gid colord 117
Change_gid saned 118
Change_gid pulse 119
Change_gid pulse-access 120
Change_gid Debian-gdm 121
Change_gid kvm 150
......@@ -11,5 +11,8 @@ set -e
echo "Creating the tails-persistence-setup user"
# If this fails because UID 115 or GID 122 are already in use,
# move the "stealer" user/group out of the way in 04-change-gids-and-uids.
addgroup --system --gid 122 tails-persistence-setup
adduser --system --uid 115 --gid 122 --no-create-home tails-persistence-setup
......@@ -114,6 +114,9 @@ EOF
# in the directory where the firefox executable is located.
mkdir -p "${prep}"/TorBrowser/Data/Browser/Caches
# Otherwise the "General" section in the preferences is not displayed.
install -d -m 0755 "${prep}"/TorBrowser/UpdateInfo
mv "${prep}" "${destination}"
rm -r "${tmp}"
......
......@@ -8,4 +8,4 @@ echo "Tweaking the offline website's CSS"
# So let's just remove the bling-bling to get a better offline browsing
# experience.
sed -e '/box-shadow/d' -i /usr/share/doc/tails/website/local.css
sed -e '/box-shadow/d' -i /usr/share/doc/tails/website/local-donate.css
#!/bin/sh
set -e
echo "Configuring htpdate HTTP User-Agent"
CONFFILE='/etc/default/htpdate.user-agent'
install -o root -g root -m 0644 /dev/null "$CONFFILE"
echo "HTTP_USER_AGENT=\"$(/usr/local/lib/getTorBrowserUserAgent)\"" \
> "$CONFFILE"
......@@ -43,6 +43,11 @@ apt-get --yes purge \
texinfo \
wamerican
### Remove packages that can get a different priority in the security
### archive (see https://bugs.debian.org/867668):
apt-get --yes purge \
mutt
### Deinstall some other unwanted packages.
apt-get --yes purge \
'^aptitude*' \
......@@ -57,7 +62,7 @@ apt-get --yes purge \
### Deinstall some other unwanted packages whose regexp might not be match
### anything when building with partial, tagged APT snapshots.
if [ $(dpkg --get-selections | grep -c -E '^geoclue') -gt 0 ]; then
if dpkg --get-selections | grep -qs -E '^geoclue'; then
apt-get --yes purge '^geoclue*'
fi
......
HTTP_USER_AGENT="Mozilla/5.0 (Windows NT 6.1; rv:60.0) Gecko/20100101 Firefox/60.0"
amnesia ALL = NOPASSWD: /usr/local/lib/kill-boot-profile
amnesia ALL = NOPASSWD: /usr/local/lib/kill-boot-profile ""
amnesia ALL = NOPASSWD: /sbin/poweroff
amnesia ALL = NOPASSWD: /sbin/reboot
amnesia ALL = NOPASSWD: /sbin/poweroff ""
amnesia ALL = NOPASSWD: /sbin/reboot ""
Cmnd_Alias PERSISTENCE_SETUP = /usr/bin/tails-persistence-setup "", /usr/bin/tails-persistence-setup --verbose, /usr/bin/tails-persistence-setup --step delete, /usr/bin/tails-persistence-setup --step delete --verbose, /usr/bin/tails-persistence-setup --force-enable-preset AdditionalSoftware
amnesia ALL = (tails-persistence-setup) NOPASSWD: PERSISTENCE_SETUP
tails-persistence-setup ALL = (root) NOPASSWD: /usr/bin/tails-fix-persistent-volume-permissions
tails-persistence-setup ALL = (root) NOPASSWD: /usr/bin/tails-fix-persistent-volume-permissions ""
amnesia ALL = NOPASSWD: /usr/local/sbin/unsafe-browser
amnesia ALL = NOPASSWD: /usr/local/sbin/unsafe-browser ""
......@@ -9,8 +9,12 @@
pref("extensions.update.enabled", false);
// Use LANG environment variable to choose locale
pref("intl.locale.matchOS", true);
// Use LANG environment variable to choose locale from system
// The old environment setting 'pref("intl.locale.matchOS", true);' is
// currently not working anymore. The new introduced setting
// 'intl.locale.requested' is now used for this. Setting an empty string is
// pulling the system locale into Thunderbird.
pref("intl.locale.requested", "");
// Disable default mail checking (gnome).
pref("mail.shell.checkDefaultMail", false);
......
// Prefs that *need* to be here because they are not honored
// if we set them via /usr/share/tails/tor-browser-prefs.js
user_pref("extensions.torbutton.launch_warning", false);
user_pref("intl.accept_languages", "en-US, en");
user_pref("javascript.use_us_english_locale", true);
......@@ -6,6 +6,8 @@
["command", {"args": ["/usr/bin/lspci", "-nn"]}],
["command", {"args": ["/bin/df", "--human-readable", "--print-type"]}],
["command", {"args": ["/bin/mount", "--show-labels"]}],
["command", {"args": ["/sbin/dmsetup", "ls", "--tree", "--options=blkdevname,uuid,active,open,rw,notrunc"]}],
["command", {"args": ["/sbin/losetup", "--list", "--output=NAME,BACK-FILE,AUTOCLEAR,RO,PARTSCAN,SIZELIMIT,OFFSET"]}],
["command", {"args": ["/bin/lsmod"]}],
["file", {"user": "root", "path": "/proc/asound/cards"}],
["file", {"user": "root", "path": "/proc/asound/devices"}],
......
......@@ -89,4 +89,27 @@ s{
' | perl -pi - /etc/apt/sources.list /etc/apt/sources.list.d/*.list
echo "- configuring APT preferences"
echo '
### Custom APT repository
s{
^
(Pin:\s+origin\s+)
deb[.]tails[.]boum[.]org
$
}{$1jenw7xbd6tf7vfhp.onion}xms;
### Fix origin for backports
s{
^
(Pin:\s+release\s+)
o=Debian
(,[an]=stretch-backports)
$
}{$1o=Debian Backports$2}xms;
' | perl -pi - /etc/apt/preferences
find /etc/apt/sources.list* -size 0 -delete
......@@ -20,7 +20,7 @@ from tailslib.persistence import ( # NOQA: E402
is_tails_media_writable,
launch_persistence_setup)
from tailslib.additionalsoftware.config import ( # NOQA: E402
from tailslib.additionalsoftware import ( # NOQA: E402
get_additional_packages,
get_packages_list_path,
filter_package_details)
......@@ -92,6 +92,7 @@ class ASPConfigApplicationWindow(Gtk.ApplicationWindow):
Gtk.DialogFlags.DESTROY_WITH_PARENT,
Gtk.MessageType.QUESTION,
Gtk.ButtonsType.NONE,
# Translators: Don't translate {package}, it's a placeholder and will be replaced.
_("Remove {package} from your additional software? "
"This will stop installing the package "
"automatically.").format(package=package_name))
......@@ -102,6 +103,7 @@ class ASPConfigApplicationWindow(Gtk.ApplicationWindow):
self.remove_asp_func(package_name)
except subprocess.CalledProcessError as e:
self.__show_exception_dialog(
# Translators: Don't translate {pkg}, it's a placeholder and will be replaced.
_("Failed to remove {pkg}").format(pkg=package_name),
e)
dialog.destroy()
......@@ -148,6 +150,7 @@ class ASPConfigApplicationWindow(Gtk.ApplicationWindow):
Gtk.IconSize.SMALL_TOOLBAR)
remove_button.set_relief(Gtk.ReliefStyle.NONE)
remove_button.set_tooltip_text(
# Translators: Don't translate {package}, it's a placeholder and will be replaced.
_("Stop installing {package} "
"automatically").format(package=package_name))
remove_button.connect(
......
......@@ -7,9 +7,6 @@ set -x
# Import set_mozilla_pref()
. /usr/local/lib/tails-shell-library/tor-browser.sh
# Import guess_best_thunderbird_locale():
. /usr/local/lib/tails-shell-library/thunderbird.sh
THUNDERBIRD_CONFIG_DIR="${HOME}/.thunderbird"
PROFILE="${THUNDERBIRD_CONFIG_DIR}/profile.default"
......@@ -32,15 +29,6 @@ configure_default_incoming_protocol() {
user_pref
}
configure_best_thunderbird_locale() {
local locale
locale=$(guess_best_thunderbird_locale)
mkdir -p "${PROFILE}"
set_mozilla_pref "${PROFILE}/prefs.js" \
"intl.locale.requested" \
"\"${locale}\"" \
user_pref
}
thunderbird_profile_is_new() {
[ ! -f "${PROFILE}/extensions.ini" ]
......@@ -73,8 +61,6 @@ start_thunderbird() {
initialize_enigmail_configured_version
fi
configure_best_thunderbird_locale
exec /usr/bin/thunderbird --class "Thunderbird" -profile "${PROFILE}" "${@}"
}
......
Markdown is supported
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