auto-import telnet-0.17-20 from telnet-0.17-20.src.rpm

This commit is contained in:
cvsdist 2004-09-09 13:11:27 +00:00
parent 83ce95798f
commit 65d029314a
2 changed files with 43 additions and 2 deletions

37
telnet-0.17-pek.patch Normal file
View File

@ -0,0 +1,37 @@
diff -u telnet/commands.c telnet.new/commands.c
--- telnet/commands.c Sat Sep 1 12:55:18 2001
+++ telnet.new/commands.c Sat Sep 1 12:54:36 2001
@@ -2354,6 +2354,7 @@
hints.ai_flags = AI_CANONNAME;
if (portp == NULL) {
portp = "telnet";
+ telnetport = 1;
} else if (*portp == '-') {
portp++;
telnetport = 1;
@@ -2397,7 +2398,6 @@
if (error) {
warn("%s: %s", aliasp, gai_strerror(error));
close(net);
- freeaddrinfo(ares);
continue;
}
if (bind(net, ares->ai_addr, ares->ai_addrlen) < 0) {
@@ -2414,7 +2414,7 @@
perror("setsockopt (IP_OPTIONS)");
#endif
#if defined(IPPROTO_IP) && defined(IP_TOS)
- {
+ if (res->ai_family == AF_INET) {
# if defined(HAS_GETTOS)
struct tosent *tp;
if (tos < 0 && (tp = gettosbyname("telnet", "tcp")))
@@ -2438,7 +2438,7 @@
char hbuf[NI_MAXHOST];
if (getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf),
- NULL, 0, NI_NUMERICHOST) != 0) {
+ NULL, 0, niflags) != 0) {
strcpy(hbuf, "(invalid)");
}
fprintf(stderr, "telnet: connect to address %s: %s\n", hbuf,

View File

@ -36,7 +36,7 @@ Summary: The client program for the telnet remote login protocol.
Name: telnet
%{?dist_prefix:Version: %{telnet_version}%{dist_prefix}}
%{!?dist_prefix:Version: %{telnet_version}}
%{!?dist_prefix:Release: 19.1}
%{!?dist_prefix:Release: 20}
%{?dist_prefix:Release: 19%{dist_prefix}}
Serial: 1
Copyright: BSD
@ -51,6 +51,7 @@ Patch6: telnet-0.17-env.patch
Patch7: telnet-0.17-issue.patch
Patch8: telnet-0.17-sa-01-49.patch
Patch9: telnet-0.17-env-5x.patch
Patch10: telnet-0.17-pek.patch
BuildPreReq: ncurses-devel
Buildroot: %{_tmppath}/%{name}-root
@ -85,10 +86,10 @@ mv telnet telnet-NETKIT
%patch1 -p0 -b .cvs
%patch5 -p0 -b .fix
%patch6 -p1 -b .env
%patch10 -p0 -b .pek
%endif
%patch7 -p1 -b .issue
%patch8 -p1 -b .sa-01-49
%build
sh configure --with-c-compiler=gcc
perl -pi -e '
@ -154,6 +155,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_mandir}/man8/telnetd.8*
%changelog
* Thu Sep 06 2001 Harald Hoyer <harald@redhat.de> 0.17-20
- hopefully fixed #52817, #52224
* Thu Aug 16 2001 Bill Nottingham <notting@redhat.com>
- bump version for 7.2