Skip to content

Commit

Permalink
Updated Windows dependencies
Browse files Browse the repository at this point in the history
- pcre2 could not be updated to 10.44 because poco/1.13.3 still depends
  on version 10.42.
  • Loading branch information
eduar-hte committed Oct 24, 2024
1 parent 29a86b1 commit 7156ca3
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
16 changes: 8 additions & 8 deletions build/win32/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ The Windows build of libModSecurity uses Build Tools for Visual Studio 2022 (for
* Windows SDK
* CMake
* Address Sanitizer
* [Conan package manager 2.2.2](https://github.com/conan-io/conan/releases/download/2.2.2/conan-2.2.2-windows-x86_64-installer.exe)
* [Conan package manager 2.8.0](https://github.com/conan-io/conan/releases/download/2.8.0/conan-2.8.0-windows-x86_64-installer.exe)
* Install and then setup the default Conan profile to use the MSVC C++ compiler:
1. Open a command-prompt and set the MSVC C++ compiler environment by executing: `C:\BuildTools\VC\Auxiliary\Build\vcvars64.bat`
2. Execute: `conan profile detect --force`
* [Git for Windows 2.44.0](https://github.com/git-for-windows/git/releases/download/v2.44.0.windows.1/Git-2.44.0-64-bit.exe)
* [Git for Windows 2.47.0.2](https://github.com/git-for-windows/git/releases/download/v2.47.0.windows.2/Git-2.47.0.2-64-bit.exe)
* To clone the libModSecurity repository.
* NOTE: Make sure to initialize and update submodules (to get `libinjection` and regression tests)
* `git submodule init`
Expand Down Expand Up @@ -63,13 +63,13 @@ NOTE: When building a different configuration, it's recommended to reset:

### Optional features

By default the following all the following features are enabled by including the associated third-party library through a Conan package:
The following features are enabled by including the associated third-party library through a Conan package:

* libxml2 2.12.6 for XML processing support
* libcurl 8.6.0 to support http requests from rules
* libmaxminddb 1.9.1 to support reading MaxMind DB files.
* LUA 5.4.6 to enable rules to run scripts in this language for extensibility
* lmdb 0.9.31 in-memory database
* LibXML2 for XML processing support
* libcurl to support http requests from rules
* libmaxminddb to support reading MaxMind DB files.
* LUA to enable rules to run scripts in this language for extensibility
* LMDB in-memory database (off by default)

Each of these can be turned off by updating the associated `HAVE_xxx` variable (setting it to zero) in the beginning of the libModSecurity section of `CMakeLists.txt`.

Expand Down
10 changes: 5 additions & 5 deletions build/win32/conanfile.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[requires]
yajl/2.1.0
pcre2/10.42
libxml2/2.12.6
lua/5.4.6
libcurl/8.6.0
lmdb/0.9.31
libmaxminddb/1.9.1
libxml2/2.13.4
lua/5.4.7
libcurl/8.10.1
lmdb/0.9.32
libmaxminddb/1.10.0
dirent/1.24
poco/1.13.3

Expand Down
8 changes: 4 additions & 4 deletions build/win32/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ RUN C:\TEMP\InstallBuildTools.cmd C:\TEMP\vs_buildtools.exe --quiet --wait --nor
--installPath C:\BuildTools

# download & install GIT
ARG GIT_VERSION=2.44.0
ARG GIT_VERSION=2.47.0.2
ARG GIT_VERSION_DIR=v2.47.0.windows.2
ARG GIT_BINARY=Git-${GIT_VERSION}-64-bit.exe
ARG GIT_URL=https://github.com/git-for-windows/git/releases/download/v${GIT_VERSION}.windows.1/${GIT_BINARY}

ARG GIT_URL=https://github.com/git-for-windows/git/releases/download/${GIT_VERSION_DIR}/${GIT_BINARY}
COPY git.inf C:\TEMP\
ARG INSTALLER=C:\TEMP\${GIT_BINARY}
ADD ${GIT_URL} ${INSTALLER}
RUN %INSTALLER% /SP- /VERYSILENT /SUPPRESSMSGBOXES /NOCANCEL `
/NORESTART /CLOSEAPPLICATIONS /RESTARTAPPLICATIONS /LOADINF=git.inf

# download & setup conan
ARG CONAN_VERSION=2.2.2
ARG CONAN_VERSION=2.8.0
ARG CONAN_BINARY=conan-${CONAN_VERSION}-windows-x86_64-installer.exe
ARG CONAN_URL=https://github.com/conan-io/conan/releases/download/${CONAN_VERSION}/${CONAN_BINARY}

Expand Down

0 comments on commit 7156ca3

Please sign in to comment.