From: Omar Polo Subject: Re: new/replace: opensmtpd-extras-* with opensmtpd-tables-* To: Stuart Henderson Cc: ports@openbsd.org Date: Mon, 06 May 2024 20:06:54 +0200 sorry for the delay, On 2024/05/02 12:30:20 +0100, Stuart Henderson wrote: > Personally I would have done this as a plain removal of the old packages > and ask people (via current.html and quirks obsolete_reason) to remove > the old ones themselves, then EPOCH stuff can be avoided in the new > ports, and we don't end up with a not-really-useful meta package lying > around (i.e. a small amount of extra work for upgraders, but less cruft > lying around, and the resulting ports are simpler). Thinking more about it, let's just remove the old packages and require some manual intenvention for the update. I removed the EPOCH in Makefile.inc and fixed the typo in the DESCR (thanks!). I'll completely remove opensmtpd-extras/*. Here's the diff only for quirks and current. Is it ok to reserve an obsolete_reason for this? P.S.: I tried to use qr{opensmtpd-extra} but then it'd complains that the obsolete reason 66 is unused. Thanks! Omar Polo Index: Makefile =================================================================== RCS file: /home/cvs/ports/devel/quirks/Makefile,v diff -u -p -r1.1613 Makefile --- Makefile 1 May 2024 10:24:18 -0000 1.1613 +++ Makefile 2 May 2024 09:17:50 -0000 @@ -3,7 +3,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-7.21 +PKGNAME = quirks-7.22 PKG_ARCH = * MAINTAINER = Marc Espie Index: files/Quirks.pm =================================================================== RCS file: /home/cvs/ports/devel/quirks/files/Quirks.pm,v diff -u -p -r1.1624 Quirks.pm --- files/Quirks.pm 1 May 2024 10:24:18 -0000 1.1624 +++ files/Quirks.pm 6 May 2024 17:56:47 -0000 @@ -813,12 +813,12 @@ my $stem_extensions = { 'sendxmpp' => 'go-sendxmpp', 'libreddit' => 'redlib', 'rebar3' => 'erl25-rebar3', +# 7.6 'stalwart-cli' => 'stalwart-mail', 'stalwart-jmap' => 'stalwart-mail', 'stalwart-imap' => 'stalwart-mail', 'stalwart-smtp' => 'stalwart-mail', 'BlockZone' => 'blockzone', -# 7.6 'tepl' => 'libgedit-tepl', }; @@ -1924,6 +1924,7 @@ setup_obsolete_reason( 31 => 'mkplaylist', 1 => 'proteus', 1 => qr{^tryton}, +# 7.6 5 => 'py3-pyls-black', 5 => 'py3-python-language-server', 5 => 'py3-python-jsonrpc-server', @@ -1932,6 +1933,11 @@ setup_obsolete_reason( 3 => 'transcode', 3 => 'phonon-backend-gstreamer', 0 => 'gone', + 66 => 'opensmtpd-extras', + 66 => 'opensmtpd-extras-mysql', + 66 => 'opensmtpd-extras-pgsql', + 66 => 'opensmtpd-extras-redis', + 31 => 'opensmtpd-extras-python', ); # though it's not yet used, these should be pkgnames, so that eventually @@ -2014,6 +2020,7 @@ my $obsolete_message = { 63 => "outdated, unmaintained, crashes on startup", 64 => "dead upstream, crashes when showing the Syncthing web interface, use a browser", 65 => "superseded by goldendict-ng", + 66 => "superseded by opensmtpd-table-*" }; # ->is_base_system($handle, $state): Index: current.html =================================================================== RCS file: /home/cvs/www/faq/current.html,v diff -u -p -r1.1119 current.html --- current.html 24 Apr 2024 12:07:11 -0000 1.1119 +++ current.html 6 May 2024 17:38:28 -0000 @@ -70,6 +70,20 @@ announce policy no +

2024/05/02 - smtpd table protocol change

+ +The smtpd(8) table protocol +was changed to +smtpd-tables(7). +The old packages opensmtpd-extras should be removed and the +appropriate table installed from the opensmtpd-table-* +packages. +For example, the passwd table is in the opensmtpd-table-passwd +package. +Once the new tables are installed, no changes to the configuration +are needed. + +