Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
tails
tails
Commits
751f169b
Commit
751f169b
authored
Jan 05, 2020
by
segfault
Browse files
Merge branch 'feature/17332-linux-5.3.15-for-stable+force-all-tests' into stable (Closes:
#17332
)
parents
e5e98537
30b7297f
Changes
4
Hide whitespace changes
Inline
Side-by-side
config/APT_snapshots.d/debian/serial
View file @
751f169b
20191
11
80
1
20191
22
80
2
config/amnesia
View file @
751f169b
...
...
@@ -23,7 +23,7 @@ AMNESIA_APPEND="live-media=removable nopersistence noprompt timezone=Etc/UTC blo
AMNESIA_ISOHYBRID_OPTS
=
"-h 255 -s 63 --id 42 --verbose"
# Kernel version
KERNEL_VERSION
=
'5.3.0-
2
'
KERNEL_VERSION
=
'5.3.0-
3
'
KERNEL_SOURCE_VERSION
=
$(
echo
"
$KERNEL_VERSION
"
\
| perl
-p
-E
's{\A (\d+ [.] \d+) [.] .*}{$1}xms'
...
...
config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch
View file @
751f169b
diff --git a/etc/apparmor.d/torbrowser.Browser.firefox b/etc/apparmor.d/torbrowser.Browser.firefox
index f782f35..426f7c8 100644
--- a/etc/apparmor.d/torbrowser.Browser.firefox
+++ b/etc/apparmor.d/torbrowser.Browser.firefox
@@ -1,11 +1,12 @@
...
...
@@ -16,7 +14,7 @@ index f782f35..426f7c8 100644
# Uncomment the following lines if you want to give the Tor Browser read-write
# access to most of your personal files.
@@ -14,6 +15,7 @@
profile torbrowser_firefox @{torbrowser_firefox_executable} {
@@ -14,6 +15,7 @@
# Audio support
/{,usr/}bin/pulseaudio Pixr,
...
...
@@ -24,7 +22,7 @@ index f782f35..426f7c8 100644
#dbus,
network netlink raw,
@@ -29,6 +31,8 @@
profile torbrowser_firefox @{torbrowser_firefox_executable} {
@@ -29,6 +31,8 @@
deny /etc/passwd r,
deny /etc/group r,
deny /etc/mailcap r,
...
...
@@ -33,7 +31,7 @@ index f782f35..426f7c8 100644
/etc/machine-id r,
/var/lib/dbus/machine-id r,
@@ -44,3
6
+48,35 @@
profile torbrowser_firefox @{torbrowser_firefox_executable} {
@@ -44,3
7
+48,35 @@
owner @{PROC}/@{pid}/task/*/stat r,
@{PROC}/sys/kernel/random/uuid r,
...
...
@@ -56,6 +54,7 @@ index f782f35..426f7c8 100644
- owner @{torbrowser_home_dir}/firefox rix,
- owner @{torbrowser_home_dir}/{,TorBrowser/UpdateInfo/}updates/[0-9]*/* rw,
- owner @{torbrowser_home_dir}/{,TorBrowser/UpdateInfo/}updates/[0-9]*/{,MozUpdater/bgupdate/}updater ix,
- owner @{torbrowser_home_dir}/updater ix,
- owner @{torbrowser_home_dir}/TorBrowser/Data/Browser/.parentwritetest rw,
- owner @{torbrowser_home_dir}/TorBrowser/Data/Browser/profiles.ini r,
- owner @{torbrowser_home_dir}/TorBrowser/Data/Browser/profile.default/{,**} rwk,
...
...
@@ -92,12 +91,12 @@ index f782f35..426f7c8 100644
+ /usr/share/doc/tails/website/** r,
# parent Firefox process when restarting after upgrade, Web Content processes
- owner @{torbrowser_firefox_executable}
i
xmr -> torbrowser_firefox,
- owner @{torbrowser_firefox_executable}
p
xmr -> torbrowser_firefox,
+ @{torbrowser_firefox_executable} pxmr -> torbrowser_firefox,
/etc/mailcap r,
/etc/mime.types r,
@@ -9
7
,1
4
+100,
9
@@
profile torbrowser_firefox @{torbrowser_firefox_executable} {
@@ -9
8
,1
2
+100,
6
@@
/sys/devices/system/node/node[0-9]*/meminfo r,
deny /sys/devices/virtual/block/*/uevent r,
...
...
@@ -109,11 +108,8 @@ index f782f35..426f7c8 100644
-
# Required for multiprocess Firefox (aka Electrolysis, i.e. e10s)
owner /{dev,run}/shm/org.chromium.* rw,
+ owner /dev/shm/org.mozilla.ipc.[0-9]*.[0-9]* rw, # for Chromium IPC
# Deny access to DRM nodes, that's granted by the X abstraction, which is
# sourced by the gnome abstraction, that we include.
@@ -116,6 +114,25 @@
profile torbrowser_firefox @{torbrowser_firefox_executable} {
owner /dev/shm/org.mozilla.ipc.[0-9]*.[0-9]* rw, # for Chromium IPC
@@ -118,6 +114,25 @@
deny @{HOME}/.cache/fontconfig/** rw,
deny @{HOME}/.config/gtk-2.0/ rw,
deny @{HOME}/.config/gtk-2.0/** rw,
...
...
@@ -139,7 +135,7 @@ index f782f35..426f7c8 100644
deny @{PROC}/@{pid}/net/route r,
deny /sys/devices/system/cpu/cpufreq/policy[0-9]*/cpuinfo_max_freq r,
deny /sys/devices/system/cpu/*/cache/index[0-9]*/size r,
@@ -13
2
,5 +149,10 @@
profile torbrowser_firefox @{torbrowser_firefox_executable} {
@@ -13
4
,5 +149,10 @@
/etc/xfce4/defaults.list r,
/usr/share/xfce4/applications/ r,
...
...
@@ -151,8 +147,6 @@ index f782f35..426f7c8 100644
+ deny owner /tmp/** rwklx,
+ deny /tmp/ rwklx,
}
diff --git a/etc/apparmor.d/tunables/torbrowser b/etc/apparmor.d/tunables/torbrowser
index 9b31139..f77e082 100644
--- a/etc/apparmor.d/tunables/torbrowser
+++ b/etc/apparmor.d/tunables/torbrowser
@@ -1,2 +1 @@
...
...
aufs-standalone
@
4f660e7c
Compare
4f22cb90
...
4f660e7c
Subproject commit 4f
22cb90488fae027f8fbde26ac7ac80cc484f76
Subproject commit 4f
660e7cbf750f9220d8d003c8ac9d83042e46c5
segfault
@segfault
mentioned in issue
#17332 (closed)
·
May 14, 2020
mentioned in issue
#17332 (closed)
mentioned in issue #17332
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment