[arch-commits] Commit in dovecot/trunk (2 files)

[Andreas Radke]

    Date: Thursday, February 13, 2014 @ 17:48:28
  Author: andyrtr
Revision: 205899

upgpkg: dovecot 2.2.11-1

upstream update 2.2.11

Added:
  dovecot/trunk/pop3_Access_sequence_numbers_correctly.diff
Modified:
  dovecot/trunk/PKGBUILD

---------------------------------------------+
 PKGBUILD                                    |   22 ++++++++++-----
 pop3_Access_sequence_numbers_correctly.diff |   36 ++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-13 16:32:59 UTC (rev 205898)
+++ PKGBUILD	2014-02-13 16:48:28 UTC (rev 205899)
@@ -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 @@
 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 @@
 
 check() {
   cd $pkgname-$pkgver
-  make -k check
+  make
 }
 
 package() {

Added: pop3_Access_sequence_numbers_correctly.diff
===================================================================
--- pop3_Access_sequence_numbers_correctly.diff	                        (rev 0)
+++ pop3_Access_sequence_numbers_correctly.diff	2014-02-13 16:48:28 UTC (rev 205899)
@@ -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);
+ }
+
+
+
+
+