Skip to content

Commit d698fd5

Browse files
akodithyakodithy
authored
Merge pull request #11 from sophos/NCL-2469c-merge
NCL-2469 strongswan upgrade to 5.9.14
2 parents 5c8e7b4 + e289d5d commit d698fd5

File tree

3,065 files changed

+65554
-70079
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,065 files changed

+65554
-70079
lines changed

‎.appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ install:
3030
IF "%IMG%" == "2019" set OPENSSL=OpenSSL-v111
3131
set OPENSSL_DIR=/c/%OPENSSL%-%TEST%
3232
C:\%OPENSSL%-%TEST%\bin\openssl.exe version -a
33-
# newer versions of msys2 don't provide autotools via base-devel anymore
34-
- IF "%IMG%" == "2019" %MSYS_SH% --login -c ". /etc/profile && pacman --noconfirm -S --needed autotools"
33+
# newer versions of msys2 don't provide autotools or gperf via base-devel anymore
34+
- IF "%IMG%" == "2019" %MSYS_SH% --login -c ". /etc/profile && pacman --noconfirm -S --needed autotools gperf"
3535

3636
build_script:
3737
- '%MSYS_SH% --login -c ". /etc/profile && cd $APPVEYOR_BUILD_FOLDER && ./scripts/test.sh deps"'

‎.cirrus.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
task:
22
matrix:
3-
- name: FreeBSD 13.0
3+
- name: FreeBSD 14.0
44
freebsd_instance:
5-
image_family: freebsd-13-0
6-
- name: FreeBSD 12.3
5+
image_family: freebsd-14-0
6+
- name: FreeBSD 13.2
77
freebsd_instance:
8-
image_family: freebsd-12-3
8+
image_family: freebsd-13-2
99

1010
env:
1111
TESTS_REDUCED_KEYLENGTHS: yes

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: "🐛 Bug report"
33
about: Report a reproducible bug or regression
4-
labels: bug, needs triage
4+
labels: bug, new
55
---
66

77
<!--

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: Feature request
33
about: Suggest an idea for this project
4-
labels: enhancement, needs triage
4+
labels: enhancement, new
55
---
66

77
<!--

‎.github/codeql/config.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
queries:
2+
- uses: ./.github/codeql/cpp-queries
3+
4+
query-filters:
5+
# don't explicitly point out FIXME comments
6+
- exclude:
7+
id: cpp/fixme-comment
8+
# this rule produces too many false positives due to our custom specifiers and
9+
# the use of void pointers in swanctl
10+
- exclude:
11+
id: cpp/wrong-type-format-argument

.lgtm/cpp-queries/chunk_from_chars.ql renamed to .github/codeql/cpp-queries/chunk_from_chars.ql

File renamed without changes.

‎.github/codeql/cpp-queries/qlpack.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
name: strongswan/cpp-queries
2+
dependencies:
3+
codeql/cpp-all: "*"

‎.github/workflows/android.yml‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,39 @@ jobs:
2626
runs-on: ubuntu-latest
2727
env:
2828
TEST: android
29-
# since the NDK is newly installed every time, we have to use this to avoid cache misses
29+
# since the NDK might be newly installed, we have to use this to avoid cache misses
3030
CCACHE_COMPILERCHECK: content
3131
steps:
32-
# even though we don't specify a specific version in our gradle files, the
33-
# build fails without this because some arbitrary NDK version, that's
34-
# weirdly not installed, is requested
32+
- uses: actions/checkout@v4
33+
# make sure the NDK we reference is installed and exported so we can use it to build OpenSSL
3534
- name: Install NDK
36-
run: yes | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install 'ndk;21.0.6113669'
37-
- uses: actions/checkout@v2
38-
- uses: actions/cache@v2
35+
id: ndk-install
36+
run: |
37+
NDK_VERSION=$(grep "ndkVersion" src/frontends/android/app/build.gradle | sed -e 's/.*"\(.*\)"/\1/')
38+
echo Using NDK ${NDK_VERSION}
39+
yes | sudo ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${NDK_VERSION}"
40+
echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/${NDK_VERSION}" >> "$GITHUB_OUTPUT"
41+
- uses: actions/cache@v4
3942
with:
40-
path: ~/.ccache
43+
path: ~/.cache/ccache
4144
key: ccache-android-${{ github.sha }}
4245
restore-keys: |
4346
ccache-android-
47+
# necessary for newer versions of the Gradle plugin
48+
- uses: actions/setup-java@v4
49+
with:
50+
distribution: 'temurin'
51+
java-version: 17
52+
cache: 'gradle'
4453
- run: |
4554
sudo apt-get install -qq ccache
4655
echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
4756
ccache -z
4857
- uses: ./.github/actions/default
58+
env:
59+
ANDROID_NDK_ROOT: ${{ steps.ndk-install.outputs.ANDROID_NDK_ROOT }}
4960
- run: ccache -s
50-
- uses: actions/upload-artifact@v2
61+
- uses: actions/upload-artifact@v4
5162
with:
5263
name: Lint Results
53-
path: src/frontends/android/app/build/reports/lint-results.xml
64+
path: src/frontends/android/app/build/reports/lint-results*.xml

‎.github/workflows/codeql.yml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: "CodeQL"
2+
3+
on: [push, pull_request]
4+
5+
env:
6+
CCACHE_BASEDIR: ${{ github.workspace }}
7+
CCACHE_COMPRESS: true
8+
CCACHE_MAXSIZE: 200M
9+
# CodeQL currently doesn't support ccache
10+
CCACHE_DISABLE: true
11+
OS_NAME: linux
12+
13+
jobs:
14+
pre-check:
15+
runs-on: ubuntu-latest
16+
outputs:
17+
should_skip: ${{ steps.skip-check.outputs.should_skip }}
18+
steps:
19+
- id: skip-check
20+
uses: fkirc/skip-duplicate-actions@master
21+
with:
22+
concurrent_skipping: 'same_content'
23+
24+
analyze:
25+
needs: pre-check
26+
if: ${{ needs.pre-check.outputs.should_skip != 'true' }}
27+
runs-on: ubuntu-latest
28+
permissions:
29+
actions: read
30+
contents: read
31+
security-events: write
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
language: [ 'cpp', 'python', 'ruby' ]
36+
steps:
37+
- uses: actions/checkout@v4
38+
- name: Initialize CodeQL
39+
uses: github/codeql-action/init@v3
40+
with:
41+
languages: ${{ matrix.language }}
42+
config-file: ./.github/codeql/config.yml
43+
44+
- if: matrix.language == 'python' || matrix.language == 'ruby'
45+
name: Autobuild
46+
uses: github/codeql-action/autobuild@v3
47+
48+
# this follows the steps of the Linux workflow
49+
- if: matrix.language == 'cpp'
50+
uses: actions/cache@v4
51+
with:
52+
path: ~/.cache/ccache
53+
key: ccache-ubuntu-latest-gcc-codeql-${{ github.sha }}
54+
restore-keys: |
55+
ccache-ubuntu-latest-gcc-codeql
56+
ccache-ubuntu-latest-gcc-all-${{ github.sha }}
57+
ccache-ubuntu-latest-gcc-all-
58+
ccache-ubuntu-latest-gcc-
59+
- if: matrix.language == 'cpp'
60+
run: |
61+
sudo apt-get install -qq ccache
62+
echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
63+
ccache -z
64+
- if: matrix.language == 'cpp'
65+
env:
66+
TEST: codeql
67+
uses: ./.github/actions/default
68+
- if: matrix.language == 'cpp'
69+
run: ccache -s
70+
71+
- name: Perform CodeQL Analysis
72+
uses: github/codeql-action/analyze@v3
73+
with:
74+
category: "/language:${{matrix.language}}"

‎.github/workflows/lgtm.yml‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)