From 72254c253591c7bff26b4bb340e93b880c9f4f2053467579772f5e06a3a64a90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Wed, 23 Jul 2014 13:19:52 +0000
Subject: [PATCH] Add no-return-in-find_variable.patch; (beo#1506).

OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=141
---
 exim.changes                     |  5 +++++
 exim.spec                        |  2 ++
 no-return-in-find_variable.patch | 17 +++++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 no-return-in-find_variable.patch

diff --git a/exim.changes b/exim.changes
index 4c19dde..dfd3416 100644
--- a/exim.changes
+++ b/exim.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jul 23 13:09:41 UTC 2014 - lmuelle@suse.com
+
+- Add no-return-in-find_variable.patch; (beo#1506).
+
 -------------------------------------------------------------------
 Wed Jul 23 10:08:04 UTC 2014 - lmuelle@suse.com
 
diff --git a/exim.spec b/exim.spec
index 6ad5fa9..e09dc93 100644
--- a/exim.spec
+++ b/exim.spec
@@ -77,6 +77,7 @@ Source31:       eximstats.conf
 Source32:       exim.service
 Patch:          exim-tail.patch
 Patch1:         exim-enable_ecdh_openssl.patch
+Patch2:         no-return-in-find_variable.patch
 %if !%{?build_with_mysql:1}0 && !%{?build_with_pgsql:1}0
 
 %package -n eximon
@@ -130,6 +131,7 @@ once, if at all. The rest is done by logrotate / cron.)
 %setup -q -n exim-%{version}
 %patch
 %patch1 -p1
+%patch2 -p1
 # build with fPIE/pie on SUSE 10.0 or newer, or on any other platform
 %if %{?suse_version:%suse_version}%{?!suse_version:99999} > 930
 fPIE="-fPIE"
diff --git a/no-return-in-find_variable.patch b/no-return-in-find_variable.patch
new file mode 100644
index 0000000..e7f96d6
--- /dev/null
+++ b/no-return-in-find_variable.patch
@@ -0,0 +1,17 @@
+Author: Lars Mueller <lmuelle@suse.com>
+Subject: no-return-in-nonvoid-function expand.c:1882
+Reported upstream: http://bugs.exim.org/show_bug.cgi?id=1506
+
+Index: exim-4.83/src/expand.c
+===================================================================
+--- exim-4.83.orig/src/expand.c
++++ exim-4.83/src/expand.c
+@@ -1879,6 +1879,8 @@ switch (vp->type)
+   #endif
+ 
+   }
++
++return NULL;          /* Unknown variable name */
+ }
+ 
+