inadyn: 2.0 -> 2.1, fix build with libite 1.9

+254 -3
+12 -3
pkgs/tools/networking/inadyn/default.nix
··· 1 - { stdenv, fetchurl, gnutls, autoreconfHook, pkgconfig, libite, libconfuse }: 1 + { stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig 2 + , gnutls, libite, libconfuse }: 2 3 3 4 let 4 - version = "2.0"; 5 + version = "2.1"; 5 6 in 6 7 stdenv.mkDerivation { 7 8 name = "inadyn-${version}"; 8 9 9 10 src = fetchurl { 10 11 url = "https://github.com/troglobit/inadyn/releases/download/v${version}/inadyn-${version}.tar.xz"; 11 - sha256 = "16nmbxj337vkqkk6f7vx7fa8mczjv6dl3ybaxy16c23h486y0mzh"; 12 + sha256 = "1b5khr2y5q1x2mn08zrnjf9hsals4y403mhsc1s7016w3my9lqw7"; 12 13 }; 14 + 15 + patches = [ 16 + ./remove-unused-macro.patch 17 + (fetchpatch { 18 + url = "https://github.com/troglobit/inadyn/commit/ed3a7761015441b5d5cacd691b7aa114da048bef.patch"; 19 + sha256 = "1passghmjd7gmrfcqkfqw9lvg8l22s91nm65ys3n3rylzsgaaq8i"; 20 + }) 21 + ]; 13 22 14 23 nativeBuildInputs = [ autoreconfHook pkgconfig ]; 15 24 buildInputs = [ gnutls libite libconfuse ];
+242
pkgs/tools/networking/inadyn/remove-unused-macro.patch
··· 1 + From b5c70461822003238784ff56f4c8eead10cfc2c1 Mon Sep 17 00:00:00 2001 2 + From: Joachim Nilsson <troglobit@gmail.com> 3 + Date: Sun, 2 Jul 2017 21:01:33 +0200 4 + Subject: [PATCH] Remove UNUSED() macro and disable the compiler warning 5 + instead 6 + 7 + Signed-off-by: Joachim Nilsson <troglobit@gmail.com> 8 + 9 + diff --git a/plugins/common.c b/plugins/common.c 10 + index 55c1ac3..9e7ba7b 100644 11 + --- a/plugins/common.c 12 + +++ b/plugins/common.c 13 + @@ -64,7 +64,7 @@ int common_request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) 14 + * DynDNS response validator -- common to many other DDNS providers as well 15 + * 'good' or 'nochg' are the good answers, 16 + */ 17 + -int common_response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) 18 + +int common_response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) 19 + { 20 + char *body = trans->rsp_body; 21 + 22 + diff --git a/plugins/ddnss.c b/plugins/ddnss.c 23 + index fea41e9..5184db0 100644 24 + --- a/plugins/ddnss.c 25 + +++ b/plugins/ddnss.c 26 + @@ -60,7 +60,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) 27 + info->user_agent); 28 + } 29 + 30 + -static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) 31 + +static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) 32 + { 33 + char *resp = trans->rsp_body; 34 + 35 + diff --git a/plugins/dhis.c b/plugins/dhis.c 36 + index 11edd2c..b6e8e0b 100644 37 + --- a/plugins/dhis.c 38 + +++ b/plugins/dhis.c 39 + @@ -65,7 +65,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) 40 + info->user_agent); 41 + } 42 + 43 + -static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *alias) 44 + +static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) 45 + { 46 + char *rsp = trans->rsp_body; 47 + 48 + diff --git a/plugins/dnsexit.c b/plugins/dnsexit.c 49 + index c456f38..4bf0a08 100644 50 + --- a/plugins/dnsexit.c 51 + +++ b/plugins/dnsexit.c 52 + @@ -62,7 +62,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) 53 + info->user_agent); 54 + } 55 + 56 + -static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) 57 + +static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) 58 + { 59 + int code = -1; 60 + char *tmp; 61 + diff --git a/plugins/dtdns.c b/plugins/dtdns.c 62 + index e7996fe..38f0977 100644 63 + --- a/plugins/dtdns.c 64 + +++ b/plugins/dtdns.c 65 + @@ -58,7 +58,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) 66 + info->user_agent); 67 + } 68 + 69 + -static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) 70 + +static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) 71 + { 72 + char *resp = trans->rsp_body; 73 + 74 + diff --git a/plugins/duckdns.c b/plugins/duckdns.c 75 + index 9ca46ae..66d9c25 100755 76 + --- a/plugins/duckdns.c 77 + +++ b/plugins/duckdns.c 78 + @@ -78,7 +78,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) 79 + info->user_agent); 80 + } 81 + 82 + -static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) 83 + +static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) 84 + { 85 + char *resp = trans->rsp_body; 86 + 87 + diff --git a/plugins/duiadns.c b/plugins/duiadns.c 88 + index 7c4ced3..7dc09c9 100644 89 + --- a/plugins/duiadns.c 90 + +++ b/plugins/duiadns.c 91 + @@ -58,7 +58,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) 92 + info->user_agent); 93 + } 94 + 95 + -static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) 96 + +static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) 97 + { 98 + char *resp = trans->rsp_body; 99 + 100 + diff --git a/plugins/dynv6-ipv4.c b/plugins/dynv6-ipv4.c 101 + index 5dab9f1..f37215a 100644 102 + --- a/plugins/dynv6-ipv4.c 103 + +++ b/plugins/dynv6-ipv4.c 104 + @@ -59,7 +59,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) 105 + info->user_agent); 106 + } 107 + 108 + -static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) 109 + +static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) 110 + { 111 + char *resp = trans->rsp_body; 112 + 113 + diff --git a/plugins/dynv6.c b/plugins/dynv6.c 114 + index 84b7c40..03b1b4c 100644 115 + --- a/plugins/dynv6.c 116 + +++ b/plugins/dynv6.c 117 + @@ -59,7 +59,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) 118 + info->user_agent); 119 + } 120 + 121 + -static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) 122 + +static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) 123 + { 124 + char *resp = trans->rsp_body; 125 + 126 + diff --git a/plugins/easydns.c b/plugins/easydns.c 127 + index c9d8059..7718c56 100644 128 + --- a/plugins/easydns.c 129 + +++ b/plugins/easydns.c 130 + @@ -70,7 +70,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) 131 + /* 132 + * NOERROR is the OK code here 133 + */ 134 + -static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) 135 + +static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) 136 + { 137 + char *resp = trans->rsp_body; 138 + 139 + diff --git a/plugins/freedns.c b/plugins/freedns.c 140 + index 2c56ca4..2a2991f 100644 141 + --- a/plugins/freedns.c 142 + +++ b/plugins/freedns.c 143 + @@ -134,7 +134,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) 144 + fail blabla and n.n.n.n 145 + are the good answers. We search our own IP address in response and that's enough. 146 + */ 147 + -static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *alias) 148 + +static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) 149 + { 150 + char *resp = trans->rsp_body; 151 + 152 + diff --git a/plugins/generic.c b/plugins/generic.c 153 + index 8f23de4..3cee1f2 100644 154 + --- a/plugins/generic.c 155 + +++ b/plugins/generic.c 156 + @@ -238,7 +238,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) 157 + return ret; 158 + } 159 + 160 + -static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *UNUSED(alias)) 161 + +static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) 162 + { 163 + char *resp = trans->rsp_body; 164 + size_t i; 165 + diff --git a/plugins/giradns.c b/plugins/giradns.c 166 + index 2d6043e..ea19f77 100644 167 + --- a/plugins/giradns.c 168 + +++ b/plugins/giradns.c 169 + @@ -57,7 +57,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) 170 + info->server_name.name, info->user_agent); 171 + } 172 + 173 + -static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) 174 + +static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) 175 + { 176 + char *resp = trans->rsp_body; 177 + 178 + diff --git a/plugins/sitelutions.c b/plugins/sitelutions.c 179 + index c484a62..611c865 100644 180 + --- a/plugins/sitelutions.c 181 + +++ b/plugins/sitelutions.c 182 + @@ -64,7 +64,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) 183 + info->user_agent); 184 + } 185 + 186 + -static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) 187 + +static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) 188 + { 189 + char *resp = trans->rsp_body; 190 + 191 + diff --git a/plugins/tunnelbroker.c b/plugins/tunnelbroker.c 192 + index 1f58990..17eb2b9 100644 193 + --- a/plugins/tunnelbroker.c 194 + +++ b/plugins/tunnelbroker.c 195 + @@ -77,7 +77,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) 196 + * Hurricate Electric IPv6 tunnelbroker specific response validator 197 + * Own IP address and 'already in use' are the good answers. 198 + */ 199 + -static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *alias) 200 + +static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) 201 + { 202 + char *resp = trans->rsp_body; 203 + 204 + diff --git a/plugins/tzo.c b/plugins/tzo.c 205 + index 0a36e87..eba3da4 100644 206 + --- a/plugins/tzo.c 207 + +++ b/plugins/tzo.c 208 + @@ -66,7 +66,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) 209 + } 210 + 211 + /* TZO specific response validator. */ 212 + -static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) 213 + +static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) 214 + { 215 + int code = -1; 216 + 217 + diff --git a/plugins/zerigo.c b/plugins/zerigo.c 218 + index 4fb29ab..cc71348 100644 219 + --- a/plugins/zerigo.c 220 + +++ b/plugins/zerigo.c 221 + @@ -70,7 +70,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) 222 + * Server error 223 + * Status: 5xx 224 + */ 225 + -static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) 226 + +static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) 227 + { 228 + char *ptr, *rsp = trans->rsp_body; 229 + 230 + diff --git a/plugins/zoneedit.c b/plugins/zoneedit.c 231 + index 7178b9c..464ed66 100644 232 + --- a/plugins/zoneedit.c 233 + +++ b/plugins/zoneedit.c 234 + @@ -65,7 +65,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) 235 + * CODE=200, 201 236 + * CODE=707, for duplicated updates 237 + */ 238 + -static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) 239 + +static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) 240 + { 241 + int code = -1; 242 +