/[gentoo-x86]/net-misc/x25_utils/files/x25_utils-2.3.93-gentoo.patch
Gentoo

Contents of /net-misc/x25_utils/files/x25_utils-2.3.93-gentoo.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download) (as text)
Sun Mar 18 12:47:03 2012 UTC (7 years, 11 months ago) by pacho
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +1 -1 lines
File MIME type: text/x-diff
FILE REMOVED
Removal.

1 diff -Nru x25_utils-2.3.93.orig/libtelnet/misc.c x25_utils-2.3.93/libtelnet/misc.c
2 --- x25_utils-2.3.93.orig/libtelnet/misc.c 1993-12-17 07:32:43.000000000 +0100
3 +++ x25_utils-2.3.93/libtelnet/misc.c 2009-07-12 14:26:35.000000000 +0200
4 @@ -55,6 +55,8 @@
5 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
6 */
7
8 +#include <stdio.h>
9 +#include <stdlib.h>
10 #include "misc.h"
11
12 char *RemoteHostName;
13 diff -Nru x25_utils-2.3.93.orig/Makefile x25_utils-2.3.93/Makefile
14 --- x25_utils-2.3.93.orig/Makefile 2000-10-20 16:14:28.000000000 +0200
15 +++ x25_utils-2.3.93/Makefile 2009-07-12 14:26:35.000000000 +0200
16 @@ -43,7 +43,7 @@
17 SUB = libtelnet telnet telnetd trace route
18
19 all:
20 - for i in $(SUB); do make -C $$i; done
21 + for i in $(SUB); do make -C $$i || exit 1; done
22
23 install:
24 for i in $(SUB); do make -C $$i install; done
25 diff -Nru x25_utils-2.3.93.orig/telnet/commands.c x25_utils-2.3.93/telnet/commands.c
26 --- x25_utils-2.3.93.orig/telnet/commands.c 1996-12-15 23:00:16.000000000 +0100
27 +++ x25_utils-2.3.93/telnet/commands.c 2009-07-12 14:26:35.000000000 +0200
28 @@ -55,7 +55,6 @@
29 #include <netdb.h>
30 #include <ctype.h>
31 #include <pwd.h>
32 -#include <varargs.h>
33 #include <errno.h>
34
35 #include <arpa/inet.h>
36 @@ -80,7 +79,7 @@
37
38 #ifndef MAXHOSTNAMELEN
39 #define MAXHOSTNAMELEN 64
40 -#endif MAXHOSTNAMELEN
41 +#endif /* MAXHOSTNAMELEN */
42
43 char *hostname;
44 static char _hostname[MAXHOSTNAMELEN];
45 @@ -91,7 +90,7 @@
46 extern char **genget();
47 extern int Ambiguous();
48
49 -static call();
50 +static call(void *fmt, ...);
51
52 typedef struct {
53 char *name; /* command name */
54 @@ -2330,8 +2329,7 @@
55
56 /*VARARGS1*/
57 static
58 -call(va_alist)
59 - va_dcl
60 +call(void *fmt, ...)
61 {
62 va_list ap;
63 typedef int (*intrtn_t)();
64 @@ -2339,7 +2337,7 @@
65 char *args[100];
66 int argno = 0;
67
68 - va_start(ap);
69 + va_start(ap, fmt);
70 routine = (va_arg(ap, intrtn_t));
71 while ((args[argno++] = va_arg(ap, char *)) != 0) {
72 ;
73 diff -Nru x25_utils-2.3.93.orig/telnet/externs.h x25_utils-2.3.93/telnet/externs.h
74 --- x25_utils-2.3.93.orig/telnet/externs.h 1994-07-26 12:53:03.000000000 +0200
75 +++ x25_utils-2.3.93/telnet/externs.h 2009-07-12 14:26:35.000000000 +0200
76 @@ -43,6 +43,9 @@
77 #endif
78
79 #include <stdio.h>
80 +#include <stdlib.h>
81 +#include <unistd.h>
82 +#include <stdarg.h>
83 #include <setjmp.h>
84 #include <linux/ioctl.h>
85 #include <features.h>
86 diff -Nru x25_utils-2.3.93.orig/telnet/ring.c x25_utils-2.3.93/telnet/ring.c
87 --- x25_utils-2.3.93.orig/telnet/ring.c 1993-12-17 08:18:19.000000000 +0100
88 +++ x25_utils-2.3.93/telnet/ring.c 2009-07-12 14:26:35.000000000 +0200
89 @@ -62,6 +62,7 @@
90
91 #include "ring.h"
92 #include "general.h"
93 +#include "externs.h"
94
95 /* Internal macros */
96
97 diff -Nru x25_utils-2.3.93.orig/telnet/sys_bsd.c x25_utils-2.3.93/telnet/sys_bsd.c
98 --- x25_utils-2.3.93.orig/telnet/sys_bsd.c 2000-10-20 17:07:34.000000000 +0200
99 +++ x25_utils-2.3.93/telnet/sys_bsd.c 2009-07-12 14:26:35.000000000 +0200
100 @@ -111,6 +111,12 @@
101
102 static fd_set ibits, obits, xbits;
103
104 +#ifdef SIGTSTP
105 +static SIG_FUNC_RET susp();
106 +#endif /* SIGTSTP */
107 +#ifdef SIGINFO
108 +static SIG_FUNC_RET ayt();
109 +#endif /* SIGINFO */
110
111 void
112 init_sys()
113 @@ -600,18 +606,11 @@
114
115 if (f != -1) {
116 #ifdef SIGTSTP
117 - static SIG_FUNC_RET susp();
118 -#endif /* SIGTSTP */
119 -#ifdef SIGINFO
120 - static SIG_FUNC_RET ayt();
121 -#endif SIGINFO
122 -
123 -#ifdef SIGTSTP
124 (void) signal(SIGTSTP, susp);
125 #endif /* SIGTSTP */
126 #ifdef SIGINFO
127 (void) signal(SIGINFO, ayt);
128 -#endif SIGINFO
129 +#endif /* SIGINFO */
130 #if defined(USE_TERMIO) && defined(NOKERNINFO)
131 tmp_tc.c_lflag |= NOKERNINFO;
132 #endif
133 @@ -653,7 +652,7 @@
134 } else {
135 #ifdef SIGINFO
136 (void) signal(SIGINFO, ayt_status);
137 -#endif SIGINFO
138 +#endif /* SIGINFO */
139 #ifdef SIGTSTP
140 (void) signal(SIGTSTP, SIG_DFL);
141 /* (void) sigsetmask(sigblock(0) & ~(1<<(SIGTSTP-1))); */
142 diff -Nru x25_utils-2.3.93.orig/telnet/telnet.c x25_utils-2.3.93/telnet/telnet.c
143 --- x25_utils-2.3.93.orig/telnet/telnet.c 1996-12-15 22:38:11.000000000 +0100
144 +++ x25_utils-2.3.93/telnet/telnet.c 2009-07-12 14:28:11.000000000 +0200
145 @@ -193,7 +193,6 @@
146
147
148 #ifdef notdef
149 -#include <varargs.h>
150
151 /*VARARGS*/
152 static void
153 @@ -825,7 +824,7 @@
154
155 TerminalSpeeds(&ispeed, &ospeed);
156
157 - sprintf((char *)temp, "%c%c%c%c%d,%d%c%c", IAC, SB, TELOPT_TSPEED,
158 + sprintf((char *)temp, "%c%c%c%c%ld,%ld%c%c", IAC, SB, TELOPT_TSPEED,
159 TELQUAL_IS, ospeed, ispeed, IAC, SE);
160 len = strlen((char *)temp+4) + 4; /* temp[3] is 0 ... */
161
162 diff -Nru x25_utils-2.3.93.orig/telnetd/sys_term.c x25_utils-2.3.93/telnetd/sys_term.c
163 --- x25_utils-2.3.93.orig/telnetd/sys_term.c 2000-12-01 00:22:49.000000000 +0100
164 +++ x25_utils-2.3.93/telnetd/sys_term.c 2009-07-12 14:26:35.000000000 +0200
165 @@ -39,6 +39,8 @@
166 static char rcsid[] = "$Id: x25_utils-2.3.93-gentoo.patch,v 1.1 2009/07/12 12:41:35 mrness Exp $";
167 #endif /* not lint */
168
169 +#include <stdint.h>
170 +#include <time.h>
171 #include "telnetd.h"
172 #include "pathnames.h"
173
174 @@ -1380,14 +1382,14 @@
175 }
176 for (cpp = argv; *cpp; cpp++)
177 ;
178 - if (cpp == &argv[(int)argv[-1]]) {
179 + if (cpp == &argv[(intptr_t)argv[-1]]) {
180 --argv;
181 - *argv = (char *)((int)(*argv) + 10);
182 - argv = (char **)realloc(argv, (int)(*argv) + 2);
183 + *argv = (char *)((intptr_t)(*argv) + 10);
184 + argv = (char **)realloc(argv, (intptr_t)(*argv) + 2);
185 if (argv == NULL)
186 return(NULL);
187 argv++;
188 - cpp = &argv[(int)argv[-1] - 10];
189 + cpp = &argv[(intptr_t)argv[-1] - 10];
190 }
191 *cpp++ = val;
192 *cpp = 0;
193 diff -Nru x25_utils-2.3.93.orig/telnetd/telnetd.c x25_utils-2.3.93/telnetd/telnetd.c
194 --- x25_utils-2.3.93.orig/telnetd/telnetd.c 2000-11-27 22:43:43.000000000 +0100
195 +++ x25_utils-2.3.93/telnetd/telnetd.c 2009-07-12 14:32:26.000000000 +0200
196 @@ -249,7 +249,7 @@
197 #endif /* AUTHENTICATE */
198
199 default:
200 - fprintf(stderr, "telnetd: %s: unknown option\n", ch);
201 + fprintf(stderr, "telnetd: %c: unknown option\n", ch);
202 /* FALLTHROUGH */
203 case '?':
204 usage();
205 diff -Nru x25_utils-2.3.93.orig/telnetd/utility.c x25_utils-2.3.93/telnetd/utility.c
206 --- x25_utils-2.3.93.orig/telnetd/utility.c 2000-12-07 19:50:37.000000000 +0100
207 +++ x25_utils-2.3.93/telnetd/utility.c 2009-07-12 14:26:35.000000000 +0200
208 @@ -40,6 +40,7 @@
209 #include <sys/utsname.h>
210 #include "telnetd.h"
211 #include <string.h>
212 +#include <time.h>
213
214 /*
215 * utility functions performing io related tasks

  ViewVC Help
Powered by ViewVC 1.1.20