!11 Update to 5.69

From: @starlet-dx 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia

stunnel-5.48.tar.gz.asc

@@ -1,18 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQKTBAABCgB9FiEEK8fk5n48wMG+py+MLvx/8NQW4BQFAls6m2RfFIAAAAAALgAo
-aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDJC
-QzdFNEU2N0UzQ0MwQzFCRUE3MkY4QzJFRkM3RkYwRDQxNkUwMTQACgkQLvx/8NQW
-4BTksRAAiWO5DWBpHrnDKy1jon+4lG/OPHe92nWxc6yH2HVeB064tXYeXYjRnnR4
-mItaO4wCJICd94+5EUO6DUfut4+7SIAWNPUnZd5OgFkgmGd0YEF6tEfM9z6BhMc3
-T8ZwKCP/hhU5oxqQyDO/esk2+Opps5ddsQLx84iUsylFwq8gK8BkVZrx2yLBX/fz
-wGpP1YnxLdx+rQQx/BkHd52nQAR3gqrGcZtMgchhTBsfZ4jgnr4Xr4XgXJPfe0Di
-xGCD7/sy+N8sNu4S6RER4qNV6PLBcZ6Bjp+VqMpODdoXlD0EQXundgbrg8Nuq8HR
-TTbL1pItHo0vy5QetFILJqlrdLw3sIG5Wy1+k87X485DKhJuvZqU0nKixYmaujB9
-as1YNccDb2FwF7Rzq4hF1J0IwYUsyfgbd58k1VdmtPp5TSUyd1lp+tpX0tEJePk6
-g1X3NecNVbw8p66gPiUadlTYkkUQdqDHnGxD9EKG7BwRE8lPR5CTJD1w8xEOzLMw
-tVKSBgcHeIA7Sn9mJtOFOJ7Y+aUccMIliprgk34P3+4bFFBxLQaRQycfLVIyRy4t
-3QRk+vsMxfuAVainN/yVU7hCtiL09ZHm3g8AnDZFKmtZzYcBbb24RWhONt0bz9j1
-fnYKvguL78ptBpsmPmXjwBY+qxmJx4LAWFxE7TUgqsaASJYWSH4=
-=KMsG
------END PGP SIGNATURE-----

stunnel-5.69.tar.gz.asc

@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQKTBAABCgB9FiEEK8fk5n48wMG+py+MLvx/8NQW4BQFAmQDL5FfFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDJC
+QzdFNEU2N0UzQ0MwQzFCRUE3MkY4QzJFRkM3RkYwRDQxNkUwMTQACgkQLvx/8NQW
+4BQqyxAAwj4fnDEJmQ86U22gRITMom39zKFG+5E/trHwNPTL4dJ2Q2EEP2W7YNhD
+FxkpRxvUSU0Ns6JzOR5v8ydwALDflzc6fVK2+dv2W7hrmR24IcNQRdZngOPMVN6Y
+chnV+ViwQapGuBmO5UWfgkgglQhJwH94G3BwbTZbTHiAa4wTQHh38m/BfNn1uZ0p
++tgMl/pWSWOU+8e0wrwrG2ELtn/zY6Qmnb0hVkGu1yn6PR24fqoq3+pnoEiNgMvV
+OWm8Uw9C1AF1euMSO8WwDV0MqyUMgntq2X6sKi/Kawi+XliDAWU/NJLVLQ8GFyBA
+kERU8aNCqdwTRK49fnUho5yIA6IX3ttR8mnh1LKZBCxu7r3UDZD377pGPCEveyrc
+B9KbuJ+j1IaUbsfa79n3IYORQ3AaSTYnG1NPL+MD/3GeJ+hWr5ai63AclPzqmSG0
+UvgOrdMRifbMrKhakA8TYvRNz7QJMvAPKTEOi0pwCK6br/OzKssmgvSVDnPoWk6n
+nYwktvMDI/AsaDPuIXQVVffJbgpN9cLNzi7fK8j7oWp2dVPTIDG3EBLPeFVwsIcB
+lcRE9PBxtBw5NAv96o8/CnLswKcUpsDpMammqv/OBQ8dCbutHRnvt+JsWCzxB66t
+av9nRDmnnhBPz8hnaws5FmA9nzPFvRs3l/mA7txXYmXJNzG7vrE=
+=rfrY
+-----END PGP SIGNATURE-----

stunnel.spec

@@ -1,11 +1,11 @@
 Name:           stunnel
-Version:        5.48
-Release:        5
+Version:        5.69
+Release:        1
 Summary:        Secure traffic running between a TCP client and server
 License:        GPLv2
 URL:            http://www.stunnel.org/
-Source0:        https://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-%{version}.tar.gz
-Source1:        https://www.stunnel.org/downloads/stunnel-%{version}.tar.gz.asc
+Source0:        https://www.usenix.org.uk/mirrors/stunnel/archive/5.x/%{name}-%{version}.tar.gz
+Source1:        https://www.usenix.org.uk/mirrors/stunnel/archive/5.x/%{name}-%{version}.tar.gz.asc
 Source2:        stunnel@.service
 
 BuildRequires:  pkgconfig util-linux autoconf automake libtool compat-openssl11-devel
@@ -38,7 +38,8 @@ Files for help with stunnel.
 change_date=`date +%Y.%m.%d`
 sed -i "s/2018\.07\.02/${change_date}/g" `grep "2018\.07\.02" -lr ./`
 sed -i '/yes).*result: no/,+1{s/result: no/result: yes/;s/as_echo "no"/as_echo "yes"/}' configure
-sed -i '/client = yes/a \\  ciphers = PSK' tests/recipes/014_PSK_secrets
+sed -i 's/-fstack-protector/-fstack-protector-strong/' configure
+
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC `pkg-config --cflags openssl`"; export CFLAGS
 LDFLAGS="`pkg-config --libs-only-L openssl`"; export LDFLAGS
@@ -68,7 +69,8 @@ install -D %{SOURCE2} %{buildroot}%{_unitdir}/%{name}@.service
 %systemd_postun_with_restart %{name}.service
 
 %files
-%doc COPY*
+%license COPY*
+%doc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
 %{_bindir}/stunnel
 %exclude %{_bindir}/stunnel3
 %{_libdir}/stunnel
@@ -86,6 +88,9 @@ install -D %{SOURCE2} %{buildroot}%{_unitdir}/%{name}@.service
 %exclude %{_datadir}/doc/stunnel
 
 %changelog
+* Wed Apr 19 2023 yaoxin <yao_xin001@hoperun.com> - 5.69-1
+- Update to 5.69
+
 * Tue Feb 07 2023 wulei <wulei80@h-partners.com> - 5.48-5
 - Fix undefined reference to 'FIPS_mode'