From 024ac73da65cfb59c9796c04cc0da50b6a4f9df1e123df8193481a1a25a1191b Mon Sep 17 00:00:00 2001
From: Christian Wittmer <chris@computersalat.de>
Date: Thu, 30 Oct 2014 11:57:06 +0000
Subject: [PATCH] Accepting request 258964 from home:computersalat:devel:mail

update to 4.15.1.20141122, disable SSLv3

OBS-URL: https://build.opensuse.org/request/show/258964
OBS-URL: https://build.opensuse.org/package/show/server:mail/courier-imap?expand=0&rev=70
---
 courier-imap-4.15.1.20141122.tar.bz2     |   3 +++
 courier-imap-4.15.1.20141122.tar.bz2.sig | Bin 0 -> 543 bytes
 courier-imap-4.15.tar.bz2                |   3 ---
 courier-imap-4.15.tar.bz2.sig            | Bin 543 -> 0 bytes
 courier-imap.changes                     |  27 +++++++++++++++++++++++
 courier-imap.spec                        |   3 ++-
 6 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 courier-imap-4.15.1.20141122.tar.bz2
 create mode 100644 courier-imap-4.15.1.20141122.tar.bz2.sig
 delete mode 100644 courier-imap-4.15.tar.bz2
 delete mode 100644 courier-imap-4.15.tar.bz2.sig

diff --git a/courier-imap-4.15.1.20141122.tar.bz2 b/courier-imap-4.15.1.20141122.tar.bz2
new file mode 100644
index 0000000..0dbf457
--- /dev/null
+++ b/courier-imap-4.15.1.20141122.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31d05d48324c340d900007067ed30f3d33077530b34f5064e254c69d7d2d7f63
+size 2999907
diff --git a/courier-imap-4.15.1.20141122.tar.bz2.sig b/courier-imap-4.15.1.20141122.tar.bz2.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..d4aa6d4139b77a47ed2c9e9e688e397c512e64d114a8fff1c0dba63335896a83
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0RjL91p-t^ZXW;&2@q>KV!kJxza>#I5CF1M>N=B-*+g32;Uf7e
zxnC&GpC)>A(7?>Eizq??u95nBt`&|Ey~4d^#vb)Q64~sMoq`XJKW}*4Qh<&}Q8o@C
z`uY-9o4vnZ(I14}1$OymL=K@5>3aYCsgg7@)rqoFnb7Okzs3p&fl^rJZQ^1WbFmWH
z^?47_?fo-!?2e$CkR(tW<pfG{Ws+#-<uc_c+%Vt@Vu2hq+0Kb!%#Z7-&jd!>3K>^q
zL7*cfB}jF=aQaUom}wxN=>sb$A(csP+x!kp)C*IJ7pM`}c~z1QTlwq>8={e~%qpK)
z82{8iJ-qYzd6U%xjEfH>qo*tJvqI22Fiu8aK;8dVw5-@uukq(|LG~H&Q|m=CR^6XC
z6#ncJs<I|?C(VMeZeya6Rqdg%uFZQ+KNHPppokW)gP})fH*+0i7iZZh;>;}OLBg0=
z2H<MhKY@pv2o1oe$Wic<>L84ud8OT355ebSZt^R43=_g?vt9FC6tkqD;a%J8I{7bD
z<ek$#a3iD{b<)hKuTtSPyPt!XnL~K3A9YGeeR(!Z{?~CjUScbIQ-7O<u(rXDtQEMy
zhiILn)a5*NO4J0OnTjaw({FHB(NZs1b*|6?GX2A9+*uB<F_&%Rdfx0K)BV#osali&
huQnG2iL*Kc4B$IiB_7Et>vx8j(gbk5binCmccagS2yXxY

literal 0
HcmV?d00001

diff --git a/courier-imap-4.15.tar.bz2 b/courier-imap-4.15.tar.bz2
deleted file mode 100644
index f0f6a35..0000000
--- a/courier-imap-4.15.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6c34107e7ba9e5396d50b58fb414a495806335cab7135c96ad85a3816785b109
-size 3266353
diff --git a/courier-imap-4.15.tar.bz2.sig b/courier-imap-4.15.tar.bz2.sig
deleted file mode 100644
index 940b1ec49f1e621b2bfcefe5625fafc2f77d3cc6d1b65f16ffa5e05532220906..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3L0vrSY0RjL91p-o+)RzDX2@q>KV!kJxza?va5C3xGow~LmmUe4f^@P%@
zVjIwb*Ay=WFoUEVe?QFCP-O}Y@9@>;k5A;lE9w4T0!n(g>m`|F9wH|glG0NQ@>FR!
z<~z>4kF?c)UBP;6HWFIX;CjB)U^M!xG#X2CMP`pf$`ecP+kmNk7#FJoK|zk%kBo53
zb=%+TrsD=q2#Xc+ywpR{2)Vw+70@TssuEbku7JJz(VxRiS?uE!K$=cP-`bYTuV=WS
z#n8~(BrD9yb0XZT>RMxGAj$!O@pohTl?-jn*GhS})va6mGT6g48aAZL<X%1!?LsX&
zlGl#}5D%WZzCw6nEyuox`u>_t#@YRFGf)>)$?pz0T-r4!?!)wD*XW(@!w@mU#Z@*4
zqmya{?ir7*>*X+0%drLdL8Bbxb95Or_Oohz4dy0@2e(YCj4so@Fzc*ECRA7uULr3i
zIX*mqaEeOTpFDaKMjsQ3G#D5!222;r?_+upIkBVN%m9O02h$#-`uuq^gYfefOBhKh
z-2Mz}tc2q-PcxjP@~jEw`(2r<WU6F#{2vD%GfytHk_Hy=&*fK|!HKs0P4RNthH>=^
zuLz+pt&0eaoh|*tGD(VsM(~ETtf<S8P6fZ4mM!O`$)Z=wbvb^3x!nR=$s2NY-LQCU
hQE@t<(EL`O+Dy(u8!u#LbbThk;u+JOJ@GZt$;X*_3XT8(

diff --git a/courier-imap.changes b/courier-imap.changes
index 4746432..208fe7e 100644
--- a/courier-imap.changes
+++ b/courier-imap.changes
@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Wed Oct 29 22:05:29 UTC 2014 - chris@computersalat.de
+
+- update to 4.15.1.20141122
+  * tcpd/libcouriertls.c: add parsing options for different protocol
+    combination.
+  * Update comments in *ssl config files.
+  * libs/tcpd/libcouriertls.c (tls_create): Set SSL_OP_NOSSLv3 flag,
+    to disable SSL3 support.
+  * mkdhparams: TLS_DHPARAMS environmnt variable overrides default
+    DH parameter file location.
+  * courier-imap.spec.in: generate the default DH parameter file and
+    package it into the rpm, instead of generating one on the first
+    start.
+  * libs/maildir/maildirinfo.c (maildir_info_imapmunge): Fix
+    UTF-8 charset name.
+  * tcpd/libcouriertls.c (tls_create): Initialize temporary ecdh
+    parameters.
+  * imap: try to print a message on stderr if the alarm() call, that
+    detects FAM library breakage, goes off.
+  * mkdhparams: default to 2048 DH params for OpenSSL.
+  * courier-imap.service: bump up startup timeout, initial service start
+    may take several minutes to generate DH parameters for the first
+    time.
+- add new dependency
+  * courier-unicode-devel (libunicode)
+
 -------------------------------------------------------------------
 Thu Sep 25 15:19:51 UTC 2014 - chris@computersalat.de
 
diff --git a/courier-imap.spec b/courier-imap.spec
index 575cc47..d1496cd 100644
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -20,7 +20,7 @@ Name:           courier-imap
 Summary:        An IMAP and POP3 Server for Maildir MTAs
 License:        GPL-3.0+
 Group:          Productivity/Networking/Email/Servers
-Version:        4.15
+Version:        4.15.1.20141122
 Release:        0
 Url:            http://www.courier-mta.org/imap/
 Source0:        %{name}-%{version}.tar.bz2
@@ -46,6 +46,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  audit-libs
 %endif
 BuildRequires:  courier-authlib-devel >= 0.62
+BuildRequires:  courier-unicode-devel
 BuildRequires:  db-devel
 %if 0%{?suse_version} >= 1220
 BuildRequires:  gamin-devel