Commit ca978139 authored by anonym's avatar anonym
Browse files

Merge branch 'stable' into devel

parents f03e4f28 c5eeb2b4
......@@ -60,6 +60,7 @@ echo "POTFILES_DOT_IN='$(
# fix permissions on some source files that will be copied as is to the chroot.
# they may be wrong, e.g. if the Git repository was cloned with a strict umask.
chown 0:0 config/chroot_local-includes/etc/resolv.conf
chmod -R go+rX config/binary_local-includes/
chmod -R go+rX config/chroot_local-includes/etc
chmod 0440 config/chroot_local-includes/etc/sudoers.d/*
......
......@@ -41,8 +41,8 @@ cp "$CHROOT_SYSLINUX_BIN" "$LINUX_BINARY_UTILS_DIR/"
cp "$CHROOT_SYSLINUX_MBR" "$BINARY_MBR_DIR/mbr.bin"
cat chroot/etc/apt/sources.list chroot/etc/apt/sources.list.d/*.list \
| grep --extended-regexp --line-regexp --invert-match \
'deb\s+file:/root/local-packages\s+\./' \
| grep --extended-regexp --invert-match \
'file:/root/local-packages' \
| grep --extended-regexp --invert-match \
'^deb\s+http://tagged\.snapshots\.deb\.tails\.boum.org/[^/]+/torproject(/|\s)' \
| grep --extended-regexp --invert-match \
......
......@@ -16,8 +16,8 @@ toggle_src_APT_sources() {
case "$MODE" in
on)
cat /etc/apt/sources.list /etc/apt/sources.list.d/*.list \
| grep --extended-regexp --line-regexp --invert-match \
'deb\s+file:/root/local-packages\s+\./' \
| grep --extended-regexp --invert-match \
'file:/root/local-packages' \
| grep --extended-regexp --invert-match \
'^deb\s+http://tagged\.snapshots\.deb\.tails\.boum.org/[^/]+/torproject(/|\s)' \
| grep --extended-regexp --invert-match \
......
# Protect against CVE-2017-2636
install n-hdlc /bin/true
Subproject commit 640e250df14d11bf1b158f37b4dda6a49363c428
Subproject commit e29c70bd96efa0757b9802c39616afd624e5901b
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