diff --git a/exim-4.96.2.tar.bz2 b/exim-4.96.2.tar.bz2 deleted file mode 100644 index 1be1206..0000000 --- a/exim-4.96.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7b9c247a8dcdf72b37ef4a6db0a744f6d34f65b40ef376265ddeb35610bb432 -size 2047572 diff --git a/exim-4.96.2.tar.bz2.asc b/exim-4.96.2.tar.bz2.asc deleted file mode 100644 index 9e67cb1..0000000 --- a/exim-4.96.2.tar.bz2.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEE0L/WueylaUpvFJ3Or0zGdqa2wUIFAmUsA1YACgkQr0zGdqa2 -wUJeoAf/cXUMEXTGR95mKUhOoNkvGQG2LLIxZq287vtmrvOXtlwKnD80uDeTLP47 -QSeFSOEQBGWSwPVCZXNZpyy+p7kNKASmY3a+Xxj6KsNdzZ75pbC4FSVbqyVKrfXz -kc5LJ8Uh0etNs9+xQntAjaQlcVLEBYjyJ7fsYGh+ewzsdORVhce730XZlwYAOvz9 -nUUr/8jK5fUdA4rsdaF20Va9bY+Fqy1cnGIYRuQ7ILze4SZJhAh+3fQ/fmLRNWPx -wdmmdun43ywj16X8p0h3JfH7xBZvWYKHQBKk9aFnTAD3pPdIGBkg3DXrQnunjCmE -zQVxl6di1f57un18cBE+Xd0oxO1E8Q== -=XRnt ------END PGP SIGNATURE----- diff --git a/exim-4.97.tar.bz2 b/exim-4.97.tar.bz2 new file mode 100644 index 0000000..a1735ed --- /dev/null +++ b/exim-4.97.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0f6141b126a929e431d6ac8af3d6a1e310621ffe1f628b7b0de1e9b05488bfd +size 2077471 diff --git a/exim-4.97.tar.bz2.asc b/exim-4.97.tar.bz2.asc new file mode 100644 index 0000000..ad45dbb --- /dev/null +++ b/exim-4.97.tar.bz2.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQFEBAABCAAuFiEEqYbzpr1jd9hzCVjevOWMjOQfMt8FAmVGQN8QHGpnaEB3aXpt +YWlsLm9yZwAKCRC85YyM5B8y38ukCADMRsjAIBe/tFwrh0pXkHQNJISfuZaCjGWL +KzIF3LEAaPhV2VSeFIUjBIiLmxjrIAMev3hbHk/O49XEzXXsobazF/G/zNJeMTY9 +uWEc+gzkztD5I1eWVbEp0MxHxo7IGf3NWHqKzA3kOdYpPhTdyX9Td9uIYvNnXSfj +Byo8OxUExu34iLaUB9g5I6ja3o799rxZ9XWHdOTIDjD96fYEQq2N0GVsuwa+Gy76 +ePZPS4KONmYRbr0Mhgk3CpFzFwn+x4xoNKmFvxNRdq1qeQOqiEr07dS0/Tk210LZ +A5Xg5mooj877FeXxUNlYVcJgqZpt/pRFdgptEfQhyhCOX24TiHgU +=mtGN +-----END PGP SIGNATURE----- diff --git a/exim.changes b/exim.changes index 390d251..1c05343 100644 --- a/exim.changes +++ b/exim.changes @@ -1,3 +1,7 @@ +Tue Nov 7 09:03:46 UTC 2023 - Peter Wullinger + +- update to exim 4.97 + ------------------------------------------------------------------- Mon Oct 16 08:45:01 UTC 2023 - Peter Wullinger diff --git a/exim.spec b/exim.spec index da5c8cb..77b600a 100644 --- a/exim.spec +++ b/exim.spec @@ -59,6 +59,8 @@ Conflicts: sendmail-tls Provides: smtp_daemon %if %{?suse_version:%suse_version}%{?!suse_version:0} > 800 Requires: logrotate +BuildRequires: perl-File-FcntlLock +Requires: perl-File-FcntlLock %if 0%{?suse_version} > 1220 BuildRequires: pkgconfig(systemd) %{?systemd_requires} @@ -74,7 +76,7 @@ Requires(pre): group(mail) %endif Requires(pre): fileutils textutils %endif -Version: 4.96.2 +Version: 4.97 Release: 0 %if %{with_mysql} BuildRequires: mysql-devel @@ -105,7 +107,6 @@ Source40: exim.service Source41: exim_db.8.gz Patch0: exim-tail.patch Patch1: gnu_printf.patch -Patch2: patch-no-exit-on-rewrite-malformed-address.patch %package -n eximon Summary: Eximon, an graphical frontend to administer Exim's mail queue @@ -149,7 +150,6 @@ once, if at all. The rest is done by logrotate / cron.) %setup -q -n exim-%{version} %patch0 %patch1 -p1 -%patch2 -p1 # build with fPIE/pie on SUSE 10.0 or newer, or on any other platform %if %{?suse_version:%suse_version}%{?!suse_version:99999} > 930 fPIE="-fPIE" diff --git a/patch-no-exit-on-rewrite-malformed-address.patch b/patch-no-exit-on-rewrite-malformed-address.patch deleted file mode 100644 index 3aa7b91..0000000 --- a/patch-no-exit-on-rewrite-malformed-address.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e7ec503729970a03d4509921342bc81313976126 Mon Sep 17 00:00:00 2001 -From: Jeremy Harris -Date: Tue, 12 Jul 2022 22:14:04 +0100 -Subject: [PATCH] Fix exit on attempt to rewrite a malformed address. Bug 2903 - -diff --git a/src/rewrite.c b/src/src/rewrite.c -index bfd78b5f1..90614e626 100644 ---- a/src/rewrite.c -+++ b/src/rewrite.c -@@ -497,15 +497,14 @@ while (*s) - - if (!recipient) - { -- /* Handle unparesable addresses in the header. Slightly ugly because a -+ /* Log unparesable addresses in the header. Slightly ugly because a - null output from the extract can also result from a header without an -- address, "To: undisclosed recpients:;" being the classic case. */ -+ address, "To: undisclosed recpients:;" being the classic case. Ignore -+ this one and carry on. */ - - if ((rewrite_rules || routed_old) && Ustrcmp(errmess, "empty address") != 0) -- { - log_write(0, LOG_MAIN, "rewrite: %s", errmess); -- exim_exit(EXIT_FAILURE); -- } -+ - loop_reset_point = store_reset(loop_reset_point); - continue; - }