Backported upstream patch that makes teststuite use SHA-256

i8e changed/i8e/s-nail-14.9.23-1.el8.inferit
Sergey Cherevko 10 months ago
parent e66be03aba
commit a5704cb0a1
Signed by: scherevko
GPG Key ID: D87CBBC16D2E4A72

@ -0,0 +1,53 @@
From f924b374f7c591d72e2326a59ed41108baa526c8 Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
Date: Wed, 6 Mar 2024 11:47:12 +0300
Subject: [PATCH] Backported upstream patch that makes teststuite use SHA-256
Upstream bug: rhbz#2103212
---
mx-test.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/mx-test.sh b/mx-test.sh
index 02028ea..2ca3894 100755
--- a/mx-test.sh
+++ b/mx-test.sh
@@ -10020,7 +10020,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
@@ -10031,7 +10031,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' |
@@ -10049,7 +10049,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
@@ -10074,7 +10074,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.39.3

@ -1,6 +1,6 @@
Name: s-nail Name: s-nail
Version: 14.9.23 Version: 14.9.23
Release: 1%{?dist} Release: 1%{?dist}.inferit
Summary: Environment for sending and receiving mail Summary: Environment for sending and receiving mail
# Everything is ISC except parts coming from the original Heirloom mailx which are BSD # Everything is ISC except parts coming from the original Heirloom mailx which are BSD
@ -11,6 +11,9 @@ Source1: https://www.sdaoden.eu/downloads/%{name}-%{version}.tar.xz.asc
# https://ftp.sdaoden.eu/steffen.asc # https://ftp.sdaoden.eu/steffen.asc
Source2: steffen.asc Source2: steffen.asc
# rhbz#2103212
Patch100: 0001-Backported-upstream-patch.patch
BuildRequires: make BuildRequires: make
BuildRequires: gnupg2 BuildRequires: gnupg2
BuildRequires: gcc BuildRequires: gcc
@ -143,7 +146,8 @@ fi
%changelog %changelog
* Wed Mar 06 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 14.9.23-1 * Wed Mar 06 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 14.9.23-1.inferit
- Backported upstream patch that makes teststuite use SHA-256
- Rebuilt for MSVSphere 8.9 - Rebuilt for MSVSphere 8.9
* Fri Nov 12 2021 Nikola Forró <nforro@redhat.com> - 14.9.23-1 * Fri Nov 12 2021 Nikola Forró <nforro@redhat.com> - 14.9.23-1

Loading…
Cancel
Save