From 51489f29d3a3274eb2abe849808d92c9a623b73d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Thu, 10 Nov 2022 12:07:43 +0100 Subject: [PATCH] Rel 9; make return_path working for autoreply driver --- autoreply-return-path.patch | 26 ++++++++++++++++++++++++++ exim.spec | 4 +++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 autoreply-return-path.patch diff --git a/autoreply-return-path.patch b/autoreply-return-path.patch new file mode 100644 index 0000000..4b18c7d --- /dev/null +++ b/autoreply-return-path.patch @@ -0,0 +1,26 @@ +diff --git a/src/src/transports/autoreply.c b/src/src/transports/autoreply.c +index 211e32810..ddf241c7b 100644 +--- a/src/src/transports/autoreply.c ++++ b/src/src/transports/autoreply.c +@@ -271,6 +271,7 @@ uschar *logfile, *oncelog; + uschar *cache_buff = NULL; + uschar *cache_time = NULL; + uschar *message_id = NULL; ++uschar *ar_return_path = NULL; + header_line *h; + time_t now = time(NULL); + time_t once_repeat_sec = 0; +@@ -564,8 +565,11 @@ if (file) + } + + /* Make a subprocess to send the message */ +- +-if ((pid = child_open_exim(&fd, US"autoreply")) < 0) ++if (tblock->return_path) ++ ar_return_path = expand_string(tblock->return_path); ++if (!ar_return_path) ++ ar_return_path = US"<>"; ++if ((pid = child_open_exim2_function(&fd, ar_return_path, bounce_sender_authentication, US"autoreply")) < 0) + { + /* Creation of child failed; defer this delivery. */ + diff --git a/exim.spec b/exim.spec index 9475b6f..13b2053 100644 --- a/exim.spec +++ b/exim.spec @@ -23,7 +23,7 @@ Summary(pl.UTF-8): Agent Transferu Poczty Uniwersytetu w Cambridge Summary(pt_BR.UTF-8): Servidor de correio eletrônico exim Name: exim Version: 4.96 -Release: 8 +Release: 9 Epoch: 2 License: GPL v2+ Group: Networking/Daemons/SMTP @@ -61,6 +61,7 @@ Patch5: 90_localscan_dlopen.dpatch Patch6: 90_localscan_dlopen-fixes.dpatch Patch7: linelength-show.patch Patch8: %{name}-spam-timeout.patch +Patch9: autoreply-return-path.patch Patch20: %{name}4-disableSSLv3.patch URL: http://www.exim.org/ @@ -185,6 +186,7 @@ Pliki nagłówkowe dla Exima. %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 install %{SOURCE4} exim4.conf install %{SOURCE14} doc/config.samples.tar.bz2 -- 2.43.0