[gentoo-commits] gentoo-x86 commit in mail-mta/exim/files: exim-4.74-pcre.patch exim-4.74-makefile-command-envs.patch exim-4.74-makefile-posix.patch

[Fabian Groffen (grobian)]

grobian     11/02/01 11:42:02

  Added:                exim-4.74-pcre.patch
                        exim-4.74-makefile-command-envs.patch
                        exim-4.74-makefile-posix.patch
  Log:
  Grabbed some fixes from upstream to resolve misc building issues
  
  (Portage version: 2.1.9.24/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  mail-mta/exim/files/exim-4.74-pcre.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/files/exim-4.74-pcre.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/files/exim-4.74-pcre.patch?rev=1.1&content-type=text/plain

Index: exim-4.74-pcre.patch
===================================================================
From: Nigel Metheringham <nigel@××××.org>
Date: Wed, 26 Jan 2011 11:04:32 +0000 (+0000)
Subject: Workround compile error with old PCRE versions
X-Git-Url: http://git.exim.org/exim.git/commitdiff_plain/aa097c4c00f62487128d74f65c521f9e877b184f

Workround compile error with old PCRE versions

Fixes bug #1073
---

diff --git a/src/src/exim.c b/src/src/exim.c
index e236975..b3035ca 100644
--- a/src/src/exim.c
+++ b/src/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();



1.1                  mail-mta/exim/files/exim-4.74-makefile-command-envs.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/files/exim-4.74-makefile-command-envs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/files/exim-4.74-makefile-command-envs.patch?rev=1.1&content-type=text/plain

Index: exim-4.74-makefile-command-envs.patch
===================================================================
From: Phil Pennock <pdp@××××.org>
Date: Fri, 28 Jan 2011 00:07:05 +0000 (-0500)
Subject: Permit make values to be indented or in env.
X-Git-Url: http://git.exim.org/exim.git/commitdiff_plain/0cc9542ab26b35cba3a5523acb8991eb18ce0656

Permit make values to be indented or in env.

It appears some make(1)s are not complaining about variables defined
with leading whitespace on the line.  Permit that where we can, for the
lookups, but it's not tenable for CFLAGS_DYNAMIC.

Some people are specifying knobs on the make command-line, so we get
them via the environment.

Tested: indented LOOKUP_CDB and commented out LOOKUP_DNSDB, supplying it
via { make LOOKUP_DNSDB=yes }.  { exim -d --version } shows both are
built-in, no results from { fgrep DNSDB build-*/Makefile }.
---

diff --git a/src/scripts/lookups-Makefile b/src/scripts/lookups-Makefile
index dd0472b..d5c450e 100755
--- a/src/scripts/lookups-Makefile
+++ b/src/scripts/lookups-Makefile
@@ -21,6 +21,9 @@ tab='	'
 # We always do something now, since there should always be a lookup,
 # and now we need to run in order to put the OBJ=$(OBJ)+ rules in.
 
+# nb: do not permit leading whitespace for this, as CFLAGS_DYNAMIC is exported
+# to the lookups subdir via a line with leading whitespace which otherwise
+# matches
 if grep -q "^CFLAGS_DYNAMIC[ $tab]*=" "$defs_source"
 then
   # we have a definition, we're good to go
@@ -32,14 +35,23 @@ fi
 
 tmp="$target.t"
 
+# For the want_ checks, we need to let the user override values from the make
+# command-line, not just check the Makefile.
+
 want_dynamic() {
   local dyn_name="$1"
-  grep -q "^LOOKUP_${dyn_name}[ $tab]*=[ $tab]*2" "$defs_source"
+  local re="LOOKUP_${dyn_name}[ $tab]*=[ $tab]*2"
+  env | grep -q "^$re"
+  if [ $? -eq 0 ]; then return 0; fi
+  grep -q "^[ $tab]*$re" "$defs_source"
 }
 
 want_at_all() {
   local want_name="$1"
-  grep -q "^LOOKUP_${want_name}[ $tab]*=[ $tab]*." "$defs_source"
+  local re="LOOKUP_${want_name}[ $tab]*=[ $tab]*."
+  env | grep -q "^$re"
+  if [ $? -eq 0 ]; then return 0; fi
+  grep -q "^[ $tab]*$re" "$defs_source"
 }
 
 # The values of these variables will be emitted into the Makefile.



1.1                  mail-mta/exim/files/exim-4.74-makefile-posix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/files/exim-4.74-makefile-posix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/files/exim-4.74-makefile-posix.patch?rev=1.1&content-type=text/plain

Index: exim-4.74-makefile-posix.patch
===================================================================
From: Tony Finch <dot@×××××.at>
Date: Thu, 27 Jan 2011 16:26:36 +0000 (+0000)
Subject: Fix portability of Makefiles to HP-UX and other non-extended makes.
X-Git-Url: http://git.exim.org/exim.git/commitdiff_plain/159f52d231c010cbc4e149502b7f906293233f94

Fix portability of Makefiles to HP-UX and other non-extended makes.
---

diff --git a/src/scripts/lookups-Makefile b/src/scripts/lookups-Makefile
index 2c4dc96..dd0472b 100755
--- a/src/scripts/lookups-Makefile
+++ b/src/scripts/lookups-Makefile
@@ -19,7 +19,7 @@ tag_marker='MAGIC-TAG-MODS-OBJ-RULES-GO-HERE'
 tab='	'
 
 # We always do something now, since there should always be a lookup,
-# and now we need to run in order to put the OBJ+= rules in.
+# and now we need to run in order to put the OBJ=$(OBJ)+ rules in.
 
 if grep -q "^CFLAGS_DYNAMIC[ $tab]*=" "$defs_source"
 then
@@ -42,6 +42,11 @@ want_at_all() {
   grep -q "^LOOKUP_${want_name}[ $tab]*=[ $tab]*." "$defs_source"
 }
 
+# The values of these variables will be emitted into the Makefile.
+
+MODS=""
+OBJ=""
+
 emit_module_rule() {
   local lookup_name="$1"
   local mod_name
@@ -59,13 +64,13 @@ emit_module_rule() {
       echo >&2 "Inhibited dynamic modules prevents building dynamic $lookup_name"
       exit 1
     fi
-    echo "MODS += ${mod_name}.so"
+    MODS="${MODS} ${mod_name}.so"
     grep "^LOOKUP_${lookup_name}_" "$defs_source"
     echo "LOOKUP_${mod_name}_INCLUDE = \$(LOOKUP_${lookup_name}_INCLUDE)"
     echo "LOOKUP_${mod_name}_LIBS = \$(LOOKUP_${lookup_name}_LIBS)"
   elif want_at_all "$lookup_name"
   then
-    echo "OBJ += ${mod_name}.o"
+    OBJ="${OBJ} ${mod_name}.o"
   fi
 }
 
@@ -83,9 +88,18 @@ done
 
 if want_at_all LDAP
 then
-  echo "OBJ += ldap.o"
+  OBJ="${OBJ} ldap.o"
 fi
 
+# Because the variable is EXPERIMENTAL_SPF and not LOOKUP_SPF we
+# always include spf.o and compile a dummy if EXPERIMENTAL_SPF is not
+# defined.
+
+OBJ="${OBJ} spf.o"
+
+echo "MODS = $MODS"
+echo "OBJ = $OBJ"
+
 sed -n "/$tag_marker/,\$p" < "$input"
 
 exec >&5
diff --git a/src/src/lookups/Makefile b/src/src/lookups/Makefile
index 623f24f..2495348 100644
--- a/src/src/lookups/Makefile
+++ b/src/src/lookups/Makefile
@@ -8,12 +8,6 @@
 # This is called from the main make file, after cd'ing
 # to the lookups subdirectory.
 
-# because the variable is EXPERIMENTAL_SPF and not LOOKUP_SPF
-# we put this one here by default and compile a dummy if
-# EXPERIMENTAL_SPF is not defined
-OBJ=spf.o
-MODS=
-
 # MAGIC-TAG-MODS-OBJ-RULES-GO-HERE