Merge branch 'master' of https://github.com/netblue30/firejail

.github/workflows/codeql-analysis.yml

@@ -7,7 +7,7 @@ name: "CodeQL"
 
 on:
  push:
- branches: [master]
+ branches: [ master ]
  paths-ignore:
  - CONTRIBUTING.md
  - README
@@ -17,7 +17,7 @@ on:
  - 'etc/**'
  pull_request:
  # The branches below must be a subset of the branches above
- branches: [master]
+ branches: [ master ]
  paths-ignore:
  - CONTRIBUTING.md
  - README
@@ -36,24 +36,14 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- # Override automatic language detection by changing the below list
- # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
- language: ['cpp', 'python']
- # Learn more...
- # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+ language: [ 'cpp', 'python' ]
+ # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+ # Learn more:
+ # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
  steps:
  - name: Checkout repository
  uses: actions/checkout@v2
- with:
- # We must fetch at least the immediate parents so that if this is
- # a pull request then we can checkout the head.
- fetch-depth: 2
-
- # If this run was triggered by a pull request event, then checkout
- # the head of the pull request instead of the merge commit.
- - run: git checkout HEAD^2
- if: ${{ github.event_name == 'pull_request' }}
 
  # Initializes the CodeQL tools for scanning.
  - name: Initialize CodeQL

platform/rpm/firejail.spec

@@ -39,6 +39,7 @@ rm -rf %{buildroot}
 %{_datarootdir}/bash-completion/completions/__NAME__
 %{_datarootdir}/bash-completion/completions/firecfg
 %{_datarootdir}/bash-completion/completions/firemon
+%{_datarootdir}/zsh/site-functions/_firejail
 %{_docdir}/__NAME__
 %{_mandir}/man1/__NAME__.1.gz
 %{_mandir}/man1/firecfg.1.gz