From nobody Tue Mar 15 21:16:00 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 63B121A253A7; Tue, 15 Mar 2022 21:16:01 +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 4KJ5mc5rRhz3KK5; Tue, 15 Mar 2022 21:16:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647378960; 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=4sRvBSIwJHA1+29UWwpWkkYkf+iRGqqM6mHqaandnf4=; b=hINaJvY+xemXAXbi9bLwLf+QvOEBPF0AcmnwE7ir8XQ/CvdZF409h9YuQMJuVeH4o2UtQB 4MpLaGiBIRraEW5qUVi9ckvaviqi5AskFJKXbVA6QskOZHcL7IPD77y/fWUnoSRrUAMSCV RUgeGbj/bD1n/trISnNQxt4tOdZhVFUcAx63J1ZnGvoIqStZXEPR/xkQcSBLB+lnV5A5k9 /+hcbDHgpagkjm2bpe0fN5UJTg2A2ht3h4kV+kX8Efox4VH+J21wopVsxmLkzZz2tMcclG p9NZklAZhp4waYgQqg5N+jDasS8DsQous/Z0nWI94TDT+R2U2ercI5eV/xNsgw== 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 7018C13C1; Tue, 15 Mar 2022 21:16:00 +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 22FLG0bM018810; Tue, 15 Mar 2022 21:16:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FLG09Y018809; Tue, 15 Mar 2022 21:16:00 GMT (envelope-from git) Date: Tue, 15 Mar 2022 21:16:00 GMT Message-Id: <202203152116.22FLG09Y018809@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: daa89f04731a - main - mail/postfix: Apply correct config file patch 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: daa89f04731a86d6ab23d176ed00755510954536 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647378960; 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=4sRvBSIwJHA1+29UWwpWkkYkf+iRGqqM6mHqaandnf4=; b=on3HfcWdM6sYFyJ2OwgTyEbwEOCIu1N9Tf80hqGkGsW+O6PLrrDpfFNCrhNVCS7GYozZvo ygSlCO+KxkRrr/V1p+RrDdZPPi2OTFVz9MotwFMpb4aDdCx1xlmu+O3HWmzrGeqMXLLBHc yXTh0yphgGfwEL2ch0ZZNkmuDKDYpa494Dh7MpIoVlKZXrr5suu9W4lEyBuNy7vXCBsOSz /U0VOUuzmr5SDnQTfNK5riJMY3fHo/Yr6Aaoa1F+iHCPAQnh3oXAaEdT4MXgxq7zGSGOgk DxjPQsRlK3LUsXapIbXvbkMSav7aY5GLj9yQGr5pcFEoFDF5ZiA6ytDO7nsLSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647378960; a=rsa-sha256; cv=none; b=kemYUJS/mSAYcXRapPL7cfqPqrCsVmLphYNCnGG6A5rnwvwaxG5UFT2goNuVUzszUxAU09 AGMflmA0ns90TBGonGwF6KTMQvgoNmvJOtWMnlSi+EdoTQW5WsLspXLT93PRWHVYORUNWc CixPaBsyyTyK6LjA1Cw3jMP5uGE7EW1bMI8YJ18LQmftMzBDD0l/FY8Vu1hqbDb38KOvRS c5usY+RRUQRUGCtBhFQMP1r0Bp5Un938+kcnRMhkpYsBvmN0zxP00NG4MmDM/McV9Q5Y6X gMiyvlo0KBob5EPyhZtfw+CQx4/8/j2zGRl3Tq0DYf7fv/hF6efLOAZh8keh4g== 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=daa89f04731a86d6ab23d176ed00755510954536 commit daa89f04731a86d6ab23d176ed00755510954536 Author: Juraj Lutter AuthorDate: 2022-03-15 21:14:32 +0000 Commit: Juraj Lutter CommitDate: 2022-03-15 21:15:51 +0000 mail/postfix: Apply correct config file patch Apply proper config file patch in correct stage. --- mail/postfix/Makefile | 3 +-- mail/postfix/files/patch-conf_main.cf | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 28e7112271c3..ea67595bf2bc 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -308,7 +308,7 @@ REINPLACE= s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX} s!^(sample_directory =)!\1 ${ETCDIR}!g;\ s!($$config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!; -pre-patch: +post-patch: .if ${PORT_OPTIONS:MSASL} && ! ${PORT_OPTIONS:MMYSQL} && exists(${LOCALBASE}/lib/libsasl2.a) @if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | ${GREP} -wq "mysql_init"; then \ ${ECHO_MSG}; \ @@ -329,7 +329,6 @@ pre-patch: -type f -a ! \( -name INSTALL -o -name aliases \) | ${XARGS} \ ${REINPLACE_CMD} -i '' -E -e '${REINPLACE}' -post-patch: .for f in ${HTML1} @${ECHO_CMD} '$$html_directory/$f:f:root:-:644' \ >> ${WRKSRC}/conf/postfix-files diff --git a/mail/postfix/files/patch-conf_main.cf b/mail/postfix/files/patch-conf_main.cf index bd57507b466f..9035a169d712 100644 --- a/mail/postfix/files/patch-conf_main.cf +++ b/mail/postfix/files/patch-conf_main.cf @@ -3,7 +3,7 @@ @@ -681,4 +681,7 @@ sample_directory = /usr/local/etc/postfix # readme_directory: The location of the Postfix README files. # - readme_directory = no + readme_directory = -inet_protocols = ipv4 +inet_protocols = all +