[cyrus-imapd/f14] updated to 2.3.17

[Michal Hlavinka]

commit 45c3a041a0367e073e609abb8465fb26f7667c36
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Tue Sep 20 09:35:37 2011 +0200

    updated to 2.3.17

 .gitignore                            |    1 +
 cyrus-imapd-2.3.12p2-current-db.patch |   18 +++++++++---------
 cyrus-imapd.spec                      |   12 ++++++------
 sources                               |    2 +-
 4 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9a827ef..584ba26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 cyrus-imapd-2.3.16.tar.gz
 cyrus_sharedbackup-0.1.tar.gz
+/cyrus-imapd-2.3.17.tar.gz
diff --git a/cyrus-imapd-2.3.12p2-current-db.patch b/cyrus-imapd-2.3.12p2-current-db.patch
index 320c403..2670fb4 100644
--- a/cyrus-imapd-2.3.12p2-current-db.patch
+++ b/cyrus-imapd-2.3.12p2-current-db.patch
@@ -1,11 +1,11 @@
---- cyrus-imapd-2.3.12p2/cmulocal/berkdb.m4.orig	2008-09-12 07:46:46.000000000 +0200
-+++ cyrus-imapd-2.3.12p2/cmulocal/berkdb.m4	2008-09-12 07:47:10.000000000 +0200
-@@ -213,7 +213,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
- 	fi
+diff -up cyrus-imapd-2.3.17/cmulocal/berkdb.m4.db4.7 cyrus-imapd-2.3.17/cmulocal/berkdb.m4
+--- cyrus-imapd-2.3.17/cmulocal/berkdb.m4.db4.7	2011-09-08 20:02:23.000000000 +0200
++++ cyrus-imapd-2.3.17/cmulocal/berkdb.m4	2011-09-19 14:20:08.306631064 +0200
+@@ -214,6 +214,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
  
  	saved_LIBS=$LIBS
--        for dbname in ${with_bdb} db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in ${with_bdb} db db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3
-           do
- 	    LIBS="$saved_LIBS -l$dbname"
- 	    AC_TRY_LINK([#include <stdio.h>
+ 	    for dbname in ${with_bdb} \
++	        db db4 \
+ 	        db-4.8 db4.8 db48 \
+ 	        db-4.7 db4.7 db47 \
+ 	        db-4.6 db4.6 db46 \
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 0504638..10d5ee6 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
-Version: 2.3.16
-Release: 8%{?dist}
+Version: 2.3.17
+Release: 1%{?dist}
 
 %define ssl_pem_file %{_sysconfdir}/pki/%{name}/%{name}.pem
 
@@ -54,9 +54,6 @@ Patch7: cyrus-imapd-2.3.16-nodenny.patch
 # from upstream, rhbz#576652, for cyrus-imapd < 2.4
 Patch8: cyrus-imapd-2.3.15-qos.patch
 
-# from upstream, starttls command injection, cyrus-imapd < 2.3.17, rhbz#705294
-Patch9: cyrus-imapd-2.3-starttls.patch
-
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: autoconf
@@ -67,6 +64,7 @@ BuildRequires: openldap-devel
 BuildRequires: krb5-devel
 BuildRequires: net-snmp-devel
 BuildRequires: transfig
+BuildRequires: perl-Digest-SHA1
 
 Requires(post): e2fsprogs, chkconfig, initscripts, perl, grep, coreutils, findutils
 Requires(preun): chkconfig, initscripts, coreutils
@@ -136,7 +134,6 @@ one running the server.
 %patch6 -p1 -b .db4.7
 %patch7 -p1 -b .nodenny
 %patch8 -p1 -b .qos
-%patch9 -p1 -b .starttls
 
 install -m 644 %{SOURCE4} %{SOURCE5} %{SOURCE11} doc/
 
@@ -488,6 +485,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Mon Sep 19 2011 Michal Hlavinka <mhlavink at redhat.com> - 2.3.17-1
+- updated to 2.3.17
+
 * Tue May 17 2011 Michal Hlavinka <mhlavink at redhat.com> - 2.3.16-8
 - fix CVE-2011-1926: STARTTLS plaintext command injection vulnerability
 
diff --git a/sources b/sources
index e34d8d7..a1c44c7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6a37feb1985974eee8a4a4b2932dd54c  cyrus-imapd-2.3.16.tar.gz
+e07e30450ba0eb351f390971e181777f  cyrus-imapd-2.3.17.tar.gz
 8f7a26b0556369827bb5c8084a3e3ea1  cyrus_sharedbackup-0.1.tar.gz