From nobody Mon Jan 1 18:54:58 2024 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 4T3lXg23dTz55KhZ; Mon, 1 Jan 2024 18:54:59 +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 4T3lXg05F4z3TgD; Mon, 1 Jan 2024 18:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704135299; 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=e9JeJiBsoniJ8EnjAQNdil2dupWCD3c2Fb6E3JBXpx0=; b=KwD4zdJwYvwa2AgfgxHr6gc1jTBsTqIxvPxFOZE9iYbanGWN7uys/IQ125YFquH9PL9RbH oyHN8uuDeI5a3KZNrAFOFEHanWVXJQhv+7ryDDhAh8kTOANVuPZ284W9dgjIkriFsFilgV 25q6Bvx++BOn+ExrAADcV8pshWOTsFwtV9kIjuWfiqqmzUyYuAwTRlPS5cGKgbBnaw56E9 R0MtBaQYCNWQ9G7NRIsAMhZnLAnmP9Hb9/17eRMqPIBdV4zRB3SOLU12tpXWtQ9h7Q+QtC qPcy35r9poV2fPo6284Ml1VD5o3q1I0W0cRpIFn+ME6vh/WgVpBrJBsSJch0pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704135299; a=rsa-sha256; cv=none; b=UiUFc5iQHIu+NoXnvpWFuBcCqD6Xp1bhUJaa6tApcsDvVWpvQv+zcK2pxQ3Ot0WyhWjPvQ 4tpI7Nlrto9poZMnpu7D9VUCf/qDV84hqc1jZgb6oU6OaM4okzXVh7jD18ne+70gCaqes/ t5X7qwtgQIfICMGAK5g2IzvZNOd4VRCyvCKNBNBRuqOGN/4Mu7VwTCU7CMV/Ll7YhL4/qN U+g4VFM8fyvgzlJ1CuKWwM8uHA1qGDjbiOTjI3nD7ht3eDXZpAx3gvchpQ5ssmvvPf0UQd lBQkCGI0UQ3r3aIG6UjIFWj9g8p9b8vNpNcsRFuaPNow5AsQRS/BMzVtyMmF4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704135299; 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=e9JeJiBsoniJ8EnjAQNdil2dupWCD3c2Fb6E3JBXpx0=; b=XYB+ZkZFI87KnAnJGRtaypQYm8s8pTMQvhX5jaJCT9qLB1u2ftb/kmQrJfT4Nrgv8V8zYa /zKtL1j+fd+Bo05VSynb070qMj23lLTKTXwbc05I4egrszLbNdypV8sBIQq4BhazDm4see i90MB+AllFDBg78z32DuzkL2XUymF0EJdYWssg3Qt6sn/4d7GsDuLiMZ+iOaQioKv53aXv VKSzRoJ0YpI/i2/9gqXpWCKm3KhOnCTFXs+YMgIec3toTkbdtlmZAy9UrrF9oAFPag5Ioo uH44/7rnLxIKtFff5WOHJYBQXEyfpvQuv4lKItxucz7xAVB6/7zs/zFrNp2PYw== 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 4T3lXf69H9zDW2; Mon, 1 Jan 2024 18:54:58 +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 401IswdQ010816; Mon, 1 Jan 2024 18:54:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 401IswT6010813; Mon, 1 Jan 2024 18:54:58 GMT (envelope-from git) Date: Mon, 1 Jan 2024 18:54:58 GMT Message-Id: <202401011854.401IswT6010813@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 1f12b8b89415 - main - mail/vpopmail: Fix build 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f12b8b894158bfcd0d3865eaac0cafe67039c01 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f12b8b894158bfcd0d3865eaac0cafe67039c01 commit 1f12b8b894158bfcd0d3865eaac0cafe67039c01 Author: Muhammad Moinur Rahman AuthorDate: 2024-01-01 14:50:16 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-01-01 18:54:47 +0000 mail/vpopmail: Fix build - While I removed the MYSQL option there was a file in the pkg-plist which caused build failures. [1] - Also refactor @exec/@unexec Reported by: antoine [1] --- mail/vpopmail/pkg-plist | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/mail/vpopmail/pkg-plist b/mail/vpopmail/pkg-plist index aa96f1eb4a86..c036e4b7a1a1 100644 --- a/mail/vpopmail/pkg-plist +++ b/mail/vpopmail/pkg-plist @@ -29,13 +29,12 @@ vpopmail/bin/vusagec vpopmail/bin/vuserinfo vpopmail/etc/inc_deps vpopmail/etc/lib_deps -@exec if [ ! -f %D/vpopmail/etc/defaultdomain ]; then install -o vpopmail -g vchkpw /dev/null %D/vpopmail/etc/defaultdomain; fi -@unexec if [ -f %D/vpopmail/etc/defaultdomain ] && [ ! -s %D/vpopmail/etc/defaultdomain ]; then rm -f %D/vpopmail/etc/defaultdomain; fi +@postexec if [ ! -f %D/vpopmail/etc/defaultdomain ]; then install -o vpopmail -g vchkpw /dev/null %D/vpopmail/etc/defaultdomain; fi +@postunexec if [ -f %D/vpopmail/etc/defaultdomain ] && [ ! -s %D/vpopmail/etc/defaultdomain ]; then rm -f %D/vpopmail/etc/defaultdomain; fi @sample vpopmail/etc/tcp.smtp-dist vpopmail/etc/tcp.smtp @sample vpopmail/etc/vlimits.default-dist vpopmail/etc/vlimits.default %%LDAP%%@sample vpopmail/etc/vpopmail.ldap-dist vpopmail/etc/vpopmail.ldap -%%LDAP%%@exec echo "You need to specify the LDAP connection settings in the %D/vpopmail/etc/vpopmail.ldap file" | /usr/bin/fmt -%%MYSQL%%@sample vpopmail/etc/vpopmail.mysql-dist vpopmail/etc/vpopmail.mysql +%%LDAP%%@preexec echo "You need to specify the LDAP connection settings in the %D/vpopmail/etc/vpopmail.ldap file" | /usr/bin/fmt @sample vpopmail/etc/vusagec.conf-dist vpopmail/etc/vusagec.conf @owner @group @@ -100,7 +99,7 @@ vpopmail/lib/libvpopmail.a @dir(vpopmail,vchkpw,) vpopmail/include @dir(vpopmail,vchkpw,) vpopmail/lib @dir(vpopmail,vchkpw,) vpopmail -%%SPAMASSASSIN%%@exec echo "***********************************************************************" -%%SPAMASSASSIN%%@exec echo "Now you should add the following options to your spamd.sh startup file:" -%%SPAMASSASSIN%%@exec echo "-v -u vpopmail" -%%SPAMASSASSIN%%@exec echo "***********************************************************************" +%%SPAMASSASSIN%%@preexec echo "***********************************************************************" +%%SPAMASSASSIN%%@preexec echo "Now you should add the following options to your spamd.sh startup file:" +%%SPAMASSASSIN%%@preexec echo "-v -u vpopmail" +%%SPAMASSASSIN%%@preexec echo "***********************************************************************"