From 55856174ba2dd4de25112d96abf6247ef0d97028 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 18 2021 06:43:35 +0000
Subject: import telnet-0.17-76.el8


---

diff --git a/SOURCES/telnet-0.17-sigpipe-segfault.patch b/SOURCES/telnet-0.17-sigpipe-segfault.patch
new file mode 100644
index 0000000..1570ab0
--- /dev/null
+++ b/SOURCES/telnet-0.17-sigpipe-segfault.patch
@@ -0,0 +1,15 @@
+diff --git a/telnet/sys_bsd.c.old b/telnet/sys_bsd.c
+index 9e05171..39845ac 100644
+--- a/telnet/sys_bsd.c.old
++++ b/telnet/sys_bsd.c
+@@ -833,6 +833,10 @@ NetSetPgrp(int fd)
+     void
+ deadpeer(int sig)
+ {
++    if(sig == SIGPIPE) {
++	    signal(SIGPIPE, SIG_DFL);
++       fprintf(stderr, "Broken pipe\n");
++    }
+     (void)sig;
+     setcommandmode();
+     siglongjmp(peerdied, -1);
diff --git a/SPECS/telnet.spec b/SPECS/telnet.spec
index 9eb3eea..1251c1d 100644
--- a/SPECS/telnet.spec
+++ b/SPECS/telnet.spec
@@ -3,7 +3,7 @@
 Summary: The client program for the Telnet remote login protocol
 Name: telnet
 Version: 0.17
-Release: 74%{?dist}.1
+Release: 76%{?dist}
 Epoch: 1
 License: BSD
 Group: Applications/Internet
@@ -43,6 +43,7 @@ Patch31: netkit-telnet-0.17-covscan.patch
 Patch32: telnet-log-address.patch
 Patch33: telnet-0.17-overflow-exploit.patch
 Patch34: telnet-0.17-pty-retry.patch
+Patch35: telnet-0.17-sigpipe-segfault.patch
 
 BuildRequires: ncurses-devel systemd
 BuildRequires: perl-interpreter
@@ -101,6 +102,7 @@ mv telnet telnet-NETKIT
 %patch32 -p1 -b .log-address
 %patch33 -p1 -b .overflow
 %patch34 -p1 -b .pty-retry
+%patch35 -p1 -b .sigpipe
 
 %build
 %ifarch s390 s390x
@@ -166,8 +168,11 @@ install -p -m644 %SOURCE6 ${RPM_BUILD_ROOT}%{_unitdir}/telnet.socket
 %{_mandir}/man8/telnetd.8*
 
 %changelog
-* Tue Dec 15 2020 Michal Ruprich <mruprich@redhat.com> - 1:0.17-74.1
-- Resolves: #1907283 - in.telnetd needs to tolerate temporary EIO errors
+* Tue Dec 15 2020 Michal Ruprich <mruprich@redhat.com> - 1:0.17-76
+- Resolves: #1895387 - telnet crashes on stack overflow due to infinite recursion
+
+* Tue Oct 27 2020 Michal Ruprich <mruprich@redhat.com> - 1:0.17-75
+- Resolves: #1881335 - in.telnetd needs to tolerate temporary EIO errors
 
 * Thu Mar 26 2020 Michal Ruprich <michalruprich@gmail.com> - 1:0.17-74
 - Resolves: #1814474 - Arbitrary remote code execution in utility.c via short writes or urgent data