From 090338e6dccb2d27e2c305fcb86a77da9b381e5775b5a805b9d7c317d5f49dd5 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 5 Feb 2007 14:37:22 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/courier-imap?expand=0&rev=3

---
 courier-imap-4.1.1.diff | 22 ++++++++++++++++++++++
 courier-imap.changes    |  6 ++++++
 courier-imap.spec       |  7 ++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 courier-imap-4.1.1.diff

diff --git a/courier-imap-4.1.1.diff b/courier-imap-4.1.1.diff
new file mode 100644
index 0000000..4450bec
--- /dev/null
+++ b/courier-imap-4.1.1.diff
@@ -0,0 +1,22 @@
+--- imap/imapd-ssl.dist.in
++++ imap/imapd-ssl.dist.in
+@@ -153,7 +153,7 @@
+ # servers, and is optional for SSL/TLS clients.  TLS_CERTFILE is usually
+ # treated as confidential, and must not be world-readable.
+ #
+-TLS_CERTFILE=@datadir@/imapd.pem
++TLS_CERTFILE=@sysconfig@/imapd.pem
+ 
+ ##NAME: TLS_TRUSTCERTS:0
+ #
+--- imap/pop3d-ssl.dist.in
++++ imap/pop3d-ssl.dist.in
+@@ -140,7 +140,7 @@
+ # servers, and is optional for SSL/TLS clients.  TLS_CERTFILE is usually
+ # treated as confidential, and must not be world-readable.
+ #
+-TLS_CERTFILE=@datadir@/pop3d.pem
++TLS_CERTFILE=@sysconfig@/pop3d.pem
+ 
+ ##NAME: TLS_TRUSTCERTS:0
+ #
diff --git a/courier-imap.changes b/courier-imap.changes
index bd952ea..9b7bc55 100644
--- a/courier-imap.changes
+++ b/courier-imap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb  5 12:34:55 CET 2007 - mskibbe@suse.de
+
+- Courier generates certificates in /usr/share/courier-imap
+  (#241937)
+
 -------------------------------------------------------------------
 Mon Jan 22 08:53:39 CET 2007 - mskibbe@suse.de
 
diff --git a/courier-imap.spec b/courier-imap.spec
index 2faa7f4..c356e26 100644
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -15,7 +15,7 @@ BuildRequires:  courier-authlib-devel fam-devel gcc-c++ libstdc++-devel openssl-
 URL:            http://www.courier-mta.org/imap/
 Summary:        An IMAP and POP3 Server for Maildir MTAs
 Version:        4.1.1
-Release:        29
+Release:        30
 License:        GNU General Public License (GPL)
 Conflicts:      imap qpopper
 Group:          Productivity/Networking/Email/Servers
@@ -28,6 +28,7 @@ Source5:        courier-imap-ssl.init
 Source6:        courier-pop.init
 Source7:        courier-pop-ssl.init
 Patch:          %{name}-4.0.6.diff
+Patch1:         %{name}-4.1.1.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Prefix:         /usr
 %define _sysconfdir /etc/courier
@@ -47,6 +48,7 @@ delivers to maildir format mailboxes.
 %prep
 %setup -q
 %patch
+%patch1
 
 %build
 %{suse_update_config}
@@ -175,6 +177,9 @@ exit 0
 rm -rf $RPM_BUILD_ROOT
 
 %changelog -n courier-imap
+* Mon Feb 05 2007 - mskibbe@suse.de
+- Courier generates certificates in /usr/share/courier-imap
+  (#241937)
 * Mon Jan 22 2007 - mskibbe@suse.de
 - checkproc uses -p parameter not as specified in man page
   (#230806)