tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,860 Commits 347 Branches 117 Tags 197 MiB
Commit Graph

115 Commits

Author SHA1 Message Date
Julian Brost b724d61330
Merge pull request #9683 from Icinga/third-party/utf8cpp 
Update vendored github.com/nemtrif/utfcpp to v3.2.3
 2023-04-28 17:31:09 +02:00
Alexander A. Klimov 6d5494ef39 Merge commit '19262c0de696533f61db14e7c167d9370a33b8b2' into HEAD 2023-02-15 11:25:31 +01:00
Alexander A. Klimov 34d0b942b9 Update third-party/nlohmann_json to v3.9.1 
the latest version w/o Apache 2.0 licensed code which conflicts with GPL 2.
 2023-02-14 16:19:44 +01:00
Julian Brost e29dfdd8da third-party: update GetGitRevisionDescription CMake module 
The new version includes functionality to prevent using version information
from parent directories of the source root directory.

wget -O third-party/cmake/GetGitRevisionDescription.cmake https://raw.githubusercontent.com/rpavlik/cmake-modules/main/GetGitRevisionDescription.cmake
wget -O third-party/cmake/GetGitRevisionDescription.cmake.in https://raw.githubusercontent.com/rpavlik/cmake-modules/main/GetGitRevisionDescription.cmake.in
 2021-08-06 16:59:23 +02:00
Bas Couwenberg b0b34f472e Fix building with Boost 1.71. 
The CMake file that detects Boost.Test version uses an older version
format, and incorrectly thinks that the available Boost version is
very old. This patch removes the version check, since Debian already
has a sufficiently recent Boost version.
 2020-01-25 19:07:44 +01:00
Michael Friedrich 5725ba4bf3 JSON: Update to nlohmann/json 3.7.3 
This includes the following fixes:

https://github.com/nlohmann/json/pull/1436

> For a deeply-nested JSON object, the recursive implementation of json_value::destroy function causes stack overflow.

https://github.com/nlohmann/json/issues/1708
https://github.com/nlohmann/json/pull/1722

Stack size

https://github.com/nlohmann/json/issues/1693#issuecomment-516980690

Integer Overflow

https://github.com/nlohmann/json/issues/1447

UTF8, json dump out of bounds

https://github.com/nlohmann/json/issues/1445

Possibly influences #7532
 2019-12-13 16:54:18 +01:00
Markus Frosch 3d1536855a cmake: Update MySQL autodetection to support MariaDB 2019-05-07 22:18:50 +02:00
Michael Friedrich 6ace8001d8
Merge pull request #7019 from Icinga/feature/new-json-library 
Replace YAJL with nlohmann::json
 2019-03-18 17:26:57 +01:00
Alexander A. Klimov 9daca0b216 Get rid of YAJL 2019-03-18 15:07:57 +01:00
Alexander A. Klimov 89b371813f Import "JSON for Modern C++" 2019-03-18 15:05:32 +01:00
Alexander A. Klimov dd15f33c17 Add 'third-party/utf8cpp/' from commit '82344d605146dca6b19abc21578482cecda7f5d7' 
git-subtree-dir: third-party/utf8cpp
git-subtree-mainline: 002f8e36f5
git-subtree-split: 82344d6051
 2019-03-15 13:33:44 +01:00
Michael Friedrich 458f997a18 Replace Copyright header with a short version, part II 2019-02-25 15:09:36 +01:00
Michael Friedrich d14a88235d Replace Copyright header with a short version, part I 
CLion -> replace in path
 2019-02-25 14:48:22 +01:00
Michael Friedrich dea5ec614e icinga.com: Update CMakeLists.txt 2018-10-18 09:35:18 +02:00
Michael Friedrich a036bda601 icinga.com: Update '*.h' 2018-10-18 09:29:29 +02:00
Bas Couwenberg 0891380789 Fix spelling errors. 
* occured -> occurred
 * dosen't -> doesn't
 2018-07-21 10:38:09 +02:00
Michal Moravec bf909ce47f Allow MYSQL_LIB to be specified by ENV variable 2018-02-21 10:49:53 +01:00
Jean Flach ee85af2151 Remove build breaking include 
This breaks the build for windows and does not seem to be required.
 2018-01-19 15:44:52 +01:00
Gunnar Beutner e1134fd3d9 Build all remaining libraries as object libraries 2018-01-17 14:59:02 +01:00
Markus Frosch fb0cc79de6 FindMySQL: Search for mariadbclient by default 
This would look for both names and use the first found.
 2018-01-04 17:37:15 +01:00
Markus Frosch 3b9c00c6ec FindMySQL: Allow other implementations 
Like mariadbclient.

So the user can specify the same via -D
 2018-01-04 17:33:29 +01:00
Gunnar Beutner 75e2473616 Clean up source lists in the CMakeLists.txt files 2018-01-03 11:47:46 +01:00
Michael Friedrich 158312c87b
Merge pull request #5934 from Icinga/feature/cmake-library-paths 
Add more include/library paths for MySQL and PostgreSQL
 2018-01-03 10:58:30 +01:00
Gunnar Beutner 6afc4ec7ac Add more include/library paths for MySQL and PostgreSQL 2018-01-03 01:11:54 +01:00
Gunnar Beutner 90496b5456 Build libraries as static libraries 2018-01-02 23:29:48 +01:00
Michael Insel 158ae2188e Change copyright header for 2018 2018-01-02 12:08:55 +01:00
Markus Frosch da1265a0fc execvpe: Fixup indention for readability 
The file was added with a mixed indention, now all are spaces.

Corresponding to the indented tabwidth of 2 and a sub-indention on curly
brackets.
 2017-12-19 16:40:38 +01:00
Michael Friedrich 6397fedc3d Remove experimental redis feature before 2.7 release 2017-06-20 11:52:24 +02:00
Jean Flach 273c893a77 Fix hiredis being built when not needed 
fixes #5125
 2017-04-03 16:20:00 +02:00
Michael Friedrich 321b067a18 Use hiredis 0.13.3 
refs #4991
 2017-03-14 14:48:18 +01:00
Gunnar Beutner 31650b0beb Add RedisWriter class 
refs #4991
 2017-02-09 16:40:11 +01:00
Gunnar Beutner 55e4881337 Add hiredis library 
refs #4991
 2017-02-09 16:40:11 +01:00
Edgar Fuß 582f700a1a Don't try to include <alloca.h> (as for other BSDs) 
fixes #4777
 2017-02-08 17:50:49 +01:00
Edgar Fuß f454053d13 Fix NetBSD install path 
fixes #4776
 2017-02-08 17:48:34 +01:00
Michael Friedrich b7caf0820d Ensure that *.icinga.com is used everywhere 
fixes #13897
fixes #13277
 2017-01-10 17:19:12 +01:00
Gunnar Beutner 1dc4ab367e Fix: Unit tests randomly crash after the tests have completed 
fixes #12610
 2016-09-07 08:25:53 +02:00
Gunnar Beutner 16742f83ba Don't link against libmysqlclient_r 
fixes #12514
 2016-08-27 09:59:23 +02:00
Gunnar Beutner 30762e5330 Set versions for all internal libraries 
fixes #12552
 2016-08-25 17:56:18 +02:00
Gunnar Beutner 99735a5b2d Fix dependencies for the unit tests 
fixes #11832
 2016-05-24 13:49:37 +02:00
Gunnar Beutner 6cc72e68ec Build fix for Ubuntu Xenial 
fixes #11634
 2016-04-20 15:36:02 +02:00
Jean Flach 0c837e30e8 Fix CMake not finding mysql libs on Windows 
fixes #11208
 2016-02-23 16:08:58 +01:00
Gunnar Beutner 599929b0f6 Update copyright headers for 2016 2016-01-12 08:29:59 +01:00
Gunnar Beutner c37a23ccba Implement the Icinga Studio application 
fixes #10042
 2015-08-31 07:50:01 +02:00
Gunnar Beutner 93177ee09a Fix build problems on AIX 
fixes #9531
 2015-07-01 08:48:42 +02:00
Jean-Marcel Flach d898350b68 Improve compatibility with sles11 2015-04-21 15:29:09 +02:00
Paul Richards 12d09ee249 Make flex detection on Windows more robust 
fixes #8913

Signed-off-by: Gunnar Beutner <gunnar@beutner.name>
 2015-03-31 08:25:59 +02:00
Gunnar Beutner 37736caa5c Implement support for libedit 
fixes #8776
 2015-03-17 15:05:47 +01:00
Gunnar Beutner 1fe24cd417 Fix incorrect variable use in BoostTestTargets.cmake 
fixes #8749
 2015-03-17 09:06:06 +01:00
Gunnar Beutner e3e83ae163 Ignore file name extension in 'flex --version' output 
refs #8750
 2015-03-16 13:37:11 +01:00
Gunnar Beutner 4a8920b1d4 Improve Flex version detection on Windows 
refs #8750
 2015-03-16 13:32:02 +01:00