From 245c1812cb3073ff11c822bf90920abd93d68729 Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <sergey.cherevko@softline.com>
Date: Tue, 24 Dec 2024 17:56:11 +0300
Subject: [PATCH] Backported upstream patch that makes teststuite use SHA-256

Upstream bug: rhbz#2103212
---
 SOURCES/0001-testsuite-use-sha256.patch | 52 +++++++++++++++++++++++++
 SPECS/s-nail.spec                       |  6 ++-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/0001-testsuite-use-sha256.patch

diff --git a/SOURCES/0001-testsuite-use-sha256.patch b/SOURCES/0001-testsuite-use-sha256.patch
new file mode 100644
index 0000000..97aa903
--- /dev/null
+++ b/SOURCES/0001-testsuite-use-sha256.patch
@@ -0,0 +1,52 @@
+From 50fac077bfdd23b3764cb9de7bff127bc4fa6a9b Mon Sep 17 00:00:00 2001
+From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
+Date: Tue, 24 Dec 2024 17:54:31 +0300
+Subject: [PATCH] testsuite use sha256
+
+---
+ mx-test.sh | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/mx-test.sh b/mx-test.sh
+index 119dbcd..382b7b8 100755
+--- a/mx-test.sh
++++ b/mx-test.sh
+@@ -10025,7 +10025,7 @@ t_s_mime() {
+       # Sign/verify
+       echo bla | ${MAILX} ${ARGS} \
+          -Ssmime-sign -Ssmime-sign-cert=./.tpair.pem -Sfrom=test@localhost \
+-         -Ssmime-sign-digest=sha1 \
++         -Ssmime-sign-digest=sha256 \
+          -S password-test@localhost.smime-cert-key=${_pass} \
+          -s 'S/MIME test' ./.VERIFY >>${ERR} 2>&1
+       check_ex0 ${_z}-estat
+@@ -10036,7 +10036,7 @@ t_s_mime() {
+          { if(!skip) print }
+       ' \
+          < ./.VERIFY > "${MBOX}"
+-      check ${_z} - "${MBOX}" '335634014 644'
++      check ${_z} - "${MBOX}" '374578409 646'
+       _z=`add ${_z} 1`
+ 
+       printf 'verify\nx\n' |
+@@ -10054,7 +10054,7 @@ t_s_mime() {
+       ${MAILX} ${ARGS} \
+          -Smta=test://./.ENCRYPT \
+          -Ssmime-force-encryption -Ssmime-encrypt-recei@ver.com=./.tpair.pem \
+-         -Ssmime-sign-digest=sha1 \
++         -Ssmime-sign-digest=sha256 \
+          -Ssmime-sign -Ssmime-sign-cert=./.tpair.pem -Sfrom=test@localhost \
+          -S password-test@localhost.smime-cert-key=${_pass} \
+          -s 'S/MIME test' recei@ver.com >>${ERR} 2>&1
+@@ -10079,7 +10079,7 @@ t_s_mime() {
+          { if(!skip) print }
+       ' \
+          < ./.DECRYPT > "${MBOX}"
+-      check ${_z} - "${MBOX}" '2602978204 940'
++      check ${_z} - "${MBOX}" '101680387 942'
+       _z=`add ${_z} 1`
+ 
+       (openssl smime -decrypt ${_ossl} -inkey ./.tkey.pem -in ./.ENCRYPT |
+-- 
+2.43.5
+
diff --git a/SPECS/s-nail.spec b/SPECS/s-nail.spec
index e6f7a82..f30bbf2 100644
--- a/SPECS/s-nail.spec
+++ b/SPECS/s-nail.spec
@@ -1,6 +1,6 @@
 Name:           s-nail
 Version:        14.9.24
-Release:        11%{?dist}
+Release:        11%{?dist}.inferit
 Summary:        Environment for sending and receiving mail, providing functionality of POSIX mailx
 
 # Everything is ISC except parts coming from the original Heirloom mailx which are BSD
@@ -13,6 +13,7 @@ Source2:        steffen.asc
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=2171723
 Patch0:		s-nail-makeflags.patch
+Patch1000:		0001-testsuite-use-sha256.patch
 
 BuildRequires:  make
 BuildRequires:  gnupg2
@@ -118,6 +119,9 @@ make test
 
 
 %changelog
+* Tue Dec 24 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 14.9.24-11.inferit
+- Backported upstream patch that makes testsuite use sha256 (rhbz#2103212)
+
 * Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 14.9.24-11
 - Rebuilt for MSVSphere 10