Compare commits

...

No commits in common. 'c10-beta' and 'c9' have entirely different histories.
c10-beta ... c9

3
.gitignore vendored

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

@ -1 +1,2 @@
11bafd0dbb78b45f36f802693233499a9f307e37 SOURCES/s-nail-14.9.24.tar.xz
4e50d4c17e8365c7eb7155ef7ea39d7974428001 SOURCES/s-nail-14.9.22.tar.xz
84fd0c1332373d331b461940d0f1cc61081ea421 SOURCES/steffen.asc

@ -0,0 +1,16 @@
-----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-----

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABCgAGBQJiPzRPAAoJEN8IL2ruyML/fxEP/3YeumLoT1/szWF/qYxlhY9F
s5tjXJMheqwKn0XCNGeZMo305ob76VVj6ECT6UUZVfjL4qOVxm3Av/yqvnrbDlFX
Ekm7ZZ2rx04cYYOvdenEFCoX1SfAqSvSd2mtSbDAgMRkp8Qzt6tJYTmDuJ55GKtC
9xYskO7jprl4qm+gqXa4Z3QHP0rn5a3pNUTQOQuylzeG42MqviJa0jp9CaxRi0qv
tkWp5z0nTTmI4StCZiSVNXCt52dKOoM0NbrqRc4LVVZE/em3hR5nhyqj/p/Jg2Xq
eO4Xr/JlRD7JEqyVDfeGZZZd7PnjgQmwxMBKFhssuCka1teg+n5nZYGIT98uEBsz
M+5PfewpDt4y+zJLiO8GKI1Z2ILYc+LByliMr7ssSxy2dOPC9e22w2NlbZhmWztG
T87aBmgORm9HWYwtFrrWLpua91AeLYvxUY5nGLPy/z8OTj1kZUFBbv1pJ6PJs85S
AI5lrl3sdAp1a3pLqtNhvg9iZ5oCCb3VfZCrxC4GMWYUT3qxRuDwDLR0MH3aZCfQ
zn2ICNDr+TM1uSNIUb4kyqTXfj4T9SHl5esrlSnU5EcB8CrOWEVDe1CIWoYfKnDs
zmADD0k7CT8QkEL8D8IrphBfk3Jrc+F6D1qbpA7nzPHcBV7MKggrAyt2txdV9EGt
hQm4vgHCDVw9XmH94RPF
=muRn
-----END PGP SIGNATURE-----

@ -1,21 +0,0 @@
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 \

@ -1,62 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQINBFogZb4BEADX1RCLsdnBq0IZiNb5HZFsp2G8BnWVM2NJJFbQFI5g+aPhO+5a
gWM2vgqn/a8zpr2OyP5/rliqMY7sxmOFEYoND0OnekXU7rVbUWpY87uK0qBxO5lo
ErQfs8sjhjH3RNKsgXyUZVN3a4HCXL2ortS8EJvcQ/2NMAEMAHEG+V4HK+nFNB4u
OpYa+QHLmTHOuOlhbDIw/dRCWP8o2+e60Juf6KXonA00dSoaMv6lL2UU3znvLHuF
zYBG4fjm2Rt5gDfehCHzeWWpc/zSTDAQf4oaFfn2JXd3gd1s5k8nKn60azONjBQ7
3dcpxcmltCYnHVohjJ/oFYSSvWG281P2Ayj67PPdekhuHhifLSut9eKVLVeUsrXo
wc8GDULIGbsy5BMI9UyHPElB+8UnRQNe3USRCQ6Hr+SYsllLLxpL0O5MrT4ELSFF
0u6naJzm7+Tq4AqgXcJ0x4siW5ipOwmZYWMbA1dtrgk7cFiUhLl2GWxf54ZvUA60
D7RfajqAyFXBEGcv37JItj0pbY8R5lqn8jDPOtcdMWBKSVg9lETt+oO30bOFSQok
QiCJc9r3bimmk+BpxK4PN3pIKKkF7Og8nggIiYzPBWVLtpGcRHOOKSYL9S6mLJPw
dt2eU6JCNunBuT0DCgJQCsc2a0V2SA/NSPcWBqozq74QFnXxG2Qr21U7IwARAQAB
tCVTdGVmZmVuIE51cnBtZXNvIDxzdGVmZmVuQHNkYW9kZW4uZXU+iQI9BBMBAgAn
AhsDBgsJCAcDAgYVCAIJCgsDFgIBAh4BAheABQJbExa9BQkkqYNmAAoJEDCJZLUY
g6DdIjoQANSSnoG7E4VRbQ/jt6k2zKi2JDnz1J0r5DCmMOI9GfGC7mzTewbarbyo
rKsOucC+SBBW7YNvUG/p24NK55ig2iXDqmFgKSP1iZ6HrrQrcJOcqdysxk6Mh/Vb
RroNKXYDnW6xtSrgEgHzxv2Py/4hI8p6G/bkRMZH3LIVsUS11cedOMrxyZbHZIc/
6VOfxNvt1cd1hZGACzX7sNSjZP8vdxK2zJwKTxsQn6tHJ4RY5qdvbfxxhl1d+JLb
rZoDjXS0DbHCNPGLyFgTfF66FqceqlprIxpXNspChaJRPkclKLp8PXPdzpGmsN54
8xNp3Ly+cXKw+ddvi76KHNndUP4FJefSiTvk4Sopzp9JQcYk4nSu0Slu+Oy0+34g
u7foKla0rgWNLzcLXzptkJ7/kqzi+OcZa0XKG3vTXT2MHr2/emK+675jz5e5RD4c
vKC3v4bxDj9Wktdq15mGHIPkVXpxe7JsHM2WWBTOGzPg+CO5Svh25rnnS6SBf2bH
/DbSPn6dfUQ98bCWTEBGDidjk1NjkRYFsJAmyw9tDk8b8orhbEBp3cSSw2bhD2Sv
CzCwr0A9OuqQdFmbT4hEHQiCliJTdAMxc/C3EKA+MRo8dvZBWvOw43zhDVHGnrrG
9YE0JZghAuZ1QEBBKvBFNmi3leCTltrHLaODutuHHqRPnolFBo+cuQINBFsSq/cB
EAC0RPc7uMOo/9Mc/oIgxTjSLn68bioste9qJtO0iKJqu+5xd0FFAdlP1JzL4+r2
nAl3qIev1EVIVx9hUeB5eLtZWR+OADmESSacdvYuPaDdLfIhqBI1kLH0jMS+lPHN
o3bsjjGmn2av511JEB4twyMib1Isl46L14hmvbt0vPXoE8+x8EogUkg7H2pdhN4Q
nz5j2WT0iVoMXnqG7ADeyjTOHKcJdnbmGQbdDaBBFKTE6QoYLSKX7SBb5DCmqHfo
uN69lL/GeeHr/c9/XSy62yl/IUWvHE6TDXdGgdR/WjrYS9q5WZq0wXtoEWKGHWBD
ewsfqvwn+K10v/ZWEjSMeFnFbEtf9ddRH7nYrrduL7G/YNXC1Pb0l8+WsVyAONBl
urj5RXQLHdGICY0nyFH9LNY9OKnGBPIR2aRva0xU0xvpvUanxFC5s4zfvBL7on02
cTRwOZ8W6/uiIFS6Cog3BLMjVBfg7E6ofMgTeOdfGXM63kl+tP8Mykn554fqhucw
GwK28/jCQFTkk8zbZ9TmbD+zJEn2H4TXr92g3wzuIWEENgwhDCFa38ZpNH4t1nfK
xh+2nK/iLBagtFH7/ljkBYoT9GEVMtyvEijpPx1mh1+CKOseI1ZPYNvjSgOBpcIH
2xwtGjp8g9040QBpCNABBjcgy8XHvJgu6KpOZjp6vyDX0wARAQABiQQ+BBgBAgAJ
BQJbEqv3AhsCAikJEDCJZLUYg6DdwV0gBBkBAgAGBQJbEqv3AAoJEN8IL2ruyML/
RckP/0MYILZhSJgDz/TkrU8whK0B4EeqSI9C0k3ofjLf8VyYmWztOLPcygQmH0UO
OqaG60T+RJlg7AjOI5AS5OoDS94VL1MQW1M41lHZO9CkV4Ww6QB0ukHHZuiOe18b
kgS/mgySn66ALWD3gO3bZBESCKtK3JnPNo6xhR+4WUTOZy1bxRk275FFfkXPOEnf
e3Q8iafQOtiGca16PcL8ehe7PW2RMUG0GcFIdh/L1L7I1DAmhaHzSnMUc1UVmU/q
F/OxE6f5ZjrFCaRUxpu2jzKneGIJa/JSKKlrgZmZOjs3hZuWL6PgOFWuHeyjTHgs
dLGXTrcFIwr3S0lc1OqsuufokmEHbSMGVfZqNtNoJUabj5DAw3e8vhKu7mQIoEZ2
i9/CH+AWZfGmsxZIUmHXbpJAdwtqdSxbsR+rONwvy1eZMycDdC18yKE2KSoxfyti
XN2aeMpy6CLfpcxuh/9MoACUs/O3Yft2602zs1KQaHHlrWnrhOMi/8drnh8N6K1o
kZTc+OImBHnBBuAOsPxx478tMvU5LUW3Plw25bzNv4clZalLKQKza09Unj8HYAkh
YeT3/usyTYfCUI6+JfcxFJ8/l4kYb0buv21ofREzpNIEEBaoS9avTk3LE7SXFjuA
ElR3XjY0US5DXWdjt9RUyPN1j6hTn9GxJ/dRl8XOWFQ1RzahrwgP/308SgiP7mzG
t4tRUdcQCBB3pbmBXJV7wACmawOfQddc+rbLtL+akh7VkrmPcmSMZ9chdbMUuqNE
Auw67+YzjZJNYHlA/cHQ6PYCHxTahMFhMBOM6TIvBcuzT7iIbqF2EjXLfiESslAT
vit7n3R/ActSu7pabcRE2Ep7UzUY28+xGkfdFOrm9X/65tGo39F2UELes4EjMvNh
jWfR0Y7grjIF9SK3o+QgN7niM6lEvXRDXwh+RLpG4MAisJsFYbMvX6v/27HmCVEK
ZLVOdXxPDTBmK2ap6qnIct8otCNSTB3VauSd4p/IIksP2gynWjvdzIO5p+O0M/pi
xzvvK3OknRt2S02ShCHm8nIkGzElRhUQahSMCfT1NhWpn5IUpkpepo2WH3m0OTlA
zbpvtn+ZmsgzCf8Ap8SmXgLR/XGQSYnYuwqA0M3tp6DM1zM9D1xtu/2/m3tsLusW
+NwJ97yZ50yoOUKd2hmKWmPH2JAea4ZtKwIE15Cq2u/1wDAqVoAKLnM5cd6yI7+B
tbTgqI+dojGKYirC/Z5RqyvwQfmzNCcoYQLjY1g9mY7ACkBKK10tmkJ1K3SMLrwY
kmQ2QWxpdN2N68BJ7A4GxZrT4yICuJlbXshKw3QrbAUD9CUSO7MtJFkoaIjIoHZ5
V0T07f+MbJVGC4WaNX+cCT/V7vyMm2ue
=GCaq
-----END PGP PUBLIC KEY BLOCK-----

@ -1,19 +1,16 @@
Name: s-nail
Version: 14.9.24
Release: 11%{?dist}
Summary: Environment for sending and receiving mail, providing functionality of POSIX mailx
Version: 14.9.22
Release: 6%{?dist}
Summary: Environment for sending and receiving mail
# 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
License: ISC and BSD with advertising and BSD
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
BuildRequires: make
BuildRequires: gnupg2
BuildRequires: gcc
@ -23,10 +20,9 @@ BuildRequires: krb5-devel
BuildRequires: libidn2-devel
BuildRequires: ncurses-devel
Requires(pre): %{_sbindir}/update-alternatives
Provides: mailx = %{version}-%{release}
Obsoletes: mailx < 12.6
Requires(post): %{_sbindir}/update-alternatives
Requires(postun): %{_sbindir}/update-alternatives
Requires(preun): %{_sbindir}/update-alternatives
# For backwards compatibility
Provides: /bin/mail
@ -82,97 +78,79 @@ EOF
# 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
# provide files for alternative usage
ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/mailx.%{name}
touch %{buildroot}%{_bindir}/{Mail,mail,mailx,nail}
ln -s %{_mandir}/man1/%{name}.1 %{buildroot}%{_mandir}/man1/mailx.%{name}.1
touch %{buildroot}%{_mandir}/man1/{Mail,mail,mailx,nail}.1
%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 || :
# remove alternativized files if they are not symlinks
for f in Mail mail mailx nail; do
[ -L %{_bindir}/$f ] || rm -f %{_bindir}/$f >/dev/null 2>&1 || :
[ -L %{_mandir}/man1/$f.1.gz ] || rm -f %{_mandir}/man1/$f.1.gz >/dev/null 2>&1 || :
done
%preun
if [ $1 -eq 0 ]; then
%{_sbindir}/update-alternatives --remove mailx %{_bindir}/mailx.%{name} >/dev/null 2>&1 || :
fi
%post
# set up the alternatives files
%{_sbindir}/update-alternatives --install %{_bindir}/mailx mailx %{_bindir}/mailx.%{name} 100 \
--slave %{_bindir}/Mail Mail %{_bindir}/mailx.%{name} \
--slave %{_bindir}/mail mail %{_bindir}/mailx.%{name} \
--slave %{_bindir}/nail nail %{_bindir}/mailx.%{name} \
--slave %{_mandir}/man1/mailx.1.gz mailx.1.gz %{_mandir}/man1/mailx.%{name}.1.gz \
--slave %{_mandir}/man1/Mail.1.gz Mail.1.gz %{_mandir}/man1/mailx.%{name}.1.gz \
--slave %{_mandir}/man1/mail.1.gz mail.1.gz %{_mandir}/man1/mailx.%{name}.1.gz \
--slave %{_mandir}/man1/nail.1.gz nail.1.gz %{_mandir}/man1/mailx.%{name}.1.gz \
>/dev/null 2>&1 || :
%postun
if [ $1 -ge 1 ]; then
if [ "$(readlink %{_sysconfdir}/alternatives/mailx)" == "%{_bindir}/mailx.%{name}" ]; then
%{_sbindir}/update-alternatives --set mailx %{_bindir}/mailx.%{name} >/dev/null 2>&1 || :
fi
fi
%files
%license COPYING
%doc README
%{_bindir}/Mail
%{_bindir}/mail
%{_bindir}/nail
%{_bindir}/mailx
%ghost %{_bindir}/{Mail,mail,mailx,nail}
%{_bindir}/mailx.%{name}
%{_bindir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}.rc
%{_mandir}/man1/Mail.1*
%{_mandir}/man1/mail.1*
%{_mandir}/man1/nail.1*
%{_mandir}/man1/mailx.1*
%ghost %{_mandir}/man1/{Mail,mail,mailx,nail}.1*
%{_mandir}/man1/mailx.%{name}.1*
%{_mandir}/man1/%{name}.1*
%changelog
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 14.9.24-11
- Bump release for June 2024 mass rebuild
* Tue Jun 04 2024 Tomas Korbar <tkorbar@redhat.com> - 14.9.24-10
- Remove RSA-MD from License tag
- Resolves: RHEL-35725
* 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
* 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
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 14.9.22-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* 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 May 07 2021 Nikola Forró <nforro@redhat.com> - 14.9.22-4
- Provide /bin/mail{,x} for backwards compatibility
resolves: #1958360
* Wed Apr 14 2021 Nikola Forró <nforro@redhat.com> - 14.9.22-3
- Remove globs in %%files
* 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
* Tue Mar 16 2021 Nikola Forró <nforro@redhat.com> - 14.9.22-2
- Fix alternatives

Loading…
Cancel
Save