From af31b139f71d04c53ce6783af244a64e1438c39d73336209fa6ffead525c760f Mon Sep 17 00:00:00 2001
From: Christian Wittmer <chris@computersalat.de>
Date: Wed, 16 Jan 2013 23:35:07 +0000
Subject: [PATCH] Accepting request 148651 from home:computersalat:devel:mail

update to 4.12.0

OBS-URL: https://build.opensuse.org/request/show/148651
OBS-URL: https://build.opensuse.org/package/show/server:mail/courier-imap?expand=0&rev=60
---
 courier-imap-4.11.0.tar.bz2                        |   3 ---
 courier-imap-4.12.0.tar.bz2                        |   3 +++
 courier-imap-4.12.0.tar.bz2.sig                    | Bin 0 -> 72 bytes
 ...1.0-sbindir.patch => courier-imap-sbindir.patch |   0
 ...mit_conf.diff => courier-imap-ulimit_conf.patch |   6 ++++--
 courier-imap.changes                               |  10 ++++++++++
 courier-imap.spec                                  |  13 +++++++------
 7 files changed, 24 insertions(+), 11 deletions(-)
 delete mode 100644 courier-imap-4.11.0.tar.bz2
 create mode 100644 courier-imap-4.12.0.tar.bz2
 create mode 100644 courier-imap-4.12.0.tar.bz2.sig
 rename courier-imap-4.11.0-sbindir.patch => courier-imap-sbindir.patch (100%)
 rename courier-imap-ulimit_conf.diff => courier-imap-ulimit_conf.patch (87%)

diff --git a/courier-imap-4.11.0.tar.bz2 b/courier-imap-4.11.0.tar.bz2
deleted file mode 100644
index f2a456e..0000000
--- a/courier-imap-4.11.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0078a71a5419b454a9aaee17d5d49b6b3b115a34fdafdc6d8b966d6355ae7893
-size 3190857
diff --git a/courier-imap-4.12.0.tar.bz2 b/courier-imap-4.12.0.tar.bz2
new file mode 100644
index 0000000..e7127d1
--- /dev/null
+++ b/courier-imap-4.12.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:39cde2bbdf06ba4217e3aaa9518114b4e4f1eb86ed961634593f2c778711f480
+size 3192751
diff --git a/courier-imap-4.12.0.tar.bz2.sig b/courier-imap-4.12.0.tar.bz2.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..ed8b31d40e2b756aad44dc418c4291b7fa3bfd193eff27d2af114663c3f3e6a5
GIT binary patch
literal 72
zcmV-O0Jr~$Mg#y60ssaD0#NfzD*y@!5Xahg8G+?c;*IeDofw>hIHfNgmFmeyDJ7(p
e7;n6c?*N}x%FvjnvDw((#}=2^IIE<uV}UxmQy-Q9

literal 0
HcmV?d00001

diff --git a/courier-imap-4.11.0-sbindir.patch b/courier-imap-sbindir.patch
similarity index 100%
rename from courier-imap-4.11.0-sbindir.patch
rename to courier-imap-sbindir.patch
diff --git a/courier-imap-ulimit_conf.diff b/courier-imap-ulimit_conf.patch
similarity index 87%
rename from courier-imap-ulimit_conf.diff
rename to courier-imap-ulimit_conf.patch
index 7d6df6f..20a44b3 100644
--- a/courier-imap-ulimit_conf.diff
+++ b/courier-imap-ulimit_conf.patch
@@ -1,6 +1,8 @@
---- imap/pop3d.dist.in
+Index: imap/pop3d.dist.in
+===================================================================
+--- imap/pop3d.dist.in.orig
 +++ imap/pop3d.dist.in
-@@ -28,6 +28,25 @@
+@@ -28,6 +28,25 @@ MAXDAEMONS=40
  
  MAXPERIP=4
  
diff --git a/courier-imap.changes b/courier-imap.changes
index f8317af..91636fa 100644
--- a/courier-imap.changes
+++ b/courier-imap.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Jan 15 18:05:58 UTC 2013 - chris@computersalat.de
+
+- update to 4.12.0
+  * tcpd/libcouriergnutls.c (get_server_cert): Fix size of malloced
+    buffer.
+  * configure.in: Fix typo in configure check for setvbuf().
+- rebase patches
+  * sbindir (remove version), ulimit_conf (rename diff -> patch)
+
 -------------------------------------------------------------------
 Fri Sep 21 09:23:57 UTC 2012 - chris@computersalat.de
 
diff --git a/courier-imap.spec b/courier-imap.spec
index 2810c11..a08e8e5 100644
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package courier-imap
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,20 +20,21 @@ Name:           courier-imap
 Summary:        An IMAP and POP3 Server for Maildir MTAs
 License:        GPL-3.0
 Group:          Productivity/Networking/Email/Servers
-Version:        4.11.0
+Version:        4.12.0
 Release:        0
 Url:            http://www.courier-mta.org/imap/
 Source0:        %{name}-%{version}.tar.bz2
-Source1:        pop3.pamd
-Source2:        imap.pamd
+Source1:        %{name}-%{version}.tar.bz2.sig
+Source2:        pop3.pamd
+Source3:        imap.pamd
 Source4:        courier-imap.init
 Source5:        courier-imap-ssl.init
 Source6:        courier-pop.init
 Source7:        courier-pop-ssl.init
 Source8:        %{name}.firewall
 Source9:        %{name}-ssl.firewall
-Patch0:         %{name}-4.11.0-sbindir.patch
-Patch2:         %{name}-ulimit_conf.diff
+Patch0:         %{name}-sbindir.patch
+Patch2:         %{name}-ulimit_conf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} > 910
 BuildRequires:  audit-libs