update telnet-0.17-sa-01-49.patch to make it apply with fuzz=0
This commit is contained in:
Karsten Hopp
parent
d28a5c778d
commit
25f8752292
@ -1,6 +1,7 @@
|
||||
--- netkit-telnet-0.17/telnetd/ext.h.sa-01-49 Sun Dec 12 15:59:44 1999
|
||||
+++ netkit-telnet-0.17/telnetd/ext.h Tue Jul 31 14:16:01 2001
|
||||
@@ -86,7 +86,10 @@
|
||||
diff -up netkit-telnet-0.17/telnetd/ext.h.sa-01-49 netkit-telnet-0.17/telnetd/ext.h
|
||||
--- netkit-telnet-0.17/telnetd/ext.h.sa-01-49 1999-12-12 15:59:44.000000000 +0100
|
||||
+++ netkit-telnet-0.17/telnetd/ext.h 2011-01-20 22:39:54.000000000 +0100
|
||||
@@ -86,7 +86,10 @@ extern char *neturg; /* one past last b
|
||||
extern int pcc, ncc;
|
||||
|
||||
/* printf into netobuf */
|
||||
@ -12,7 +13,7 @@
|
||||
|
||||
extern int pty, net;
|
||||
extern char *line;
|
||||
@@ -182,7 +185,10 @@
|
||||
@@ -182,7 +185,10 @@ void tty_setsofttab(int);
|
||||
void tty_tspeed(int);
|
||||
void willoption(int);
|
||||
void wontoption(int);
|
||||
@ -23,9 +24,10 @@
|
||||
|
||||
#if defined(ENCRYPT)
|
||||
extern void (*encrypt_output)(unsigned char *, int);
|
||||
--- netkit-telnet-0.17/telnetd/slc.c.sa-01-49 Sun Dec 12 15:59:44 1999
|
||||
+++ netkit-telnet-0.17/telnetd/slc.c Tue Jul 31 14:16:01 2001
|
||||
@@ -183,7 +183,7 @@
|
||||
diff -up netkit-telnet-0.17/telnetd/slc.c.sa-01-49 netkit-telnet-0.17/telnetd/slc.c
|
||||
--- netkit-telnet-0.17/telnetd/slc.c.sa-01-49 1999-12-12 15:59:44.000000000 +0100
|
||||
+++ netkit-telnet-0.17/telnetd/slc.c 2011-01-20 22:39:54.000000000 +0100
|
||||
@@ -183,7 +183,7 @@ int end_slc(unsigned char **bufp) {
|
||||
else {
|
||||
snprintf(slcbuf+slcoff, sizeof(slcbuf)-slcoff, "%c%c", IAC, SE);
|
||||
slcoff += 2;
|
||||
@ -34,17 +36,18 @@
|
||||
netflush(); /* force it out immediately */
|
||||
}
|
||||
}
|
||||
--- netkit-telnet-0.17/telnetd/state.c.sa-01-49 Sun Dec 12 20:41:44 1999
|
||||
+++ netkit-telnet-0.17/telnetd/state.c Tue Jul 31 14:16:01 2001
|
||||
diff -up netkit-telnet-0.17/telnetd/state.c.sa-01-49 netkit-telnet-0.17/telnetd/state.c
|
||||
--- netkit-telnet-0.17/telnetd/state.c.sa-01-49 1999-12-12 20:41:44.000000000 +0100
|
||||
+++ netkit-telnet-0.17/telnetd/state.c 2011-01-20 22:43:34.000000000 +0100
|
||||
@@ -37,6 +37,7 @@
|
||||
char state_rcsid[] =
|
||||
"$Id: telnet-0.17-sa-01-49.patch,v 1.1 2004/09/09 13:10:15 cvsdist Exp $";
|
||||
"$Id: state.c,v 1.12 1999/12/12 19:41:44 dholland Exp $";
|
||||
|
||||
+#include <stdarg.h>
|
||||
#include "telnetd.h"
|
||||
|
||||
int not42 = 1;
|
||||
@@ -1365,7 +1366,7 @@
|
||||
@@ -1365,7 +1366,7 @@ void send_status(void) {
|
||||
ADD(IAC);
|
||||
ADD(SE);
|
||||
|
||||
@ -53,9 +56,10 @@
|
||||
netflush(); /* Send it on its way */
|
||||
|
||||
DIAG(TD_OPTIONS, {printsub('>', statusbuf, ncp - statusbuf); netflush();});
|
||||
--- netkit-telnet-0.17/telnetd/termstat.c.sa-01-49 Sun Dec 12 15:59:45 1999
|
||||
+++ netkit-telnet-0.17/telnetd/termstat.c Tue Jul 31 14:16:01 2001
|
||||
@@ -128,7 +128,6 @@
|
||||
diff -up netkit-telnet-0.17/telnetd/termstat.c.sa-01-49 netkit-telnet-0.17/telnetd/termstat.c
|
||||
--- netkit-telnet-0.17/telnetd/termstat.c.sa-01-49 1999-12-12 15:59:45.000000000 +0100
|
||||
+++ netkit-telnet-0.17/telnetd/termstat.c 2011-01-20 22:39:54.000000000 +0100
|
||||
@@ -128,7 +128,6 @@ static int _terminit = 0;
|
||||
void
|
||||
localstat()
|
||||
{
|
||||
@ -63,20 +67,21 @@
|
||||
int need_will_echo = 0;
|
||||
|
||||
/*
|
||||
--- netkit-telnet-0.17/telnetd/utility.c.sa-01-49 Tue Jul 31 14:16:01 2001
|
||||
+++ netkit-telnet-0.17/telnetd/utility.c Tue Jul 31 14:46:15 2001
|
||||
@@ -38,8 +38,9 @@
|
||||
"$Id: telnet-0.17-sa-01-49.patch,v 1.1 2004/09/09 13:10:15 cvsdist Exp $";
|
||||
diff -up netkit-telnet-0.17/telnetd/utility.c.sa-01-49 netkit-telnet-0.17/telnetd/utility.c
|
||||
--- netkit-telnet-0.17/telnetd/utility.c.sa-01-49 2011-01-20 22:39:54.000000000 +0100
|
||||
+++ netkit-telnet-0.17/telnetd/utility.c 2011-01-20 22:48:02.000000000 +0100
|
||||
@@ -38,8 +38,10 @@ char util_rcsid[] =
|
||||
"$Id: utility.c,v 1.11 1999/12/12 14:59:45 dholland Exp $";
|
||||
|
||||
#define PRINTOPTIONS
|
||||
-
|
||||
+#define _GNU_SOURCE
|
||||
|
||||
#include <stdarg.h>
|
||||
+#include <stdio.h>
|
||||
+#include <stdio.h>
|
||||
#include <sys/utsname.h>
|
||||
|
||||
#ifdef AUTHENTICATE
|
||||
@@ -52,6 +53,53 @@
|
||||
@@ -52,6 +54,53 @@ char util_rcsid[] =
|
||||
* utility functions performing io related tasks
|
||||
*/
|
||||
|
||||
@ -130,7 +135,7 @@
|
||||
void
|
||||
netoprintf(const char *fmt, ...)
|
||||
{
|
||||
@@ -67,7 +115,7 @@
|
||||
@@ -67,7 +116,7 @@ netoprintf(const char *fmt, ...)
|
||||
va_end(ap);
|
||||
|
||||
if (len<0 || len==maxsize) {
|
||||
@ -139,7 +144,7 @@
|
||||
netflush();
|
||||
}
|
||||
else {
|
||||
@@ -76,6 +124,7 @@
|
||||
@@ -76,6 +125,7 @@ netoprintf(const char *fmt, ...)
|
||||
}
|
||||
nfrontp += len;
|
||||
}
|
||||
@ -147,7 +152,7 @@
|
||||
|
||||
/*
|
||||
* ttloop
|
||||
@@ -273,10 +322,15 @@
|
||||
@@ -273,10 +323,15 @@ netflush(void)
|
||||
int n;
|
||||
|
||||
if ((n = nfrontp - nbackp) > 0) {
|
||||
@ -163,7 +168,7 @@
|
||||
#if defined(ENCRYPT)
|
||||
if (encrypt_output) {
|
||||
char *s = nclearto ? nclearto : nbackp;
|
||||
@@ -310,11 +364,14 @@
|
||||
@@ -310,11 +365,14 @@ netflush(void)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -183,7 +188,7 @@
|
||||
nbackp += n;
|
||||
#if defined(ENCRYPT)
|
||||
if (nbackp > nclearto)
|
||||
@@ -332,7 +389,7 @@
|
||||
@@ -332,7 +390,7 @@ netflush(void)
|
||||
return;
|
||||
} /* end of netflush */
|
||||
|
||||
@ -192,7 +197,7 @@
|
||||
/*
|
||||
* writenet
|
||||
*
|
||||
@@ -355,7 +412,7 @@
|
||||
@@ -355,7 +413,7 @@ void writenet(register unsigned char *pt
|
||||
nfrontp += len;
|
||||
|
||||
} /* end of writenet */
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: The client program for the Telnet remote login protocol
|
||||
Name: telnet
|
||||
Version: 0.17
|
||||
Release: 47%{?dist}
|
||||
Release: 48%{?dist}
|
||||
Epoch: 1
|
||||
License: BSD
|
||||
Group: Applications/Internet
|
||||
@ -129,6 +129,9 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||
%{_mandir}/man8/telnetd.8*
|
||||
|
||||
%changelog
|
||||
* Thu Jan 20 2011 Karsten Hopp <karsten@redhat.com> 1:0.17-48
|
||||
- update telnet-0.17-sa-01-49.patch to make it apply with fuzz=0
|
||||
|
||||
* Tue Mar 09 2010 Adam Tkac <atkac redhat com> 1:0.17-47
|
||||
- add URL and README
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user