From 54507f71258447e8b8cd58358c8a348e794ac4c82c08f20415902638a2502ecc Mon Sep 17 00:00:00 2001
From: Philipp Thomas <pth@suse.com>
Date: Thu, 10 Oct 2013 17:35:44 +0000
Subject: [PATCH] Accepting request 201986 from
 home:elvigia:branches:server:mail

- two improvements for 13.1 and factory
* postfix-opensslconfig.patch call openSSL_config
  so postfix respects the system's openssl configuration
* postfix-SuSE/postfix.service since a few months there
  is no mail-transfer-agent.target, units must be ordered
  after a list of smtpd implementations instead.

OBS-URL: https://build.opensuse.org/request/show/201986
OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=176
---
 postfix-SuSE.tar.gz         |  4 ++--
 postfix-opensslconfig.patch | 20 ++++++++++++++++++++
 postfix.changes             | 10 ++++++++++
 postfix.spec                |  2 ++
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 postfix-opensslconfig.patch

diff --git a/postfix-SuSE.tar.gz b/postfix-SuSE.tar.gz
index 2d81990..205fdf2 100644
--- a/postfix-SuSE.tar.gz
+++ b/postfix-SuSE.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:40231ea2c1a55a65eada87243f89468efc8b87e8bf1ee0833768bbb76621e51b
-size 25878
+oid sha256:3e97e44af7ac71ddd41f9d436f44b2e615a30fec3611aeb8131061c4dac9bda9
+size 113152
diff --git a/postfix-opensslconfig.patch b/postfix-opensslconfig.patch
new file mode 100644
index 0000000..622c3c4
--- /dev/null
+++ b/postfix-opensslconfig.patch
@@ -0,0 +1,20 @@
+--- postfix-2.9.6.orig/src/tls/tls_server.c
++++ postfix-2.9.6/src/tls/tls_server.c
+@@ -317,6 +317,7 @@ TLS_APPL_STATE *tls_server_init(const TL
+      */
+     SSL_load_error_strings();
+     OpenSSL_add_ssl_algorithms();
++    OPENSSL_config(NULL);
+ 
+     /*
+      * First validate the protocols. If these are invalid, we can't continue.
+--- postfix-2.9.6.orig/src/tls/tls_client.c
++++ postfix-2.9.6/src/tls/tls_client.c
+@@ -323,6 +323,7 @@ TLS_APPL_STATE *tls_client_init(const TL
+      */
+     SSL_load_error_strings();
+     OpenSSL_add_ssl_algorithms();
++    OPENSSL_config(NULL);
+ 
+     /*
+      * Create an application data index for SSL objects, so that we can
diff --git a/postfix.changes b/postfix.changes
index b54b544..a628129 100644
--- a/postfix.changes
+++ b/postfix.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Oct  3 02:47:54 UTC 2013 - crrodriguez@opensuse.org
+
+- two improvements for 13.1 and factory
+* postfix-opensslconfig.patch call openSSL_config 
+  so postfix respects the system's openssl configuration
+* postfix-SuSE/postfix.service since a few months there
+  is no mail-transfer-agent.target, units must be ordered
+  after a list of smtpd implementations instead.
+
 -------------------------------------------------------------------
 Fri Sep 20 04:48:08 UTC 2013 - varkoly@suse.com
 
diff --git a/postfix.spec b/postfix.spec
index 9469cbd..73a6b2e 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -39,6 +39,7 @@ Patch10:        %{name}-main.cf.patch
 Patch11:        %{name}-master.cf.patch
 Patch12:        %{name}-post-install.patch
 Patch20:        %{name}-ssl-release-buffers.patch
+Patch21:        postfix-opensslconfig.patch
 Patch100:       %{name}-vda-v11-2.9.6.patch
 Patch101:       postfix-db6.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -163,6 +164,7 @@ PostgreSQL.
 %patch11
 %patch12
 %patch20
+%patch21 -p1
 %patch100 -p1
 %patch -P 101 -p1
 # ---------------------------------------------------------------------------