diff --git a/0001-Avoid-generating-illegal-Envelope-From-with-sendmail.patch b/0001-Avoid-generating-illegal-Envelope-From-with-sendmail.patch deleted file mode 100644 index 5eb5822..0000000 --- a/0001-Avoid-generating-illegal-Envelope-From-with-sendmail.patch +++ /dev/null @@ -1,31 +0,0 @@ -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/_service b/_service index fa91011..f84c5ec 100644 --- a/_service +++ b/_service @@ -1,14 +1,14 @@ - + git https://github.com/kisli/vmime - fc69321d5304c73be685c890f3b30528aadcfeaf + c3c6242ed135f9eca805380394791d17b0fc7a63 v0.9.2 - 0.9.2.@TAG_OFFSET@ + 0.9.2+g@TAG_OFFSET@ - + *.tar xz - + diff --git a/debian.changelog b/debian.changelog index b962619..5e808bc 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -libvmime (0.9.2.175-0) unstable; urgency=low +libvmime (0.9.2+g188-0) unstable; urgency=low * Initial package. diff --git a/debian.libvmime-suse5.install b/debian.libvmime-suse6.install similarity index 100% rename from debian.libvmime-suse5.install rename to debian.libvmime-suse6.install diff --git a/libvmime-soname.diff b/libvmime-soname.diff index db38f06..9785191 100644 --- a/libvmime-soname.diff +++ b/libvmime-soname.diff @@ -19,7 +19,7 @@ Index: vmime-0.9.2.165/CMakeLists.txt # . Interfaces added (upward-compatible changes): AGE++ # . Interfaces removed: AGE=0 -SET(VMIME_API_VERSION_CURRENT 1) -+SET(VMIME_API_VERSION_CURRENT 5) ++SET(VMIME_API_VERSION_CURRENT 6) SET(VMIME_API_VERSION_REVISION 0) SET(VMIME_API_VERSION_AGE 0) diff --git a/libvmime.changes b/libvmime.changes index 6ddf4da..1e1af17 100644 --- a/libvmime.changes +++ b/libvmime.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Dec 31 16:19:00 UTC 2023 - Jan Engelhardt + +- Update to snapshot 0.9.2+git188 (c3c6242ed) + * Fix emission of bugs Envelope-From to sendmail:// transports. + * Add parsing feedback via parsingContext +- Drop 0001-Avoid-generating-illegal-Envelope-From-with-sendmail.patch + (merged) + ------------------------------------------------------------------- Mon Dec 18 03:46:09 UTC 2023 - Jan Engelhardt diff --git a/libvmime.dsc b/libvmime.dsc index cfb00d7..1b7f6cc 100644 --- a/libvmime.dsc +++ b/libvmime.dsc @@ -1,7 +1,7 @@ Format: 1.0 Source: libvmime Architecture: any -Version: 0.9.2.175 +Version: 0.9.2+g188 DEBTRANSFORM-RELEASE: 1 Maintainer: openSUSE Homepage: https://opensuse.org/ diff --git a/libvmime.spec b/libvmime.spec index 63708fa..13567a4 100644 --- a/libvmime.spec +++ b/libvmime.spec @@ -1,7 +1,7 @@ # # spec file for package libvmime # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,8 +17,8 @@ Name: libvmime -%define lname libvmime-suse5 -Version: 0.9.2.175 +%define lname libvmime-suse6 +Version: 0.9.2+g188 Release: 0 Summary: Library for working with RFC 5322, MIME messages and IMAP/POP/SMTP License: GPL-3.0-or-later @@ -29,7 +29,6 @@ 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} @@ -136,7 +135,7 @@ mkdir -p "$b/%_datadir" %files -n %lname %license COPYING -%_libdir/libvmime-suse.so.5* +%_libdir/libvmime-suse.so.6* %files devel %_includedir/vmime diff --git a/vmime-0.9.2+g188.tar.xz b/vmime-0.9.2+g188.tar.xz new file mode 100644 index 0000000..faf80a2 --- /dev/null +++ b/vmime-0.9.2+g188.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e470c729d3dc037a63785bcebe8ab75dda8b1156fe10c26b5fa113d5249e436 +size 387556 diff --git a/vmime-0.9.2.175.tar.xz b/vmime-0.9.2.175.tar.xz deleted file mode 100644 index d832a15..0000000 --- a/vmime-0.9.2.175.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:99be125a6a73ac839e8f4b423c5cceb59ab89fcfc9d7c9323f5cbf5201fa44aa -size 386332