From af87d2873bcaaf5a93ccf25da80aa670f89fbe96 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Tue, 13 May 2014 04:08:22 +0000 Subject: Tue May 13 04:03:53 UTC 2014 --- extra/dovecot/PKGBUILD | 15 +++------ .../pop3_Access_sequence_numbers_correctly.diff | 36 ---------------------- 2 files changed, 5 insertions(+), 46 deletions(-) delete mode 100644 extra/dovecot/pop3_Access_sequence_numbers_correctly.diff (limited to 'extra/dovecot') diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index fac1cc4b8..27546531c 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 205903 2014-02-13 16:52:18Z andyrtr $ +# $Id: PKGBUILD 212317 2014-05-12 18:20:13Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Paul Mattal # Contributor: Federico Quagliata (quaqo) @@ -8,7 +8,7 @@ # --->>> remember to rebuild/bump pigeonhole in one step <<<--- pkgname=dovecot -pkgver=2.2.11 +pkgver=2.2.13 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64') @@ -23,21 +23,16 @@ 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 - pop3_Access_sequence_numbers_correctly.diff) -md5sums=('d53d207727df99e4362a3787223c6fa3' + dovecot.tmpfilesd) +md5sums=('a3eb1c0b1822c4f2b0fe9247776baa71' 'SKIP' - '342a28251d40f983c98c0d1f1bf3d07d' - 'c8096d3966651222accd7f6bc678d08d') + '342a28251d40f983c98c0d1f1bf3d07d') 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() { diff --git a/extra/dovecot/pop3_Access_sequence_numbers_correctly.diff b/extra/dovecot/pop3_Access_sequence_numbers_correctly.diff deleted file mode 100644 index d415a0eff..000000000 --- a/extra/dovecot/pop3_Access_sequence_numbers_correctly.diff +++ /dev/null @@ -1,36 +0,0 @@ - -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); - } - - - - - -- cgit v1.2.3-54-g00ecf