From c8da1b8e2ee6405e3e8bddece8abe1d2178d3a52 Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@fedoraproject.org>
Date: Mon, 17 May 2010 15:59:00 +0000
Subject: [PATCH] - pigeonhole and dovecot updated to snapshot 20100515 - fix
 crash for THREAD command

---
 .cvsignore                   |   4 ++--
 dovecot-2.0-betahotfix.patch |  19 -------------------
 dovecot.conf.5.gz            | Bin 398 -> 409 bytes
 dovecot.spec                 |  18 ++++++++++++------
 sources                      |   4 ++--
 5 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 00cec88..e58ba85 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-dovecot-20100505.tar.gz
-pigeonhole-snap861ffb523cb9.tar.bzip2
+dovecot-20100512.tar.gz
+pigeonhole-snapd84aaca546b9.tar.bz2
diff --git a/dovecot-2.0-betahotfix.patch b/dovecot-2.0-betahotfix.patch
index a358a4b..e69de29 100644
--- a/dovecot-2.0-betahotfix.patch
+++ b/dovecot-2.0-betahotfix.patch
@@ -1,19 +0,0 @@
-diff -up dovecot-2.0.beta4/src/lib-sql/Makefile.am.betahotfix dovecot-2.0.beta4/src/lib-sql/Makefile.am
---- dovecot-2.0.beta4/src/lib-sql/Makefile.am.betahotfix	2010-05-05 04:00:03.000000000 +0200
-+++ dovecot-2.0.beta4/src/lib-sql/Makefile.am	2010-05-05 11:34:17.286805721 +0200
-@@ -38,13 +38,13 @@ if ! SQL_PLUGINS
- driver_sources = \
- 	driver-mysql.c \
- 	driver-pgsql.c \
--	driver-sqlpool.c \
- 	driver-sqlite.c
- endif
- 
- libsql_la_SOURCES = \
- 	$(dist_sources) \
--	$(driver_sources)
-+	$(driver_sources) \
-+	driver-sqlpool.c
- nodist_libsql_la_SOURCES = sql-drivers-register.c
- 
- if SQL_PLUGINS
diff --git a/dovecot.conf.5.gz b/dovecot.conf.5.gz
index d379c469ae3f68731ea400148c62bbdccc4d3317..986d3753eb959338206d435ba49e003ba7a529d3 100644
GIT binary patch
literal 409
zcmV;K0cQRmiwFp5wc<+v17vS@Wn*u2E@N+QW-c`VeNx>|!Y~kj-(PXrlNjj`qtV2e
z@G$}jGQy@$ymVVD4O`o^9r)*a+XzBLlD*vZ_jPw8$rQ%XXE=%yGKv-xc!Ykh_Y&aO
ze*!;OJC-TugFg`kgNZUFbrz`1VWi}aNhg%FzDMFIEC%nPx8}nGhh$3fHDAKI3(1B-
zU5c;D(3%3gmgCAmgLWWFsvB9Y^aEICcFcH<?BruUhvguddSnOzb6Id|&|=16JX+0`
z$t+rUwbv=4wGtTmzX<M^adY3f7=^$e*$ZOWa#TnQIkTA&x_NO5Xi)&&QBlwoQL5=%
z0<kKw;<dj$wt*UU;HNA{s#PE)!gwJhgT2@a%#l?k?!L9w1<eqNprEoQup3ms9Ub>{
z8`PwLfal@;Af?&1(x5A&m1PzxS*l!cff6{VtraoT`KVMvTJNfoSA4p!2mV{YzG<lo
z)@^rmb}*7NPOHMThx6kwguy(H@E01cj#qf@+@02Xk9TQ1S4X^xxESIG{9Vz5{{jF2
DC*;G8

literal 398
zcmV;90df8xiwFpTWc^A217vS@Wn*u2E@N+QW-c`VeNtaf!Y~kj->10j35|4!(P&~!
zV2nV5jIikwFWuHk!`3!!hhN{@Mi3&B?B%Y%e|I;M&R`OMMq!+iFkVjK5r%`oOMu_-
z3H(CsS+1N9{#29<rpi>*S)j6jP{}=$PAF-8k0di#j@~10!^Z~>$(7_AzJg63(k+9g
z6koNW4Fz~3$CZH=?Lbsix3XI42e8cSnekfL>BnLLt5G`h$QT0V^5E2<!%U(iT+dhO
zJYIT@*D0d25*Yfw2=15Bd%n3Cg}@)#3u4%ER7eX2v$+wveQ^qCSpwZtQPK=is_k0>
ziK?*TjlVs%ff{z;XRJV~RUjn7cqt@<Z?O}YBd;smeP^vpnj;cHL2XT7x2S+SI_~K<
zXh;D8&%^scM)O^*LDxnr%PiEgQib3GC2&yNC}O7bQK^Ki*;OsC`1D^7{I|0Uk%Dnr
sm#({%pF|Oi7D<f%%y@mW_Pf(sfA{VWovSllMO+N=1B58W!teqB0GH^#_W%F@

diff --git a/dovecot.spec b/dovecot.spec
index a5f0121..0cd0225 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -1,11 +1,11 @@
-%global betasuffix .beta4
-%global snapsuffix 20100505
+%global betasuffix .beta5
+%global snapsuffix 20100515
 
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 2.0
-Release: 0.8%{?betasuffix}.%{?snapsuffix}%{?dist}
+Release: 0.10%{?betasuffix}.%{?snapsuffix}%{?dist}
 #dovecot itself is MIT, a few sources are PD, (manage)sieve is LGPLv2, perfect_maildir.pl is GPLv2+
 License: MIT and LGPLv2 and GPLv2+
 Group: System Environment/Daemons
@@ -24,7 +24,7 @@ Source1: dovecot.init
 Source2: dovecot.pam
 #Source8: http://hg.rename-it.nl/dovecot-2.0-pigeonhole/archive/tip.tar.bz2
 #we use this ^^^ repository snapshost just renamed to contain last commit in name
-%global phsnap 861ffb523cb9
+%global phsnap d84aaca546b9
 Source8: pigeonhole-snap%{phsnap}.tar.bzip2
 Source9: dovecot.sysconfig
 
@@ -147,7 +147,7 @@ automake --add-missing --copy --force-missing
 
 sed -i 's|/etc/ssl|/etc/pki/dovecot|' doc/mkcert.sh doc/example-config/conf.d/10-ssl.conf
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
 #pigeonhole
 pushd dovecot-2-0-pigeonhole-%{phsnap}
@@ -236,6 +236,8 @@ rm -rf $RPM_BUILD_ROOT
 getent group dovecot >/dev/null || groupadd -r dovecot
 getent passwd dovecot >/dev/null || \
 useradd -r -g dovecot -d /usr/libexec/dovecot -s /sbin/nologin -c "Dovecot IMAP server" dovecot
+getent passwd dovenull >/dev/null || \
+useradd -r -g dovecot -d /usr/libexec/dovecot -s /sbin/nologin -c "Dovecot login process" dovenul
 exit 0
 
 %post
@@ -326,7 +328,7 @@ make check
 %{_libexecdir}/dovecot
 
 %attr(0755,root,dovecot) %dir /var/run/dovecot
-%attr(0750,root,dovecot) %dir /var/run/dovecot/login
+%attr(0750,root,dovenull) %dir /var/run/dovecot/login
 %attr(0750,dovecot,dovecot) %dir /var/lib/dovecot
 
 %{_mandir}/man1/doveadm.1.gz
@@ -370,6 +372,10 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Mon May 15 2010 Michal Hlavinka <mhlavink@redhat.com> - 1:2.0-0.9.beta5.20100515
+- pigeonhole and dovecot updated to snapshot 20100515
+- fix crash for THREAD command
+
 * Wed May 05 2010 Michal Hlavinka <mhlavink@redhat.com> - 1:2.0-0.8.beta4.20100505
 - pigeonhole and dovecot updated to snapshot 20100505
 - mdbox: Avoid rebuilding storage if another process already did it
diff --git a/sources b/sources
index 23ef994..f9ccec7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-86b3c6c3ea29e0d5db6c722fb4276a15  dovecot-20100505.tar.gz
-58638d02fcf44a3b2005e41dcc79719a  pigeonhole-snap861ffb523cb9.tar.bzip2
+25f47548b45fe74e6850fc67b1b5d8dc  dovecot-20100512.tar.gz
+a02d64af5e5177a41bc4f7671ffe0262  pigeonhole-snapd84aaca546b9.tar.bz2