Attachment 215610 Details for Bug 247305 – proposed patch

[patch] proposed patch

unbound-BEFORE-SERVERS.diff (text/plain), 1.82 KB, created by Andriy Gapon on 2020-06-16 11:26:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Gapon

Created: 2020-06-16 11:26:36 UTC

Size: 1.82 KB

patch

obsolete

>diff --git a/dns/unbound/Makefile b/dns/unbound/Makefile
>index 8b82957bc3791..e45ca40f861b0 100644
>--- a/dns/unbound/Makefile
>+++ b/dns/unbound/Makefile
>@@ -35,7 +35,7 @@ PORTDOCS=	CREDITS Changelog FEATURES LICENSE README README.svn \
> OPTIONS_SUB=	yes
> OPTIONS_DEFINE=	THREADS PYTHON GOST ECDSA MUNIN_PLUGIN DOCS LIBEVENT \
> 		FILTER_AAAA DNSTAP DNSCRYPT SUBNET EVAPI TFOCL TFOSE \
>-		HIREDIS
>+		HIREDIS START_LATE
> OPTIONS_DEFAULT=THREADS ECDSA LIBEVENT GOST
> 
> LIBEVENT_DESC=	Build against libevent
>@@ -50,6 +50,7 @@ EVAPI_DESC=	(Experimental) pluggable event based libunbound API support
> TFOCL_DESC=	Enable TCP Fast Open for client mode
> TFOSE_DESC=	Enable TCP Fast Open for server mode
> HIREDIS_DESC=	Enable hiredis support for the cachedb module
>+START_LATE_DESC=Start unbound later in the boot process
> 
> STRIP_FILES=	.libs/libunbound.so unbound-checkconf unbound \
> 		unbound-control .libs/unbound-host .libs/unbound-anchor
>@@ -81,6 +82,10 @@ PYTHON_VARS=		STRIP_FILES+=.libs/_unbound.so
> THREADS_CONFIGURE_WITH=	pthreads
> HIREDIS_CONFIGURE_ON=	--enable-cachedb --with-libhiredis
> HIREDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
>+START_LATE_SUB_LIST=	UNBOUND_BEFORE="LOGIN" \
>+			UNBOUND_REQUIRE="SERVERS cleanvar"
>+START_LATE_SUB_LIST_OFF=UNBOUND_BEFORE="SERVERS" \
>+			UNBOUND_REQUIRE="NETWORKING ldconfig syslogd"
> 
> post-patch:
> 	@${RM} ${WRKSRC}/util/configlexer.c
>diff --git a/dns/unbound/files/unbound.in b/dns/unbound/files/unbound.in
>index 42b1d5b3bdb66..8909c315d7412 100644
>--- a/dns/unbound/files/unbound.in
>+++ b/dns/unbound/files/unbound.in
>@@ -12,7 +12,8 @@
> # root.hints (-r).  Useful for when /etc/resolv.conf only contains 127.0.0.1
> #
> # PROVIDE: unbound
>-# REQUIRE: SERVERS cleanvar
>+# REQUIRE: %%UNBOUND_REQUIRE%%
>+# BEFORE: %%UNBOUND_BEFORE%%
> # KEYWORD: shutdown
> #
> # Add the following line to /etc/rc.conf to enable unbound:

Actions: View | Diff

Attachments on bug 247305: 215610 | 215611