Re: git: 34f87e912b08 - main - net-mgmt/icinga2: Update to 2.14.0

On 11/08/23 14:26, Jochen Neumeister wrote:
> The branch main has been updated by joneum:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=34f87e912b083650d13592c2ef250d2549bde126
> 
> commit 34f87e912b083650d13592c2ef250d2549bde126
> Author:     Jochen Neumeister <joneum@FreeBSD.org>
> AuthorDate: 2023-08-11 12:24:31 +0000
> Commit:     Jochen Neumeister <joneum@FreeBSD.org>
> 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

This is failing to build with MYSQL suport turned off:

-- Found BISON: /usr/local/bin/bison (Required is at least version "2.3.0")
-- Found FLEX: 2.6.4 (Required is at least version "2.5.31")
-- Cannot find MySQL. Include dir: MYSQL_INCLUDE_DIR-NOTFOUND  library dir:
CMake Error at lib/CMakeLists.txt:29 (message):
   You have selected MySQL support, but MySQL could not be found.  You can
   disable the MySQL IDO module using -DICINGA2_WITH_MYSQL=OFF.


-- Configuring incomplete, errors occurred!

> ---
>   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)

I've not tested any patches, but looking at this diff it looks like this 
one makes both PGSQL and MYSQL support default to on.

Maybe that's the issue?

-- 
Guido Falsi <madpilot@FreeBSD.org>