From: Stuart Henderson <stu@spacehopper.org>
Subject: Re: Update: Suricata 7.0.4 + fixes
To: Jeremy Evans <jeremy@openbsd.org>
Cc: gonzalo@openbsd.org, OpenBSD ports <ports@openbsd.org>
Date: Tue, 26 Mar 2024 09:38:07 +0000

On 2024/03/25 20:16, Jeremy Evans wrote:
> Here's an update to Suricata 7.0.4, based on gonzalo's update
> recently posted to ports@.  After discussion with gonzalo@ and
> sthen@, I'm adding myself as co-maintainer.
> 
> In addition to the version update, this fixes the following issues:
> 
> Package README recommends suricata-update, but default config is
> overridden to not use suricata-update. Stop overriding default
> config, so way recommended by package README does not require
> suricata.yaml modification.
> 
> Run SUBST_CMD on suricata.yaml.in to fix the ${LOCALSTATEDIR}
> remaining in default installed configuration.
> 
> suricata-update downloads to /var/lib/suricata instead of
> /var/suricata by default, despite the local patches.  Not sure yet
> how to fix that easily, so updated package README to specify -D
> flag so it updates the correct place.  I checked OpenBSD 7.4
> (Suricata 6.0.12) and suricata-update also defaulted to
> /var/lib/suricata there.
> 
> Remove now unnecessary patch for suricata/doc/Makefile.in. Remove
> a couple unnecessary files in SUBST_CMD as well.

OK.

Some other possible tweaks:

${WRKSRC}/configure can be dropped from SUBST_CMD too.

AUTOMAKE_VERSION is set but does nothing (the port does not use a
CONFIGURE_STYLE which depends on automake) so probably better removed.
Alternatively as e_rundir is only used to set the default pid path in
suricata.yaml, that could be patched  in suricata.yaml.in and avoid the
need to re-run autoconf completely (-> CONFIGURE_STYLE=gnu and drop
both AUTO*_VERSION lines).