From 0ec4735cff5040b1169b916c18f9b91a53c4b3d4cab36cce479ae19d2b3cc5e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Wed, 23 Jul 2014 18:20:48 +0000
Subject: [PATCH] Merge feedback from upstream and modify the package change
 log to:

Silence static checkers; (beo#1506).

OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=142
---
 exim.changes                          |  2 +-
 exim.spec                             |  2 +-
 no-return-in-find_variable.patch      | 17 -----------------
 silence-static-checkers_beo1506.patch | 21 +++++++++++++++++++++
 4 files changed, 23 insertions(+), 19 deletions(-)
 delete mode 100644 no-return-in-find_variable.patch
 create mode 100644 silence-static-checkers_beo1506.patch

diff --git a/exim.changes b/exim.changes
index dfd3416..d2a1eb1 100644
--- a/exim.changes
+++ b/exim.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Jul 23 13:09:41 UTC 2014 - lmuelle@suse.com
 
-- Add no-return-in-find_variable.patch; (beo#1506).
+- Silence static checkers; (beo#1506).
 
 -------------------------------------------------------------------
 Wed Jul 23 10:08:04 UTC 2014 - lmuelle@suse.com
diff --git a/exim.spec b/exim.spec
index e09dc93..0641a08 100644
--- a/exim.spec
+++ b/exim.spec
@@ -77,7 +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
+Patch2:         silence-static-checkers_beo1506.patch
 %if !%{?build_with_mysql:1}0 && !%{?build_with_pgsql:1}0
 
 %package -n eximon
diff --git a/no-return-in-find_variable.patch b/no-return-in-find_variable.patch
deleted file mode 100644
index e7f96d6..0000000
--- a/no-return-in-find_variable.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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 */
- }
- 
- 
diff --git a/silence-static-checkers_beo1506.patch b/silence-static-checkers_beo1506.patch
new file mode 100644
index 0000000..dd64167
--- /dev/null
+++ b/silence-static-checkers_beo1506.patch
@@ -0,0 +1,21 @@
+Author: Lars Mueller <lmuelle@suse.com>
+Date:   Wed Jul 23 07:22:52 2014 -0700
+
+    Bug 1506: Silence static checkers.
+····
+    Re-adds a return NULL which was removed because it was redundant. Static
+      checkers don't parse the logic, so adding it back to make them happy.
+
+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. Silences static checkers. */
+ }
+ 
+