[csw-devel] SF.net SVN: gar:[14613] csw/mgar/pkg/exim/trunk/files

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Thu May 19 01:54:47 CEST 2011 

Revision: 14613
          http://gar.svn.sourceforge.net/gar/?rev=14613&view=rev
Author:   bdwalton
Date:     2011-05-18 23:54:47 +0000 (Wed, 18 May 2011)

Log Message:
-----------
exim/trunk: update patches for new version

Modified Paths:
--------------
    csw/mgar/pkg/exim/trunk/files/0003-Set-OpenCSW-build-options.patch
    csw/mgar/pkg/exim/trunk/files/0004-Force-Compiler-and-a-few-compilation-options.patch

Modified: csw/mgar/pkg/exim/trunk/files/0003-Set-OpenCSW-build-options.patch
===================================================================
--- csw/mgar/pkg/exim/trunk/files/0003-Set-OpenCSW-build-options.patch	2011-05-18 23:39:54 UTC (rev 14612)
+++ csw/mgar/pkg/exim/trunk/files/0003-Set-OpenCSW-build-options.patch	2011-05-18 23:54:47 UTC (rev 14613)
@@ -1,6 +1,6 @@
-From 5c1f33d87884e0c66ace1fd36e290cbe28d5c0de Mon Sep 17 00:00:00 2001
+From 9e08d89739eab7fc54c07068d8f5f902c89ec3c8 Mon Sep 17 00:00:00 2001
 From: Ben Walton <bwalton at opencsw.org>
-Date: Tue, 14 Dec 2010 03:31:46 +0100
+Date: Thu, 19 May 2011 01:47:39 +0200
 Subject: [PATCH] Set OpenCSW build options
 
 Modify the template Local/Makefile to set the options for the csw
@@ -12,7 +12,7 @@
  1 files changed, 45 insertions(+), 45 deletions(-)
 
 diff --git a/Local/Makefile b/Local/Makefile
-index 9869eb1..6ba1bf8 100644
+index b0335a9..e0e9e36 100644
 --- a/Local/Makefile
 +++ b/Local/Makefile
 @@ -100,7 +100,7 @@
@@ -33,16 +33,16 @@
  
  # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
  # In this case, Exim will use the first of them that exists when it is run.
-@@ -134,7 +134,7 @@ CONFIGURE_FILE=/usr/exim/configure
- # owner of a local mailbox.) Specifying these values as root is very strongly
- # discouraged.
+@@ -133,7 +133,7 @@ CONFIGURE_FILE=/usr/exim/configure
+ # deliveries. (Local deliveries run as various non-root users, typically as the
+ # owner of a local mailbox.) Specifying these values as root is not supported.
  
 -EXIM_USER=
 +EXIM_USER=ref:exim
  
  # If you specify EXIM_USER as a name, this is looked up at build time, and the
  # uid number is built into the binary. However, you can specify that this
-@@ -176,7 +176,7 @@ EXIM_USER=
+@@ -175,7 +175,7 @@ EXIM_USER=
  
  # Almost all installations choose this:
  
@@ -51,7 +51,7 @@
  
  
  
-@@ -214,7 +214,7 @@ ROUTER_REDIRECT=yes
+@@ -213,7 +213,7 @@ ROUTER_REDIRECT=yes
  
  # This one is very special-purpose, so is not included by default.
  
@@ -60,7 +60,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -235,7 +235,7 @@ TRANSPORT_SMTP=yes
+@@ -234,7 +234,7 @@ TRANSPORT_SMTP=yes
  # This one is special-purpose, and commonly not required, so it is not
  # included by default.
  
@@ -69,7 +69,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -244,9 +244,9 @@ TRANSPORT_SMTP=yes
+@@ -243,9 +243,9 @@ TRANSPORT_SMTP=yes
  # MBX, is included only when requested. If you do not know what this is about,
  # leave these settings commented out.
  
@@ -82,7 +82,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -262,16 +262,16 @@ LOOKUP_DBM=yes
+@@ -286,16 +286,16 @@ LOOKUP_DBM=yes
  LOOKUP_LSEARCH=yes
  LOOKUP_DNSDB=yes
  
@@ -107,7 +107,7 @@
  # LOOKUP_SQLITE=yes
  # LOOKUP_WHOSON=yes
  
-@@ -292,7 +292,7 @@ LOOKUP_DNSDB=yes
+@@ -316,7 +316,7 @@ LOOKUP_DNSDB=yes
  # with Solaris 7 onwards. Uncomment whichever of these you are using.
  
  # LDAP_LIB_TYPE=OPENLDAP1
@@ -116,7 +116,7 @@
  # LDAP_LIB_TYPE=NETSCAPE
  # LDAP_LIB_TYPE=SOLARIS
  
-@@ -321,8 +321,8 @@ PCRE_LIBS=-lpcre
+@@ -345,8 +345,8 @@ PCRE_LIBS=-lpcre
  # specified in INCLUDE. The settings below are just examples; -lpq is for
  # PostgreSQL, -lgds is for Interbase, -lsqlite3 is for SQLite.
  
@@ -127,7 +127,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -343,14 +343,14 @@ EXIM_MONITOR=eximon.bin
+@@ -367,14 +367,14 @@ EXIM_MONITOR=eximon.bin
  # and the MIME ACL. Please read the documentation to learn more about these
  # features.
  
@@ -142,9 +142,9 @@
 -# WITH_OLD_DEMIME=yes
 +WITH_OLD_DEMIME=yes
  
- #------------------------------------------------------------------------------
- # Compiling Exim with experimental features. These are documented in
-@@ -361,9 +361,9 @@ EXIM_MONITOR=eximon.bin
+ # If you're using ClamAV and are backporting fixes to an old version, instead
+ # of staying current (which is the more usual approach) then you may need to
+@@ -404,9 +404,9 @@ EXIM_MONITOR=eximon.bin
  # installed on your system (www.libspf2.org). Depending on where it is installed
  # you may have to edit the CFLAGS and LDFLAGS lines.
  
@@ -156,16 +156,16 @@
  
  # Uncomment the following lines to add SRS (Sender rewriting scheme) support.
  # You need to have libsrs_alt installed on your system (srs.mirtol.com).
-@@ -451,7 +451,7 @@ FIXED_NEVER_USERS=root
- # used. The prefix can be more restrictive than just a directory (the second
- # example).
+@@ -493,7 +493,7 @@ FIXED_NEVER_USERS=root
+ # configurations to be used. The prefix can be more restrictive than just a
+ # directory (the second example).
  
 -# ALT_CONFIG_PREFIX=/some/directory/
 +ALT_CONFIG_PREFIX=/opt/csw/etc/exim/
  # ALT_CONFIG_PREFIX=/some/directory/exim.conf-
  
  
-@@ -486,11 +486,11 @@ FIXED_NEVER_USERS=root
+@@ -552,11 +552,11 @@ FIXED_NEVER_USERS=root
  # included in the Exim binary. You will then need to set up the run time
  # configuration to make use of the mechanism(s) selected.
  
@@ -182,7 +182,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -498,7 +498,7 @@ FIXED_NEVER_USERS=root
+@@ -564,7 +564,7 @@ FIXED_NEVER_USERS=root
  # Cyrus SASL library installed before trying to build Exim, and you probably
  # want to uncomment the following line:
  
@@ -191,7 +191,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -527,7 +527,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -593,7 +593,7 @@ HEADERS_CHARSET="ISO-8859-1"
  # the Sieve filter support. For those OS where iconv() is known to be installed
  # as standard, the file in OS/Makefile-xxxx contains
  #
@@ -200,7 +200,7 @@
  #
  # If you are not using one of those systems, but have installed iconv(), you
  # need to uncomment that line above. In some cases, you may find that iconv()
-@@ -536,7 +536,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -602,7 +602,7 @@ HEADERS_CHARSET="ISO-8859-1"
  #
  # HAVE_ICONV=yes
  # CFLAGS=-O -I/usr/local/include
@@ -209,7 +209,7 @@
  #
  # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
  # as well.
-@@ -589,10 +589,10 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -655,10 +655,10 @@ HEADERS_CHARSET="ISO-8859-1"
  # leave these settings commented out.
  
  # This setting is required for any TLS support (either OpenSSL or GnuTLS)
@@ -222,7 +222,7 @@
  
  # Uncomment these settings if you are using GnuTLS
  # USE_GNUTLS=yes
-@@ -611,7 +611,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -677,7 +677,7 @@ HEADERS_CHARSET="ISO-8859-1"
  # with all your other libraries. If they are in a special directory, you may
  # need something like
  
@@ -231,7 +231,7 @@
  # or
  # TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt
  
-@@ -619,7 +619,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -685,7 +685,7 @@ HEADERS_CHARSET="ISO-8859-1"
  # auxiliary programs. If the include files are not in a standard place, you can
  # set TLS_INCLUDE to specify where they are, for example:
  
@@ -240,7 +240,7 @@
  # or
  # TLS_INCLUDE=-I/opt/gnu/include
  
-@@ -643,7 +643,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -709,7 +709,7 @@ HEADERS_CHARSET="ISO-8859-1"
  # Once you have done this, "make install" will build the info files and
  # install them in the directory you have defined.
  
@@ -249,7 +249,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -656,7 +656,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -722,7 +722,7 @@ HEADERS_CHARSET="ISO-8859-1"
  # %s. This will be replaced by one of the strings "main", "panic", or "reject"
  # to form the final file names. Some installations may want something like this:
  
@@ -258,7 +258,7 @@
  
  # which results in files with names /var/log/exim_mainlog, etc. The directory
  # in which the log files are placed must exist; Exim does not try to create
-@@ -705,7 +705,7 @@ EXICYCLOG_MAX=10
+@@ -771,7 +771,7 @@ EXICYCLOG_MAX=10
  # files. Both the name of the command and the suffix that it adds to files
  # need to be defined here. See also the EXICYCLOG_MAX configuration.
  
@@ -267,7 +267,7 @@
  COMPRESS_SUFFIX=gz
  
  
-@@ -713,7 +713,7 @@ COMPRESS_SUFFIX=gz
+@@ -779,7 +779,7 @@ COMPRESS_SUFFIX=gz
  # If the exigrep utility is fed compressed log files, it tries to uncompress
  # them using this command.
  
@@ -276,7 +276,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -732,7 +732,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -798,7 +798,7 @@ ZCAT_COMMAND=/usr/bin/zcat
  # that the local_scan API is made available by the linker. You may also need
  # to add -ldl to EXTRALIBS so that dlopen() is available to Exim.
  
@@ -285,7 +285,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -742,7 +742,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -808,7 +808,7 @@ ZCAT_COMMAND=/usr/bin/zcat
  # support, which is intended for use in conjunction with the SMTP AUTH
  # facilities, is included only when requested by the following setting:
  
@@ -294,7 +294,7 @@
  
  # You probably need to add -lpam to EXTRALIBS, and in some releases of
  # GNU/Linux -ldl is also needed.
-@@ -839,7 +839,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -912,7 +912,7 @@ ZCAT_COMMAND=/usr/bin/zcat
  # (the value doesn't matter), the symbolic link is not created or moved. You
  # will then have to "turn Exim on" by setting up the link manually.
  
@@ -303,7 +303,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -851,7 +851,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -924,7 +924,7 @@ ZCAT_COMMAND=/usr/bin/zcat
  # aliases). The following setting can be changed to specify a different
  # location for the system alias file.
  

Modified: csw/mgar/pkg/exim/trunk/files/0004-Force-Compiler-and-a-few-compilation-options.patch
===================================================================
--- csw/mgar/pkg/exim/trunk/files/0004-Force-Compiler-and-a-few-compilation-options.patch	2011-05-18 23:39:54 UTC (rev 14612)
+++ csw/mgar/pkg/exim/trunk/files/0004-Force-Compiler-and-a-few-compilation-options.patch	2011-05-18 23:54:47 UTC (rev 14613)
@@ -1,6 +1,6 @@
-From 3cc753695b92fae90252d3beb8f83dfd1133f6aa Mon Sep 17 00:00:00 2001
+From fe5dfda4e0b20be76a30dfe20a4bee8265bd00f6 Mon Sep 17 00:00:00 2001
 From: Ben Walton <bwalton at opencsw.org>
-Date: Tue, 14 Dec 2010 04:37:19 +0100
+Date: Thu, 19 May 2011 01:51:46 +0200
 Subject: [PATCH] Force Compiler and a few compilation options
 
 We need to force the use of compiler and add a few extra CFLAGS and
@@ -12,11 +12,11 @@
  1 files changed, 11 insertions(+), 0 deletions(-)
 
 diff --git a/Local/Makefile b/Local/Makefile
-index 6ba1bf8..60f0199 100644
+index e0e9e36..68bd009 100644
 --- a/Local/Makefile
 +++ b/Local/Makefile
 @@ -1,5 +1,16 @@
- # $Cambridge: exim/exim-src/src/EDITME,v 1.23 2009/11/20 12:18:19 nm4 Exp $
+ # $Cambridge: exim/src/src/EDITME,v 1.27 2010/06/12 15:21:25 jetmore Exp $
  
 +# -I (CSW_WORKSRC).. is needed for the SPF2 hack (to pick up patched
 +# SPF2 headers locally)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the devel mailing list