From 4a6bd5403b9c11f6ad0ac31220390e04c90b4cae Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sat, 19 Feb 2005 00:02:20 +0000 Subject: [PATCH] - update for 4.50 Changed files: exim4-EDITME.patch -> 1.13 exim4-texinfo.patch -> 1.7 --- exim4-EDITME.patch | 72 +++++++++++++++++++++++++++------------------ exim4-texinfo.patch | 8 ++--- 2 files changed, 48 insertions(+), 32 deletions(-) diff --git a/exim4-EDITME.patch b/exim4-EDITME.patch index 63c461b..c2652be 100644 --- a/exim4-EDITME.patch +++ b/exim4-EDITME.patch @@ -1,7 +1,7 @@ -diff -urN exim-4.43.org/src/EDITME exim-4.43/src/EDITME ---- exim-4.43.org/src/EDITME 2004-10-07 14:25:49.533597214 +0200 -+++ exim-4.43/src/EDITME 2004-10-07 14:28:22.292872122 +0200 -@@ -98,7 +98,7 @@ +diff -urN exim-4.50.org/src/EDITME exim-4.50/src/EDITME +--- exim-4.50.org/src/EDITME 2005-02-17 15:49:11.000000000 +0100 ++++ exim-4.50/src/EDITME 2005-02-19 02:44:57.133818056 +0100 +@@ -100,7 +100,7 @@ # /usr/local/sbin. The installation script will try to create this directory, # and any superior directories, if they do not exist. @@ -10,7 +10,7 @@ diff -urN exim-4.43.org/src/EDITME exim-4.43/src/EDITME #------------------------------------------------------------------------------ -@@ -114,7 +114,7 @@ +@@ -116,7 +116,7 @@ # don't exist. It will also install a default runtime configuration if this # file does not exist. @@ -19,7 +19,7 @@ diff -urN exim-4.43.org/src/EDITME exim-4.43/src/EDITME # 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. -@@ -132,7 +132,8 @@ +@@ -134,7 +134,8 @@ # owner of a local mailbox.) Specifying these values as root is very strongly # discouraged. @@ -29,7 +29,7 @@ diff -urN exim-4.43.org/src/EDITME exim-4.43/src/EDITME # 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 -@@ -206,7 +207,7 @@ +@@ -208,7 +209,7 @@ # This one is very special-purpose, so is not included by default. @@ -38,7 +38,7 @@ diff -urN exim-4.43.org/src/EDITME exim-4.43/src/EDITME #------------------------------------------------------------------------------ -@@ -227,7 +228,7 @@ +@@ -229,7 +230,7 @@ # This one is special-purpose, and commonly not required, so it is not # included by default. @@ -47,7 +47,7 @@ diff -urN exim-4.43.org/src/EDITME exim-4.43/src/EDITME #------------------------------------------------------------------------------ -@@ -236,9 +237,9 @@ +@@ -238,9 +239,9 @@ # MBX, is included only when requested. If you do not know what this is about, # leave these settings commented out. @@ -60,7 +60,7 @@ diff -urN exim-4.43.org/src/EDITME exim-4.43/src/EDITME #------------------------------------------------------------------------------ -@@ -253,16 +254,16 @@ +@@ -255,16 +256,16 @@ LOOKUP_DBM=yes LOOKUP_LSEARCH=yes @@ -81,22 +81,38 @@ diff -urN exim-4.43.org/src/EDITME exim-4.43/src/EDITME # LOOKUP_PGSQL=yes # LOOKUP_WHOSON=yes -@@ -406,10 +407,10 @@ +@@ -321,14 +322,14 @@ + # and the MIME ACL. Please read the documentation to learn more about these + # features. + +-# WITH_CONTENT_SCAN=yes ++WITH_CONTENT_SCAN=yes + + # If you want to use the deprecated "demime" condition in the DATA ACL, + # uncomment the line below. Doing so will also explicitly turn on the + # WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of + # the "demime" condition. + +-# WITH_OLD_DEMIME=yes ++WITH_OLD_DEMIME=yes + + #------------------------------------------------------------------------------ + # Compiling Exim with experimental features. These are documented in +@@ -464,10 +465,10 @@ # included in the Exim binary. You will then need to set up the run time # configuration to make use of the mechanism(s) selected. -# AUTH_CRAM_MD5=yes --# AUTH_CYRUS_SASL=yes ++AUTH_CRAM_MD5=yes + # AUTH_CYRUS_SASL=yes -# AUTH_PLAINTEXT=yes -# AUTH_SPA=yes -+AUTH_CRAM_MD5=yes -+# AUTH_CYRUS_SASL=yes +AUTH_PLAINTEXT=yes +AUTH_SPA=yes #------------------------------------------------------------------------------ -@@ -495,10 +496,10 @@ +@@ -553,10 +554,10 @@ # leave these settings commented out. # This setting is required for any TLS support (either OpenSSL or GnuTLS) @@ -109,7 +125,7 @@ diff -urN exim-4.43.org/src/EDITME exim-4.43/src/EDITME # Uncomment these settings if you are using GnuTLS # USE_GNUTLS=yes -@@ -549,7 +550,7 @@ +@@ -607,7 +608,7 @@ # Once you have done this, "make install" will build the info files and # install them in the directory you have defined. @@ -118,7 +134,7 @@ diff -urN exim-4.43.org/src/EDITME exim-4.43/src/EDITME #------------------------------------------------------------------------------ -@@ -562,7 +563,7 @@ +@@ -620,7 +621,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: @@ -127,7 +143,7 @@ diff -urN exim-4.43.org/src/EDITME exim-4.43/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 -@@ -611,7 +612,7 @@ +@@ -669,7 +670,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. @@ -136,7 +152,7 @@ diff -urN exim-4.43.org/src/EDITME exim-4.43/src/EDITME COMPRESS_SUFFIX=gz -@@ -619,7 +620,7 @@ +@@ -677,7 +678,7 @@ # If the exigrep utility is fed compressed log files, it tries to uncompress # them using this command. @@ -145,7 +161,7 @@ diff -urN exim-4.43.org/src/EDITME exim-4.43/src/EDITME #------------------------------------------------------------------------------ -@@ -628,7 +629,7 @@ +@@ -686,7 +687,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. @@ -154,7 +170,7 @@ diff -urN exim-4.43.org/src/EDITME exim-4.43/src/EDITME #------------------------------------------------------------------------------ -@@ -638,11 +639,12 @@ +@@ -696,11 +697,12 @@ # support, which is intended for use in conjunction with the SMTP AUTH # facilities, is included only when requested by the following setting: @@ -168,7 +184,7 @@ diff -urN exim-4.43.org/src/EDITME exim-4.43/src/EDITME #------------------------------------------------------------------------------ # Support for authentication via Radius is also available. The Exim support, -@@ -682,7 +684,7 @@ +@@ -740,7 +742,7 @@ # /var/pwcheck) and chown it to exim's user and group. Once you have installed # pwcheck, you should arrange for it to be started by root at boot time. @@ -177,7 +193,7 @@ diff -urN exim-4.43.org/src/EDITME exim-4.43/src/EDITME #------------------------------------------------------------------------------ -@@ -699,7 +701,7 @@ +@@ -757,7 +759,7 @@ # group. Once you have installed saslauthd, you should arrange for it to be # started by root at boot time. @@ -186,16 +202,16 @@ diff -urN exim-4.43.org/src/EDITME exim-4.43/src/EDITME #------------------------------------------------------------------------------ -@@ -759,7 +761,7 @@ +@@ -817,7 +819,7 @@ # is "yes", as well as supporting line editing, a history of input lines in the # current run is maintained. -# USE_READLINE=yes +USE_READLINE=yes - - -@@ -830,7 +832,7 @@ + # You may need to add -ldl to EXTRA_LIBS when you set USE_READLINE=yes. + # Note that this option adds to the size of the Exim binary, because the +@@ -892,7 +894,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. @@ -204,7 +220,7 @@ diff -urN exim-4.43.org/src/EDITME exim-4.43/src/EDITME #------------------------------------------------------------------------------ -@@ -1003,7 +1005,7 @@ +@@ -1065,7 +1067,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-texinfo.patch b/exim4-texinfo.patch index a201a50..ddf6d03 100644 --- 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.40.org/doc/filter.texinfo Sat Jun 30 01:12:24 2001 -+++ exim-texinfo-4.40/doc/filter.texinfo Sat Jun 30 01:12:53 2001 +--- exim-texinfo-4.50.org/doc/filter.texinfo Sat Jun 30 01:12:24 2001 ++++ exim-texinfo-4.50/doc/filter.texinfo Sat Jun 30 01:12:53 2001 @@ -4,10 +4,19 @@ @set{wmAuthor_email} @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.40.org/doc/spec.texinfo Sat Jun 30 01:12:24 2001 -+++ exim-texinfo-4.40/doc/spec.texinfo Sat Jun 30 01:12:54 2001 +--- exim-texinfo-4.50.org/doc/spec.texinfo Sat Jun 30 01:12:24 2001 ++++ exim-texinfo-4.50/doc/spec.texinfo Sat Jun 30 01:12:54 2001 @@ -4,10 +4,19 @@ @set{wmAuthor_email} @set{COPYRIGHT1} Copyright @copyright{} @value{wmYear} University of Cambridge -- 2.43.0