From nobody Sat Aug 12 19:10:56 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 4RNVch09L8z4qQlZ; Sat, 12 Aug 2023 19:11:00 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNVcg6j5Lz3fkW; Sat, 12 Aug 2023 19:10:59 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691867459; 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: in-reply-to:in-reply-to:references:references; bh=3GXZE7epR5YDgF0rSruSO5pEb08dv2y9pL8kE5c6ALE=; b=ylec4pTDF+0hfjTS4pbq93QwRzYEXKL+E+tEIlAleQs399Js8YJBsDST2RmO/G2KlD7l4b St2r9VNLPI8bTBODu6/GCNKvu6m5fHT74B/X3ODmMuyuEBE3I6aeYT9hJBLXae4ZX+UqMj Fp3oeuSQW0TRvOzHH7sXrU990jBUisDsN+hG6mxKj8H4Is6LAJ3jlYXEaruioIH8fegpBv KqwXC8/TwE1IR3rA8zSjXxp+h7/01nKa3Ufwzog3zFGblncHqL/Tfhn0bhX7oX+6O0lxnx JeXXt5/0XA+Pj2h5sEtib1Wx9gkXNZpqtHQxith1lPeAXlBiwPNwuyJ4Tzz0Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691867459; 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: in-reply-to:in-reply-to:references:references; bh=3GXZE7epR5YDgF0rSruSO5pEb08dv2y9pL8kE5c6ALE=; b=Z+GLJ1233tKFiU2hqjsiLwEI5JORax1vok1UZocQxNjgcLbrGLQKJ4B2WEdj4LX9V6IGWj cSpVA1jL/GAVfK9dqRcFb1Vll4sOACqjX26m83rzYVZfxgTV1eCkH17Zu+cfNhQ+/T60Rz cVwhI7lzOKVkPV4t2Ie5yXLlblqRbKe2DwME9MkIozhm64fnvMfaogO5wckxujXXg+VdE/ 6Oz25j3EhFjZFLB3nnZWjV7jVb+IPr5zkrbrOGp6slk2XMoG37IJf/E0q3WxE3Ps1Rx2OB OjAWHjz1XFM4T6yZyu8K/RYCh124XZ7hckIQqtvGd4/nc7HGkYQwO36fbVJ7Ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691867459; a=rsa-sha256; cv=none; b=PHsmbyI/o+bxyrAgov+7xnae8mJH+cBkTW9hL71z758+QshxSDs3xOKwIRM/WkJxNmbOIT mi7+7Z426hRPNQMtrdEsMKCM1aI1zVaTM43e511caHwrXS7aVenMdyJxdR993HmQ6Hyq/p /UQ05Nw9WIscQlI3hX0ivZVt1NVlsl0rEeDMGItPKj+RBPOwD0GdnxrAGxF7Ucu0f4u8+D XcW8bB+8IuTvL4mXUym7k6/I53Ewh7i3kMJS637hrpAKShXKjmBtPigxyf6Loj3Mt8vlYF 1FDloNssSPbv41u7ycv78/yBnvHracuGcuonkWbixUueZurz2VchCqMZKS3HaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2a01:e11:2002:4280:4aee:cff:fe73:9857] (unknown [IPv6:2a01:e11:2002:4280:4aee:cff:fe73:9857]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: madpilot/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RNVcg1t0Xz4dd; Sat, 12 Aug 2023 19:10:59 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Message-ID: <3d8f5314-9c8c-b626-42c6-e5e80b3eff5a@FreeBSD.org> Date: Sat, 12 Aug 2023 21:10:56 +0200 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 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Subject: Re: git: 34f87e912b08 - main - net-mgmt/icinga2: Update to 2.14.0 To: Jochen Neumeister , ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org References: <202308111226.37BCQ2wJ025280@gitrepo.freebsd.org> Content-Language: en-US From: Guido Falsi In-Reply-To: <202308111226.37BCQ2wJ025280@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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 > 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 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