Compare commits

..

No commits in common. 'c9' and 'i8e' have entirely different histories.
c9 ... i8e

4
.gitignore vendored

@ -1,2 +1,2 @@
SOURCES/s-nail-14.9.22.tar.xz
SOURCES/steffen.asc
SOURCES/s-nail-14.9.23.tar.xz
SOURCES/s-nail-14.9.23.tar.xz.asc

@ -1,2 +1,2 @@
4e50d4c17e8365c7eb7155ef7ea39d7974428001 SOURCES/s-nail-14.9.22.tar.xz
84fd0c1332373d331b461940d0f1cc61081ea421 SOURCES/steffen.asc
28103190bb366c4cfd7ccf3084d55cdff4260048 SOURCES/s-nail-14.9.23.tar.xz
33deadb8c62e89d59031e62a17d637e5deb264f1 SOURCES/s-nail-14.9.23.tar.xz.asc

@ -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

@ -0,0 +1,3 @@
# s-nail
Environment for sending and receiving mail

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABCgAGBQJgNa5QAAoJEN8IL2ruyML/zhEQAJFoX8pXBeCKPZRFS8jCzjQT
5YGGfF3JMhoK4C2rnF00Z5hwNR7TlIh4UxN8GbU+ONsRlOQj+RUbvriZtI050WF+
VC6QfDVi7lB6OwAwDL94em1tNPbv3tFPWjlQBYH03u/omH0ybN5MBC2uZiAPVlYS
q/m0dgB3DWx3ljHgsSQqObXanGH1uKxbhof55KSZurMF3c+PbHe7BgJveewjhOo2
3ldpS+Z/AFI8sWOeYQezd8sHGfOrp8T/kcIighYaU9UOE/tTCaUvyuvmCFLe27H6
4GV6wH5uwv/Sx8rOhGJAXT6nOFTS3mSCsyO+tz4XWDfOTPWZnJNVP+5uaqJcj6Tu
JxJesebY8RnPBiKyHYH2ufIIaJe9ZSbobzXzh071g6iW70CtlYlCQB/0EEDmcd9c
bZ6HAl1RvlS1P1bvDwiGoIQrp7Ma7KPwX0zIbUpchvxUOka/XVh5+yDWxszDvxzV
72DyN6sc/bQyBJOLOVpIB/IoTNiCMnhNDt2gJYojBQuhWIvCDeV0nNPlYxk99p1J
kR0pfQ6Mpyi7aBAnJWv5eE939JjlzxTx/rp0Be+3UKizjEiWK83Z40UUOJDzEKkP
CT/BQBFCh98wCpRKiKWdY71YaamHLogGbAvN8PUMrNqbYQ+tyqtiewPtkAgEhfGg
OSnaw60I2rhjZT85oajX
=WhVY
-----END PGP SIGNATURE-----

@ -0,0 +1,62 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
V0T07f+MbJVGC4WaNX+cCT/V7vyMm2ue
=GCaq
-----END PGP PUBLIC KEY BLOCK-----

@ -1,6 +1,6 @@
Name: s-nail
Version: 14.9.22
Release: 6%{?dist}
Version: 14.9.23
Release: 1%{?dist}.inferit
Summary: Environment for sending and receiving mail
# 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
Source2: steffen.asc
# rhbz#2103212
Patch100: 0001-Backported-upstream-patch.patch
BuildRequires: make
BuildRequires: gnupg2
BuildRequires: gcc
@ -127,30 +130,41 @@ fi
%files
%license COPYING
%doc README
%ghost %{_bindir}/{Mail,mail,mailx,nail}
%ghost %{_bindir}/Mail
%ghost %{_bindir}/mail
%ghost %{_bindir}/mailx
%ghost %{_bindir}/nail
%{_bindir}/mailx.%{name}
%{_bindir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}.rc
%ghost %{_mandir}/man1/{Mail,mail,mailx,nail}.1*
%ghost %{_mandir}/man1/Mail.1*
%ghost %{_mandir}/man1/mail.1*
%ghost %{_mandir}/man1/mailx.1*
%ghost %{_mandir}/man1/nail.1*
%{_mandir}/man1/mailx.%{name}.1*
%{_mandir}/man1/%{name}.1*
%changelog
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 14.9.22-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* 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
* Fri Nov 12 2021 Nikola Forró <nforro@redhat.com> - 14.9.23-1
- New upstream release 14.9.23
resolves: #2022552
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 14.9.22-6
- Rebuilt with OpenSSL 3.0.0
* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 14.9.22-5
- Rebuilt for RHEL 9 BETA for openssl 3.0
Related: rhbz#1971065
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 14.9.22-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri May 07 2021 Nikola Forró <nforro@redhat.com> - 14.9.22-4
- Provide /bin/mail{,x} for backwards compatibility
resolves: #1958360
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 14.9.22-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Apr 14 2021 Nikola Forró <nforro@redhat.com> - 14.9.22-3
- Remove globs in %%files
* Tue Mar 16 2021 Nikola Forró <nforro@redhat.com> - 14.9.22-2
- Fix alternatives

Loading…
Cancel
Save