From 7db94b80a8351026772a2ca665d0d3ee91812dc9f4d59a42923f669582bfad5e Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Fri, 2 Aug 2019 20:58:37 +0000
Subject: [PATCH] Accepting request 714913 from
 home:benoit_monin:branches:server:mail

- update to version 1.8.5
- fix sh scripts shebang, in addition to bash scripts

OBS-URL: https://build.opensuse.org/request/show/714913
OBS-URL: https://build.opensuse.org/package/show/server:mail/msmtp?expand=0&rev=89
---
 msmtp-1.8.4.tar.xz     |   3 ---
 msmtp-1.8.4.tar.xz.sig | Bin 310 -> 0 bytes
 msmtp-1.8.5.tar.xz     |   3 +++
 msmtp-1.8.5.tar.xz.sig | Bin 0 -> 310 bytes
 msmtp.changes          |  10 ++++++++++
 msmtp.spec             |   6 +++---
 6 files changed, 16 insertions(+), 6 deletions(-)
 delete mode 100644 msmtp-1.8.4.tar.xz
 delete mode 100644 msmtp-1.8.4.tar.xz.sig
 create mode 100644 msmtp-1.8.5.tar.xz
 create mode 100644 msmtp-1.8.5.tar.xz.sig

diff --git a/msmtp-1.8.4.tar.xz b/msmtp-1.8.4.tar.xz
deleted file mode 100644
index 2f5b7e6..0000000
--- a/msmtp-1.8.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e5dd7fe95bc8e2f5eea3e4894ec9628252f30bd700a7fd1a568b10efa91129f7
-size 337292
diff --git a/msmtp-1.8.4.tar.xz.sig b/msmtp-1.8.4.tar.xz.sig
deleted file mode 100644
index 0078516c09b8c61c275769b76b803bdcb64a298928dc783e1d51ef45ce95eb63..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 310
zcmV-60m=S}0W$;u0SW*e79j*LVYGsax_6rFv-2kdqNJ-HGW|3K0$jkSRR9VJ5Cfv5
zs~$4_G!zU6|91EDgRv$Z8nHMW!cFLzTO!Tu(CN<uX$7&uOWEJO3GSD8@;Ze+krAp^
z9|(t^U!X4!<aVVKH_5$q#=3Pg!jr0Z)M%nn%Kt%g8jefD*kYe>DM-#Qoh2K=8hYMT
zeW87wJVZCLh0f^qU;u*R-j2L!By?q-HHF#>bLz^&kYq655Ti7jGfNMy<;$~<5gy4!
z54rsWoe?4rbbdwUu)&*WEvuVr#SbN(8P`h;K4eIPS;5;%bPcruHGfuB(`!sw6uXf1
z0-I0FKBwBWhl<vCO*9Ra9pH$hqnRnYI-zufmAn}@Ec(s*MH~3$T0IbJ1fWC;*}u1I
IcY_5E>~Q6cqW}N^

diff --git a/msmtp-1.8.5.tar.xz b/msmtp-1.8.5.tar.xz
new file mode 100644
index 0000000..13085ec
--- /dev/null
+++ b/msmtp-1.8.5.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1613daced9c47b8c028224fc076799c2a4d72923e242be4e9e5c984cbbbb9f39
+size 338840
diff --git a/msmtp-1.8.5.tar.xz.sig b/msmtp-1.8.5.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..8d712c29d3257c6e4a165497426d9239811f3c2743c8bca1a76f91e567d79a9c
GIT binary patch
literal 310
zcmV-60m=S}0W$;u0SW*e79j*LVYGsax_6rFv-2kdqNJ-HGW|3K0$nIFQveDH5Cfv5
zs~$4_G{p}G|596y=ZK+X{bNlt^!tw7szqlM2l{o#l|DD)mCLu5?Gk`eHZ*c3tx!^N
zP#L(~2z;)@USaVsO4BKlN@UJZpnhI!TBlKYF@B~vBfiEm$2HIZ#=(P8Q1tGOtcy=K
zN|fkYFl=;d+y{5^sEUJs&qRJu1{HgslkNLkpYN(O+&}U2nMxxW7s#<D7+X=8?-os-
zt)t$&H^?-!))>eq7=1%mxHlu#T-|ABf~z3+&lKIFTqvEQ8FERYKS-Y^@}3$k`3TLk
zAMJPZ@_lQ!V$jf)E=Kgadlz}R|COE=6t=lym*~wLIXCvgHlw>LCaOnL&p&Ae3-)M6
I!JrhXi=a=D0RR91

literal 0
HcmV?d00001

diff --git a/msmtp.changes b/msmtp.changes
index 2f0f9bd..6c91e0a 100644
--- a/msmtp.changes
+++ b/msmtp.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Jul 12 18:22:21 UTC 2019 - Benoît Monin <benoit.monin@gmx.fr>
+
+- update to version 1.8.5:
+  * Fixed OAUTHBEARER.
+  * Support for TLS client certificates via PKCS11 devices, e.g.
+    smart cards.
+  * Various small bug fixes and improvements.
+- fix sh scripts shebang, in addition to bash scripts
+
 -------------------------------------------------------------------
 Wed Apr 24 18:48:28 UTC 2019 - Benoît Monin <benoit.monin@gmx.fr>
 
diff --git a/msmtp.spec b/msmtp.spec
index 0d88bd0..4250199 100644
--- a/msmtp.spec
+++ b/msmtp.spec
@@ -17,7 +17,7 @@
 
 
 Name:           msmtp
-Version:        1.8.4
+Version:        1.8.5
 Release:        0
 BuildRequires:  gnutls-devel
 BuildRequires:  libidn2-devel
@@ -97,13 +97,13 @@ a minimalistic replacement of sendmail.
 
 %prep
 %setup -q
-# fix bash scripts shebang while preserving mtime
+# fix bash and sh scripts shebang while preserving mtime
 for i in scripts/msmtpqueue/*.sh \
          scripts/msmtpq/msmtpq \
          scripts/msmtpq/msmtp-queue \
          scripts/set_sendmail/*.sh \
          scripts/find_alias/*.sh; do
-    sed '1 s|#!/usr/bin/env bash|#!/bin/bash|' $i > $i.new
+    sed '1 s|#!/usr/bin/env \(.*\)|#!/bin/\1|' $i > $i.new
     touch -r $i $i.new
     mv $i.new $i
 done