From b0cce512c22d7d07adfbc879f975b6180fa5dd07 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Thu, 7 Apr 2022 11:03:44 +0200
Subject: [PATCH 1/2] Bump Boost to 1.78
---
doc/21-development.md | 32 ++++++++++++++++----------------
doc/win-dev.ps1 | 2 +-
tools/win32/configure-dev.ps1 | 4 ++--
tools/win32/configure.ps1 | 4 ++--
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/doc/21-development.md b/doc/21-development.md
index cb3fcf262..119391cea 100644
--- a/doc/21-development.md
+++ b/doc/21-development.md
@@ -477,18 +477,18 @@ File Type: EXECUTABLE IMAGE
Image has the following dependencies:
- boost_coroutine-vc142-mt-gd-x64-1_76.dll
- boost_date_time-vc142-mt-gd-x64-1_76.dll
- boost_filesystem-vc142-mt-gd-x64-1_76.dll
- boost_thread-vc142-mt-gd-x64-1_76.dll
- boost_regex-vc142-mt-gd-x64-1_76.dll
+ boost_coroutine-vc142-mt-gd-x64-1_78.dll
+ boost_date_time-vc142-mt-gd-x64-1_78.dll
+ boost_filesystem-vc142-mt-gd-x64-1_78.dll
+ boost_thread-vc142-mt-gd-x64-1_78.dll
+ boost_regex-vc142-mt-gd-x64-1_78.dll
libssl-1_1-x64.dll
libcrypto-1_1-x64.dll
WS2_32.dll
dbghelp.dll
SHLWAPI.dll
msi.dll
- boost_unit_test_framework-vc142-mt-gd-x64-1_76.dll
+ boost_unit_test_framework-vc142-mt-gd-x64-1_78.dll
KERNEL32.dll
SHELL32.dll
ADVAPI32.dll
@@ -1763,7 +1763,7 @@ mkdir build
cd .\build\
& "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" `
- -DBoost_INCLUDE_DIR=C:\local\boost_1_76_0-Win64 `
+ -DBoost_INCLUDE_DIR=C:\local\boost_1_78_0-Win64 `
-DBISON_EXECUTABLE=C:\ProgramData\chocolatey\lib\winflexbison3\tools\win_bison.exe `
-DFLEX_EXECUTABLE=C:\ProgramData\chocolatey\lib\winflexbison3\tools\win_flex.exe `
-DICINGA2_WITH_MYSQL=OFF -DICINGA2_WITH_PGSQL=OFF ..
@@ -1936,16 +1936,16 @@ Download the [boost-binaries](https://sourceforge.net/projects/boost/files/boost
- 64 for 64 bit builds
```
-https://sourceforge.net/projects/boost/files/boost-binaries/1.76.0/boost_1_76_0-msvc-14.2-64.exe/download
+https://sourceforge.net/projects/boost/files/boost-binaries/1.78.0/boost_1_78_0-msvc-14.2-64.exe/download
```
-Run the installer and leave the default installation path in `C:\local\boost_1_76_0`.
+Run the installer and leave the default installation path in `C:\local\boost_1_78_0`.
##### Source & Compile
In order to use the boost development header and library files you need to [download](https://www.boost.org/users/download/)
-Boost and then extract it to e.g. `C:\local\boost_1_76_0`.
+Boost and then extract it to e.g. `C:\local\boost_1_78_0`.
> **Note**
>
@@ -1953,12 +1953,12 @@ Boost and then extract it to e.g. `C:\local\boost_1_76_0`.
> the archive contains more than 70k files.
In order to integrate Boost into Visual Studio, open the `Developer Command Prompt` from the start menu,
-and navigate to `C:\local\boost_1_76_0`.
+and navigate to `C:\local\boost_1_78_0`.
Execute `bootstrap.bat` first.
```
-cd C:\local\boost_1_76_0
+cd C:\local\boost_1_78_0
bootstrap.bat
```
@@ -2041,8 +2041,8 @@ You need to specify the previously installed component paths.
Variable | Value | Description
----------------------|----------------------------------------------------------------------|-------------------------------------------------------
-`BOOST_ROOT` | `C:\local\boost_1_76_0` | Root path where you've extracted and compiled Boost.
-`BOOST_LIBRARYDIR` | Binary: `C:\local\boost_1_76_0\lib64-msvc-14.2`, Source: `C:\local\boost_1_76_0\stage` | Path to the static compiled Boost libraries, directory must contain `lib`.
+`BOOST_ROOT` | `C:\local\boost_1_78_0` | Root path where you've extracted and compiled Boost.
+`BOOST_LIBRARYDIR` | Binary: `C:\local\boost_1_78_0\lib64-msvc-14.2`, Source: `C:\local\boost_1_78_0\stage` | Path to the static compiled Boost libraries, directory must contain `lib`.
`BISON_EXECUTABLE` | `C:\ProgramData\chocolatey\lib\winflexbison\tools\win_bison.exe` | Path to the Bison executable.
`FLEX_EXECUTABLE` | `C:\ProgramData\chocolatey\lib\winflexbison\tools\win_flex.exe` | Path to the Flex executable.
`ICINGA2_WITH_MYSQL` | OFF | Requires extra setup for MySQL if set to `ON`. Not supported for client setups.
@@ -2079,8 +2079,8 @@ $env:ICINGA2_INSTALLPATH = 'C:\Program Files\Icinga2-debug'
$env:ICINGA2_BUILDPATH='debug'
$env:CMAKE_BUILD_TYPE='Debug'
$env:OPENSSL_ROOT_DIR='C:\OpenSSL-Win64'
-$env:BOOST_ROOT='C:\local\boost_1_76_0'
-$env:BOOST_LIBRARYDIR='C:\local\boost_1_76_0\lib64-msvc-14.2'
+$env:BOOST_ROOT='C:\local\boost_1_78_0'
+$env:BOOST_LIBRARYDIR='C:\local\boost_1_78_0\lib64-msvc-14.2'
```
#### Icinga 2 in Visual Studio
diff --git a/doc/win-dev.ps1 b/doc/win-dev.ps1
index 617e085d4..dca8682d2 100644
--- a/doc/win-dev.ps1
+++ b/doc/win-dev.ps1
@@ -13,7 +13,7 @@ function ThrowOnNativeFailure {
$VsVersion = 2019
$MsvcVersion = '14.2'
-$BoostVersion = @(1, 76, 0)
+$BoostVersion = @(1, 78, 0)
$OpensslVersion = '1_1_1k'
switch ($Env:BITS) {
diff --git a/tools/win32/configure-dev.ps1 b/tools/win32/configure-dev.ps1
index a30189dae..afad1bc1b 100644
--- a/tools/win32/configure-dev.ps1
+++ b/tools/win32/configure-dev.ps1
@@ -31,10 +31,10 @@ if (-not (Test-Path env:OPENSSL_ROOT_DIR)) {
$env:OPENSSL_ROOT_DIR = 'c:\local\OpenSSL-Win64'
}
if (-not (Test-Path env:BOOST_ROOT)) {
- $env:BOOST_ROOT = 'c:\local\boost_1_76_0'
+ $env:BOOST_ROOT = 'c:\local\boost_1_78_0'
}
if (-not (Test-Path env:BOOST_LIBRARYDIR)) {
- $env:BOOST_LIBRARYDIR = 'c:\local\boost_1_76_0\lib64-msvc-14.2'
+ $env:BOOST_LIBRARYDIR = 'c:\local\boost_1_78_0\lib64-msvc-14.2'
}
if (-not (Test-Path env:FLEX_BINARY)) {
$env:FLEX_BINARY = 'C:\ProgramData\chocolatey\bin\win_flex.exe'
diff --git a/tools/win32/configure.ps1 b/tools/win32/configure.ps1
index f6c0f3303..e2d8f70fa 100644
--- a/tools/win32/configure.ps1
+++ b/tools/win32/configure.ps1
@@ -33,10 +33,10 @@ if (-not (Test-Path env:OPENSSL_ROOT_DIR)) {
$env:OPENSSL_ROOT_DIR = "c:\local\OpenSSL_1_1_1k-Win${env:BITS}"
}
if (-not (Test-Path env:BOOST_ROOT)) {
- $env:BOOST_ROOT = "c:\local\boost_1_76_0-Win${env:BITS}"
+ $env:BOOST_ROOT = "c:\local\boost_1_78_0-Win${env:BITS}"
}
if (-not (Test-Path env:BOOST_LIBRARYDIR)) {
- $env:BOOST_LIBRARYDIR = "c:\local\boost_1_76_0-Win${env:BITS}\lib${env:BITS}-msvc-14.2"
+ $env:BOOST_LIBRARYDIR = "c:\local\boost_1_78_0-Win${env:BITS}\lib${env:BITS}-msvc-14.2"
}
if (-not (Test-Path env:FLEX_BINARY)) {
$env:FLEX_BINARY = 'C:\ProgramData\chocolatey\bin\win_flex.exe'
From 52ca277dd82432f1457ec76202561b6b1513ef69 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Thu, 7 Apr 2022 11:06:39 +0200
Subject: [PATCH 2/2] Bump OpenSSL to 1.1.1n
---
doc/win-dev.ps1 | 2 +-
tools/win32/configure.ps1 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/win-dev.ps1 b/doc/win-dev.ps1
index dca8682d2..fbefeaee6 100644
--- a/doc/win-dev.ps1
+++ b/doc/win-dev.ps1
@@ -14,7 +14,7 @@ function ThrowOnNativeFailure {
$VsVersion = 2019
$MsvcVersion = '14.2'
$BoostVersion = @(1, 78, 0)
-$OpensslVersion = '1_1_1k'
+$OpensslVersion = '1_1_1n'
switch ($Env:BITS) {
32 { }
diff --git a/tools/win32/configure.ps1 b/tools/win32/configure.ps1
index e2d8f70fa..9c6d57014 100644
--- a/tools/win32/configure.ps1
+++ b/tools/win32/configure.ps1
@@ -30,7 +30,7 @@ if (-not (Test-Path env:CMAKE_GENERATOR_PLATFORM)) {
}
}
if (-not (Test-Path env:OPENSSL_ROOT_DIR)) {
- $env:OPENSSL_ROOT_DIR = "c:\local\OpenSSL_1_1_1k-Win${env:BITS}"
+ $env:OPENSSL_ROOT_DIR = "c:\local\OpenSSL_1_1_1n-Win${env:BITS}"
}
if (-not (Test-Path env:BOOST_ROOT)) {
$env:BOOST_ROOT = "c:\local\boost_1_78_0-Win${env:BITS}"