From d66b1e9a61a9823ec7ad3cb3acb07e989d75cca4ebe6f5e6c731a5b81c53c546 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Fri, 4 Feb 2011 22:21:53 +0000
Subject: [PATCH] - Workround for PCRE version dependancy in version reporting;
 (beo#1073).

OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=99
---
 aa097c4c00f62487128d74f65c521f9e877b184f.diff | 45 +++++++++++++++++++
 exim.changes                                  |  5 +++
 exim.spec                                     |  2 +
 3 files changed, 52 insertions(+)
 create mode 100644 aa097c4c00f62487128d74f65c521f9e877b184f.diff

diff --git a/aa097c4c00f62487128d74f65c521f9e877b184f.diff b/aa097c4c00f62487128d74f65c521f9e877b184f.diff
new file mode 100644
index 0000000..13634b0
--- /dev/null
+++ b/aa097c4c00f62487128d74f65c521f9e877b184f.diff
@@ -0,0 +1,45 @@
+commit aa097c4c00f62487128d74f65c521f9e877b184f
+Author: Nigel Metheringham <nigel@exim.org>
+Date:   Wed Jan 26 11:04:32 2011 +0000
+
+    Workround compile error with old PCRE versions
+    
+    Fixes bug #1073
+
+Index: exim-4.74/doc/ChangeLog
+===================================================================
+--- exim-4.74.orig/doc/ChangeLog
++++ exim-4.74/doc/ChangeLog
+@@ -3,6 +3,13 @@ $Cambridge: exim/doc/doc-txt/ChangeLog,v
+ Change log file for Exim from version 4.21
+ -------------------------------------------
+ 
++Exim version 4.75
++-----------------
++
++NM/01 Workround for PCRE version dependancy in version reporting
++      Bugzilla 1073
++
++
+ Exim version 4.74
+ -----------------
+ 
+Index: exim-4.74/src/exim.c
+===================================================================
+--- exim-4.74.orig/src/exim.c
++++ exim-4.74/src/exim.c
+@@ -931,8 +931,13 @@ DEBUG(D_any) do {
+              "                       Runtime: %s\n",
+           PCRE_MAJOR, PCRE_MINOR,
+           /* PRE_PRERELEASE is either defined and empty or a string.
+-           * This should work: */
++           * unless its an ancient version of PCRE in which case it
++           * is not defined */
++#ifdef PCRE_PRERELEASE
+           PCRE_PRERELEASE "",
++#else
++          "",
++#endif
+           pcre_version());
+ 
+   init_lookup_list();
diff --git a/exim.changes b/exim.changes
index 9d91dbc..3bceb5a 100644
--- a/exim.changes
+++ b/exim.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Feb  4 22:13:39 UTC 2011 - lars@samba.org
+
+- Workround for PCRE version dependancy in version reporting; (beo#1073).
+
 -------------------------------------------------------------------
 Fri Feb  4 19:33:40 UTC 2011 - lars@samba.org
 
diff --git a/exim.spec b/exim.spec
index 2dafd9e..33e36e8 100644
--- a/exim.spec
+++ b/exim.spec
@@ -58,6 +58,7 @@ Source20:       http://www.logic.univie.ac.at/~ametzler/debian/exim4manpages/exi
 Source30:       eximstats-html-update.py
 Source31:       eximstats.conf
 Patch:          exim-4.12-tail.patch
+Patch1:         aa097c4c00f62487128d74f65c521f9e877b184f.diff
 %if !%{?build_with_mysql:1}0
 
 %package -n eximon
@@ -124,6 +125,7 @@ Authors:
 %prep
 %setup -q -n exim-%{version}
 %patch
+%patch1 -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"