bin/182310: [patch] unbound-checkconf: fatal error: config file /etc/unbound/unbound.conf is not inside chroot /var/unbound

[Jan Beich]

>Number:         182310
>Category:       bin
>Synopsis:       [patch] unbound-checkconf: fatal error: config file /etc/unbound/unbound.conf is not inside chroot /var/unbound
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 23 06:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Jan Beich
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
rc.d script from dns/unbound

>Description:
unbound in base is configured to use chroot dir but its config file
lives outside, under /etc.

>How-To-Repeat:

>Fix:
--- chroot_conf.diff begins here ---
Index: contrib/unbound/config.h
===================================================================
--- contrib/unbound/config.h	(revision 255808)
+++ contrib/unbound/config.h	(working copy)
@@ -5,10 +5,10 @@
 #define CHROOT_DIR "/var/unbound"
 
 /* Pathname to the Unbound configuration file */
-#define CONFIGFILE "/etc/unbound/unbound.conf"
+#define CONFIGFILE "/var/unbound/unbound.conf"
 
 /* configure flags */
-#define CONFIGURE_BUILD_WITH " '--prefix=' '--exec-prefix=/usr' '--with-conf-file=/etc/unbound/unbound.conf' '--with-run-dir=/var/unbound' '--with-username=unbound'"
+#define CONFIGURE_BUILD_WITH " '--prefix=' '--exec-prefix=/usr' '--with-conf-file=/var/unbound/unbound.conf' '--with-run-dir=/var/unbound' '--with-username=unbound'"
 
 /* configure date */
 #define CONFIGURE_DATE "Sun Sep 15 15:38:41 CEST 2013"
Index: contrib/unbound/freebsd-configure.sh
===================================================================
--- contrib/unbound/freebsd-configure.sh	(revision 255808)
+++ contrib/unbound/freebsd-configure.sh	(working copy)
@@ -26,7 +26,7 @@ export LDFLAGS="-L$ldnsobj"
 
 ./configure \
 	--prefix= --exec-prefix=/usr \
-	--with-conf-file=/etc/unbound/unbound.conf \
+	--with-conf-file=/var/unbound/unbound.conf \
 	--with-run-dir=/var/unbound \
 	--with-username=unbound
 
Index: etc/Makefile
===================================================================
--- etc/Makefile	(revision 255808)
+++ etc/Makefile	(working copy)
@@ -247,6 +247,11 @@ distribution:
 		ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \
 	fi
 .endif
+.if ${MK_UNBOUND} != "no"
+	if [ ! -e ${DESTDIR}/etc/unbound ]; then \
+		ln -s ../var/unbound ${DESTDIR}/etc/unbound; \
+	fi
+.endif
 .if ${MK_BIND_ETC} != "no"
 	${_+_}cd ${.CURDIR}/namedb; ${MAKE} install
 .endif
Index: etc/mtree/BSD.root.dist
===================================================================
--- etc/mtree/BSD.root.dist	(revision 255808)
+++ etc/mtree/BSD.root.dist	(working copy)
@@ -66,8 +66,6 @@
         ..
         ssl
         ..
-        unbound
-        ..
         zfs
         ..
     ..
--- chroot_conf.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: