Go to most recent revision | Details | Last modification | View Log | RSS feed
Rev | Author | Line No. | Line |
---|---|---|---|
2 | magnus | 1 | #! /bin/sh /usr/share/dpatch/dpatch-run |
2 | ## 20_64bit_types.dpatch by Magnus Holmgren <magnus@kibibyte.se> |
||
3 | ## |
||
4 | ## All lines beginning with `## DP:' are a description of the patch. |
||
5 | ## DP: Change various ints to size_t etc, to avoid crashes on 64-bit |
||
6 | ## DP: architectures. |
||
7 | |||
8 | @DPATCH@ |
||
9 | |||
10 | diff -Nur libspf2-1.2.5.dfsg/src/include/spf_internal.h libspf2-1.2.5.dfsg.new/src/include/spf_internal.h |
||
11 | --- libspf2-1.2.5.dfsg/src/include/spf_internal.h 2007-03-23 22:37:26.000000000 +0100 |
||
12 | +++ libspf2-1.2.5.dfsg.new/src/include/spf_internal.h 2007-03-23 23:08:54.000000000 +0100 |
||
13 | @@ -71,7 +71,7 @@ |
||
14 | static inline size_t _align_sz(size_t s) |
||
15 | { return (s + (_ALIGN_SZ - 1 - (((s - 1) & (_ALIGN_SZ - 1))))); } |
||
16 | static inline char * _align_ptr(char *s) |
||
17 | - { return (s + (_ALIGN_SZ - 1 - ((((unsigned int)s - 1) & (_ALIGN_SZ - 1))))); } |
||
18 | + { return (s + (_ALIGN_SZ - 1 - ((((size_t)s - 1) & (_ALIGN_SZ - 1))))); } |
||
19 | #else |
||
20 | static inline size_t _align_sz(size_t s) { return s; } |
||
21 | static inline char * _align_ptr(char *s) { return s; } |
||
22 | diff -Nur libspf2-1.2.5.dfsg/src/include/spf_record.h libspf2-1.2.5.dfsg.new/src/include/spf_record.h |
||
23 | --- libspf2-1.2.5.dfsg/src/include/spf_record.h 2007-03-23 22:37:26.000000000 +0100 |
||
24 | +++ libspf2-1.2.5.dfsg.new/src/include/spf_record.h 2007-03-23 23:08:54.000000000 +0100 |
||
25 | @@ -224,7 +224,7 @@ |
||
26 | |||
27 | struct SPF_macro_struct |
||
28 | { |
||
29 | - unsigned int macro_len; /* bytes of data */ |
||
30 | + size_t macro_len; /* bytes of data */ |
||
31 | /* data: (SPF_data_t[] = char[macro_len]) follows */ |
||
32 | }; |
||
33 | |||
34 | diff -Nur libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c libspf2-1.2.5.dfsg.new/src/libspf2/spf_compile.c |
||
35 | --- libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c 2007-03-23 22:37:26.000000000 +0100 |
||
36 | +++ libspf2-1.2.5.dfsg.new/src/libspf2/spf_compile.c 2007-03-23 23:18:41.000000000 +0100 |
||
37 | @@ -98,7 +98,7 @@ |
||
38 | } |
||
39 | |||
40 | static void |
||
41 | -SPF_c_ensure_capacity(void **datap, int *sizep, int length) |
||
42 | +SPF_c_ensure_capacity(void **datap, size_t *sizep, int length) |
||
43 | { |
||
44 | int size = *sizep; |
||
45 | if (length > size) |
||
46 | @@ -435,7 +435,7 @@ |
||
47 | static SPF_errcode_t |
||
48 | SPF_c_parse_macro(SPF_server_t *spf_server, |
||
49 | SPF_response_t *spf_response, |
||
50 | - SPF_data_t *data, int *data_len, |
||
51 | + SPF_data_t *data, size_t *data_len, |
||
52 | const char **startp, const char **endp, |
||
53 | size_t max_len, SPF_errcode_t big_err, |
||
54 | int is_mod) |
||
55 | @@ -551,10 +551,10 @@ |
||
56 | static SPF_errcode_t |
||
57 | SPF_c_parse_domainspec(SPF_server_t *spf_server, |
||
58 | SPF_response_t *spf_response, |
||
59 | - SPF_data_t *data, int *data_len, |
||
60 | + SPF_data_t *data, size_t *data_len, |
||
61 | const char **startp, const char **endp, |
||
62 | size_t max_len, SPF_errcode_t big_err, |
||
63 | - int cidr_ok, int is_mod) |
||
64 | + SPF_cidr_t cidr_ok, int is_mod) |
||
65 | { |
||
66 | SPF_errcode_t err; |
||
67 | /* Generic parsing iterators and boundaries */ |
||
68 | diff -Nur libspf2-1.2.5.dfsg/src/libspf2/spf_dns_resolv.c libspf2-1.2.5.dfsg.new/src/libspf2/spf_dns_resolv.c |
||
69 | --- libspf2-1.2.5.dfsg/src/libspf2/spf_dns_resolv.c 2007-03-23 22:37:26.000000000 +0100 |
||
70 | +++ libspf2-1.2.5.dfsg.new/src/libspf2/spf_dns_resolv.c 2007-03-23 23:08:54.000000000 +0100 |
||
71 | @@ -393,7 +393,7 @@ |
||
72 | if ( SPF_dns_rr_buf_realloc( spfrr, cnt, rdlen ) != SPF_E_SUCCESS ) |
||
73 | return spfrr; |
||
74 | |||
75 | - dst = spfrr->rr[cnt]->txt; |
||
76 | + dst = (u_char *)(spfrr->rr[cnt]->txt); |
||
77 | len = 0; |
||
78 | src = (u_char *)rdata; |
||
79 | while ( rdlen > 0 ) |
||
80 | diff -Nur libspf2-1.2.5.dfsg/src/libspf2/spf_interpret.c libspf2-1.2.5.dfsg.new/src/libspf2/spf_interpret.c |
||
81 | --- libspf2-1.2.5.dfsg/src/libspf2/spf_interpret.c 2007-03-23 22:37:26.000000000 +0100 |
||
82 | +++ libspf2-1.2.5.dfsg.new/src/libspf2/spf_interpret.c 2007-03-23 23:20:30.000000000 +0100 |
||
83 | @@ -49,8 +49,8 @@ |
||
84 | SPF_record_t *spf_record; |
||
85 | SPF_errcode_t err; |
||
86 | char *buf; |
||
87 | - int buflen; |
||
88 | - int len; |
||
89 | + size_t buflen; |
||
90 | + size_t len; |
||
91 | |||
92 | SPF_ASSERT_NOTNULL(spf_response); |
||
93 | spf_request = spf_response->spf_request; |
||
94 | diff -Nur libspf2-1.2.5.dfsg/src/spfd/spfd.c libspf2-1.2.5.dfsg.new/src/spfd/spfd.c |
||
95 | --- libspf2-1.2.5.dfsg/src/spfd/spfd.c 2007-03-23 22:37:26.000000000 +0100 |
||
96 | +++ libspf2-1.2.5.dfsg.new/src/spfd/spfd.c 2007-03-23 23:08:54.000000000 +0100 |
||
97 | @@ -168,7 +168,7 @@ |
||
98 | struct sockaddr_in in; |
||
99 | struct sockaddr_un un; |
||
100 | } addr; |
||
101 | - int addrlen; |
||
102 | + socklen_t addrlen; |
||
103 | char *data; |
||
104 | int datalen; |
||
105 |