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

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.3 - (show annotations) (download) (as text)
Sun Jul 12 12:41:35 2009 UTC (10 years, 7 months ago) by mrness
Branch: MAIN
CVS Tags: HEAD
Changes since 1.2: +1 -1 lines
File MIME type: text/x-diff
FILE REMOVED
Migrate to EAPI 2. Fix compile errors (#277166) and QA notices.
(Portage version: 2.1.6.13/cvs/Linux x86_64)

1 --- Makefile.orig 2000-10-20 16:14:28.000000000 +0200
2 +++ Makefile 2005-08-21 05:39:41.000000000 +0200
3 @@ -43,7 +43,7 @@
4 SUB = libtelnet telnet telnetd trace route
5
6 all:
7 - for i in $(SUB); do make -C $$i; done
8 + for i in $(SUB); do make -C $$i || exit 1; done
9
10 install:
11 for i in $(SUB); do make -C $$i install; done
12 --- telnet/commands.c.orig 1996-12-15 23:00:16.000000000 +0100
13 +++ telnet/commands.c 2005-08-21 04:47:29.000000000 +0200
14 @@ -55,7 +55,8 @@
15 #include <netdb.h>
16 #include <ctype.h>
17 #include <pwd.h>
18 -#include <varargs.h>
19 +#include <stdio.h>
20 +#include <stdarg.h>
21 #include <errno.h>
22
23 #include <arpa/inet.h>
24 @@ -80,7 +81,7 @@
25
26 #ifndef MAXHOSTNAMELEN
27 #define MAXHOSTNAMELEN 64
28 -#endif MAXHOSTNAMELEN
29 +#endif /* MAXHOSTNAMELEN */
30
31 char *hostname;
32 static char _hostname[MAXHOSTNAMELEN];
33 @@ -91,7 +92,7 @@
34 extern char **genget();
35 extern int Ambiguous();
36
37 -static call();
38 +static call(void *fmt, ...);
39
40 typedef struct {
41 char *name; /* command name */
42 @@ -2330,8 +2331,7 @@
43
44 /*VARARGS1*/
45 static
46 -call(va_alist)
47 - va_dcl
48 +call(void *fmt, ...)
49 {
50 va_list ap;
51 typedef int (*intrtn_t)();
52 @@ -2339,7 +2339,7 @@
53 char *args[100];
54 int argno = 0;
55
56 - va_start(ap);
57 + va_start(ap, fmt);
58 routine = (va_arg(ap, intrtn_t));
59 while ((args[argno++] = va_arg(ap, char *)) != 0) {
60 ;
61 --- telnet/sys_bsd.c.orig 2000-10-20 17:07:34.000000000 +0200
62 +++ telnet/sys_bsd.c 2005-08-21 04:47:29.000000000 +0200
63 @@ -604,14 +604,14 @@
64 #endif /* SIGTSTP */
65 #ifdef SIGINFO
66 static SIG_FUNC_RET ayt();
67 -#endif SIGINFO
68 +#endif /* SIGINFO */
69
70 #ifdef SIGTSTP
71 (void) signal(SIGTSTP, susp);
72 #endif /* SIGTSTP */
73 #ifdef SIGINFO
74 (void) signal(SIGINFO, ayt);
75 -#endif SIGINFO
76 +#endif /* SIGINFO */
77 #if defined(USE_TERMIO) && defined(NOKERNINFO)
78 tmp_tc.c_lflag |= NOKERNINFO;
79 #endif
80 @@ -653,7 +653,7 @@
81 } else {
82 #ifdef SIGINFO
83 (void) signal(SIGINFO, ayt_status);
84 -#endif SIGINFO
85 +#endif /* SIGINFO */
86 #ifdef SIGTSTP
87 (void) signal(SIGTSTP, SIG_DFL);
88 /* (void) sigsetmask(sigblock(0) & ~(1<<(SIGTSTP-1))); */
89 --- telnet/telnet.c.orig 1996-12-15 22:38:11.000000000 +0100
90 +++ telnet/telnet.c 2005-08-21 04:49:44.000000000 +0200
91 @@ -50,6 +50,7 @@
92 #include <sgtty.h>
93
94 #include <ctype.h>
95 +#include <stdlib.h>
96
97 #include "ring.h"
98
99 @@ -193,7 +194,7 @@
100
101
102 #ifdef notdef
103 -#include <varargs.h>
104 +#include <stdarg.h>
105
106 /*VARARGS*/
107 static void
108 --- telnetd/utility.c.orig 2000-12-07 19:50:37.000000000 +0100
109 +++ telnetd/utility.c 2005-08-21 04:47:29.000000000 +0200
110 @@ -40,6 +40,7 @@
111 #include <sys/utsname.h>
112 #include "telnetd.h"
113 #include <string.h>
114 +#include <time.h>
115
116 /*
117 * utility functions performing io related tasks
118 --- telnetd/sys_term.c.orig 2000-12-01 00:22:49.000000000 +0100
119 +++ telnetd/sys_term.c 2005-08-21 04:54:01.000000000 +0200
120 @@ -39,6 +39,7 @@
121 static char rcsid[] = "$Id: x25_utils-2.3.93.patch,v 1.2 2005/08/21 03:43:17 sbriesen Exp $";
122 #endif /* not lint */
123
124 +#include <stdint.h>
125 #include "telnetd.h"
126 #include "pathnames.h"
127
128 @@ -1380,14 +1381,14 @@
129 }
130 for (cpp = argv; *cpp; cpp++)
131 ;
132 - if (cpp == &argv[(int)argv[-1]]) {
133 + if (cpp == &argv[(intptr_t)argv[-1]]) {
134 --argv;
135 - *argv = (char *)((int)(*argv) + 10);
136 - argv = (char **)realloc(argv, (int)(*argv) + 2);
137 + *argv = (char *)((intptr_t)(*argv) + 10);
138 + argv = (char **)realloc(argv, (intptr_t)(*argv) + 2);
139 if (argv == NULL)
140 return(NULL);
141 argv++;
142 - cpp = &argv[(int)argv[-1] - 10];
143 + cpp = &argv[(intptr_t)argv[-1] - 10];
144 }
145 *cpp++ = val;
146 *cpp = 0;

  ViewVC Help
Powered by ViewVC 1.1.20