summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Wickert <wickert@kolabsys.com>2011-09-13 12:50:38 (GMT)
committerChristoph Wickert <wickert@kolabsys.com>2011-09-13 12:50:38 (GMT)
commit88ef781356ef631bddf79f872bf9147e3096eaef (patch)
treecd93eb13ebfa795b5afaf0016933fea0aa0e954a
parent84a74902afd0ad2c2e7d570ae061340e66b84aa9 (diff)
downloadserver-88ef781356ef631bddf79f872bf9147e3096eaef.tar.gz
imapd: Update to 2.3.17, fixes CVE-2011-3208
-rw-r--r--imapd/Makefile6
-rw-r--r--imapd/imapd.spec23
2 files changed, 15 insertions, 14 deletions
diff --git a/imapd/Makefile b/imapd/Makefile
index a35fa85..7f01663 100644
--- a/imapd/Makefile
+++ b/imapd/Makefile
@@ -4,7 +4,7 @@ PACKAGE = $(shell grep "^Name:" *.spec | sed -e "s/^Name:\s*\([a-z-]*\).*/\1/")
VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*\([0-9.]*\).*/\1/")
RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([a-z0-9._-]*\).*/\1/")
-SOURCE_URL=ftp://ftp.andrew.cmu.edu/pub/cyrus
+SOURCE_URL=http://www.cyrusimap.org/releases/
SOURCE_0=cyrus-imapd-$(VERSION).tar.gz
PATCHES=patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Cyradm_Annotations.patch \
@@ -13,9 +13,7 @@ PATCHES=patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Cyradm_Annot
patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Logging.patch \
patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_timsieved_starttls-sendcaps.patch \
patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_UID.patch \
- patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_cross-domain-acls.patch \
- patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_flush-buffer-after-TLS-initiation.patch \
- patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_workaround-for-missing-user_deny.db.patch
+ patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_cross-domain-acls.patch
EXTRA=$(PATCHES) cyrus.conf fsl.imapd imapd.conf imapd.patch rc.imapd
diff --git a/imapd/imapd.spec b/imapd/imapd.spec
index afbb9df..9d5c1f2 100644
--- a/imapd/imapd.spec
+++ b/imapd/imapd.spec
@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
Class: BASE
Group: Mail
License: BSD
-Version: 2.3.16
-Release: 20110428_kolab1
+Version: 2.3.17
+Release: 20110909_kolab1
# package options
%option with_fsl yes
@@ -76,8 +76,6 @@ Patch4: patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_Loggin
Patch5: patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_UID.patch
Patch6: patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_Folder-names.patch
Patch7: patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_timsieved_starttls-sendcaps.patch
-Patch8: patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_flush-buffer-after-TLS-initiation.patch
-Patch9: patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_workaround-for-missing-user_deny.db.patch
# build information
Prefix: %{l_prefix}
@@ -162,12 +160,6 @@ AutoReqProv: no
%patch -p1 -P 7
%endif
- # https://bugzilla.kolabsys.com/show_bug.cgi?id=81
-%patch -p1 -P 8
-
- # https://bugzilla.kolabsys.com/show_bug.cgi?id=72
-%patch -p1 -P 9
-
# add optional DRAC file support
%if "%{with_drac}" == "yes"
%{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
@@ -436,3 +428,14 @@ AutoReqProv: no
fi
exit 0
+
+%changelog
+* Fri Sep 09 2011 Christoph Wickert <wickert@kolabsys.com> - 2.3.17-20110909_kolab1
+- Update to 2.3.17, fixes CVE-2011-3208
+
+* Fri Apr 29 2011 Christoph Wickert <wickert@kolabsys.com> - 2.3.16-20110428_kolab1
+- Flush buffer after TLS initiation (bugzilla.kolabsys.com #81)
+- Workaround for missing user_deny.db (bugzilla.kolabsys.com #72)
+
+* Wed Apr 13 2011 Christoph Wickert <wickert@kolabsys.com> - 2.3.16-20110328_kolab1
+- Make sure logfiles get rotated (kolab/issue4377)