From owner-svn-ports-head@freebsd.org Sat Nov 14 09:03:15 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 633F82E408D; Sat, 14 Nov 2020 09:03:15 +0000 (UTC) (envelope-from ume@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CY8WR2Jb9z4hd7; Sat, 14 Nov 2020 09:03:15 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 42009276B1; Sat, 14 Nov 2020 09:03:15 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AE93FNt065088; Sat, 14 Nov 2020 09:03:15 GMT (envelope-from ume@FreeBSD.org) Received: (from ume@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AE93ETU065084; Sat, 14 Nov 2020 09:03:14 GMT (envelope-from ume@FreeBSD.org) Message-Id: <202011140903.0AE93ETU065084@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org using -f From: Hajimu UMEMOTO Date: Sat, 14 Nov 2020 09:03:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r555099 - in head/mail/cyrus-imapd32: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ume X-SVN-Commit-Paths: in head/mail/cyrus-imapd32: . files X-SVN-Commit-Revision: 555099 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Nov 2020 09:03:15 -0000 Author: ume Date: Sat Nov 14 09:03:14 2020 New Revision: 555099 URL: https://svnweb.freebsd.org/changeset/ports/555099 Log: - Install translatesieve as well. [1] - Ignore . and .. while iterating through the directories holding usernames. [2] This patch was sent to upstream by submitter and already mergend into it. - Sort pkg-plist. Requested by: "Daniel O'Connor" [1] Submitted by: "Daniel O'Connor" [2] Added: head/mail/cyrus-imapd32/files/patch-tools__translatesieve (contents, props changed) Modified: head/mail/cyrus-imapd32/Makefile head/mail/cyrus-imapd32/pkg-plist Modified: head/mail/cyrus-imapd32/Makefile ============================================================================== --- head/mail/cyrus-imapd32/Makefile Sat Nov 14 08:39:17 2020 (r555098) +++ head/mail/cyrus-imapd32/Makefile Sat Nov 14 09:03:14 2020 (r555099) @@ -2,7 +2,7 @@ PORTNAME= cyrus-imapd PORTVERSION= 3.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/ PKGNAMESUFFIX= 32 @@ -39,7 +39,8 @@ MAKE_JOBS_UNSAFE= yes USES+= shebangfix SHEBANG_FILES= imap/promdatagen snmp/snmpgen tools/config2header \ - tools/masssievec tools/mkimap perl/sieve/scripts/*.pl + tools/masssievec tools/mkimap tools/translatesieve \ + perl/sieve/scripts/*.pl CPE_VENDOR= cmu CPE_PRODUCT= cyrus_imap_server @@ -182,9 +183,11 @@ post-patch: -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \ ${WRKSRC}/tools/mkimap +.for f in masssievec translatesieve @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \ -e "s|/usr/sieve|/var/imap/sieve|g" \ - ${WRKSRC}/tools/masssievec + ${WRKSRC}/tools/${f} +.endfor @${REINPLACE_CMD} \ -e 's|$$(libdir)/\(pkgconfig\)|${PREFIX}/libdata/\1|g' \ -e 's|$$(mandir)/\(man[8]\)|${PREFIX}/cyrus/man/\1|g' \ @@ -199,10 +202,10 @@ post-install: ${SED} -e 's,/run/cyrus/socket,/var/imap/socket,' \ ${WRKSRC}/doc/examples/cyrus_conf/normal.conf \ > ${STAGEDIR}${EXAMPLESDIR}/cyrus.conf - ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \ - ${STAGEDIR}${CYRUS_PREFIX}/sbin/mkimap - ${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \ - ${STAGEDIR}${CYRUS_PREFIX}/sbin/masssievec +.for f in mkimap masssievec translatesieve + ${INSTALL_SCRIPT} ${WRKSRC}/tools/${f} \ + ${STAGEDIR}${CYRUS_PREFIX}/sbin/${f} +.endfor ${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \ ${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf .for s in 1 3 5 Added: head/mail/cyrus-imapd32/files/patch-tools__translatesieve ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/cyrus-imapd32/files/patch-tools__translatesieve Sat Nov 14 09:03:14 2020 (r555099) @@ -0,0 +1,12 @@ +--- tools/translatesieve.orig 2020-10-04 23:31:24 UTC ++++ tools/translatesieve +@@ -204,6 +204,9 @@ if ($altnamespace > $OPT_WasAlt) { + chdir $sievedir or die "couldn't change to $sievedir"; + opendir (H, "."); + while (my $i = readdir H) { ++ if ($i eq "." || $i eq "..") { ++ next; ++ } + if (-d $i) { + if (! chdir $i) { + ouch "couldn't chdir to $i"; Modified: head/mail/cyrus-imapd32/pkg-plist ============================================================================== --- head/mail/cyrus-imapd32/pkg-plist Sat Nov 14 08:39:17 2020 (r555098) +++ head/mail/cyrus-imapd32/pkg-plist Sat Nov 14 09:03:14 2020 (r555099) @@ -18,13 +18,16 @@ cyrus/libexec/imapd cyrus/libexec/lmtpd cyrus/libexec/lmtpproxyd cyrus/libexec/master +%%MURDER%%cyrus/libexec/mupdate %%NNTP%%cyrus/libexec/nntpd cyrus/libexec/notifyd cyrus/libexec/pop3d cyrus/libexec/pop3proxyd cyrus/libexec/promstatsd cyrus/libexec/proxyd +%%LDAP%%cyrus/libexec/ptloader cyrus/libexec/smmapd +%%REPLICATION%%cyrus/libexec/sync_server cyrus/libexec/timsieved cyrus/sbin/arbitron cyrus/sbin/chk_cyrus @@ -57,10 +60,8 @@ cyrus/sbin/mbexamine cyrus/sbin/mbpath cyrus/sbin/mbtool cyrus/sbin/mkimap -%%MURDER%%cyrus/libexec/mupdate %%LDAP%%cyrus/sbin/ptdump %%LDAP%%cyrus/sbin/ptexpire -%%LDAP%%cyrus/libexec/ptloader cyrus/sbin/quota cyrus/sbin/reconstruct %%BACKUP%%cyrus/sbin/restore @@ -69,8 +70,8 @@ cyrus/sbin/sieved %%SQUATTER%%cyrus/sbin/squatter %%REPLICATION%%cyrus/sbin/sync_client %%REPLICATION%%cyrus/sbin/sync_reset -%%REPLICATION%%cyrus/libexec/sync_server cyrus/sbin/tls_prune +cyrus/sbin/translatesieve cyrus/sbin/unexpunge etc/man.d/cyrus-imapd.conf include/cyrus/acl.h