Attachment #246234 for bug #275012

View | Details | Raw Unified | Return to bug 275012
Collapse All | Expand All




PORTNAME=	unbound
DISTVERSION=	1.19.0
PORTREVISION=	1
CATEGORIES=	dns
MASTER_SITES=	https://www.nlnetlabs.nl/downloads/unbound/


		control_proto_spec.txt example.conf ietf67-design-02.odp \
		ietf67-design-02.pdf requirements.txt

OPTIONS_DEFINE=		DEP-RSA1024 DNSCRYPT DNSTAP DOCS DOH DYNLIB ECDSA EVAPI \
			FILTER_AAAA GOST HIREDIS LIBEVENT MUNIN_PLUGIN PYTHON \
			SUBNET TFOCL TFOSE THREADS
OPTIONS_DEFAULT=	DNSCRYPT DOH DYNLIB ECDSA GOST LIBEVENT THREADS
OPTIONS_SUB=		yes


		${WRKSRC}/Makefile.in

post-patch-FILTER_AAAA-on:
	@${CAT} ${WRKSRC}/contrib/aaaa-filter-iterator.patch | \
		${PATCH} -d ${WRKSRC} -p1 -s

post-build:
	@for s in ${STRIP_FILES}; \
		do ${STRIP_CMD} ${WRKSRC}/$$s; \
		done

post-install-DOCS-on:
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} \
		${STAGEDIR}${DOCSDIR}

post-install-MUNIN_PLUGIN-on:
	@${MKDIR} ${STAGEDIR}${PREFIX}/share/munin/plugins

Lines 1-3 Link Here

(-)b/dns/unbound/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1693414086	1	TIMESTAMP = 1699440575
2	SHA256 (unbound-1.18.0.tar.gz) = 3da95490a85cff6420f26fae0b84a49f5112df1bf1b7fc34f8724f02082cb712	2	SHA256 (unbound-1.19.0.tar.gz) = a97532468854c61c2de48ca4170de854fd3bc95c8043bb0cfb0fe26605966624
3	SIZE (unbound-1.18.0.tar.gz) = 6315297	3	SIZE (unbound-1.19.0.tar.gz) = 6336113




--- util/netevent.c.orig	2023-08-30 01:01:13.000000000 -0700
+++ util/netevent.c	2023-10-12 19:00:53.157995000 -0700
@@ -116,6 +116,8 @@
 
 /** timeout in millisec to wait for write to unblock, packets dropped after.*/
 #define SEND_BLOCKED_WAIT_TIMEOUT 200
+/** max number of times to wait for write to unblock, packets dropped after.*/
+#define SEND_BLOCKED_MAX_RETRY 5
 
 /** Let's make timestamping code cleaner and redefine SO_TIMESTAMP* */
 #ifndef SO_TIMESTAMP
@@ -402,9 +404,10 @@
 			WSAGetLastError() == WSAENOBUFS ||
 			WSAGetLastError() == WSAEWOULDBLOCK) {
 #endif
+			int retries = 0;
 			/* if we set the fd blocking, other threads suddenly
 			 * have a blocking fd that they operate on */
-			while(sent == -1 && (
+			while(sent == -1 && retries < SEND_BLOCKED_MAX_RETRY && (
 #ifndef USE_WINSOCK
 				errno == EAGAIN || errno == EINTR ||
 #  ifdef EWOULDBLOCK
@@ -419,6 +422,13 @@
 #endif
 			)) {
 #if defined(HAVE_POLL) || defined(USE_WINSOCK)
+				int send_nobufs = (
+#ifndef USE_WINSOCK
+					errno == ENOBUFS
+#else
+					WSAGetLastError() == WSAENOBUFS
+#endif
+				);
 				struct pollfd p;
 				int pret;
 				memset(&p, 0, sizeof(p));
@@ -457,8 +467,48 @@
 					log_err("poll udp out failed: %s",
 						sock_strerror(errno));
 					return 0;
+				} else if((pret < 0 &&
+#ifndef USE_WINSOCK
+					errno == ENOBUFS
+#else
+					WSAGetLastError() == WSAENOBUFS
+#endif
+					) || (send_nobufs && retries > 0)) {
+					/* ENOBUFS, and poll returned without
+					 * a timeout. Or the retried send call
+					 * returned ENOBUFS. It is good to
+					 * wait a bit for the error to clear. */
+					/* The timeout is 20*(2^(retries+1)),
+					 * it increases exponentially, starting
+					 * at 40 msec. After 5 tries, 1240 msec
+					 * have passed in total, when poll
+					 * returned the error, and 1200 msec
+					 * when send returned the errors. */
+#ifndef USE_WINSOCK
+					pret = poll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1));
+#else
+					pret = WSAPoll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1));
+#endif
+					if(pret < 0 &&
+#ifndef USE_WINSOCK
+						errno != EAGAIN && errno != EINTR &&
+#  ifdef EWOULDBLOCK
+						errno != EWOULDBLOCK &&
+#  endif
+						errno != ENOBUFS
+#else
+						WSAGetLastError() != WSAEINPROGRESS &&
+						WSAGetLastError() != WSAEINTR &&
+						WSAGetLastError() != WSAENOBUFS &&
+						WSAGetLastError() != WSAEWOULDBLOCK
+#endif
+					) {
+						log_err("poll udp out timer failed: %s",
+							sock_strerror(errno));
+					}
 				}
 #endif /* defined(HAVE_POLL) || defined(USE_WINSOCK) */
+				retries++;
 				if (!is_connected) {
 					sent = sendto(c->fd, (void*)sldns_buffer_begin(packet),
 						sldns_buffer_remaining(packet), 0,
@@ -665,7 +715,8 @@
 			WSAGetLastError() == WSAENOBUFS ||
 			WSAGetLastError() == WSAEWOULDBLOCK) {
 #endif
-			while(sent == -1 && (
+			int retries = 0;
+			while(sent == -1 && retries < SEND_BLOCKED_MAX_RETRY && (
 #ifndef USE_WINSOCK
 				errno == EAGAIN || errno == EINTR ||
 #  ifdef EWOULDBLOCK
@@ -680,6 +731,13 @@
 #endif
 			)) {
 #if defined(HAVE_POLL) || defined(USE_WINSOCK)
+				int send_nobufs = (
+#ifndef USE_WINSOCK
+					errno == ENOBUFS
+#else
+					WSAGetLastError() == WSAENOBUFS
+#endif
+				);
 				struct pollfd p;
 				int pret;
 				memset(&p, 0, sizeof(p));
@@ -718,8 +776,48 @@
 					log_err("poll udp out failed: %s",
 						sock_strerror(errno));
 					return 0;
+				} else if((pret < 0 &&
+#ifndef USE_WINSOCK
+					errno == ENOBUFS
+#else
+					WSAGetLastError() == WSAENOBUFS
+#endif
+					) || (send_nobufs && retries > 0)) {
+					/* ENOBUFS, and poll returned without
+					 * a timeout. Or the retried send call
+					 * returned ENOBUFS. It is good to
+					 * wait a bit for the error to clear. */
+					/* The timeout is 20*(2^(retries+1)),
+					 * it increases exponentially, starting
+					 * at 40 msec. After 5 tries, 1240 msec
+					 * have passed in total, when poll
+					 * returned the error, and 1200 msec
+					 * when send returned the errors. */
+#ifndef USE_WINSOCK
+					pret = poll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1));
+#else
+					pret = WSAPoll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1));
+#endif
+					if(pret < 0 &&
+#ifndef USE_WINSOCK
+						errno != EAGAIN && errno != EINTR &&
+#  ifdef EWOULDBLOCK
+						errno != EWOULDBLOCK &&
+#  endif
+						errno != ENOBUFS
+#else
+						WSAGetLastError() != WSAEINPROGRESS &&
+						WSAGetLastError() != WSAEINTR &&
+						WSAGetLastError() != WSAENOBUFS &&
+						WSAGetLastError() != WSAEWOULDBLOCK
+#endif
+					) {
+						log_err("poll udp out timer failed: %s",
+							sock_strerror(errno));
+					}
 				}
 #endif /* defined(HAVE_POLL) || defined(USE_WINSOCK) */
+				retries++;
 				sent = sendmsg(c->fd, &msg, 0);
 			}
 		}

Lines 5-11 libdata/pkgconfig/libunbound.pc Link Here

(-)b/dns/unbound/pkg-plist (-2 / +1 lines)
5	lib/libunbound.a	5	lib/libunbound.a
6	lib/libunbound.so	6	lib/libunbound.so
7	lib/libunbound.so.8	7	lib/libunbound.so.8
8	lib/libunbound.so.8.1.22	8	lib/libunbound.so.8.1.23
9	%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so	9	%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so
10	%%PYTHON%%%%PYTHON_SITELIBDIR%%/unbound.py	10	%%PYTHON%%%%PYTHON_SITELIBDIR%%/unbound.py
11	%%PYTHON%%%%PYTHON_SITELIBDIR%%/unboundmodule.py	11	%%PYTHON%%%%PYTHON_SITELIBDIR%%/unboundmodule.py
12	-

Return to bug 275012

Lines 1-6 Link Here

(-)b/dns/unbound/Makefile (-8 / +11 lines)
1	PORTNAME= unbound	1	PORTNAME= unbound
2	DISTVERSION= 1.18.0	2	DISTVERSION= 1.19.0
3	PORTREVISION= 1
4	CATEGORIES= dns	3	CATEGORIES= dns
5	MASTER_SITES= https://www.nlnetlabs.nl/downloads/unbound/	4	MASTER_SITES= https://www.nlnetlabs.nl/downloads/unbound/
6		5
Lines 32-40 PORTDOCS= CNAME-basedRedirectionDesignNotes.pdf CREDITS Changelog \ Link Here
32	control_proto_spec.txt example.conf ietf67-design-02.odp \	31	control_proto_spec.txt example.conf ietf67-design-02.odp \
33	ietf67-design-02.pdf requirements.txt	32	ietf67-design-02.pdf requirements.txt
34		33
35	OPTIONS_DEFINE= DEP-RSA1024 DNSCRYPT DNSTAP DOCS DOH ECDSA EVAPI \	34	OPTIONS_DEFINE= DEP-RSA1024 DNSCRYPT DNSTAP DOCS DOH DYNLIB ECDSA EVAPI \
36	DYNLIB FILTER_AAAA GOST HIREDIS LIBEVENT MUNIN_PLUGIN \	35	FILTER_AAAA GOST HIREDIS LIBEVENT MUNIN_PLUGIN PYTHON \
37	PYTHON SUBNET TFOCL TFOSE THREADS	36	SUBNET TFOCL TFOSE THREADS
38	OPTIONS_DEFAULT= DNSCRYPT DOH DYNLIB ECDSA GOST LIBEVENT THREADS	37	OPTIONS_DEFAULT= DNSCRYPT DOH DYNLIB ECDSA GOST LIBEVENT THREADS
39	OPTIONS_SUB= yes	38	OPTIONS_SUB= yes
40		39
Lines 98-111 post-patch: Link Here
98	${WRKSRC}/Makefile.in	97	${WRKSRC}/Makefile.in
99		98
100	post-patch-FILTER_AAAA-on:	99	post-patch-FILTER_AAAA-on:
101	${CAT} ${WRKSRC}/contrib/aaaa-filter-iterator.patch \| ${PATCH} -d ${WRKSRC} -p1 -s	100	@${CAT} ${WRKSRC}/contrib/aaaa-filter-iterator.patch \| \
		101	${PATCH} -d ${WRKSRC} -p1 -s
102		102
103	post-build:	103	post-build:
104	@for s in ${STRIP_FILES}; do ${STRIP_CMD} ${WRKSRC}/$$s; done	104	@for s in ${STRIP_FILES}; \
		105	do ${STRIP_CMD} ${WRKSRC}/$$s; \
		106	done
105		107
106	post-install-DOCS-on:	108	post-install-DOCS-on:
107	${MKDIR} ${STAGEDIR}${DOCSDIR}	109	${MKDIR} ${STAGEDIR}${DOCSDIR}
108	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/doc/\|} ${STAGEDIR}${DOCSDIR}	110	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/doc/\|} \
		111	${STAGEDIR}${DOCSDIR}
109		112
110	post-install-MUNIN_PLUGIN-on:	113	post-install-MUNIN_PLUGIN-on:
111	@${MKDIR} ${STAGEDIR}${PREFIX}/share/munin/plugins	114	@${MKDIR} ${STAGEDIR}${PREFIX}/share/munin/plugins

Removed Link Here

(-)a/dns/unbound/files/patch-netevent.c (-159 lines)
1	--- util/netevent.c.orig 2023-08-30 01:01:13.000000000 -0700
2	+++ util/netevent.c 2023-10-12 19:00:53.157995000 -0700
3	@@ -116,6 +116,8 @@
4
5	/** timeout in millisec to wait for write to unblock, packets dropped after.*/
6	#define SEND_BLOCKED_WAIT_TIMEOUT 200
7	+/** max number of times to wait for write to unblock, packets dropped after.*/
8	+#define SEND_BLOCKED_MAX_RETRY 5
9
10	/** Let's make timestamping code cleaner and redefine SO_TIMESTAMP* */
11	#ifndef SO_TIMESTAMP
12	@@ -402,9 +404,10 @@
13	WSAGetLastError() == WSAENOBUFS \|\|
14	WSAGetLastError() == WSAEWOULDBLOCK) {
15	#endif
16	+ int retries = 0;
17	/* if we set the fd blocking, other threads suddenly
18	* have a blocking fd that they operate on */
19	- while(sent == -1 && (
20	+ while(sent == -1 && retries < SEND_BLOCKED_MAX_RETRY && (
21	#ifndef USE_WINSOCK
22	errno == EAGAIN \|\| errno == EINTR \|\|
23	# ifdef EWOULDBLOCK
24	@@ -419,6 +422,13 @@
25	#endif
26	)) {
27	#if defined(HAVE_POLL) \|\| defined(USE_WINSOCK)
28	+ int send_nobufs = (
29	+#ifndef USE_WINSOCK
30	+ errno == ENOBUFS
31	+#else
32	+ WSAGetLastError() == WSAENOBUFS
33	+#endif
34	+ );
35	struct pollfd p;
36	int pret;
37	memset(&p, 0, sizeof(p));
38	@@ -457,8 +467,48 @@
39	log_err("poll udp out failed: %s",
40	sock_strerror(errno));
41	return 0;
42	+ } else if((pret < 0 &&
43	+#ifndef USE_WINSOCK
44	+ errno == ENOBUFS
45	+#else
46	+ WSAGetLastError() == WSAENOBUFS
47	+#endif
48	+ ) \|\| (send_nobufs && retries > 0)) {
49	+ /* ENOBUFS, and poll returned without
50	+ * a timeout. Or the retried send call
51	+ * returned ENOBUFS. It is good to
52	+ * wait a bit for the error to clear. */
53	+ /* The timeout is 20*(2^(retries+1)),
54	+ * it increases exponentially, starting
55	+ * at 40 msec. After 5 tries, 1240 msec
56	+ * have passed in total, when poll
57	+ * returned the error, and 1200 msec
58	+ * when send returned the errors. */
59	+#ifndef USE_WINSOCK
60	+ pret = poll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1));
61	+#else
62	+ pret = WSAPoll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1));
63	+#endif
64	+ if(pret < 0 &&
65	+#ifndef USE_WINSOCK
66	+ errno != EAGAIN && errno != EINTR &&
67	+# ifdef EWOULDBLOCK
68	+ errno != EWOULDBLOCK &&
69	+# endif
70	+ errno != ENOBUFS
71	+#else
72	+ WSAGetLastError() != WSAEINPROGRESS &&
73	+ WSAGetLastError() != WSAEINTR &&
74	+ WSAGetLastError() != WSAENOBUFS &&
75	+ WSAGetLastError() != WSAEWOULDBLOCK
76	+#endif
77	+ ) {
78	+ log_err("poll udp out timer failed: %s",
79	+ sock_strerror(errno));
80	+ }
81	}
82	#endif /* defined(HAVE_POLL) \|\| defined(USE_WINSOCK) */
83	+ retries++;
84	if (!is_connected) {
85	sent = sendto(c->fd, (void*)sldns_buffer_begin(packet),
86	sldns_buffer_remaining(packet), 0,
87	@@ -665,7 +715,8 @@
88	WSAGetLastError() == WSAENOBUFS \|\|
89	WSAGetLastError() == WSAEWOULDBLOCK) {
90	#endif
91	- while(sent == -1 && (
92	+ int retries = 0;
93	+ while(sent == -1 && retries < SEND_BLOCKED_MAX_RETRY && (
94	#ifndef USE_WINSOCK
95	errno == EAGAIN \|\| errno == EINTR \|\|
96	# ifdef EWOULDBLOCK
97	@@ -680,6 +731,13 @@
98	#endif
99	)) {
100	#if defined(HAVE_POLL) \|\| defined(USE_WINSOCK)
101	+ int send_nobufs = (
102	+#ifndef USE_WINSOCK
103	+ errno == ENOBUFS
104	+#else
105	+ WSAGetLastError() == WSAENOBUFS
106	+#endif
107	+ );
108	struct pollfd p;
109	int pret;
110	memset(&p, 0, sizeof(p));
111	@@ -718,8 +776,48 @@
112	log_err("poll udp out failed: %s",
113	sock_strerror(errno));
114	return 0;
115	+ } else if((pret < 0 &&
116	+#ifndef USE_WINSOCK
117	+ errno == ENOBUFS
118	+#else
119	+ WSAGetLastError() == WSAENOBUFS
120	+#endif
121	+ ) \|\| (send_nobufs && retries > 0)) {
122	+ /* ENOBUFS, and poll returned without
123	+ * a timeout. Or the retried send call
124	+ * returned ENOBUFS. It is good to
125	+ * wait a bit for the error to clear. */
126	+ /* The timeout is 20*(2^(retries+1)),
127	+ * it increases exponentially, starting
128	+ * at 40 msec. After 5 tries, 1240 msec
129	+ * have passed in total, when poll
130	+ * returned the error, and 1200 msec
131	+ * when send returned the errors. */
132	+#ifndef USE_WINSOCK
133	+ pret = poll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1));
134	+#else
135	+ pret = WSAPoll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1));
136	+#endif
137	+ if(pret < 0 &&
138	+#ifndef USE_WINSOCK
139	+ errno != EAGAIN && errno != EINTR &&
140	+# ifdef EWOULDBLOCK
141	+ errno != EWOULDBLOCK &&
142	+# endif
143	+ errno != ENOBUFS
144	+#else
145	+ WSAGetLastError() != WSAEINPROGRESS &&
146	+ WSAGetLastError() != WSAEINTR &&
147	+ WSAGetLastError() != WSAENOBUFS &&
148	+ WSAGetLastError() != WSAEWOULDBLOCK
149	+#endif
150	+ ) {
151	+ log_err("poll udp out timer failed: %s",
152	+ sock_strerror(errno));
153	+ }
154	}
155	#endif /* defined(HAVE_POLL) \|\| defined(USE_WINSOCK) */
156	+ retries++;
157	sent = sendmsg(c->fd, &msg, 0);
158	}
159	}