Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add release for Wireshark 4.4.0 #40

Merged
merged 2 commits into from
Aug 29, 2024
Merged

Add release for Wireshark 4.4.0 #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00d77b7
Add release for Wireshark 4.4.0
oshaked1 Aug 29, 2024
02bb708
Fix: Windows install script used incorrect install path logic
oshaked1 Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/install-wireshark-headers-windows/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ runs:
cd build
set WIRESHARK_BASE_DIR=..\
set WIRESHARK_QT6_PREFIX_PATH=$QT_ROOT_DIR
cmake -G "Visual Studio 17 2022" -A x64 ..\wireshark
cmake -G "Visual Studio 17 2022" -A x64 -DENABLE_MINIZIPNG=Off ..\wireshark
shell: cmd
- name: Install headers
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
matrix:
# macos-14 is ARM64, macos-13 is x86-64
os: [ubuntu-latest, macos-14, macos-13, windows-latest]
wireshark_version: [wireshark-4.2.6]
wireshark_version: [wireshark-4.2.6, wireshark-4.4.0]
include:
# Ubuntu 22.04 Wireshark package version
- os: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
matrix:
# macos-14 is ARM64, macos-13 is x86-64
os: [ubuntu-latest, macos-14, macos-13, windows-latest]
wireshark_version: [wireshark-4.2.6]
wireshark_version: [wireshark-4.2.6, wireshark-4.4.0]
include:
# Ubuntu 22.04 Wireshark package version
- os: ubuntu-latest
Expand Down
30 changes: 1 addition & 29 deletions dist/install.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,3 @@
function Version-LessThan {
param (
[string]$version1,
[string]$version2
)

$version1Parts = $version1.Split('.')
$version2Parts = $version2.Split('.')

$major1 = [int]$version1Parts[0]
$minor1 = [int]$version1Parts[1]

$major2 = [int]$version2Parts[0]
$minor2 = [int]$version2Parts[1]

if ($major1 -lt $major2 -or ($major1 -eq $major2 -and $minor1 -lt $minor2)) {
return $true
}
else {
return $false
}
}

$wsVersionWanted = (Get-Content -Path "ws_version.txt" | Select-String -Pattern "\d+\.\d+\.\d+" -AllMatches).Matches.Value

if (Get-Command "wireshark" -ErrorAction SilentlyContinue) {
Expand Down Expand Up @@ -59,12 +36,7 @@ New-Item -Path "$wsPersonalDir\profiles" -ItemType Directory -Force | Out-Null
Copy-Item -Path "profiles\Tracee" -Destination "$wsPersonalDir\profiles" -Recurse -Force
Write-Output "[*] Installed profile to $wsPersonalDir\profiles\Tracee"

if (Version-LessThan -version1 $wsShortVersion -version2 "4.3") {
$wsPluginsDir = "$wsPersonalDir\plugins\$wsShortVersion"
}
else {
$wsPluginsDir = "$wsPersonalDir\plugins"
}
$wsPluginsDir = "$wsPersonalDir\plugins\$wsShortVersion"

New-Item -Path "$wsPluginsDir\epan" -ItemType Directory -Force | Out-Null
Copy-Item "tracee-event.dll" "$wsPluginsDir\epan" -Force
Expand Down
4 changes: 2 additions & 2 deletions scripts/cmake.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ pushd build

rem Wireshark changed DISABLE_WERROR to ENABLE_WERROR at some point. Use both for compatibility (even though it causes a cmake warning to be thrown)
if "%WERROR%"=="y" (
cmake -G "Visual Studio 17 2022" -A x64 -DTRACEESHARK_VERSION=%TRACEESHARK_VERSION% -DENABLE_CCACHE=Yes -DENABLE_WERROR=ON -DDISABLE_WERROR=OFF ..\wireshark
cmake -G "Visual Studio 17 2022" -A x64 -DENABLE_MINIZIPNG=Off -DTRACEESHARK_VERSION=%TRACEESHARK_VERSION% -DENABLE_CCACHE=Yes -DENABLE_WERROR=ON -DDISABLE_WERROR=OFF ..\wireshark
) else (
cmake -G "Visual Studio 17 2022" -A x64 -DTRACEESHARK_VERSION=%TRACEESHARK_VERSION% -DENABLE_CCACHE=Yes -DENABLE_WERROR=OFF -DDISABLE_WERROR=OFF ..\wireshark
cmake -G "Visual Studio 17 2022" -A x64 -DENABLE_MINIZIPNG=Off -DTRACEESHARK_VERSION=%TRACEESHARK_VERSION% -DENABLE_CCACHE=Yes -DENABLE_WERROR=OFF -DDISABLE_WERROR=OFF ..\wireshark
)

popd
Expand Down
Loading