From nobody Tue Mar 15 21:10:31 2022 X-Original-To: dev-commits-ports-main@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 897211A22F9B; Tue, 15 Mar 2022 21:10:31 +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 4KJ5fH3Jy9z3HMr; Tue, 15 Mar 2022 21:10:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647378631; 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=r0WzMMxHQ3bSDqctxVzLeQTPjCj/vuZH1uH6UDOq3jY=; b=RVjEm0JlxKzLhXGzDjWBJUD09lP+nMQEwuxxU/sDm1P/EIV+7Ffkar/rt31RypiF2/KyX/ OSeSijbsenf5TvFtmQlJcvSkqR4EhEwgEnmp+/ozFnaxfmppnAtL4GsAH7fBAuDwtib7e7 s0o/yLf9SeLZ0jQ/MtxwDT4WK/qKFZRtMY9tgvVZxjh5qW9glpmWxtHzMjpLcrNYwtA/yU 9TzxceuHvvAieZ4mtuhRCgRGqEPUn0mVfb5k1Q4xE6QqJVqnEwEpmrmOITd0nLw9xYKs+M pBUBCfFAgtK1AaFI4PKeqrYBI97ZgJ1ZUpu1s/pKuFkFMSLE9/x47EdCP7anfQ== 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 51639E6B; Tue, 15 Mar 2022 21:10:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22FLAVEd013223; Tue, 15 Mar 2022 21:10:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FLAVbb013222; Tue, 15 Mar 2022 21:10:31 GMT (envelope-from git) Date: Tue, 15 Mar 2022 21:10:31 GMT Message-Id: <202203152110.22FLAVbb013222@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: 548805651e61 - main - mail/postfix: Update to 3.7.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 548805651e61cca4d6b5dc4be0787e1e5e188ff0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647378631; 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=r0WzMMxHQ3bSDqctxVzLeQTPjCj/vuZH1uH6UDOq3jY=; b=wKvdrl/vioueFDVtt3PSbCxRPVIV0qOozYYbtWxC5D2WDbADqeHqTT18Nzb01fsr5an5/W dhn4skxsHSdKgyyugmRcskn83dEf65piIIEtCp+I2gQkc8i2vegNiRuc3h8SYxu/6zRiFn o1Ra460Lh51HjuVTJyuN0fH4E08UYIaJj9kPcXXFllNrGhne4VliZ0LDAFog0pjPXf7QeW YIfxfvWEAb+sgqriG+EoPUOlC22CXFo2ivRZMBN8tBjTbr9UV8GRRZwBNa189VIA/kduE9 lK9ATurMAvf5fBk4MHNvktRXqVq3Oxx6mrYOMVBnKx8cY39KWIMQRrobdiWtBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647378631; a=rsa-sha256; cv=none; b=V2pcia6dGceaF3KARiZDFKw4NYsRRnFdofEaHoabc2e1k4F0YLYFXUxzvsIxgJfcUuJcIr bGQBYmBSS2S7hsEKo3J2eppPjTEImwu1WQBhyDxW+IpmGbs1UeeuncLf2GCkL5wGfxkMcq dO0HRX2kqDWUo46wWkHmX96LxTGXWuZF3vvsiPqOLXSrbmj2VRgz4gHDaVjG/bMFG3yvnS itUrxpKvgBQcRmqpzp22a+CSEeR1OBD9ZiMDKK70pwC/8XCq1CxXJl0N5PLfXrqy9KiyC+ szFBfnWCu+AY+/uYG0lXMTFsR+r+WdST8aESOxQycxARFnZm2gA1t+YNCUERdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=548805651e61cca4d6b5dc4be0787e1e5e188ff0 commit 548805651e61cca4d6b5dc4be0787e1e5e188ff0 Author: Juraj Lutter AuthorDate: 2022-03-14 21:21:57 +0000 Commit: Juraj Lutter CommitDate: 2022-03-15 20:55:46 +0000 mail/postfix: Update to 3.7.0 - Update to 3.7.0 - Correct installation instructions [1] - Listen on both IPv4 and IPv6 [2] - Use system-wide CA path [3] - Correct typo in pkg-message [4] - Switch to PCRE2 [5] PR: 261821 [1] PR: 252872 [2] PR: 239473 [3] PR: 261824 [4] PR: 262100 [5] --- mail/postfix/Makefile | 13 +++++++------ mail/postfix/distinfo | 6 +++--- mail/postfix/files/patch-conf_main.cf | 11 +++++++++++ mail/postfix/files/patch-makedefs | 27 --------------------------- mail/postfix/files/patch-src_util_sys__defs.h | 12 ------------ mail/postfix/files/pkg-install.in | 6 +++--- mail/postfix/files/pkg-message.in | 1 + mail/postfix/pkg-plist | 6 +++--- 8 files changed, 28 insertions(+), 54 deletions(-) diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index bae47d1aa5c0..28e7112271c3 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -1,7 +1,7 @@ # Created by: Torsten Blum PORTNAME= postfix -DISTVERSION= 3.6.3 +DISTVERSION= 3.7.0 PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= mail @@ -53,8 +53,8 @@ USERS= postfix GROUPS= mail maildrop postfix OPTIONS_DEFINE= BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP LMDB MYSQL \ - NIS PCRE PGSQL SASL SQLITE TEST TLS -OPTIONS_DEFAULT?= BLACKLISTD EAI PCRE TLS + NIS PCRE2 PGSQL SASL SQLITE TEST TLS +OPTIONS_DEFAULT?= BLACKLISTD EAI PCRE2 TLS OPTIONS_RADIO= RG1 OPTIONS_RADIO_RG1= SASLKMIT SASLKRB5 .if ${FLAVOR:U} == ldap @@ -74,6 +74,7 @@ EAI_DESC= Email Address Internationalization (SMTPUTF8) support INST_BASE_DESC= Install into /usr and /etc/postfix LDAP_DESC= LDAP maps (uses WITH_OPENLDAP_VER) LMDB_DESC= LMDB maps +PCRE2_DESC= Use Perl Compatible Regular Expressions, version 2 RG1_DESC= Kerberos network authentication protocol type SASLKMIT_DESC= If your SASL req. MIT Kerberos5, select this SASLKRB5_DESC= If your SASL req. Kerberos5, select this @@ -87,7 +88,7 @@ EAI_LIB_DEPENDS= libicuuc.so:devel/icu LDAP_USE= OPENLDAP=yes LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb MYSQL_USES?= mysql -PCRE_LIB_DEPENDS= libpcre.so:devel/pcre +PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 PGSQL_USES= pgsql SASLKMIT_LIB_DEPENDS= libkrb5.so:security/krb5 SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 @@ -190,10 +191,10 @@ POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -licuuc POSTFIX_CCARGS+= -DNO_EAI .endif -.if ${PORT_OPTIONS:MPCRE} +.if ${PORT_OPTIONS:MPCRE2} DYN_EXT+= pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include -POSTFIX_DYN_AUXLIBS+= "AUXLIBS_PCRE=`${LOCALBASE}/bin/pcre-config --libs`" +POSTFIX_DYN_AUXLIBS+= "AUXLIBS_PCRE=`${LOCALBASE}/bin/pcre2-config --libs8`" .else POSTFIX_CCARGS+= -DNO_PCRE .endif diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo index 31e1298b38d7..a6d98a034d36 100644 --- a/mail/postfix/distinfo +++ b/mail/postfix/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1636377579 -SHA256 (postfix/postfix-3.6.3.tar.gz) = 0f1241d456a0158e0c418abf62c52c2ff83f8f1dcf2fbdd4c40765b67789b1bc -SIZE (postfix/postfix-3.6.3.tar.gz) = 4750833 +TIMESTAMP = 1647175812 +SHA256 (postfix/postfix-3.7.0.tar.gz) = 645c6a74959703f8dff5b696b2df2e8bc0c91ac530127a21c998e3defbb9528c +SIZE (postfix/postfix-3.7.0.tar.gz) = 4823087 diff --git a/mail/postfix/files/patch-conf_main.cf b/mail/postfix/files/patch-conf_main.cf new file mode 100644 index 000000000000..bd57507b466f --- /dev/null +++ b/mail/postfix/files/patch-conf_main.cf @@ -0,0 +1,11 @@ +--- conf/main.cf.orig 2022-03-15 20:47:35 UTC ++++ conf/main.cf +@@ -681,4 +681,7 @@ sample_directory = /usr/local/etc/postfix + # readme_directory: The location of the Postfix README files. + # + readme_directory = no +-inet_protocols = ipv4 ++inet_protocols = all ++ ++# smtp CA path (default to system-wide location) ++smtp_tls_CApath = /etc/ssl/certs diff --git a/mail/postfix/files/patch-makedefs b/mail/postfix/files/patch-makedefs deleted file mode 100644 index bc2fcbf36c3b..000000000000 --- a/mail/postfix/files/patch-makedefs +++ /dev/null @@ -1,27 +0,0 @@ ---- makedefs.orig 2021-04-24 20:49:37 UTC -+++ makedefs -@@ -309,6 +309,24 @@ case "$SYSTEM.$RELEASE" in - : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} - : ${PLUGIN_LD="${CC} -shared"} - ;; -+ FreeBSD.13*) SYSTYPE=FREEBSD13 -+ : ${CC=cc} -+ : ${SHLIB_SUFFIX=.so} -+ : ${SHLIB_CFLAGS=-fPIC} -+ : ${SHLIB_LD="${CC} -shared"' -Wl,-soname,${LIB}'} -+ : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'} -+ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} -+ : ${PLUGIN_LD="${CC} -shared"} -+ ;; -+ FreeBSD.14*) SYSTYPE=FREEBSD14 -+ : ${CC=cc} -+ : ${SHLIB_SUFFIX=.so} -+ : ${SHLIB_CFLAGS=-fPIC} -+ : ${SHLIB_LD="${CC} -shared"' -Wl,-soname,${LIB}'} -+ : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'} -+ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} -+ : ${PLUGIN_LD="${CC} -shared"} -+ ;; - DragonFly.*) SYSTYPE=DRAGONFLY - ;; - OpenBSD.2*) SYSTYPE=OPENBSD2 diff --git a/mail/postfix/files/patch-src_util_sys__defs.h b/mail/postfix/files/patch-src_util_sys__defs.h deleted file mode 100644 index 96beb47184f3..000000000000 --- a/mail/postfix/files/patch-src_util_sys__defs.h +++ /dev/null @@ -1,12 +0,0 @@ ---- src/util/sys_defs.h.orig 2020-05-21 18:34:23 UTC -+++ src/util/sys_defs.h -@@ -30,7 +30,8 @@ - #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ - || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ - || defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \ -- || defined(FREEBSD11) || defined(FREEBSD12) \ -+ || defined(FREEBSD11) || defined(FREEBSD12) || defined(FREEBSD13) \ -+ || defined(FREEBSD14) \ - || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ - || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ - || defined(OPENBSD5) || defined(OPENBSD6) \ diff --git a/mail/postfix/files/pkg-install.in b/mail/postfix/files/pkg-install.in index 0b7e47cfe011..340c1df561e7 100644 --- a/mail/postfix/files/pkg-install.in +++ b/mail/postfix/files/pkg-install.in @@ -61,7 +61,7 @@ yesno() { # Respect POSTFIX_DEFAULT_MTA, do not ask for confirmation! # (This helps tools like salt, ansible or puppet on new installations) # ============================================================================== -install_choise(){ +install_choice(){ local mailerconf mailerconf=$1 @@ -167,12 +167,12 @@ if [ -f "${MC_BASE}" ]; then cmp_mailer ${MC_LOCALBASE} || install_mailer_conf ${MC_LOCALBASE} try_reload else - cmp_mailer ${MC_LOCALBASE} || install_choise ${MC_LOCALBASE} + cmp_mailer ${MC_LOCALBASE} || install_choice ${MC_LOCALBASE} fi else cmp_mailer ${MC_BASE} if [ $? -ne 0 ]; then - install_choise ${MC_BASE} + install_choice ${MC_BASE} else show_activated_msg ${MC_BASE} try_reload diff --git a/mail/postfix/files/pkg-message.in b/mail/postfix/files/pkg-message.in index f03a454212ff..3f12dcd56cd9 100644 --- a/mail/postfix/files/pkg-message.in +++ b/mail/postfix/files/pkg-message.in @@ -11,6 +11,7 @@ Run the following commands to enable postfix during startup: If postfix is *not* already activated in %%MC_PREFIX%%/etc/mail/mailer.conf - mv %%MC_PREFIX%%/etc/mail/mailer.conf %%MC_PREFIX%%/etc/mail/mailer.conf.old + - install -d %%MC_PREFIX%%/etc/mail - install -m 0644 %%DATADIR%%/mailer.conf.postfix %%MC_PREFIX%%/etc/mail/mailer.conf Disable sendmail(8) specific tasks, diff --git a/mail/postfix/pkg-plist b/mail/postfix/pkg-plist index a3cc7b594290..4976929394de 100644 --- a/mail/postfix/pkg-plist +++ b/mail/postfix/pkg-plist @@ -29,7 +29,7 @@ lib/postfix/libpostfix-util.so %%LDAP%%lib/postfix/postfix-ldap.so %%LMDB%%lib/postfix/postfix-lmdb.so %%MYSQL%%lib/postfix/postfix-mysql.so -%%PCRE%%lib/postfix/postfix-pcre.so +%%PCRE2%%lib/postfix/postfix-pcre.so %%PGSQL%%lib/postfix/postfix-pgsql.so %%SQLITE%%lib/postfix/postfix-sqlite.so libexec/postfix/anvil @@ -42,7 +42,7 @@ libexec/postfix/dynamicmaps.cf %%LDAP%%libexec/postfix/dynamicmaps.cf.d/ldap.cf %%LMDB%%libexec/postfix/dynamicmaps.cf.d/lmdb.cf %%MYSQL%%libexec/postfix/dynamicmaps.cf.d/mysql.cf -%%PCRE%%libexec/postfix/dynamicmaps.cf.d/pcre.cf +%%PCRE2%%libexec/postfix/dynamicmaps.cf.d/pcre.cf %%PGSQL%%libexec/postfix/dynamicmaps.cf.d/pgsql.cf %%SQLITE%%libexec/postfix/dynamicmaps.cf.d/sqlite.cf libexec/postfix/error @@ -63,7 +63,7 @@ libexec/postfix/postfix-files %%LDAP%%libexec/postfix/postfix-files.d/ldap-files %%LMDB%%libexec/postfix/postfix-files.d/lmdb-files %%MYSQL%%libexec/postfix/postfix-files.d/mysql-files -%%PCRE%%libexec/postfix/postfix-files.d/pcre-files +%%PCRE2%%libexec/postfix/postfix-files.d/pcre-files %%PGSQL%%libexec/postfix/postfix-files.d/pgsql-files %%SQLITE%%libexec/postfix/postfix-files.d/sqlite-files libexec/postfix/postfix-script