From 472f0fc3058aa207a92cd1becf3ddb751b4a355c2e551289f62b5e7f3c83a515 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 18 Dec 2023 03:53:16 +0000 Subject: [PATCH] - Add 0001-Avoid-generating-illegal-Envelope-From-with-sendmail.patch OBS-URL: https://build.opensuse.org/package/show/server:mail/libvmime?expand=0&rev=36 --- ...-illegal-Envelope-From-with-sendmail.patch | 31 +++++++++++++++++++ libvmime.changes | 5 +++ libvmime.spec | 7 +++-- 3 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 0001-Avoid-generating-illegal-Envelope-From-with-sendmail.patch diff --git a/0001-Avoid-generating-illegal-Envelope-From-with-sendmail.patch b/0001-Avoid-generating-illegal-Envelope-From-with-sendmail.patch new file mode 100644 index 0000000..5eb5822 --- /dev/null +++ b/0001-Avoid-generating-illegal-Envelope-From-with-sendmail.patch @@ -0,0 +1,31 @@ +From a30f0677dc199bc85e78fc8e97760ed97231d444 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Mon, 18 Dec 2023 04:44:45 +0100 +Subject: [PATCH] Avoid generating illegal Envelope-From with sendmail:// + transport +References: https://github.com/kisli/vmime/pull/285 + +When the ``sender`` function argument is the empty object, vmime +would still attempt to use it at ``sender.getEmail().generate()``, +but that produces just ``@``. As sendmail is called with ``-f @``, +this shows up in postfix's logs as ``<""@>``. +--- + src/vmime/net/sendmail/sendmailTransport.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/vmime/net/sendmail/sendmailTransport.cpp b/src/vmime/net/sendmail/sendmailTransport.cpp +index 8b8b7272..75508ee4 100644 +--- a/src/vmime/net/sendmail/sendmailTransport.cpp ++++ b/src/vmime/net/sendmail/sendmailTransport.cpp +@@ -165,7 +165,7 @@ void sendmailTransport::send( + args.push_back("-i"); + args.push_back("-f"); + +- if (!sender.isEmpty()) { ++ if (sender.isEmpty()) { + args.push_back(expeditor.getEmail().generate()); + } else { + args.push_back(sender.getEmail().generate()); +-- +2.43.0 + diff --git a/libvmime.changes b/libvmime.changes index ca7718f..6ddf4da 100644 --- a/libvmime.changes +++ b/libvmime.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 18 03:46:09 UTC 2023 - Jan Engelhardt + +- Add 0001-Avoid-generating-illegal-Envelope-From-with-sendmail.patch + ------------------------------------------------------------------- Sun Sep 25 18:34:03 UTC 2022 - Jan Engelhardt diff --git a/libvmime.spec b/libvmime.spec index a3e1921..63708fa 100644 --- a/libvmime.spec +++ b/libvmime.spec @@ -1,7 +1,7 @@ # # spec file for package libvmime # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -29,6 +29,7 @@ URL: http://vmime.org/ Source: vmime-%version.tar.xz Patch1: libvmime-nodatetime.diff Patch2: libvmime-soname.diff +Patch3: 0001-Avoid-generating-illegal-Envelope-From-with-sendmail.patch BuildRequires: cmake >= 2.8.3 BuildRequires: gcc-c++ %if 0%{?centos_version} @@ -46,8 +47,8 @@ BuildRequires: xz BuildRequires: ImageMagick BuildRequires: doxygen BuildRequires: inkscape -BuildRequires: texlive-latex BuildRequires: texlive-collection-fontsrecommended +BuildRequires: texlive-latex BuildRequires: tex(courier.sty) BuildRequires: tex(fancyheadings.sty) BuildRequires: tex(pcrr7t.tfm)