From: Stuart Henderson <stu@spacehopper.org>
Subject: Re: [UPDATE] icinga-web2 to 2.12.2
To: Alvar Penning <post@0x21.biz>, <ports@openbsd.org>, Stuart Henderson <stu.ports@spacehopper.org>
Date: Fri, 15 Nov 2024 23:59:43 +0000

Please just run "make update-patches" after "make patch" rather than after 
any other stages which might change the file. The change on the #! line for 
icingacli would break things when I switch to 8.3 by default (which I plan 
to do this release cycle).

Btw I do monitor ports where I'm listed as maintainer for updates - there's 
not usually any need to send me diffs for them. If I'm slow picking them up 
then usually either there's a problem or I won't have time I review anyway. 
If there's a port where I don't think I'll be able to update reasonably 
quickly I'll generally do maintainer

-- 
  Sent from a phone, apologies for poor formatting.

On 15 November 2024 20:28:00 Alvar Penning <post@0x21.biz> wrote:

> Hi ports@,
> Hi Stuart,
>
> A patch for icinga-web2 to the latest version 2.12.2[0] follows.
>
> During "make update-patches" the patches/patch-bin_icingacli file got
> slightly rewritten. If this is undesired, feel free to ignore this part.
>
> [0]: https://github.com/Icinga/icingaweb2/releases/tag/v2.12.2
>
> Cheers,
> Alvar
>
>
> diff --git Makefile Makefile
> index 94c0c16a215..73f4e404469 100644
> --- Makefile
> +++ Makefile
> @@ -2,8 +2,7 @@ COMMENT =	next-generation web UI for icinga
>
> GH_ACCOUNT =	Icinga
> GH_PROJECT =	icingaweb2
> -GH_TAGNAME =	v2.12.1
> -REVISION=	1
> +GH_TAGNAME =	v2.12.2
> PKGNAME =	icinga-web2-${GH_TAGNAME:S/v//}
>
> MODULES=	lang/php
> diff --git distinfo distinfo
> index 430fa10f037..d6caff4c773 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (icingaweb2-2.12.1.tar.gz) = 
> RkC4zzgmXJx0aJcBxejho7GTitGsmtcWdDk9L/PC3H8=
> -SIZE (icingaweb2-2.12.1.tar.gz) = 6353911
> +SHA256 (icingaweb2-2.12.2.tar.gz) = 
> sVaHpJnxd0qvlTIWmQxclGOaGaaJd8KIhHuFdUHIRkk=
> +SIZE (icingaweb2-2.12.2.tar.gz) = 6361027
> diff --git patches/patch-bin_icingacli patches/patch-bin_icingacli
> index 1dca479da61..63ad0f45e56 100644
> --- patches/patch-bin_icingacli
> +++ patches/patch-bin_icingacli
> @@ -1,7 +1,11 @@
> Index: bin/icingacli
> --- bin/icingacli.orig
> +++ bin/icingacli
> -@@ -4,4 +4,4 @@
> +@@ -1,7 +1,7 @@
> +-#!/usr/bin/env php
> ++#!/usr/local/bin/php-8.2
> + <?php
> + /* Icinga Web 2 | (c) 2013 Icinga Development Team | GPLv2+ */
>
>  require_once dirname(__DIR__) . '/library/Icinga/Application/Cli.php';
>
> diff --git pkg/PLIST pkg/PLIST
> index 02365398cd3..74186fd4598 100644
> --- pkg/PLIST
> +++ pkg/PLIST
> @@ -1305,7 +1305,12 @@ 
> icinga-web2/modules/translation/library/Translation/Cli/TranslationCommand.php
> icinga-web2/modules/translation/library/Translation/Util/
> icinga-web2/modules/translation/library/Translation/Util/GettextTranslationHelper.php
> icinga-web2/modules/translation/module.info
> -icinga-web2/phpstan-baseline.neon
> +icinga-web2/phpstan-baseline-7x.neon
> +icinga-web2/phpstan-baseline-8.0.neon
> +icinga-web2/phpstan-baseline-8.1+.neon
> +icinga-web2/phpstan-baseline-8x.neon
> +icinga-web2/phpstan-baseline-by-php-version.php
> +icinga-web2/phpstan-baseline-standard.neon
> icinga-web2/phpstan.neon
> icinga-web2/public/
> icinga-web2/public/css/