1 From aff98a5667c22794e2eaf658f6dfbee54cdd4a3b Mon Sep 17 00:00:00 2001
2 From: Felix Yan <felixonmars@archlinux.org>
3 Date: Thu, 12 Aug 2021 02:44:43 +0800
4 Subject: [PATCH 1/2] deps: fix building with system c-ares on Linux
6 The change in #39724 breaks building with system c-ares
9 In file included from ../src/cares_wrap.cc:25:
10 ../src/cares_wrap.h:25:11: fatal error: ares_nameser.h: No such file or
12 25 | # include <ares_nameser.h>
16 Since `ares_nameser.h` isn't available with a default system c-ares
17 installation, let's copy it as our private header here.
19 Tested to build fine on Arch Linux with shared c-ares.
21 src/ares_nameser.h | 482 +++++++++++++++++++++++++++++++++++++++++++++
22 1 file changed, 482 insertions(+)
23 create mode 100644 src/ares_nameser.h
25 diff --git a/src/ares_nameser.h b/src/ares_nameser.h
27 index 000000000000..5270e5a3a6a0
29 +++ b/src/ares_nameser.h
32 +#ifndef ARES_NAMESER_H
33 +#define ARES_NAMESER_H
35 +#ifdef HAVE_ARPA_NAMESER_H
36 +# include <arpa/nameser.h>
38 +#ifdef HAVE_ARPA_NAMESER_COMPAT_H
39 +# include <arpa/nameser_compat.h>
42 +/* ============================================================================
43 + * arpa/nameser.h may or may not provide ALL of the below defines, so check
44 + * each one individually and set if not
45 + * ============================================================================
49 +# define NS_PACKETSZ 512 /* maximum packet size */
53 +# define NS_MAXDNAME 256 /* maximum domain name */
57 +# define NS_MAXCDNAME 255 /* maximum compressed domain name */
61 +# define NS_MAXLABEL 63
65 +# define NS_HFIXEDSZ 12 /* #/bytes of fixed data in header */
69 +# define NS_QFIXEDSZ 4 /* #/bytes of fixed data in query */
73 +# define NS_RRFIXEDSZ 10 /* #/bytes of fixed data in r record */
77 +# define NS_INT16SZ 2
81 +# define NS_INADDRSZ 4
85 +# define NS_IN6ADDRSZ 16
89 +# define NS_CMPRSFLGS 0xc0 /* Flag bits indicating name compression. */
92 +#ifndef NS_DEFAULTPORT
93 +# define NS_DEFAULTPORT 53 /* For both TCP and UDP. */
96 +/* ============================================================================
97 + * arpa/nameser.h should provide these enumerations always, so if not found,
99 + * ============================================================================
101 +#ifndef HAVE_ARPA_NAMESER_H
103 +typedef enum __ns_class {
104 + ns_c_invalid = 0, /* Cookie. */
105 + ns_c_in = 1, /* Internet. */
106 + ns_c_2 = 2, /* unallocated/unsupported. */
107 + ns_c_chaos = 3, /* MIT Chaos-net. */
108 + ns_c_hs = 4, /* MIT Hesiod. */
109 + /* Query class values which do not appear in resource records */
110 + ns_c_none = 254, /* for prereq. sections in update requests */
111 + ns_c_any = 255, /* Wildcard match. */
115 +typedef enum __ns_type {
116 + ns_t_invalid = 0, /* Cookie. */
117 + ns_t_a = 1, /* Host address. */
118 + ns_t_ns = 2, /* Authoritative server. */
119 + ns_t_md = 3, /* Mail destination. */
120 + ns_t_mf = 4, /* Mail forwarder. */
121 + ns_t_cname = 5, /* Canonical name. */
122 + ns_t_soa = 6, /* Start of authority zone. */
123 + ns_t_mb = 7, /* Mailbox domain name. */
124 + ns_t_mg = 8, /* Mail group member. */
125 + ns_t_mr = 9, /* Mail rename name. */
126 + ns_t_null = 10, /* Null resource record. */
127 + ns_t_wks = 11, /* Well known service. */
128 + ns_t_ptr = 12, /* Domain name pointer. */
129 + ns_t_hinfo = 13, /* Host information. */
130 + ns_t_minfo = 14, /* Mailbox information. */
131 + ns_t_mx = 15, /* Mail routing information. */
132 + ns_t_txt = 16, /* Text strings. */
133 + ns_t_rp = 17, /* Responsible person. */
134 + ns_t_afsdb = 18, /* AFS cell database. */
135 + ns_t_x25 = 19, /* X_25 calling address. */
136 + ns_t_isdn = 20, /* ISDN calling address. */
137 + ns_t_rt = 21, /* Router. */
138 + ns_t_nsap = 22, /* NSAP address. */
139 + ns_t_nsap_ptr = 23, /* Reverse NSAP lookup (deprecated). */
140 + ns_t_sig = 24, /* Security signature. */
141 + ns_t_key = 25, /* Security key. */
142 + ns_t_px = 26, /* X.400 mail mapping. */
143 + ns_t_gpos = 27, /* Geographical position (withdrawn). */
144 + ns_t_aaaa = 28, /* Ip6 Address. */
145 + ns_t_loc = 29, /* Location Information. */
146 + ns_t_nxt = 30, /* Next domain (security). */
147 + ns_t_eid = 31, /* Endpoint identifier. */
148 + ns_t_nimloc = 32, /* Nimrod Locator. */
149 + ns_t_srv = 33, /* Server Selection. */
150 + ns_t_atma = 34, /* ATM Address */
151 + ns_t_naptr = 35, /* Naming Authority PoinTeR */
152 + ns_t_kx = 36, /* Key Exchange */
153 + ns_t_cert = 37, /* Certification record */
154 + ns_t_a6 = 38, /* IPv6 address (deprecates AAAA) */
155 + ns_t_dname = 39, /* Non-terminal DNAME (for IPv6) */
156 + ns_t_sink = 40, /* Kitchen sink (experimentatl) */
157 + ns_t_opt = 41, /* EDNS0 option (meta-RR) */
158 + ns_t_apl = 42, /* Address prefix list (RFC3123) */
159 + ns_t_ds = 43, /* Delegation Signer (RFC4034) */
160 + ns_t_sshfp = 44, /* SSH Key Fingerprint (RFC4255) */
161 + ns_t_rrsig = 46, /* Resource Record Signature (RFC4034) */
162 + ns_t_nsec = 47, /* Next Secure (RFC4034) */
163 + ns_t_dnskey = 48, /* DNS Public Key (RFC4034) */
164 + ns_t_tkey = 249, /* Transaction key */
165 + ns_t_tsig = 250, /* Transaction signature. */
166 + ns_t_ixfr = 251, /* Incremental zone transfer. */
167 + ns_t_axfr = 252, /* Transfer zone of authority. */
168 + ns_t_mailb = 253, /* Transfer mailbox records. */
169 + ns_t_maila = 254, /* Transfer mail agent records. */
170 + ns_t_any = 255, /* Wildcard match. */
171 + ns_t_zxfr = 256, /* BIND-specific, nonstandard. */
172 + ns_t_caa = 257, /* Certification Authority Authorization. */
176 +typedef enum __ns_opcode {
177 + ns_o_query = 0, /* Standard query. */
178 + ns_o_iquery = 1, /* Inverse query (deprecated/unsupported). */
179 + ns_o_status = 2, /* Name server status query (unsupported). */
180 + /* Opcode 3 is undefined/reserved. */
181 + ns_o_notify = 4, /* Zone change notification. */
182 + ns_o_update = 5, /* Zone update message. */
186 +typedef enum __ns_rcode {
187 + ns_r_noerror = 0, /* No error occurred. */
188 + ns_r_formerr = 1, /* Format error. */
189 + ns_r_servfail = 2, /* Server failure. */
190 + ns_r_nxdomain = 3, /* Name error. */
191 + ns_r_notimpl = 4, /* Unimplemented. */
192 + ns_r_refused = 5, /* Operation refused. */
193 + /* these are for BIND_UPDATE */
194 + ns_r_yxdomain = 6, /* Name exists */
195 + ns_r_yxrrset = 7, /* RRset exists */
196 + ns_r_nxrrset = 8, /* RRset does not exist */
197 + ns_r_notauth = 9, /* Not authoritative for zone */
198 + ns_r_notzone = 10, /* Zone of record different from zone section */
200 + /* The following are TSIG extended errors */
206 +#endif /* HAVE_ARPA_NAMESER_H */
209 +/* ============================================================================
210 + * arpa/nameser_compat.h typically sets these. However on some systems
211 + * arpa/nameser.h does, but may not set all of them. Lets conditionally
213 + * ============================================================================
217 +# define PACKETSZ NS_PACKETSZ
221 +# define MAXDNAME NS_MAXDNAME
225 +# define MAXCDNAME NS_MAXCDNAME
229 +# define MAXLABEL NS_MAXLABEL
233 +# define HFIXEDSZ NS_HFIXEDSZ
237 +# define QFIXEDSZ NS_QFIXEDSZ
241 +# define RRFIXEDSZ NS_RRFIXEDSZ
245 +# define INDIR_MASK NS_CMPRSFLGS
248 +#ifndef NAMESERVER_PORT
249 +# define NAMESERVER_PORT NS_DEFAULTPORT
255 +# define O_QUERY 0 /* ns_o_query */
258 +# define O_IQUERY 1 /* ns_o_iquery */
261 +# define O_STATUS 2 /* ns_o_status */
264 +# define O_NOTIFY 4 /* ns_o_notify */
267 +# define O_UPDATE 5 /* ns_o_update */
271 +/* response codes */
273 +# define SERVFAIL ns_r_servfail
276 +# define NOTIMP ns_r_notimpl
279 +# define REFUSED ns_r_refused
281 +#if defined(_WIN32) && !defined(HAVE_ARPA_NAMESER_COMPAT_H) && defined(NOERROR)
282 +# undef NOERROR /* it seems this is already defined in winerror.h */
285 +# define NOERROR ns_r_noerror
288 +# define FORMERR ns_r_formerr
291 +# define NXDOMAIN ns_r_nxdomain
293 +/* Non-standard response codes, use numeric values */
295 +# define YXDOMAIN 6 /* ns_r_yxdomain */
298 +# define YXRRSET 7 /* ns_r_yxrrset */
301 +# define NXRRSET 8 /* ns_r_nxrrset */
304 +# define NOTAUTH 9 /* ns_r_notauth */
307 +# define NOTZONE 10 /* ns_r_notzone */
310 +# define TSIG_BADSIG 16 /* ns_r_badsig */
313 +# define TSIG_BADKEY 17 /* ns_r_badkey */
315 +#ifndef TSIG_BADTIME
316 +# define TSIG_BADTIME 18 /* ns_r_badtime */
322 +# define C_IN 1 /* ns_c_in */
325 +# define C_CHAOS 3 /* ns_c_chaos */
328 +# define C_HS 4 /* ns_c_hs */
331 +# define C_NONE 254 /* ns_c_none */
334 +# define C_ANY 255 /* ns_c_any */
340 +# define T_A 1 /* ns_t_a */
343 +# define T_NS 2 /* ns_t_ns */
346 +# define T_MD 3 /* ns_t_md */
349 +# define T_MF 4 /* ns_t_mf */
352 +# define T_CNAME 5 /* ns_t_cname */
355 +# define T_SOA 6 /* ns_t_soa */
358 +# define T_MB 7 /* ns_t_mb */
361 +# define T_MG 8 /* ns_t_mg */
364 +# define T_MR 9 /* ns_t_mr */
367 +# define T_NULL 10 /* ns_t_null */
370 +# define T_WKS 11 /* ns_t_wks */
373 +# define T_PTR 12 /* ns_t_ptr */
376 +# define T_HINFO 13 /* ns_t_hinfo */
379 +# define T_MINFO 14 /* ns_t_minfo */
382 +# define T_MX 15 /* ns_t_mx */
385 +# define T_TXT 16 /* ns_t_txt */
388 +# define T_RP 17 /* ns_t_rp */
391 +# define T_AFSDB 18 /* ns_t_afsdb */
394 +# define T_X25 19 /* ns_t_x25 */
397 +# define T_ISDN 20 /* ns_t_isdn */
400 +# define T_RT 21 /* ns_t_rt */
403 +# define T_NSAP 22 /* ns_t_nsap */
406 +# define T_NSAP_PTR 23 /* ns_t_nsap_ptr */
409 +# define T_SIG 24 /* ns_t_sig */
412 +# define T_KEY 25 /* ns_t_key */
415 +# define T_PX 26 /* ns_t_px */
418 +# define T_GPOS 27 /* ns_t_gpos */
421 +# define T_AAAA 28 /* ns_t_aaaa */
424 +# define T_LOC 29 /* ns_t_loc */
427 +# define T_NXT 30 /* ns_t_nxt */
430 +# define T_EID 31 /* ns_t_eid */
433 +# define T_NIMLOC 32 /* ns_t_nimloc */
436 +# define T_SRV 33 /* ns_t_srv */
439 +# define T_ATMA 34 /* ns_t_atma */
442 +# define T_NAPTR 35 /* ns_t_naptr */
445 +# define T_KX 36 /* ns_t_kx */
448 +# define T_CERT 37 /* ns_t_cert */
451 +# define T_A6 38 /* ns_t_a6 */
454 +# define T_DNAME 39 /* ns_t_dname */
457 +# define T_SINK 40 /* ns_t_sink */
460 +# define T_OPT 41 /* ns_t_opt */
463 +# define T_APL 42 /* ns_t_apl */
466 +# define T_DS 43 /* ns_t_ds */
469 +# define T_SSHFP 44 /* ns_t_sshfp */
472 +# define T_RRSIG 46 /* ns_t_rrsig */
475 +# define T_NSEC 47 /* ns_t_nsec */
478 +# define T_DNSKEY 48 /* ns_t_dnskey */
481 +# define T_TKEY 249 /* ns_t_tkey */
484 +# define T_TSIG 250 /* ns_t_tsig */
487 +# define T_IXFR 251 /* ns_t_ixfr */
490 +# define T_AXFR 252 /* ns_t_axfr */
493 +# define T_MAILB 253 /* ns_t_mailb */
496 +# define T_MAILA 254 /* ns_t_maila */
499 +# define T_ANY 255 /* ns_t_any */
502 +# define T_ZXFR 256 /* ns_t_zxfr */
505 +# define T_CAA 257 /* ns_t_caa */
508 +# define T_MAX 65536 /* ns_t_max */
512 +#endif /* ARES_NAMESER_H */
514 From db4643979ee676b3a3d6cdf2fb597d399cf8013f Mon Sep 17 00:00:00 2001
515 From: Felix Yan <felixonmars@archlinux.org>
516 Date: Fri, 13 Aug 2021 00:01:59 +0800
517 Subject: [PATCH 2/2] build: ignore cpplint for third-party ares_nameser.h
521 1 file changed, 1 insertion(+)
523 diff --git a/Makefile b/Makefile
524 index ec4c774748cd..c418995c53c1 100644
527 @@ -1289,6 +1289,7 @@ jslint-ci: lint-js-ci
528 LINT_CPP_ADDON_DOC_FILES_GLOB = test/addons/??_*/*.cc test/addons/??_*/*.h
529 LINT_CPP_ADDON_DOC_FILES = $(wildcard $(LINT_CPP_ADDON_DOC_FILES_GLOB))
531 +LINT_CPP_EXCLUDE += src/ares_nameser.h
532 LINT_CPP_EXCLUDE += src/node_root_certs.h
533 LINT_CPP_EXCLUDE += $(LINT_CPP_ADDON_DOC_FILES)
534 LINT_CPP_EXCLUDE += $(wildcard test/js-native-api/??_*/*.cc test/js-native-api/??_*/*.h test/node-api/??_*/*.cc test/node-api/??_*/*.h)