589 files changed, 1314 insertions, 1083 deletions
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..7d98c1b14
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,34 @@
+root = true
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+# Build
+[configure.ac]
+indent_size = 8
+indent_style = tab
+[*{.mk,Makefile}{,.in}]
+indent_size = 8
+indent_style = tab
+# Source code and scripts
+[*.{c,h}{,.in}]
+indent_size = 8
+indent_style = tab
+[*.{awk,exp,sh}{,.in}]
+indent_size = 8
+indent_style = tab
+[*.py{,.in}]
+indent_size = 4
+indent_style = space
+# Misc
+[.gitlab-ci.yml]
+indent_size = 4
+indent_style = space
diff --git a/.gitattributes b/.gitattributes
index 6b329f917..61bf3bfb7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,6 @@
+* text=auto eol=lf
+*.AppImage -text
+*.zip -text
 /etc/inc/*.inc linguist-language=text
diff --git a/.github/.editorconfig b/.github/.editorconfig
new file mode 100644
index 000000000..eb5c699c5
--- /dev/null
+++ b/.github/.editorconfig
@@ -0,0 +1,3 @@
+[*.yml]
+indent_size = 2
+indent_style = space
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index c8c6f40bd..53066013d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -81,7 +81,7 @@ output goes here
 <details>
 <summary>Output of <code>LC_ALL=C firejail --debug /path/to/program</code></summary>
 <p>
-  
 <!-- If the output is too long to embed it into the comment,
     create a secret gist at https://gist.github.com/ and link it here. -->
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 7cb92a938..80945c8ba 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,17 +1,17 @@
 If your PR isn't about profiles or you have no idea how to do one of these, skip the following and go ahead with this PR.
 If you submit a PR for new profiles or changing profiles, please do the following:
- - The ordering of options follow the rules described in [/usr/share/doc/firejail/profile.template](https://github.com/netblue30/firejail/blob/master/etc/templates/profile.template).  
+- The ordering of options follow the rules described in [/usr/share/doc/firejail/profile.template](https://github.com/netblue30/firejail/blob/master/etc/templates/profile.template).
-   > Hint: The profile-template is very new. If you install firejail with your package manager, it may be missing. In order to follow the latest rules, it is recommended to use the template from the repository.
+> Hint: The profile-template is very new. If you install firejail with your package manager, it may be missing. In order to follow the latest rules, it is recommended to use the template from the repository.
- - Order the arguments of options alphabetically. You can easily do this with [sort.py](https://github.com/netblue30/firejail/tree/master/contrib/sort.py).  
+- Order the arguments of options alphabetically. You can easily do this with [sort.py](https://github.com/netblue30/firejail/tree/master/contrib/sort.py).
- The path to it depends on your distro:
+The path to it depends on your distro:
-   | Distro | Path |
+| Distro | Path |
-   | ------ | ---- |
+| ------ | ---- |
-   | Arch/Fedora | `/usr/lib64/firejail/sort.py` |
+| Arch/Fedora | `/usr/lib64/firejail/sort.py` |
-   | Debian/Ubuntu/Mint | `/usr/lib/x86_64-linux-gnu/firejail/sort.py` |
+| Debian/Ubuntu/Mint | `/usr/lib/x86_64-linux-gnu/firejail/sort.py` |
-   | local git clone | `contrib/sort.py` |
+| local git clone | `contrib/sort.py` |
-   Note also that the sort.py script exists only since firejail `0.9.61`.
+Note also that the sort.py script exists only since firejail `0.9.61`.
 See also [CONTRIBUTING.md](/CONTRIBUTING.md).
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f61e19fdc..f1167b78b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -62,7 +62,7 @@ jobs:
    - name: install dependencies
      run: sudo apt-get install gcc-12 libapparmor-dev libselinux1-dev expect xzdec whois
    - name: configure
-      run: CC=gcc-12 ./configure --enable-fatal-warnings --enable-analyzer --enable-apparmor --enable-selinux --prefix=/usr
+      run: CC=gcc-12 ./configure --prefix=/usr --enable-fatal-warnings --enable-analyzer --enable-apparmor --enable-selinux
    - name: make
      run: make
    - name: make install
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 9cf216492..c232f59d9 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -88,7 +88,7 @@ jobs:
    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
-      uses: github/codeql-action/init@3ebbd71c74ef574dbc558c82f70e52732c8b44fe
+      uses: github/codeql-action/init@17573ee1cc1b9d061760f3a006fc4aac4f944fd5
      with:
        languages: ${{ matrix.language }}
        # If you wish to specify custom queries, you can do so here or in a config file.
@@ -99,7 +99,7 @@ jobs:
    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
    # If this step fails, then you should remove it and run the build manually (see below)
    - name: Autobuild
-      uses: github/codeql-action/autobuild@3ebbd71c74ef574dbc558c82f70e52732c8b44fe
+      uses: github/codeql-action/autobuild@17573ee1cc1b9d061760f3a006fc4aac4f944fd5
    # ℹ️ Command-line programs to run using the OS shell.
    # 📚 https://git.io/JvXDl
@@ -113,4 +113,4 @@ jobs:
    #   make release
    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@3ebbd71c74ef574dbc558c82f70e52732c8b44fe
+      uses: github/codeql-action/analyze@17573ee1cc1b9d061760f3a006fc4aac4f944fd5
diff --git a/.github/workflows/profile-checks.yml b/.github/workflows/profile-checks.yml
index 66bba61f5..ad4f86b53 100644
--- a/.github/workflows/profile-checks.yml
+++ b/.github/workflows/profile-checks.yml
@@ -34,8 +34,8 @@ jobs:
          github.com:443
    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
-    - name: sort.py
+#   - name: sort.py
-      run: ./ci/check/profiles/sort.py etc/inc/*.inc etc/{profile-a-l,profile-m-z}/*.profile
+#      run: ./ci/check/profiles/sort.py etc/inc/*.inc etc/{profile-a-l,profile-m-z}/*.profile
 # Currently broken (see #5610)
 #    - name: private-etc-always-required.sh
 #      run: ./ci/check/profiles/private-etc-always-required.sh etc/inc/*.inc etc/{profile-a-l,profile-m-z}/*.profile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index af590e2e1..6dcb40e67 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,8 +9,8 @@ build_ubuntu_package:
    image: ubuntu:rolling
    script:
        - apt-get update -qq
-        - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian pkg-config python3 gawk
+        - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian libapparmor-dev pkg-config python3 gawk
-        - ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb
+        - ./configure && make deb && dpkg -i firejail*.deb
        - command -V firejail && firejail --version
        - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc
@@ -18,8 +18,8 @@ build_debian_package:
    image: debian:stretch
    script:
        - apt-get update -qq
-        - apt-get install -y -qq build-essential lintian pkg-config gawk
+        - apt-get install -y -qq build-essential lintian libapparmor-dev pkg-config gawk
-        - ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb
+        - ./configure && make deb && dpkg -i firejail*.deb
        - command -V firejail && firejail --version
 build_redhat_package:
@@ -49,14 +49,14 @@ build_src_package:
        - command -V firejail && firejail --version
        # - python3 contrib/sort.py etc/*.{profile,inc}
-build_apparmor:
+build_no_apparmor:
    image: ubuntu:latest
    script:
        - apt-get update -qq
-        - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian libapparmor-dev pkg-config gawk
+        - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian pkg-config gawk
-        - ./configure && make deb-apparmor && dpkg -i firejail*.deb
+        - ./configure && make dist && ./mkdeb.sh --disable-apparmor && dpkg -i firejail*.deb
        - command -V firejail && firejail --version
-        - firejail --version | grep -F 'AppArmor support is enabled'
+        - firejail --version | grep -F 'AppArmor support is disabled'
 debian_ci:
    image: registry.salsa.debian.org/salsa-ci-team/ci-image-git-buildpackage:latest
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 97730e533..76d3e709b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,14 +9,14 @@ our [dedicated issue](https://github.com/netblue30/firejail/issues/1139).
 When submitting a bug report, please provide the following information so that
 we can handle the report more easily:
- - firejail version. If you're not sure, open a terminal and type `firejail --version`.
+- firejail version. If you're not sure, open a terminal and type `firejail --version`.
- - Linux distribution (so that we can try to reproduce it, if necessary).
+- Linux distribution (so that we can try to reproduce it, if necessary).
- - If you know that the problem did not exist in an earlier version of firejail, please mention it.
+- If you know that the problem did not exist in an earlier version of firejail, please mention it.
- - If you are reporting that a program does not work with firejail, please also run firejail with
+- If you are reporting that a program does not work with firejail, please also run firejail with
- the `--noprofile` argument.
+the `--noprofile` argument.
- For example, if `firejail firefox` does not work, please also run `firejail --noprofile firefox` and
+For example, if `firejail firefox` does not work, please also run `firejail --noprofile firefox` and
- let us know if it runs correctly or not.
+let us know if it runs correctly or not.
- - You may also try disabling various options provided in `/etc/firejail/<ProgramName.profile>` until you find out which one causes problems. It will significantly help to find solution for your issue.
+- You may also try disabling various options provided in `/etc/firejail/<ProgramName.profile>` until you find out which one causes problems. It will significantly help to find solution for your issue.
 Please note: if you are running Debian, Ubuntu, Linux Mint, or another related
 distribution and you installed firejail from your distro's repositories, please
@@ -36,10 +36,10 @@ If you have already written a profile, please make sure it follows the rules des
 If you add a new command, here's the checklist:
- - [ ] Update manpages: firejail(1) and firejail-profile(5)
+- [ ] Update manpages: firejail(1) and firejail-profile(5)
- - [ ] Update shell completions
+- [ ] Update shell completions
- - [ ] Update syntax files (run `make syntax` or just `make`)
+- [ ] Update syntax files (run `make syntax` or just `make`)
- - [ ] Update --help
+- [ ] Update --help
 # Editing the wiki
diff --git a/Makefile b/Makefile
index 010f7f0aa..d7e2eb209 100644
--- a/Makefile
+++ b/Makefile
@@ -340,10 +340,6 @@ asc: config.mk
 deb: dist config.sh
        ./mkdeb.sh
-.PHONY: deb-apparmor
-deb-apparmor: dist config.sh
-        ./mkdeb.sh -apparmor --enable-apparmor
 .PHONY: test-compile
 test-compile: dist config.mk
        cd test/compile; ./compile.sh $(TARNAME)-$(VERSION)
diff --git a/README b/README
index 13331d2f4..7750fc049 100644
--- a/README
+++ b/README
@@ -34,7 +34,7 @@ $ sudo apt-get install git build-essential libapparmor-dev pkg-config gawk
 For --selinux option, add libselinux1-dev (libselinux-devel for Fedora).
 We build our release firejail.tar.xz and firejail.deb packages using the following command:
-$ make distclean && ./configure && make deb-apparmor
+$ make distclean && ./configure && make deb
 Maintainer:
@@ -329,6 +329,8 @@ Dara Adib (https://github.com/daradib)
        - linphone profile fix
 Dario Pellegrini (https://github.com/dpellegr)
        - allowing links in netns
+David Fetter (https://github.com/davidfetter)
+        - bump up copyright years
 David Thole (https://github.com/TheDarkTrumpet)
        - added profile for teams-for-linux
 Davide Beatrici (https://github.com/davidebeatrici)
@@ -685,6 +687,7 @@ LaurentGH (https://github.com/LaurentGH)
        - allow private-bin parameters to be absolute paths
 layderv (https://github.com/layderv)
        - prevent sandbox name from containing only digits
+        - clean escape control characters from the command line
 lecso7 (https://github.com/lecso7)
        - added goldendict profile
        - allow evince to read .cbz file format
@@ -774,6 +777,8 @@ Neo00001 (https://github.com/Neo00001)
        - update telegram profile
        - add spectacle profile
        - add kdiff3 profile
+netcarver (https://github.com/netcarver)
+        - prevent access to LUKS keyfile
 NetSysFire (https://github.com/NetSysFire)
        - update weechat profile
        - update megaglest profile
@@ -996,6 +1001,7 @@ slowpeek (https://github.com/slowpeek)
        - allow access to avahi-daemon in apparmor/firejail-default
        - make appimage examples consistent with --appimage option short description
        - blacklist google-drive-ocamlfuse config
+        - blacklist sendgmail config
 smitsohu (https://github.com/smitsohu)
        - read-only kde4 services directory
        - enhanced mediathekview profile
@@ -1073,7 +1079,7 @@ SYN-cook (https://github.com/SYN-cook)
 startx2017 (https://github.com/startx2017)
        - syscall list update
        - updated default seccomp filters - added bpf, clock_settime, personality, process_vm_writev, query_module,
-                      settimeofday, stime, umount, userfaultfd, ustat, vm86, and vm86old
+          settimeofday, stime, umount, userfaultfd, ustat, vm86, and vm86old
        - enable/disable join support in /etc/firejail/firejail.config
        - firecfg fix: create ~/.local/share/applications directory if it doesn't exist
        - firejail.config cleanup
@@ -1242,4 +1248,4 @@ Zack Weinberg (https://github.com/zackw)
 zupatisc (https://github.com/zupatisc)
        - patch-util fix
-Copyright (C) 2014-2022 Firejail Authors
+Copyright (C) 2014-2023 Firejail Authors
diff --git a/README.md b/README.md
index 0f6ca9b08..22e2fa291 100644
--- a/README.md
+++ b/README.md
@@ -268,5 +268,3 @@ Stats:
    dbus-system filter          12
 ```
diff --git a/RELNOTES b/RELNOTES
index 90a6982e8..3309e4438 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,14 +1,23 @@
 firejail (0.9.73) baseline; urgency=low
  * work in progress
+  * feature: Add "keep-shell-rc" command and option (#1127 #5634)
  * modif: Stop forwarding own double-dash to the shell (#5599 #5600)
-  * modif: Prevent sandbox name from containing only digits (#5578)
+  * modif: Prevent sandbox name (--name=) and host name (--hostname=)
+    from containing only digits (#5578)
+  * modif: Escape control characters of the command line (#5613)
+  * modif: Allow only letters and digits for sandbox name (--name=) and
+    host name (--hostname=)
  * bugfix: qutebrowser: links will not open in the existing instance (#5601
    #5618)
-  * feature: added --keep-shell-rc command and profile option (#1127)
  * build: auto-generate syntax files (#5627)
  * build: mark most phony targets as such (#5637)
+  * build: mkdeb.sh: pass all arguments to ./configure (#5654)
+  * build: deb: enable apparmor by default & remove deb-apparmor (#5668)
  * docs: remove apparmor options in --help when building without apparmor
    support (#5589)
+  * docs: selinux.c: Split Copyright notice & use same license as upstream
+    (#5667)
+  * new profiles: fix-qdf, qpdf, zlib-flate 
 -- netblue30 <netblue30@yahoo.com>  Mon, 16 Jan 2023 09:00:00 -0500
 firejail (0.9.72) baseline; urgency=low
diff --git a/contrib/fj-mkdeb.py b/contrib/fj-mkdeb.py
index b215b157b..95c6d08e9 100755
--- a/contrib/fj-mkdeb.py
+++ b/contrib/fj-mkdeb.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 # This script automates the creation of a .deb package.  It was originally
diff --git a/contrib/fjclip.py b/contrib/fjclip.py
index 893fff243..5bc1f17ad 100755
--- a/contrib/fjclip.py
+++ b/contrib/fjclip.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 import sys
diff --git a/contrib/fjdisplay.py b/contrib/fjdisplay.py
index a49aa3e36..512a0d3b7 100755
--- a/contrib/fjdisplay.py
+++ b/contrib/fjdisplay.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 import re
diff --git a/contrib/fjresize.py b/contrib/fjresize.py
index 6575d6a0b..bc3dad8f8 100755
--- a/contrib/fjresize.py
+++ b/contrib/fjresize.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 import sys
diff --git a/contrib/gdb-firejail.sh b/contrib/gdb-firejail.sh
index 35348088e..032b031f0 100755
--- a/contrib/gdb-firejail.sh
+++ b/contrib/gdb-firejail.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set -x
@@ -13,11 +13,11 @@ set -x
 # setuid firejail process from the absolute beginning.
 if [ -z "${1##*/firejail}" ]; then
-    FIREJAIL=$1
+        FIREJAIL=$1
 else
-    # First argument is not named firejail, then add default unless environment
+        # First argument is not named firejail, then add default unless environment
-    # variable already set.
+        # variable already set.
-    set -- ${FIREJAIL:=$(command -v firejail)} "$@"
+        set -- ${FIREJAIL:=$(command -v firejail)} "$@"
 fi
 bash -c "kill -STOP \$\$; exec \"\$0\" \"\$@\"" "$@" &
diff --git a/contrib/jail_prober.py b/contrib/jail_prober.py
index 9776e9380..fcfe90eb7 100755
--- a/contrib/jail_prober.py
+++ b/contrib/jail_prober.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 """
 Figure out which profile options may be causing a particular program to break
diff --git a/contrib/sort.py b/contrib/sort.py
index 638f14516..cdeecf99b 100755
--- a/contrib/sort.py
+++ b/contrib/sort.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 # Requirements:
diff --git a/contrib/syntax/.editorconfig b/contrib/syntax/.editorconfig
new file mode 100644
index 000000000..385bf17d5
--- /dev/null
+++ b/contrib/syntax/.editorconfig
@@ -0,0 +1,7 @@
+[*.lang{,.in}]
+indent_size = 2
+indent_style = space
+[*.vim{,.in}]
+indent_size = 2
+indent_style = space
diff --git a/contrib/syscalls.sh b/contrib/syscalls.sh
index d13f24280..aece84e72 100755
--- a/contrib/syscalls.sh
+++ b/contrib/syscalls.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 STRACE_OUTPUT_FILE="$(pwd)/strace_output.txt"
@@ -8,22 +8,22 @@ SYSCALLS_OUTPUT_FILE="$(pwd)/syscalls.txt"
 if [ $# -eq 0 ]
 then
-  echo
+        echo
-  echo "   *** No program specified!!! ***"
+        echo "   *** No program specified!!! ***"
-  echo
+        echo
-  echo -e "Make this file executable and execute it as:\\n"
+        echo -e "Make this file executable and execute it as:\\n"
-  echo -e "\\e[96m   syscalls.sh /full/path/to/program\\n"
+        echo -e "\\e[96m   syscalls.sh /full/path/to/program\\n"
-  echo -e "\\e[39mif you saved this script in a directory in your PATH (e.g., in ${HOME}/bin), otherwise as:\\n"
+        echo -e "\\e[39mif you saved this script in a directory in your PATH (e.g., in ${HOME}/bin), otherwise as:\\n"
-  echo -e "\\e[96m   ./syscalls.sh /full/path/to/program\\n"
+        echo -e "\\e[96m   ./syscalls.sh /full/path/to/program\\n"
-  echo -e "\\e[39mUse the full path to the respective program to avoid executing it sandboxed with Firejail\\n(if a Firejail profile for it already exits and 'sudo firecfg' was executed earlier)\\nin order to determine the necessary system calls."
+        echo -e "\\e[39mUse the full path to the respective program to avoid executing it sandboxed with Firejail\\n(if a Firejail profile for it already exits and 'sudo firecfg' was executed earlier)\\nin order to determine the necessary system calls."
-  echo
+        echo
-  exit 0
+        exit 0
 else
-  strace -cfo "$STRACE_OUTPUT_FILE" "$@" && awk '{print $NF}' "$STRACE_OUTPUT_FILE" | sed '/syscall\|-\|total/d' | sort -u | awk -vORS=, '{ print $1 }' | sed 's/,$/\n/' > "$SYSCALLS_OUTPUT_FILE"
+        strace -cfo "$STRACE_OUTPUT_FILE" "$@" && awk '{print $NF}' "$STRACE_OUTPUT_FILE" | sed '/syscall\|-\|total/d' | sort -u | awk -vORS=, '{ print $1 }' | sed 's/,$/\n/' > "$SYSCALLS_OUTPUT_FILE"
-  echo
+        echo
-  echo -e "\e[39mThese are the sorted syscalls:\n\e[93m"
+        echo -e "\e[39mThese are the sorted syscalls:\n\e[93m"
-  cat "$SYSCALLS_OUTPUT_FILE"
+        cat "$SYSCALLS_OUTPUT_FILE"
-  echo
+        echo
-  echo -e "\e[39mThe sorted syscalls were saved to:\n\e[96m$SYSCALLS_OUTPUT_FILE\n\e[39m"
+        echo -e "\e[39mThe sorted syscalls were saved to:\n\e[96m$SYSCALLS_OUTPUT_FILE\n\e[39m"
-  exit 0
+        exit 0
 fi
diff --git a/contrib/update_deb.sh b/contrib/update_deb.sh
index 4ee652024..aaefc38a8 100755
--- a/contrib/update_deb.sh
+++ b/contrib/update_deb.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 # Purpose: Fetch, compile, and install firejail from GitHub source. For
@@ -15,7 +15,7 @@ cd firejail
 sed -i "s/# restricted-network .*/restricted-network yes/" \
    etc/firejail.config
-make deb-apparmor
+make deb
 sudo dpkg -i firejail*.deb
 echo "Firejail updated."
 cd ..
diff --git a/etc/inc/disable-common.inc b/etc/inc/disable-common.inc
index 03daaa9a6..65159b951 100644
--- a/etc/inc/disable-common.inc
+++ b/etc/inc/disable-common.inc
@@ -168,8 +168,10 @@ blacklist ${HOME}/.local/share/systemd
 blacklist ${PATH}/systemctl
 blacklist ${PATH}/systemd-run
 blacklist ${RUNUSER}/systemd
+blacklist /etc/credstore*
 blacklist /etc/systemd/network
 blacklist /etc/systemd/system
+blacklist /run/credentials
 blacklist /var/lib/systemd
 # creates problems on Arch where /etc/resolv.conf is a symlink to /var/run/systemd/resolve/resolv.conf
 #blacklist /var/run/systemd
@@ -450,6 +452,9 @@ blacklist ${HOME}/.vaults
 blacklist /run/timeshift
 blacklist /var/backup
+# dm-crypt / LUKS
+blacklist /crypto_keyfile.bin
 # Remove environment variables with auth tokens.
 # Note however that the sandbox might still have access to the
 # files where these variables are set.
diff --git a/etc/inc/disable-programs.inc b/etc/inc/disable-programs.inc
index 2a7e1a898..3eb6c03d5 100644
--- a/etc/inc/disable-programs.inc
+++ b/etc/inc/disable-programs.inc
@@ -605,6 +605,7 @@ blacklist ${HOME}/.config/rpcs3
 blacklist ${HOME}/.config/rtv
 blacklist ${HOME}/.config/scribus
 blacklist ${HOME}/.config/scribusrc
+blacklist ${HOME}/.config/sendgmail
 blacklist ${HOME}/.config/sinew.in
 blacklist ${HOME}/.config/sink
 blacklist ${HOME}/.config/skypeforlinux
@@ -1108,6 +1109,7 @@ blacklist ${HOME}/.sbt
 blacklist ${HOME}/.scorched3d
 blacklist ${HOME}/.scribus
 blacklist ${HOME}/.scribusrc
+blacklist ${HOME}/.sendgmail.*
 blacklist ${HOME}/.simutrans
 blacklist ${HOME}/.smartgit/*/passwords
 blacklist ${HOME}/.ssr
diff --git a/etc/inc/whitelist-usr-share-common.inc b/etc/inc/whitelist-usr-share-common.inc
index bb0bcd050..dcf941004 100644
--- a/etc/inc/whitelist-usr-share-common.inc
+++ b/etc/inc/whitelist-usr-share-common.inc
@@ -29,6 +29,7 @@ whitelist /usr/share/gtk-engines
 whitelist /usr/share/gtksourceview-3.0
 whitelist /usr/share/gtksourceview-4
 whitelist /usr/share/hunspell
+whitelist /usr/share/hyphen
 whitelist /usr/share/hwdata
 whitelist /usr/share/icons
 whitelist /usr/share/icu
diff --git a/etc/profile-a-l/apostrophe.profile b/etc/profile-a-l/apostrophe.profile
index 4ad6ac6bc..0655c2e6f 100644
--- a/etc/profile-a-l/apostrophe.profile
+++ b/etc/profile-a-l/apostrophe.profile
@@ -35,7 +35,6 @@ whitelist /usr/share/apostrophe
 whitelist /usr/share/texlive
 whitelist /usr/share/texmf
 whitelist /usr/share/pandoc-*
-whitelist /usr/share/perl5
 include whitelist-runuser-common.inc
 include whitelist-usr-share-common.inc
 include whitelist-var-common.inc
diff --git a/etc/profile-a-l/archiver-common.profile b/etc/profile-a-l/archiver-common.profile
index b0f83aa32..ef875c5b7 100644
--- a/etc/profile-a-l/archiver-common.profile
+++ b/etc/profile-a-l/archiver-common.profile
@@ -44,6 +44,7 @@ x11 none
 private-cache
 private-dev
+private-etc
 dbus-user none
 dbus-system none
diff --git a/etc/profile-a-l/audacity.profile b/etc/profile-a-l/audacity.profile
index 371054728..c2a482b61 100644
--- a/etc/profile-a-l/audacity.profile
+++ b/etc/profile-a-l/audacity.profile
@@ -50,6 +50,7 @@ tracelog
 private-bin audacity
 private-dev
+private-etc @x11
 private-tmp
 # problems on Fedora 27
diff --git a/etc/profile-a-l/bibtex.profile b/etc/profile-a-l/bibtex.profile
index e868dcbab..5f12d61f1 100644
--- a/etc/profile-a-l/bibtex.profile
+++ b/etc/profile-a-l/bibtex.profile
@@ -9,4 +9,3 @@ private-bin bibtex
 # Redirect
 include latex-common.profile
diff --git a/etc/profile-a-l/com.github.johnfactotum.Foliate.profile b/etc/profile-a-l/com.github.johnfactotum.Foliate.profile
index f4533b537..6177b52c0 100644
--- a/etc/profile-a-l/com.github.johnfactotum.Foliate.profile
+++ b/etc/profile-a-l/com.github.johnfactotum.Foliate.profile
@@ -2,7 +2,7 @@
 # Description: Simple and modern GTK eBook reader
 # This file is overwritten after every install/update
 # Persistent local customizations
-include foliate.local
+include com.github.johnfactotum.Foliate.local
 # Persistent global definitions
 include globals.local
@@ -28,7 +28,6 @@ whitelist ${HOME}/.local/share/com.github.johnfactotum.Foliate
 whitelist ${DOCUMENTS}
 whitelist ${DOWNLOADS}
 whitelist /usr/share/com.github.johnfactotum.Foliate
-whitelist /usr/share/hyphen
 include whitelist-common.inc
 include whitelist-usr-share-common.inc
 include whitelist-var-common.inc
diff --git a/etc/profile-a-l/dosbox.profile b/etc/profile-a-l/dosbox.profile
index 1edbb7ca0..882709808 100644
--- a/etc/profile-a-l/dosbox.profile
+++ b/etc/profile-a-l/dosbox.profile
@@ -37,6 +37,7 @@ tracelog
 private-bin dosbox
 private-dev
+private-etc @games
 private-tmp
 dbus-user none
diff --git a/etc/profile-a-l/electron-hardened.inc.profile b/etc/profile-a-l/electron-hardened.inc.profile
index eacf5cebe..a9e1756d9 100644
--- a/etc/profile-a-l/electron-hardened.inc.profile
+++ b/etc/profile-a-l/electron-hardened.inc.profile
@@ -7,4 +7,4 @@ include electron-hardened.inc.local
 #include globals.local
 # Redirect
-include chrome-common-hardened.inc.profile
+include chromium-common-hardened.inc.profile
diff --git a/etc/profile-a-l/etr.profile b/etc/profile-a-l/etr.profile
index 7d27f12c9..5b9892af3 100644
--- a/etc/profile-a-l/etr.profile
+++ b/etc/profile-a-l/etr.profile
@@ -49,6 +49,7 @@ private-bin etr
 private-cache
 private-dev
 # private-etc alternatives,drirc,machine-id,openal,passwd
+private-etc @games,@x11
 private-tmp
 dbus-user none
diff --git a/etc/profile-a-l/fix-qdf.profile b/etc/profile-a-l/fix-qdf.profile
new file mode 100644
index 000000000..2dbb44e1d
--- /dev/null
+++ b/etc/profile-a-l/fix-qdf.profile
@@ -0,0 +1,13 @@
+# Firejail profile for fix-qdf
+# This file is overwritten after every install/update
+quiet
+# Persistent local customizations
+include fix-qdf.local
+# Persistent global definitions
+# added by included profile
+#include globals.local
+private-bin fix-qdf
+# Redirect
+include qpdf.profile
diff --git a/etc/profile-a-l/frozen-bubble.profile b/etc/profile-a-l/frozen-bubble.profile
index 86a8a8fc6..f162a4a31 100644
--- a/etc/profile-a-l/frozen-bubble.profile
+++ b/etc/profile-a-l/frozen-bubble.profile
@@ -22,6 +22,7 @@ mkdir ${HOME}/.frozen-bubble
 whitelist ${HOME}/.frozen-bubble
 include whitelist-common.inc
 include whitelist-runuser-common.inc
+whitelist /usr/share/games
 include whitelist-usr-share-common.inc
 include whitelist-var-common.inc
@@ -42,6 +43,7 @@ tracelog
 disable-mnt
 # private-bin frozen-bubble
 private-dev
+private-etc @games,@x11
 private-tmp
 dbus-user none
diff --git a/etc/profile-a-l/gimp.profile b/etc/profile-a-l/gimp.profile
index 717519112..6f350f8ac 100644
--- a/etc/profile-a-l/gimp.profile
+++ b/etc/profile-a-l/gimp.profile
@@ -59,7 +59,7 @@ seccomp !mbind
 tracelog
 private-dev
-private-etc @tls-ca,@x11,python*
+private-etc @x11,python*
 private-tmp
 dbus-user none
diff --git a/etc/profile-a-l/gnome-calculator.profile b/etc/profile-a-l/gnome-calculator.profile
index 3926146ff..e5c6022e8 100644
--- a/etc/profile-a-l/gnome-calculator.profile
+++ b/etc/profile-a-l/gnome-calculator.profile
@@ -45,6 +45,7 @@ disable-mnt
 private-bin gnome-calculator
 private-cache
 private-dev
+private-etc @x11
 #private-lib gdk-pixbuf-2.*,gio,girepository-1.*,gvfs,libgconf-2.so.*,libgnutls.so.*,libproxy.so.*,librsvg-2.so.*,libxml2.so.*
 private-tmp
diff --git a/etc/profile-a-l/hasher-common.profile b/etc/profile-a-l/hasher-common.profile
index fd8246aae..96e69d6cf 100644
--- a/etc/profile-a-l/hasher-common.profile
+++ b/etc/profile-a-l/hasher-common.profile
@@ -48,6 +48,7 @@ x11 none
 # Add the next line to your hasher-common.local if you don't need to hash files in ~/.cache.
 #private-cache
 private-dev
+private-etc
 # Add the next line to your hasher-common.local if you don't need to hash files in /tmp.
 #private-tmp
diff --git a/etc/profile-a-l/iagno.profile b/etc/profile-a-l/iagno.profile
index e16f3f1d5..82cba7887 100644
--- a/etc/profile-a-l/iagno.profile
+++ b/etc/profile-a-l/iagno.profile
@@ -13,6 +13,13 @@ include disable-interpreters.inc
 include disable-programs.inc
 include disable-shell.inc
+whitelist ${HOME}/.local/share/glib-2.0/schemas
+include whitelist-common.inc
+include whitelist-runuser-common.inc
+whitelist /usr/share/iagno
+whitelist /usr/share/gdm
+include whitelist-usr-share-common.inc
 include whitelist-var-common.inc
 apparmor
@@ -28,11 +35,12 @@ nou2f
 novideo
 protocol unix
 seccomp
+seccomp.block-secondary
 disable-mnt
-private
 private-bin iagno
 private-dev
+private-etc @x11,gconf
 private-tmp
 # dbus-user none
diff --git a/etc/profile-a-l/kdiff3.profile b/etc/profile-a-l/kdiff3.profile
index e0b3eadfd..d9e4480f5 100644
--- a/etc/profile-a-l/kdiff3.profile
+++ b/etc/profile-a-l/kdiff3.profile
@@ -52,6 +52,7 @@ disable-mnt
 private-bin kdiff3
 private-cache
 private-dev
+private-etc @x11
 dbus-user none
 dbus-system none
diff --git a/etc/profile-a-l/latex.profile b/etc/profile-a-l/latex.profile
index 2230dd570..f6e625d35 100644
--- a/etc/profile-a-l/latex.profile
+++ b/etc/profile-a-l/latex.profile
@@ -9,4 +9,3 @@ private-bin latex
 # Redirect
 include latex-common.profile
diff --git a/etc/profile-a-l/libreoffice.profile b/etc/profile-a-l/libreoffice.profile
index 518928876..d7144d8c3 100644
--- a/etc/profile-a-l/libreoffice.profile
+++ b/etc/profile-a-l/libreoffice.profile
@@ -50,6 +50,7 @@ tracelog
 #private-bin libreoffice,sh,uname,dirname,grep,sed,basename,ls
 private-cache
 private-dev
+private-etc @tls-ca,@x11,cups,gnupg,libreoffice,papersize,ssh
 private-tmp
 dbus-system none
diff --git a/etc/profile-m-z/open-invaders.profile b/etc/profile-m-z/open-invaders.profile
index f6b070ab3..498a4f6c8 100644
--- a/etc/profile-m-z/open-invaders.profile
+++ b/etc/profile-m-z/open-invaders.profile
@@ -35,6 +35,7 @@ seccomp
 private-bin open-invaders
 private-dev
+private-etc @x11
 private-tmp
 dbus-user none
diff --git a/etc/profile-m-z/pdflatex.profile b/etc/profile-m-z/pdflatex.profile
index caf980d4d..ddf6d0990 100644
--- a/etc/profile-m-z/pdflatex.profile
+++ b/etc/profile-m-z/pdflatex.profile
@@ -9,4 +9,3 @@ private-bin pdflatex
 # Redirect
 include latex-common.profile
diff --git a/etc/profile-m-z/presentations18.profile b/etc/profile-m-z/presentations18.profile
index 65d684c40..ac844d1af 100644
--- a/etc/profile-m-z/presentations18.profile
+++ b/etc/profile-m-z/presentations18.profile
@@ -8,4 +8,3 @@ include globals.local
 # Redirect
 include softmaker-common.profile
diff --git a/etc/profile-m-z/qpdf.profile b/etc/profile-m-z/qpdf.profile
new file mode 100644
index 000000000..0c1e09e92
--- /dev/null
+++ b/etc/profile-m-z/qpdf.profile
@@ -0,0 +1,68 @@
+# Firejail profile for qpdf
+# Description: A Content-Preserving PDF Transformation System
+# This file is overwritten after every install/update
+quiet
+# Persistent local customizations
+include qpdf.local
+# Persistent global definitions
+include globals.local
+blacklist ${RUNUSER}/wayland-*
+noblacklist ${DOCUMENTS}
+include disable-common.inc
+include disable-devel.inc
+include disable-exec.inc
+include disable-interpreters.inc
+include disable-proc.inc
+include disable-programs.inc
+include disable-shell.inc
+include disable-X11.inc
+include disable-xdg.inc
+whitelist ${DOCUMENTS}
+whitelist ${DOWNLOADS}
+include whitelist-common.inc
+include whitelist-run-common.inc
+include whitelist-runuser-common.inc
+include whitelist-usr-share-common.inc
+include whitelist-var-common.inc
+apparmor
+caps.drop all
+hostname qpdf
+ipc-namespace
+machine-id
+net none
+no3d
+nodvd
+nogroups
+noinput
+nonewprivs
+noprinters
+noroot
+nosound
+notv
+nou2f
+novideo
+# block the socket syscall to simulate an be empty protocol line, see #639
+seccomp socket
+tracelog
+x11 none
+private-bin qpdf
+private-cache
+private-dev
+private-etc
+private-lib libqpdf.so.*
+#private-tmp # breaks on Arch Linux
+dbus-user none
+dbus-system none
+memory-deny-write-execute
+restrict-namespaces
+read-only ${HOME}
+read-write ${DOCUMENTS}
+read-write ${DOWNLOADS}
diff --git a/etc/profile-m-z/qutebrowser.profile b/etc/profile-m-z/qutebrowser.profile
index e83484ae5..0d35dbbad 100644
--- a/etc/profile-m-z/qutebrowser.profile
+++ b/etc/profile-m-z/qutebrowser.profile
@@ -18,6 +18,8 @@ include allow-bin-sh.inc
 include allow-python2.inc
 include allow-python3.inc
+ignore noexec ${HOME}
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
@@ -41,7 +43,7 @@ include whitelist-runuser-common.inc
 include whitelist-usr-share-common.inc
 include whitelist-var-common.inc
-apparmor
+#apparmor # breaks userscripts under ${HOME}, see #5639
 caps.drop all
 netfilter
 nodvd
diff --git a/etc/profile-m-z/rhythmbox.profile b/etc/profile-m-z/rhythmbox.profile
index dccd93429..77c032a53 100644
--- a/etc/profile-m-z/rhythmbox.profile
+++ b/etc/profile-m-z/rhythmbox.profile
@@ -51,6 +51,7 @@ tracelog
 private-bin rhythmbox,rhythmbox-client
 private-cache
 private-dev
+private-etc @tls-ca,@x11,python*
 private-tmp
 dbus-user filter
diff --git a/etc/profile-m-z/rpcs3.profile b/etc/profile-m-z/rpcs3.profile
index 186e31b46..405ab818d 100644
--- a/etc/profile-m-z/rpcs3.profile
+++ b/etc/profile-m-z/rpcs3.profile
@@ -2,7 +2,7 @@
 # Description: RPCS3 emulator
 # This file is overwritten after every install/update
 # Persistent local customizations
-include rpcs3.local 
+include rpcs3.local
 # Persistent global definitions
 include globals.local
diff --git a/etc/profile-m-z/simutrans.profile b/etc/profile-m-z/simutrans.profile
index 6ba735556..f88ae65c8 100644
--- a/etc/profile-m-z/simutrans.profile
+++ b/etc/profile-m-z/simutrans.profile
@@ -35,6 +35,7 @@ seccomp
 # private-bin simutrans
 private-dev
+private-etc @games,@x11
 private-tmp
 dbus-user none
diff --git a/etc/profile-m-z/tex.profile b/etc/profile-m-z/tex.profile
index f56c3038e..c850cf5c3 100644
--- a/etc/profile-m-z/tex.profile
+++ b/etc/profile-m-z/tex.profile
@@ -9,4 +9,3 @@ private-bin tex
 # Redirect
 include latex-common.profile
diff --git a/etc/profile-m-z/textmaker18.profile b/etc/profile-m-z/textmaker18.profile
index e5a4b6454..8284df791 100644
--- a/etc/profile-m-z/textmaker18.profile
+++ b/etc/profile-m-z/textmaker18.profile
@@ -8,4 +8,3 @@ include globals.local
 # Redirect
 include softmaker-common.profile
diff --git a/etc/profile-m-z/textmaker18free.profile b/etc/profile-m-z/textmaker18free.profile
index 0e918bf0a..ad945ca55 100644
--- a/etc/profile-m-z/textmaker18free.profile
+++ b/etc/profile-m-z/textmaker18free.profile
@@ -8,4 +8,3 @@ include globals.local
 # Redirect
 include softmaker-common.profile
diff --git a/etc/profile-m-z/totem.profile b/etc/profile-m-z/totem.profile
index e21d37040..a4cb49171 100644
--- a/etc/profile-m-z/totem.profile
+++ b/etc/profile-m-z/totem.profile
@@ -51,7 +51,7 @@ private-bin totem
 # totem needs access to ~/.cache/tracker or it exits
 #private-cache
 private-dev
-# private-etc alternatives,asound.conf,ca-certificates,crypto-policies,fonts,machine-id,pki,pulse,ssl
+private-etc @tls-ca,@x11,python*
 private-tmp
 # makes settings immutable
diff --git a/etc/profile-m-z/transmission-cli.profile b/etc/profile-m-z/transmission-cli.profile
index edb4db8aa..5c0690b1d 100644
--- a/etc/profile-m-z/transmission-cli.profile
+++ b/etc/profile-m-z/transmission-cli.profile
@@ -7,6 +7,8 @@ include transmission-cli.local
 # Persistent global definitions
 include globals.local
+whitelist /usr/share/transmission
 private-bin transmission-cli
 private-etc @tls-ca
diff --git a/etc/profile-m-z/transmission-common.profile b/etc/profile-m-z/transmission-common.profile
index 0a9029c97..d80eb708b 100644
--- a/etc/profile-m-z/transmission-common.profile
+++ b/etc/profile-m-z/transmission-common.profile
@@ -44,6 +44,7 @@ tracelog
 private-cache
 private-dev
+private-etc @tls-ca,@x11
 private-tmp
 dbus-user none
diff --git a/etc/profile-m-z/zlib-flate.profile b/etc/profile-m-z/zlib-flate.profile
new file mode 100644
index 000000000..48a2c9845
--- /dev/null
+++ b/etc/profile-m-z/zlib-flate.profile
@@ -0,0 +1,13 @@
+# Firejail profile for zlib-flate
+# This file is overwritten after every install/update
+quiet
+# Persistent local customizations
+include zlib-flate.local
+# Persistent global definitions
+# added by included profile
+#include globals.local
+private-bin zlib-flate
+# Redirect
+include qpdf.profile
diff --git a/gcov.sh b/gcov.sh
index 79736d3d8..34fb6e03e 100755
--- a/gcov.sh
+++ b/gcov.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 gcov_init() {
diff --git a/install.sh b/install.sh
index 2d5f29d41..30155cab4 100755
--- a/install.sh
+++ b/install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 echo "installing..."
diff --git a/linecnt.sh b/linecnt.sh
index 06d136d8c..93cdbd8fc 100755
--- a/linecnt.sh
+++ b/linecnt.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 gcov_init() {
diff --git a/mkasc.sh b/mkasc.sh
index 6de64c6f2..de9bf9851 100755
--- a/mkasc.sh
+++ b/mkasc.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 echo "Calculating SHA256 for all files in /transfer - firejail version $1"
diff --git a/mkdeb.sh b/mkdeb.sh
index 5f65e80b2..edb16fb93 100755
--- a/mkdeb.sh
+++ b/mkdeb.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 # based on http://tldp.org/HOWTO/html_single/Debian-Binary-Package-Building-HOWTO/
@@ -10,10 +10,6 @@ set -e
 . "$(dirname "$0")/config.sh"
-EXTRA_VERSION=$1
-test "$#" -gt 0 && shift
 CODE_ARCHIVE="$TARNAME-$VERSION.tar.xz"
 CODE_DIR="$TARNAME-$VERSION"
 INSTALL_DIR="${INSTALL_DIR}${CODE_DIR}/debian"
@@ -29,7 +25,7 @@ echo "*****************************************"
 tar -xJvf "$CODE_ARCHIVE"
 #mkdir -p "$INSTALL_DIR"
 cd "$CODE_DIR"
-./configure --prefix=/usr "$@"
+./configure --prefix=/usr --enable-apparmor "$@"
 make -j2
 mkdir debian
 DESTDIR=debian make install-strip
diff --git a/mketc.sh b/mketc.sh
index 0e681fa28..c95e688c0 100755
--- a/mketc.sh
+++ b/mketc.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 sed -i -e '
diff --git a/mkman.sh b/mkman.sh
index 79ad16252..58a44ecda 100755
--- a/mkman.sh
+++ b/mkman.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set -e
diff --git a/mkuid.sh b/mkuid.sh
index 7db6c9ac5..90f536aa6 100755
--- a/mkuid.sh
+++ b/mkuid.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 echo "extracting UID_MIN and GID_MIN"
diff --git a/platform/debian/copyright b/platform/debian/copyright
index aef85743e..0c9b982c6 100644
--- a/platform/debian/copyright
+++ b/platform/debian/copyright
@@ -7,7 +7,7 @@ This is the Debian/Ubuntu prepackaged version of firejail.
    and networking stack isolation, and it runs on any recent Linux system. It
    includes a sandbox profile for Mozilla Firefox.
-    Copyright (C) 2014-2022 Firejail Authors (see README file for more details)
+    Copyright (C) 2014-2023 Firejail Authors (see README file for more details)
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/platform/rpm/.editorconfig b/platform/rpm/.editorconfig
new file mode 100644
index 000000000..964dd36dd
--- /dev/null
+++ b/platform/rpm/.editorconfig
@@ -0,0 +1,3 @@
+[*.sh{,.in}]
+indent_size = 4
+indent_style = space
diff --git a/platform/rpm/mkrpm.sh b/platform/rpm/mkrpm.sh
index d597d32fd..d32ccd360 100755
--- a/platform/rpm/mkrpm.sh
+++ b/platform/rpm/mkrpm.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # Usage: ./platform/rpm/mkrpm.sh firejail <version> "<config options>"
@@ -31,7 +31,7 @@ fi
 tmpdir=$(mktemp -d)
 mkdir -p ${tmpdir}/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 function cleanup {
-  rm -rf ${tmpdir}
+    rm -rf ${tmpdir}
 }
 trap cleanup EXIT
diff --git a/src/bash_completion/.editorconfig b/src/bash_completion/.editorconfig
new file mode 100644
index 000000000..298a13b5e
--- /dev/null
+++ b/src/bash_completion/.editorconfig
@@ -0,0 +1,3 @@
+[*.bash_completion{,.in}]
+indent_size = 4
+indent_style = space
diff --git a/src/etc-cleanup/main.c b/src/etc-cleanup/main.c
index 47fe1556b..6c7bea6d6 100644
--- a/src/etc-cleanup/main.c
+++ b/src/etc-cleanup/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -231,8 +231,8 @@ int main(int argc, char **argv) {
        int i;
        for (i = 1; i < argc; i++) {
                if (strcmp(argv[i], "-h") == 0 ||
-                     strcmp(argv[i], "-?") == 0 ||
+                    strcmp(argv[i], "-?") == 0 ||
-                     strcmp(argv[i], "--help") == 0) {
+                    strcmp(argv[i], "--help") == 0) {
                        usage();
                        return 0;
                }
@@ -252,4 +252,4 @@ int main(int argc, char **argv) {
                process_file(argv[i]);
        return 0;
-}
-\ No newline at end of file
+}
diff --git a/src/fbuilder/build_bin.c b/src/fbuilder/build_bin.c
index 041c52629..2a88d44c0 100644
--- a/src/fbuilder/build_bin.c
+++ b/src/fbuilder/build_bin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fbuilder/build_fs.c b/src/fbuilder/build_fs.c
index 88b5eaad3..f00134e1d 100644
--- a/src/fbuilder/build_fs.c
+++ b/src/fbuilder/build_fs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fbuilder/build_home.c b/src/fbuilder/build_home.c
index 00f227c95..15c54911b 100644
--- a/src/fbuilder/build_home.c
+++ b/src/fbuilder/build_home.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -110,7 +110,7 @@ void process_home(const char *fname, char *home, int home_len) {
                    strcmp(toadd, ".cache") == 0) {
                        if (dir)
                                free(dir);
-                        continue;
+                        continue;
                }
                // clean .cache entries
diff --git a/src/fbuilder/build_profile.c b/src/fbuilder/build_profile.c
index d57db7f42..75f1c10d7 100644
--- a/src/fbuilder/build_profile.c
+++ b/src/fbuilder/build_profile.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fbuilder/build_seccomp.c b/src/fbuilder/build_seccomp.c
index b772de45f..159340dea 100644
--- a/src/fbuilder/build_seccomp.c
+++ b/src/fbuilder/build_seccomp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fbuilder/fbuilder.h b/src/fbuilder/fbuilder.h
index b07209e51..c82f90c8d 100644
--- a/src/fbuilder/fbuilder.h
+++ b/src/fbuilder/fbuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fbuilder/filedb.c b/src/fbuilder/filedb.c
index 89b6980d2..5a3b389ae 100644
--- a/src/fbuilder/filedb.c
+++ b/src/fbuilder/filedb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -38,8 +38,8 @@ FileDB *filedb_find(FileDB *head, const char *fname) {
                if (strlen(fname) > ptr->len &&
                    fname[ptr->len] == '/' &&
                    strncmp(ptr->fname, fname, ptr->len) == 0) {
-                        found = 1;
+                        found = 1;
-                        break;
+                        break;
                }
                ptr = ptr->next;
diff --git a/src/fbuilder/main.c b/src/fbuilder/main.c
index aa49b2489..7fdf9af68 100644
--- a/src/fbuilder/main.c
+++ b/src/fbuilder/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -32,7 +32,7 @@ int main(int argc, char **argv) {
 system("cat /proc/self/status");
 int i;
 for (i = 0; i < argc; i++)
-        printf("*%s* ", argv[i]);
+        printf("*%s* ", argv[i]);
 printf("\n");
 }
 #endif
diff --git a/src/fbuilder/utils.c b/src/fbuilder/utils.c
index f89e69679..fa432d003 100644
--- a/src/fbuilder/utils.c
+++ b/src/fbuilder/utils.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fcopy/main.c b/src/fcopy/main.c
index b0b7f7024..ce2efb295 100644
--- a/src/fcopy/main.c
+++ b/src/fcopy/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -92,7 +92,7 @@ static void selinux_relabel_path(const char *path, const char *inside_path) {
                        printf("Cannot relabel %s: %s\n", path, strerror(errno));
        }
        freecon(fcon);
- close:
+close:
        close(fd);
 #else
        (void) path;
@@ -236,7 +236,7 @@ void copy_link(const char *target, const char *linkpath, mode_t mode, uid_t uid,
        // if the link is already there, don't create it
        struct stat s;
        if (lstat(linkpath, &s) == 0)
-               return;
+                return;
        char *rp = proc_pid_to_self(target);
        if (rp) {
diff --git a/src/fids/blake2b.c b/src/fids/blake2b.c
index ec7cf8602..ca884dfc0 100644
--- a/src/fids/blake2b.c
+++ b/src/fids/blake2b.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fids/config b/src/fids/config
index c18c97260..7828622e8 100644
--- a/src/fids/config
+++ b/src/fids/config
@@ -13,4 +13,3 @@
 /home/netblue/Desktop/*.desktop
 /home/netblue/.ssh
 /home/netblue/.gnupg
diff --git a/src/fids/db.c b/src/fids/db.c
index e8dfab1ac..7cad11cca 100644
--- a/src/fids/db.c
+++ b/src/fids/db.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -155,4 +155,3 @@ errexit:
        fprintf(stderr, "Error fids: database corrupted\n");
        exit(1);
 }
diff --git a/src/fids/db_exclude.c b/src/fids/db_exclude.c
index cfb37219c..aedb95e4f 100644
--- a/src/fids/db_exclude.c
+++ b/src/fids/db_exclude.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -53,4 +53,3 @@ int db_exclude_check(const char *fname) {
        return 0;
 }
diff --git a/src/fids/fids.h b/src/fids/fids.h
index 93ae106a1..8bbdcb6db 100644
--- a/src/fids/fids.h
+++ b/src/fids/fids.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fids/main.c b/src/fids/main.c
index e6be365d1..f1dfdac8e 100644
--- a/src/fids/main.c
+++ b/src/fids/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firecfg/desktop_files.c b/src/firecfg/desktop_files.c
index 408662907..963e05ff3 100644
--- a/src/firecfg/desktop_files.c
+++ b/src/firecfg/desktop_files.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 793ec9a52..45457fb47 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -260,6 +260,7 @@ firefox-nightly
 firefox-wayland
 firefox-x11
 five-or-more
+fix-qdf
 flacsplt
 flameshot
 flashpeak-slimjet
@@ -519,6 +520,7 @@ matrix-mirage
 mattermost-desktop
 mcabber
 mcomix
+md5sum
 mediainfo
 mediathekview
 megaglest
@@ -693,6 +695,7 @@ qgis
 qlipper
 qmmp
 qnapi
+qpdf
 qpdfview
 qq
 qt-faststart
@@ -736,6 +739,11 @@ seahorse-tool
 seamonkey
 seamonkey-bin
 secret-tool
+sha1sum
+sha224sum
+sha256sum
+sha348sum
+sha512sum
 shellcheck
 shortwave
 shotcut
@@ -775,6 +783,7 @@ straw-viewer
 strings
 studio.sh
 subdownloader
+sum
 supertux2
 supertuxkart
 surf
@@ -950,6 +959,7 @@ zart
 zathura
 zeal
 zim
+zlib-flate
 zoom
 # zpaq - disable until we fix CLI archivers for makepkg on Arch (see discussion in #3095)
 # zstd - disable until we fix CLI archivers for makepkg on Arch (see discussion in #3095)
diff --git a/src/firecfg/firecfg.h b/src/firecfg/firecfg.h
index f54bfd5b5..825bf8d03 100644
--- a/src/firecfg/firecfg.h
+++ b/src/firecfg/firecfg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firecfg/firejail-welcome.sh b/src/firecfg/firejail-welcome.sh
index 3ff06d87e..a8482a957 100755
--- a/src/firecfg/firejail-welcome.sh
+++ b/src/firecfg/firejail-welcome.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2020-2022 Firejail Authors
+# Copyright (C) 2020-2023 Firejail Authors
 # License GPL v2
 #
 # Usage: firejail-welcome PROGRAM SYSCONFDIR USER_NAME
diff --git a/src/firecfg/main.c b/src/firecfg/main.c
index 07e30415b..e1ff7e17a 100644
--- a/src/firecfg/main.c
+++ b/src/firecfg/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firecfg/sound.c b/src/firecfg/sound.c
index 9d04c951b..2c8c28191 100644
--- a/src/firecfg/sound.c
+++ b/src/firecfg/sound.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firecfg/util.c b/src/firecfg/util.c
index 4697e7dd9..4185b52dd 100644
--- a/src/firecfg/util.c
+++ b/src/firecfg/util.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -30,8 +30,8 @@ static int find(const char *program, const char *directory) {
        struct stat s;
        if (stat(fname, &s) == 0) {
-                if (arg_debug)
+                if (arg_debug)
-                        printf("found %s in directory %s\n", program, directory);
+                        printf("found %s in directory %s\n", program, directory);
                retval = 1;
        }
@@ -44,8 +44,8 @@ static int find(const char *program, const char *directory) {
 int which(const char *program) {
        // check some well-known paths
        if (find(program, "/bin") || find(program, "/usr/bin") ||
-             find(program, "/sbin") || find(program, "/usr/sbin") ||
+            find(program, "/sbin") || find(program, "/usr/sbin") ||
-             find(program, "/usr/games"))
+            find(program, "/usr/games"))
                return 1;
        // check environment
diff --git a/src/firejail/appimage.c b/src/firejail/appimage.c
index 479473572..f93891af2 100644
--- a/src/firejail/appimage.c
+++ b/src/firejail/appimage.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/appimage_size.c b/src/firejail/appimage_size.c
index 4f8c7a7aa..60c4c0364 100644
--- a/src/firejail/appimage_size.c
+++ b/src/firejail/appimage_size.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -17,8 +17,9 @@
 * with this program; if not, write to the Free Software Foundation, Inc.,
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 /*
-    This code borrows heavily from src/libappimage_shared/elf.c in libappimage
+ * This code borrows heavily from src/libappimage_shared/elf.c in libappimage
 */
 /*
 Compile with:
@@ -144,7 +145,7 @@ long unsigned int appimage2_size(int fd) {
                return 0;
        if ((ehdr.e_ident[EI_DATA] != ELFDATA2LSB) &&
-             (ehdr.e_ident[EI_DATA] != ELFDATA2MSB))
+            (ehdr.e_ident[EI_DATA] != ELFDATA2MSB))
                return 0;
        if(ehdr.e_ident[EI_CLASS] == ELFCLASS32) {
diff --git a/src/firejail/arp.c b/src/firejail/arp.c
index cbd80dee0..bfb522d38 100644
--- a/src/firejail/arp.c
+++ b/src/firejail/arp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/bandwidth.c b/src/firejail/bandwidth.c
index fa9d3a940..b6a588e36 100644
--- a/src/firejail/bandwidth.c
+++ b/src/firejail/bandwidth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/caps.c b/src/firejail/caps.c
index d88a99132..d11adc9d5 100644
--- a/src/firejail/caps.c
+++ b/src/firejail/caps.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c
index 62b8c4dc4..56f983854 100644
--- a/src/firejail/checkcfg.c
+++ b/src/firejail/checkcfg.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/chroot.c b/src/firejail/chroot.c
index 72322221c..132ac94ba 100644
--- a/src/firejail/chroot.c
+++ b/src/firejail/chroot.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -280,7 +280,7 @@ void fs_chroot(const char *rootdir) {
        //              fs_dev_shm();
        fs_var_lock();
        if (!arg_keep_var_tmp)
-                fs_var_tmp();
+                fs_var_tmp();
        if (!arg_writable_var_log)
                fs_var_log();
diff --git a/src/firejail/cmdline.c b/src/firejail/cmdline.c
index 6f7739da0..45b82f4f7 100644
--- a/src/firejail/cmdline.c
+++ b/src/firejail/cmdline.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/cpu.c b/src/firejail/cpu.c
index 917726359..804d51caa 100644
--- a/src/firejail/cpu.c
+++ b/src/firejail/cpu.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -103,17 +103,17 @@ void set_cpu_affinity(void) {
        if (sched_setaffinity(0, sizeof(mask), &mask) == -1)
                fwarning("cannot set cpu affinity\n");
-                // verify cpu affinity
+                // verify cpu affinity
        cpu_set_t mask2;
        CPU_ZERO(&mask2);
        if (sched_getaffinity(0, sizeof(mask2), &mask2) == -1)
                fwarning("cannot verify cpu affinity\n");
-                else if (arg_debug) {
+                else if (arg_debug) {
-                        if (CPU_EQUAL(&mask, &mask2))
+                        if (CPU_EQUAL(&mask, &mask2))
-                                printf("CPU affinity set\n");
+                                printf("CPU affinity set\n");
                else
-                                printf("CPU affinity not set\n");
+                                printf("CPU affinity not set\n");
-                }
+                }
 }
 static void print_cpu(ProcessHandle process) {
diff --git a/src/firejail/dbus.c b/src/firejail/dbus.c
index 66738bd4b..b2f9fe2d2 100644
--- a/src/firejail/dbus.c
+++ b/src/firejail/dbus.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -263,7 +263,7 @@ static char *find_user_socket_by_format(char *format) {
        if (!S_ISSOCK(s.st_mode))
                goto fail;
        return dbus_user_socket;
- fail:
+fail:
        free(dbus_user_socket);
        return NULL;
 }
diff --git a/src/firejail/dhcp.c b/src/firejail/dhcp.c
index fb66d74ff..60fa34517 100644
--- a/src/firejail/dhcp.c
+++ b/src/firejail/dhcp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/env.c b/src/firejail/env.c
index 8d2b9ea5a..ede5f812d 100644
--- a/src/firejail/env.c
+++ b/src/firejail/env.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index a09158e9e..824164c8a 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -266,7 +266,7 @@ static inline int any_ip6_dhcp(void) {
 }
 static inline int any_dhcp(void) {
-  return any_ip_dhcp() || any_ip6_dhcp();
+        return any_ip_dhcp() || any_ip6_dhcp();
 }
 extern int arg_private;         // mount private /home
@@ -525,6 +525,7 @@ int macro_id(const char *name);
 // util.c
+int invalid_name(const char *name);
 void errLogExit(char* fmt, ...) __attribute__((noreturn));
 void fwarning(char* fmt, ...);
 void fmessage(char* fmt, ...);
diff --git a/src/firejail/fs.c b/src/firejail/fs.c
index 89a67f686..182f26e53 100644
--- a/src/firejail/fs.c
+++ b/src/firejail/fs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -123,8 +123,8 @@ static void disable_file(OPERATION op, const char *filename) {
        if (op == BLACKLIST_FILE || op == BLACKLIST_NOLOG) {
                // some distros put all executables under /usr/bin and make /bin a symbolic link
                if ((strcmp(fname, "/bin") == 0 || strcmp(fname, "/usr/bin") == 0) &&
-                      is_link(filename) &&
+                    is_link(filename) &&
-                      S_ISDIR(s.st_mode)) {
+                    S_ISDIR(s.st_mode)) {
                        fwarning("%s directory link was not blacklisted\n", filename);
                }
                else {
diff --git a/src/firejail/fs_bin.c b/src/firejail/fs_bin.c
index 6228e9740..04c5a7d07 100644
--- a/src/firejail/fs_bin.c
+++ b/src/firejail/fs_bin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/fs_dev.c b/src/firejail/fs_dev.c
index a6fbbb89a..51a58013d 100644
--- a/src/firejail/fs_dev.c
+++ b/src/firejail/fs_dev.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/fs_etc.c b/src/firejail/fs_etc.c
index 83f140d80..3b7369ea8 100644
--- a/src/firejail/fs_etc.c
+++ b/src/firejail/fs_etc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -402,4 +402,3 @@ void fs_private_dir_list(const char *private_dir, const char *private_run_dir, c
        fs_private_dir_mount(private_dir, private_run_dir);
        fmessage("Private %s installed in %0.2f ms\n", private_dir, timetrace_end());
 }
diff --git a/src/firejail/fs_home.c b/src/firejail/fs_home.c
index 8e72f8687..624e74fe4 100644
--- a/src/firejail/fs_home.c
+++ b/src/firejail/fs_home.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/fs_hostname.c b/src/firejail/fs_hostname.c
index dca394865..bf4435310 100644
--- a/src/firejail/fs_hostname.c
+++ b/src/firejail/fs_hostname.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/fs_lib.c b/src/firejail/fs_lib.c
index 5d6d81ae1..e349941fa 100644
--- a/src/firejail/fs_lib.c
+++ b/src/firejail/fs_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/fs_lib2.c b/src/firejail/fs_lib2.c
index aefd38e3c..540c3286f 100644
--- a/src/firejail/fs_lib2.c
+++ b/src/firejail/fs_lib2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/fs_logger.c b/src/firejail/fs_logger.c
index 8b6c41278..b2db40a62 100644
--- a/src/firejail/fs_logger.c
+++ b/src/firejail/fs_logger.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/fs_mkdir.c b/src/firejail/fs_mkdir.c
index 30dbd8e9b..d59735401 100644
--- a/src/firejail/fs_mkdir.c
+++ b/src/firejail/fs_mkdir.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/fs_overlayfs.c b/src/firejail/fs_overlayfs.c
index 167a7e28b..b2b24cf69 100644
--- a/src/firejail/fs_overlayfs.c
+++ b/src/firejail/fs_overlayfs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/fs_trace.c b/src/firejail/fs_trace.c
index 4cecea9ce..05fd89f53 100644
--- a/src/firejail/fs_trace.c
+++ b/src/firejail/fs_trace.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/fs_var.c b/src/firejail/fs_var.c
index ad5ee6759..690780a0e 100644
--- a/src/firejail/fs_var.c
+++ b/src/firejail/fs_var.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/fs_whitelist.c b/src/firejail/fs_whitelist.c
index 3377b2592..471fa3a56 100644
--- a/src/firejail/fs_whitelist.c
+++ b/src/firejail/fs_whitelist.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/ids.c b/src/firejail/ids.c
index fdb78d6e6..e371f5c6d 100644
--- a/src/firejail/ids.c
+++ b/src/firejail/ids.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/join.c b/src/firejail/join.c
index 01fd6c41d..5ef54002b 100644
--- a/src/firejail/join.c
+++ b/src/firejail/join.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/ls.c b/src/firejail/ls.c
index 6494372cb..ea85fabfd 100644
--- a/src/firejail/ls.c
+++ b/src/firejail/ls.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -178,7 +178,7 @@ static void print_directory(const char *path) {
        n = scandir(path, &namelist, 0, alphasort);
        if (n < 0)
-                        errExit("scandir");
+                errExit("scandir");
        else {
                for (i = 0; i < n; i++)
                        print_file_or_dir(path, namelist[i]->d_name);
diff --git a/src/firejail/macros.c b/src/firejail/macros.c
index 3f9460041..af7d02c2a 100644
--- a/src/firejail/macros.c
+++ b/src/firejail/macros.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -38,19 +38,19 @@ Macro macro[] = {
        },
        {
-                "${MUSIC}",
+                "${MUSIC}",
                "XDG_MUSIC_DIR=\"$HOME/",
                {"Music", "Музыка", "Musique", "Musica", "Música", "Musik"}
        },
        {
-                "${VIDEOS}",
+                "${VIDEOS}",
                "XDG_VIDEOS_DIR=\"$HOME/",
                {"Videos", "Видео", "Vidéos", "Video", "Vídeos"}
        },
        {
-                "${PICTURES}",
+                "${PICTURES}",
                "XDG_PICTURES_DIR=\"$HOME/",
                {"Pictures", "Изображения", "Photos", "Immagini", "Imágenes", "Imagens", "Bilder"}
        },
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 8df6926ee..ac84f00c9 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -47,12 +47,12 @@
 #endif
 #ifdef __ia64__
-/* clone(2) has a different interface on ia64, as it needs to know
+/* clone(2) has a different interface on ia64, as it needs to know the size of
-   the size of the stack */
+ * the stack */
 int __clone2(int (*fn)(void *),
             void *child_stack_base, size_t stack_size,
             int flags, void *arg, ...
-              /* pid_t *ptid, struct user_desc *tls, pid_t *ctid */ );
+             /* pid_t *ptid, struct user_desc *tls, pid_t *ctid */ );
 #endif
 uid_t firejail_uid = 0;
@@ -106,7 +106,7 @@ char *arg_netfilter6_file = NULL;		// netfilter6 file
 char *arg_netns = NULL;                 // "ip netns"-created network namespace to use
 int arg_doubledash = 0;                 // double dash
 int arg_private_dev = 0;                        // private dev directory
-int arg_keep_dev_shm = 0;                       // preserve /dev/shm
+int arg_keep_dev_shm = 0;                       // preserve /dev/shm
 int arg_private_etc = 0;                        // private etc directory
 int arg_private_opt = 0;                        // private opt directory
 int arg_private_srv = 0;                        // private srv directory
@@ -129,7 +129,7 @@ int arg_writable_etc = 0;			// writable etc
 int arg_keep_config_pulse = 0;                  // disable automatic ~/.config/pulse init
 int arg_keep_shell_rc = 0;                      // do not copy shell configuration from /etc/skel
 int arg_writable_var = 0;                       // writable var
-int arg_keep_var_tmp = 0;                       // don't overwrite /var/tmp
+int arg_keep_var_tmp = 0;                       // don't overwrite /var/tmp
 int arg_writable_run_user = 0;                  // writable /run/user
 int arg_writable_var_log = 0;           // writable /var/log
 int arg_appimage = 0;                           // appimage
@@ -141,7 +141,7 @@ int arg_x11_block = 0;				// block X11
 int arg_x11_xorg = 0;                           // use X11 security extension
 int arg_allusers = 0;                           // all user home directories visible
 int arg_machineid = 0;                          // spoof /etc/machine-id
-int arg_allow_private_blacklist = 0;            // blacklist things in private directories
+int arg_allow_private_blacklist = 0;            // blacklist things in private directories
 int arg_disable_mnt = 0;                        // disable /mnt and /media
 int arg_noprofile = 0; // use default.profile if none other found/specified
 int arg_memory_deny_write_execute = 0;          // block writable and executable memory
@@ -150,7 +150,7 @@ int arg_nodvd = 0; // --nodvd
 int arg_nou2f = 0; // --nou2f
 int arg_noinput = 0; // --noinput
 int arg_deterministic_exit_code = 0;    // always exit with first child's exit status
-int arg_deterministic_shutdown = 0;     // shut down the sandbox if first child dies
+int arg_deterministic_shutdown = 0;     // shut down the sandbox if first child dies
 int arg_keep_fd_all = 0;                // inherit all file descriptors to sandbox
 DbusPolicy arg_dbus_user = DBUS_POLICY_ALLOW;   // --dbus-user
 DbusPolicy arg_dbus_system = DBUS_POLICY_ALLOW; // --dbus-system
@@ -768,11 +768,11 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
                                exit(1);
                        }
                        char *path = argv[i + 1];
-                         invalid_filename(path, 0); // no globbing
+                        invalid_filename(path, 0); // no globbing
-                         if (strstr(path, "..")) {
+                        if (strstr(path, "..")) {
-                                fprintf(stderr, "Error: invalid file name %s\n", path);
+                                fprintf(stderr, "Error: invalid file name %s\n", path);
-                                exit(1);
+                                exit(1);
-                         }
+                        }
                        // get file
                        pid_t pid = require_pid(argv[i] + 6);
@@ -796,17 +796,17 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
                                exit(1);
                        }
                        char *path1 = argv[i + 1];
-                         invalid_filename(path1, 0); // no globbing
+                        invalid_filename(path1, 0); // no globbing
-                         if (strstr(path1, "..")) {
+                        if (strstr(path1, "..")) {
-                                fprintf(stderr, "Error: invalid file name %s\n", path1);
+                                fprintf(stderr, "Error: invalid file name %s\n", path1);
-                                exit(1);
+                                exit(1);
-                         }
+                        }
                        char *path2 = argv[i + 2];
-                         invalid_filename(path2, 0); // no globbing
+                        invalid_filename(path2, 0); // no globbing
-                         if (strstr(path2, "..")) {
+                        if (strstr(path2, "..")) {
-                                fprintf(stderr, "Error: invalid file name %s\n", path2);
+                                fprintf(stderr, "Error: invalid file name %s\n", path2);
-                                exit(1);
+                                exit(1);
-                         }
+                        }
                        // get file
                        pid_t pid = require_pid(argv[i] + 6);
@@ -830,15 +830,15 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
                                exit(1);
                        }
                        char *path = argv[i + 1];
-                         invalid_filename(path, 0); // no globbing
+                        invalid_filename(path, 0); // no globbing
-                         if (strstr(path, "..")) {
+                        if (strstr(path, "..")) {
-                                fprintf(stderr, "Error: invalid file name %s\n", path);
+                                fprintf(stderr, "Error: invalid file name %s\n", path);
-                                exit(1);
+                                exit(1);
-                         }
+                        }
                        // list directory contents
                        if (!arg_debug)
-                                 arg_quiet = 1;
+                                arg_quiet = 1;
                        pid_t pid = require_pid(argv[i] + 5);
                        sandboxfs(SANDBOX_FS_LS, pid, path, NULL);
                        exit(0);
@@ -867,7 +867,7 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
                        // write file contents to stdout
                        if (!arg_debug)
-                                 arg_quiet = 1;
+                                arg_quiet = 1;
                        pid_t pid = require_pid(argv[i] + 6);
                        sandboxfs(SANDBOX_FS_CAT, pid, path, NULL);
                        exit(0);
@@ -894,8 +894,8 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
        }
        else if (strncmp(argv[i], "--join-or-start=", 16) == 0) {
-                // NOTE: this is first part of option handler,
+                // Note: This is the first part of the option handler; the
-                //               sandbox name is set in other part
+                // sandbox name is set in the other part
                if (checkcfg(CFG_JOIN) || getuid() == 0) {
                        logargs(argc, argv);
@@ -1050,11 +1050,11 @@ static int check_postexec(const char *list) {
 //*******************************************
 int main(int argc, char **argv, char **envp) {
        int i;
-        int prog_index = -1;                      // index in argv where the program command starts
+        int prog_index = -1;            // index in argv where the program command starts
        int lockfd_network = -1;
        int lockfd_directory = -1;
-        int custom_profile = 0; // custom profile loaded
+        int custom_profile = 0;         // custom profile loaded
-        int arg_caps_cmdline = 0;       // caps requested on command line (used to break out of --chroot)
+        int arg_caps_cmdline = 0;       // caps requested on command line (used to break out of --chroot)
        char **ptr;
@@ -1080,7 +1080,8 @@ int main(int argc, char **argv, char **envp) {
        // sanity check for arguments
        for (i = 0; i < argc; i++) {
                if (strlen(argv[i]) >= MAX_ARG_LEN) {
-                        fprintf(stderr, "Error: too long arguments: argv[%d] len (%zu) >= MAX_ARG_LEN (%d)\n", i, strlen(argv[i]), MAX_ARG_LEN);
+                        fprintf(stderr, "Error: too long argument: argv[%d] len (%zu) >= MAX_ARG_LEN (%d): %s\n",
+                                i, strlen(argv[i]), MAX_ARG_LEN, argv[i]);
                        exit(1);
                }
        }
@@ -1983,7 +1984,7 @@ int main(int argc, char **argv, char **envp) {
                        arg_writable_var = 1;
                }
                else if (strcmp(argv[i], "--keep-var-tmp") == 0) {
-                        arg_keep_var_tmp = 1;
+                        arg_keep_var_tmp = 1;
                }
                else if (strcmp(argv[i], "--writable-run-user") == 0) {
                        arg_writable_run_user = 1;
@@ -2176,22 +2177,13 @@ int main(int argc, char **argv, char **envp) {
                // hostname, etc
                //*************************************
                else if (strncmp(argv[i], "--name=", 7) == 0) {
-                        int only_numbers = 1;
                        cfg.name = argv[i] + 7;
                        if (strlen(cfg.name) == 0) {
                                fprintf(stderr, "Error: please provide a name for sandbox\n");
                                return 1;
                        }
-                        const char *c = cfg.name;
+                        if (invalid_name(cfg.name)) {
-                        while (*c) {
+                                fprintf(stderr, "Error: invalid sandbox name\n");
-                                if (!isdigit(*c)) {
-                                        only_numbers = 0;
-                                        break;
-                                }
-                                ++c;
-                        }
-                        if (only_numbers) {
-                                fprintf(stderr, "Error: invalid sandbox name: it only contains digits\n");
                                return 1;
                        }
                }
@@ -2201,6 +2193,10 @@ int main(int argc, char **argv, char **envp) {
                                fprintf(stderr, "Error: please provide a hostname for sandbox\n");
                                return 1;
                        }
+                        if (invalid_name(cfg.hostname)) {
+                                fprintf(stderr, "Error: invalid hostname\n");
+                                return 1;
+                        }
                }
                else if (strcmp(argv[i], "--nogroups") == 0)
                        arg_nogroups = 1;
@@ -2823,8 +2819,9 @@ int main(int argc, char **argv, char **envp) {
                }
 #endif
                else if (strncmp(argv[i], "--join-or-start=", 16) == 0) {
-                        // NOTE: this is second part of option handler,
+                        // Note: This is the second part of the option handler;
-                        //               atempt to find and join sandbox is done in other one
+                        // the attempt to find and join the sandbox is done in
+                        // the other one
                        // set sandbox name and start normally
                        cfg.name = argv[i] + 16;
diff --git a/src/firejail/mountinfo.c b/src/firejail/mountinfo.c
index 56c0bda30..c9be158da 100644
--- a/src/firejail/mountinfo.c
+++ b/src/firejail/mountinfo.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/netfilter.c b/src/firejail/netfilter.c
index aab03c796..b4deda562 100644
--- a/src/firejail/netfilter.c
+++ b/src/firejail/netfilter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/netns.c b/src/firejail/netns.c
index c72c009ae..2a4624695 100644
--- a/src/firejail/netns.c
+++ b/src/firejail/netns.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Firejail Authors
+ * Copyright (C) 2020-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/network.c b/src/firejail/network.c
index e631745fb..c1adf87cc 100644
--- a/src/firejail/network.c
+++ b/src/firejail/network.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -265,7 +265,7 @@ int net_get_mac(const char *ifname, unsigned char mac[6]) {
        int sock;
        if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-                errExit("socket");
+                errExit("socket");
        memset(&ifr, 0, sizeof(ifr));
        strncpy(ifr.ifr_name, ifname, IFNAMSIZ - 1);
diff --git a/src/firejail/network_main.c b/src/firejail/network_main.c
index 46ddf269e..78697b010 100644
--- a/src/firejail/network_main.c
+++ b/src/firejail/network_main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/no_sandbox.c b/src/firejail/no_sandbox.c
index f5e287e32..22ee9dc3c 100644
--- a/src/firejail/no_sandbox.c
+++ b/src/firejail/no_sandbox.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -29,10 +29,10 @@
 int is_container(const char *str) {
        assert(str);
        if (strcmp(str, "lxc") == 0 ||
-             strcmp(str, "docker") == 0 ||
+            strcmp(str, "docker") == 0 ||
-             strcmp(str, "lxc-libvirt") == 0 ||
+            strcmp(str, "lxc-libvirt") == 0 ||
-             strcmp(str, "systemd-nspawn") == 0 ||
+            strcmp(str, "systemd-nspawn") == 0 ||
-             strcmp(str, "rkt") == 0)
+            strcmp(str, "rkt") == 0)
                return 1;
        return 0;
 }
diff --git a/src/firejail/oom.c b/src/firejail/oom.c
index f5f4b978e..482fc0ad0 100644
--- a/src/firejail/oom.c
+++ b/src/firejail/oom.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -84,4 +84,3 @@ void oom_set(const char *oom_string) {
        if (waitpid(child, &status, 0) == -1 )
                errExit("waitpid");
 }
diff --git a/src/firejail/output.c b/src/firejail/output.c
index f9df9f3d4..57679901f 100644
--- a/src/firejail/output.c
+++ b/src/firejail/output.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/paths.c b/src/firejail/paths.c
index 6d62c9004..6bc6230f0 100644
--- a/src/firejail/paths.c
+++ b/src/firejail/paths.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/preproc.c b/src/firejail/preproc.c
index 44f82681a..6055ec95b 100644
--- a/src/firejail/preproc.c
+++ b/src/firejail/preproc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/process.c b/src/firejail/process.c
index fa6b1394d..7faa2221a 100644
--- a/src/firejail/process.c
+++ b/src/firejail/process.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 3924465e4..202bcf4da 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/protocol.c b/src/firejail/protocol.c
index 37782b756..91d63b505 100644
--- a/src/firejail/protocol.c
+++ b/src/firejail/protocol.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/pulseaudio.c b/src/firejail/pulseaudio.c
index 320668bf9..ce20e1098 100644
--- a/src/firejail/pulseaudio.c
+++ b/src/firejail/pulseaudio.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/restrict_users.c b/src/firejail/restrict_users.c
index 447d7b663..b95c9a96b 100644
--- a/src/firejail/restrict_users.c
+++ b/src/firejail/restrict_users.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/restricted_shell.c b/src/firejail/restricted_shell.c
index c1340cae1..79e0bd9df 100644
--- a/src/firejail/restricted_shell.c
+++ b/src/firejail/restricted_shell.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -84,16 +84,16 @@ int restricted_shell(const char *user) {
                // user name globbing
                if (fnmatch(usr, user, 0) == 0) {
-                        // process program arguments
+                        // process program arguments
-                        fullargv[0] = "firejail";
+                        fullargv[0] = "firejail";
-                        int i;
+                        int i;
-                        ptr = args;
+                        ptr = args;
-                        for (i = 1; i < MAX_ARGS; i++) {
+                        for (i = 1; i < MAX_ARGS; i++) {
-                                // skip blanks
+                                // skip blanks
-                                while (*ptr == ' ' || *ptr == '\t')
+                                while (*ptr == ' ' || *ptr == '\t')
-                                        ptr++;
+                                        ptr++;
-                                fullargv[i] = ptr;
+                                fullargv[i] = ptr;
 #ifdef DEBUG_RESTRICTED_SHELL
                                {EUID_ROOT();
                                FILE *fp = fopen("/firelog", "ae");
@@ -104,23 +104,23 @@ int restricted_shell(const char *user) {
                                EUID_USER();}
 #endif
-                                if (*ptr != '\0') {
+                                if (*ptr != '\0') {
-                                        // go to the end of the word
+                                        // go to the end of the word
-                                        while (*ptr != ' ' && *ptr != '\t' && *ptr != '\0')
+                                        while (*ptr != ' ' && *ptr != '\t' && *ptr != '\0')
-                                                ptr++;
+                                                ptr++;
-                                        *ptr ='\0';
+                                        *ptr ='\0';
-                                        fullargv[i] = strdup(fullargv[i]);
+                                        fullargv[i] = strdup(fullargv[i]);
-                                        if (fullargv[i] == NULL)
+                                        if (fullargv[i] == NULL)
-                                                errExit("strdup");
+                                                errExit("strdup");
-                                        ptr++;
+                                        ptr++;
-                                        while (*ptr == ' ' || *ptr == '\t')
+                                        while (*ptr == ' ' || *ptr == '\t')
-                                                ptr++;
+                                                ptr++;
-                                        if (*ptr != '\0')
+                                        if (*ptr != '\0')
-                                                continue;
+                                                continue;
-                                }
+                                }
-                                fullargv[i] = strdup(fullargv[i]);
+                                fullargv[i] = strdup(fullargv[i]);
                                fclose(fp);
-                                return i + 1;
+                                return i + 1;
                        }
                        fprintf(stderr, "Error: too many program arguments in users.conf line %d\n", lineno);
                        exit(1);
diff --git a/src/firejail/rlimit.c b/src/firejail/rlimit.c
index b10d2c528..d583cbefa 100644
--- a/src/firejail/rlimit.c
+++ b/src/firejail/rlimit.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/run_files.c b/src/firejail/run_files.c
index 212a69bc3..a20085294 100644
--- a/src/firejail/run_files.c
+++ b/src/firejail/run_files.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/run_symlink.c b/src/firejail/run_symlink.c
index e2847aea6..dc247280b 100644
--- a/src/firejail/run_symlink.c
+++ b/src/firejail/run_symlink.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index ec3bc250e..a4109cc17 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -274,7 +274,7 @@ static void sandbox_if_up(Bridge *br) {
        }
        if (br->ip6sandbox)
-                 net_if_ip6(dev, br->ip6sandbox);
+                net_if_ip6(dev, br->ip6sandbox);
 }
 static void chk_chroot(void) {
@@ -650,12 +650,12 @@ int sandbox(void* sandbox_arg) {
        if (arg_debug)
                printf("Initializing child process\n");
-        // close each end of the unused pipes
+        // close each end of the unused pipes
-        close(parent_to_child_fds[1]);
+        close(parent_to_child_fds[1]);
-        close(child_to_parent_fds[0]);
+        close(child_to_parent_fds[0]);
-        // wait for parent to do base setup
+        // wait for parent to do base setup
-        wait_for_other(parent_to_child_fds[0]);
+        wait_for_other(parent_to_child_fds[0]);
        if (arg_debug && child_pid == 1)
                printf("PID namespace installed\n");
@@ -1259,13 +1259,13 @@ int sandbox(void* sandbox_arg) {
        }
        // notify parent that new user namespace has been created so a proper
-        // UID/GID map can be setup
+        // UID/GID map can be setup
-        notify_other(child_to_parent_fds[1]);
+        notify_other(child_to_parent_fds[1]);
-        close(child_to_parent_fds[1]);
+        close(child_to_parent_fds[1]);
-        // wait for parent to finish setting up a proper UID/GID map
+        // wait for parent to finish setting up a proper UID/GID map
-        wait_for_other(parent_to_child_fds[0]);
+        wait_for_other(parent_to_child_fds[0]);
-        close(parent_to_child_fds[0]);
+        close(parent_to_child_fds[0]);
        // somehow, the new user namespace resets capabilities;
        // we need to do them again
diff --git a/src/firejail/sbox.c b/src/firejail/sbox.c
index a37943940..11ea5b036 100644
--- a/src/firejail/sbox.c
+++ b/src/firejail/sbox.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/seccomp.c b/src/firejail/seccomp.c
index 84748da77..15a707d3f 100644
--- a/src/firejail/seccomp.c
+++ b/src/firejail/seccomp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/selinux.c b/src/firejail/selinux.c
index 0348cef4b..08f3b3122 100644
--- a/src/firejail/selinux.c
+++ b/src/firejail/selinux.c
@@ -1,21 +1,9 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
- * Copyright (C) 2020-2022 Firejail and systemd authors
+ * Copyright (C) 2009-2020 The systemd Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project, from systemd selinux-util.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 #if HAVE_SELINUX
 #include "firejail.h"
@@ -90,7 +78,7 @@ void selinux_relabel_path(const char *path, const char *inside_path)
        }
        freecon(fcon);
- close:
+close:
        close(fd);
 #else
        (void) path;
diff --git a/src/firejail/shutdown.c b/src/firejail/shutdown.c
index fb1ddef73..67b605acd 100644
--- a/src/firejail/shutdown.c
+++ b/src/firejail/shutdown.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/usage.c b/src/firejail/usage.c
index e31293c66..2e10fb959 100644
--- a/src/firejail/usage.c
+++ b/src/firejail/usage.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/util.c b/src/firejail/util.c
index b35225620..bafcd69ec 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -1101,7 +1101,7 @@ void mkdir_attr(const char *fname, mode_t mode, uid_t uid, gid_t gid) {
        if (mkdir(fname, mode) == -1 ||
            chmod(fname, mode) == -1 ||
            chown(fname, uid, gid)) {
-                fprintf(stderr, "Error: failed to create %s directory\n", fname);
+                fprintf(stderr, "Error: failed to create %s directory\n", fname);
                errExit("mkdir/chmod");
        }
@@ -1448,6 +1448,29 @@ static int has_link(const char *dir) {
        return 0;
 }
+// allow strict ASCII letters and numbers; names with only numbers are rejected; spaces are rejected
+int invalid_name(const char *name) {
+        const char *c = name;
+        int only_numbers = 1;
+        while (*c) {
+                if (!isalnum(*c))
+                        return 1;
+                if (!isdigit(*c))
+                        only_numbers = 0;
+                ++c;
+        }
+        if (only_numbers)
+                return 1;
+        // restrict name to 64 chars max
+        if (strlen(name) > 64)
+                return 1;
+        return 0;
+}
 void check_homedir(const char *dir) {
        assert(dir);
        if (dir[0] != '/') {
diff --git a/src/firejail/x11.c b/src/firejail/x11.c
index f173b6672..2eaa9bde5 100644
--- a/src/firejail/x11.c
+++ b/src/firejail/x11.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/apparmor.c b/src/firemon/apparmor.c
index 7103ab7af..462853f02 100644
--- a/src/firemon/apparmor.c
+++ b/src/firemon/apparmor.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/arp.c b/src/firemon/arp.c
index 1a01da016..863d551f8 100644
--- a/src/firemon/arp.c
+++ b/src/firemon/arp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/caps.c b/src/firemon/caps.c
index 045cd1968..5a73cc37e 100644
--- a/src/firemon/caps.c
+++ b/src/firemon/caps.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/cpu.c b/src/firemon/cpu.c
index 31e4eb7fd..b5e824933 100644
--- a/src/firemon/cpu.c
+++ b/src/firemon/cpu.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/firemon.c b/src/firemon/firemon.c
index 4ee319a7e..01167e555 100644
--- a/src/firemon/firemon.c
+++ b/src/firemon/firemon.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/firemon.h b/src/firemon/firemon.h
index d12091217..dae071e89 100644
--- a/src/firemon/firemon.h
+++ b/src/firemon/firemon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/interface.c b/src/firemon/interface.c
index f57616ed7..a8e78133b 100644
--- a/src/firemon/interface.c
+++ b/src/firemon/interface.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/list.c b/src/firemon/list.c
index d066c7a5f..d068e653c 100644
--- a/src/firemon/list.c
+++ b/src/firemon/list.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/netstats.c b/src/firemon/netstats.c
index 156efe67d..6bf013d9d 100644
--- a/src/firemon/netstats.c
+++ b/src/firemon/netstats.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/procevent.c b/src/firemon/procevent.c
index 4edbaab07..77739c1f3 100644
--- a/src/firemon/procevent.c
+++ b/src/firemon/procevent.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -309,7 +309,7 @@ static void __attribute__((noreturn)) procevent_monitor(const int sock, pid_t my
 #endif
                                        if (proc_ev->event_data.fork.child_pid !=
                                            proc_ev->event_data.fork.child_tgid)
-                                                continue; // this is a thread, not a process
+                                                continue; // this is a thread, not a process
                                        pid = proc_ev->event_data.fork.parent_tgid;
 #ifdef DEBUG_PRCTL
        printf("%s: %d, event fork, pid %d\n", __FUNCTION__, __LINE__, pid);
diff --git a/src/firemon/route.c b/src/firemon/route.c
index 86f4d85ae..a8415616e 100644
--- a/src/firemon/route.c
+++ b/src/firemon/route.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/seccomp.c b/src/firemon/seccomp.c
index ba0017eff..865ed138e 100644
--- a/src/firemon/seccomp.c
+++ b/src/firemon/seccomp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/top.c b/src/firemon/top.c
index 56f171f5b..c70bc9424 100644
--- a/src/firemon/top.c
+++ b/src/firemon/top.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -166,7 +166,8 @@ static char *print_top(unsigned index, unsigned parent, unsigned *utime, unsigne
                snprintf(prcs_str, 10, "%d", *cnt);
                if (asprintf(&rv, "%-7.7s %-9.9s %-8.8s %-8.8s %-5.5s %-4.4s %-9.9s %s",
-                                 pidstr, ptruser, rss, shared, cpu_str, prcs_str, uptime_str, ptrcmd) == -1)
+                             pidstr, ptruser, rss, shared, cpu_str, prcs_str,
+                             uptime_str, ptrcmd) == -1)
                        errExit("asprintf");
                if (cmd)
diff --git a/src/firemon/tree.c b/src/firemon/tree.c
index 7ad413772..85e8d591a 100644
--- a/src/firemon/tree.c
+++ b/src/firemon/tree.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/usage.c b/src/firemon/usage.c
index a1b6098ef..169ec9163 100644
--- a/src/firemon/usage.c
+++ b/src/firemon/usage.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/x11.c b/src/firemon/x11.c
index 16ee0a2d6..01a26bb8a 100644
--- a/src/firemon/x11.c
+++ b/src/firemon/x11.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fldd/main.c b/src/fldd/main.c
index 898e0f36a..4b645b1b3 100644
--- a/src/fldd/main.c
+++ b/src/fldd/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -193,9 +193,9 @@ static void parse_elf(const char *exe) {
        }
        goto close;
- error_close:
+error_close:
        perror("copy libs");
- close:
+close:
        if (base)
                munmap(base, s.st_size);
@@ -295,7 +295,7 @@ int main(int argc, char **argv) {
 //system("cat /proc/self/status");
 int i;
 for (i = 0; i < argc; i++)
-        printf("*%s* ", argv[i]);
+        printf("*%s* ", argv[i]);
 printf("\n");
 }
 #endif
diff --git a/src/fnet/arp.c b/src/fnet/arp.c
index ed110c271..1e90dafa3 100644
--- a/src/fnet/arp.c
+++ b/src/fnet/arp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fnet/fnet.h b/src/fnet/fnet.h
index 41db5aa1b..f9b09d7ea 100644
--- a/src/fnet/fnet.h
+++ b/src/fnet/fnet.h
@@ -1,5 +1,5 @@
- /*
+/*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fnet/interface.c b/src/fnet/interface.c
index 072dbf381..ca7c744ed 100644
--- a/src/fnet/interface.c
+++ b/src/fnet/interface.c
@@ -1,5 +1,5 @@
- /*
+/*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -57,7 +57,7 @@ void net_bridge_add_interface(const char *bridge, const char *dev) {
        int sock;
        if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-                errExit("socket");
+                errExit("socket");
        memset(&ifr, 0, sizeof(ifr));
        strncpy(ifr.ifr_name, bridge, IFNAMSIZ - 1);
@@ -237,7 +237,7 @@ int net_get_mac(const char *ifname, unsigned char mac[6]) {
        int sock;
        if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-                errExit("socket");
+                errExit("socket");
        memset(&ifr, 0, sizeof(ifr));
        strncpy(ifr.ifr_name, ifname, IFNAMSIZ - 1);
@@ -291,7 +291,7 @@ int net_if_mac(const char *ifname, const unsigned char mac[6]) {
        int sock;
        if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-                errExit("socket");
+                errExit("socket");
        memset(&ifr, 0, sizeof(ifr));
        strncpy(ifr.ifr_name, ifname, IFNAMSIZ - 1);
diff --git a/src/fnet/main.c b/src/fnet/main.c
index d39fcfc84..96c4f1478 100644
--- a/src/fnet/main.c
+++ b/src/fnet/main.c
@@ -1,5 +1,5 @@
- /*
+/*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -47,7 +47,7 @@ static void usage(void) {
        printf("\tfnet config mac addr\n");
        printf("\tfnet config ipv6 dev ip\n");
        printf("\tfnet ifup dev\n");
-  printf("\tfnet waitll dev\n");
+        printf("\tfnet waitll dev\n");
 }
 int main(int argc, char **argv) {
@@ -144,9 +144,9 @@ printf("\n");
        else if (argc == 5 && strcmp(argv[1], "config") == 0 && strcmp(argv[2], "ipv6") == 0) {
                net_if_ip6(argv[3], argv[4]);
        }
-  else if (argc == 3 && strcmp(argv[1], "waitll") == 0) {
+        else if (argc == 3 && strcmp(argv[1], "waitll") == 0) {
-    net_if_waitll(argv[2]);
+                net_if_waitll(argv[2]);
-  }
+        }
        else {
                fprintf(stderr, "Error fnet: invalid arguments\n");
                return 1;
diff --git a/src/fnet/veth.c b/src/fnet/veth.c
index bd6e33583..2111cfa56 100644
--- a/src/fnet/veth.c
+++ b/src/fnet/veth.c
@@ -24,9 +24,9 @@
 *
 * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
 *
- */
+*/
- /*
+/*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fnetfilter/main.c b/src/fnetfilter/main.c
index a89e12933..8c0f6c297 100644
--- a/src/fnetfilter/main.c
+++ b/src/fnetfilter/main.c
@@ -1,5 +1,5 @@
- /*
+/*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fnettrace-dns/fnettrace_dns.h b/src/fnettrace-dns/fnettrace_dns.h
index db2e1a668..b8f69e9d7 100644
--- a/src/fnettrace-dns/fnettrace_dns.h
+++ b/src/fnettrace-dns/fnettrace_dns.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -31,4 +31,4 @@
 #include <fcntl.h>
 #include <sys/mman.h>
-#endif
-\ No newline at end of file
+#endif
diff --git a/src/fnettrace-dns/main.c b/src/fnettrace-dns/main.c
index 48bf14710..64feec5fe 100644
--- a/src/fnettrace-dns/main.c
+++ b/src/fnettrace-dns/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -124,7 +124,7 @@ static void print_date(void) {
 static void run_trace(void) {
        // grab all Ethernet packets and use a custom BPF filter to get only UDP from source port 53
-        int s = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
+        int s = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
        if (s < 0)
                errExit("socket");
        custom_bpf(s);
diff --git a/src/fnettrace-icmp/fnettrace_icmp.h b/src/fnettrace-icmp/fnettrace_icmp.h
index 790a3ce7f..04c449ff2 100644
--- a/src/fnettrace-icmp/fnettrace_icmp.h
+++ b/src/fnettrace-icmp/fnettrace_icmp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -31,4 +31,4 @@
 #include <fcntl.h>
 #include <sys/mman.h>
-#endif
-\ No newline at end of file
+#endif
diff --git a/src/fnettrace-icmp/main.c b/src/fnettrace-icmp/main.c
index bb857c922..714917547 100644
--- a/src/fnettrace-icmp/main.c
+++ b/src/fnettrace-icmp/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fnettrace-sni/fnettrace_sni.h b/src/fnettrace-sni/fnettrace_sni.h
index 790a3ce7f..04c449ff2 100644
--- a/src/fnettrace-sni/fnettrace_sni.h
+++ b/src/fnettrace-sni/fnettrace_sni.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -31,4 +31,4 @@
 #include <fcntl.h>
 #include <sys/mman.h>
-#endif
-\ No newline at end of file
+#endif
diff --git a/src/fnettrace-sni/main.c b/src/fnettrace-sni/main.c
index d0f75dac9..b8490b4f7 100644
--- a/src/fnettrace-sni/main.c
+++ b/src/fnettrace-sni/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fnettrace/fnettrace.h b/src/fnettrace/fnettrace.h
index b30a9f10d..629b8ce5b 100644
--- a/src/fnettrace/fnettrace.h
+++ b/src/fnettrace/fnettrace.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -70,4 +70,4 @@ char* retrieve_hostname(uint32_t ip);
 // tail.c
 void tail(const char *logfile);
-#endif
-\ No newline at end of file
+#endif
diff --git a/src/fnettrace/hostnames.c b/src/fnettrace/hostnames.c
index 71ce672b5..878a67123 100644
--- a/src/fnettrace/hostnames.c
+++ b/src/fnettrace/hostnames.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -121,4 +121,3 @@ errexit:
        fprintf(stderr, "Error: invalid line %d in file %s\n", line, fname);
        exit(1);
 }
diff --git a/src/fnettrace/main.c b/src/fnettrace/main.c
index f57aa6c87..2f421562e 100644
--- a/src/fnettrace/main.c
+++ b/src/fnettrace/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fnettrace/radix.c b/src/fnettrace/radix.c
index c9493717d..a1d510a61 100644
--- a/src/fnettrace/radix.c
+++ b/src/fnettrace/radix.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -152,4 +152,3 @@ char *radix_longest_prefix_match(uint32_t ip) {
        return (rv)? rv->name: NULL;
 }
diff --git a/src/fnettrace/radix.h b/src/fnettrace/radix.h
index c22c5c547..d75fe3999 100644
--- a/src/fnettrace/radix.h
+++ b/src/fnettrace/radix.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -24,4 +24,4 @@ extern int radix_nodes;
 char *radix_longest_prefix_match(uint32_t ip);
 char *radix_add(uint32_t ip, uint32_t mask, char *name);
-#endif
-\ No newline at end of file
+#endif
diff --git a/src/fnettrace/static-ip-map b/src/fnettrace/static-ip-map
index e310354af..935872b6d 100644
--- a/src/fnettrace/static-ip-map
+++ b/src/fnettrace/static-ip-map
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 #
 # This file is part of firejail project
 #
diff --git a/src/fnettrace/tail.c b/src/fnettrace/tail.c
index a910788d6..3b1b274f8 100644
--- a/src/fnettrace/tail.c
+++ b/src/fnettrace/tail.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fsec-optimize/fsec_optimize.h b/src/fsec-optimize/fsec_optimize.h
index 2a77f69aa..f26f26907 100644
--- a/src/fsec-optimize/fsec_optimize.h
+++ b/src/fsec-optimize/fsec_optimize.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fsec-optimize/main.c b/src/fsec-optimize/main.c
index ec3420e16..0bc521c0d 100644
--- a/src/fsec-optimize/main.c
+++ b/src/fsec-optimize/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -33,7 +33,7 @@ int main(int argc, char **argv) {
 //system("cat /proc/self/status");
 int i;
 for (i = 0; i < argc; i++)
-        printf("*%s* ", argv[i]);
+        printf("*%s* ", argv[i]);
 printf("\n");
 }
 #endif
diff --git a/src/fsec-optimize/optimizer.c b/src/fsec-optimize/optimizer.c
index 20333a8a8..c9b82b1a2 100644
--- a/src/fsec-optimize/optimizer.c
+++ b/src/fsec-optimize/optimizer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fsec-print/fsec_print.h b/src/fsec-print/fsec_print.h
index a754e2295..48cdcac7d 100644
--- a/src/fsec-print/fsec_print.h
+++ b/src/fsec-print/fsec_print.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fsec-print/main.c b/src/fsec-print/main.c
index 039377999..696c6bc0c 100644
--- a/src/fsec-print/main.c
+++ b/src/fsec-print/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -47,7 +47,7 @@ int main(int argc, char **argv) {
 //system("cat /proc/self/status");
 int i;
 for (i = 0; i < argc; i++)
-        printf("*%s* ", argv[i]);
+        printf("*%s* ", argv[i]);
 printf("\n");
 }
 #endif
diff --git a/src/fsec-print/print.c b/src/fsec-print/print.c
index f6af20f04..2f3b6f935 100644
--- a/src/fsec-print/print.c
+++ b/src/fsec-print/print.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fseccomp/fseccomp.h b/src/fseccomp/fseccomp.h
index 5911b5156..df971d2d9 100644
--- a/src/fseccomp/fseccomp.h
+++ b/src/fseccomp/fseccomp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fseccomp/main.c b/src/fseccomp/main.c
index 01d7dd8cf..57a5a6d67 100644
--- a/src/fseccomp/main.c
+++ b/src/fseccomp/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -58,7 +58,7 @@ int main(int argc, char **argv) {
 //system("cat /proc/self/status");
 int i;
 for (i = 0; i < argc; i++)
-        printf("*%s* ", argv[i]);
+        printf("*%s* ", argv[i]);
 printf("\n");
 }
 #endif
diff --git a/src/fseccomp/namespaces.c b/src/fseccomp/namespaces.c
index 8254b54ef..e6c63219f 100644
--- a/src/fseccomp/namespaces.c
+++ b/src/fseccomp/namespaces.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -202,8 +202,8 @@ void deny_ns_32(const char *fname, const char *list) {
        //       0003: 20 00 00 00000000 ld data.syscall-number
        //       0004: 06 00 00 7fff0000 ret ALLOW
        //
-        if (sizeof(filter))
+        if (sizeof(filter))
-                write_to_file(fd, filter, sizeof(filter));
+                write_to_file(fd, filter, sizeof(filter));
        filter_end_blacklist(fd);
diff --git a/src/fseccomp/protocol.c b/src/fseccomp/protocol.c
index ea5cd5bd4..7c1c99df1 100644
--- a/src/fseccomp/protocol.c
+++ b/src/fseccomp/protocol.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fseccomp/seccomp.c b/src/fseccomp/seccomp.c
index 49b789755..9941b9ccd 100644
--- a/src/fseccomp/seccomp.c
+++ b/src/fseccomp/seccomp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fseccomp/seccomp_file.c b/src/fseccomp/seccomp_file.c
index ee18ca74f..9ce2dabb1 100644
--- a/src/fseccomp/seccomp_file.c
+++ b/src/fseccomp/seccomp_file.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fseccomp/seccomp_secondary.c b/src/fseccomp/seccomp_secondary.c
index d4ccd96b2..a90544c81 100644
--- a/src/fseccomp/seccomp_secondary.c
+++ b/src/fseccomp/seccomp_secondary.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fshaper/fshaper.sh b/src/fshaper/fshaper.sh
index a8379612d..451cae644 100755
--- a/src/fshaper/fshaper.sh
+++ b/src/fshaper/fshaper.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 TCFILE=""
diff --git a/src/ftee/ftee.h b/src/ftee/ftee.h
index 458308a4c..d8cb4ae84 100644
--- a/src/ftee/ftee.h
+++ b/src/ftee/ftee.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/ftee/main.c b/src/ftee/main.c
index d408566fa..0a492b41e 100644
--- a/src/ftee/main.c
+++ b/src/ftee/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/include/common.h b/src/include/common.h
index ed6560701..a0ad8c765 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -143,6 +143,7 @@ int pid_proc_cmdline_x11_xpra_xephyr(const pid_t pid);
 int pid_hidepid(void);
 char *do_replace_cntrl_chars(char *str, char c);
 char *replace_cntrl_chars(const char *str, char c);
+char *escape_cntrl_chars(const char *str);
 int has_cntrl_chars(const char *str);
 void reject_cntrl_chars(const char *fname);
 void reject_meta_chars(const char *fname, int globbing);
diff --git a/src/include/etc_groups.h b/src/include/etc_groups.h
index dd9d94ffd..9e24256c0 100644
--- a/src/include/etc_groups.h
+++ b/src/include/etc_groups.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -28,6 +28,10 @@
 static char *etc_list[ETC_MAX + 1] = { // plus 1 for ending NULL pointer
        "alternatives",
        "fonts",
+        "gcrypt",       // GNU crypto library - it contains configuration for specialized encryption
+                // and random number generators hardware.
+                // The directory is not installed in Debian. On Fedora it is an empty directory.
+                // The defaults in glibc cover the regular PC.
        "group",
        "ld.so.cache",
        "ld.so.conf",
@@ -49,7 +53,6 @@ static char *etc_group_games[] = {
        "openal", // 3D sound
        "timidity", // MIDI
        "timidity.cfg",
-        "vulkan", // next generation OpenGL stack
        NULL
 };
@@ -75,7 +78,6 @@ static char *etc_group_sound[] = {
 static char *etc_group_tls_ca[] = {
        "ca-certificates",
        "crypto-policies",
-        "gcrypt",
        "pki",
        "ssl",
        NULL
@@ -90,9 +92,11 @@ static char *etc_group_x11[] = {
        "gtk-3.0",
        "kde4rc",
        "kde5rc",
+        "machine-id", // QT dbus lib is crashing without it!
        "nvidia", // 3D
        "pango", // text rendering/internationalization
        "Trolltech.conf", // old QT config file
+        "vulkan", // next generation OpenGL stack
        "X11",
        "xdg",
        NULL
diff --git a/src/include/euid_common.h b/src/include/euid_common.h
index f40cbb9de..0c7e9d24e 100644
--- a/src/include/euid_common.h
+++ b/src/include/euid_common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/include/firejail_user.h b/src/include/firejail_user.h
index 6cf895db8..9198ce216 100644
--- a/src/include/firejail_user.h
+++ b/src/include/firejail_user.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/include/gcov_wrapper.h b/src/include/gcov_wrapper.h
index f714a9b20..7c8f89d59 100644
--- a/src/include/gcov_wrapper.h
+++ b/src/include/gcov_wrapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -33,8 +33,8 @@
 */
 #if __GNUC__ > 11 || (__GNUC__ == 11 && __GNUC_MINOR__ >= 1)
 static void __gcov_flush(void) {
-       __gcov_dump();
+        __gcov_dump();
-       __gcov_reset();
+        __gcov_reset();
 }
 #endif
 #else
diff --git a/src/include/ldd_utils.h b/src/include/ldd_utils.h
index e9dac1171..00151afab 100644
--- a/src/include/ldd_utils.h
+++ b/src/include/ldd_utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/include/pid.h b/src/include/pid.h
index d2f912b2a..80aa9f240 100644
--- a/src/include/pid.h
+++ b/src/include/pid.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/include/rundefs.h b/src/include/rundefs.h
index b3ad564ac..af42b0984 100644
--- a/src/include/rundefs.h
+++ b/src/include/rundefs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/include/seccomp.h b/src/include/seccomp.h
index 503bf54ac..fc07b75ce 100644
--- a/src/include/seccomp.h
+++ b/src/include/seccomp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -194,24 +194,24 @@
 #endif
 #define VALIDATE_ARCHITECTURE \
-     BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \
+        BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \
-     BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_NR, 1, 0), \
+        BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_NR, 1, 0), \
-     BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
+        BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
 #define VALIDATE_ARCHITECTURE_KILL \
-     BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \
+        BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \
-     BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_NR, 1, 0), \
+        BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_NR, 1, 0), \
-     KILL_OR_RETURN_ERRNO
+        KILL_OR_RETURN_ERRNO
 #define VALIDATE_ARCHITECTURE_64 \
-     BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \
+        BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \
-     BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_64, 1, 0), \
+        BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_64, 1, 0), \
-     BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
+        BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
 #define VALIDATE_ARCHITECTURE_32 \
-     BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \
+        BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \
-     BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_32, 1, 0), \
+        BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_32, 1, 0), \
-     BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
+        BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
 #ifndef X32_SYSCALL_BIT
 #define X32_SYSCALL_BIT 0x40000000
diff --git a/src/include/syscall.h b/src/include/syscall.h
index 68be16a04..c9fa0c68f 100644
--- a/src/include/syscall.h
+++ b/src/include/syscall.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/jailcheck/access.c b/src/jailcheck/access.c
index 3e99b0b52..08c3a51a1 100644
--- a/src/jailcheck/access.c
+++ b/src/jailcheck/access.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/jailcheck/apparmor.c b/src/jailcheck/apparmor.c
index 521ce047e..658928ed5 100644
--- a/src/jailcheck/apparmor.c
+++ b/src/jailcheck/apparmor.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -37,4 +37,3 @@ void apparmor_test(pid_t pid) {
        return;
 }
 #endif
diff --git a/src/jailcheck/jailcheck.h b/src/jailcheck/jailcheck.h
index 2d25ee8ce..f6bee9436 100644
--- a/src/jailcheck/jailcheck.h
+++ b/src/jailcheck/jailcheck.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/jailcheck/main.c b/src/jailcheck/main.c
index 04fc3a6af..8e0aaa860 100644
--- a/src/jailcheck/main.c
+++ b/src/jailcheck/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/jailcheck/network.c b/src/jailcheck/network.c
index 8f70c6ff0..a4d5eeec1 100644
--- a/src/jailcheck/network.c
+++ b/src/jailcheck/network.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -52,6 +52,3 @@ void network_test(void) {
        else
                printf("   Networking: disabled\n");
 }
diff --git a/src/jailcheck/noexec.c b/src/jailcheck/noexec.c
index 4cf5dabde..bfeff9c7f 100644
--- a/src/jailcheck/noexec.c
+++ b/src/jailcheck/noexec.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -76,7 +76,7 @@ void noexec_test(const char *path) {
        if (child == 0) { // child
                // drop privileges
-                if (setgid(user_gid) != 0)
+                if (setgid(user_gid) != 0)
                        errExit("setgid");
                if (setuid(user_uid) != 0)
                        errExit("setuid");
diff --git a/src/jailcheck/seccomp.c b/src/jailcheck/seccomp.c
index ac8064f0b..6cc13c5e7 100644
--- a/src/jailcheck/seccomp.c
+++ b/src/jailcheck/seccomp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/jailcheck/sysfiles.c b/src/jailcheck/sysfiles.c
index 0df95d496..f8094c5be 100644
--- a/src/jailcheck/sysfiles.c
+++ b/src/jailcheck/sysfiles.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/jailcheck/utils.c b/src/jailcheck/utils.c
index 65431e2e1..97fe8833b 100644
--- a/src/jailcheck/utils.c
+++ b/src/jailcheck/utils.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -99,4 +99,3 @@ int find_child(int id) {
        // this happens for processes sandboxed with --join
        return first_child;
 }
diff --git a/src/jailcheck/virtual.c b/src/jailcheck/virtual.c
index 93172d65c..9cc714529 100644
--- a/src/jailcheck/virtual.c
+++ b/src/jailcheck/virtual.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/lib/common.c b/src/lib/common.c
index 111366782..eee19c731 100644
--- a/src/lib/common.c
+++ b/src/lib/common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -404,6 +404,64 @@ char *replace_cntrl_chars(const char *str, char c) {
        return rv;
 }
+// Replaces each control character in str with an escape sequence, such as by
+// replacing '\n' (0x0a) with "\\n" (0x5c6e).
+char *escape_cntrl_chars(const char *str) {
+        if (str == NULL)
+                return NULL;
+        unsigned int cntrl_chars = 0;
+        const char *c = str;
+        while (*c) {
+                switch (*c++) {
+                case '\b':
+                case '\a':
+                case '\e':
+                case '\f':
+                case '\n':
+                case '\r':
+                case '\t':
+                case '\v':
+                case '\"':
+                case '\'':
+                case '\?':
+                case '\\':
+                        ++cntrl_chars;
+                default:
+                        break;
+                }
+        }
+        char *ptr, *rv = malloc(strlen(str) + cntrl_chars + 1);
+        if (!rv)
+                errExit("malloc");
+        ptr = rv;
+        c = str;
+        while (*c) {
+                if (iscntrl(*c)) {
+                        *ptr++ = '\\';
+                        switch (*c) {
+                        case '\b': *ptr++ = 'b'; break;
+                        case '\a': *ptr++ = 'a'; break;
+                        case '\e': *ptr++ = 'e'; break;
+                        case '\f': *ptr++ = 'f'; break;
+                        case '\n': *ptr++ = 'n'; break;
+                        case '\r': *ptr++ = 'r'; break;
+                        case '\t': *ptr++ = 't'; break;
+                        case '\v': *ptr++ = 'v'; break;
+                        case '\"': *ptr++ = '\"'; break;
+                        case '\'': *ptr++ = '\''; break;
+                        case '\?': *ptr++ = '?'; break;
+                        case '\\': *ptr++ = '\\'; break;
+                        }
+                } else {
+                        *ptr++ = *c;
+                }
+                c++;
+        }
+        *ptr = '\0';
+        return rv;
+}
 int has_cntrl_chars(const char *str) {
        assert(str);
diff --git a/src/lib/errno.c b/src/lib/errno.c
index 99b028e27..8103dec3b 100644
--- a/src/lib/errno.c
+++ b/src/lib/errno.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/lib/firejail_user.c b/src/lib/firejail_user.c
index bf338ee43..dc6361422 100644
--- a/src/lib/firejail_user.c
+++ b/src/lib/firejail_user.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/lib/ldd_utils.c b/src/lib/ldd_utils.c
index a50b759c3..39a548887 100644
--- a/src/lib/ldd_utils.c
+++ b/src/lib/ldd_utils.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/lib/pid.c b/src/lib/pid.c
index 5e9b20c94..e76f66910 100644
--- a/src/lib/pid.c
+++ b/src/lib/pid.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -197,6 +197,12 @@ static void print_elem(unsigned index, int nowrap) {
        char *user = pid_get_user_name(uid);
        char *user_allocated = user;
+        char *cmd_escaped = escape_cntrl_chars(cmd);
+        if (cmd_escaped) {
+                free(cmd);
+                cmd = cmd_escaped;
+        }
        // extract sandbox name - pid == index
        char *sandbox_name = "";
        char *sandbox_name_allocated = NULL;
@@ -224,7 +230,7 @@ static void print_elem(unsigned index, int nowrap) {
        }
        free(fname);
-        if (user ==NULL)
+        if (user == NULL)
                user = "";
        if (cmd) {
                if (col < 4 || nowrap)
diff --git a/src/lib/syscall.c b/src/lib/syscall.c
index 29cf6318f..ca7c61c8e 100644
--- a/src/lib/syscall.c
+++ b/src/lib/syscall.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/libpostexecseccomp/libpostexecseccomp.c b/src/libpostexecseccomp/libpostexecseccomp.c
index c8f1fb3fb..3a9ef9855 100644
--- a/src/libpostexecseccomp/libpostexecseccomp.c
+++ b/src/libpostexecseccomp/libpostexecseccomp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/libtrace/libtrace.c b/src/libtrace/libtrace.c
index aa37bb758..25f0cc12e 100644
--- a/src/libtrace/libtrace.c
+++ b/src/libtrace/libtrace.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -35,11 +35,11 @@
 #include "../include/rundefs.h"
 #define tprintf(fp, args...) \
-    do { \
+        do { \
-        if (!fp)\
+                if (!fp)\
-            init(); \
+                        init(); \
-        fprintf(fp, args); \
+                fprintf(fp, args); \
-    } while(0)
+        } while(0)
 // break recursivity on fopen call
 typedef FILE *(*orig_fopen_t)(const char *pathname, const char *mode);
@@ -515,7 +515,7 @@ int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen) {
        if (!orig_connect)
                orig_connect = (orig_connect_t)dlsym(RTLD_NEXT, "connect");
-        int rv = orig_connect(sockfd, addr, addrlen);
+        int rv = orig_connect(sockfd, addr, addrlen);
        print_sockaddr(sockfd, "connect", addr, rv);
        return rv;
diff --git a/src/libtracelog/libtracelog.c b/src/libtracelog/libtracelog.c
index fc2eba638..0cb13d2a8 100644
--- a/src/libtracelog/libtracelog.c
+++ b/src/libtracelog/libtracelog.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/man/preproc.awk b/src/man/preproc.awk
index d3a2b71c9..57424b3aa 100755
--- a/src/man/preproc.awk
+++ b/src/man/preproc.awk
@@ -1,6 +1,6 @@
 #!/usr/bin/gawk -E
-# Copyright (c) 2019-2022 rusty-snake
+# Copyright (c) 2019-2023 rusty-snake
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/src/profstats/main.c b/src/profstats/main.c
index 310319c69..d5e57e7cc 100644
--- a/src/profstats/main.c
+++ b/src/profstats/main.c
@@ -1,5 +1,5 @@
- /*
+/*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -166,7 +166,7 @@ static void process_file(char *fname) {
                else if (strncmp(ptr, "include whitelist-var-common.inc", 32) == 0)
                        cnt_whitelistvar++;
                else if (strncmp(ptr, "include whitelist-runuser-common.inc", 36) == 0 ||
-                        strncmp(ptr, "blacklist ${RUNUSER}", 20) == 0)
+                        strncmp(ptr, "blacklist ${RUNUSER}", 20) == 0)
                        cnt_whitelistrunuser++;
                else if (strncmp(ptr, "include whitelist-common.inc", 28) == 0)
                        cnt_whitelisthome++;
@@ -283,10 +283,10 @@ int main(int argc, char **argv) {
                        arg_dbus_user_none = 1;
                else if (*argv[i] == '-') {
                        fprintf(stderr, "Error: invalid option %s\n", argv[i]);
-                        return 1;
+                        return 1;
-                 }
+                }
-                 else
+                else
-                        break;
+                        break;
        }
        start = i;
diff --git a/src/tools/check-caps.sh b/src/tools/check-caps.sh
index 62c3b9066..b2cdd08e0 100755
--- a/src/tools/check-caps.sh
+++ b/src/tools/check-caps.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 if [ $# -eq 0 ]
diff --git a/src/tools/extract_caps.c b/src/tools/extract_caps.c
index 5e5b3cdc6..fd3cb236d 100644
--- a/src/tools/extract_caps.c
+++ b/src/tools/extract_caps.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/tools/extract_errnos.sh b/src/tools/extract_errnos.sh
index bb430b3e1..c134db8f6 100755
--- a/src/tools/extract_errnos.sh
+++ b/src/tools/extract_errnos.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 echo -e "#include <errno.h>\n#include <attr/xattr.h>" | \
diff --git a/src/tools/extract_seccomp.c b/src/tools/extract_seccomp.c
index 6b644796b..69e20317a 100644
--- a/src/tools/extract_seccomp.c
+++ b/src/tools/extract_seccomp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -31,10 +31,13 @@
 #include <linux/filter.h>
 #define MAXBUF 1024
-#define errExit(msg)  { char msgout[256]; \
+#define errExit(msg) \
-                        snprintf(msgout, 256, "Error %d: %s", __LINE__, (msg)); \
+        do { \
-                        perror(msgout); \
+                char msgout[256]; \
-                        exit(1); }
+                snprintf(msgout, 256, "Error %d: %s", __LINE__, (msg)); \
+                perror(msgout); \
+                exit(1); \
+        } while (0);
 // dump all seccomp filters of a process
 // for further analysis with fsec-print
diff --git a/src/tools/extract_syscalls.c b/src/tools/extract_syscalls.c
index f77a84123..20f100572 100644
--- a/src/tools/extract_syscalls.c
+++ b/src/tools/extract_syscalls.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/tools/mkcoverit.sh b/src/tools/mkcoverit.sh
index c7a57cd21..a82bf4fbc 100755
--- a/src/tools/mkcoverit.sh
+++ b/src/tools/mkcoverit.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 # unpack firejail archive
diff --git a/src/tools/testuid.c b/src/tools/testuid.c
index 1bc617522..86eae4ba3 100644
--- a/src/tools/testuid.c
+++ b/src/tools/testuid.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/tools/ttytest.c b/src/tools/ttytest.c
index 9e40d289a..3dcb5a06b 100644
--- a/src/tools/ttytest.c
+++ b/src/tools/ttytest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/tools/unixsocket.c b/src/tools/unixsocket.c
index bd638269d..304c5d34d 100644
--- a/src/tools/unixsocket.c
+++ b/src/tools/unixsocket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/zsh_completion/.editorconfig b/src/zsh_completion/.editorconfig
new file mode 100644
index 000000000..15ca952a4
--- /dev/null
+++ b/src/zsh_completion/.editorconfig
@@ -0,0 +1,3 @@
+[_*{,.in}]
+indent_size = 4
+indent_style = space
diff --git a/test/appimage/appimage-args.exp b/test/appimage/appimage-args.exp
index e1fb8567a..c10007603 100755
--- a/test/appimage/appimage-args.exp
+++ b/test/appimage/appimage-args.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/appimage/appimage-trace.exp b/test/appimage/appimage-trace.exp
index d1530349e..f98826138 100755
--- a/test/appimage/appimage-trace.exp
+++ b/test/appimage/appimage-trace.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/appimage/appimage-v1.exp b/test/appimage/appimage-v1.exp
index 2fcccfd5b..72dfdea42 100755
--- a/test/appimage/appimage-v1.exp
+++ b/test/appimage/appimage-v1.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/appimage/appimage-v2.exp b/test/appimage/appimage-v2.exp
index d289165d9..0f865d94b 100755
--- a/test/appimage/appimage-v2.exp
+++ b/test/appimage/appimage-v2.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/appimage/appimage.sh b/test/appimage/appimage.sh
index c2bdad012..0c50434ac 100755
--- a/test/appimage/appimage.sh
+++ b/test/appimage/appimage.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/appimage/filename.exp b/test/appimage/filename.exp
index 711eae8d2..9d9127fb5 100755
--- a/test/appimage/filename.exp
+++ b/test/appimage/filename.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11-xorg/apps-x11-xorg.sh b/test/apps-x11-xorg/apps-x11-xorg.sh
index 9dcee7aff..44f3fd677 100755
--- a/test/apps-x11-xorg/apps-x11-xorg.sh
+++ b/test/apps-x11-xorg/apps-x11-xorg.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/apps-x11-xorg/firefox.exp b/test/apps-x11-xorg/firefox.exp
index 4a85b593b..7f7269c61 100755
--- a/test/apps-x11-xorg/firefox.exp
+++ b/test/apps-x11-xorg/firefox.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11-xorg/thunderbird.exp b/test/apps-x11-xorg/thunderbird.exp
index a06303fc5..491c13825 100755
--- a/test/apps-x11-xorg/thunderbird.exp
+++ b/test/apps-x11-xorg/thunderbird.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11-xorg/transmission-gtk.exp b/test/apps-x11-xorg/transmission-gtk.exp
index 3e497f9e0..558468bd5 100755
--- a/test/apps-x11-xorg/transmission-gtk.exp
+++ b/test/apps-x11-xorg/transmission-gtk.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11-xorg/transmission-qt.exp b/test/apps-x11-xorg/transmission-qt.exp
index 0642d3d32..f76c260d5 100755
--- a/test/apps-x11-xorg/transmission-qt.exp
+++ b/test/apps-x11-xorg/transmission-qt.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11/apps-x11.sh b/test/apps-x11/apps-x11.sh
index b2722eed3..81916685a 100755
--- a/test/apps-x11/apps-x11.sh
+++ b/test/apps-x11/apps-x11.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/apps-x11/chromium.exp b/test/apps-x11/chromium.exp
index 059fd0ad7..b654dc5d4 100755
--- a/test/apps-x11/chromium.exp
+++ b/test/apps-x11/chromium.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11/firefox.exp b/test/apps-x11/firefox.exp
index ac177211d..fe6d036d1 100755
--- a/test/apps-x11/firefox.exp
+++ b/test/apps-x11/firefox.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11/thunderbird.exp b/test/apps-x11/thunderbird.exp
index 391dc52e3..aa697a7c1 100755
--- a/test/apps-x11/thunderbird.exp
+++ b/test/apps-x11/thunderbird.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11/transmission-gtk.exp b/test/apps-x11/transmission-gtk.exp
index 21bc4a8bc..32c88250c 100755
--- a/test/apps-x11/transmission-gtk.exp
+++ b/test/apps-x11/transmission-gtk.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11/x11-none.exp b/test/apps-x11/x11-none.exp
index e6ff12f27..3a2fcca7c 100755
--- a/test/apps-x11/x11-none.exp
+++ b/test/apps-x11/x11-none.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11/x11-xephyr.exp b/test/apps-x11/x11-xephyr.exp
index f0090d713..5f9212d80 100755
--- a/test/apps-x11/x11-xephyr.exp
+++ b/test/apps-x11/x11-xephyr.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11/xterm-xephyr.exp b/test/apps-x11/xterm-xephyr.exp
index 3db6cf793..af69dd003 100755
--- a/test/apps-x11/xterm-xephyr.exp
+++ b/test/apps-x11/xterm-xephyr.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11/xterm-xorg.exp b/test/apps-x11/xterm-xorg.exp
index 409b39f40..b0c501b00 100755
--- a/test/apps-x11/xterm-xorg.exp
+++ b/test/apps-x11/xterm-xorg.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11/xterm-xpra.exp b/test/apps-x11/xterm-xpra.exp
index 4acf780ac..80cc6a618 100755
--- a/test/apps-x11/xterm-xpra.exp
+++ b/test/apps-x11/xterm-xpra.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/apps.sh b/test/apps/apps.sh
index 0ef01bf2e..fc053a30d 100755
--- a/test/apps/apps.sh
+++ b/test/apps/apps.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/apps/chromium.exp b/test/apps/chromium.exp
index 4e036dee9..aef1a93f4 100755
--- a/test/apps/chromium.exp
+++ b/test/apps/chromium.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/deluge.exp b/test/apps/deluge.exp
index 5df35fce4..21b1b7d4c 100755
--- a/test/apps/deluge.exp
+++ b/test/apps/deluge.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/fbreader.exp b/test/apps/fbreader.exp
index ebb21bcf2..7bcefda13 100755
--- a/test/apps/fbreader.exp
+++ b/test/apps/fbreader.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/filezilla.exp b/test/apps/filezilla.exp
index 397904860..34fe257eb 100755
--- a/test/apps/filezilla.exp
+++ b/test/apps/filezilla.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/firefox.exp b/test/apps/firefox.exp
index f09c76b5d..29e03028a 100755
--- a/test/apps/firefox.exp
+++ b/test/apps/firefox.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/gnome-mplayer.exp b/test/apps/gnome-mplayer.exp
index 4d7ccff81..6491a5343 100755
--- a/test/apps/gnome-mplayer.exp
+++ b/test/apps/gnome-mplayer.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/gthumb.exp b/test/apps/gthumb.exp
index 0da1572b2..585d8d7d7 100755
--- a/test/apps/gthumb.exp
+++ b/test/apps/gthumb.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/hexchat.exp b/test/apps/hexchat.exp
index 8ed823dd5..0429dbec5 100755
--- a/test/apps/hexchat.exp
+++ b/test/apps/hexchat.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/kcalc.exp b/test/apps/kcalc.exp
index d7251eec1..4d00d3cc4 100755
--- a/test/apps/kcalc.exp
+++ b/test/apps/kcalc.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/ktorrent.exp b/test/apps/ktorrent.exp
index efa3f1d08..58f875077 100755
--- a/test/apps/ktorrent.exp
+++ b/test/apps/ktorrent.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/midori.exp b/test/apps/midori.exp
index 431b43f8d..3ab67e7d0 100755
--- a/test/apps/midori.exp
+++ b/test/apps/midori.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/opera.exp b/test/apps/opera.exp
index b0d1f3b9d..665c5b672 100755
--- a/test/apps/opera.exp
+++ b/test/apps/opera.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/qbittorrent.exp b/test/apps/qbittorrent.exp
index 842e47986..0d482c1d8 100755
--- a/test/apps/qbittorrent.exp
+++ b/test/apps/qbittorrent.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/thunderbird.exp b/test/apps/thunderbird.exp
index 2b93835b6..632df93b0 100755
--- a/test/apps/thunderbird.exp
+++ b/test/apps/thunderbird.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/transmission-qt.exp b/test/apps/transmission-qt.exp
index 90b0ef4ac..212423035 100755
--- a/test/apps/transmission-qt.exp
+++ b/test/apps/transmission-qt.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/uget-gtk.exp b/test/apps/uget-gtk.exp
index 21b859ee2..96c9c598b 100755
--- a/test/apps/uget-gtk.exp
+++ b/test/apps/uget-gtk.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/vlc.exp b/test/apps/vlc.exp
index a0aed9cc9..671758077 100755
--- a/test/apps/vlc.exp
+++ b/test/apps/vlc.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/wine.exp b/test/apps/wine.exp
index e2a08089f..4536c353c 100755
--- a/test/apps/wine.exp
+++ b/test/apps/wine.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/xchat.exp b/test/apps/xchat.exp
index ca17f44e4..add6fbb91 100755
--- a/test/apps/xchat.exp
+++ b/test/apps/xchat.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/chroot/chroot.sh b/test/chroot/chroot.sh
index f5ccf3549..840f162cc 100755
--- a/test/chroot/chroot.sh
+++ b/test/chroot/chroot.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/chroot/configure b/test/chroot/configure
index 3f3555193..a817f6566 100755
--- a/test/chroot/configure
+++ b/test/chroot/configure
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 # build a very small chroot
diff --git a/test/chroot/fs_chroot.exp b/test/chroot/fs_chroot.exp
index c379e389c..545de0c66 100755
--- a/test/chroot/fs_chroot.exp
+++ b/test/chroot/fs_chroot.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/chroot/unchroot-as-root.exp b/test/chroot/unchroot-as-root.exp
index f67590768..eccb400c0 100755
--- a/test/chroot/unchroot-as-root.exp
+++ b/test/chroot/unchroot-as-root.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/chroot/unchroot.c b/test/chroot/unchroot.c
index 5d006e318..408e4eedf 100644
--- a/test/chroot/unchroot.c
+++ b/test/chroot/unchroot.c
@@ -1,5 +1,5 @@
 // This file is part of Firejail project
-// Copyright (C) 2014-2022 Firejail Authors
+// Copyright (C) 2014-2023 Firejail Authors
 // License GPL v2
 // simple unchroot example from http://linux-vserver.org/Secure_chroot_Barrier
diff --git a/test/compile/compile.sh b/test/compile/compile.sh
index 0285c8935..da6e43a5a 100755
--- a/test/compile/compile.sh
+++ b/test/compile/compile.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 # not currently covered
diff --git a/test/environment/allow-debuggers.exp b/test/environment/allow-debuggers.exp
index f972b5788..00cb9fc53 100755
--- a/test/environment/allow-debuggers.exp
+++ b/test/environment/allow-debuggers.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/deterministic-exit-code.exp b/test/environment/deterministic-exit-code.exp
index 9f5be2c3d..bc177ee7e 100755
--- a/test/environment/deterministic-exit-code.exp
+++ b/test/environment/deterministic-exit-code.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 4
diff --git a/test/environment/deterministic-shutdown.exp b/test/environment/deterministic-shutdown.exp
index be4e9c42e..2fa454795 100755
--- a/test/environment/deterministic-shutdown.exp
+++ b/test/environment/deterministic-shutdown.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/dns.exp b/test/environment/dns.exp
index 2c00cfa1c..373d50999 100755
--- a/test/environment/dns.exp
+++ b/test/environment/dns.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/doubledash.exp b/test/environment/doubledash.exp
index dd2725426..4ea23a8f6 100755
--- a/test/environment/doubledash.exp
+++ b/test/environment/doubledash.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/env.exp b/test/environment/env.exp
index 9394f2066..343b42f75 100755
--- a/test/environment/env.exp
+++ b/test/environment/env.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/environment.sh b/test/environment/environment.sh
index c88c91741..0250836df 100755
--- a/test/environment/environment.sh
+++ b/test/environment/environment.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/environment/extract_command.exp b/test/environment/extract_command.exp
index 45ff1f291..0e6b2aa0a 100755
--- a/test/environment/extract_command.exp
+++ b/test/environment/extract_command.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/firejail-in-firejail.exp b/test/environment/firejail-in-firejail.exp
index 4a60d5611..1229ec982 100755
--- a/test/environment/firejail-in-firejail.exp
+++ b/test/environment/firejail-in-firejail.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/hostfile.exp b/test/environment/hostfile.exp
index ccc8d049e..f909b2827 100755
--- a/test/environment/hostfile.exp
+++ b/test/environment/hostfile.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
diff --git a/test/environment/ibus.exp b/test/environment/ibus.exp
index e9dd290a1..ebdfbb14c 100755
--- a/test/environment/ibus.exp
+++ b/test/environment/ibus.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/keep-fd-bad.exp b/test/environment/keep-fd-bad.exp
index e8b411ea0..1a4e89cf9 100755
--- a/test/environment/keep-fd-bad.exp
+++ b/test/environment/keep-fd-bad.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/keep-fd.exp b/test/environment/keep-fd.exp
index 440cbd860..c144046ca 100755
--- a/test/environment/keep-fd.exp
+++ b/test/environment/keep-fd.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/machineid.exp b/test/environment/machineid.exp
index 2392dc9d6..acee1ccbe 100755
--- a/test/environment/machineid.exp
+++ b/test/environment/machineid.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
diff --git a/test/environment/nice.exp b/test/environment/nice.exp
index f3b3f083f..7cc8619ae 100755
--- a/test/environment/nice.exp
+++ b/test/environment/nice.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/output.exp b/test/environment/output.exp
index 2b9594b61..ec66a0196 100755
--- a/test/environment/output.exp
+++ b/test/environment/output.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/output.sh b/test/environment/output.sh
index ba06f9184..b8f27ad65 100755
--- a/test/environment/output.sh
+++ b/test/environment/output.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 i="0"
diff --git a/test/environment/quiet.exp b/test/environment/quiet.exp
index b1b3b0173..6dd552845 100755
--- a/test/environment/quiet.exp
+++ b/test/environment/quiet.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 4
diff --git a/test/environment/rlimit-bad-profile.exp b/test/environment/rlimit-bad-profile.exp
index 627cc860f..f2e9bebcf 100755
--- a/test/environment/rlimit-bad-profile.exp
+++ b/test/environment/rlimit-bad-profile.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/rlimit-bad.exp b/test/environment/rlimit-bad.exp
index 24df1874c..47c004716 100755
--- a/test/environment/rlimit-bad.exp
+++ b/test/environment/rlimit-bad.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/rlimit-join.exp b/test/environment/rlimit-join.exp
index 9e7161241..c71dad27e 100755
--- a/test/environment/rlimit-join.exp
+++ b/test/environment/rlimit-join.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
@@ -8,7 +8,7 @@ cd /home
 spawn $env(SHELL)
 match_max 100000
-send --  "firejail --noprofile --name=\"rlimit testing\"\r"
+send --  "firejail --noprofile --name=\"rlimittesting\"\r"
 expect {
        timeout {puts "TESTING ERROR 0\n";exit}
        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
@@ -16,7 +16,7 @@ expect {
 sleep 1
 spawn $env(SHELL)
-send --  "firejail --rlimit-nofile=1234 --join=\"rlimit testing\"\r"
+send --  "firejail --rlimit-nofile=1234 --join=\"rlimittesting\"\r"
 expect {
        timeout {puts "TESTING ERROR 1\n";exit}
        "Switching to pid"
diff --git a/test/environment/rlimit-profile.exp b/test/environment/rlimit-profile.exp
index 762f70ba9..f7d486603 100755
--- a/test/environment/rlimit-profile.exp
+++ b/test/environment/rlimit-profile.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/rlimit.exp b/test/environment/rlimit.exp
index acc87277b..180010c4f 100755
--- a/test/environment/rlimit.exp
+++ b/test/environment/rlimit.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/sound.exp b/test/environment/sound.exp
index 7ee1c74d7..5582d1bbe 100755
--- a/test/environment/sound.exp
+++ b/test/environment/sound.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
diff --git a/test/environment/timeout.exp b/test/environment/timeout.exp
index b38881c81..23853deb1 100755
--- a/test/environment/timeout.exp
+++ b/test/environment/timeout.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/umask.exp b/test/environment/umask.exp
index 46bd80a92..3c1365693 100755
--- a/test/environment/umask.exp
+++ b/test/environment/umask.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fcopy/cmdline.exp b/test/fcopy/cmdline.exp
index 91f18c332..2cd5b2d89 100755
--- a/test/fcopy/cmdline.exp
+++ b/test/fcopy/cmdline.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fcopy/dircopy.exp b/test/fcopy/dircopy.exp
index a779f80cd..6c3501597 100755
--- a/test/fcopy/dircopy.exp
+++ b/test/fcopy/dircopy.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
diff --git a/test/fcopy/fcopy.sh b/test/fcopy/fcopy.sh
index 72b87d14c..f842cdc4a 100755
--- a/test/fcopy/fcopy.sh
+++ b/test/fcopy/fcopy.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/fcopy/filecopy.exp b/test/fcopy/filecopy.exp
index 155c1ce31..3c15efaf1 100755
--- a/test/fcopy/filecopy.exp
+++ b/test/fcopy/filecopy.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
diff --git a/test/fcopy/linkcopy.exp b/test/fcopy/linkcopy.exp
index 7c085e552..8bcb2d25a 100755
--- a/test/fcopy/linkcopy.exp
+++ b/test/fcopy/linkcopy.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
diff --git a/test/features/1.1.exp b/test/features/1.1.exp
index 916a610a6..34159f114 100755
--- a/test/features/1.1.exp
+++ b/test/features/1.1.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # disable /boot
diff --git a/test/features/1.10.exp b/test/features/1.10.exp
index 53279f71e..6744ce826 100755
--- a/test/features/1.10.exp
+++ b/test/features/1.10.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # disable /selinux
diff --git a/test/features/1.2.exp b/test/features/1.2.exp
index 3043f0104..56750670d 100755
--- a/test/features/1.2.exp
+++ b/test/features/1.2.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # new /proc
diff --git a/test/features/1.4.exp b/test/features/1.4.exp
index b7e8246a2..f5db0c450 100755
--- a/test/features/1.4.exp
+++ b/test/features/1.4.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # mask other users
diff --git a/test/features/1.5.exp b/test/features/1.5.exp
index cce8f490f..68709fcad 100755
--- a/test/features/1.5.exp
+++ b/test/features/1.5.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # PID namespace
diff --git a/test/features/1.6.exp b/test/features/1.6.exp
index 81da44c64..0d0f08817 100755
--- a/test/features/1.6.exp
+++ b/test/features/1.6.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # new /var/log
diff --git a/test/features/1.7.exp b/test/features/1.7.exp
index a84b723de..b3264970d 100755
--- a/test/features/1.7.exp
+++ b/test/features/1.7.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # new /var/tmp
diff --git a/test/features/1.8.exp b/test/features/1.8.exp
index 5f7b0cdbc..028077b6f 100755
--- a/test/features/1.8.exp
+++ b/test/features/1.8.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # disable /etc/firejail and ~/.config/firejail
diff --git a/test/features/2.1.exp b/test/features/2.1.exp
index b56cbc135..8f7ddce2c 100755
--- a/test/features/2.1.exp
+++ b/test/features/2.1.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # hostname
diff --git a/test/features/2.2.exp b/test/features/2.2.exp
index 378bd529a..94bd6f4db 100755
--- a/test/features/2.2.exp
+++ b/test/features/2.2.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # DNS
diff --git a/test/features/2.3.exp b/test/features/2.3.exp
index 5a188ccc3..1e27a7632 100755
--- a/test/features/2.3.exp
+++ b/test/features/2.3.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # mac-vlan
diff --git a/test/features/2.4.exp b/test/features/2.4.exp
index 15159c9b7..ed52f4bad 100755
--- a/test/features/2.4.exp
+++ b/test/features/2.4.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # bridge
diff --git a/test/features/2.5.exp b/test/features/2.5.exp
index 2995d34f7..ad462e440 100755
--- a/test/features/2.5.exp
+++ b/test/features/2.5.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # interface
diff --git a/test/features/2.6.exp b/test/features/2.6.exp
index e8cd780ee..7fdb69052 100755
--- a/test/features/2.6.exp
+++ b/test/features/2.6.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # default gateway
diff --git a/test/features/3.1.exp b/test/features/3.1.exp
index 95d1d609b..fb144b857 100755
--- a/test/features/3.1.exp
+++ b/test/features/3.1.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # private
diff --git a/test/features/3.10.exp b/test/features/3.10.exp
index 5d4414f40..728ad91f5 100755
--- a/test/features/3.10.exp
+++ b/test/features/3.10.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # whitelist tmp
diff --git a/test/features/3.11.exp b/test/features/3.11.exp
index 8287f9dbf..9e59b05e7 100755
--- a/test/features/3.11.exp
+++ b/test/features/3.11.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # mkdir
diff --git a/test/features/3.2.exp b/test/features/3.2.exp
index 9af0513ea..1fdb74a42 100755
--- a/test/features/3.2.exp
+++ b/test/features/3.2.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # read-only
diff --git a/test/features/3.3.exp b/test/features/3.3.exp
index 71b6f70db..8c931dcf1 100755
--- a/test/features/3.3.exp
+++ b/test/features/3.3.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # blacklist
diff --git a/test/features/3.4.exp b/test/features/3.4.exp
index d3f894da2..813c2d86a 100755
--- a/test/features/3.4.exp
+++ b/test/features/3.4.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # whitelist home
diff --git a/test/features/3.5.exp b/test/features/3.5.exp
index c19680d41..93bbfe054 100755
--- a/test/features/3.5.exp
+++ b/test/features/3.5.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # private-dev
diff --git a/test/features/3.6.exp b/test/features/3.6.exp
index 31978e764..5dcbdd483 100755
--- a/test/features/3.6.exp
+++ b/test/features/3.6.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # private-etc
diff --git a/test/features/3.7.exp b/test/features/3.7.exp
index 4a0cb0d79..f7f5fa67f 100755
--- a/test/features/3.7.exp
+++ b/test/features/3.7.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # private-tmp
diff --git a/test/features/3.8.exp b/test/features/3.8.exp
index 0a53599a9..23adab634 100755
--- a/test/features/3.8.exp
+++ b/test/features/3.8.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # private-bin
diff --git a/test/features/3.9.exp b/test/features/3.9.exp
index 7d843e7cc..cfc588bf1 100755
--- a/test/features/3.9.exp
+++ b/test/features/3.9.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # whitelist dev
diff --git a/test/features/test.sh b/test/features/test.sh
index 44677aaa7..b3e29bc28 100755
--- a/test/features/test.sh
+++ b/test/features/test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 export LC_ALL=C
diff --git a/test/filters/apparmor.exp b/test/filters/apparmor.exp
index 0797a1db3..a8f73c797 100755
--- a/test/filters/apparmor.exp
+++ b/test/filters/apparmor.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/caps-join.exp b/test/filters/caps-join.exp
index 921d6b695..1830143fb 100755
--- a/test/filters/caps-join.exp
+++ b/test/filters/caps-join.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/caps-print.exp b/test/filters/caps-print.exp
index f4f2fc7ca..b403f9ffe 100755
--- a/test/filters/caps-print.exp
+++ b/test/filters/caps-print.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/caps.exp b/test/filters/caps.exp
index 29437beea..dbd63efda 100755
--- a/test/filters/caps.exp
+++ b/test/filters/caps.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/debug.exp b/test/filters/debug.exp
index 769c03273..daf1fe2f2 100755
--- a/test/filters/debug.exp
+++ b/test/filters/debug.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/filters.sh b/test/filters/filters.sh
index c313b80ed..1d145ac4b 100755
--- a/test/filters/filters.sh
+++ b/test/filters/filters.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/filters/fseccomp.exp b/test/filters/fseccomp.exp
index ff0179a1c..7f22b7247 100755
--- a/test/filters/fseccomp.exp
+++ b/test/filters/fseccomp.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/memwrexe-32.exp b/test/filters/memwrexe-32.exp
index 211052514..966ade4f2 100755
--- a/test/filters/memwrexe-32.exp
+++ b/test/filters/memwrexe-32.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/memwrexe.c b/test/filters/memwrexe.c
index 042c31086..548320df9 100644
--- a/test/filters/memwrexe.c
+++ b/test/filters/memwrexe.c
@@ -1,5 +1,5 @@
 // This file is part of Firejail project
-// Copyright (C) 2014-2022 Firejail Authors
+// Copyright (C) 2014-2023 Firejail Authors
 // License GPL v2
 #include <stdio.h>
diff --git a/test/filters/memwrexe.exp b/test/filters/memwrexe.exp
index 950acbf50..e51b3372e 100755
--- a/test/filters/memwrexe.exp
+++ b/test/filters/memwrexe.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/namespaces-32.exp b/test/filters/namespaces-32.exp
index b643a28d3..3b618bd01 100755
--- a/test/filters/namespaces-32.exp
+++ b/test/filters/namespaces-32.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/namespaces.c b/test/filters/namespaces.c
index 06dfa4edf..ecf0fdcd1 100644
--- a/test/filters/namespaces.c
+++ b/test/filters/namespaces.c
@@ -15,82 +15,82 @@
 #define STACK_SIZE 1024 * 1024
 static int usage() {
-    fprintf(stderr, "Usage: namespaces <system call>[clone,unshare] <list of namespaces>[cgroup,ipc,mnt,net,pid,time,user,uts]\n");
+        fprintf(stderr, "Usage: namespaces <system call>[clone,unshare] <list of namespaces>[cgroup,ipc,mnt,net,pid,time,user,uts]\n");
-    exit(1);
+        exit(1);
 }
 static void die(const char *msg) {
-    fprintf(stderr, "Error: %s: %s\n", msg, strerror(errno));
+        fprintf(stderr, "Error: %s: %s\n", msg, strerror(errno));
-    exit(1);
+        exit(1);
 }
 static int ns_flags(const char *list) {
-    int flags = 0;
+        int flags = 0;
-    char *dup = strdup(list);
+        char *dup = strdup(list);
-    if (!dup)
+        if (!dup)
-        die("cannot allocate memory");
+                die("cannot allocate memory");
-    char *token = strtok(dup, ",");
+        char *token = strtok(dup, ",");
-    while (token) {
+        while (token) {
-        if (strcmp(token, "cgroup") == 0)
+                if (strcmp(token, "cgroup") == 0)
-            flags |= CLONE_NEWCGROUP;
+                        flags |= CLONE_NEWCGROUP;
-        else if (strcmp(token, "ipc") == 0)
+                else if (strcmp(token, "ipc") == 0)
-            flags |= CLONE_NEWIPC;
+                        flags |= CLONE_NEWIPC;
-        else if (strcmp(token, "net") == 0)
+                else if (strcmp(token, "net") == 0)
-            flags |= CLONE_NEWNET;
+                        flags |= CLONE_NEWNET;
-        else if (strcmp(token, "mnt") == 0)
+                else if (strcmp(token, "mnt") == 0)
-            flags |= CLONE_NEWNS;
+                        flags |= CLONE_NEWNS;
-        else if (strcmp(token, "pid") == 0)
+                else if (strcmp(token, "pid") == 0)
-            flags |= CLONE_NEWPID;
+                        flags |= CLONE_NEWPID;
-        else if (strcmp(token, "time") == 0)
+                else if (strcmp(token, "time") == 0)
-            flags |= CLONE_NEWTIME;
+                        flags |= CLONE_NEWTIME;
-        else if (strcmp(token, "user") == 0)
+                else if (strcmp(token, "user") == 0)
-            flags |= CLONE_NEWUSER;
+                        flags |= CLONE_NEWUSER;
-        else if (strcmp(token, "uts") == 0)
+                else if (strcmp(token, "uts") == 0)
-            flags |= CLONE_NEWUTS;
+                        flags |= CLONE_NEWUTS;
-        else
+                else
-            usage();
+                        usage();
-        token = strtok(NULL, ",");
+                token = strtok(NULL, ",");
-    }
+        }
-    free(dup);
+        free(dup);
-    return flags;
+        return flags;
 }
 static int child(void *arg) {
-    (void) arg;
+        (void) arg;
-    fprintf(stderr, "clone successful\n");
+        fprintf(stderr, "clone successful\n");
-    return 0;
+        return 0;
 }
 int main (int argc, char **argv) {
-    if (argc != 3)
+        if (argc != 3)
-        usage();
+                usage();
-    int flags = ns_flags(argv[2]);
+        int flags = ns_flags(argv[2]);
-    if (getuid() != 0)
+        if (getuid() != 0)
-        flags |= CLONE_NEWUSER;
+                flags |= CLONE_NEWUSER;
-    if (strcmp(argv[1], "clone") == 0) {
+        if (strcmp(argv[1], "clone") == 0) {
-        void *stack = mmap(NULL, STACK_SIZE, PROT_READ | PROT_WRITE,
+                void *stack = mmap(NULL, STACK_SIZE, PROT_READ | PROT_WRITE,
-                    MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+                                   MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-        if (stack == MAP_FAILED)
+                if (stack == MAP_FAILED)
-            die("mmap");
+                        die("mmap");
-        if (clone(child, stack + STACK_SIZE, flags | SIGCHLD, NULL) < 0)
+                if (clone(child, stack + STACK_SIZE, flags | SIGCHLD, NULL) < 0)
-            die("clone");
+                        die("clone");
-    }
+        }
-    else if (strcmp(argv[1], "unshare") == 0) {
+        else if (strcmp(argv[1], "unshare") == 0) {
-        if (unshare(flags))
+                if (unshare(flags))
-            die("unshare");
+                        die("unshare");
-        fprintf(stderr, "unshare successful\n");
+                fprintf(stderr, "unshare successful\n");
-    }
+        }
-    else
+        else
-        usage();
+                usage();
-    return 0;
+        return 0;
 }
diff --git a/test/filters/namespaces.exp b/test/filters/namespaces.exp
index cfa92f0ba..96e4a774a 100755
--- a/test/filters/namespaces.exp
+++ b/test/filters/namespaces.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/noroot.exp b/test/filters/noroot.exp
index 942aedbcb..8a8842cd9 100755
--- a/test/filters/noroot.exp
+++ b/test/filters/noroot.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/protocol.exp b/test/filters/protocol.exp
index 96ac8d586..5320dde6f 100755
--- a/test/filters/protocol.exp
+++ b/test/filters/protocol.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-bad-empty.exp b/test/filters/seccomp-bad-empty.exp
index 484dc32a9..293750cf9 100755
--- a/test/filters/seccomp-bad-empty.exp
+++ b/test/filters/seccomp-bad-empty.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-chmod-profile.exp b/test/filters/seccomp-chmod-profile.exp
index ac16015cd..2939cf7aa 100755
--- a/test/filters/seccomp-chmod-profile.exp
+++ b/test/filters/seccomp-chmod-profile.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-chmod.exp b/test/filters/seccomp-chmod.exp
index 913ea18a7..6e6436f97 100755
--- a/test/filters/seccomp-chmod.exp
+++ b/test/filters/seccomp-chmod.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-chown.exp b/test/filters/seccomp-chown.exp
index be6c13e2d..f1324678e 100755
--- a/test/filters/seccomp-chown.exp
+++ b/test/filters/seccomp-chown.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-debug-32.exp b/test/filters/seccomp-debug-32.exp
index 71d653c1f..f129e26b8 100755
--- a/test/filters/seccomp-debug-32.exp
+++ b/test/filters/seccomp-debug-32.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-debug.exp b/test/filters/seccomp-debug.exp
index b4a9e158d..dc6befcfe 100755
--- a/test/filters/seccomp-debug.exp
+++ b/test/filters/seccomp-debug.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-empty.exp b/test/filters/seccomp-empty.exp
index 7a5597727..247cabcd4 100755
--- a/test/filters/seccomp-empty.exp
+++ b/test/filters/seccomp-empty.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-errno.exp b/test/filters/seccomp-errno.exp
index f5e9ff402..46c691a36 100755
--- a/test/filters/seccomp-errno.exp
+++ b/test/filters/seccomp-errno.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-join.exp b/test/filters/seccomp-join.exp
index 1e62e75e7..305b12bd3 100755
--- a/test/filters/seccomp-join.exp
+++ b/test/filters/seccomp-join.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-numeric.exp b/test/filters/seccomp-numeric.exp
index fa1d8ada9..7203dc7f7 100755
--- a/test/filters/seccomp-numeric.exp
+++ b/test/filters/seccomp-numeric.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-postexec.exp b/test/filters/seccomp-postexec.exp
index 1d4166067..9a86651d6 100755
--- a/test/filters/seccomp-postexec.exp
+++ b/test/filters/seccomp-postexec.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-ptrace.exp b/test/filters/seccomp-ptrace.exp
index 9bde7355f..b65f8670e 100755
--- a/test/filters/seccomp-ptrace.exp
+++ b/test/filters/seccomp-ptrace.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-run-files.exp b/test/filters/seccomp-run-files.exp
index 959eb743e..16bfa9066 100755
--- a/test/filters/seccomp-run-files.exp
+++ b/test/filters/seccomp-run-files.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-su.exp b/test/filters/seccomp-su.exp
index d204a4295..c4dd25ed6 100755
--- a/test/filters/seccomp-su.exp
+++ b/test/filters/seccomp-su.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fnetfilter/cmdline.exp b/test/fnetfilter/cmdline.exp
index 514d3f890..fe24dfbd6 100755
--- a/test/fnetfilter/cmdline.exp
+++ b/test/fnetfilter/cmdline.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fnetfilter/copy.exp b/test/fnetfilter/copy.exp
index b03b3e19b..29d5cdb93 100755
--- a/test/fnetfilter/copy.exp
+++ b/test/fnetfilter/copy.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fnetfilter/default.exp b/test/fnetfilter/default.exp
index 545837cc1..19327a60b 100755
--- a/test/fnetfilter/default.exp
+++ b/test/fnetfilter/default.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fnetfilter/fnetfilter.sh b/test/fnetfilter/fnetfilter.sh
index 52f921232..4e08b45b5 100755
--- a/test/fnetfilter/fnetfilter.sh
+++ b/test/fnetfilter/fnetfilter.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/fnetfilter/template.exp b/test/fnetfilter/template.exp
index 2c5dba920..94b23c644 100755
--- a/test/fnetfilter/template.exp
+++ b/test/fnetfilter/template.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/fs.sh b/test/fs/fs.sh
index affc4bc7e..a4fab6bc4 100755
--- a/test/fs/fs.sh
+++ b/test/fs/fs.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/fs/fs_dev_shm.exp b/test/fs/fs_dev_shm.exp
index 5d57a8975..4d8c63577 100755
--- a/test/fs/fs_dev_shm.exp
+++ b/test/fs/fs_dev_shm.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/fs_var_lock.exp b/test/fs/fs_var_lock.exp
index ce3eb836e..58554f737 100755
--- a/test/fs/fs_var_lock.exp
+++ b/test/fs/fs_var_lock.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/fs_var_tmp.exp b/test/fs/fs_var_tmp.exp
index 8c2da085f..eac724d77 100755
--- a/test/fs/fs_var_tmp.exp
+++ b/test/fs/fs_var_tmp.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/fscheck-bindnoroot.exp b/test/fs/fscheck-bindnoroot.exp
index 6142a270a..f169f0f5e 100755
--- a/test/fs/fscheck-bindnoroot.exp
+++ b/test/fs/fscheck-bindnoroot.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/fscheck-private.exp b/test/fs/fscheck-private.exp
index 0b3f41115..c4d1bccf7 100755
--- a/test/fs/fscheck-private.exp
+++ b/test/fs/fscheck-private.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/fscheck-readonly.exp b/test/fs/fscheck-readonly.exp
index 6c58f41da..a04e3185f 100755
--- a/test/fs/fscheck-readonly.exp
+++ b/test/fs/fscheck-readonly.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/fscheck-tmpfs.exp b/test/fs/fscheck-tmpfs.exp
index 223bb63ba..96d7458e8 100755
--- a/test/fs/fscheck-tmpfs.exp
+++ b/test/fs/fscheck-tmpfs.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/invalid_filename.exp b/test/fs/invalid_filename.exp
index 3d4904d8f..3519059c6 100755
--- a/test/fs/invalid_filename.exp
+++ b/test/fs/invalid_filename.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/kmsg.exp b/test/fs/kmsg.exp
index e7d765bff..3f952a4d4 100755
--- a/test/fs/kmsg.exp
+++ b/test/fs/kmsg.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/macro.exp b/test/fs/macro.exp
index c01123f41..8a0d8932d 100755
--- a/test/fs/macro.exp
+++ b/test/fs/macro.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/mkdir.exp b/test/fs/mkdir.exp
index b9e8d5ce4..6494c8f0a 100755
--- a/test/fs/mkdir.exp
+++ b/test/fs/mkdir.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 3
diff --git a/test/fs/mkdir_mkfile.exp b/test/fs/mkdir_mkfile.exp
index c1dce58ea..e77fc8a82 100755
--- a/test/fs/mkdir_mkfile.exp
+++ b/test/fs/mkdir_mkfile.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/noblacklist-blacklist-noexec.exp b/test/fs/noblacklist-blacklist-noexec.exp
index 3bc5e7c79..33a927dd0 100755
--- a/test/fs/noblacklist-blacklist-noexec.exp
+++ b/test/fs/noblacklist-blacklist-noexec.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/noblacklist-blacklist-readonly.exp b/test/fs/noblacklist-blacklist-readonly.exp
index b5d3ef045..46341306c 100755
--- a/test/fs/noblacklist-blacklist-readonly.exp
+++ b/test/fs/noblacklist-blacklist-readonly.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/option_bind_user.exp b/test/fs/option_bind_user.exp
index c58c23d8c..aac23497e 100755
--- a/test/fs/option_bind_user.exp
+++ b/test/fs/option_bind_user.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/option_blacklist.exp b/test/fs/option_blacklist.exp
index 9e1533435..cecf79f2e 100755
--- a/test/fs/option_blacklist.exp
+++ b/test/fs/option_blacklist.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/option_blacklist_file.exp b/test/fs/option_blacklist_file.exp
index 9b4d3ed83..0ab61fea5 100755
--- a/test/fs/option_blacklist_file.exp
+++ b/test/fs/option_blacklist_file.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/option_blacklist_glob.exp b/test/fs/option_blacklist_glob.exp
index 83b123a4b..5dff6e8a0 100755
--- a/test/fs/option_blacklist_glob.exp
+++ b/test/fs/option_blacklist_glob.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/private-bin.exp b/test/fs/private-bin.exp
index e4b36e114..8d02ec0ed 100755
--- a/test/fs/private-bin.exp
+++ b/test/fs/private-bin.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/private-cache.exp b/test/fs/private-cache.exp
index 2764c5608..375b37577 100755
--- a/test/fs/private-cache.exp
+++ b/test/fs/private-cache.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/private-cwd.exp b/test/fs/private-cwd.exp
index 77374e086..85dfe7e73 100755
--- a/test/fs/private-cwd.exp
+++ b/test/fs/private-cwd.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/private-home-dir.exp b/test/fs/private-home-dir.exp
index e46d2b113..6b13c9d16 100755
--- a/test/fs/private-home-dir.exp
+++ b/test/fs/private-home-dir.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/private-home.exp b/test/fs/private-home.exp
index 99456a211..a180bf1a8 100755
--- a/test/fs/private-home.exp
+++ b/test/fs/private-home.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/private-homedir.exp b/test/fs/private-homedir.exp
index 0b4348514..3a134aed9 100755
--- a/test/fs/private-homedir.exp
+++ b/test/fs/private-homedir.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/private-whitelist.exp b/test/fs/private-whitelist.exp
index 48add880c..bf95e40dd 100755
--- a/test/fs/private-whitelist.exp
+++ b/test/fs/private-whitelist.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
@@ -32,9 +32,9 @@ send -- "ls -a ~ | wc -l\r"
 expect {
        timeout {puts "TESTING ERROR 4\n";exit}
        "3" {puts "3\n"}
-        "4" {puts "4\n"}
+        "4" {puts "4\n"}
-        "5" {puts "5\n"}
+        "5" {puts "5\n"}
-        "6" {puts "6\n"}
+        "6" {puts "6\n"}
 }
 sleep 1
diff --git a/test/fs/private.exp b/test/fs/private.exp
index ff8e0c66e..29ba5b53b 100755
--- a/test/fs/private.exp
+++ b/test/fs/private.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/read-write.exp b/test/fs/read-write.exp
index f0ef0842c..01c729597 100755
--- a/test/fs/read-write.exp
+++ b/test/fs/read-write.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/sys_fs.exp b/test/fs/sys_fs.exp
index ce1fb04de..cbd5ecdb4 100755
--- a/test/fs/sys_fs.exp
+++ b/test/fs/sys_fs.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/tab.exp b/test/fs/tab.exp
index cc9e11ed5..1488d91fb 100755
--- a/test/fs/tab.exp
+++ b/test/fs/tab.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/whitelist-dev.exp b/test/fs/whitelist-dev.exp
index fb91c4678..6236a8060 100755
--- a/test/fs/whitelist-dev.exp
+++ b/test/fs/whitelist-dev.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/whitelist-double.exp b/test/fs/whitelist-double.exp
index b3b48f2cd..36b0ba7d9 100755
--- a/test/fs/whitelist-double.exp
+++ b/test/fs/whitelist-double.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/whitelist-empty.exp b/test/fs/whitelist-empty.exp
index fc860f219..c26423f1d 100755
--- a/test/fs/whitelist-empty.exp
+++ b/test/fs/whitelist-empty.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 30
diff --git a/test/fs/whitelist-noexec.exp b/test/fs/whitelist-noexec.exp
index ba3ca4d92..3f0314e9e 100755
--- a/test/fs/whitelist-noexec.exp
+++ b/test/fs/whitelist-noexec.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/whitelist-readonly.exp b/test/fs/whitelist-readonly.exp
index 676131ade..e87e21a97 100755
--- a/test/fs/whitelist-readonly.exp
+++ b/test/fs/whitelist-readonly.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/whitelist-whitespace.exp b/test/fs/whitelist-whitespace.exp
index 885b90f2a..2133fe33b 100755
--- a/test/fs/whitelist-whitespace.exp
+++ b/test/fs/whitelist-whitespace.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/whitelist.exp b/test/fs/whitelist.exp
index f35744a9c..f44844d8a 100755
--- a/test/fs/whitelist.exp
+++ b/test/fs/whitelist.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/4bridges_arp.exp b/test/network/4bridges_arp.exp
index b7138851a..ca326320a 100755
--- a/test/network/4bridges_arp.exp
+++ b/test/network/4bridges_arp.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/4bridges_ip.exp b/test/network/4bridges_ip.exp
index 60e9d3bab..135b1121c 100755
--- a/test/network/4bridges_ip.exp
+++ b/test/network/4bridges_ip.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/bandwidth.exp b/test/network/bandwidth.exp
index 1a27bc0bf..ef68165b7 100755
--- a/test/network/bandwidth.exp
+++ b/test/network/bandwidth.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/configure b/test/network/configure
index 2b7b257bc..1a39dd5ad 100755
--- a/test/network/configure
+++ b/test/network/configure
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 brctl addbr br0
diff --git a/test/network/dns-print.exp b/test/network/dns-print.exp
index fd19b79ed..769d5431c 100755
--- a/test/network/dns-print.exp
+++ b/test/network/dns-print.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/firemon-arp.exp b/test/network/firemon-arp.exp
index 0e98b9f36..858c4a729 100755
--- a/test/network/firemon-arp.exp
+++ b/test/network/firemon-arp.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/firemon-interfaces.exp b/test/network/firemon-interfaces.exp
index 8eb9f4d87..47e540cc5 100755
--- a/test/network/firemon-interfaces.exp
+++ b/test/network/firemon-interfaces.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/firemon-route.exp b/test/network/firemon-route.exp
index 4eea5c14c..69cccfeae 100755
--- a/test/network/firemon-route.exp
+++ b/test/network/firemon-route.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
@@ -33,7 +33,7 @@ expect {
        "0.0.0.0/0 via 192.168.1.1, dev eth0, metric 0" {puts "Debian testing\n";}
        "0.0.0.0/0 via 192.168.1.1, dev enp0s3, metric 1024" {puts "Centos 7 testing\n";}
        "0.0.0.0/0 via 192.168.1.1, dev enp0s3, metric 0" {puts "OpenSUSE testing\n";}
-            "0.0.0.0/0 via 192.168.1.1, dev enp0s3, metric 100" {puts "Arch testing\n";}
+        "0.0.0.0/0 via 192.168.1.1, dev enp0s3, metric 100" {puts "Arch testing\n";}
 }
 expect {
        timeout {puts "TESTING ERROR 4\n";exit}
diff --git a/test/network/hostname.exp b/test/network/hostname.exp
index 12266a170..42af84847 100755
--- a/test/network/hostname.exp
+++ b/test/network/hostname.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/interface.exp b/test/network/interface.exp
index 7c3e39fea..2bcc6e88b 100755
--- a/test/network/interface.exp
+++ b/test/network/interface.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 #
 # interface
diff --git a/test/network/ip6.exp b/test/network/ip6.exp
index 665081db7..1f6581ae4 100755
--- a/test/network/ip6.exp
+++ b/test/network/ip6.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/iprange.exp b/test/network/iprange.exp
index d45ecaa40..a4e5560c1 100755
--- a/test/network/iprange.exp
+++ b/test/network/iprange.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_arp.exp b/test/network/net_arp.exp
index dee4ac1c1..f3e1f6e25 100755
--- a/test/network/net_arp.exp
+++ b/test/network/net_arp.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_badip.exp b/test/network/net_badip.exp
index b3fde5dc1..3a45496c7 100755
--- a/test/network/net_badip.exp
+++ b/test/network/net_badip.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_defaultgw.exp b/test/network/net_defaultgw.exp
index 6a5a0b64e..ee1ac9882 100755
--- a/test/network/net_defaultgw.exp
+++ b/test/network/net_defaultgw.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_defaultgw2.exp b/test/network/net_defaultgw2.exp
index 5d18571b6..30c945718 100755
--- a/test/network/net_defaultgw2.exp
+++ b/test/network/net_defaultgw2.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_defaultgw3.exp b/test/network/net_defaultgw3.exp
index 708c37a47..aa9bac156 100755
--- a/test/network/net_defaultgw3.exp
+++ b/test/network/net_defaultgw3.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_ip.exp b/test/network/net_ip.exp
index bdac67155..48d8a75fb 100755
--- a/test/network/net_ip.exp
+++ b/test/network/net_ip.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_local.exp b/test/network/net_local.exp
index 6d02de089..117b94212 100755
--- a/test/network/net_local.exp
+++ b/test/network/net_local.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_mac.exp b/test/network/net_mac.exp
index 3bd871a06..086efd02c 100755
--- a/test/network/net_mac.exp
+++ b/test/network/net_mac.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_macvlan2.exp b/test/network/net_macvlan2.exp
index abc6641bf..0fcea53dd 100755
--- a/test/network/net_macvlan2.exp
+++ b/test/network/net_macvlan2.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_mtu.exp b/test/network/net_mtu.exp
index 81c89e147..b87db1296 100755
--- a/test/network/net_mtu.exp
+++ b/test/network/net_mtu.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_netfilter.exp b/test/network/net_netfilter.exp
index eef4a145f..97170a1b9 100755
--- a/test/network/net_netfilter.exp
+++ b/test/network/net_netfilter.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_noip.exp b/test/network/net_noip.exp
index 11d12c3d3..7da2e85ef 100755
--- a/test/network/net_noip.exp
+++ b/test/network/net_noip.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_noip2.exp b/test/network/net_noip2.exp
index 09607d4b5..a0828a0e7 100755
--- a/test/network/net_noip2.exp
+++ b/test/network/net_noip2.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_none.exp b/test/network/net_none.exp
index 32d7532ce..aa071862e 100755
--- a/test/network/net_none.exp
+++ b/test/network/net_none.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_profile.exp b/test/network/net_profile.exp
index 3d6f8fdbb..d9ce166fd 100755
--- a/test/network/net_profile.exp
+++ b/test/network/net_profile.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_scan.exp b/test/network/net_scan.exp
index 42dd74df0..8d3e95f29 100755
--- a/test/network/net_scan.exp
+++ b/test/network/net_scan.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_unconfigured.exp b/test/network/net_unconfigured.exp
index 92d7a33eb..7a9f05236 100755
--- a/test/network/net_unconfigured.exp
+++ b/test/network/net_unconfigured.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_veth.exp b/test/network/net_veth.exp
index 781cc194c..c8c0c47e1 100755
--- a/test/network/net_veth.exp
+++ b/test/network/net_veth.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/netfilter-template.exp b/test/network/netfilter-template.exp
index ba09aaea7..0a3386965 100755
--- a/test/network/netfilter-template.exp
+++ b/test/network/netfilter-template.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/netns.exp b/test/network/netns.exp
index 034f4736e..048dbfa93 100755
--- a/test/network/netns.exp
+++ b/test/network/netns.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/netstats.exp b/test/network/netstats.exp
index e06e6769d..a41acac68 100755
--- a/test/network/netstats.exp
+++ b/test/network/netstats.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/network.sh b/test/network/network.sh
index 1f676ff50..0cb92f2e3 100755
--- a/test/network/network.sh
+++ b/test/network/network.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/network/tcpserver.c b/test/network/tcpserver.c
index d2c0a6e5d..639fbf868 100644
--- a/test/network/tcpserver.c
+++ b/test/network/tcpserver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2022 Firejail Authors
+ * Copyright (C) 2014-2023 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/test/network/veth-name.exp b/test/network/veth-name.exp
index 1c9f23c54..14ab27850 100755
--- a/test/network/veth-name.exp
+++ b/test/network/veth-name.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/overlay/firefox-x11-xorg.exp b/test/overlay/firefox-x11-xorg.exp
index 691e58437..5457b512a 100755
--- a/test/overlay/firefox-x11-xorg.exp
+++ b/test/overlay/firefox-x11-xorg.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/overlay/firefox-x11.exp b/test/overlay/firefox-x11.exp
index 96c6796bb..66b3d9d8e 100755
--- a/test/overlay/firefox-x11.exp
+++ b/test/overlay/firefox-x11.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/overlay/firefox.exp b/test/overlay/firefox.exp
index eb7276f99..295a03f52 100755
--- a/test/overlay/firefox.exp
+++ b/test/overlay/firefox.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/overlay/fs-named.exp b/test/overlay/fs-named.exp
index 25762337b..9e606183f 100755
--- a/test/overlay/fs-named.exp
+++ b/test/overlay/fs-named.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/overlay/fs-tmpfs.exp b/test/overlay/fs-tmpfs.exp
index 442a0fffa..8c8ebcb16 100755
--- a/test/overlay/fs-tmpfs.exp
+++ b/test/overlay/fs-tmpfs.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/overlay/fs.exp b/test/overlay/fs.exp
index 21de942ec..e078e604c 100755
--- a/test/overlay/fs.exp
+++ b/test/overlay/fs.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/overlay/overlay.sh b/test/overlay/overlay.sh
index a0519d1ad..2015942d9 100755
--- a/test/overlay/overlay.sh
+++ b/test/overlay/overlay.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/private-etc/etc-cleanup.exp b/test/private-etc/etc-cleanup.exp
index eb7eedcf4..0c1218829 100755
--- a/test/private-etc/etc-cleanup.exp
+++ b/test/private-etc/etc-cleanup.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-etc/groups.exp b/test/private-etc/groups.exp
index fed6d40b0..822845d11 100755
--- a/test/private-etc/groups.exp
+++ b/test/private-etc/groups.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-etc/private-etc.exp b/test/private-etc/private-etc.exp
index 3aac7cdf2..2e3c06dc1 100755
--- a/test/private-etc/private-etc.exp
+++ b/test/private-etc/private-etc.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-etc/private-etc.sh b/test/private-etc/private-etc.sh
index 67076af95..c46b684af 100755
--- a/test/private-etc/private-etc.sh
+++ b/test/private-etc/private-etc.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
@@ -18,4 +18,3 @@ echo "TESTING: groups (test/private-etc/groups.exp)"
 echo "TESTING: etc-cleanup (test/private-etc/etc-cleanup.exp)"
 ./etc-cleanup.exp
diff --git a/test/private-etc/profile.exp b/test/private-etc/profile.exp
index d5713fe95..7920b0c05 100755
--- a/test/private-etc/profile.exp
+++ b/test/private-etc/profile.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/atril.exp b/test/private-lib/atril.exp
index cad118c0a..7f59e32ec 100755
--- a/test/private-lib/atril.exp
+++ b/test/private-lib/atril.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/dig.exp b/test/private-lib/dig.exp
index fd40cd48c..dbe16c68a 100755
--- a/test/private-lib/dig.exp
+++ b/test/private-lib/dig.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/eog.exp b/test/private-lib/eog.exp
index c4bfc0aa7..bcab65df3 100755
--- a/test/private-lib/eog.exp
+++ b/test/private-lib/eog.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/eom.exp b/test/private-lib/eom.exp
index a7709b0ec..b6b410e41 100755
--- a/test/private-lib/eom.exp
+++ b/test/private-lib/eom.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/evince.exp b/test/private-lib/evince.exp
index 8f54ee345..689934d33 100755
--- a/test/private-lib/evince.exp
+++ b/test/private-lib/evince.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/galculator.exp b/test/private-lib/galculator.exp
index 4cf6b6a73..8be64f391 100755
--- a/test/private-lib/galculator.exp
+++ b/test/private-lib/galculator.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/gedit.exp b/test/private-lib/gedit.exp
index 838ffad21..30d3988f1 100755
--- a/test/private-lib/gedit.exp
+++ b/test/private-lib/gedit.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/gnome-calculator.exp b/test/private-lib/gnome-calculator.exp
index 37e6b86cb..20f91d03e 100755
--- a/test/private-lib/gnome-calculator.exp
+++ b/test/private-lib/gnome-calculator.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/gnome-logs.exp b/test/private-lib/gnome-logs.exp
index 3f0cc3544..d6dce771f 100755
--- a/test/private-lib/gnome-logs.exp
+++ b/test/private-lib/gnome-logs.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/gnome-nettool.exp b/test/private-lib/gnome-nettool.exp
index 3a08fe3df..a71db729b 100755
--- a/test/private-lib/gnome-nettool.exp
+++ b/test/private-lib/gnome-nettool.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/gnome-system-log.exp b/test/private-lib/gnome-system-log.exp
index 5ab819a89..886cd0e87 100755
--- a/test/private-lib/gnome-system-log.exp
+++ b/test/private-lib/gnome-system-log.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/gpicview.exp b/test/private-lib/gpicview.exp
index ea0964787..6a1467ca4 100755
--- a/test/private-lib/gpicview.exp
+++ b/test/private-lib/gpicview.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/leafpad.exp b/test/private-lib/leafpad.exp
index 9e4dc7fed..4df68f74e 100755
--- a/test/private-lib/leafpad.exp
+++ b/test/private-lib/leafpad.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/mousepad.exp b/test/private-lib/mousepad.exp
index 9c7501473..d0ffce97e 100755
--- a/test/private-lib/mousepad.exp
+++ b/test/private-lib/mousepad.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/pavucontrol.exp b/test/private-lib/pavucontrol.exp
index 3aeda709a..5634b1b1e 100755
--- a/test/private-lib/pavucontrol.exp
+++ b/test/private-lib/pavucontrol.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/pluma.exp b/test/private-lib/pluma.exp
index 64cb16d5a..3f88bfcb7 100755
--- a/test/private-lib/pluma.exp
+++ b/test/private-lib/pluma.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/private-lib.exp b/test/private-lib/private-lib.exp
index 5290def35..54b50561f 100755
--- a/test/private-lib/private-lib.exp
+++ b/test/private-lib/private-lib.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
diff --git a/test/private-lib/private-lib.sh b/test/private-lib/private-lib.sh
index 43c42a098..5c67b16c5 100755
--- a/test/private-lib/private-lib.sh
+++ b/test/private-lib/private-lib.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3g
@@ -29,4 +29,3 @@ if [[ $(uname -m) == "x86_64" ]]; then
 else
        echo "TESTING SKIP: private-lib test implemented only for x86_64."
 fi
diff --git a/test/private-lib/transmission-gtk.exp b/test/private-lib/transmission-gtk.exp
index 0f297cc42..4f5b8094c 100755
--- a/test/private-lib/transmission-gtk.exp
+++ b/test/private-lib/transmission-gtk.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/xcalc.exp b/test/private-lib/xcalc.exp
index e9c541684..196d3481a 100755
--- a/test/private-lib/xcalc.exp
+++ b/test/private-lib/xcalc.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/profiles/all-profiles.sh b/test/profiles/all-profiles.sh
index a550afe23..6f814a160 100755
--- a/test/profiles/all-profiles.sh
+++ b/test/profiles/all-profiles.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/profiles/conditional.exp b/test/profiles/conditional.exp
index 40bae3878..189cd6320 100755
--- a/test/profiles/conditional.exp
+++ b/test/profiles/conditional.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/profiles/ignore.exp b/test/profiles/ignore.exp
index df4337e1e..450d271c1 100755
--- a/test/profiles/ignore.exp
+++ b/test/profiles/ignore.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/profiles/profile_appname.exp b/test/profiles/profile_appname.exp
index c178e8e00..deb375f39 100755
--- a/test/profiles/profile_appname.exp
+++ b/test/profiles/profile_appname.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/profiles/profile_comment.exp b/test/profiles/profile_comment.exp
index 73e92d864..56cf9e034 100755
--- a/test/profiles/profile_comment.exp
+++ b/test/profiles/profile_comment.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/profiles/profile_followlnk.exp b/test/profiles/profile_followlnk.exp
index 112acbbc9..39ea8bb43 100755
--- a/test/profiles/profile_followlnk.exp
+++ b/test/profiles/profile_followlnk.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/profiles/profile_noperm.exp b/test/profiles/profile_noperm.exp
index c6a571473..51eb0023f 100755
--- a/test/profiles/profile_noperm.exp
+++ b/test/profiles/profile_noperm.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/profiles/profile_readonly.exp b/test/profiles/profile_readonly.exp
index 4c1bcba89..5cd2c3d3b 100755
--- a/test/profiles/profile_readonly.exp
+++ b/test/profiles/profile_readonly.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/profiles/profile_recursivity.exp b/test/profiles/profile_recursivity.exp
index a3d4843ab..be2c7d4dd 100755
--- a/test/profiles/profile_recursivity.exp
+++ b/test/profiles/profile_recursivity.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/profiles/profile_syntax.exp b/test/profiles/profile_syntax.exp
index 2bce76d83..803b23a8c 100755
--- a/test/profiles/profile_syntax.exp
+++ b/test/profiles/profile_syntax.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/profiles/profile_syntax2.exp b/test/profiles/profile_syntax2.exp
index 2ddaded88..6568fa88c 100755
--- a/test/profiles/profile_syntax2.exp
+++ b/test/profiles/profile_syntax2.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/profiles/profiles.sh b/test/profiles/profiles.sh
index 90c88aaf5..d49f26b92 100755
--- a/test/profiles/profiles.sh
+++ b/test/profiles/profiles.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/profiles/test-profile.exp b/test/profiles/test-profile.exp
index 5f18695a7..085411f36 100755
--- a/test/profiles/test-profile.exp
+++ b/test/profiles/test-profile.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/profiles/test2.profile b/test/profiles/test2.profile
index 9fbd5219a..9504f5085 100644
--- a/test/profiles/test2.profile
+++ b/test/profiles/test2.profile
@@ -1,6 +1,6 @@
 caps
 seccomp
-  private
+private
-  include test.profile
+include test.profile
-  include test.local
+include test.local
-  include test25.profile
+include test25.profile
diff --git a/test/root/apache2.exp b/test/root/apache2.exp
index a6b25de2f..369cda40d 100755
--- a/test/root/apache2.exp
+++ b/test/root/apache2.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 5
diff --git a/test/root/checkcfg.exp b/test/root/checkcfg.exp
index 94d9e08fc..d7aea8084 100755
--- a/test/root/checkcfg.exp
+++ b/test/root/checkcfg.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/firecfg.exp b/test/root/firecfg.exp
index 917cea90f..d78631c76 100755
--- a/test/root/firecfg.exp
+++ b/test/root/firecfg.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/firemon-events.exp b/test/root/firemon-events.exp
index 8eab93a2a..8ca222733 100755
--- a/test/root/firemon-events.exp
+++ b/test/root/firemon-events.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/isc-dhcp.exp b/test/root/isc-dhcp.exp
index 20e5ef408..dbafdb9d0 100755
--- a/test/root/isc-dhcp.exp
+++ b/test/root/isc-dhcp.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 5
diff --git a/test/root/join.exp b/test/root/join.exp
index 291ee9115..c488a488a 100755
--- a/test/root/join.exp
+++ b/test/root/join.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/login_nobody.exp b/test/root/login_nobody.exp
index 9c0932196..0c54488bd 100755
--- a/test/root/login_nobody.exp
+++ b/test/root/login_nobody.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/nginx.exp b/test/root/nginx.exp
index 40d8cb51e..cb7367729 100755
--- a/test/root/nginx.exp
+++ b/test/root/nginx.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 5
diff --git a/test/root/option_bind_directory.exp b/test/root/option_bind_directory.exp
index 4fabf0cd8..83ed6b84d 100755
--- a/test/root/option_bind_directory.exp
+++ b/test/root/option_bind_directory.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/option_bind_file.exp b/test/root/option_bind_file.exp
index 6c796a2b0..0807f951a 100755
--- a/test/root/option_bind_file.exp
+++ b/test/root/option_bind_file.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/option_tmpfs.exp b/test/root/option_tmpfs.exp
index 13820afe8..2d9eea8f5 100755
--- a/test/root/option_tmpfs.exp
+++ b/test/root/option_tmpfs.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/private.exp b/test/root/private.exp
index 70d0218fa..8c89e1f31 100755
--- a/test/root/private.exp
+++ b/test/root/private.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/profile_tmpfs.exp b/test/root/profile_tmpfs.exp
index fba63773f..7331225b3 100755
--- a/test/root/profile_tmpfs.exp
+++ b/test/root/profile_tmpfs.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/root.sh b/test/root/root.sh
index a39525b6e..84e430c7f 100755
--- a/test/root/root.sh
+++ b/test/root/root.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 # set a new firejail config file
diff --git a/test/root/seccomp-chmod.exp b/test/root/seccomp-chmod.exp
index ef0453548..d26098524 100755
--- a/test/root/seccomp-chmod.exp
+++ b/test/root/seccomp-chmod.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/seccomp-chown.exp b/test/root/seccomp-chown.exp
index 968a4bc96..e17bbc4bb 100755
--- a/test/root/seccomp-chown.exp
+++ b/test/root/seccomp-chown.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/seccomp-umount.exp b/test/root/seccomp-umount.exp
index b99ec30f7..70a39925d 100755
--- a/test/root/seccomp-umount.exp
+++ b/test/root/seccomp-umount.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/snmpd.exp b/test/root/snmpd.exp
index 510abfbad..63f488342 100755
--- a/test/root/snmpd.exp
+++ b/test/root/snmpd.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 5
diff --git a/test/root/unbound.exp b/test/root/unbound.exp
index 6440304b2..d84c07452 100755
--- a/test/root/unbound.exp
+++ b/test/root/unbound.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 5
diff --git a/test/root/whitelist.exp b/test/root/whitelist.exp
index 2397f6a90..063864e13 100755
--- a/test/root/whitelist.exp
+++ b/test/root/whitelist.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/ssh/login.exp b/test/ssh/login.exp
index 5d6a6216b..0a05b2dd1 100755
--- a/test/ssh/login.exp
+++ b/test/ssh/login.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/ssh/scp.exp b/test/ssh/scp.exp
index 13163564b..a803e7131 100755
--- a/test/ssh/scp.exp
+++ b/test/ssh/scp.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/ssh/sftp.exp b/test/ssh/sftp.exp
index 01c1e7e04..a3299ef26 100755
--- a/test/ssh/sftp.exp
+++ b/test/ssh/sftp.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/ssh/ssh.sh b/test/ssh/ssh.sh
index c0d545a55..d9fedc969 100755
--- a/test/ssh/ssh.sh
+++ b/test/ssh/ssh.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/stress/blacklist.exp b/test/stress/blacklist.exp
index 7d32ad114..3c6801b99 100755
--- a/test/stress/blacklist.exp
+++ b/test/stress/blacklist.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/stress/env.exp b/test/stress/env.exp
index 5411819ec..66e2d8374 100755
--- a/test/stress/env.exp
+++ b/test/stress/env.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/stress/net_macvlan.exp b/test/stress/net_macvlan.exp
index f17067cbb..6471979e9 100755
--- a/test/stress/net_macvlan.exp
+++ b/test/stress/net_macvlan.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/stress/stress.sh b/test/stress/stress.sh
index 2b4d8147d..9db7ac9d3 100755
--- a/test/stress/stress.sh
+++ b/test/stress/stress.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/sysutils/cpio.exp b/test/sysutils/cpio.exp
index e4ab77525..f1ae1f83d 100755
--- a/test/sysutils/cpio.exp
+++ b/test/sysutils/cpio.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/sysutils/curl.exp b/test/sysutils/curl.exp
index 29c9883a4..31f44bf54 100755
--- a/test/sysutils/curl.exp
+++ b/test/sysutils/curl.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/sysutils/dig.exp b/test/sysutils/dig.exp
index bd5ccbb5c..38acabeed 100755
--- a/test/sysutils/dig.exp
+++ b/test/sysutils/dig.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/sysutils/file.exp b/test/sysutils/file.exp
index dcc253dad..b302c8be2 100755
--- a/test/sysutils/file.exp
+++ b/test/sysutils/file.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/sysutils/gzip.exp b/test/sysutils/gzip.exp
index 75b51694c..1588262e2 100755
--- a/test/sysutils/gzip.exp
+++ b/test/sysutils/gzip.exp
@@ -1,26 +1,20 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
 spawn $env(SHELL)
 match_max 100000
-send -- "/bin/gzip -c /usr/bin/firejail > firejail_t1\r"
+send -- "rm index.html*\r"
-sleep 1
+after 500
-send -- "firejail /bin/gzip -c /usr/bin/firejail > firejail_t2\r"
+send -- "firejail gzip -c ../../mkdeb.sh | firejail gunzip -c\r"
-sleep 1
-send -- "diff -s firejail_t1 firejail_t2\r"
 expect {
        timeout {puts "TESTING ERROR 1\n";exit}
-        "firejail_t1 and firejail_t2 are identical"
+        "This file is part of Firejail project"
 }
+after 500
-send -- "rm firejail_t*\r"
-sleep 1
 puts "\nall done\n"
diff --git a/test/sysutils/host.exp b/test/sysutils/host.exp
index 7fe3ddfa4..5c7d3f062 100755
--- a/test/sysutils/host.exp
+++ b/test/sysutils/host.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/sysutils/less.exp b/test/sysutils/less.exp
index 7bbd76942..182e259e1 100755
--- a/test/sysutils/less.exp
+++ b/test/sysutils/less.exp
@@ -1,23 +1,25 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
 spawn $env(SHELL)
 match_max 100000
-send -- "firejail less sysutils.sh\r"
+send -- "rm -f /tmp/tt\r"
+after 500
+send -- "firejail less sysutils.sh > /tmp/t\r"
+sleep 1
+send -- "cat /tmp/t | grep Authors\r"
 expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
+        timeout {puts "TESTING ERROR 0\n";exit}
-        "(press RETURN)" {puts "TESTING SKIP: terminal is not fully functional - 1.1\n";exit}
-        "Press RETURN to continue" {puts "TESTING SKIP: terminal is not fully functional - 1.2\n";exit}
        "Firejail Authors"
 }
-expect {
-        timeout {puts "TESTING ERROR 2\n";exit}
-        "MALLOC_CHECK"
-}
 after 100
+send -- "rm -f /tmp/t\r"
+after 500
 puts "\nall done\n"
diff --git a/test/sysutils/man.exp b/test/sysutils/man.exp
index c569653c6..0386b2e92 100755
--- a/test/sysutils/man.exp
+++ b/test/sysutils/man.exp
@@ -1,18 +1,25 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
 spawn $env(SHELL)
 match_max 100000
-send -- "firejail man firejail\r"
+send -- "rm -f /tmp/t\r"
+after 500
+send -- "firejail man firejail > /tmp/t\r"
+sleep 1
+send -- "cat /tmp/t\r"
 expect {
        timeout {puts "TESTING ERROR 0\n";exit}
-        "(press RETURN)" {puts "TESTING SKIP: terminal is not fully functional - 1.1\n";exit}
-        "Press RETURN to continue" {puts "TESTING SKIP: terminal is not fully functional - 1.2\n";exit}
        "NAME"
 }
 after 100
+send -- "rm -f /tmp/t\r"
+after 500
 puts "\nall done\n"
diff --git a/test/sysutils/md5sum.exp b/test/sysutils/md5sum.exp
new file mode 100755
index 000000000..24567ee36
--- /dev/null
+++ b/test/sysutils/md5sum.exp
@@ -0,0 +1,21 @@
+#!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2023 Firejail Authors
+# License GPL v2
+set timeout 10
+spawn $env(SHELL)
+match_max 100000
+send -- "firejail md5sum ../../COPYING\r"
+expect {
+        timeout {puts "TESTING ERROR 0\n";exit}
+        "b234ee"
+}
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "COPYING"
+}
+after 500
+puts "\nall done\n"
diff --git a/test/sysutils/nslookup.exp b/test/sysutils/nslookup.exp
index 2a99441d9..249cfe565 100755
--- a/test/sysutils/nslookup.exp
+++ b/test/sysutils/nslookup.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/sysutils/ping.exp b/test/sysutils/ping.exp
index dd6073234..dc50af38e 100755
--- a/test/sysutils/ping.exp
+++ b/test/sysutils/ping.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/sysutils/sha512sum.exp b/test/sysutils/sha512sum.exp
new file mode 100755
index 000000000..8c1f81417
--- /dev/null
+++ b/test/sysutils/sha512sum.exp
@@ -0,0 +1,21 @@
+#!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2023 Firejail Authors
+# License GPL v2
+set timeout 10
+spawn $env(SHELL)
+match_max 100000
+send -- "firejail sha512sum ../../COPYING\r"
+expect {
+        timeout {puts "TESTING ERROR 0\n";exit}
+        "aee80b1f"
+}
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "COPYING"
+}
+after 500
+puts "\nall done\n"
diff --git a/test/sysutils/strings.exp b/test/sysutils/strings.exp
index 47b75accc..f440a7674 100755
--- a/test/sysutils/strings.exp
+++ b/test/sysutils/strings.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/sysutils/sysutils.sh b/test/sysutils/sysutils.sh
index a1aaa80a7..f5567ff02 100755
--- a/test/sysutils/sysutils.sh
+++ b/test/sysutils/sysutils.sh
@@ -1,12 +1,36 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 export LC_ALL=C
+if command -v gzip
+then
+        echo "TESTING: gzip"
+        ./gzip.exp
+else
+        echo "TESTING SKIP: md5sum not found"
+fi
+if command -v md5sum
+then
+        echo "TESTING: md5sum"
+        ./md5sum.exp
+else
+        echo "TESTING SKIP: md5sum not found"
+fi
+if command -v sha512sum
+then
+        echo "TESTING: sha512sum"
+        ./sha512sum.exp
+else
+        echo "TESTING SKIP: sha512sum not found"
+fi
 if command -v cpio
 then
        echo "TESTING: cpio"
@@ -23,14 +47,6 @@ else
        echo "TESTING SKIP: gzip not found"
 fi
-if command -v xzdec
-then
-        echo "TESTING: xzdec"
-        ./xzdec.exp
-else
-        echo "TESTING SKIP: xzdec not found"
-fi
 if command -v xz
 then
        echo "TESTING: xz"
@@ -134,4 +150,3 @@ then
 else
        echo "TESTING SKIP: whois not found"
 fi
diff --git a/test/sysutils/tar.exp b/test/sysutils/tar.exp
index ed68179f9..8f4c9f565 100755
--- a/test/sysutils/tar.exp
+++ b/test/sysutils/tar.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/sysutils/wget.exp b/test/sysutils/wget.exp
index c6d2765c7..7f994ff81 100755
--- a/test/sysutils/wget.exp
+++ b/test/sysutils/wget.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/sysutils/whois.exp b/test/sysutils/whois.exp
index 1797ca14e..932a46282 100755
--- a/test/sysutils/whois.exp
+++ b/test/sysutils/whois.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/sysutils/xz.exp b/test/sysutils/xz.exp
index 9ee85cde4..bbe05ea19 100755
--- a/test/sysutils/xz.exp
+++ b/test/sysutils/xz.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 60
diff --git a/test/sysutils/xzdec.exp b/test/sysutils/xzdec.exp
deleted file mode 100755
index 1b525e3bd..000000000
--- a/test/sysutils/xzdec.exp
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/expect -f
-# This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
-# License GPL v2
-set timeout 10
-spawn $env(SHELL)
-match_max 100000
-send -- "/usr/bin/xz -c /usr/bin/firejail > firejail_t3\r"
-sleep 1
-send -- "/usr/bin/xzdec -c firejail_t3 > firejail_t1\r"
-sleep 1
-send -- "firejail /usr/bin/xzdec -c firejail_t3 > firejail_t2\r"
-sleep 1
-send -- "diff -s firejail_t1 firejail_t2\r"
-expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
-        "firejail_t1 and firejail_t2 are identical"
-}
-send -- "rm firejail_t*\r"
-sleep 1
-puts "\nall done\n"
diff --git a/test/utils/build.exp b/test/utils/build.exp
index a1f1d10fb..3f42a74be 100755
--- a/test/utils/build.exp
+++ b/test/utils/build.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/caps-print.exp b/test/utils/caps-print.exp
index b6ccd05d4..381f27574 100755
--- a/test/utils/caps-print.exp
+++ b/test/utils/caps-print.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/catchsignal-master.sh b/test/utils/catchsignal-master.sh
index 881aac270..dd5fd0c7b 100755
--- a/test/utils/catchsignal-master.sh
+++ b/test/utils/catchsignal-master.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 ./catchsignal.sh &
diff --git a/test/utils/catchsignal.sh b/test/utils/catchsignal.sh
index cef00b2a5..99be6d196 100755
--- a/test/utils/catchsignal.sh
+++ b/test/utils/catchsignal.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 _term() {
diff --git a/test/utils/catchsignal2.sh b/test/utils/catchsignal2.sh
index 21f299430..024f297b3 100755
--- a/test/utils/catchsignal2.sh
+++ b/test/utils/catchsignal2.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 _term() {
diff --git a/test/utils/command.exp b/test/utils/command.exp
index 5e15efc14..87742c40b 100755
--- a/test/utils/command.exp
+++ b/test/utils/command.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/cpu-print.exp b/test/utils/cpu-print.exp
index 3e4d63f2a..6a05e4139 100755
--- a/test/utils/cpu-print.exp
+++ b/test/utils/cpu-print.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/dns-print.exp b/test/utils/dns-print.exp
index c0cf2ff0f..7766e0629 100755
--- a/test/utils/dns-print.exp
+++ b/test/utils/dns-print.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/firemon-caps.exp b/test/utils/firemon-caps.exp
index 02b317341..621447d45 100755
--- a/test/utils/firemon-caps.exp
+++ b/test/utils/firemon-caps.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/firemon-cpu.exp b/test/utils/firemon-cpu.exp
index db5069ede..40ac958ea 100755
--- a/test/utils/firemon-cpu.exp
+++ b/test/utils/firemon-cpu.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/firemon-interface.exp b/test/utils/firemon-interface.exp
index 7e4e5f0ae..fc1ea9ef6 100755
--- a/test/utils/firemon-interface.exp
+++ b/test/utils/firemon-interface.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/firemon-name.exp b/test/utils/firemon-name.exp
index f8161cc81..873814d0f 100755
--- a/test/utils/firemon-name.exp
+++ b/test/utils/firemon-name.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/firemon-seccomp.exp b/test/utils/firemon-seccomp.exp
index 7eb6f9168..9e95366e7 100755
--- a/test/utils/firemon-seccomp.exp
+++ b/test/utils/firemon-seccomp.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/firemon-version.exp b/test/utils/firemon-version.exp
index 81ab2e8b0..ce4d3bed1 100755
--- a/test/utils/firemon-version.exp
+++ b/test/utils/firemon-version.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/fs-print.exp b/test/utils/fs-print.exp
index 536d59dbd..d0d62c82f 100755
--- a/test/utils/fs-print.exp
+++ b/test/utils/fs-print.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/help.exp b/test/utils/help.exp
index 4c5f46e8a..805efd1fd 100755
--- a/test/utils/help.exp
+++ b/test/utils/help.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/join-profile.exp b/test/utils/join-profile.exp
index 565010b82..3c065df24 100755
--- a/test/utils/join-profile.exp
+++ b/test/utils/join-profile.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/join.exp b/test/utils/join.exp
index d7dc0a1f9..ba0bc5838 100755
--- a/test/utils/join.exp
+++ b/test/utils/join.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/join2.exp b/test/utils/join2.exp
deleted file mode 100755
index 5f5a6bfe0..000000000
--- a/test/utils/join2.exp
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/expect -f
-# This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
-# License GPL v2
-set timeout 10
-cd /home
-spawn $env(SHELL)
-match_max 100000
-send --  "firejail --name=\"join testing\"\r"
-expect {
-        timeout {puts "TESTING ERROR 0\n";exit}
-        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
-}
-sleep 2
-spawn $env(SHELL)
-send --  "firejail --join=\"join testing\"\r"
-expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
-        "Switching to pid"
-}
-expect {
-        timeout {puts "TESTING ERROR 2\n";exit}
-        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
-}
-sleep 1
-send -- "ps aux\r"
-expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
-        "/bin/bash"
-}
-expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
-        "/bin/bash"
-}
-send -- "exit\r"
-after 100
-puts "\nall done\n"
diff --git a/test/utils/join3.exp b/test/utils/join3.exp
deleted file mode 100755
index c771b924b..000000000
--- a/test/utils/join3.exp
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/expect -f
-# This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
-# License GPL v2
-set timeout 10
-cd /home
-spawn $env(SHELL)
-match_max 100000
-send --  "firejail --name=join\\ testing\r"
-expect {
-        timeout {puts "TESTING ERROR 0\n";exit}
-        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
-}
-sleep 2
-spawn $env(SHELL)
-send --  "firejail --join=join\\ testing\r"
-expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
-        "Switching to pid"
-}
-expect {
-        timeout {puts "TESTING ERROR 2\n";exit}
-        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
-}
-sleep 1
-send -- "ps aux\r"
-expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
-        "/bin/bash"
-}
-expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
-        "/bin/bash"
-}
-send -- "exit\r"
-after 100
-puts "\nall done\n"
diff --git a/test/utils/join4.exp b/test/utils/join4.exp
index cddf7ad18..97e862c58 100755
--- a/test/utils/join4.exp
+++ b/test/utils/join4.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/join5.exp b/test/utils/join5.exp
index c0990ebf1..b42f94530 100755
--- a/test/utils/join5.exp
+++ b/test/utils/join5.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/list.exp b/test/utils/list.exp
index 30344e22a..369e50693 100755
--- a/test/utils/list.exp
+++ b/test/utils/list.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/ls.exp b/test/utils/ls.exp
index 6b6c67ede..3d8399947 100755
--- a/test/utils/ls.exp
+++ b/test/utils/ls.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/man.exp b/test/utils/man.exp
index f62859a8f..ba351981f 100755
--- a/test/utils/man.exp
+++ b/test/utils/man.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/name.exp b/test/utils/name.exp
index cd4465d41..0431dadb1 100755
--- a/test/utils/name.exp
+++ b/test/utils/name.exp
@@ -1,16 +1,45 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
 spawn $env(SHELL)
 match_max 100000
+send -- "firejail --name=12345\r"
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "invalid sandbox name"
+}
+after 100
+send --  "firejail --name=\"join testing\"\r"
+expect {
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "invalid sandbox name"
+}
+after 100
+send --  "firejail --name=join\\ testing\r"
+expect {
+        timeout {puts "TESTING ERROR 3\n";exit}
+        "invalid sandbox name"
+}
+after 100
+send -- "firejail --name=asdf,12345\r"
+expect {
+        timeout {puts "TESTING ERROR 4\n";exit}
+        "invalid sandbox name"
+}
+after 100
 send -- "firejail --name=ftest\r"
 expect {
-        timeout {puts "TESTING ERROR 0\n";exit}
+        timeout {puts "TESTING ERROR 5\n";exit}
        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
@@ -18,7 +47,7 @@ after 100
 spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
+        timeout {puts "TESTING ERROR 6\n";exit}
        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
@@ -26,7 +55,7 @@ after 100
 spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
-        timeout {puts "TESTING ERROR 2\n";exit}
+        timeout {puts "TESTING ERROR 7\n";exit}
        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
@@ -34,7 +63,7 @@ after 100
 spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
+        timeout {puts "TESTING ERROR 8\n";exit}
        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
@@ -42,7 +71,7 @@ after 100
 spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
+        timeout {puts "TESTING ERROR 9\n";exit}
        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
@@ -50,7 +79,7 @@ after 100
 spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
-        timeout {puts "TESTING ERROR 5\n";exit}
+        timeout {puts "TESTING ERROR 10\n";exit}
        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
@@ -58,7 +87,7 @@ after 100
 spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
-        timeout {puts "TESTING ERROR 6\n";exit}
+        timeout {puts "TESTING ERROR 11\n";exit}
        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
@@ -66,7 +95,7 @@ after 100
 spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
-        timeout {puts "TESTING ERROR 7\n";exit}
+        timeout {puts "TESTING ERROR 12\n";exit}
        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
@@ -74,7 +103,7 @@ after 100
 spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
-        timeout {puts "TESTING ERROR 8\n";exit}
+        timeout {puts "TESTING ERROR 13\n";exit}
        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
@@ -82,7 +111,7 @@ after 100
 spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
-        timeout {puts "TESTING ERROR 9\n";exit}
+        timeout {puts "TESTING ERROR 14\n";exit}
        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
@@ -90,7 +119,7 @@ after 100
 spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
-        timeout {puts "TESTING ERROR 10\n";exit}
+        timeout {puts "TESTING ERROR 15\n";exit}
        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
@@ -98,7 +127,7 @@ after 100
 spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
-        timeout {puts "TESTING ERROR 11\n";exit}
+        timeout {puts "TESTING ERROR 16\n";exit}
        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
@@ -106,51 +135,51 @@ after 100
 spawn $env(SHELL)
 send -- "firejail --list\r"
 expect {
-        timeout {puts "TESTING ERROR 12\n";exit}
+        timeout {puts "TESTING ERROR 17\n";exit}
        ":ftest:"
 }
 expect {
-        timeout {puts "TESTING ERROR 13\n";exit}
+        timeout {puts "TESTING ERROR 18\n";exit}
        ":ftest-"
 }
 expect {
-        timeout {puts "TESTING ERROR 14\n";exit}
+        timeout {puts "TESTING ERROR 19\n";exit}
        ":ftest-"
 }
 expect {
-        timeout {puts "TESTING ERROR 15\n";exit}
+        timeout {puts "TESTING ERROR 20\n";exit}
        ":ftest-"
 }
 expect {
-        timeout {puts "TESTING ERROR 16\n";exit}
+        timeout {puts "TESTING ERROR 21\n";exit}
        ":ftest-"
 }
 expect {
-        timeout {puts "TESTING ERROR 17\n";exit}
+        timeout {puts "TESTING ERROR 22\n";exit}
        ":ftest-"
 }
 expect {
-        timeout {puts "TESTING ERROR 18\n";exit}
+        timeout {puts "TESTING ERROR 23\n";exit}
        ":ftest-"
 }
 expect {
-        timeout {puts "TESTING ERROR 19\n";exit}
+        timeout {puts "TESTING ERROR 24\n";exit}
        ":ftest-"
 }
 expect {
-        timeout {puts "TESTING ERROR 20\n";exit}
+        timeout {puts "TESTING ERROR 25\n";exit}
        ":ftest-"
 }
 expect {
-        timeout {puts "TESTING ERROR 21\n";exit}
+        timeout {puts "TESTING ERROR 26\n";exit}
        ":ftest-"
 }
 expect {
-        timeout {puts "TESTING ERROR 22\n";exit}
+        timeout {puts "TESTING ERROR 27\n";exit}
        ":ftest-"
 }
 expect {
-        timeout {puts "TESTING ERROR 23\n";exit}
+        timeout {puts "TESTING ERROR 28\n";exit}
        ":ftest-"
 }
 sleep 1
diff --git a/test/utils/profile_print.exp b/test/utils/profile_print.exp
index 9b2d65d84..4ec101f07 100755
--- a/test/utils/profile_print.exp
+++ b/test/utils/profile_print.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/protocol-print.exp b/test/utils/protocol-print.exp
index ca74b7fc9..f24afc703 100755
--- a/test/utils/protocol-print.exp
+++ b/test/utils/protocol-print.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/seccomp-print.exp b/test/utils/seccomp-print.exp
index a9525ce2e..a78501582 100755
--- a/test/utils/seccomp-print.exp
+++ b/test/utils/seccomp-print.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/shutdown.exp b/test/utils/shutdown.exp
index 8bd7a6616..514029964 100755
--- a/test/utils/shutdown.exp
+++ b/test/utils/shutdown.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 15
diff --git a/test/utils/shutdown2.exp b/test/utils/shutdown2.exp
index 4dabf6c23..a0a976667 100755
--- a/test/utils/shutdown2.exp
+++ b/test/utils/shutdown2.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/shutdown3.exp b/test/utils/shutdown3.exp
index 8017d753d..89994faec 100755
--- a/test/utils/shutdown3.exp
+++ b/test/utils/shutdown3.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/shutdown4.exp b/test/utils/shutdown4.exp
index 09db3f140..3fbe75c97 100755
--- a/test/utils/shutdown4.exp
+++ b/test/utils/shutdown4.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/top.exp b/test/utils/top.exp
index 402d7c2df..9f4a34640 100755
--- a/test/utils/top.exp
+++ b/test/utils/top.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/trace.exp b/test/utils/trace.exp
index beb59d337..3805955d7 100755
--- a/test/utils/trace.exp
+++ b/test/utils/trace.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 30
diff --git a/test/utils/tree.exp b/test/utils/tree.exp
index 4b1f70bd2..c5047763a 100755
--- a/test/utils/tree.exp
+++ b/test/utils/tree.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/utils.sh b/test/utils/utils.sh
index 647cbfb34..9f04c2625 100755
--- a/test/utils/utils.sh
+++ b/test/utils/utils.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
@@ -85,12 +85,6 @@ echo "TESTING: shutdown4 (test/utils/shutdown4.exp)"
 echo "TESTING: join (test/utils/join.exp)"
 ./join.exp
-echo "TESTING: join2 (test/utils/join2.exp)"
-./join2.exp
-echo "TESTING: join3 (test/utils/join3.exp)"
-./join3.exp
 echo "TESTING: join4 (test/utils/join4.exp)"
 ./join4.exp
diff --git a/test/utils/version.exp b/test/utils/version.exp
index f010809f8..d5cf311d7 100755
--- a/test/utils/version.exp
+++ b/test/utils/version.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
+# Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 set timeout 10