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

Annotation of /rpms/ppp/sme8/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)
Tue Jun 12 20:34:42 2007 UTC (17 years, 4 months ago) by slords
Branch: MAIN
CVS Tags: ppp-2_4_4-1_3_el5_sme, HEAD
Import on branch sme8 of package ppp-2.4.4-1.3.el5.sme.src.rpm

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    
5     #include "pppoe.h"
6    
7     +void warn __P((char *, ...)); /* log a warning message */
8     +
9     #ifdef HAVE_SYSLOG_H
10     #include <syslog.h>
11     #endif
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/include/linux/if_pppox.h.fix 2001-12-15 01:34:24.000000000 +0100
34     +++ ppp-2.4.3/include/linux/if_pppox.h 2004-11-22 16:00:27.049114044 +0100
35     @@ -18,7 +18,7 @@
36    
37    
38     #include <asm/types.h>
39     -#include <asm/byteorder.h>
40     +#include <endian.h>
41    
42     #ifdef __KERNEL__
43     #include <linux/if_ether.h>
44     @@ -97,10 +97,10 @@
45     #define PTT_GEN_ERR __constant_htons(0x0203)
46    
47     struct pppoe_hdr {
48     -#if defined(__LITTLE_ENDIAN_BITFIELD)
49     +#if __BYTE_ORDER == __LITTLE_ENDIAN
50     __u8 ver : 4;
51     __u8 type : 4;
52     -#elif defined(__BIG_ENDIAN_BITFIELD)
53     +#elif __BYTE_ORDER == __BIG_ENDIAN
54     __u8 type : 4;
55     __u8 ver : 4;
56     #else
57     --- ppp-2.4.3/pppdump/deflate.c.fix 2004-02-02 04:36:46.000000000 +0100
58     +++ ppp-2.4.3/pppdump/deflate.c 2004-11-22 16:02:18.071820020 +0100
59     @@ -39,6 +39,7 @@
60     #include <sys/types.h>
61     #include <stdio.h>
62     #include <stddef.h>
63     +#include <stdio.h>
64     #include <stdlib.h>
65     #include <string.h>
66     #include "ppp_defs.h"
67     @@ -237,8 +238,8 @@
68     {
69     struct deflate_state *state = (struct deflate_state *) arg;
70     u_char *rptr, *wptr;
71     - int rlen, olen, ospace;
72     - int seq, i, flush, r, decode_proto;
73     + int rlen, olen;
74     + int seq, r;
75    
76     rptr = mi;
77     if (*rptr == 0)
78     --- ppp-2.4.3/pppdump/bsd-comp.c.fix 2004-02-02 04:36:46.000000000 +0100
79     +++ ppp-2.4.3/pppdump/bsd-comp.c 2004-11-22 16:00:27.052113631 +0100
80     @@ -383,7 +383,7 @@
81     || options[0] != CI_BSD_COMPRESS || options[1] != CILEN_BSD_COMPRESS
82     || BSD_VERSION(options[2]) != BSD_CURRENT_VERSION
83     || BSD_NBITS(options[2]) != db->maxbits
84     - || decomp && db->lens == NULL)
85     + || (decomp && db->lens == NULL))
86     return 0;
87    
88     if (decomp) {
89     @@ -556,11 +556,11 @@
90     u_int n_bits = db->n_bits;
91     u_int tgtbitno = 32-n_bits; /* bitno when we have a code */
92     struct bsd_dict *dictp;
93     - int explen, i, seq, len;
94     + int explen, seq, len;
95     u_int incode, oldcode, finchar;
96     u_char *p, *rptr, *wptr;
97     int ilen;
98     - int dlen, space, codelen, extra;
99     + int dlen=0, codelen, extra;
100    
101     rptr = cmsg;
102     if (*rptr == 0)
103     @@ -616,7 +616,7 @@
104     }
105    
106     if (incode > max_ent + 2 || incode > db->maxmaxcode
107     - || incode > max_ent && oldcode == CLEAR) {
108     + || (incode > max_ent && oldcode == CLEAR)) {
109     if (db->debug) {
110     printf("bsd_decomp%d: bad code 0x%x oldcode=0x%x ",
111     db->unit, incode, oldcode);
112     --- ppp-2.4.3/pppdump/pppdump.c.fix 2004-02-02 04:36:46.000000000 +0100
113     +++ ppp-2.4.3/pppdump/pppdump.c 2004-11-22 16:00:27.054113356 +0100
114     @@ -34,6 +34,7 @@
115     * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
116     */
117     #include <stdio.h>
118     +#include <stdlib.h>
119     #include <unistd.h>
120     #include <stdlib.h>
121     #include <time.h>
122     @@ -191,7 +192,7 @@
123     show_time(f, c);
124     break;
125     default:
126     - printf("?%.2x\n");
127     + printf("?%.2x\n", c);
128     }
129     }
130     }
131     @@ -421,7 +422,7 @@
132     show_time(f, c);
133     break;
134     default:
135     - printf("?%.2x\n");
136     + printf("?%.2x\n", c);
137     }
138     }
139     }

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