Update cyrus-imapd23 to 2.3.17.

(add an patch to fix compilation on perl 5.14)

Changes to the Cyrus IMAP Server since 2.3.16

      * Fix for CVE-2011-3208, a remotely exploitable buffer overflow in
        nntpd

5 files changed, 124 insertions, 40 deletions

diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 44e377d239e..f26f90ddf2c 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2011/08/14 13:25:21 obache Exp $
+# $NetBSD: Makefile,v 1.12 2011/09/09 11:56:19 obache Exp $
 
-DISTNAME=	cyrus-imapd-2.3.16
-PKGREVISION=	6
+DISTNAME=	cyrus-imapd-2.3.17
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
 		ftp://ftp.cyrusimap.org/cyrus-imapd/OLD-VERSIONS/ \
@@ -9,13 +8,6 @@ MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
 		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/ \
 		http://www.t.ring.gr.jp/archives/net/mail/cyrus-mail/ \
 		ftp://ftp.t.ring.gr.jp/pub/net/mail/cyrus-mail/
-PATCHFILES+=	cyrus-imapd-2.3-patch-99e184a903e4f973c7358bc0c7e26fabb2237fd2
-PATCHFILES+=	cyrus-imapd-2.3-patch-82cbb4adddeafbf9998de110831ad593f94a5a06
-SITES.cyrus-imapd-2.3-patch-99e184a903e4f973c7358bc0c7e26fabb2237fd2=	\
-	-http://git.cyrusimap.org/cyrus-imapd/patch/?h=cyrus-imapd-2.3&id=99e184a903e4f973c7358bc0c7e26fabb2237fd2
-SITES.cyrus-imapd-2.3-patch-82cbb4adddeafbf9998de110831ad593f94a5a06=	\
-	-http://git.cyrusimap.org/cyrus-imapd/patch/?h=cyrus-imapd-2.3&id=82cbb4adddeafbf9998de110831ad593f94a5a06
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://www.cyrusimap.org/
diff --git a/mail/cyrus-imapd23/distinfo b/mail/cyrus-imapd23/distinfo
index c09157f6579..8c403c572eb 100644
--- a/mail/cyrus-imapd23/distinfo
+++ b/mail/cyrus-imapd23/distinfo
@@ -1,16 +1,10 @@
-$NetBSD: distinfo,v 1.4 2011/05/15 08:40:33 obache Exp $
+$NetBSD: distinfo,v 1.5 2011/09/09 11:56:19 obache Exp $
 
-SHA1 (cyrus-imapd-2.3-patch-82cbb4adddeafbf9998de110831ad593f94a5a06) = ba6dc1db0750ec3f92b84ff5348a86ee4d3e6842
-RMD160 (cyrus-imapd-2.3-patch-82cbb4adddeafbf9998de110831ad593f94a5a06) = 295b42f4aaf89b0118b16b1bbb965e6fe19233fc
-Size (cyrus-imapd-2.3-patch-82cbb4adddeafbf9998de110831ad593f94a5a06) = 509 bytes
-SHA1 (cyrus-imapd-2.3-patch-99e184a903e4f973c7358bc0c7e26fabb2237fd2) = 66dc4def6323afbccdb9aae76649c44dde55c1f3
-RMD160 (cyrus-imapd-2.3-patch-99e184a903e4f973c7358bc0c7e26fabb2237fd2) = db083cd7e78bc5f4442f4fe6ca9ccf7315fc1fd5
-Size (cyrus-imapd-2.3-patch-99e184a903e4f973c7358bc0c7e26fabb2237fd2) = 3913 bytes
-SHA1 (cyrus-imapd-2.3.16.tar.gz) = decc87045bfedb449d0af3512aa228090e558036
-RMD160 (cyrus-imapd-2.3.16.tar.gz) = fa9d1462a7d7e839da9a11f52cddfd2ab854f2be
-Size (cyrus-imapd-2.3.16.tar.gz) = 2359349 bytes
-SHA1 (patch-aa) = ad2080816f3ec3b4cf0eca027cf5152dadc621b1
-SHA1 (patch-ab) = 50bf708b4e784925ea1b8f1fbaeefeb4bc1d2c09
+SHA1 (cyrus-imapd-2.3.17.tar.gz) = caa82b91b98ef49cab55657d4d2a873ec3064afc
+RMD160 (cyrus-imapd-2.3.17.tar.gz) = 9485a7905cc69c040ee7b6c0d02d229237640756
+Size (cyrus-imapd-2.3.17.tar.gz) = 2311153 bytes
+SHA1 (patch-aa) = c3ab1ed39eb96b6d3bdbe298333c8488e3fb51e7
+SHA1 (patch-ab) = bec4bf47154e1d526124e0b990950d6543909847
 SHA1 (patch-ac) = 28143b2306866ec8fb6357f7fa70f1c8baaa4c2d
 SHA1 (patch-ad) = b9a68c7a1ab9b36e1c9bfa6d06dbc4f13bb2c99a
 SHA1 (patch-ae) = f72486e0e3cf941eabbe6da31b107e8aabecb112
@@ -25,3 +19,4 @@ SHA1 (patch-am) = d06b62f9ea153560d84ec013861839071e4ab700
 SHA1 (patch-an) = b3ac809f2807a1766197958e807eb99cb42847f0
 SHA1 (patch-ao) = 784363a1802cbaf08e62bbbd2020fe592be0a126
 SHA1 (patch-ap) = 4a794b806b20270e2b9b551bfae21352389e1352
+SHA1 (patch-perl_imap_IMAP.xs) = 535f2187e9270ad35481869c6ee031ed915abc38
diff --git a/mail/cyrus-imapd23/patches/patch-aa b/mail/cyrus-imapd23/patches/patch-aa
index 8dfc538d94f..2c51cd4cb3f 100644
--- a/mail/cyrus-imapd23/patches/patch-aa
+++ b/mail/cyrus-imapd23/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2011/04/14 12:29:17 obache Exp $
+$NetBSD: patch-aa,v 1.3 2011/09/09 11:56:19 obache Exp $
 
---- configure.in.orig	2009-12-21 13:09:10.000000000 +0000
+--- configure.in.orig	2011-09-08 18:02:23.000000000 +0000
 +++ configure.in
 @@ -391,11 +391,11 @@ if test "$sievedir" != "no"; then
  	AC_CHECK_LIB(fl,main)
@@ -16,12 +16,12 @@ $NetBSD: patch-aa,v 1.2 2011/04/14 12:29:17 obache Exp $
  			LIBS="$LIBS -lrx"
  			AC_DEFINE(ENABLE_REGEX, [],
  				  [Do we have a regex library?])
-@@ -1145,7 +1145,7 @@ dnl add perl cccdlflags when building li
- dnl libraries will be compiled as PIC if perl requires PIC objects
- dnl -- this is needed on NetBSD and Linux, but seems to cause problems on atleast Solaris --
+@@ -1146,7 +1146,7 @@ dnl libraries will be compiled as PIC if
+ dnl -- this is needed on NetBSD, FreeBSD, and Linux, but seems to
+ dnl cause problems on atleast Solaris -- 
      case "${target_os}" in
--        linux*|netbsd*)
-+        linux*|netbsd*|dragonfly*)
+-        linux*|netbsd*|freebsd*)
++        linux*|netbsd*|freebsd*|dragonfly*)
              AC_MSG_CHECKING(for perl cccdlflags needed on "${target_os}")
              eval `${PERL} -V:cccdlflags`
              PERL_CCCDLFLAGS="$cccdlflags"
diff --git a/mail/cyrus-imapd23/patches/patch-ab b/mail/cyrus-imapd23/patches/patch-ab
index 815cdb13d9c..bfe3b77b226 100644
--- a/mail/cyrus-imapd23/patches/patch-ab
+++ b/mail/cyrus-imapd23/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2011/04/14 12:29:17 obache Exp $
+$NetBSD: patch-ab,v 1.3 2011/09/09 11:56:19 obache Exp $
 
---- configure.orig	2009-12-21 13:17:55.000000000 +0000
+--- configure.orig	2011-09-08 18:03:46.000000000 +0000
 +++ configure
-@@ -12402,7 +12402,7 @@ fi
+@@ -7171,13 +7171,13 @@ fi
  
  done
  
@@ -10,22 +10,20 @@ $NetBSD: patch-ab,v 1.2 2011/04/14 12:29:17 obache Exp $
 +	if test "$ac_cv_header_pcreposix_h" = "yes"; then
  		LIBS="$LIBS -lpcre -lpcreposix";
  
- cat >>confdefs.h <<\_ACEOF
-@@ -12410,7 +12410,7 @@ cat >>confdefs.h <<\_ACEOF
- _ACEOF
+ $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
  
  	else
 -		if test "$ac_cv_header_rxposix_h" == "yes"; then
 +		if test "$ac_cv_header_rxposix_h" = "yes"; then
  			LIBS="$LIBS -lrx"
  
- cat >>confdefs.h <<\_ACEOF
-@@ -20173,7 +20173,7 @@ elif test "${with_perl}" != "no"; then
+ $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
+@@ -10411,7 +10411,7 @@ elif test "${with_perl}" != "no"; then
      PERL_SUBDIRS="imap"
      PERL="${with_perl}"
      case "${target_os}" in
--        linux*|netbsd*)
-+        linux*|netbsd*|dragonfly*)
-             { $as_echo "$as_me:$LINENO: checking for perl cccdlflags needed on \"${target_os}\"" >&5
+-        linux*|netbsd*|freebsd*)
++        linux*|netbsd*|freebsd*|dragonfly*)
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl cccdlflags needed on \"${target_os}\"" >&5
  $as_echo_n "checking for perl cccdlflags needed on \"${target_os}\"... " >&6; }
              eval `${PERL} -V:cccdlflags`
diff --git a/mail/cyrus-imapd23/patches/patch-perl_imap_IMAP.xs b/mail/cyrus-imapd23/patches/patch-perl_imap_IMAP.xs
new file mode 100644
index 00000000000..3a62e22c9d3
--- /dev/null
+++ b/mail/cyrus-imapd23/patches/patch-perl_imap_IMAP.xs
@@ -0,0 +1,99 @@
+$NetBSD: patch-perl_imap_IMAP.xs,v 1.1 2011/09/09 11:56:19 obache Exp $
+
+* fix compilation on perl 5.14, from cyrus-imapd-2.4 branch.
+
+--- perl/imap/IMAP.xs.orig	2011-09-08 18:02:23.000000000 +0000
++++ perl/imap/IMAP.xs
+@@ -124,10 +124,10 @@ void imclient_xs_cb(struct imclient *cli
+   SAVETMPS;
+   PUSHMARK(SP);
+   XPUSHs(sv_2mortal(newSVpv("-client", 0)));
+-  rv = newSVsv(&sv_undef);
++  rv = newSVsv(&PL_sv_undef);
+   sv_setref_pv(rv, NULL, (void *) rock->client);
+   XPUSHs(rv);
+-  if (rock->prock != &sv_undef) {
++  if (rock->prock != &PL_sv_undef) {
+     XPUSHs(sv_2mortal(newSVpv("-rock", 0)));
+     XPUSHs(sv_mortalcopy(rock->prock));
+   }
+@@ -392,7 +392,7 @@ CODE:
+ 	ST(0) = sv_newmortal();
+ 
+ 	if(client->authenticated) {
+-	  ST(0) = &sv_no;
++	  ST(0) = &PL_sv_no;
+ 	  return;
+ 	}
+ 
+@@ -414,10 +414,10 @@ CODE:
+ 	rc = imclient_authenticate(client->imclient, mechlist, service, user,
+ 				   minssf, maxssf);
+ 	if (rc)
+-	  ST(0) = &sv_no;
++	  ST(0) = &PL_sv_no;
+ 	else {
+ 	  client->authenticated = 1;
+-	  ST(0) = &sv_yes;
++	  ST(0) = &PL_sv_yes;
+ 	}
+ 
+ int
+@@ -449,12 +449,12 @@ CODE:
+ #ifdef HAVE_SSL
+ 	rc = imclient_starttls(client->imclient, tls_cert_file, tls_key_file, CAfile, CApath);
+ 	if (rc)
+-	  ST(0) = &sv_no;
++	  ST(0) = &PL_sv_no;
+ 	else {
+-	  ST(0) = &sv_yes;
++	  ST(0) = &PL_sv_yes;
+ 	}
+ #else
+-	ST(0) = &sv_no;
++	ST(0) = &PL_sv_no;
+ #endif /* HAVE_SSL */
+ 
+ void
+@@ -514,7 +514,7 @@ PPCODE:
+ 	      (val = hv_fetch(cb, "Rock", 4, 0)))
+ 	    prock = *val;
+ 	  else
+-	    prock = &sv_undef;
++	    prock = &PL_sv_undef;
+ 	  /*
+ 	   * build our internal rock, which is used by our internal
+ 	   * callback handler to invoke the Perl callback
+@@ -525,7 +525,7 @@ PPCODE:
+ 	    rock = (struct xsccb *) safemalloc(sizeof *rock);
+ 	    /* bump refcounts on these so they don't go away */
+ 	    rock->pcb = SvREFCNT_inc(pcb);
+-	    if (!prock) prock = &sv_undef;
++	    if (!prock) prock = &PL_sv_undef;
+ 	    rock->prock = SvREFCNT_inc(prock);
+ 	    rock->client = client;
+ 	    rock->autofree = 0;
+@@ -652,9 +652,9 @@ PPCODE:
+ 	    EXTEND(SP, 1);
+ 	    pcb = av_shift(av);
+ 	    if (strcmp(SvPV(pcb, arg), "OK") == 0)
+-	      PUSHs(&sv_yes);
++	      PUSHs(&PL_sv_yes);
+ 	    else
+-	      PUSHs(&sv_no);
++	      PUSHs(&PL_sv_no);
+ 	    pcb = perl_get_sv("@", TRUE);
+ 	    sv_setsv(pcb, av_shift(av));
+ 	    if (av_len(av) != -1) {
+@@ -687,9 +687,9 @@ PPCODE:
+ 	EXTEND(SP, 2);
+ 	PUSHs(sv_2mortal(newSViv(fd)));
+ 	if (writep)
+-	  PUSHs(&sv_yes);
++	  PUSHs(&PL_sv_yes);
+ 	else
+-	  PUSHs(&sv_no);
++	  PUSHs(&PL_sv_no);
+ 
+ void
+ imclient_fromURL(client,url)