diff options
| author | Eygene Ryabinkin <rea@FreeBSD.org> | 2011-10-18 08:55:44 +0000 |
|---|---|---|
| committer | Eygene Ryabinkin <rea@FreeBSD.org> | 2011-10-18 08:55:44 +0000 |
| commit | 81a42c07f79717291fbfabe574233f8328458403 (patch) | |
| tree | c355d230dd67d4200fe2e8cea8c0496d983a1b0c /mail/exim/files | |
| parent | f33745d142f60b3a58d7dac59e1b69bbea764aca (diff) | |
Notes
Diffstat (limited to 'mail/exim/files')
| -rw-r--r-- | mail/exim/files/extra-patch-xclient | 17 | ||||
| -rw-r--r-- | mail/exim/files/patch-exiqgrep.src | 15 |
2 files changed, 8 insertions, 24 deletions
diff --git a/mail/exim/files/extra-patch-xclient b/mail/exim/files/extra-patch-xclient index 01a955294819..f55498f2a33e 100644 --- a/mail/exim/files/extra-patch-xclient +++ b/mail/exim/files/extra-patch-xclient @@ -1,22 +1,21 @@ - ---- src/globals.c.orig 2007-12-10 18:59:58.297661332 +0300 -+++ src/globals.c 2007-12-10 19:00:22.299029091 +0300 -@@ -621,6 +621,7 @@ +--- src/globals.c.orig 2011-10-10 09:18:13.000000000 +0400 ++++ src/globals.c 2011-10-16 02:33:45.000000000 +0400 +@@ -633,6 +633,7 @@ BOOL helo_verified = FALSE; BOOL helo_verify_failed = FALSE; uschar *helo_verify_hosts = NULL; +uschar *xclient_allow_hosts = NULL; - uschar *hex_digits = US"0123456789abcdef"; + const uschar *hex_digits = CUS"0123456789abcdef"; uschar *hold_domains = NULL; BOOL host_checking = FALSE; ---- src/globals.h.orig 2007-12-10 19:11:45.337953260 +0300 -+++ src/globals.h 2007-12-10 19:12:42.341201691 +0300 -@@ -367,6 +367,7 @@ +--- src/globals.h.orig 2011-10-10 09:18:13.000000000 +0400 ++++ src/globals.h 2011-10-16 02:34:09.000000000 +0400 +@@ -398,6 +398,7 @@ extern BOOL helo_verified; /* True if HELO verified */ extern BOOL helo_verify_failed; /* True if attempt failed */ extern uschar *helo_verify_hosts; /* Hard check HELO argument for these */ +extern uschar *xclient_allow_hosts; /* Allow XCLIENT command for specified hosts */ - extern uschar *hex_digits; /* Used in several places */ + extern const uschar *hex_digits; /* Used in several places */ extern uschar *hold_domains; /* Hold up deliveries to these */ extern BOOL host_find_failed_syntax;/* DNS syntax check failure */ --- src/macros.h.orig 2007-08-30 18:31:06.000000000 +0400 diff --git a/mail/exim/files/patch-exiqgrep.src b/mail/exim/files/patch-exiqgrep.src deleted file mode 100644 index 32986dad99ad..000000000000 --- a/mail/exim/files/patch-exiqgrep.src +++ /dev/null @@ -1,15 +0,0 @@ -Should be removed once it will get into the mainline release. - -Taken-from: http://bugs.exim.org/show_bug.cgi?id=1103 -Reported-by: Oliver Brandmueller <ob@e-gitt.net> ---- src/exiqgrep.src.orig 2011-05-10 10:29:50.000000000 +0400 -+++ src/exiqgrep.src 2011-05-10 10:31:13.000000000 +0400 -@@ -88,7 +88,7 @@ - chomp(); - my $line = $_; - #Should be 1st line of record, if not error. -- if ($line =~ /^\s*(\w+)\s+((?:\d+(?:\.\d+)?[A-Z])?)\s*(\w{6}-\w{6}-\w{2})\s+(<.*?>)/) { -+ if ($line =~ /^\s*(\w+)\s+((?:\d+(?:\.\d+)?[A-Z]?)?)\s*(\w{6}-\w{6}-\w{2})\s+(<.*?>)/) { - my $msg = $3; - $id{$msg}{age} = $1; - $id{$msg}{size} = $2; |