Andreas Metzler wrote:
> On Wed, Sep 24, 2003 at 12:25:28AM +0200, Oliver Eikemeier wrote:
>
>>Hi Nigel,
>>
>>could it be that your MIME stripper strips trailing spaces,
>
> Quite possible.
> From: Andreas Metzler <eximusers@???>
> To: exim-users@???
> Message-ID: <20030914165158.GA8121@???>
> Subject: [Exim] exim-users mailinglist-software kills signature separator
>
>>rendering patches useless?
>
> Shouldn't 'patch -l' work as hotfix?
or sending the patch as a shar file:
--- exiscan-acl-4.22-12.patch.shar begins here ---
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# exiscan-acl-4.22-12.patch.patch
#
echo x - exiscan-acl-4.22-12.patch.patch
sed -e 's/^X//' -e 's/X$//' >exiscan-acl-4.22-12.patch.patch << 'END-of-exiscan-acl-4.22-12.patch.patch'
X--- exiscan-acl-4.22-12.patch.orig Fri Sep 19 20:13:21 2003X
X+++ exiscan-acl-4.22-12.patch Fri Sep 19 20:13:48 2003X
X@@ -2903,7 +2903,7 @@X
X int expand_forbid = 0;X
X int expand_nlength[EXPAND_MAXN+1];X
X int expand_nmax = -1;X
X-@@ -442,12 +447,14 @@X
X+@@ -442,13 +447,15 @@X
X BOOL extract_addresses_remove_arguments = TRUE;X
X uschar *extra_local_interfaces = NULL;X
X X
X@@ -2914,6 +2914,7 @@X
X uschar *filter_test = NULL;X
X uschar *filter_thisaddress = NULL;X
X int finduser_retries = 0;X
X+ uid_t fixed_never_users[] = { FIXED_NEVER_USERS };X
X +uschar *found_extension = NULL;X
X uschar *freeze_tell = NULL;X
X X
X@@ -2975,7 +2976,7 @@X
X extern int expand_forbid; /* RDO flags for forbidding things */X
X extern int expand_nlength[]; /* Lengths of numbered strings */X
X extern int expand_nmax; /* Max numerical value */X
X-@@ -249,12 +254,14 @@X
X+@@ -249,13 +254,15 @@X
X extern BOOL extract_addresses_remove_arguments; /* Controls -t behaviour */X
X extern uschar *extra_local_interfaces; /* Local, non-listen interfaces */X
X X
X@@ -2986,6 +2987,7 @@X
X extern uschar *filter_test; /* Run as a filter tester on this file */X
X extern uschar *filter_thisaddress; /* For address looping */X
X extern int finduser_retries; /* Retry count for getpwnam() */X
X+ extern uid_t fixed_never_users[]; /* Can't be overridden */X
X +extern uschar *found_extension; /* demime acl condition: file extension found */X
X extern uschar *freeze_tell; /* Message on (some) freezings */X
X X
X@@ -4676,14 +4678,14 @@X
X received_protocol = NULL;X
X recipients_list = NULL;X
X @@ -347,6 +349,8 @@X
X- local_error_message = TRUE;X
X- else if (Ustrncmp(big_buffer, "-local_scan ", 12) == 0)X
X- local_scan_data = string_copy(big_buffer + 12);X
X-+ else if (Ustrncmp(big_buffer, "-spam_score_int ", 16) == 0)X
X-+ spam_score_int = string_copy(big_buffer + 16);X
X- else if (Ustrcmp(big_buffer, "-host_lookup_failed") == 0)X
X- host_lookup_failed = TRUE;X
X- else if (Ustrncmp(big_buffer, "-body_linecount", 15) == 0)X
X+ local_error_message = TRUE;X
X+ else if (Ustrncmp(big_buffer, "-local_scan ", 12) == 0)X
X+ local_scan_data = string_copy(big_buffer + 12);X
X++ else if (Ustrncmp(big_buffer, "-spam_score_int ", 16) == 0)X
X++ spam_score_int = string_copy(big_buffer + 16);X
X+ else if (Ustrcmp(big_buffer, "-host_lookup_failed") == 0)X
X+ host_lookup_failed = TRUE;X
X+ else if (Ustrncmp(big_buffer, "-body_linecount", 15) == 0)X
X diff -urN exim-4.22-orig/src/spool_mbox.c exim-4.22/src/spool_mbox.cX
X --- exim-4.22-orig/src/spool_mbox.c Thu Jan 1 01:00:00 1970X
X +++ exim-4.22/src/spool_mbox.c Thu Aug 28 10:21:09 2003X
X@@ -7468,7 +7470,7 @@X
X @@ -11,7 +11,7 @@X
X X
X X
X- #define THIS_VERSION "4.22"X
X+ #define THIS_VERSION "4.24"X
X -X
X +#define EXISCAN_VERSION "12"X
X X
END-of-exiscan-acl-4.22-12.patch.patch
exit
--- exiscan-acl-4.22-12.patch.shar ends here ---
save the lines between and excluding `--- ... begins ...' and `--- ... ends ...' in
a file `exiscan-acl-4.22-12.patch.shar' in a directory
containing `exiscan-acl-4.22-12.patch' from
http://duncanthrax.net/exiscan-acl/,
then do (in this directory):
sh exiscan-acl-4.22-12.patch.shar
patch -p0 < exiscan-acl-4.22-12.patch.patch
patch -p1 -d /path/to/exim/sources/exim-4.24 < exiscan-acl-4.22-12.patch
and voila, you have an exim-4.24 source tree with an exiscan-acl-4.22-12 patch applied.
