Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openresolv for openSUSE:Factory checked in at 2023-12-06 23:48:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openresolv (Old) and /work/SRC/openSUSE:Factory/.openresolv.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openresolv" Wed Dec 6 23:48:50 2023 rev:5 rq:1131313 version:3.13.2 Changes: -------- --- /work/SRC/openSUSE:Factory/openresolv/openresolv.changes 2021-01-05 18:16:06.711500452 +0100 +++ /work/SRC/openSUSE:Factory/.openresolv.new.25432/openresolv.changes 2023-12-06 23:49:26.909933458 +0100 @@ -1,0 +2,17 @@ +Tue Dec 5 15:28:39 UTC 2023 - Andrea Manzini <andrea.manz...@suse.com> + +- update to 3.13.2: + * Do not return error from -i when no interfaces are configured + * Update README.md to fix broken link to openresolv configuration + +- update to 3.13.1: + * new build system + +- update to 3.13.0: + * /etc/resolv.conf is now updated by mv(1) so it's atomic and watchers don't read partials. + * unbound can now add generic options to forward zones + * dinit and s6 init systems are now supported + +- ran spec-cleaner + +------------------------------------------------------------------- Old: ---- openresolv-3.12.0.tar.xz New: ---- openresolv-3.13.2.tar.xz openresolv-3.13.2.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openresolv.spec ++++++ --- /var/tmp/diff_new_pack.IZDeGc/_old 2023-12-06 23:49:27.409951883 +0100 +++ /var/tmp/diff_new_pack.IZDeGc/_new 2023-12-06 23:49:27.413952031 +0100 @@ -1,7 +1,7 @@ # # spec file for package openresolv # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,13 @@ Name: openresolv -Version: 3.12.0 +Version: 3.13.2 Release: 0 Summary: DNS management framework License: BSD-2-Clause URL: https://roy.marples.name/projects/openresolv -Source: https://roy.marples.name/downloads/openresolv/%{name}-%{version}.tar.xz +Source0: https://github.com/NetworkConfiguration/openresolv/releases/download/v3.13.2/openresolv-%{version}.tar.xz +Source1: https://github.com/NetworkConfiguration/openresolv/releases/download/v3.13.2/openresolv-%{version}.tar.xz.asc Requires: bash BuildArch: noarch @@ -36,12 +37,12 @@ (like unbound, dnsmasq or bind) that will route the dns requests according to the search domain. %prep -%setup -q +%autosetup sed -i -e 's/^#!\/bin\/sh$//' named.in pdnsd.in dnsmasq.in unbound.in libc.in pdns_recursor.in %build ./configure --bindir=%{_sbindir} --libexecdir=%{_libexecdir}/resolvconf -make %{?_smp_mflags} +%make_build %install %make_install ++++++ openresolv-3.12.0.tar.xz -> openresolv-3.13.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.12.0/Makefile new/openresolv-3.13.2/Makefile --- old/openresolv-3.12.0/Makefile 2020-12-27 19:05:10.000000000 +0100 +++ new/openresolv-3.13.2/Makefile 2023-06-27 16:39:40.000000000 +0200 @@ -5,6 +5,9 @@ CONFIG_MK?= ${_CONFIG_MK} include ${CONFIG_MK} +DIST!= if test -d .git; then echo "dist-git"; \ + else echo "dist-inst"; fi + SBINDIR?= /sbin SYSCONFDIR?= /etc LIBEXECDIR?= /libexec/resolvconf @@ -37,12 +40,12 @@ SED_STATUSARG= -e 's:@STATUSARG@:${STATUSARG}:g' DISTPREFIX?= ${PKG}-${VERSION} -DISTFILEGZ?= ${DISTPREFIX}.tar.gz DISTFILE?= ${DISTPREFIX}.tar.xz DISTINFO= ${DISTFILE}.distinfo -DISTINFOSIGN= ${DISTINFO}.asc -CKSUM?= cksum -a SHA256 -PGP?= netpgp +DISTINFOMD= ${DISTINFO}.md +DISTSIGN= ${DISTFILE}.asc +SHA256?= sha256 +PGP?= gpg GITREF?= HEAD @@ -60,7 +63,7 @@ rm -f ${TARGET} distclean: clean - rm -f config.mk ${DISTFILE} ${DISTINFO} ${DISTINFOSIGN} + rm -f config.mk ${DISTFILE} ${DISTINFO} ${DISTINFOMD} ${DISTSIGN} installdirs: @@ -91,18 +94,30 @@ mkdir /tmp/${DISTPREFIX} cp -RPp * /tmp/${DISTPREFIX} (cd /tmp/${DISTPREFIX}; make clean) - tar -cvjpf ${DISTFILE} -C /tmp ${DISTPREFIX} + tar -cvJpf ${DISTFILE} -C /tmp ${DISTPREFIX} rm -rf /tmp/${DISTPREFIX} -dist: dist-git +dist: ${DIST} distinfo: dist - rm -f ${DISTINFO} ${DISTINFOSIGN} - ${CKSUM} ${DISTFILE} >${DISTINFO} - #printf "SIZE (${DISTFILE}) = %s\n" $$(wc -c <${DISTFILE}) >>${DISTINFO} - ${PGP} --clearsign --output=${DISTINFOSIGN} ${DISTINFO} - chmod 644 ${DISTINFOSIGN} - ls -l ${DISTFILE} ${DISTINFO} ${DISTINFOSIGN} + rm -f ${DISTINFO} ${DISTSIGN} + ${SHA256} ${DISTFILE} >${DISTINFO} + wc -c <${DISTFILE} \ + | xargs printf 'Size (${DISTFILE}) = %s\n' >>${DISTINFO} + ${PGP} --armour --detach-sign ${DISTFILE} + chmod 644 ${DISTSIGN} + ls -l ${DISTFILE} ${DISTINFO} ${DISTSIGN} + +${DISTINFOMD}: ${DISTINFO} + echo '```' >${DISTINFOMD} + cat ${DISTINFO} >>${DISTINFOMD} + echo '```' >>${DISTINFOMD} + +release: distinfo ${DISTINFOMD} + gh release create v${VERSION} \ + --title "openresolv ${VERSION}" --draft --generate-notes \ + --notes-file ${DISTINFOMD} \ + ${DISTFILE} ${DISTSIGN} import: dist rm -rf /tmp/${DISTPREFIX} @@ -119,4 +134,4 @@ @${ECHO} "openresolv-${VERSION} imported to ${DESTDIR}" import-src: - ${MAKE} _import-src DESTDIR=`if [ -n "${DESTDIR}" ]; then echo "${DESTDIR}"; else echo /tmp/${DISTPREFIX}; fi` + ${MAKE} _import-src DESTDIR=`if [ -n "${DESTDIR}" ]; then echo "${DESTDIR}"; else echo /tmp/${DISTPREFIX}; fi` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.12.0/README.md new/openresolv-3.13.2/README.md --- old/openresolv-3.12.0/README.md 2020-12-27 19:05:10.000000000 +0100 +++ new/openresolv-3.13.2/README.md 2023-06-27 16:39:40.000000000 +0200 @@ -37,7 +37,7 @@ The last point is quite important, especially when running VPN systems. Take the following resolv.conf files which have been generated by a -[DHCP client](../dhcpcd) and sent to resolvconf: +[DHCP client](https://github.com/NetworkConfiguration/dhcpcd) and sent to resolvconf: ``` # resolv.conf from bge0 @@ -60,7 +60,7 @@ * [PowerDNS Recursor](http://wiki.powerdns.com/trac) See the -[configuration section](https://roy.marples.name/projects/openresolv/config) +[configuration section](https://roy.marples.name/projects/openresolv/configuration) for more details. If openresolv updates `/etc/resolv.conf` it can notify the following of this: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.12.0/avahi-daemon.in new/openresolv-3.13.2/avahi-daemon.in --- old/openresolv-3.12.0/avahi-daemon.in 2020-12-27 19:05:10.000000000 +0100 +++ new/openresolv-3.13.2/avahi-daemon.in 2023-06-27 16:39:40.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2007-2020 Roy Marples +# Copyright (c) 2007-2023 Roy Marples # All rights reserved # avahi-daemon notifier for resolvconf libc subscriber diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.12.0/configure new/openresolv-3.13.2/configure --- old/openresolv-3.12.0/configure 2020-12-27 19:05:10.000000000 +0100 +++ new/openresolv-3.13.2/configure 2023-06-27 16:39:40.000000000 +0200 @@ -92,7 +92,7 @@ : ${LIBEXECDIR:=${PREFIX:-/usr}/libexec/resolvconf} ;; linux*) - # cksum does't support -a and netpgp is rare + # cksum doesn't support -a and netpgp is rare echo "CKSUM= sha256sum --tag" >>$CONFIG_MK echo "PGP= gpg2" >>$CONFIG_MK ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.12.0/dnsmasq.in new/openresolv-3.13.2/dnsmasq.in --- old/openresolv-3.12.0/dnsmasq.in 2020-12-27 19:05:10.000000000 +0100 +++ new/openresolv-3.13.2/dnsmasq.in 2023-06-27 16:39:40.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2007-2020 Roy Marples +# Copyright (c) 2007-2023 Roy Marples # All rights reserved # dnsmasq subscriber for resolvconf @@ -105,7 +105,7 @@ empty=true continue fi - i=$(($i + 1)) + i=$((i + 1)) while [ ${#addr} -lt 4 ]; do addr="0${addr}" done @@ -118,7 +118,7 @@ fi done while [ $i != 8 ]; do - i=$(($i + 1)) + i=$((i + 1)) front="$front byte:0 byte:0" done front="${front}$back" @@ -151,7 +151,7 @@ fi # Try to ensure that config dirs exist -if type config_mkdirs >/dev/null 2>&1; then +if command -v config_mkdirs >/dev/null 2>&1; then config_mkdirs "$dnsmasq_conf" "$dnsmasq_resolv" else @SBINDIR@/resolvconf -D "$dnsmasq_conf" "$dnsmasq_resolv" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.12.0/libc.in new/openresolv-3.13.2/libc.in --- old/openresolv-3.12.0/libc.in 2020-12-27 19:05:10.000000000 +0100 +++ new/openresolv-3.13.2/libc.in 2023-06-27 16:39:40.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2007-2020 Roy Marples +# Copyright (c) 2007-2023 Roy Marples # All rights reserved # libc subscriber for resolvconf @@ -94,6 +94,7 @@ fi fi : ${resolv_conf:=/etc/resolv.conf} +: ${resolv_conf_tmp:="$resolv_conf.$$.openresolv"} : ${libc_service:=nscd} : ${list_resolv:=@SBINDIR@/resolvconf -l} if [ "${resolv_conf_head-x}" = x ] && [ -f "$SYSCONFDIR"/resolv.conf.head ] @@ -107,7 +108,7 @@ backup=true signature="# Generated by resolvconf" - + uniqify() { result= @@ -226,8 +227,26 @@ fi fi -# Create our resolv.conf now -(umask 022; printf %s "$newconf" >"$resolv_conf") +# There are pros and cons for writing directly to resolv.conf +# instead of a temporary file and then moving it over. +# The default is to write to resolv.conf as it has the least +# issues and has been the long standing default behaviour. +case "${resolv_conf_mv:-NO}" in +[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) + # Protect against symlink attack, ensure new file does not exist + rm -f "$resolv_conf_tmp" + # Keep original file owner, group and mode + [ -r "$resolv_conf" ] && cp -p "$resolv_conf" "$resolv_conf_tmp" + # Create our resolv.conf now + if (umask 022; printf %s "$newconf" >"$resolv_conf_tmp"); then + mv "$resolv_conf_tmp" "$resolv_conf" + fi + ;; +*) + (umask 022; printf %s "$newconf" >"$resolv_conf") + ;; +esac + if [ -n "$libc_restart" ]; then eval $libc_restart elif [ -n "$RESTARTCMD" ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.12.0/mdnsd.in new/openresolv-3.13.2/mdnsd.in --- old/openresolv-3.12.0/mdnsd.in 2020-12-27 19:05:10.000000000 +0100 +++ new/openresolv-3.13.2/mdnsd.in 2023-06-27 16:39:40.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2007-2020 Roy Marples +# Copyright (c) 2007-2023 Roy Marples # All rights reserved # mdnsd notifier for resolvconf libc subscriber diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.12.0/named.in new/openresolv-3.13.2/named.in --- old/openresolv-3.12.0/named.in 2020-12-27 19:05:10.000000000 +0100 +++ new/openresolv-3.13.2/named.in 2023-06-27 16:39:40.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2007-2020 Roy Marples +# Copyright (c) 2007-2023 Roy Marples # All rights reserved # named subscriber for resolvconf @@ -79,7 +79,7 @@ done # Try to ensure that config dirs exist -if type config_mkdirs >/dev/null 2>&1; then +if command -v config_mkdirs >/dev/null 2>&1; then config_mkdirs "$named_options" "$named_zones" else @SBINDIR@/resolvconf -D "$named_options" "$named_zones" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.12.0/pdns_recursor.in new/openresolv-3.13.2/pdns_recursor.in --- old/openresolv-3.12.0/pdns_recursor.in 2020-12-27 19:05:10.000000000 +0100 +++ new/openresolv-3.13.2/pdns_recursor.in 2023-06-27 16:39:40.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2009-2020 Roy Marples +# Copyright (c) 2009-2023 Roy Marples # All rights reserved # PowerDNS Recursor subscriber for resolvconf @@ -54,7 +54,7 @@ done # Try to ensure that config dirs exist -if type config_mkdirs >/dev/null 2>&1; then +if command -v config_mkdirs >/dev/null 2>&1; then config_mkdirs "$pdnsd_zones" else @SBINDIR@/resolvconf -D "$pdnsd_zones" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.12.0/pdnsd.in new/openresolv-3.13.2/pdnsd.in --- old/openresolv-3.12.0/pdnsd.in 2020-12-27 19:05:10.000000000 +0100 +++ new/openresolv-3.13.2/pdnsd.in 2023-06-27 16:39:40.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2010-2020 Roy Marples +# Copyright (c) 2010-2023 Roy Marples # All rights reserved # pdnsd subscriber for resolvconf @@ -46,7 +46,7 @@ in_marker=0 shift; shift - if type sed >/dev/null 2>&1; then + if command -v sed >/dev/null 2>&1; then sed "/^$m1/,/^$m2/d" $@ else for x do @@ -66,9 +66,9 @@ change_file() { if [ -e "$1" ]; then - if type cmp >/dev/null 2>&1; then + if command -v cmp >/dev/null 2>&1; then cmp -s "$1" "$2" - elif type diff >/dev/null 2>&1; then + elif command -v diff >/dev/null 2>&1; then diff -q "$1" "$2" >/dev/null else # Hopefully we're only working on small text files ... @@ -88,7 +88,7 @@ changed=false # Try to ensure that config dirs exist -if type config_mkdirs >/dev/null 2>&1; then +if command -v config_mkdirs >/dev/null 2>&1; then config_mkdirs "$pdnsd_resolv" "$pdnsd_conf" else @SBINDIR@/resolvconf -D "$pdnsd_resolv" "$pdnsd_conf" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.12.0/resolvconf.8.in new/openresolv-3.13.2/resolvconf.8.in --- old/openresolv-3.12.0/resolvconf.8.in 2020-12-27 19:05:10.000000000 +0100 +++ new/openresolv-3.13.2/resolvconf.8.in 2023-06-27 16:39:40.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2007-2020 Roy Marples +.\" Copyright (c) 2007-2023 Roy Marples .\" All rights reserved .\" .\" Redistribution and use in source and binary forms, with or without @@ -189,7 +189,7 @@ .El .Pp .Nm -also has some commands designed to be used by it's subscribers and +also has some commands designed to be used by its subscribers and system startup:- .Bl -tag -width pattern_opt .It Fl I @@ -229,7 +229,7 @@ .Nm first processes interfaces from the .Sy interface_order -list, then interfaces without a metic and that match the +list, then interfaces without a metric and that match the .Sy dynamic_order list, then interfaces with a metric in order and finally the rest in the operating systems lexical order. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.12.0/resolvconf.conf.5.in new/openresolv-3.13.2/resolvconf.conf.5.in --- old/openresolv-3.12.0/resolvconf.conf.5.in 2020-12-27 19:05:10.000000000 +0100 +++ new/openresolv-3.13.2/resolvconf.conf.5.in 2023-06-27 16:39:40.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2009-2020 Roy Marples +.\" Copyright (c) 2009-2023 Roy Marples .\" All rights reserved .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 1, 2020 +.Dd May 23, 2023 .Dt RESOLVCONF.CONF 5 .Os .Sh NAME @@ -134,7 +134,7 @@ nameserver 1.2.3.4 nameserver 2.3.4.5 .Ed -and this configuaration: +and this configuration: .Bd -compact -literal -offset indent replace="search/foo*/bar.com" replace="$replace nameserver/1.2.3.4/5.6.7.8" @@ -210,6 +210,12 @@ Append search domains to the dynamically generated list. .It Sy prepend_search Prepend search domains to the dynamically generated list. +.It Sy resolv_conf_mv +Defaults to NO. +Defines if +.Pa /etc/resolv.conf +is updated by writing to a temporary file and then moving it +vs writing directly to it. .El .Sh SUBSCRIBER OPTIONS openresolv ships with subscribers for the name servers @@ -222,7 +228,7 @@ Each subscriber can create configuration files which should be included in the subscribers main configuration file. .Pp -To disable a subscriber, simply set it's name to NO. +To disable a subscriber, simply set its name to NO. For example, to disable the libc subscriber you would set: .Bd -compact -literal -offset indent libc=NO @@ -322,6 +328,9 @@ This file tells unbound about specific and global name servers. .It Sy unbound_insecure When set to YES, unbound marks the domains as insecure, thus ignoring DNSSEC. +.It Sy unbound_forward_zone_options +Options appended to each forward zone. +Each option should be separated by an embedded new line. .Pp Example resolvconf.conf for unbound: .Bd -compact -literal -offset indent @@ -385,4 +394,4 @@ differently, namely the named service script. .Pp Please report them to -.Lk http://roy.marples.name/projects/openresolv +.Lk https://roy.marples.name/projects/openresolv diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.12.0/resolvconf.in new/openresolv-3.13.2/resolvconf.in --- old/openresolv-3.12.0/resolvconf.in 2020-12-27 19:05:10.000000000 +0100 +++ new/openresolv-3.13.2/resolvconf.in 2023-06-27 16:39:40.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2007-2020 Roy Marples +# Copyright (c) 2007-2023 Roy Marples # All rights reserved # Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. RESOLVCONF="$0" -OPENRESOLV_VERSION="3.12.0" +OPENRESOLV_VERSION="3.13.2" SYSCONFDIR=@SYSCONFDIR@ LIBEXECDIR=@LIBEXECDIR@ VARDIR=@VARDIR@ @@ -158,7 +158,7 @@ if [ -e "$PRIVATEDIR/$iface" ]; then return 0 fi - + for p in $private_interfaces; do case "$iface" in "$p"|"$p":*) return 0;; @@ -290,9 +290,9 @@ # With the advent of alternative init systems, it's possible to have # more than one installed. So we need to try and guess what one we're -# using unless overriden by configure. +# using unless overridden by configure. # Note that restarting a service is a last resort - the subscribers -# should make a reasonable attempt to reconfigre the service via some +# should make a reasonable attempt to reconfigure the service via some # method, normally SIGHUP. detect_init() { @@ -327,6 +327,12 @@ then /usr/sbin/invoke-rc.d $1 restart fi' + elif [ -x /usr/bin/s6-rc ] && [ -x /usr/bin/s6-svc ]; then + RESTARTCMD=' + if s6-rc -a list | grep -qFx $1-srv + then + s6-svc -r /run/service/$1-srv + fi' elif [ -x /sbin/service ]; then # Old RedHat RCDIR=/etc/init.d @@ -367,6 +373,8 @@ then /etc/rc.d/$1 restart fi' + elif [ -d /etc/dinit.d ] && command -v dinitctl >/dev/null 2>&1; then + RESTARTCMD='dinitctl --quiet restart --ignore-unstarted $1' else for x in /etc/init.d/rc.d /etc/rc.d /etc/init.d; do [ -d $x ] || continue @@ -432,6 +440,8 @@ cmd="$1" shift + pattern_specified="$1" + excl=false list= report=false @@ -462,7 +472,7 @@ # If we have an interface ordering list, then use that. # It works by just using pathname expansion in the interface directory. - if [ -n "$1" ]; then + if [ -n "$pattern_specified" ]; then list="$*" $force || report=true elif ! $excl; then @@ -515,7 +525,11 @@ fi cd "$IFACEDIR" - retval=1 + if $excl || [ -n "$pattern_specified" ]; then + retval=1 + else + retval=0 + fi for i in $(uniqify $list); do # Only list interfaces which we really have if ! [ -f "$i" ]; then @@ -542,7 +556,7 @@ fi done fi - + if [ "$cmd" = i ] || [ "$cmd" = "-i" ]; then printf %s "$i " else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.12.0/unbound.in new/openresolv-3.13.2/unbound.in --- old/openresolv-3.12.0/unbound.in 2020-12-27 19:05:10.000000000 +0100 +++ new/openresolv-3.13.2/unbound.in 2023-06-27 16:39:40.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2009-2020 Roy Marples +# Copyright (c) 2009-2023 Roy Marples # All rights reserved # unbound subscriber for resolvconf @@ -49,6 +49,9 @@ ;; esac newconf="$newconf${NL}forward-zone:$NL name: \"$dn\"$NL" + if [ -n "$unbound_forward_zone_options" ]; then + newconf="$newconf $unbound_forward_zone_options${NL}" + fi while [ -n "$ns" ]; do newconf="$newconf forward-addr: ${ns%%,*}$NL" [ "$ns" = "${ns#*,}" ] && break @@ -58,13 +61,16 @@ if [ -n "$NAMESERVERS" ]; then newconf="$newconf${NL}forward-zone:$NL name: \".\"$NL" + if [ -n "$unbound_forward_zone_options" ]; then + newconf="$newconf $unbound_forward_zone_options${NL}" + fi for n in $NAMESERVERS; do newconf="$newconf forward-addr: $n$NL" done fi # Try to ensure that config dirs exist -if type config_mkdirs >/dev/null 2>&1; then +if command -v config_mkdirs >/dev/null 2>&1; then config_mkdirs "$unbound_conf" else @SBINDIR@/resolvconf -D "$unbound_conf"
