diff options
3 files changed, 1 insertions, 103 deletions
diff --git a/config/chroot_local-hooks/09-torsocks-apps b/config/chroot_local-hooks/09-torsocks-apps index e7440a5..484068a 100755 --- a/config/chroot_local-hooks/09-torsocks-apps +++ b/config/chroot_local-hooks/09-torsocks-apps @@ -4,9 +4,8 @@ set -e echo "Wrapping some applications with torsocks" -APPS="gobby-0.5 net.sourceforge.liferea openpgp-applet seahorse" +APPS="openpgp-applet seahorse" DBUS_SERVICES="org.gnome.seahorse.Application org.fedoraproject.Config.Printing" -WRAPPED_DBUS_SERVICES="net.sourceforge.liferea" for app in $APPS; do sed -i'' --regexp-extended 's,^Exec=(.*),Exec=torsocks \1,' \ @@ -18,12 +17,6 @@ for dbus_service in $DBUS_SERVICES; do "/usr/share/dbus-1/services/${dbus_service}.service" done -# Wrapped by both torsocks and a binary in /usr/local -for dbus_service in $WRAPPED_DBUS_SERVICES; do - sed -i'' --regexp-extended 's,^Exec=/usr/(.*),Exec=/usr/bin/torsocks /usr/local/\1,' \ - "/usr/share/dbus-1/services/${dbus_service}.service" -done - # Redirect to existing wrapper sed -i'' --regexp-extended 's,^Exec=pidgin$,Exec=/usr/local/bin/pidgin,' \ "/usr/share/applications/pidgin.desktop" diff --git a/config/chroot_local-hooks/99-zzzzzz_reproducible-builds-post-processing b/config/chroot_local-hooks/99-zzzzzz_reproducible-builds-post-processing index 5dc6a22..55e0a01 100644 --- a/config/chroot_local-hooks/99-zzzzzz_reproducible-builds-post-processing +++ b/config/chroot_local-hooks/99-zzzzzz_reproducible-builds-post-processing @@ -26,21 +26,6 @@ rm /etc/console-setup/cached_setup_keyboard.sh rm /var/cache/ldconfig/aux-cache 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. -# 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 # will populate /etc with preset unit settings, which will for example re-enable diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list index 29b9cf6..eebca7b 100644 --- a/config/chroot_local-packageslists/tails-common.list +++ b/config/chroot_local-packageslists/tails-common.list @@ -64,7 +64,6 @@ apparmor apparmor-profiles apparmor-profiles-extra apt-transport-tor -audacity bilibop-udev caribou cups @@ -72,13 +71,11 @@ cups-pk-helper cryptsetup rsync bash-completion -bookletimposer cracklib-runtime dbus-user-session desktop-base dmz-cursor-theme dosfstools -electrum enigmail eog evince @@ -88,10 +85,8 @@ exiv2 file-roller fonts-cantarell fonts-liberation -fonts-linuxlibertine gdm3 gedit -gimp git gkbd-capplet gnome-calculator @@ -104,7 +99,6 @@ gnome-screenshot gnome-session gnome-shell-extension-top-icons-plus gnome-shell-extensions -gnome-sound-recorder # Jessie's gnome-sound-recorder is missing the dependency on gstreamer1.0-pulseaudio (Debian bug #852870) # This can be removed once gnome-sound-recorder is >=3.21.92-2 gstreamer1.0-pulseaudio @@ -115,7 +109,6 @@ gnome-user-guide gnupg-agent gnupg2 gobi-loader -gobby ## breaks lb because of desktop-base.postinst (see Debian bug #467620) #if ARCHITECTURE amd64 # grub @@ -130,87 +123,53 @@ hardlink haveged # needed by laptop-mode-tools to spin-down hard drives hdparm -hopenpgp-tools -inkscape iptables # ships isolinux.bin in syslinux 6.x packaging isolinux ferm keepassx -keyringer memlockd less laptop-mode-tools libgail-common libgfshare-bin libcaribou-gtk-module -libsane-hpaio -liferea live-config live-config-systemd live-tools lvm2 macchanger mat -pdf-redact-tools mesa-utils -monkeysign -monkeysphere -msva-perl nautilus nautilus-wipe -nautilus-gtkhash network-manager network-manager-gnome ntfs-3g obfs4proxy onionshare -libreoffice-calc -libreoffice-draw -libreoffice-gnome -libreoffice-gtk3 -libreoffice-impress -libreoffice-math -libreoffice-writer -libreoffice-l10n-ar -libreoffice-l10n-de -libreoffice-l10n-es -libreoffice-l10n-fa -libreoffice-l10n-fr -libreoffice-l10n-it -libreoffice-l10n-pt -libreoffice-l10n-ru -libreoffice-l10n-vi -libreoffice-l10n-zh-cn onioncircuits openpgp-applet openssh-client -paperkey parted patch pidgin pidgin-guifications pidgin-otr pinentry-gtk2 -pitivi -poedit ppp pppoe pulseaudio pulseaudio-utils -pwgen p7zip-full qt-at-spi rng-tools rfkill -sane-utils scdaemon -scribus seahorse seahorse-daemon seahorse-nautilus secure-delete -simple-scan sshfs # ships the *.c32 modules in syslinux 6.x packaging syslinux-common @@ -222,7 +181,6 @@ system-config-printer-common synaptic torsocks totem-plugins -traverso ttf-dejavu tcpdump tcpflow @@ -230,8 +188,6 @@ thunderbird thunderbird-l10n-all tor tor-geoipdb -sound-juicer -ssss totem unar usbutils @@ -290,42 +246,6 @@ ibus-hangul ## Vietnamese ibus-unikey -### l10n, i18n -## precompiled locales -locales-all -## arabic fonts -fonts-kacst -fonts-farsiweb -## chinese fonts -xfonts-intl-chinese -fonts-arphic-ukai -fonts-arphic-uming -fonts-wqy-microhei -fonts-wqy-zenhei -## Hebrew support -culmus -libfribidi0 -## indic fonts -fonts-indic -## Khmer language, used in Cambodia -fonts-khmeros -## Korean fonts -fonts-unfonts-core -## Lao fonts -fonts-lao -## russian fonts -xfonts-bolkhov-koi8r-75dpi -xfonts-bolkhov-koi8r-misc -xfonts-cronyx-koi8r-100dpi -## Sinhala fonts -fonts-lklug-sinhala -## Thai fonts -fonts-thai-tlwg - -### CD burning -brasero -cdrdao - ### Accessibility ## mouse accessibility enhancements mousetweaks |