Subversion Repositories

#! /bin/sh /usr/share/dpatch/dpatch-run
## 20_64bit_types.dpatch by Magnus Holmgren <magnus@kibibyte.se>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Change various ints to size_t etc, to avoid crashes on 64-bit 
## DP: architectures.

@DPATCH@

diff -Nur libspf2-1.2.5.dfsg/src/include/spf_internal.h libspf2-1.2.5.dfsg.new/src/include/spf_internal.h
--- libspf2-1.2.5.dfsg/src/include/spf_internal.h       2007-03-23 22:37:26.000000000 +0100
+++ libspf2-1.2.5.dfsg.new/src/include/spf_internal.h   2007-03-23 23:08:54.000000000 +0100
@@ -71,7 +71,7 @@
 static inline size_t _align_sz(size_t s)
        { return (s + (_ALIGN_SZ - 1 - (((s - 1) & (_ALIGN_SZ - 1))))); }
 static inline char * _align_ptr(char *s)
-       { return (s + (_ALIGN_SZ - 1 - ((((unsigned int)s - 1) & (_ALIGN_SZ - 1))))); }
+       { return (s + (_ALIGN_SZ - 1 - ((((size_t)s - 1) & (_ALIGN_SZ - 1))))); }
 #else
 static inline size_t _align_sz(size_t s) { return s; }
 static inline char * _align_ptr(char *s) { return s; }
diff -Nur libspf2-1.2.5.dfsg/src/include/spf_record.h libspf2-1.2.5.dfsg.new/src/include/spf_record.h
--- libspf2-1.2.5.dfsg/src/include/spf_record.h 2007-03-23 22:37:26.000000000 +0100
+++ libspf2-1.2.5.dfsg.new/src/include/spf_record.h     2007-03-23 23:08:54.000000000 +0100
@@ -224,7 +224,7 @@
 
 struct SPF_macro_struct
 {
-    unsigned int       macro_len;      /* bytes of data */
+    size_t     macro_len;      /* bytes of data */
     /* data: (SPF_data_t[] = char[macro_len]) follows */
 };
 
diff -Nur libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c libspf2-1.2.5.dfsg.new/src/libspf2/spf_compile.c
--- libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c        2007-03-23 22:37:26.000000000 +0100
+++ libspf2-1.2.5.dfsg.new/src/libspf2/spf_compile.c    2007-03-23 23:18:41.000000000 +0100
@@ -98,7 +98,7 @@
 }
 
 static void
-SPF_c_ensure_capacity(void **datap, int *sizep, int length)
+SPF_c_ensure_capacity(void **datap, size_t *sizep, int length)
 {
        int              size = *sizep;
        if (length > size)
@@ -435,7 +435,7 @@
 static SPF_errcode_t
 SPF_c_parse_macro(SPF_server_t *spf_server,
                                SPF_response_t *spf_response,
-                               SPF_data_t *data, int *data_len,
+                               SPF_data_t *data, size_t *data_len,
                                const char **startp, const char **endp,
                                size_t max_len, SPF_errcode_t big_err,
                                int is_mod)
@@ -551,10 +551,10 @@
 static SPF_errcode_t
 SPF_c_parse_domainspec(SPF_server_t *spf_server,
                                SPF_response_t *spf_response,
-                               SPF_data_t *data, int *data_len,
+                               SPF_data_t *data, size_t *data_len,
                                const char **startp, const char **endp,
                                size_t max_len, SPF_errcode_t big_err,
-                               int cidr_ok, int is_mod)
+                               SPF_cidr_t cidr_ok, int is_mod)
 {
        SPF_errcode_t            err;
                        /* Generic parsing iterators and boundaries */
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
--- libspf2-1.2.5.dfsg/src/libspf2/spf_dns_resolv.c     2007-03-23 22:37:26.000000000 +0100
+++ libspf2-1.2.5.dfsg.new/src/libspf2/spf_dns_resolv.c 2007-03-23 23:08:54.000000000 +0100
@@ -393,7 +393,7 @@
                                if ( SPF_dns_rr_buf_realloc( spfrr, cnt, rdlen ) != SPF_E_SUCCESS )
                                return spfrr;
 
-                               dst = spfrr->rr[cnt]->txt;
+                               dst = (u_char *)(spfrr->rr[cnt]->txt);
                                len = 0;
                                src = (u_char *)rdata;
                                while ( rdlen > 0 )
diff -Nur libspf2-1.2.5.dfsg/src/libspf2/spf_interpret.c libspf2-1.2.5.dfsg.new/src/libspf2/spf_interpret.c
--- libspf2-1.2.5.dfsg/src/libspf2/spf_interpret.c      2007-03-23 22:37:26.000000000 +0100
+++ libspf2-1.2.5.dfsg.new/src/libspf2/spf_interpret.c  2007-03-23 23:20:30.000000000 +0100
@@ -49,8 +49,8 @@
        SPF_record_t    *spf_record;
        SPF_errcode_t    err;
        char                    *buf;
-       int                              buflen;
-       int                              len;
+       size_t                           buflen;
+       size_t                           len;
 
        SPF_ASSERT_NOTNULL(spf_response);
        spf_request = spf_response->spf_request;
diff -Nur libspf2-1.2.5.dfsg/src/spfd/spfd.c libspf2-1.2.5.dfsg.new/src/spfd/spfd.c
--- libspf2-1.2.5.dfsg/src/spfd/spfd.c  2007-03-23 22:37:26.000000000 +0100
+++ libspf2-1.2.5.dfsg.new/src/spfd/spfd.c      2007-03-23 23:08:54.000000000 +0100
@@ -168,7 +168,7 @@
                struct sockaddr_in      in;
                struct sockaddr_un      un;
        } addr;
-       int              addrlen;
+       socklen_t                addrlen;
        char    *data;
        int              datalen;