svn commit: r356914 - in stable: 11/contrib/unbound 11/lib/libunbound 11/usr.sbin/unbound 11/usr.sbin/unbound/anchor 11/usr.sbin/unbound/checkconf 11/usr.sbin/unbound/control 11/usr.sbin/unbound/da...

[Cy Schubert]

Author: cy
Date: Mon Jan 20 13:46:09 2020
New Revision: 356914
URL: https://svnweb.freebsd.org/changeset/base/356914

Log:
  MFC r356676:
  
  Unbound's config.h is manually maintained, using a ./configure produced
  config.h as a guide. In practice contributed software maintains a copy
  of config.h within its build directory tree containing its Makefile.
  usr.sbin/unbound is the home for its config.h.
  
  Differential Revision:	https://reviews.freebsd.org/D22983

Added:
  stable/11/usr.sbin/unbound/config.h   (contents, props changed)
     - copied, changed from r356913, stable/11/contrib/unbound/config.h
Deleted:
  stable/11/contrib/unbound/config.h
Modified:
  stable/11/lib/libunbound/Makefile
  stable/11/usr.sbin/unbound/anchor/Makefile
  stable/11/usr.sbin/unbound/checkconf/Makefile
  stable/11/usr.sbin/unbound/control/Makefile
  stable/11/usr.sbin/unbound/daemon/Makefile
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Added:
  stable/12/usr.sbin/unbound/config.h
     - copied unchanged from r356676, head/usr.sbin/unbound/config.h
Deleted:
  stable/12/contrib/unbound/config.h
Modified:
  stable/12/lib/libunbound/Makefile
  stable/12/usr.sbin/unbound/anchor/Makefile
  stable/12/usr.sbin/unbound/checkconf/Makefile
  stable/12/usr.sbin/unbound/control/Makefile
  stable/12/usr.sbin/unbound/daemon/Makefile
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/lib/libunbound/Makefile
==============================================================================
--- stable/11/lib/libunbound/Makefile	Mon Jan 20 12:53:02 2020	(r356913)
+++ stable/11/lib/libunbound/Makefile	Mon Jan 20 13:46:09 2020	(r356914)
@@ -13,6 +13,7 @@ PRIVATELIB=
 PACKAGE=	unbound
 
 CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR}
+CFLAGS+= -I${SRCTOP}/usr.sbin/unbound
 
 SRCS=	alloc.c as112.c authzone.c autotrust.c cachedb.c config_file.c \
 	configlexer.l configparser.y context.c dname.c dns.c dns64.c \

Modified: stable/11/usr.sbin/unbound/anchor/Makefile
==============================================================================
--- stable/11/usr.sbin/unbound/anchor/Makefile	Mon Jan 20 12:53:02 2020	(r356913)
+++ stable/11/usr.sbin/unbound/anchor/Makefile	Mon Jan 20 13:46:09 2020	(r356914)
@@ -10,6 +10,7 @@ EXPATDIR= ${SRCTOP}/contrib/expat
 PROG=	local-unbound-anchor
 SRCS=	unbound-anchor.c
 CFLAGS+=	-I${UNBOUNDDIR} -I${LDNSDIR} -I${EXPATDIR}/lib
+CFLAGS+=	-I${.CURDIR:H} -I${.CURDIR}
 LIBADD=	unbound bsdxml ssl crypto pthread
 MAN=	local-unbound-anchor.8
 

Modified: stable/11/usr.sbin/unbound/checkconf/Makefile
==============================================================================
--- stable/11/usr.sbin/unbound/checkconf/Makefile	Mon Jan 20 12:53:02 2020	(r356913)
+++ stable/11/usr.sbin/unbound/checkconf/Makefile	Mon Jan 20 13:46:09 2020	(r356914)
@@ -9,6 +9,7 @@ UNBOUNDDIR= ${SRCTOP}/contrib/unbound
 PROG=	local-unbound-checkconf
 SRCS=	ub_event.c unbound-checkconf.c worker_cb.c
 CFLAGS+=	-I${UNBOUNDDIR} -I${LDNSDIR}
+CFLAGS+=	-I${.CURDIR:H} -I${.CURDIR}
 LIBADD=	unbound pthread
 MAN=	local-unbound-checkconf.8
 

Copied and modified: stable/11/usr.sbin/unbound/config.h (from r356913, stable/11/contrib/unbound/config.h)
==============================================================================
--- stable/11/contrib/unbound/config.h	Mon Jan 20 12:53:02 2020	(r356913, copy source)
+++ stable/11/usr.sbin/unbound/config.h	Mon Jan 20 13:46:09 2020	(r356914)
@@ -1,5 +1,6 @@
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
+/* $FreeBSD$ */
 
 /* apply the noreturn attribute to a function that exits the program */
 #define ATTR_NORETURN __attribute__((__noreturn__))

Modified: stable/11/usr.sbin/unbound/control/Makefile
==============================================================================
--- stable/11/usr.sbin/unbound/control/Makefile	Mon Jan 20 12:53:02 2020	(r356913)
+++ stable/11/usr.sbin/unbound/control/Makefile	Mon Jan 20 13:46:09 2020	(r356914)
@@ -9,6 +9,7 @@ UNBOUNDDIR= ${SRCTOP}/contrib/unbound
 PROG=	local-unbound-control
 SRCS=	ub_event.c unbound-control.c worker_cb.c
 CFLAGS+=	-I${UNBOUNDDIR} -I${LDNSDIR}
+CFLAGS+=	-I${.CURDIR:H} -I${.CURDIR}
 LIBADD=	unbound crypto ssl pthread
 MAN=	local-unbound-control.8
 

Modified: stable/11/usr.sbin/unbound/daemon/Makefile
==============================================================================
--- stable/11/usr.sbin/unbound/daemon/Makefile	Mon Jan 20 12:53:02 2020	(r356913)
+++ stable/11/usr.sbin/unbound/daemon/Makefile	Mon Jan 20 13:46:09 2020	(r356914)
@@ -10,6 +10,7 @@ PROG=	local-unbound
 SRCS=	acl_list.c cachedump.c daemon.c remote.c shm_main.c stats.c \
 	ub_event.c unbound.c worker.c
 CFLAGS+=	-I${UNBOUNDDIR} -I${LDNSDIR}
+CFLAGS+=	-I${.CURDIR:H} -I${.CURDIR}
 LIBADD=	unbound util ssl crypto pthread
 MAN=	local-unbound.8 local-unbound.conf.5