On Sun, 01 Jun 2025 12:15:38 +0200,
Kirill A. Korinsky <kirill@korins.ky> wrote:
> 
> On Sun, 01 Jun 2025 13:39:32 +0200,
> Martijn van Duren <openbsd+ports@list.imperialat.at> wrote:
> > 
> > Here's a bulk diff, since they all relate to each other.
> > 
> > In a back and forth, kirill@ and I decided to change libopensmtpd to
> > make our lives a little easier by making it handle disconnections when
> > a callback returns -1. This change from void to int is an API/ABI change
> > and all released filters have been adjusted.
> > 
> > Apart from that, filter-dkimsign also includes the following changes:
> > - Clean up some memory leaks in error paths
> >   Found/inspired by Peter J Philipp
> > - Implement -D file as an easy way to manage multiple domains.
> >   Requested by Mischa Peters and Renaud Allard
> > - Strip CFWS when returning domain names from osmtpd_mheader_from_domain
> >   Pointed out by Paul Pace
> > - System level errors are now fatal
> > - Remove HAVE_ED25519 guard
> > 
> > OK?
> >
> 
> Seems that libopensmtpd has extra WANTLIB, or at least
> port-lib-depends-check thinks so:
> 
>         libopensmtpd-1.0(mail/opensmtpd-filters/libopensmtpd):
>         Extra:  c.100
> 
> Otherwise portwise OK kirill@
>

Thus, you also don't need HAVE_ED25519=1 in
mail/opensmtpd-filters/dkimsign/Makefile anymore.

> > martijn@
> > 
> > diff /usr/ports
> > path + /usr/ports
> > commit - 8a4533929b0a14bbe28aea212281ed3086079f96
> > blob - dce9d187a397984e7b27265cbdadea042ba7137a
> > file + mail/opensmtpd-filters/admdscrub/Makefile
> > --- mail/opensmtpd-filters/admdscrub/Makefile
> > +++ mail/opensmtpd-filters/admdscrub/Makefile
> > @@ -1,15 +1,14 @@
> >  COMMENT=	Administrative Management Domain scrubber for OpenSMTPD
> > -V=		0.1
> > +V=		0.2
> >  FILTER_NAME =	admdscrub
> >  DISTNAME =	filter-admdscrub-${V}
> >  
> >  CATEGORIES=	mail
> > -HOMEPAGE=	http://imperialat.at/dev/filter-admdscrub
> > +HOMEPAGE=	https://src.imperialat.at/?action=summary&path=filter-admdscrub.git
> >  
> >  MAINTAINER=	Martijn van Duren <martijn@openbsd.org>
> >  
> > -#SITES=		https://distfiles.sigtrap.nl/
> > -SITES=		https://imperialat.at/releases/
> > +SITES=		https://src.imperialat.at/releases/
> >  INSTALL_TARGET=	bindir install
> >  
> >  LIB_DEPENDS=	mail/opensmtpd-filters/libopensmtpd
> > commit - 8a4533929b0a14bbe28aea212281ed3086079f96
> > blob - f70695b5ec8dc22f241cf0352dbcc522ec9f6afb
> > file + mail/opensmtpd-filters/admdscrub/distinfo
> > --- mail/opensmtpd-filters/admdscrub/distinfo
> > +++ mail/opensmtpd-filters/admdscrub/distinfo
> > @@ -1,2 +1,2 @@
> > -SHA256 (filter-admdscrub-0.1.tar.gz) = rg8+PRzQa1cyMTKY1JhMksGC3HhbusjOg45tl+Ss2vQ=
> > -SIZE (filter-admdscrub-0.1.tar.gz) = 5732
> > +SHA256 (filter-admdscrub-0.2.tar.gz) = xmDsy6LPirkP38ODS5BKgsq08LkxXDjUIoQ2B+oh2vo=
> > +SIZE (filter-admdscrub-0.2.tar.gz) = 18185
> > commit - 8a4533929b0a14bbe28aea212281ed3086079f96
> > blob - d8a4b7a8e696e00d71c635b6bb6b874724abb458
> > file + mail/opensmtpd-filters/dkimsign/Makefile
> > --- mail/opensmtpd-filters/dkimsign/Makefile
> > +++ mail/opensmtpd-filters/dkimsign/Makefile
> > @@ -1,16 +1,15 @@
> >  COMMENT=	dkim signer integration to the OpenSMTPD daemon
> >  
> > -V=		0.5
> > +V=		0.6
> >  FILTER_NAME =	dkimsign
> >  DISTNAME =	filter-dkimsign-${V}
> > -REVISION =	2
> >  
> >  CATEGORIES=	mail
> > -HOMEPAGE=	http://imperialat.at/dev/filter-dkimsign
> > +HOMEPAGE=	https://src.imperialat.at/?action=summary&path=filter-dkimsign.git
> >  
> >  MAINTAINER=	Martijn van Duren <martijn@openbsd.org>
> >  
> > -SITES=		https://distfiles.sigtrap.nl/
> > +SITES=		https://src.imperialat.at/releases/
> >  INSTALL_TARGET=	bindir install
> >  
> >  LIB_DEPENDS=	mail/opensmtpd-filters/libopensmtpd
> > commit - 8a4533929b0a14bbe28aea212281ed3086079f96
> > blob - dc50ef7f576a87bc6c072ae489ad73378c390f7c
> > file + mail/opensmtpd-filters/dkimsign/distinfo
> > --- mail/opensmtpd-filters/dkimsign/distinfo
> > +++ mail/opensmtpd-filters/dkimsign/distinfo
> > @@ -1,2 +1,2 @@
> > -SHA256 (filter-dkimsign-0.5.tar.gz) = pbTsOvXstCNRoLVFm90PMsAOxVwjBQtfRt+u2OMhl0s=
> > -SIZE (filter-dkimsign-0.5.tar.gz) = 23709
> > +SHA256 (filter-dkimsign-0.6.tar.gz) = /guEp+WDh2FmvLfws0Fk9cqpZWUidZH+qQ5mS6OtCTk=
> > +SIZE (filter-dkimsign-0.6.tar.gz) = 22677
> > commit - 8a4533929b0a14bbe28aea212281ed3086079f96
> > blob - aa5ac7f881897f79fe2444026cdd844a11469516
> > file + mail/opensmtpd-filters/dnsbl/Makefile
> > --- mail/opensmtpd-filters/dnsbl/Makefile
> > +++ mail/opensmtpd-filters/dnsbl/Makefile
> > @@ -1,15 +1,15 @@
> >  COMMENT=	dnsbl integration to the OpenSMTPD daemon
> >  
> > -V=		0.3
> > +V=		0.4
> >  FILTER_NAME =	dnsbl
> >  DISTNAME =	filter-dnsbl-${V}
> >  
> >  CATEGORIES=	mail
> > -HOMEPAGE=	http://imperialat.at/dev/filter-dnsbl
> > +HOMEPAGE=	https://src.imperialat.at/?action=summary&path=filter-dnsbl.git
> >  
> >  MAINTAINER=	Martijn van Duren <martijn@openbsd.org>
> >  
> > -SITES=		https://distfiles.sigtrap.nl/
> > +SITES=		https://src.imperialat.at/releases/
> >  INSTALL_TARGET=	bindir install
> >  
> >  LIB_DEPENDS=	mail/opensmtpd-filters/libopensmtpd
> > commit - 8a4533929b0a14bbe28aea212281ed3086079f96
> > blob - d6b0516ab4ba9a814d599ffa7508eafe6c985fb3
> > file + mail/opensmtpd-filters/dnsbl/distinfo
> > --- mail/opensmtpd-filters/dnsbl/distinfo
> > +++ mail/opensmtpd-filters/dnsbl/distinfo
> > @@ -1,2 +1,2 @@
> > -SHA256 (filter-dnsbl-0.3.tar.gz) = qYM8nO3GfVVoA4WcXiJ3j11IhJfvCSzEseJQCiAYUl4=
> > -SIZE (filter-dnsbl-0.3.tar.gz) = 3413
> > +SHA256 (filter-dnsbl-0.4.tar.gz) = u4jgXbmAdHADfZCKvWWMIe1836KJKRDjOHhleA7f9f8=
> > +SIZE (filter-dnsbl-0.4.tar.gz) = 3458
> > commit - 8a4533929b0a14bbe28aea212281ed3086079f96
> > blob - db8cf9b92588868373958e3c234659f1193ded24
> > file + mail/opensmtpd-filters/libopensmtpd/Makefile
> > --- mail/opensmtpd-filters/libopensmtpd/Makefile
> > +++ mail/opensmtpd-filters/libopensmtpd/Makefile
> > @@ -1,10 +1,10 @@
> >  COMMENT=	library for writing opensmtpd filters
> >  
> > -V=		0.8
> > +V=		1.0
> >  PKGNAME=	libopensmtpd-${V}
> >  DISTNAME=	libopensmtpd-${V}
> >  
> > -SHARED_LIBS=	opensmtpd 1.0
> > +SHARED_LIBS=	opensmtpd 2.0
> >  
> >  CATEGORIES=	mail
> >  HOMEPAGE=	https://src.imperialat.at/?action=summary&path=libopensmtpd.git
> > commit - 8a4533929b0a14bbe28aea212281ed3086079f96
> > blob - 7979ee5045acd0d5232d167991956a5434aea463
> > file + mail/opensmtpd-filters/libopensmtpd/distinfo
> > --- mail/opensmtpd-filters/libopensmtpd/distinfo
> > +++ mail/opensmtpd-filters/libopensmtpd/distinfo
> > @@ -1,2 +1,2 @@
> > -SHA256 (libopensmtpd-0.8.tar.gz) = YkR/aoS9YvyNZFnIbTFCLOOk2Qe4K2O9qx4bw4Yafxg=
> > -SIZE (libopensmtpd-0.8.tar.gz) = 35776
> > +SHA256 (libopensmtpd-1.0.tar.gz) = LtwmJQF74yCPnHZvh6FqTDc8OkvFzgIjwtQpPp5PTfk=
> > +SIZE (libopensmtpd-1.0.tar.gz) = 34758
> > 
> 
> -- 
> wbr, Kirill
> 

-- 
wbr, Kirill