From 3fecb419994eaebdbeb6d88e97df14817f4d23e2 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 22 Sep 2010 08:37:57 +0000
Subject: main/dovecot: upgrade to 1.2.14 and rebuild against fixed bzip2
 (CVE-2010-0405)

---
 main/dovecot/2281223b9cb9.patch | 21 ---------------------
 main/dovecot/APKBUILD           | 11 ++++-------
 2 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 main/dovecot/2281223b9cb9.patch

diff --git a/main/dovecot/2281223b9cb9.patch b/main/dovecot/2281223b9cb9.patch
deleted file mode 100644
index 4eb9c01f85f..00000000000
--- a/main/dovecot/2281223b9cb9.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# HG changeset patch
-# User Timo Sirainen <tss@iki.fi>
-# Date 1281449944 -3600
-# Node ID 2281223b9cb99357a89971b64680530813d22a81
-# Parent  367ce71922bfc95ec1faad91cd47f1c758cd2d50
-master: Don't crash on config reload when using dict processes.
-
---- a/src/master/dict-process.c	Wed Aug 04 16:54:17 2010 +0100
-+++ b/src/master/dict-process.c	Tue Aug 10 15:19:04 2010 +0100
-@@ -214,7 +214,8 @@
- 	struct dict_listener *listener = process->listener;
- 
- 	dict_process_deinit(process);
--	if (listener->processes == NULL && listener->fd != -1) {
-+	if (listener->processes == NULL && listener->fd != -1 &&
-+	    listener->io == NULL) {
- 		/* last listener died, create new ones */
- 		listener->io = io_add(listener->fd, IO_READ,
- 				      dict_listener_input, listener);
-
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 40aae396a47..e35eda7a79e 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dovecot
-pkgver=1.2.13
-pkgrel=1
+pkgver=1.2.14
+pkgrel=0
 pkgdesc="IMAP and POP3 server"
 url="http://www.dovecot.org/"
 license="LGPL-2.1"
@@ -18,12 +18,10 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-pgsql $pkgname-mysql
 source="http://www.dovecot.org/releases/1.2/$pkgname-$pkgver.tar.gz
 	dovecot.logrotate
 	dovecot.initd
-	2281223b9cb9.patch
 	"
 
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
-	patch -p1 -i "$srcdir"/2281223b9cb9.patch || return 1
 }
 
 build() {
@@ -96,7 +94,6 @@ sqlite() {
 	_mv $(cd "$pkgdir" && find usr -name '*sqlite.so')
 }
 
-md5sums="aaee3b5fd59e01780305553248f686bc  dovecot-1.2.13.tar.gz
+md5sums="1fe41e99c1dea311beee6d4d994490cc  dovecot-1.2.14.tar.gz
 aec5cc797ab2acf72ce3b6bb1030345f  dovecot.logrotate
-c58b474dca20e6e60fa4f1f5b9c726e1  dovecot.initd
-c8581417ce7946668839a9d0fcd93ee8  2281223b9cb9.patch"
+c58b474dca20e6e60fa4f1f5b9c726e1  dovecot.initd"
-- 
cgit v1.2.3