From owner-svn-src-stable-11@freebsd.org Mon Jan 20 13:46:11 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B4B5E1FA833; Mon, 20 Jan 2020 13:46:11 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 481Xxv4LpJz4X37; Mon, 20 Jan 2020 13:46:11 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8C1002479D; Mon, 20 Jan 2020 13:46:11 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00KDkBkH056527; Mon, 20 Jan 2020 13:46:11 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00KDkA06056518; Mon, 20 Jan 2020 13:46:10 GMT (envelope-from cy@FreeBSD.org) Message-Id: <202001201346.00KDkA06056518@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Mon, 20 Jan 2020 13:46:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: 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... X-SVN-Group: stable-11 X-SVN-Commit-Author: cy X-SVN-Commit-Paths: 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/daemon 12/contrib/unbound 1... X-SVN-Commit-Revision: 356914 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jan 2020 13:46:11 -0000 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