Replace and Upgrade: mailx 12.5 to s-nail 14.9.25 (#13627)

archana25-ms · web-flow · commit 302d30d4a7ba · 2025-05-06T18:37:51.000+05:30
diff --git a/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md b/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md
diff --git a/LICENSES-AND-NOTICES/SPECS/data/licenses.json b/LICENSES-AND-NOTICES/SPECS/data/licenses.json
@@ -1973,6 +1973,7 @@
                 "rubygem-thread_order",
                 "rusers",
                 "rust-cbindgen",
+                "s-nail",
                 "samba",
                 "sanlock",
                 "sassist",
diff --git a/SPECS-EXTENDED/s-nail/s-nail-14.9.25-test-sha256.patch b/SPECS-EXTENDED/s-nail/s-nail-14.9.25-test-sha256.patch
@@ -0,0 +1,46 @@
+commit 2336b1c31d16dcb24b8390f2166e25ef51fd6b05
+Author: Tomas Korbar <tkorbar@redhat.com>
+Date:   Thu Aug 1 14:10:09 2024 +0200
+
+    Change hash algorithm in testing to sha256
+
+diff --git a/mx-test.sh b/mx-test.sh
+index 119dbcd..239659c 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 |
diff --git a/SPECS-EXTENDED/s-nail/s-nail-14.9.25.tar.xz.asc b/SPECS-EXTENDED/s-nail/s-nail-14.9.25.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJmfcS2AAoJEN8IL2ruyML/k08P/0nfqvMnGtPKmr0NhCAC4/A7
+gqI9t7UzSKO+nuTPyqWC2DMPzPhZnv5MvwX3I4frXqlIiEYL3JTelCsZJ5VvMst1
+BP+hUqk8m9NM3mWjxwIHJY6khh1kySq7N8+yBbodRLI0ErjEQ2l2sxUacpoFaD+i
+ntQbgjYocZOw2g7LZFzQGzW6ks4GtozqGRPzEXVQE01uT6VKYXk4xAnqkQKI2rOB
+CPNmIWKIAAIguw1tllPsGgYOg3mmOT/T9RvLr6RYKT61FDpo9d0uNRR+rNOo5aQq
+8RSk7U0edqLzeNt7tZNJS3i1bSQKOvoc8ETh97BF84lb9+2yFqOBIkb9wHlCv8JK
+Os0/WvHNCR8ojTyBSYypSKFA8Bdn2+2pdVT+81fSOMoZyeg6VUNO5ncJcSOLcCt+
+na7Fz2Zsa268SPHIUKDC4N7M5Dsor+Hdg08R8usRnWXdg5JDrOoPMMAdgc9wjFuN
+QXOb1+mhSvN8N92HV3hoMYpP2zoTP9PXPWAZm9UwT8mgyeyIS3o7Nqd/JbC7X+Uc
+M+TmhFCNfMLNM6lYguFzhwhEM6FWOKrOzwS4BVi0/LZB6it9assep14RdbROWb9r
+RvGuz1IlM+bhSKcXc3jfbh+AZwoFeoglgUqLZY5HXxnte+7rcafkD6u7u5+upBcF
+Ex9Fv4UvWeVwkQPIm0A5
+=UW6j
+-----END PGP SIGNATURE-----
diff --git a/SPECS-EXTENDED/s-nail/s-nail-makeflags.patch b/SPECS-EXTENDED/s-nail/s-nail-makeflags.patch
@@ -0,0 +1,21 @@
+commit 6b2c08bcd0e1c34db4b1bf9946a201f03595e36d
+Author: Tomas Korbar <tkorbar@redhat.com>
+Date:   Thu Apr 13 10:20:08 2023 +0200
+
+    Remove sync-mutex from MAKEFLAGS
+
+diff --git a/mk/make-config.sh b/mk/make-config.sh
+index 2d7c619..c12d317 100644
+--- a/mk/make-config.sh
++++ b/mk/make-config.sh
+@@ -1555,6 +1555,10 @@ if feat_yes DOTLOCK; then
+    printf "#real below OPTIONAL_PS_DOTLOCK = \$(VAL_PS_DOTLOCK)\n" >> ${newmk}
+ fi
+ 
++
++# remove sync-mutex option
++MAKEFLAGS=$(printf %b "${MAKEFLAGS}" | ${sed} -e "s#--sync-mutex=[a-zA-Z0-9:/]*##")
++
+ for i in \
+    CWDDIR TOPDIR OBJDIR INCDIR SRCDIR \
+          MX_CWDDIR MX_INCDIR MX_SRCDIR \
diff --git a/SPECS-EXTENDED/s-nail/s-nail.signatures.json b/SPECS-EXTENDED/s-nail/s-nail.signatures.json
@@ -0,0 +1,7 @@
+{
+ "Signatures": {
+  "s-nail-14.9.25.tar.xz": "20ff055be9829b69d46ebc400dfe516a40d287d7ce810c74355d6bdc1a28d8a9",
+  "s-nail-14.9.25.tar.xz.asc": "a90c84f46469234f7bb508c644a69cdb9429d6831be2a4c74c7fc1794f35961b",
+  "steffen.asc": "feadd015059dde7c06d971288e8d3ce7cc8087007696ebca2d1232a6e87f0d1a"
+ }
+}
diff --git a/SPECS-EXTENDED/s-nail/s-nail.spec b/SPECS-EXTENDED/s-nail/s-nail.spec
@@ -0,0 +1,220 @@
+Vendor:         Microsoft Corporation
+Distribution:   Azure Linux
+Name:           s-nail
+Version:        14.9.25
+Release:        2%{?dist}
+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
+License:        ISC AND BSD-4-Clause-UC AND BSD-3-Clause AND HPND-sell-variant
+URL:            https://www.sdaoden.eu/code.html#s-nail
+Source0:        https://www.sdaoden.eu/downloads/%{name}-%{version}.tar.xz
+Source1:        https://www.sdaoden.eu/downloads/%{name}-%{version}.tar.xz.asc
+# https://ftp.sdaoden.eu/steffen.asc
+Source2:        steffen.asc
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=2171723
+Patch0:		s-nail-makeflags.patch
+Patch1:		s-nail-14.9.25-test-sha256.patch
+
+BuildRequires:  make
+BuildRequires:  gnupg2
+BuildRequires:  gcc
+BuildRequires:  openssl
+BuildRequires:  openssl-devel
+BuildRequires:  krb5-devel
+BuildRequires:  libidn2-devel
+BuildRequires:  ncurses-devel
+
+Requires(pre):  %{_sbindir}/update-alternatives
+
+Provides:       mailx = %{version}-%{release}
+Obsoletes:      mailx < 12.6
+
+# For backwards compatibility
+Provides: /bin/mail
+Provides: /bin/mailx
+
+
+%description
+S-nail provides a simple and friendly environment for sending
+and receiving mail. It is intended to provide the functionality
+of the POSIX mailx(1) command, but is MIME capable and optionally offers
+extensions for line editing, S/MIME, SMTP and POP3, among others.
+S-nail divides incoming mail into its constituent messages and allows
+the user to deal with them in any order. It offers many commands
+and internal variables for manipulating messages and sending mail.
+It provides the user simple editing capabilities to ease the composition
+of outgoing messages, and increasingly powerful and reliable
+non-interactive scripting capabilities.
+
+
+%prep
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
+
+%autosetup -p1
+
+cat <<EOF >>nail.rc
+
+# Fedora-specific defaults
+set bsdcompat
+set noemptystart
+set prompt='& '
+EOF
+
+
+%build
+%make_build \
+    CFLAGS="%{build_cflags}" \
+    LDFLAGS="%{build_ldflags}" \
+    OPT_AUTOCC=no \
+    OPT_DEBUG=yes \
+    OPT_NOMEMDBG=yes \
+    OPT_DOTLOCK=no \
+    VAL_PREFIX=%{_prefix} \
+    VAL_SYSCONFDIR=%{_sysconfdir} \
+    VAL_MAIL=%{_localstatedir}/mail \
+    config
+
+%make_build build
+
+
+%install
+%make_install
+
+# s-nail binary is installed with 0555 permissions, fix that
+chmod 0755 %{buildroot}%{_bindir}/%{name}
+
+# compatibility symlinks
+for f in Mail mail mailx nail; do
+    ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/$f
+    ln -s %{_mandir}/man1/%{name}.1 %{buildroot}%{_mandir}/man1/$f.1
+done
+
+
+%check
+%if %{defined rhel}
+# SHA-1 is disabled as insecure by RHEL default policies, but used in tests
+export OPENSSL_ENABLE_SHA1_SIGNATURES=yes
+%endif
+make test
+
+
+%pre
+%{_sbindir}/update-alternatives --remove-all mailx >/dev/null 2>&1 || :
+
+
+%files
+%license COPYING
+%doc README
+%{_bindir}/Mail
+%{_bindir}/mail
+%{_bindir}/nail
+%{_bindir}/mailx
+%{_bindir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}.rc
+%{_mandir}/man1/Mail.1*
+%{_mandir}/man1/mail.1*
+%{_mandir}/man1/nail.1*
+%{_mandir}/man1/mailx.1*
+%{_mandir}/man1/%{name}.1*
+
+
+%changelog
+* Tue Apr 29 2025 Archana Shettigar <v-shettigara@microsoft.com> - 14.9.25-2
+- Initial Azure Linux import from Fedora 41 (license: MIT).
+- License verified
+
+* Thu Aug 01 2024 Tomas Korbar <tkorbar@redhat.com> - 14.9.25-1
+- Rebase to 14.9.25
+- Resolves: rhbz#2301265
+- Resolves: rhbz#2295570
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 14.9.24-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Jun 04 2024 Tomas Korbar <tkorbar@redhat.com> - 14.9.24-10
+- Remove RSA-MD from License tag
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 14.9.24-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Dec 11 2023 Nikola Forró <nforro@redhat.com> - 14.9.24-8
+- Replace and obsolete mailx
+
+* Wed Nov 01 2023 Tomas Korbar <tkorbar@redhat.com> - 14.9.24-7
+- Add licenses to fully conform to SPDX
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 14.9.24-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Apr 21 2023 Tomas Korbar <tkorbar@redhat.com> - 14.9.24-5
+- Fix s-nail installation without docs
+- Resolves: rhbz#2188620
+
+* Thu Apr 13 2023 Tomas Korbar <tkorbar@redhat.com> - 14.9.24-4
+- Fix s-nail makeflags
+- Resolves: rhbz#2171723
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 14.9.24-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 14.9.24-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sun Mar 27 2022 Nikola Forró <nforro@redhat.com> - 14.9.24-1
+- New upstream release 14.9.24
+  resolves: #2068768
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 14.9.23-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* 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
+
+* 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
+
+* 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
+  related: #1897928
+
+* Wed Feb 24 2021 Nikola Forró <nforro@redhat.com> - 14.9.22-1
+- New upstream release 14.9.22
+  resolves: #1932122
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 14.9.21-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 22 2021 Nikola Forró <nforro@redhat.com> - 14.9.21-1
+- New upstream release 14.9.21
+  resolves: #1919030
+
+* Mon Dec 14 2020 Nikola Forró <nforro@redhat.com> - 14.9.20-1
+- New upstream release 14.9.20
+  resolves: #1907112
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 14.9.19-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Apr 27 2020 Nikola Forró <nforro@redhat.com> - 14.9.19-1
+- New upstream release 14.9.19
+- Adjust default configuration to be closer to Heirloom mailx
+- Provide alternativized binaries and man pages
+  resolves: #1827969
+
+* Thu Apr 23 2020 Nikola Forró <nforro@redhat.com> - 14.9.18-1
+- Update to the latest upstream release
+
+* Thu Apr 09 2020 Nikola Forró <nforro@redhat.com> - 14.9.17-1
+- Initial package
diff --git a/SPECS-EXTENDED/s-nail/steffen.asc b/SPECS-EXTENDED/s-nail/steffen.asc
@@ -0,0 +1,62 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+V0T07f+MbJVGC4WaNX+cCT/V7vyMm2ue
+=GCaq
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/cgmanifest.json b/cgmanifest.json
