From 25db234386acba5cf133b91bd2057b69369e5474073264e825a50cc42c5876bb Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Fri, 14 Jun 2024 07:40:46 +0000
Subject: [PATCH] - update to version 1.8.26 - require libgsasl >= 2.1.0:
 needed for supporting SCRAM

OBS-URL: https://build.opensuse.org/package/show/server:mail/msmtp?expand=0&rev=125
---
 msmtp-1.8.25.tar.xz     |   3 ---
 msmtp-1.8.25.tar.xz.sig | Bin 310 -> 0 bytes
 msmtp-1.8.26.tar.xz     |   3 +++
 msmtp-1.8.26.tar.xz.sig | Bin 0 -> 310 bytes
 msmtp.changes           |  11 +++++++++++
 msmtp.spec              |  10 +++++-----
 6 files changed, 19 insertions(+), 8 deletions(-)
 delete mode 100644 msmtp-1.8.25.tar.xz
 delete mode 100644 msmtp-1.8.25.tar.xz.sig
 create mode 100644 msmtp-1.8.26.tar.xz
 create mode 100644 msmtp-1.8.26.tar.xz.sig

diff --git a/msmtp-1.8.25.tar.xz b/msmtp-1.8.25.tar.xz
deleted file mode 100644
index 931f57f..0000000
--- a/msmtp-1.8.25.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2dfe1dbbb397d26fe0b0b6b2e9cd2efdf9d72dd42d18e70d7f363ada2652d738
-size 418264
diff --git a/msmtp-1.8.25.tar.xz.sig b/msmtp-1.8.25.tar.xz.sig
deleted file mode 100644
index ffe5714ccd3e2271d6a81682a0c9d966020c6510ded256b184b7bcae1654aa6f..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 310
zcmV-60m=S}0W$;u0SW*e79j*LVYGsax_6rFv-2kdqNJ-HGW|3K0%bmtKL82|5Cfv5
zs~$4_G~v7l|3wT)Jg%eDzxlX5Vw{969W?1UD{Fg=Pq$K*nEpT<$&idTiKwZevv1$y
zL`t<CxZ(YSgEfckqhTYb_jGoH^kSb+aNv?BGtYE2jx2|N1jrJZ)-!!Y!MjHbKd&)9
zC6Im^QjS?lzJh^Vy@IynPWGEx96Ww~X5s2=SaKIP@BK<1KG*J=7qg=|uS`%Z4@B$0
ztXk7~D@~R<G5M`q&&g5l9{17592C_E!^EAmn&9ODFWqz!PgaKvY#fFAi=}kTY9_h=
z#`pIJeH-1%l(YI6U-&RJKhdQ=HD+n52^@_8dKIZ}YAma5hca!8Y4jCnDDqSLJwaua
IMsFJJ*@EAY$N&HU

diff --git a/msmtp-1.8.26.tar.xz b/msmtp-1.8.26.tar.xz
new file mode 100644
index 0000000..a89a0ef
--- /dev/null
+++ b/msmtp-1.8.26.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6cfc488344cef189267e60aea481f00d4c7e2a59b53c6c659c520a4d121f66d8
+size 419644
diff --git a/msmtp-1.8.26.tar.xz.sig b/msmtp-1.8.26.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..7dbc903428f0c6b36e6bc57fe9ae4265509b5e18b24c467e59704e60d18c01af
GIT binary patch
literal 310
zcmV-60m=S}0W$;u0SW*e79j*LVYGsax_6rFv-2kdqNJ-HGW|3K0%kHU9RLam5Cfv5
zs~$4_G*N8`0F6TOsa=nK1L|Fxt_4wf%19({&5T-kHay8XGRP0}FJ$TCV(uqAl3}fA
z#1|UXso{+DRu?>v>IIlxST^YobhV${7K-h9O>mzwL35oxuXt{^gM4*Or`y@HdwVgz
zy*T^^IUWNjJ^b-F^u2<an|bjQTcNXFrD3bzhK4-eReaOz?HVa|ioJl#oHFOnlSZ&h
zrT=74u%KiVKA&P9*`%ku*{s2cgkzJDwa91Wom90zjLCPn9D*aD&6e5B36Ej=x}!_n
zafxc!2pVoA&5m~Ji6nR>W1MyEsj?O#TeK<>MYlIoKOs)2LU4-y*%8pqIFDG5Tq`nm
I?J&c9T3#ZN(f|Me

literal 0
HcmV?d00001

diff --git a/msmtp.changes b/msmtp.changes
index 6fbe53f..0ce160f 100644
--- a/msmtp.changes
+++ b/msmtp.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Jun 13 16:35:20 UTC 2024 - Benoît Monin <benoit.monin@gmx.fr>
+
+- update to version 1.8.26:
+  * Add support for SCRAM-SHA-256-PLUS and SCRAM-SHA-1-PLUS
+    authentication, and prefer SCRAM methods over the PLAIN method
+    because of their superior properties.
+  * With --read-envelope-from, a Resent-From header is now used if
+    it is present and appears before any From header
+- require libgsasl >= 2.1.0: needed for supporting SCRAM
+
 -------------------------------------------------------------------
 Sun Oct 29 18:32:58 UTC 2023 - Benoît Monin <benoit.monin@gmx.fr>
 
diff --git a/msmtp.spec b/msmtp.spec
index 9e5ff73..de0451d 100644
--- a/msmtp.spec
+++ b/msmtp.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package msmtp
 #
-# 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,7 +17,7 @@
 
 
 Name:           msmtp
-Version:        1.8.25
+Version:        1.8.26
 Release:        0
 BuildRequires:  gnutls-devel >= 3.4
 BuildRequires:  libidn2-devel
@@ -28,7 +28,7 @@ BuildRequires:  xz
 BuildRequires:  libsecret-devel
 %endif
 %if 0%{?suse_version}
-BuildRequires:  libgsasl-devel
+BuildRequires:  libgsasl-devel >= 2.1.0
 %endif
 # for the directory
 %if 0%{?centos_version}
@@ -40,11 +40,11 @@ BuildRequires:  vim-base
 %endif #centos_version
 %if 0%{?suse_version}
 Requires(post): %install_info_prereq
-Requires(preun):%install_info_prereq
+Requires(preun): %install_info_prereq
 %endif
 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
 Requires(post): /sbin/install-info
-Requires(preun):/sbin/install-info
+Requires(preun): /sbin/install-info
 %endif
 Summary:        Lightweight SMTP Client
 License:        GPL-3.0-or-later