Compare commits

...

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

@ -0,0 +1,38 @@
The changes to telnet/commands.c fix fix a crash in the tracefile
command on 64-bit architectures due to pointer truncation.
The telnetd.c change is just to avoid a future compiler error.
diff -ur netkit-telnet-0.17.orig/telnet/commands.c netkit-telnet-0.17/telnet/commands.c
--- netkit-telnet-0.17.orig/telnet/commands.c 2023-12-21 12:28:51.146313891 +0100
+++ netkit-telnet-0.17/telnet/commands.c 2023-12-21 12:58:47.177886556 +0100
@@ -843,7 +843,7 @@
struct termios new_tc;
#endif
-typedef void (*set_handler_t) P((int));
+typedef void (*set_handler_t) P((char *));
struct setlist {
const char *name; /* name */
const char *help; /* help information */
@@ -857,7 +857,7 @@
#endif
{ "escape", "character to escape back to telnet command mode", 0, &escape },
{ "rlogin", "rlogin escape character", 0, &rlogin },
- { "tracefile", "file to write trace information to", (set_handler_t)SetNetTrace, (cc_t *)NetTraceFile},
+ { "tracefile", "file to write trace information to", SetNetTrace, (cc_t *)NetTraceFile},
{ " ", "", 0, NULL },
{ " ", "The following need 'localchars' to be toggled true", 0, 0 },
{ "flushoutput", "character to cause an Abort Output", 0, &termFlushChar },
diff -ur netkit-telnet-0.17.orig/telnetd/telnetd.c netkit-telnet-0.17/telnetd/telnetd.c
--- netkit-telnet-0.17.orig/telnetd/telnetd.c 2023-12-21 12:28:51.149313860 +0100
+++ netkit-telnet-0.17/telnetd/telnetd.c 2023-12-21 12:29:51.396695540 +0100
@@ -385,7 +385,7 @@
}
#endif /* defined(HAS_IPPROTO_IP) && defined(IP_TOS) */
net = s;
- doit(&from, fromlen);
+ doit((struct sockaddr *) &from, fromlen);
/* NOTREACHED */
return 0;
} /* end of main */

@ -3,9 +3,9 @@
Summary: The client program for the Telnet remote login protocol Summary: The client program for the Telnet remote login protocol
Name: telnet Name: telnet
Version: 0.17 Version: 0.17
Release: 85%{?dist} Release: 94%{?dist}
Epoch: 1 Epoch: 1
License: BSD License: BSD-3-Clause AND BSD-4-Clause AND BSD-4-Clause-UC
Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-%{version}.tar.gz Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-%{version}.tar.gz
Url: http://web.archive.org/web/20070819111735/www.hcs.harvard.edu/~dholland/computers/old-netkit.html Url: http://web.archive.org/web/20070819111735/www.hcs.harvard.edu/~dholland/computers/old-netkit.html
# telnet-client tarball is snapshot of the OpenBSD client telnet # telnet-client tarball is snapshot of the OpenBSD client telnet
@ -42,6 +42,7 @@ Patch31: netkit-telnet-0.17-telnetrc.patch
Patch32: telnet-log-address.patch Patch32: telnet-log-address.patch
Patch33: telnet-0.17-overflow-exploit.patch Patch33: telnet-0.17-overflow-exploit.patch
Patch34: telnet-0.17-pty-retry.patch Patch34: telnet-0.17-pty-retry.patch
Patch35: telnet-c99.patch
BuildRequires: make BuildRequires: make
BuildRequires: ncurses-devel systemd gcc gcc-c++ BuildRequires: ncurses-devel systemd gcc gcc-c++
@ -100,6 +101,7 @@ mv telnet telnet-NETKIT
%patch32 -p1 -b .log-address %patch32 -p1 -b .log-address
%patch33 -p1 -b .overflow %patch33 -p1 -b .overflow
%patch34 -p1 -b .pty-retry %patch34 -p1 -b .pty-retry
%patch35 -p1 -b .c99
%build %build
%ifarch s390 s390x %ifarch s390 s390x
@ -162,12 +164,43 @@ install -D -p -m644 %SOURCE6 ${RPM_BUILD_ROOT}%{_unitdir}/telnet.socket
%{_mandir}/man8/telnetd.8* %{_mandir}/man8/telnetd.8*
%changelog %changelog
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.17-85 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:0.17-94
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Bump release for October 2024 mass rebuild:
Related: rhbz#1991688 Resolves: RHEL-64018
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.17-84 * Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1:0.17-93
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Rebuilt for MSVSphere 10
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:0.17-93
- Bump release for June 2024 mass rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.17-92
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Dec 21 2023 Florian Weimer <fweimer@redhat.com> - 1:0.17-91
- Fix tracefile setting, C type errors (#2255510)
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.17-90
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Mar 20 2023 Michal Ruprich <mruprich@redhat.com> - 1:0.17-89
- SPDX migration
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.17-88
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.17-87
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.17-86
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.17-85
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:0.17-84
- Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.17-83 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.17-83
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save