diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-14 03:37:58 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-14 03:37:58 +0000 |
| commit | 86a5624291a8a72d9a0a2c51fcc64bf6e221524b (patch) | |
| tree | e585f1910631fdca9c14bc3127c269c8005c838e /extra/dovecot | |
| parent | b6ad8075baf858359209aa7f1af82a143dcc0c80 (diff) | |
Fri Feb 14 03:35:43 UTC 2014
Diffstat (limited to 'extra/dovecot')
| -rw-r--r-- | extra/dovecot/PKGBUILD | 24 | ||||
| -rw-r--r-- | extra/dovecot/pop3_Access_sequence_numbers_correctly.diff | 36 |
2 files changed, 52 insertions, 8 deletions
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 6dbc6a917..fac1cc4b8 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 202249 2013-12-20 22:01:34Z andyrtr $ +# $Id: PKGBUILD 205903 2014-02-13 16:52:18Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> @@ -8,7 +8,7 @@ # --->>> remember to rebuild/bump pigeonhole in one step <<<--- pkgname=dovecot -pkgver=2.2.10 +pkgver=2.2.11 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64') @@ -23,17 +23,25 @@ optdepends=('libldap: ldap plugin' provides=('imap-server' 'pop3-server') install=$pkgname.install source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig} - dovecot.tmpfilesd) -md5sums=('037e9c9e07d9dbff54dcff09f280fc8c' + dovecot.tmpfilesd + pop3_Access_sequence_numbers_correctly.diff) +md5sums=('d53d207727df99e4362a3787223c6fa3' 'SKIP' - '342a28251d40f983c98c0d1f1bf3d07d') + '342a28251d40f983c98c0d1f1bf3d07d' + 'c8096d3966651222accd7f6bc678d08d') -build() { +prepare() { cd $pkgname-$pkgver - + # fix path in helper script sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh + # post release segfault fix + patch -Np1 -i ${srcdir}/pop3_Access_sequence_numbers_correctly.diff +} + +build() { + cd $pkgname-$pkgver # configure with openssl, mysql, and postgresql support ./configure --prefix=/usr --sysconfdir=/etc \ --sbindir=/usr/bin \ @@ -61,7 +69,7 @@ build() { check() { cd $pkgname-$pkgver - make -k check + make } package() { diff --git a/extra/dovecot/pop3_Access_sequence_numbers_correctly.diff b/extra/dovecot/pop3_Access_sequence_numbers_correctly.diff new file mode 100644 index 000000000..d415a0eff --- /dev/null +++ b/extra/dovecot/pop3_Access_sequence_numbers_correctly.diff @@ -0,0 +1,36 @@ + +diff -r 59decc957b39 -r d20059f7d3a1 src/pop3/pop3-commands.c +--- a/src/pop3/pop3-commands.c Fri Feb 07 15:03:33 2014 -0500 ++++ b/src/pop3/pop3-commands.c Thu Feb 13 05:33:13 2014 +0200 +@@ -253,7 +253,7 @@ + for (msgnum = 0; msgnum < client->messages_count; msgnum++) { + bit = 1 << (msgnum % CHAR_BIT); + if ((client->deleted_bitmask[msgnum / CHAR_BIT] & bit) != 0) +- seq_range_array_add(&deleted_msgs, client->msgnum_to_seq_map[msgnum]); ++ seq_range_array_add(&deleted_msgs, msgnum_to_seq(client, msgnum)); + } + } + t_array_init(&seen_msgs, 8); +@@ -261,7 +261,7 @@ + for (msgnum = 0; msgnum < client->messages_count; msgnum++) { + bit = 1 << (msgnum % CHAR_BIT); + if ((client->seen_bitmask[msgnum / CHAR_BIT] & bit) != 0) +- seq_range_array_add(&seen_msgs, client->msgnum_to_seq_map[msgnum]); ++ seq_range_array_add(&seen_msgs, msgnum_to_seq(client, msgnum)); + } + } + +@@ -826,7 +826,7 @@ + client->messages_count+1); + for (msgnum = 0; msgnum < client->messages_count; msgnum++) { + client->message_uidls[msgnum] = +- seq_uidls[client->msgnum_to_seq_map[msgnum]]; ++ seq_uidls[msgnum_to_seq(client, msgnum)]; + } + i_free(seq_uidls); + } + + + + + |