From nobody Fri Aug 11 12:26:02 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMjgt3cdrz4Tjgl; Fri, 11 Aug 2023 12:26:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RMjgt358lz4GKr; Fri, 11 Aug 2023 12:26:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R2q8ckFAmoWWgM81yyBsykLixnR+Ay9ZqtFbPzXpXY0=; b=tyBBd68JhEiMJlVjWzJAZOmE3sJLFnhEHgr37f3qQcWomBudfphGd4vijIzDyGZOWD1mSN T71YHlM10xCTw0005Lgs8nvDlk5PDGpf94BsQKCzZRxr+czE5hTxZabOrY3vWfezbOTjL8 G6Ev90ILX61ZDGjRW3DJBs7Mmd8wjyBMY9eFch3nGDo0fIagw6yL29oGqvyaMxrJkgGvLP ljrGbxt2uyShyRtGnh4TG1xo/EZdlmy2tLX+C/gT05ETrL6a9fATlJ0G+tn34/yPm/1VUW UW30FPcrE5CsU3sko/0N6VEG3qdxY3BAqDkzEuJ+gcmTd4ieY61kyHYVYEqDCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R2q8ckFAmoWWgM81yyBsykLixnR+Ay9ZqtFbPzXpXY0=; b=gYDWwO0B3MGZJVkysddp3cYZ+jGvqOE2lECUIJB2SeZkC8B+/FR98bE8782iVaBy4/kjd5 skPC0rRSi99ckdp6oE6w6wE8UV5ZbtVeM2ry2UHQJoW/V4JzV8BYGEkjKFIm0VHBVbCRaI 1uQVaxq+S24L2WBzi2xAwo4UEm9SkLbmXL+f5qYRtgo8O8TpdCDs3FvwzFxj0a/Khyd18a PnHFX0yjXQlBZ+5QXGGMfrC7dQeuWnLlnCZonJjOs2bFYjO3M40wJLx/86czBp5IAdeC1k Kr/t3zuspeN4TtZCgZ2dfSuaujZSM5nVZ6ZRUlX5pwY7oyuUCVhFDyPH1PQnAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691756762; a=rsa-sha256; cv=none; b=RRY7t7OcwEtZjtTewsmsptuvW5UwxL77CTh776lXTacsQSj4LflfLVOM/LL5NkwQeiuDRT 2vX+MwibwQT552KO0YwTJijSQabYQVSehUi9aRR8uCYSWMvuLtubZ1VZoh2vT91KASBL+G NdO+wL2S4aQzNNPtN+3op0d/GA7ItRpa74RCURzZmETXuEFd6KY2v8OzPrd9K4PKpsAFRT iPw7CfUQl3wM/dbG13Jc1E5dG2DUFmL73qhe4cfwgN61jaFEbqxbi4xN6ZF/A9ss9gVJ5e eGfembljtVZ6W5U8MO0juCcT258yBHZ2apCb3zafZYNsJafMksWxLdSJOOajfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMjgt225szfLp; Fri, 11 Aug 2023 12:26:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37BCQ2b9025283; Fri, 11 Aug 2023 12:26:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37BCQ2wJ025280; Fri, 11 Aug 2023 12:26:02 GMT (envelope-from git) Date: Fri, 11 Aug 2023 12:26:02 GMT Message-Id: <202308111226.37BCQ2wJ025280@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jochen Neumeister Subject: git: 34f87e912b08 - main - net-mgmt/icinga2: Update to 2.14.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: joneum X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34f87e912b083650d13592c2ef250d2549bde126 Auto-Submitted: auto-generated The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=34f87e912b083650d13592c2ef250d2549bde126 commit 34f87e912b083650d13592c2ef250d2549bde126 Author: Jochen Neumeister AuthorDate: 2023-08-11 12:24:31 +0000 Commit: Jochen Neumeister CommitDate: 2023-08-11 12:25:55 +0000 net-mgmt/icinga2: Update to 2.14.0 Changelog: https://icinga.com/blog/2023/07/12/releasing-icinga-2-14-and-2-13-8/ Sponsored by: Netzkommune GmbH --- net-mgmt/icinga2/Makefile | 2 +- net-mgmt/icinga2/distinfo | 8 +++---- net-mgmt/icinga2/files/patch-CMakeLists.txt | 28 +++++++++++----------- net-mgmt/icinga2/files/patch-etc_CMakeLists.txt | 11 +++++---- .../icinga2/files/patch-lib_compat_CMakeLists.txt | 12 +++------- net-mgmt/icinga2/pkg-plist | 12 ++-------- 6 files changed, 30 insertions(+), 43 deletions(-) diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile index 10e3c4e94866..716aa8a3af62 100644 --- a/net-mgmt/icinga2/Makefile +++ b/net-mgmt/icinga2/Makefile @@ -1,6 +1,6 @@ PORTNAME= icinga2 DISTVERSIONPREFIX= v -DISTVERSION= 2.13.7 +DISTVERSION= 2.14.0 PORTREVISION= 0 CATEGORIES= net-mgmt diff --git a/net-mgmt/icinga2/distinfo b/net-mgmt/icinga2/distinfo index 9dcc54419f0f..6b1d96bc4997 100644 --- a/net-mgmt/icinga2/distinfo +++ b/net-mgmt/icinga2/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1685558338 -SHA256 (icinga-icinga2-v2.13.7_GH0.tar.gz) = 8a37b7731b30127c01de8ac4cd2372b2b3a06a3972d896fd206454f6e5b136b4 -SIZE (icinga-icinga2-v2.13.7_GH0.tar.gz) = 9667526 -SHA256 (dd51997c73c6b4b328e3ad006eb8c86678001780.patch) = 95a729bda8c368e15c89ceb98d45cfcd8048d28cb8659eeb79adc07724a4dcf5 -SIZE (dd51997c73c6b4b328e3ad006eb8c86678001780.patch) = 3876 +TIMESTAMP = 1691660351 +SHA256 (icinga-icinga2-v2.14.0_GH0.tar.gz) = e97ff8560148fd9dc1c57e3901840a0f8515b9ce53922dbaec7799c220d9f44f +SIZE (icinga-icinga2-v2.14.0_GH0.tar.gz) = 9389972 diff --git a/net-mgmt/icinga2/files/patch-CMakeLists.txt b/net-mgmt/icinga2/files/patch-CMakeLists.txt index 6767dc100751..290a7cc4caff 100644 --- a/net-mgmt/icinga2/files/patch-CMakeLists.txt +++ b/net-mgmt/icinga2/files/patch-CMakeLists.txt @@ -1,26 +1,26 @@ ---- CMakeLists.txt.orig 2020-08-03 13:43:47 UTC -+++ CMakeLists.txt -@@ -13,8 +13,8 @@ if(NOT CMAKE_BUILD_TYPE) - FORCE) +--- CMakeLists.txt.orig 2023-08-11 08:54:43.660987000 +0200 ++++ CMakeLists.txt 2023-08-11 09:20:13.573939000 +0200 +@@ -29,8 +29,8 @@ endif() + set(ICINGA2_MASTER ON) endif() --option(ICINGA2_WITH_MYSQL "Build the MySQL IDO module" ON) --option(ICINGA2_WITH_PGSQL "Build the PostgreSQL IDO module" ON) -+option(ICINGA2_WITH_MYSQL "Build the MySQL IDO module" OFF) -+option(ICINGA2_WITH_PGSQL "Build the PostgreSQL IDO module" OFF) +-option(ICINGA2_WITH_MYSQL "Build the MySQL IDO module" ${ICINGA2_MASTER}) +-option(ICINGA2_WITH_PGSQL "Build the PostgreSQL IDO module" ${ICINGA2_MASTER}) ++option(ICINGA2_WITH_MYSQL "Build the MySQL IDO module" ON) ++option(ICINGA2_WITH_PGSQL "Build the PostgreSQL IDO module" ON) option(ICINGA2_WITH_CHECKER "Build the checker module" ON) - option(ICINGA2_WITH_COMPAT "Build the compat module" ON) - option(ICINGA2_WITH_LIVESTATUS "Build the Livestatus module" ON) -@@ -260,6 +260,12 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + option(ICINGA2_WITH_COMPAT "Build the compat module" ${ICINGA2_MASTER}) + option(ICINGA2_WITH_LIVESTATUS "Build the Livestatus module" ${ICINGA2_MASTER}) +@@ -269,6 +269,12 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -pthread") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -pthread") endif() +endif() + +if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD.*") -+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lexecinfo") -+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lexecinfo") -+ set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} -lexecinfo") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lexecinfo") ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lexecinfo") ++ set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} -lexecinfo") endif() include(CheckCXXCompilerFlag) diff --git a/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt b/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt index 81f020449f75..dcdbf7b020b3 100644 --- a/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt +++ b/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt @@ -1,6 +1,6 @@ ---- etc/CMakeLists.txt.orig 2021-09-04 12:11:45.752360000 +0200 -+++ etc/CMakeLists.txt 2021-09-04 12:25:10.298643000 +0200 -@@ -9,41 +9,41 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") +--- etc/CMakeLists.txt.orig 2023-08-11 09:37:32.071724000 +0200 ++++ etc/CMakeLists.txt 2023-08-11 11:30:51.251785000 +0200 +@@ -9,44 +9,44 @@ if(NOT WIN32) endif() if(NOT WIN32) @@ -51,6 +51,9 @@ if(NOT WIN32) - install_if_not_exists(icinga2/features-available/syslog.conf ${ICINGA2_CONFIGDIR}/features-available) + install_if_not_exists(icinga2/features-available/syslog.conf.sample ${ICINGA2_CONFIGDIR}/features-available) + if(HAVE_SYSTEMD) + install_if_not_exists(icinga2/features-available/journald.conf ${ICINGA2_CONFIGDIR}/features-available) + endif() else() - install_if_not_exists(icinga2/features-available/windowseventlog.conf ${ICINGA2_CONFIGDIR}/features-available) + install_if_not_exists(icinga2/features-available/windowseventlog.conf.sample ${ICINGA2_CONFIGDIR}/features-available) @@ -62,7 +65,7 @@ install_if_not_exists(icinga2/zones.d/README ${ICINGA2_CONFIGDIR}/zones.d) if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") -@@ -56,7 +56,7 @@ if(NOT WIN32) +@@ -59,7 +59,7 @@ else() install(FILES bash_completion.d/icinga2 DESTINATION ${BASHCOMPLETION_DIR}) else() diff --git a/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt index 817acc9238ce..23cfaf20112e 100644 --- a/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt +++ b/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt @@ -1,6 +1,6 @@ ---- lib/compat/CMakeLists.txt.orig 2020-08-03 13:43:47 UTC -+++ lib/compat/CMakeLists.txt -@@ -26,17 +26,17 @@ set_target_properties ( +--- lib/compat/CMakeLists.txt.orig 2023-08-11 11:35:43.136114000 +0200 ++++ lib/compat/CMakeLists.txt 2023-08-11 11:40:02.639410000 +0200 +@@ -22,12 +22,12 @@ install_if_not_exists( ) install_if_not_exists( @@ -15,9 +15,3 @@ ${ICINGA2_CONFIGDIR}/features-available ) - install_if_not_exists( -- ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/statusdata.conf -+ ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/statusdata.conf.sample - ${ICINGA2_CONFIGDIR}/features-available - ) - diff --git a/net-mgmt/icinga2/pkg-plist b/net-mgmt/icinga2/pkg-plist index 1974df68b719..9c8c370984d3 100644 --- a/net-mgmt/icinga2/pkg-plist +++ b/net-mgmt/icinga2/pkg-plist @@ -28,7 +28,6 @@ etc/bash_completion.d/icinga2 @sample %%ETCDIR%%/features-available/notification.conf.sample @sample %%ETCDIR%%/features-available/opentsdb.conf.sample @sample %%ETCDIR%%/features-available/perfdata.conf.sample -@sample %%ETCDIR%%/features-available/statusdata.conf.sample @sample %%ETCDIR%%/features-available/syslog.conf.sample %%ETCDIR%%/features-enabled/checker.conf %%ETCDIR%%/features-enabled/mainlog.conf @@ -39,9 +38,9 @@ etc/bash_completion.d/icinga2 @sample %%ETCDIR%%/zones.conf.sample %%ETCDIR%%/zones.d/README %%MYSQL%%lib/icinga2/libmysql_shim.so -%%MYSQL%%lib/icinga2/libmysql_shim.so.2.13.7 +%%MYSQL%%lib/icinga2/libmysql_shim.so.2.14.0 %%PGSQL%%lib/icinga2/libpgsql_shim.so -%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.13.7 +%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.14.0 lib/icinga2/sbin/icinga2 libexec/nagios/check_nscp_api man/man8/icinga2.8.gz @@ -118,13 +117,6 @@ sbin/icinga2 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_02_global_zone.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_03.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_04.png -%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_01.png -%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_02.png -%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_03.png -%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_04.png -%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_05.png -%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_06.png -%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_07.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_06_finish_no_ticket.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_06_finish_with_ticket.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_examine_config.png