This is a multi-part message in MIME format.
--
Philip Hazel wrote:
> I have just put Exim release 4.24 on the primary ftp site
> [...]
> The only changes in this release are bug fixes. Tom Kistner is on vacation at
> the moment. As a result, there won't be a corresponding Exiscan release until
> he gets back (at the end of the month, I think).
attached is a patch to apply exiscan-acl-4.22-12.patch to exim-4.24:
save the attached patch as `exiscan-acl-4.22-12.patch.patch' ;-) in a directory
containing `exiscan-acl-4.22-12.patch' from
http://duncanthrax.net/exiscan-acl/,
then do (in this directory):
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.
Only for the adventurous, wanting to test exim-4.24 with exiscan-acl-4.22-12 ;-)
Have fun
Oliver
--
--- exiscan-acl-4.22-12.patch.orig Fri Sep 19 20:13:21 2003
+++ exiscan-acl-4.22-12.patch Fri Sep 19 20:13:48 2003
@@ -2903,7 +2903,7 @@
int expand_forbid = 0;
int expand_nlength[EXPAND_MAXN+1];
int expand_nmax = -1;
-@@ -442,12 +447,14 @@
+@@ -442,13 +447,15 @@
BOOL extract_addresses_remove_arguments = TRUE;
uschar *extra_local_interfaces = NULL;
@@ -2914,6 +2914,7 @@
uschar *filter_test = NULL;
uschar *filter_thisaddress = NULL;
int finduser_retries = 0;
+ uid_t fixed_never_users[] = { FIXED_NEVER_USERS };
+uschar *found_extension = NULL;
uschar *freeze_tell = NULL;
@@ -2975,7 +2976,7 @@
extern int expand_forbid; /* RDO flags for forbidding things */
extern int expand_nlength[]; /* Lengths of numbered strings */
extern int expand_nmax; /* Max numerical value */
-@@ -249,12 +254,14 @@
+@@ -249,13 +254,15 @@
extern BOOL extract_addresses_remove_arguments; /* Controls -t behaviour */
extern uschar *extra_local_interfaces; /* Local, non-listen interfaces */
@@ -2986,6 +2987,7 @@
extern uschar *filter_test; /* Run as a filter tester on this file */
extern uschar *filter_thisaddress; /* For address looping */
extern int finduser_retries; /* Retry count for getpwnam() */
+ extern uid_t fixed_never_users[]; /* Can't be overridden */
+extern uschar *found_extension; /* demime acl condition: file extension found */
extern uschar *freeze_tell; /* Message on (some) freezings */
@@ -4676,14 +4678,14 @@
received_protocol = NULL;
recipients_list = NULL;
@@ -347,6 +349,8 @@
- local_error_message = TRUE;
- else if (Ustrncmp(big_buffer, "-local_scan ", 12) == 0)
- local_scan_data = string_copy(big_buffer + 12);
-+ else if (Ustrncmp(big_buffer, "-spam_score_int ", 16) == 0)
-+ spam_score_int = string_copy(big_buffer + 16);
- else if (Ustrcmp(big_buffer, "-host_lookup_failed") == 0)
- host_lookup_failed = TRUE;
- else if (Ustrncmp(big_buffer, "-body_linecount", 15) == 0)
+ local_error_message = TRUE;
+ else if (Ustrncmp(big_buffer, "-local_scan ", 12) == 0)
+ local_scan_data = string_copy(big_buffer + 12);
++ else if (Ustrncmp(big_buffer, "-spam_score_int ", 16) == 0)
++ spam_score_int = string_copy(big_buffer + 16);
+ else if (Ustrcmp(big_buffer, "-host_lookup_failed") == 0)
+ host_lookup_failed = TRUE;
+ else if (Ustrncmp(big_buffer, "-body_linecount", 15) == 0)
diff -urN exim-4.22-orig/src/spool_mbox.c exim-4.22/src/spool_mbox.c
--- exim-4.22-orig/src/spool_mbox.c Thu Jan 1 01:00:00 1970
+++ exim-4.22/src/spool_mbox.c Thu Aug 28 10:21:09 2003
@@ -7468,7 +7470,7 @@
@@ -11,7 +11,7 @@
- #define THIS_VERSION "4.22"
+ #define THIS_VERSION "4.24"
-
+#define EXISCAN_VERSION "12"
--