diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2010-09-22 08:37:57 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-09-22 08:56:45 +0000 |
commit | 3fecb419994eaebdbeb6d88e97df14817f4d23e2 (patch) | |
tree | a5efbddf6e83d3faef2e58d6beed534f12e1e9ec | |
parent | bc07430e29da2559dcfe4b7b1fb736906a1b5e48 (diff) | |
download | alpine_aports-3fecb419994eaebdbeb6d88e97df14817f4d23e2.tar.bz2 alpine_aports-3fecb419994eaebdbeb6d88e97df14817f4d23e2.tar.xz alpine_aports-3fecb419994eaebdbeb6d88e97df14817f4d23e2.zip |
main/dovecot: upgrade to 1.2.14 and rebuild against fixed bzip2 (CVE-2010-0405)
-rw-r--r-- | main/dovecot/2281223b9cb9.patch | 21 | ||||
-rw-r--r-- | main/dovecot/APKBUILD | 11 |
2 files changed, 4 insertions, 28 deletions
diff --git a/main/dovecot/2281223b9cb9.patch b/main/dovecot/2281223b9cb9.patch deleted file mode 100644 index 4eb9c01f85..0000000000 --- a/main/dovecot/2281223b9cb9.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | |||
2 | # HG changeset patch | ||
3 | # User Timo Sirainen <tss@iki.fi> | ||
4 | # Date 1281449944 -3600 | ||
5 | # Node ID 2281223b9cb99357a89971b64680530813d22a81 | ||
6 | # Parent 367ce71922bfc95ec1faad91cd47f1c758cd2d50 | ||
7 | master: Don't crash on config reload when using dict processes. | ||
8 | |||
9 | --- a/src/master/dict-process.c Wed Aug 04 16:54:17 2010 +0100 | ||
10 | +++ b/src/master/dict-process.c Tue Aug 10 15:19:04 2010 +0100 | ||
11 | @@ -214,7 +214,8 @@ | ||
12 | struct dict_listener *listener = process->listener; | ||
13 | |||
14 | dict_process_deinit(process); | ||
15 | - if (listener->processes == NULL && listener->fd != -1) { | ||
16 | + if (listener->processes == NULL && listener->fd != -1 && | ||
17 | + listener->io == NULL) { | ||
18 | /* last listener died, create new ones */ | ||
19 | listener->io = io_add(listener->fd, IO_READ, | ||
20 | dict_listener_input, listener); | ||
21 | |||
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD index 40aae396a4..e35eda7a79 100644 --- a/main/dovecot/APKBUILD +++ b/main/dovecot/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Contributor: Michael Mason <ms13sp@gmail.com> | 1 | # Contributor: Michael Mason <ms13sp@gmail.com> |
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
3 | pkgname=dovecot | 3 | pkgname=dovecot |
4 | pkgver=1.2.13 | 4 | pkgver=1.2.14 |
5 | pkgrel=1 | 5 | pkgrel=0 |
6 | pkgdesc="IMAP and POP3 server" | 6 | pkgdesc="IMAP and POP3 server" |
7 | url="http://www.dovecot.org/" | 7 | url="http://www.dovecot.org/" |
8 | license="LGPL-2.1" | 8 | license="LGPL-2.1" |
@@ -18,12 +18,10 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-pgsql $pkgname-mysql | |||
18 | source="http://www.dovecot.org/releases/1.2/$pkgname-$pkgver.tar.gz | 18 | source="http://www.dovecot.org/releases/1.2/$pkgname-$pkgver.tar.gz |
19 | dovecot.logrotate | 19 | dovecot.logrotate |
20 | dovecot.initd | 20 | dovecot.initd |
21 | 2281223b9cb9.patch | ||
22 | " | 21 | " |
23 | 22 | ||
24 | prepare() { | 23 | prepare() { |
25 | cd "$srcdir"/$pkgname-$pkgver | 24 | cd "$srcdir"/$pkgname-$pkgver |
26 | patch -p1 -i "$srcdir"/2281223b9cb9.patch || return 1 | ||
27 | } | 25 | } |
28 | 26 | ||
29 | build() { | 27 | build() { |
@@ -96,7 +94,6 @@ sqlite() { | |||
96 | _mv $(cd "$pkgdir" && find usr -name '*sqlite.so') | 94 | _mv $(cd "$pkgdir" && find usr -name '*sqlite.so') |
97 | } | 95 | } |
98 | 96 | ||
99 | md5sums="aaee3b5fd59e01780305553248f686bc dovecot-1.2.13.tar.gz | 97 | md5sums="1fe41e99c1dea311beee6d4d994490cc dovecot-1.2.14.tar.gz |
100 | aec5cc797ab2acf72ce3b6bb1030345f dovecot.logrotate | 98 | aec5cc797ab2acf72ce3b6bb1030345f dovecot.logrotate |
101 | c58b474dca20e6e60fa4f1f5b9c726e1 dovecot.initd | 99 | c58b474dca20e6e60fa4f1f5b9c726e1 dovecot.initd" |
102 | c8581417ce7946668839a9d0fcd93ee8 2281223b9cb9.patch" | ||