svn commit: r555099 - in head/mail/cyrus-imapd32: . files
Hajimu UMEMOTO
ume at FreeBSD.org
Sat Nov 14 09:03:15 UTC 2020
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" <doconnor at gsoft.com.au> [1]
Submitted by: "Daniel O'Connor" <doconnor at gsoft.com.au> [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
More information about the svn-ports-head
mailing list