Rev 77 | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 77 | Rev 79 | ||
---|---|---|---|
1 | #! /bin/sh /usr/share/dpatch/dpatch-run |
1 | #! /bin/sh /usr/share/dpatch/dpatch-run |
2 | ## 20_spf_dns_include_std_headers.dpatch by Magnus Holmgren <magnus@kibibyte.se> |
2 | ## 20_spf_dns_include_std_headers.dpatch by Magnus Holmgren <magnus@kibibyte.se> |
3 | ## |
3 | ## |
4 | ## All lines beginning with `## DP:' are a description of the patch. |
4 | ## All lines beginning with `## DP:' are a description of the patch. |
5 | ## DP: Include arpa/nameser.h and netdb.h from spf_dns.h instead of defining |
5 | ## DP: Include arpa/nameser.h and netdb.h from spf_dns.h instead of defining |
6 | ## DP: the constants needed unless certain HAVE_ macros are defined. |
6 | ## DP: the constants needed unless certain HAVE_ macros are defined. |
7 | ## DP: Updated for libspf2 1.2.8/9 by Scott Kitterman <scott@kitterman.com> |
7 | ## DP: Updated for libspf2 1.2.8/9 by Scott Kitterman <scott@kitterman.com> |
8 | 8 | ||
9 | @DPATCH@ |
9 | @DPATCH@ |
10 | diff -urNad libspf2-1.2.9~/src/include/spf_dns.h libspf2-1.2.9/src/include/spf_dns.h |
10 | diff -urNad libspf2-1.2.9~/src/include/spf_dns.h libspf2-1.2.9/src/include/spf_dns.h |
11 | --- libspf2-1.2.9~/src/include/spf_dns.h 2008-10-27 12:27:14.000000000 -0400 |
11 | --- libspf2-1.2.9~/src/include/spf_dns.h 2008-10-27 12:27:14.000000000 -0400 |
12 | +++ libspf2-1.2.9/src/include/spf_dns.h 2008-11-04 10:10:58.000000000 -0500 |
12 | +++ libspf2-1.2.9/src/include/spf_dns.h 2008-11-04 10:10:58.000000000 -0500 |
13 | @@ -63,48 +63,19 @@ |
13 | @@ -63,48 +63,19 @@ |
14 | * |
14 | * |
15 | */ |
15 | */ |
16 | 16 | ||
17 | +/* The following two header files might not exist on all platforms, |
17 | +/* The following two header files might not exist on all platforms, |
18 | + * but at least they exist on Debian with libc6. |
18 | + * but at least they exist on Debian with libc6. |
19 | + */ |
19 | + */ |
20 | +#include <arpa/nameser.h> |
20 | +#include <arpa/nameser.h> |
21 | +#include <netdb.h> |
21 | +#include <netdb.h> |
22 | 22 | ||
23 | /* |
23 | /* |
24 | - * For those who don't have <arpa/nameserv.h> |
24 | - * For those who don't have <arpa/nameserv.h> |
25 | + * Type 99 decl does not exist in Debian libc6 (not even 2.7) |
25 | + * Type 99 decl does not exist in Debian libc6 (not even 2.7) |
26 | */ |
26 | */ |
27 | - |
27 | - |
28 | -/* XXX This should use a more sensible define. */ |
28 | -/* XXX This should use a more sensible define. */ |
29 | -#if !defined( HAVE_NS_TYPE ) |
29 | -#if !defined( HAVE_NS_TYPE ) |
30 | - |
30 | - |
31 | -#define ns_t_invalid 0 |
31 | -#define ns_t_invalid 0 |
32 | -#define ns_t_a 1 |
32 | -#define ns_t_a 1 |
33 | -#define ns_t_ns 2 |
33 | -#define ns_t_ns 2 |
34 | -#define ns_t_cname 5 |
34 | -#define ns_t_cname 5 |
35 | -#define ns_t_ptr 12 |
35 | -#define ns_t_ptr 12 |
36 | -#define ns_t_mx 15 |
36 | -#define ns_t_mx 15 |
37 | -#define ns_t_txt 16 |
37 | -#define ns_t_txt 16 |
38 | -#define ns_t_aaaa 28 |
38 | -#define ns_t_aaaa 28 |
39 | -/* #define ns_t_a6 38 */ |
39 | -/* #define ns_t_a6 38 */ |
40 | -#define ns_t_any 255 /**< Wildcard match. */ |
40 | -#define ns_t_any 255 /**< Wildcard match. */ |
41 | - |
41 | - |
42 | -typedef int ns_type; |
42 | -typedef int ns_type; |
43 | -#endif |
43 | -#endif |
44 | - |
44 | - |
45 | #if ! HAVE_DECL_NS_T_SPF |
45 | #if ! HAVE_DECL_NS_T_SPF |
46 | #define ns_t_spf 99 |
46 | #define ns_t_spf 99 |
47 | #endif |
47 | #endif |
48 | 48 | ||
49 | -#if ! HAVE_DECL_NS_T_INVALID |
49 | -#if ! HAVE_DECL_NS_T_INVALID |
50 | -#define ns_t_invalid 0 |
50 | -#define ns_t_invalid 0 |
51 | -#endif |
51 | -#endif |
52 | - |
52 | - |
53 | - |
53 | - |
54 | -/* |
54 | -/* |
55 | - * For those who don't have <netdb.h> |
55 | - * For those who don't have <netdb.h> |
56 | - */ |
56 | - */ |
57 | - |
57 | - |
58 | -#if !defined(HAVE_NETDB_H) && !defined(_WIN32) |
58 | -#if !defined(HAVE_NETDB_H) && !defined(_WIN32) |
59 | -#define NETDB_SUCCESS 0 |
59 | -#define NETDB_SUCCESS 0 |
60 | -#define HOST_NOT_FOUND 1 /**< NXDOMAIN (authoritative answer)*/ |
60 | -#define HOST_NOT_FOUND 1 /**< NXDOMAIN (authoritative answer)*/ |
61 | -#define TRY_AGAIN 2 /**< SERVFAIL (no authoritative answer)*/ |
61 | -#define TRY_AGAIN 2 /**< SERVFAIL (no authoritative answer)*/ |
62 | -#define NO_RECOVERY 3 /**< invalid/unimplmeneted query */ |
62 | -#define NO_RECOVERY 3 /**< invalid/unimplmeneted query */ |
63 | -#define NO_DATA 4 /**< host found, but no RR of req type*/ |
63 | -#define NO_DATA 4 /**< host found, but no RR of req type*/ |
64 | -#endif |
64 | -#endif |
65 | typedef int SPF_dns_stat_t; |
65 | typedef int SPF_dns_stat_t; |
66 | 66 | ||
67 | typedef struct SPF_dns_server_struct SPF_dns_server_t; |
67 | typedef struct SPF_dns_server_struct SPF_dns_server_t; |