Sun May 15 08:40:33 2011 UTC ()
Add two patches taken from upstream repo for CVE-2011-0411.

Bump PKGREVISION.


(obache)
diff -r1.8 -r1.9 pkgsrc/mail/cyrus-imapd23/Makefile
diff -r1.3 -r1.4 pkgsrc/mail/cyrus-imapd23/distinfo

cvs diff -r1.8 -r1.9 pkgsrc/mail/cyrus-imapd23/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/cyrus-imapd23/Attic/Makefile 2010/10/30 07:44:35 1.8
+++ pkgsrc/mail/cyrus-imapd23/Attic/Makefile 2011/05/15 08:40:33 1.9
@@ -1,24 +1,31 @@ @@ -1,24 +1,31 @@
1# $NetBSD: Makefile,v 1.8 2010/10/30 07:44:35 obache Exp $ 1# $NetBSD: Makefile,v 1.9 2011/05/15 08:40:33 obache Exp $
2 2
3DISTNAME= cyrus-imapd-2.3.16 3DISTNAME= cyrus-imapd-2.3.16
4PKGREVISION= 3 4PKGREVISION= 4
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ \ 6MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ \
7 ftp://ftp.cyrusimap.org/cyrus-imapd/OLD-VERSIONS/ \ 7 ftp://ftp.cyrusimap.org/cyrus-imapd/OLD-VERSIONS/ \
8 ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ 8 ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
9 ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/ \ 9 ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/ \
10 http://www.t.ring.gr.jp/archives/net/mail/cyrus-mail/ \ 10 http://www.t.ring.gr.jp/archives/net/mail/cyrus-mail/ \
11 ftp://ftp.t.ring.gr.jp/pub/net/mail/cyrus-mail/ 11 ftp://ftp.t.ring.gr.jp/pub/net/mail/cyrus-mail/
 12PATCHFILES+= cyrus-imapd-2.3-patch-99e184a903e4f973c7358bc0c7e26fabb2237fd2
 13PATCHFILES+= cyrus-imapd-2.3-patch-82cbb4adddeafbf9998de110831ad593f94a5a06
 14SITES.cyrus-imapd-2.3-patch-99e184a903e4f973c7358bc0c7e26fabb2237fd2= \
 15 -http://git.cyrusimap.org/cyrus-imapd/patch/?h=cyrus-imapd-2.3&id=99e184a903e4f973c7358bc0c7e26fabb2237fd2
 16SITES.cyrus-imapd-2.3-patch-82cbb4adddeafbf9998de110831ad593f94a5a06= \
 17 -http://git.cyrusimap.org/cyrus-imapd/patch/?h=cyrus-imapd-2.3&id=82cbb4adddeafbf9998de110831ad593f94a5a06
 18PATCH_DIST_STRIP= -p1
12 19
13MAINTAINER= obache@NetBSD.org 20MAINTAINER= obache@NetBSD.org
14HOMEPAGE= http://www.cyrusimap.org/ 21HOMEPAGE= http://www.cyrusimap.org/
15COMMENT= Cyrus IMAP server 22COMMENT= Cyrus IMAP server
16#LICENSE= original-bsd # like license 23#LICENSE= original-bsd # like license
17 24
18PKG_DESTDIR_SUPPORT= user-destdir 25PKG_DESTDIR_SUPPORT= user-destdir
19 26
20USE_TOOLS+= perl makedepend 27USE_TOOLS+= perl makedepend
21USE_PKGLOCALEDIR= yes 28USE_PKGLOCALEDIR= yes
22GNU_CONFIGURE= yes 29GNU_CONFIGURE= yes
23PERL5_CONFIGURE= no 30PERL5_CONFIGURE= no
24 31

cvs diff -r1.3 -r1.4 pkgsrc/mail/cyrus-imapd23/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/cyrus-imapd23/Attic/distinfo 2011/04/14 12:29:16 1.3
+++ pkgsrc/mail/cyrus-imapd23/Attic/distinfo 2011/05/15 08:40:33 1.4
@@ -1,15 +1,21 @@ @@ -1,15 +1,21 @@
1$NetBSD: distinfo,v 1.3 2011/04/14 12:29:16 obache Exp $ 1$NetBSD: distinfo,v 1.4 2011/05/15 08:40:33 obache Exp $
2 2
 3SHA1 (cyrus-imapd-2.3-patch-82cbb4adddeafbf9998de110831ad593f94a5a06) = ba6dc1db0750ec3f92b84ff5348a86ee4d3e6842
 4RMD160 (cyrus-imapd-2.3-patch-82cbb4adddeafbf9998de110831ad593f94a5a06) = 295b42f4aaf89b0118b16b1bbb965e6fe19233fc
 5Size (cyrus-imapd-2.3-patch-82cbb4adddeafbf9998de110831ad593f94a5a06) = 509 bytes
 6SHA1 (cyrus-imapd-2.3-patch-99e184a903e4f973c7358bc0c7e26fabb2237fd2) = 66dc4def6323afbccdb9aae76649c44dde55c1f3
 7RMD160 (cyrus-imapd-2.3-patch-99e184a903e4f973c7358bc0c7e26fabb2237fd2) = db083cd7e78bc5f4442f4fe6ca9ccf7315fc1fd5
 8Size (cyrus-imapd-2.3-patch-99e184a903e4f973c7358bc0c7e26fabb2237fd2) = 3913 bytes
3SHA1 (cyrus-imapd-2.3.16.tar.gz) = decc87045bfedb449d0af3512aa228090e558036 9SHA1 (cyrus-imapd-2.3.16.tar.gz) = decc87045bfedb449d0af3512aa228090e558036
4RMD160 (cyrus-imapd-2.3.16.tar.gz) = fa9d1462a7d7e839da9a11f52cddfd2ab854f2be 10RMD160 (cyrus-imapd-2.3.16.tar.gz) = fa9d1462a7d7e839da9a11f52cddfd2ab854f2be
5Size (cyrus-imapd-2.3.16.tar.gz) = 2359349 bytes 11Size (cyrus-imapd-2.3.16.tar.gz) = 2359349 bytes
6SHA1 (patch-aa) = ad2080816f3ec3b4cf0eca027cf5152dadc621b1 12SHA1 (patch-aa) = ad2080816f3ec3b4cf0eca027cf5152dadc621b1
7SHA1 (patch-ab) = 50bf708b4e784925ea1b8f1fbaeefeb4bc1d2c09 13SHA1 (patch-ab) = 50bf708b4e784925ea1b8f1fbaeefeb4bc1d2c09
8SHA1 (patch-ac) = 28143b2306866ec8fb6357f7fa70f1c8baaa4c2d 14SHA1 (patch-ac) = 28143b2306866ec8fb6357f7fa70f1c8baaa4c2d
9SHA1 (patch-ad) = b9a68c7a1ab9b36e1c9bfa6d06dbc4f13bb2c99a 15SHA1 (patch-ad) = b9a68c7a1ab9b36e1c9bfa6d06dbc4f13bb2c99a
10SHA1 (patch-ae) = f72486e0e3cf941eabbe6da31b107e8aabecb112 16SHA1 (patch-ae) = f72486e0e3cf941eabbe6da31b107e8aabecb112
11SHA1 (patch-af) = f007c8d861e003f75260f0544a24ef71f8062494 17SHA1 (patch-af) = f007c8d861e003f75260f0544a24ef71f8062494
12SHA1 (patch-ag) = dd38d0c6aa45736ef142cdb4ad95f11e4c23cb03 18SHA1 (patch-ag) = dd38d0c6aa45736ef142cdb4ad95f11e4c23cb03
13SHA1 (patch-ah) = 6daa97e516a5db87579dabd11a7a6f9b83366e27 19SHA1 (patch-ah) = 6daa97e516a5db87579dabd11a7a6f9b83366e27
14SHA1 (patch-ai) = 6cc1c87972cb0fa4b170e76869817b1de1ff7aa6 20SHA1 (patch-ai) = 6cc1c87972cb0fa4b170e76869817b1de1ff7aa6
15SHA1 (patch-aj) = a2d3aba6b2bf4383740f0b1bd48cb6d4027a6d70 21SHA1 (patch-aj) = a2d3aba6b2bf4383740f0b1bd48cb6d4027a6d70