Skip to content

Commit 4b4d15c

Browse files
authored
Merge pull request #10700 from Icinga/license-gpl3-later
Upgrade license to GPLv3 & replace existing copyright with SPDX header
2 parents 1260637 + 84ee943 commit 4b4d15c

File tree

822 files changed

+2333
-1168
lines changed

Some content is hidden

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

822 files changed

+2333
-1168
lines changed

CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
1+
# SPDX-FileCopyrightText: 2012 Icinga GmbH <https://icinga.com>
2+
# SPDX-License-Identifier: GPL-2.0-or-later
23

34
# CMake 3.17 is required, CMake policy compatibility was verified up to 3.17.
45
cmake_minimum_required(VERSION 3.17...3.17)
@@ -93,7 +94,7 @@ endif()
9394

9495
set(ICINGA2_BUILD_COMPILER_VERSION "${CMAKE_CXX_COMPILER_VERSION}")
9596

96-
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/COPYING" ICINGA2_LICENSE_GPL)
97+
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md" ICINGA2_LICENSE_GPL)
9798
set(ICINGA2_LICENSE "${ICINGA2_LICENSE_GPL}\n\n---\n\n${ICINGA2_LICENSE_ADDITIONS}")
9899
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt" ${ICINGA2_LICENSE})
99100

@@ -468,7 +469,7 @@ endif()
468469
configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h ESCAPE_QUOTES)
469470

470471
install(
471-
FILES README.md COPYING AUTHORS CHANGELOG.md NEWS
472+
FILES README.md LICENSE.md AUTHORS CHANGELOG.md NEWS
472473
DESTINATION ${CMAKE_INSTALL_DOCDIR}
473474
)
474475

COPYING

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

Containerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# Icinga 2 Docker image | (c) 2025 Icinga GmbH | GPLv2+
1+
# SPDX-FileCopyrightText: 2025 Icinga GmbH <https://icinga.com>
2+
# SPDX-License-Identifier: GPL-2.0-or-later
23

34
FROM debian:trixie-slim AS build-base
45

LICENSE.md

Lines changed: 675 additions & 0 deletions

README.md

Lines changed: 12 additions & 2 deletions

agent/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
1+
# SPDX-FileCopyrightText: 2012 Icinga GmbH <https://icinga.com>
2+
# SPDX-License-Identifier: GPL-2.0-or-later
23

34
if(MSVC)
45
include_external_msproject(

choco/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
1+
# SPDX-FileCopyrightText: 2012 Icinga GmbH <https://icinga.com>
2+
# SPDX-License-Identifier: GPL-2.0-or-later
23

34
if(WIN32)
45
configure_file(icinga2.nuspec.cmake icinga2.nuspec)

choco/icinga2.nuspec.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<description>Icinga is an open source monitoring platform which notifies users about host and service outages.</description>
1414
<projectUrl>https://icinga.com/</projectUrl>
1515
<tags>icinga2 icinga agent monitoring admin</tags>
16-
<licenseUrl>https://github.com/Icinga/icinga2/blob/master/COPYING</licenseUrl>
16+
<licenseUrl>https://github.com/Icinga/icinga2/blob/master/LICENSE.md</licenseUrl>
1717
<releaseNotes>https://github.com/Icinga/icinga2/blob/master/ChangeLog</releaseNotes>
1818
<docsUrl>https://icinga.com/docs/icinga2/latest/</docsUrl>
1919
<bugTrackerUrl>https://github.com/Icinga/icinga2/issues</bugTrackerUrl>

cmake/DiscoverBoostTests.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
# Icinga 2 | (c) 2025 Icinga GmbH | GPLv2+
2-
1+
# SPDX-FileCopyrightText: 2025 Icinga GmbH <https://icinga.com>
2+
# SPDX-License-Identifier: GPL-2.0-or-later
3+
#
34
# - Discover tests defined in the Boost.Test executable target
45
#
56
# Boost.Test executables should be defined like any other CMake executable target.

cmake/ExecuteCommandQuietly.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
# Icinga 2 | (c) 2025 Icinga GmbH | GPLv2+
1+
# SPDX-FileCopyrightText: 2025 Icinga GmbH <https://icinga.com>
2+
# SPDX-License-Identifier: GPL-2.0-or-later
23

34
execute_process(COMMAND "${CMD}" ${ARGS} OUTPUT_QUIET)

0 commit comments

Comments
 (0)