/[smeserver]/rpms/ppp/sme9/ppp-2.4.3-fix.patch
ViewVC logotype

Annotation of /rpms/ppp/sme9/ppp-2.4.3-fix.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Wed Mar 6 22:45:22 2013 UTC (11 years, 7 months ago) by slords
Branch: MAIN
CVS Tags: ppp-2_4_5-24_fc19, ppp-2_4_5-24_el6_sme, HEAD
Initial import

1 slords 1.1 --- ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c.fix 2004-11-04 11:07:37.000000000 +0100
2     +++ ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c 2004-11-22 16:00:24.522462124 +0100
3     @@ -13,6 +13,8 @@
4     #include "pppoe.h"
5     #include "pppd/pppd.h"
6    
7     +void warn __P((char *, ...)); /* log a warning message */
8     +
9     #include <string.h>
10     #include <stdlib.h>
11     #include <errno.h>
12     --- ppp-2.4.3/pppd/ipv6cp.c.fix 2004-11-13 03:28:15.000000000 +0100
13     +++ ppp-2.4.3/pppd/ipv6cp.c 2004-11-22 16:00:27.049114044 +0100
14     @@ -151,6 +151,7 @@
15     */
16    
17     #include <stdio.h>
18     +#include <stdlib.h>
19     #include <string.h>
20     #include <unistd.h>
21     #include <netdb.h>
22     @@ -1064,7 +1065,9 @@
23     return (rc); /* Return final code */
24     }
25    
26     -
27     +#if defined(SOL2) || defined(__linux__)
28     +int ether_to_eui64(eui64_t *p_eui64);
29     +#endif
30     /*
31     * ipv6_check_options - check that any IP-related options are OK,
32     * and assign appropriate defaults.
33     --- ppp-2.4.3/pppdump/deflate.c.fix 2004-02-02 04:36:46.000000000 +0100
34     +++ ppp-2.4.3/pppdump/deflate.c 2004-11-22 16:02:18.071820020 +0100
35     @@ -39,6 +39,7 @@
36     #include <sys/types.h>
37     #include <stdio.h>
38     #include <stddef.h>
39     +#include <stdio.h>
40     #include <stdlib.h>
41     #include <string.h>
42     #include "ppp_defs.h"
43     @@ -237,8 +238,8 @@
44     {
45     struct deflate_state *state = (struct deflate_state *) arg;
46     u_char *rptr, *wptr;
47     - int rlen, olen, ospace;
48     - int seq, i, flush, r, decode_proto;
49     + int rlen, olen;
50     + int seq, r;
51    
52     rptr = mi;
53     if (*rptr == 0)
54     --- ppp-2.4.3/pppdump/bsd-comp.c.fix 2004-02-02 04:36:46.000000000 +0100
55     +++ ppp-2.4.3/pppdump/bsd-comp.c 2004-11-22 16:00:27.052113631 +0100
56     @@ -383,7 +383,7 @@
57     || options[0] != CI_BSD_COMPRESS || options[1] != CILEN_BSD_COMPRESS
58     || BSD_VERSION(options[2]) != BSD_CURRENT_VERSION
59     || BSD_NBITS(options[2]) != db->maxbits
60     - || decomp && db->lens == NULL)
61     + || (decomp && db->lens == NULL))
62     return 0;
63    
64     if (decomp) {
65     @@ -556,11 +556,11 @@
66     u_int n_bits = db->n_bits;
67     u_int tgtbitno = 32-n_bits; /* bitno when we have a code */
68     struct bsd_dict *dictp;
69     - int explen, i, seq, len;
70     + int explen, seq, len;
71     u_int incode, oldcode, finchar;
72     u_char *p, *rptr, *wptr;
73     int ilen;
74     - int dlen, space, codelen, extra;
75     + int dlen=0, codelen, extra;
76    
77     rptr = cmsg;
78     if (*rptr == 0)
79     @@ -616,7 +616,7 @@
80     }
81    
82     if (incode > max_ent + 2 || incode > db->maxmaxcode
83     - || incode > max_ent && oldcode == CLEAR) {
84     + || (incode > max_ent && oldcode == CLEAR)) {
85     if (db->debug) {
86     printf("bsd_decomp%d: bad code 0x%x oldcode=0x%x ",
87     db->unit, incode, oldcode);
88     --- ppp-2.4.3/pppdump/pppdump.c.fix 2004-02-02 04:36:46.000000000 +0100
89     +++ ppp-2.4.3/pppdump/pppdump.c 2004-11-22 16:00:27.054113356 +0100
90     @@ -34,6 +34,7 @@
91     * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
92     */
93     #include <stdio.h>
94     +#include <stdlib.h>
95     #include <unistd.h>
96     #include <stdlib.h>
97     #include <time.h>
98     @@ -191,7 +192,7 @@
99     show_time(f, c);
100     break;
101     default:
102     - printf("?%.2x\n");
103     + printf("?%.2x\n", c);
104     }
105     }
106     }
107     @@ -421,7 +422,7 @@
108     show_time(f, c);
109     break;
110     default:
111     - printf("?%.2x\n");
112     + printf("?%.2x\n", c);
113     }
114     }
115     }

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed