From nobody Sun Apr 10 04:46:54 2022 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 3C2F01AAF1A6; Sun, 10 Apr 2022 04:46:55 +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 4KbfbM0lpwz4gNj; Sun, 10 Apr 2022 04:46:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649566015; 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=y48eKPKa1iqOo9OURsEo1XWNB4J9gwtxtiJxYYcBPzA=; b=VOVJ0heW96QHzIIm03r3f7dHMl0bgbQefveekucc2XhWtEBLjqK0ng8zTxDYFvKEF7+hDb B74ZK8C2bbDiUMMhssvSMRA4ESBZZfyZsf/F4RaxUZkTzNloHyG1avC3qokAYLnPYyQiLH hvZYYACXuqMZclsO5L0rzCIQOvyHgHmqaM8iVL4iKemVZkgJ22sXgr67heRBXUgQod+m95 VpKYej5AqOGBVIsJMBzY5Tl55NVtaIl0lGOna8cRl9HCZsHBN7oa91UZUziS/6uK5zIKf+ n12oFLoOb2zcQoFFbMPCkgdRpHDuS62O/GVtwL6PNRg14+ZkubwOsThHD/4wAg== 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 E960B27978; Sun, 10 Apr 2022 04:46:54 +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 23A4ks5q058194; Sun, 10 Apr 2022 04:46:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23A4ksTR058193; Sun, 10 Apr 2022 04:46:54 GMT (envelope-from git) Date: Sun, 10 Apr 2022 04:46:54 GMT Message-Id: <202204100446.23A4ksTR058193@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hajimu UMEMOTO Subject: git: c34f92ae7950 - main - mail/cyrus-imapd34: disable http and https services in cyrus.conf, when HTTP is not enabled 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: ume X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c34f92ae7950c05dd13b1286cac07414f503ab1d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649566015; 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=y48eKPKa1iqOo9OURsEo1XWNB4J9gwtxtiJxYYcBPzA=; b=l6sWNz11tTZJuXNymyoq3LYeDjpGRQD14ObdUCocKRW7wAnq8X517owk6wQmKsIyFVQuKj +yalQKq9GPASIh3HRieCAA3Swca0MW/PUWO6oc3HfWjyGYdR3KIkuDfd3scH0po4nz3q/f HamUEqdqQpJu1HJjRVorJZkZLucBzdLjBC/NcTlW7s65hlhtO1rSX+BldzIG6WDdOKbh5C xqCA1PyIjadAwPb3fotYTJ8JrvFg8BybbsvcDvJCxXfhZaaOvN1qXaJm7J4qM4r7TNKYHq DoBoWk8h/b5OR2DniJlnOrMEFSeu+RqyIQleAgYpZ+FNOWk5IJT1+3hk+3lL3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649566015; a=rsa-sha256; cv=none; b=vyGH/YtbfzoagGODyh1CQ8R22J9uATOhQwuYzsjYlAixJUIzpcLde31Wjm4IBqKGWH4gui +AWcil8MhlC3CdcrGLHy7NIuPGVQmAwSkbfpbCdnvKMYNf59gpw9u9nlpUYSFkwa7zveo1 a5x3z5bsoXragV1z5nLgBisZmbe7LmUfOuSi1yUb1H56GRNXle/C4RFS15V7G4JKGhYc7z 4wW3PCUNdic6AveWEFKtbVzGJTtjRDqfQi2AFEtavIpbacKr4JE1b0ovtRovNt/zfe2nXA tcEem4JUKXdEHeMDp3j2BKylVHSZlyDGqo9Px1fA4++oExgU5sykASa18xTX5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ume: URL: https://cgit.FreeBSD.org/ports/commit/?id=c34f92ae7950c05dd13b1286cac07414f503ab1d commit c34f92ae7950c05dd13b1286cac07414f503ab1d Author: Hajimu UMEMOTO AuthorDate: 2022-04-10 04:45:04 +0000 Commit: Hajimu UMEMOTO CommitDate: 2022-04-10 04:45:04 +0000 mail/cyrus-imapd34: disable http and https services in cyrus.conf, when HTTP is not enabled PR: 263168 --- mail/cyrus-imapd34/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mail/cyrus-imapd34/Makefile b/mail/cyrus-imapd34/Makefile index 4e65663a74a2..21ae2fd10255 100644 --- a/mail/cyrus-imapd34/Makefile +++ b/mail/cyrus-imapd34/Makefile @@ -1,6 +1,6 @@ PORTNAME= cyrus-imapd PORTVERSION= 3.4.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/ PKGNAMESUFFIX= ${CYRUS_IMAPD_VER} @@ -166,6 +166,8 @@ CYRUS_PERL_MAN3=Cyrus::Annotator::Daemon Cyrus::Annotator::Message \ INSTALL_TARGET= install-strip +REINPLACE_ARGS= -i '' + .include .if ${PORT_OPTIONS:MHTTP} || ${PORT_OPTIONS:MSQLITE} @@ -217,6 +219,10 @@ post-install: ${SED} -e 's,/run/cyrus/socket,/var/imap/socket,' \ ${WRKSRC}/doc/examples/cyrus_conf/normal.conf \ > ${STAGEDIR}${EXAMPLESDIR}/cyrus.conf +.if !${PORT_OPTIONS:MHTTP} + ${REINPLACE_CMD} -e 's/^\( http\)/#\1/' \ + ${STAGEDIR}${EXAMPLESDIR}/cyrus.conf +.endif .for f in mkimap masssievec translatesieve ${INSTALL_SCRIPT} ${WRKSRC}/tools/${f} \ ${STAGEDIR}${CYRUS_PREFIX}/sbin/${f}