Sun May 17 15:11:14 2009 UTC ()
Pullup ticket #2774 - requested by obache
cyrus-imapd: bug fix and destdir support

Revisions pulled up:
- mail/cyrus-imapd/Makefile			1.79
- mail/cyrus-imapd/distinfo			1.29
- mail/cyrus-imapd/patches/patch-aq		1.4
---
Module Name:	pkgsrc
Committed By:	obache
Date:		Fri May 15 23:29:02 UTC 2009

Modified Files:
	pkgsrc/mail/cyrus-imapd: Makefile distinfo
	pkgsrc/mail/cyrus-imapd/patches: patch-aq

Log Message:
Fixes `-n' option handling for fetchnews(1).
Patch provided by Jukka Salmi in PR 41432.

While here, add DESTDIR support.


(tron)
diff -r1.78 -r1.78.4.1 pkgsrc/mail/cyrus-imapd/Makefile
diff -r1.28 -r1.28.20.1 pkgsrc/mail/cyrus-imapd/distinfo
diff -r1.3 -r1.3.24.1 pkgsrc/mail/cyrus-imapd/patches/patch-aq
cvs diff -r1.78 -r1.78.4.1 pkgsrc/mail/cyrus-imapd/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/cyrus-imapd/Attic/Makefile 2008/10/19 19:18:11 1.78
+++ pkgsrc/mail/cyrus-imapd/Attic/Makefile 2009/05/17 15:11:14 1.78.4.1
@@ -1,25 +1,27 @@ @@ -1,25 +1,27 @@
1# $NetBSD: Makefile,v 1.78 2008/10/19 19:18:11 he Exp $ 1# $NetBSD: Makefile,v 1.78.4.1 2009/05/17 15:11:14 tron Exp $
2 2
3DISTNAME= cyrus-imapd-2.2.13 3DISTNAME= cyrus-imapd-2.2.13
4PKGREVISION= 7 4PKGREVISION= 8
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ 6MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
7 ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/ 7 ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
8 8
9MAINTAINER= recht@NetBSD.org 9MAINTAINER= recht@NetBSD.org
10HOMEPAGE= http://cyrusimap.web.cmu.edu/imapd/ 10HOMEPAGE= http://cyrusimap.web.cmu.edu/imapd/
11COMMENT= Cyrus IMAP server 11COMMENT= Cyrus IMAP server
12 12
 13PKG_DESTDIR_SUPPORT= user-destdir
 14
13USE_TOOLS+= perl 15USE_TOOLS+= perl
14USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
15GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
16PERL5_CONFIGURE= no 18PERL5_CONFIGURE= no
17BDB_ACCEPTED= db4 db3 19BDB_ACCEPTED= db4 db3
18 20
19.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
20 22
21# CYRUS_USER username of the Cyrus administrator 23# CYRUS_USER username of the Cyrus administrator
22# CYRUS_GROUP group of the Cyrus administrator 24# CYRUS_GROUP group of the Cyrus administrator
23# 25#
24CYRUS_USER?= cyrus 26CYRUS_USER?= cyrus
25CYRUS_GROUP?= mail 27CYRUS_GROUP?= mail
@@ -155,29 +157,29 @@ post-patch: @@ -155,29 +157,29 @@ post-patch:
155 fi; \ 157 fi; \
156 shift 2; \ 158 shift 2; \
157 done 159 done
158 ${FIND} ${WRKSRC} -type f -print | \ 160 ${FIND} ${WRKSRC} -type f -print | \
159 ${XARGS} -n 1 ${GREP} -l -e /etc/imapd\.conf -e /etc/cyrus\.conf | \ 161 ${XARGS} -n 1 ${GREP} -l -e /etc/imapd\.conf -e /etc/cyrus\.conf | \
160 while read file; do \ 162 while read file; do \
161 ${SED} -e "s|/etc/\(cyrus\.conf\)|${PKG_SYSCONFDIR}/\1|g" \ 163 ${SED} -e "s|/etc/\(cyrus\.conf\)|${PKG_SYSCONFDIR}/\1|g" \
162 -e "s|/etc/\(imapd\.conf\)|${PKG_SYSCONFDIR}/\1|g" \ 164 -e "s|/etc/\(imapd\.conf\)|${PKG_SYSCONFDIR}/\1|g" \
163 $$file > $$file.fixed; \ 165 $$file > $$file.fixed; \
164 ${MV} -f $$file.fixed $$file; \ 166 ${MV} -f $$file.fixed $$file; \
165 done 167 done
166 168
167post-install: 169post-install:
168 ${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec ${PREFIX}/cyrus/bin 170 ${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec ${DESTDIR}${PREFIX}/cyrus/bin
169 ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap ${PREFIX}/cyrus/bin 171 ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap ${DESTDIR}${PREFIX}/cyrus/bin
170 ${INSTALL_SCRIPT} ${WRKSRC}/tools/mknewsgroups ${PREFIX}/cyrus/bin 172 ${INSTALL_SCRIPT} ${WRKSRC}/tools/mknewsgroups ${DESTDIR}${PREFIX}/cyrus/bin
171 ${INSTALL_SCRIPT} ${WRKSRC}/tools/translatesieve ${PREFIX}/cyrus/bin 173 ${INSTALL_SCRIPT} ${WRKSRC}/tools/translatesieve ${DESTDIR}${PREFIX}/cyrus/bin
172 ${INSTALL_SCRIPT} ${WRKSRC}/tools/rehash ${PREFIX}/cyrus/bin 174 ${INSTALL_SCRIPT} ${WRKSRC}/tools/rehash ${DESTDIR}${PREFIX}/cyrus/bin
173 ${INSTALL_DATA_DIR} ${EGDIR} 175 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
174 ${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EGDIR} 176 ${INSTALL_DATA} ${FILESDIR}/imapd.conf ${DESTDIR}${EGDIR}
175 cd ${WRKSRC}/master/conf; for file in *.conf; do \ 177 cd ${WRKSRC}/master/conf; for file in *.conf; do \
176 ${INSTALL_DATA} $$file ${EGDIR}; \ 178 ${INSTALL_DATA} $$file ${DESTDIR}${EGDIR}; \
177 done 179 done
178 ${INSTALL_DATA_DIR} ${HTMLDIR} 180 ${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}
179 cd ${WRKSRC}/doc; for file in *.html cyrusv2.mc; do \ 181 cd ${WRKSRC}/doc; for file in *.html cyrusv2.mc; do \
180 ${INSTALL_DATA} $$file ${HTMLDIR}; \ 182 ${INSTALL_DATA} $$file ${DESTDIR}${HTMLDIR}; \
181 done 183 done
182 184
183.include "../../mk/bsd.pkg.mk" 185.include "../../mk/bsd.pkg.mk"
cvs diff -r1.28 -r1.28.20.1 pkgsrc/mail/cyrus-imapd/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/cyrus-imapd/Attic/distinfo 2007/06/12 11:34:29 1.28
+++ pkgsrc/mail/cyrus-imapd/Attic/distinfo 2009/05/17 15:11:14 1.28.20.1
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: distinfo,v 1.28 2007/06/12 11:34:29 obache Exp $ 1$NetBSD: distinfo,v 1.28.20.1 2009/05/17 15:11:14 tron Exp $
2 2
3SHA1 (cyrus-imapd-2.2.13.tar.gz) = ba84b67a1cae4c15d5a588d010764031167970c4 3SHA1 (cyrus-imapd-2.2.13.tar.gz) = ba84b67a1cae4c15d5a588d010764031167970c4
4RMD160 (cyrus-imapd-2.2.13.tar.gz) = 7e8ac84b5ddd9f1206e71d5b659d07d8400f9ac2 4RMD160 (cyrus-imapd-2.2.13.tar.gz) = 7e8ac84b5ddd9f1206e71d5b659d07d8400f9ac2
5Size (cyrus-imapd-2.2.13.tar.gz) = 2109770 bytes 5Size (cyrus-imapd-2.2.13.tar.gz) = 2109770 bytes
6SHA1 (patch-aa) = 379da5df874f3514d654d895e8b8e56a6f26c63d 6SHA1 (patch-aa) = 379da5df874f3514d654d895e8b8e56a6f26c63d
7SHA1 (patch-ab) = 986fa32dd6acc088779791b7bdabde5981b61bc1 7SHA1 (patch-ab) = 986fa32dd6acc088779791b7bdabde5981b61bc1
8SHA1 (patch-ac) = 48557e05ef0d82413da18dd46d9c4baf802a771d 8SHA1 (patch-ac) = 48557e05ef0d82413da18dd46d9c4baf802a771d
9SHA1 (patch-ad) = e99638a062b2695514c6859788eac3fd02cf5c1d 9SHA1 (patch-ad) = e99638a062b2695514c6859788eac3fd02cf5c1d
10SHA1 (patch-ae) = b1865b68a8f798a3766e53e60e9e68099df9bd54 10SHA1 (patch-ae) = b1865b68a8f798a3766e53e60e9e68099df9bd54
11SHA1 (patch-af) = 2aaf1be5fcb102b047a57fe0a908b3e8f95037ea 11SHA1 (patch-af) = 2aaf1be5fcb102b047a57fe0a908b3e8f95037ea
12SHA1 (patch-ag) = 85d931a197d9185cbcff592efd67c2090724d7fd 12SHA1 (patch-ag) = 85d931a197d9185cbcff592efd67c2090724d7fd
13SHA1 (patch-al) = d28a0e604f0ddcf22c6753be333216780558e05c 13SHA1 (patch-al) = d28a0e604f0ddcf22c6753be333216780558e05c
14SHA1 (patch-am) = 0804e6fa6694ed820861b740ac1bead29b3eeb4b 14SHA1 (patch-am) = 0804e6fa6694ed820861b740ac1bead29b3eeb4b
15SHA1 (patch-ap) = 95b987e83ddd53065f7ffe503d0f07694f9bcd6b 15SHA1 (patch-ap) = 95b987e83ddd53065f7ffe503d0f07694f9bcd6b
16SHA1 (patch-aq) = 0d764585dc2af05964b03723c29ff127ebe3c25d 16SHA1 (patch-aq) = f0be966a4219db43ba51c7f25a088addb036a0c0
17SHA1 (patch-ba) = 98bea064fa4d97b0bb1ba2d1fcb4d30611ac706e 17SHA1 (patch-ba) = 98bea064fa4d97b0bb1ba2d1fcb4d30611ac706e
18SHA1 (patch-bb) = 8725d9008617acb392b904d76a353b8829fdfb33 18SHA1 (patch-bb) = 8725d9008617acb392b904d76a353b8829fdfb33
19SHA1 (patch-bc) = 3266d52067aef8f4835670cba1be6c190ff94f15 19SHA1 (patch-bc) = 3266d52067aef8f4835670cba1be6c190ff94f15
20SHA1 (patch-ca) = cc3e9cb9c56e8d51062bf9d691454ea90ce25b09 20SHA1 (patch-ca) = cc3e9cb9c56e8d51062bf9d691454ea90ce25b09
21SHA1 (patch-cb) = a8281c11f93f8f91d6c80d43ca9e20bc658d8813 21SHA1 (patch-cb) = a8281c11f93f8f91d6c80d43ca9e20bc658d8813
22SHA1 (patch-cc) = 3ee1d64fe5f228aab4fceca3cbd45839d3659dd0 22SHA1 (patch-cc) = 3ee1d64fe5f228aab4fceca3cbd45839d3659dd0
cvs diff -r1.3 -r1.3.24.1 pkgsrc/mail/cyrus-imapd/patches/Attic/patch-aq (expand / switch to unified diff)

--- pkgsrc/mail/cyrus-imapd/patches/Attic/patch-aq 2006/12/01 13:36:59 1.3
+++ pkgsrc/mail/cyrus-imapd/patches/Attic/patch-aq 2009/05/17 15:11:14 1.3.24.1
@@ -1,17 +1,26 @@ @@ -1,17 +1,26 @@
1$NetBSD: patch-aq,v 1.3 2006/12/01 13:36:59 joerg Exp $ 1$NetBSD: patch-aq,v 1.3.24.1 2009/05/17 15:11:14 tron Exp $
2 2
3--- imap/fetchnews.c.orig 2005-03-23 00:40:11.000000000 +0000 3--- imap/fetchnews.c.orig 2005-03-23 00:40:11.000000000 +0000
4+++ imap/fetchnews.c 4+++ imap/fetchnews.c
 5@@ -268,7 +268,7 @@ int main(int argc, char *argv[])
 6
 7 if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE);
 8
 9- while ((opt = getopt(argc, argv, "C:s:w:f:a:p:n:y")) != EOF) {
 10+ while ((opt = getopt(argc, argv, "C:s:w:f:a:p:ny")) != EOF) {
 11 switch (opt) {
 12 case 'C': /* alt config file */
 13 alt_config = optarg;
5@@ -371,7 +371,8 @@ int main(int argc, char *argv[]) 14@@ -371,7 +371,8 @@ int main(int argc, char *argv[])
6 prot_fgets(buf, sizeof(buf), pin); 15 prot_fgets(buf, sizeof(buf), pin);
7  16
8 if (newnews) { 17 if (newnews) {
9- struct tm ctime, *ptime; 18- struct tm ctime, *ptime;
10+ struct tm ctime, ptime, ltime; 19+ struct tm ctime, ptime, ltime;
11+ time_t l_time, l_gmt; 20+ time_t l_time, l_gmt;
12  21
13 /* fetch the server's current time */ 22 /* fetch the server's current time */
14 prot_printf(pout, "DATE\r\n"); 23 prot_printf(pout, "DATE\r\n");
15@@ -416,8 +417,11 @@ int main(int argc, char *argv[]) 24@@ -416,8 +417,11 @@ int main(int argc, char *argv[])
16  25
17 /* ask for new articles */ 26 /* ask for new articles */