diff options
author | netblue30 <netblue30@protonmail.com> | 2022-06-18 07:21:05 -0400 |
---|---|---|
committer | netblue30 <netblue30@protonmail.com> | 2022-06-18 07:21:05 -0400 |
commit | 964fe43ef842f9c463ae479892a3bb098e60927e (patch) | |
tree | f75125c703b6d81fc53e2d4ba93af936e23ba9d4 | |
parent | seccomp-log support in firejail.config (diff) | |
parent | update_deb.sh: fix not building with apparmor support (diff) | |
download | firejail-964fe43ef842f9c463ae479892a3bb098e60927e.tar.gz firejail-964fe43ef842f9c463ae479892a3bb098e60927e.tar.zst firejail-964fe43ef842f9c463ae479892a3bb098e60927e.zip |
Merge branch 'master' of ssh://github.com/netblue30/firejail
-rwxr-xr-x | contrib/update_deb.sh | 4 | ||||
-rw-r--r-- | src/lib/errno.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/update_deb.sh b/contrib/update_deb.sh index 316043701..4ee652024 100755 --- a/contrib/update_deb.sh +++ b/contrib/update_deb.sh | |||
@@ -9,13 +9,13 @@ set -e | |||
9 | 9 | ||
10 | git clone --depth=1 https://github.com/netblue30/firejail.git | 10 | git clone --depth=1 https://github.com/netblue30/firejail.git |
11 | cd firejail | 11 | cd firejail |
12 | ./configure --enable-apparmor --prefix=/usr | 12 | ./configure |
13 | 13 | ||
14 | # Fix https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916920 | 14 | # Fix https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916920 |
15 | sed -i "s/# restricted-network .*/restricted-network yes/" \ | 15 | sed -i "s/# restricted-network .*/restricted-network yes/" \ |
16 | etc/firejail.config | 16 | etc/firejail.config |
17 | 17 | ||
18 | make deb | 18 | make deb-apparmor |
19 | sudo dpkg -i firejail*.deb | 19 | sudo dpkg -i firejail*.deb |
20 | echo "Firejail updated." | 20 | echo "Firejail updated." |
21 | cd .. | 21 | cd .. |
diff --git a/src/lib/errno.c b/src/lib/errno.c index b666c5646..99b028e27 100644 --- a/src/lib/errno.c +++ b/src/lib/errno.c | |||
@@ -31,7 +31,7 @@ typedef struct { | |||
31 | 31 | ||
32 | static ErrnoEntry errnolist[] = { | 32 | static ErrnoEntry errnolist[] = { |
33 | // | 33 | // |
34 | // code generated using tools/extract-errnos | 34 | // code generated using ../tools/extract_errnos.sh |
35 | // | 35 | // |
36 | {"EPERM", EPERM}, | 36 | {"EPERM", EPERM}, |
37 | {"ENOENT", ENOENT}, | 37 | {"ENOENT", ENOENT}, |