From nobody Fri Nov 17 18:32:53 2023 X-Original-To: dev-commits-ports-all@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 4SX59x2XSFz51FJb; Fri, 17 Nov 2023 18:32:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SX59x26lrz4cMQ; Fri, 17 Nov 2023 18:32:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700245973; 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; bh=xX1moBP7ZoMGx3lyWi2d2HaWHW526rk3mNoqxhucZD8=; b=stiyXr+HZnGCEyh4HXwVFpTtYlm+p74cdnXPCFB13n/ffIROWM7CiaRuphQDODezrXelZs PlQlgr6Gd9vmnmUwEADLBeWXlBUmDoKaSyyBjsBV0lvogotbKM5yfeDSNBLZ1EMQ0LSp1E rhS622VlIP8+PFGoeAn+w8ZDEuUUdKHBbbuoA5gyh0fR1ui1Nu+TuCUMWkcE/BwNRmzzPa jT0LXvJwqw7gb1bbCFjExksWiKRvrBmNl1EmL/6GdOI9AiUgBmb6uIC6YOmWLFfstIMAO+ UnlpfnQro6cJpI1i9yODBjr1Tm5asjO5dhboBDC8FR50frh3kevkYnVJrdBJGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700245973; 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; bh=xX1moBP7ZoMGx3lyWi2d2HaWHW526rk3mNoqxhucZD8=; b=LIUBkcw7QD5DlAFfB54R9drOKXyZ0BbHqoTHWeFKP2vZepG2idrzyNZuefIBuEu689i7ye SVHOp21fl4eUGOR3DWTBFmoanelGmF4MwEs6Eax07d0RTDEckYadOoO2XqKgHFavudO7xJ GCI2tUGhUVoCNrUt5lfbIbXcf6Lfvp+FKEcShSax+GXg1J65H1lJ2uyo4BuFaipYYQPFbE 76PtvPoiwN0aJQax/L9oCkPL3LRbyR1BpRVfTW3CTBLzueFc5mdoxyVh7hpC2atokYOMB5 yo6WzlbFry6opFjErWOfiV1I2nb0Ew197yJKmVgL+npRz9JH1M3AjPPcQT9DTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700245973; a=rsa-sha256; cv=none; b=IVDcVC/e7cfECPgcKIHSyc7I82JN9RiVNQV0UfY+MlRdBSqmHS2OeZxfEQkctP5Ct9HQR2 0WiVGLrXgVAJNZH7b9Dbw5Mg7whVm0Xr9RkMnBoj8Sr4EzIBt6it85+DGtj+8hpKhsmHXa Ttb7Xw3T+cPNPdDEBAy1aaxTmopSS1OIcEDgM/wLR8QbtO4BxKmrheSSHIj5Tu9ODZ7+OM Mzsq6PRPfYMr0Kb6P29qKvg6fLvyt9RWHfRSg7co4PnLHeDqNHBy6L3KVMt99k3PknOSXO 1jMFM00RRhP4ag4AIOXFXoHEWB/QBRdj02dEEGIAvOgNQLH0zFqpBdBx3wiUQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SX59x16pfzv2R; Fri, 17 Nov 2023 18:32:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AHIWrIs026171; Fri, 17 Nov 2023 18:32:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AHIWrav026168; Fri, 17 Nov 2023 18:32:53 GMT (envelope-from git) Date: Fri, 17 Nov 2023 18:32:53 GMT Message-Id: <202311171832.3AHIWrav026168@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Juraj Lutter Subject: git: b9edc9557d20 - main - mail/postfix-current: Update to 3.9-20231112 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9edc9557d20005d41e14b73260b299b448bd90a Auto-Submitted: auto-generated The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=b9edc9557d20005d41e14b73260b299b448bd90a commit b9edc9557d20005d41e14b73260b299b448bd90a Author: Juraj Lutter AuthorDate: 2023-11-17 17:17:42 +0000 Commit: Juraj Lutter CommitDate: 2023-11-17 18:32:36 +0000 mail/postfix-current: Update to 3.9-20231112 - Update to 3.9-20231112 - Regen extra patches - Add flavors same as mail/postfix --- mail/postfix-current/Makefile | 58 ++++++++++++++++------- mail/postfix-current/distinfo | 6 +-- mail/postfix-current/files/extra-patch-blacklistd | 53 ++++++++++----------- 3 files changed, 69 insertions(+), 48 deletions(-) diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index a37f2af05e3f..f1b63b89bea6 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -1,11 +1,11 @@ PORTNAME= postfix -DISTVERSION= 3.9-20231030 -PORTREVISION= 1 +DISTVERSION= 3.9-20231112 +PORTREVISION?= 0 PORTEPOCH= 6 CATEGORIES= mail -MASTER_SITES= http://ftp.porcupine.org/mirrors/postfix-release/ \ +MASTER_SITES= https://postfix-mirror.horus-it.com/postfix-release/ \ + http://ftp.porcupine.org/mirrors/postfix-release/ \ http://de.postfix.org/ftpmirror/ \ - http://cdn.postfix.johnriley.me/mirrors/postfix-release/ \ http://www.artfiles.org/postfix.org/postfix-release/ \ http://mirror.lhsolutions.nl/postfix-release/ \ ftp://postfix.mirrors.pair.com/ @@ -23,20 +23,42 @@ LICENSE_NAME_IPL10= IBM PUBLIC LICENSE VERSION 1.0 LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS_IPL10= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -FLAVORS= default ldap sasl -default_CONFLICTS_INSTALL= postfix-current-base-ldap \ - postfix-current-base-sasl \ - postfix-current-ldap postfix-current-sasl -ldap_PKGNAMESUFFIX= -current-ldap -ldap_CONFLICTS_INSTALL= postfix-current \ - postfix-current-base \ - postfix-current-base-sasl \ - postfix-current-sasl -sasl_PKGNAMESUFFIX= -current-sasl -sasl_CONFLICTS_INSTALL= postfix-current \ - postfix-current-base \ - postfix-current-base-ldap \ - postfix-current-ldap +FLAVORS= default ldap mysql pgsql sasl sqlite +default_CONFLICTS_INSTALL= postfix-current-base-ldap postfix-current-base-sasl \ + postfix-current-ldap postfix-current-sasl \ + postfix-current-mysql postfix-current-base-mysql \ + postfix-current-pgsql postfix-current-base-pgsql \ + postfix-current-sqlite postfix-current-base-sqlite +ldap_PKGNAMESUFFIX= -ldap +ldap_CONFLICTS_INSTALL= postfix-current postfix-current-base \ + postfix-current-base-sasl postfix-current-sasl \ + postfix-current-mysql postfix-current-base-mysql \ + postfix-current-pgsql postfix-current-base-pgsql \ + postfix-current-sqlite postfix-current-base-sqlite +mysql_PKGNAMESUFFIX= -mysql +mysql_CONFLICTS_INSTALL= postfix-current postfix-current-base \ + postfix-current-ldap postfix-current-base-ldap \ + postfix-current-pgsql postfix-current-base-pgsql \ + postfix-current-sasl postfix-current-base-sasl \ + postfix-current-sqlite postfix-current-base-sqlite +pgsql_PKGNAMESUFFIX= -pgsql +pgsql_CONFLICTS_INSTALL= postfix-current postfix-current-base \ + postfix-current-ldap postfix-current-base-ldap \ + postfix-current-mysql postfix-current-base-mysql \ + postfix-current-sasl postfix-current-base-sasl \ + postfix-current-sqlite postfix-current-base-sqlite +sasl_PKGNAMESUFFIX= -sasl +sasl_CONFLICTS_INSTALL= postfix-current postfix-current-base \ + postfix-current-base-ldap postfix-current-ldap \ + postfix-current-mysql postfix-current-base-mysql \ + postfix-current-pgsql postfix-current-base-pgsql \ + postfix-current-sqlite postfix-current-base-sqlite +sqlite_PKGNAMESUFFIX= -sqlite +sqlite_CONFLICTS_INSTALL= postfix-current postfix-current-base \ + postfix-current-ldap postfix-current-base-ldap \ + postfix-current-mysql postfix-current-base-mysql \ + postfix-current-pgsql postfix-current-base-pgsql \ + postfix-current-sasl postfix-current-base-sasl COMMENT_ldap= (with OpenLDAP support) COMMENT_sasl= (with Cyrus SASL support) diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo index ef45264c79ba..2ddd2aa58db2 100644 --- a/mail/postfix-current/distinfo +++ b/mail/postfix-current/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1699483949 -SHA256 (postfix/postfix-3.9-20231030.tar.gz) = 5af6380e3caa51a6b7cc92335f27e923f3f86f551d7fd2191abcd9eb86842ac4 -SIZE (postfix/postfix-3.9-20231030.tar.gz) = 4896025 +TIMESTAMP = 1700225849 +SHA256 (postfix/postfix-3.9-20231112.tar.gz) = c3590cda4a18740274d9d7ffdeec6dad71b7856be012817d90920bc04fc62595 +SIZE (postfix/postfix-3.9-20231112.tar.gz) = 4896401 diff --git a/mail/postfix-current/files/extra-patch-blacklistd b/mail/postfix-current/files/extra-patch-blacklistd index 2b2bc712e667..c6811790ed66 100644 --- a/mail/postfix-current/files/extra-patch-blacklistd +++ b/mail/postfix-current/files/extra-patch-blacklistd @@ -1,6 +1,6 @@ # PR 225664: support blacklistd on FreeBSD >= 11.0 # ---- src/smtpd/Makefile.in.orig 2021-04-18 20:45:05 UTC +--- src/smtpd/Makefile.in.orig 2023-05-21 16:54:34 UTC +++ src/smtpd/Makefile.in @@ -2,14 +2,14 @@ SHELL = /bin/sh SRCS = smtpd.c smtpd_token.c smtpd_check.c smtpd_chat.c smtpd_state.c \ @@ -20,32 +20,7 @@ TESTSRC = smtpd_token_test.c DEFS = -I. -I$(INC_DIR) -D$(SYSTYPE) CFLAGS = $(DEBUG) $(OPT) $(DEFS) ---- src/smtpd/smtpd_sasl_glue.c.orig 2020-08-30 21:03:46 UTC -+++ src/smtpd/smtpd_sasl_glue.c -@@ -149,6 +149,7 @@ - #include "smtpd.h" - #include "smtpd_sasl_glue.h" - #include "smtpd_chat.h" -+#include "pfilter.h" /* for blacklistd(8) */ - - #ifdef USE_SASL_AUTH - -@@ -350,6 +351,10 @@ int smtpd_sasl_authenticate(SMTPD_STATE *state, - else - smtpd_chat_reply(state, "535 5.7.8 Error: authentication failed: %s", - STR(state->sasl_reply)); -+ -+ -+ /* notify blacklistd of SASL authentication failure */ -+ pfilter_notify(1, vstream_fileno(state->client)); - return (-1); - } - /* RFC 4954 Section 6. */ ---- src/smtpd/pfilter.h.orig 2021-05-06 19:00:00 UTC -+++ src/smtpd/pfilter.h -@@ -0,0 +1 @@ -+void pfilter_notify(int, int); ---- src/smtpd/pfilter.c.orig 2021-05-06 19:00:00 UTC +--- src/smtpd/pfilter.c.orig 2023-11-17 14:38:32 UTC +++ src/smtpd/pfilter.c @@ -0,0 +1,19 @@ +#include "pfilter.h" @@ -67,3 +42,27 @@ + blstate = NULL; + } +} +--- src/smtpd/pfilter.h.orig 2023-11-17 14:38:32 UTC ++++ src/smtpd/pfilter.h +@@ -0,0 +1 @@ ++void pfilter_notify(int, int); +--- src/smtpd/smtpd_sasl_glue.c.orig 2023-11-12 21:41:13 UTC ++++ src/smtpd/smtpd_sasl_glue.c +@@ -153,6 +153,7 @@ + #include "smtpd.h" + #include "smtpd_sasl_glue.h" + #include "smtpd_chat.h" ++#include "pfilter.h" /* for blacklistd(8) */ + + #ifdef USE_SASL_AUTH + +@@ -358,6 +359,9 @@ int smtpd_sasl_authenticate(SMTPD_STATE *state, + else + smtpd_chat_reply(state, "535 5.7.8 Error: authentication failed: %s", + reason); ++ ++ /* notify blacklistd of SASL authentication failure */ ++ pfilter_notify(1, vstream_fileno(state->client)); + return (-1); + } + /* RFC 4954 Section 6. */