- EXIM_4 -> HEAD

Changed files:
    exim4-EDITME.patch -> 1.3
    exim4-exiscan-pld.patch -> 1.3
    exim4-texinfo.patch -> 1.3
    exim4-use_system_pcre.patch -> 1.3

diff --git a/exim4-EDITME.patch b/exim4-EDITME.patch
index 335c1db31b8d1e9a2ba0020e82d2973c7903a5d5..d734339f021381b4fbac59dbe22bb749ba89b437 100644 (file)
--- a/exim4-EDITME.patch
+++ b/exim4-EDITME.patch
@@ -1,6 +1,5 @@
-diff -urN exim-4.02.org/src/EDITME exim-4.02/src/EDITME
---- exim-4.02.org/src/EDITME   Tue Mar 26 13:02:27 2002
-+++ exim-4.02/src/EDITME       Tue Mar 26 13:24:21 2002
+--- exim-4.11/src/EDITME.orig  Mon Dec  9 11:42:50 2002
++++ exim-4.11/src/EDITME       Wed Dec 11 15:02:06 2002
 @@ -98,7 +98,7 @@
  # /usr/local/sbin. The installation script will try to create this directory,
  # and any superior directories, if they do not exist.
@@ -11,15 +10,15 @@ diff -urN exim-4.02.org/src/EDITME exim-4.02/src/EDITME
  
  #------------------------------------------------------------------------------
 @@ -113,7 +113,7 @@
- # directories if they don't exist. It will also install a default run time
+ # directories if they don't exist. It will also install a default runtime
  # configuration if this file does not exist.
  
 -CONFIGURE_FILE=/usr/exim/configure
 +CONFIGURE_FILE=/etc/mail/exim.conf
  
- 
- #------------------------------------------------------------------------------
-@@ -126,7 +126,8 @@
+ # 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.
+@@ -131,7 +131,8 @@
  # owner of a local mailbox.) Specifying these values as root is very strongly
  # discouraged. These values are compiled into the binary.
  
@@ -29,7 +28,7 @@ diff -urN exim-4.02.org/src/EDITME exim-4.02/src/EDITME
  
  # If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must
  # also be a setting of EXIM_GROUP. If, on the other hand, you use a name
-@@ -207,7 +208,7 @@
+@@ -212,7 +213,7 @@
  # This one is special-purpose, and commonly not required, so it is not
  # included by default.
  
@@ -38,7 +37,7 @@ diff -urN exim-4.02.org/src/EDITME exim-4.02/src/EDITME
  
  
  #------------------------------------------------------------------------------
-@@ -216,9 +217,9 @@
+@@ -221,9 +222,9 @@
  # MBX, is included only when requested. If you do not know what this is about,
  # leave these settings commented out.
  
@@ -51,7 +50,7 @@ diff -urN exim-4.02.org/src/EDITME exim-4.02/src/EDITME
  
  
  #------------------------------------------------------------------------------
-@@ -233,7 +234,7 @@
+@@ -238,7 +239,7 @@
  LOOKUP_DBM=yes
  LOOKUP_LSEARCH=yes
  
@@ -60,7 +59,7 @@ diff -urN exim-4.02.org/src/EDITME exim-4.02/src/EDITME
  # LOOKUP_DNSDB=yes
  # LOOKUP_DSEARCH=yes
  # LOOKUP_LDAP=yes
-@@ -302,8 +303,8 @@
+@@ -309,8 +310,8 @@
  # included in the Exim binary. You will then need to set up the run time
  # configuration to make use of the mechanism(s) selected.
  
@@ -71,18 +70,20 @@ diff -urN exim-4.02.org/src/EDITME exim-4.02/src/EDITME
  # AUTH_SPA=yes
  
  
-@@ -315,8 +316,8 @@
- # with TLS support. If you don't know what this is all about, leave these
- # settings commented out.
+@@ -323,10 +324,10 @@
+ # leave these settings commented out.
  
+ # This setting is required for any TLS support (either OpenSSL or GnuTLS)
 -# SUPPORT_TLS=yes
--# TLS_LIBS=-lssl -lcrypto
 +SUPPORT_TLS=yes
+ 
+ # Uncomment this setting if you are using OpenSSL
+-# TLS_LIBS=-lssl -lcrypto
 +TLS_LIBS=-lssl -lcrypto
  
- # If you are running Exim as a server, note that just building it with TLS
- # support is not all you need to do. You also need to set up a suitable
-@@ -358,7 +359,7 @@
+ # Uncomment these settings if you are using GnuTLS
+ # USE_GNUTLS=yes
+@@ -377,7 +378,7 @@
  # Once you have done this, "make install" will build the info files and
  # install them in the directory you have defined.
  
@@ -91,7 +92,7 @@ diff -urN exim-4.02.org/src/EDITME exim-4.02/src/EDITME
  
  
  #------------------------------------------------------------------------------
-@@ -371,7 +372,7 @@
+@@ -390,7 +391,7 @@
  # %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:
  
@@ -100,7 +101,7 @@ diff -urN exim-4.02.org/src/EDITME exim-4.02/src/EDITME
  
  # 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
-@@ -405,7 +406,7 @@
+@@ -424,7 +425,7 @@
  # 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.
  
@@ -109,7 +110,7 @@ diff -urN exim-4.02.org/src/EDITME exim-4.02/src/EDITME
  COMPRESS_SUFFIX=gz
  
  
-@@ -413,7 +414,7 @@
+@@ -432,7 +433,7 @@
  # If the exigrep utility is fed compressed log files, it tries to uncompress
  # them using this command.
  
@@ -118,7 +119,7 @@ diff -urN exim-4.02.org/src/EDITME exim-4.02/src/EDITME
  
  
  #------------------------------------------------------------------------------
-@@ -422,7 +423,7 @@
+@@ -441,7 +442,7 @@
  # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
  # Perl costs quite a lot of resources. Only do this if you really need it.
  
@@ -127,7 +128,7 @@ diff -urN exim-4.02.org/src/EDITME exim-4.02/src/EDITME
  
  
  #------------------------------------------------------------------------------
-@@ -432,11 +433,12 @@
+@@ -451,11 +452,12 @@
  # support, which is intended for use in conjunction with the SMTP AUTH
  # facilities, is included only when requested by the following setting:
  
@@ -141,7 +142,7 @@ diff -urN exim-4.02.org/src/EDITME exim-4.02/src/EDITME
  
  #------------------------------------------------------------------------------
  # Support for authentication via Radius is also available. The Exim support,
-@@ -529,7 +531,7 @@
+@@ -577,7 +579,7 @@
  # period (for example, /usr/exim/configure.host.in.some.domain). If this file
  # does not exist, then the bare configuration file name is tried.
  
@@ -150,7 +151,7 @@ diff -urN exim-4.02.org/src/EDITME exim-4.02/src/EDITME
  
  
  #------------------------------------------------------------------------------
-@@ -678,7 +680,7 @@
+@@ -726,7 +728,7 @@
  # (process id) to a file so that it can easily be identified. The path of the
  # file can be specified here. Some installations may want something like this:
  
@@ -159,7 +160,7 @@ diff -urN exim-4.02.org/src/EDITME exim-4.02/src/EDITME
  
  # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
  # using the name "exim-daemon.pid".
-@@ -701,7 +703,7 @@
+@@ -749,7 +751,7 @@
  # be changed here. The default is 0640 so that information from the spool is
  # available to anyone who is a member of the Exim group.
  

diff --git a/exim4-exiscan-pld.patch b/exim4-exiscan-pld.patch
index 252e67b51008ddeeac5cb4aff1d4a98120c93b31..11aa38490f987bbffd05b7b15ead0c8d0c61be11 100644 (file)
--- a/exim4-exiscan-pld.patch
+++ b/exim4-exiscan-pld.patch
@@ -1,6 +1,6 @@
-diff -urN exiscan-4.11-18/exiscan-4.11-18.patch.org exiscan-4.10-16/exiscan-4.10-16.patch
---- exiscan-4.11-18/exiscan-4.11-18.patch.org  Fri Oct  4 14:19:29 2002
-+++ exiscan-4.11-18/exiscan-4.11-18.patch      Fri Oct 18 23:15:29 2002
+diff -urN exiscan-4.11-19/exiscan-4.11-19.patch.org exiscan-4.11-19/exiscan-4.11-19.patch
+--- exiscan-4.11-19/exiscan-4.11-19.patch.org  Fri Oct  4 14:19:29 2002
++++ exiscan-4.11-19/exiscan-4.11-19.patch      Fri Oct 18 23:15:29 2002
 @@ -17,15 +17,15 @@
  -        local_scan.o $(EXIM_PERL)
  +        local_scan.o exiscan.o $(EXIM_PERL)

diff --git a/exim4-texinfo.patch b/exim4-texinfo.patch
index 1d0964256c87e8aafd3d543e7a6e243a3667d280..4dd21c5c6084fefc70a89989f017678556b148ff 100644 (file)
--- a/exim4-texinfo.patch
+++ b/exim4-texinfo.patch
@@ -1,6 +1,6 @@
 diff -urN exim-texinfo-4.00.org/doc/filter.texinfo exim-texinfo-4.00/doc/filter.texinfo
---- exim-texinfo-4.00.org/doc/filter.texinfo   Sat Jun 30 01:12:24 2001
-+++ exim-texinfo-4.00/doc/filter.texinfo       Sat Jun 30 01:12:53 2001
+--- exim-texinfo-4.10.org/doc/filter.texinfo   Sat Jun 30 01:12:24 2001
++++ exim-texinfo-4.10/doc/filter.texinfo       Sat Jun 30 01:12:53 2001
 @@ -4,10 +4,19 @@
  @set{wmAuthor_email} <ph10@@cus.cam.ac.uk>
  @set{COPYRIGHT1} Copyright @copyright{} @value{wmYear} University of Cambridge
@@ -23,8 +23,8 @@ diff -urN exim-texinfo-4.00.org/doc/filter.texinfo exim-texinfo-4.00/doc/filter.
  @titlepage
  @title The Exim Mail Transfer Agent
 diff -urN exim-texinfo-4.00.org/doc/spec.texinfo exim-texinfo-4.00/doc/spec.texinfo
---- exim-texinfo-4.00.org/doc/spec.texinfo     Sat Jun 30 01:12:24 2001
-+++ exim-texinfo-4.00/doc/spec.texinfo Sat Jun 30 01:12:54 2001
+--- exim-texinfo-4.10.org/doc/spec.texinfo     Sat Jun 30 01:12:24 2001
++++ exim-texinfo-4.10/doc/spec.texinfo Sat Jun 30 01:12:54 2001
 @@ -4,10 +4,19 @@
  @set{wmAuthor_email} <ph10@@cus.cam.ac.uk>
  @set{COPYRIGHT1} Copyright @copyright{} @value{wmYear} University of Cambridge

diff --git a/exim4-use_system_pcre.patch b/exim4-use_system_pcre.patch
index 4890b09c0a4b376935bbf065610ebc5f03740f61..211076647801a930cbfb7a6f3de54243c8dc48e8 100644 (file)
--- a/exim4-use_system_pcre.patch
+++ b/exim4-use_system_pcre.patch
@@ -1,13 +1,13 @@
 diff -urN exim-3.952.orig/OS/Makefile-Base exim-3.952/OS/Makefile-Base
 --- exim-3.952.orig/OS/Makefile-Base   Tue Dec 18 13:04:43 2001
 +++ exim-3.952/OS/Makefile-Base        Tue Jan 15 16:23:40 2002
-@@ -85,7 +85,7 @@
+@@ -94,7 +94,7 @@
  # This is the real default target for all the various exim binaries and
  # scripts, once the configuring stuff is done.
  
 -allexim: config.h buildpcre $(EXIM_MONITOR) exicyclog exinext exiwhat \
 +allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \
-         exigrep eximstats exiqsumm \
+         exigrep eximstats exiqgrep exiqsumm \
          transport-filter.pl convert4r3 convert4r4 \
          exim_checkaccess \
 @@ -235,7 +235,7 @@