pfixtools: fix build with unbound-1.6.1

+56
+54
pkgs/servers/mail/postfix/0001-Fix-build-with-unbound-1.6.1.patch
··· 1 + From bf269dda3c81bb9eaa244b3015d426de38c85ccf Mon Sep 17 00:00:00 2001 2 + From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat> 3 + Date: Fri, 3 Mar 2017 09:59:09 +0100 4 + Subject: [PATCH] Fix build with unbound 1.6.1 5 + 6 + From their changelog: Fix to rename ub_callback_t to ub_callback_type, because POSIX reserves _t typedefs 7 + --- 8 + postlicyd/dns.c | 2 +- 9 + postlicyd/dns.h | 2 +- 10 + postlicyd/spf-proto.c | 2 +- 11 + 3 files changed, 3 insertions(+), 3 deletions(-) 12 + 13 + diff --git a/postlicyd/dns.c b/postlicyd/dns.c 14 + index d8409c2..97f1c4d 100644 15 + --- a/postlicyd/dns.c 16 + +++ b/postlicyd/dns.c 17 + @@ -123,7 +123,7 @@ static int dns_handler(client_t *event, void *config) 18 + } 19 + 20 + bool dns_resolve(const char *hostname, dns_rrtype_t type, 21 + - ub_callback_t callback, void *data) 22 + + ub_callback_type callback, void *data) 23 + { 24 + if (_G.ctx == NULL) { 25 + _G.ctx = ub_ctx_create(); 26 + diff --git a/postlicyd/dns.h b/postlicyd/dns.h 27 + index d84de3b..905b924 100644 28 + --- a/postlicyd/dns.h 29 + +++ b/postlicyd/dns.h 30 + @@ -89,7 +89,7 @@ typedef void (*dns_result_callback_f)(dns_result_t *result, void *data); 31 + */ 32 + __attribute__((nonnull(1,3,4))) 33 + bool dns_resolve(const char *hostname, dns_rrtype_t type, 34 + - ub_callback_t callback, void *data); 35 + + ub_callback_type callback, void *data); 36 + 37 + /** Fetch the DNS record of the given type. 38 + */ 39 + diff --git a/postlicyd/spf-proto.c b/postlicyd/spf-proto.c 40 + index 31cb0a5..79a2d83 100644 41 + --- a/postlicyd/spf-proto.c 42 + +++ b/postlicyd/spf-proto.c 43 + @@ -279,7 +279,7 @@ static bool spf_validate_domain(const char* restrict domain) 44 + } 45 + 46 + static bool spf_query(spf_t *spf, const char* query, dns_rrtype_t rtype, 47 + - ub_callback_t cb) 48 + + ub_callback_type cb) 49 + { 50 + buffer_reset(&_G.query_buffer); 51 + buffer_addstr(&_G.query_buffer, query); 52 + -- 53 + 2.12.0 54 +
+2
pkgs/servers/mail/postfix/pfixtools.nix
··· 26 26 27 27 src = pfixtoolsSrc; 28 28 29 + patches = [ ./0001-Fix-build-with-unbound-1.6.1.patch ]; 30 + 29 31 buildInputs = [git gperf pcre unbound libev tokyocabinet pkgconfig bash libsrs2]; 30 32 31 33 postUnpack = ''