Hello community, here is the log from the commit of package openresolv for openSUSE:Factory checked in at 2020-08-29 20:37:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openresolv (Old) and /work/SRC/openSUSE:Factory/.openresolv.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openresolv" Sat Aug 29 20:37:49 2020 rev:3 rq:829832 version:3.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/openresolv/openresolv.changes 2019-11-30 10:35:50.256183315 +0100 +++ /work/SRC/openSUSE:Factory/.openresolv.new.3399/openresolv.changes 2020-08-29 20:38:03.965357202 +0200 @@ -1,0 +2,7 @@ +Wed Aug 26 20:02:39 UTC 2020 - Dirk Mueller <[email protected]> + +- update to 3.11.0: + * Add allow_interfaces and deny_interfaces configuration options + * Add support to notify avahi-daemon and mdnsd of resolv.conf changes + +------------------------------------------------------------------- Old: ---- openresolv-3.9.2.tar.xz New: ---- openresolv-3.11.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openresolv.spec ++++++ --- /var/tmp/diff_new_pack.VnFrSn/_old 2020-08-29 20:38:04.773357542 +0200 +++ /var/tmp/diff_new_pack.VnFrSn/_new 2020-08-29 20:38:04.777357545 +0200 @@ -1,7 +1,7 @@ # # spec file for package openresolv # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: openresolv -Version: 3.9.2 +Version: 3.11.0 Release: 0 Summary: DNS management framework License: BSD-2-Clause ++++++ openresolv-3.9.2.tar.xz -> openresolv-3.11.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.9.2/.gitignore new/openresolv-3.11.0/.gitignore --- old/openresolv-3.9.2/.gitignore 2019-09-08 22:36:27.000000000 +0200 +++ new/openresolv-3.11.0/.gitignore 2020-07-22 15:09:00.000000000 +0200 @@ -10,3 +10,6 @@ pdnsd pdns_recursor unbound + +avahi-daemon +mdnsd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.9.2/LICENSE new/openresolv-3.11.0/LICENSE --- old/openresolv-3.9.2/LICENSE 2019-09-08 22:36:27.000000000 +0200 +++ new/openresolv-3.11.0/LICENSE 2020-07-22 15:09:00.000000000 +0200 @@ -1,4 +1,4 @@ -Copyright (c) 2007-2019 Roy Marples <[email protected]> +Copyright (c) 2007-2020 Roy Marples <[email protected]> All rights reserved. Redistribution and use in source and binary forms, with or without diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.9.2/Makefile new/openresolv-3.11.0/Makefile --- old/openresolv-3.9.2/Makefile 2019-09-08 22:36:27.000000000 +0200 +++ new/openresolv-3.11.0/Makefile 2020-07-22 15:09:00.000000000 +0200 @@ -20,9 +20,10 @@ DOCMODE?= 0644 MANMODE?= 0444 -RESOLVCONF= resolvconf resolvconf.8 resolvconf.conf.5 -SUBSCRIBERS= libc dnsmasq named pdnsd pdns_recursor unbound -TARGET= ${RESOLVCONF} ${SUBSCRIBERS} +RESOLVCONF= resolvconf resolvconf.8 resolvconf.conf.5 +SUBSCRIBERS= libc dnsmasq named pdnsd pdns_recursor unbound +LIBC_SUBSCRIBERS= avahi-daemon mdnsd +TARGET= ${RESOLVCONF} ${SUBSCRIBERS} ${LIBC_SUBSCRIBERS} SRCS= ${TARGET:C,$,.in,} # pmake SRCS:= ${TARGET:=.in} # gmake @@ -71,6 +72,9 @@ ${INSTALL} -m ${DOCMODE} resolvconf.conf ${DESTDIR}${SYSCONFDIR} ${INSTALL} -d ${DESTDIR}${LIBEXECDIR} ${INSTALL} -m ${DOCMODE} ${SUBSCRIBERS} ${DESTDIR}${LIBEXECDIR} + ${INSTALL} -d ${DESTDIR}${LIBEXECDIR}/libc.d + ${INSTALL} -m ${DOCMODE} ${LIBC_SUBSCRIBERS} \ + ${DESTDIR}${LIBEXECDIR}/libc.d maninstall: ${INSTALL} -d ${DESTDIR}${MANDIR}/man8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.9.2/README.md new/openresolv-3.11.0/README.md --- old/openresolv-3.9.2/README.md 2019-09-08 22:36:27.000000000 +0200 +++ new/openresolv-3.11.0/README.md 2020-07-22 15:09:00.000000000 +0200 @@ -62,3 +62,7 @@ See the [configuration section](https://roy.marples.name/projects/openresolv/config) for more details. + +If openresolv updates `/etc/resolv.conf` it can notify the following of this: + * [Bonjour (mdnsd)](https://developer.apple.com/bonjour/) + * [avahi](http://www.avahi.org/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.9.2/avahi-daemon.in new/openresolv-3.11.0/avahi-daemon.in --- old/openresolv-3.9.2/avahi-daemon.in 1970-01-01 01:00:00.000000000 +0100 +++ new/openresolv-3.11.0/avahi-daemon.in 2020-07-22 15:09:00.000000000 +0200 @@ -0,0 +1,32 @@ +#!/bin/sh +# Copyright (c) 2007-2020 Roy Marples +# All rights reserved + +# avahi-daemon notifier for resolvconf libc subscriber + +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials provided +# with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +: ${avahi_daemon_pidfile:=/var/run/avahi-daemon/pid} +if [ -s "$avahi_daemon_pidfile" ]; then + kill -HUP $(cat "$avahi_daemon_pidfile") +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.9.2/dnsmasq.in new/openresolv-3.11.0/dnsmasq.in --- old/openresolv-3.9.2/dnsmasq.in 2019-09-08 22:36:27.000000000 +0200 +++ new/openresolv-3.11.0/dnsmasq.in 2020-07-22 15:09:00.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2007-2019 Roy Marples +# Copyright (c) 2007-2020 Roy Marples # All rights reserved # dnsmasq subscriber for resolvconf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.9.2/libc.in new/openresolv-3.11.0/libc.in --- old/openresolv-3.9.2/libc.in 2019-09-08 22:36:27.000000000 +0200 +++ new/openresolv-3.11.0/libc.in 2020-07-22 15:09:00.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2007-2019 Roy Marples +# Copyright (c) 2007-2020 Roy Marples # All rights reserved # libc subscriber for resolvconf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.9.2/mdnsd.in new/openresolv-3.11.0/mdnsd.in --- old/openresolv-3.9.2/mdnsd.in 1970-01-01 01:00:00.000000000 +0100 +++ new/openresolv-3.11.0/mdnsd.in 2020-07-22 15:09:00.000000000 +0200 @@ -0,0 +1,32 @@ +#!/bin/sh +# Copyright (c) 2007-2020 Roy Marples +# All rights reserved + +# mdnsd notifier for resolvconf libc subscriber + +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials provided +# with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +: ${mdnsd_pidfile:=/var/run/mdnsd/mdnsd.pid} +if [ -s "$mdnsd_pidfile" ]; then + kill -HUP $(cat "$mdnsd_pidfile") +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.9.2/named.in new/openresolv-3.11.0/named.in --- old/openresolv-3.9.2/named.in 2019-09-08 22:36:27.000000000 +0200 +++ new/openresolv-3.11.0/named.in 2020-07-22 15:09:00.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2007-2016 Roy Marples +# Copyright (c) 2007-2020 Roy Marples # All rights reserved # named subscriber for resolvconf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.9.2/pdns_recursor.in new/openresolv-3.11.0/pdns_recursor.in --- old/openresolv-3.9.2/pdns_recursor.in 2019-09-08 22:36:27.000000000 +0200 +++ new/openresolv-3.11.0/pdns_recursor.in 2020-07-22 15:09:00.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2009-2019 Roy Marples +# Copyright (c) 2009-2020 Roy Marples # All rights reserved # PowerDNS Recursor subscriber for resolvconf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.9.2/pdnsd.in new/openresolv-3.11.0/pdnsd.in --- old/openresolv-3.9.2/pdnsd.in 2019-09-08 22:36:27.000000000 +0200 +++ new/openresolv-3.11.0/pdnsd.in 2020-07-22 15:09:00.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2010-2018 Roy Marples +# Copyright (c) 2010-2020 Roy Marples # All rights reserved # pdnsd subscriber for resolvconf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.9.2/resolvconf.8.in new/openresolv-3.11.0/resolvconf.8.in --- old/openresolv-3.9.2/resolvconf.8.in 2019-09-08 22:36:27.000000000 +0200 +++ new/openresolv-3.11.0/resolvconf.8.in 2020-07-22 15:09:00.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2007-2016 Roy Marples +.\" Copyright (c) 2007-2020 Roy Marples .\" All rights reserved .\" .\" Redistribution and use in source and binary forms, with or without diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.9.2/resolvconf.conf.5.in new/openresolv-3.11.0/resolvconf.conf.5.in --- old/openresolv-3.9.2/resolvconf.conf.5.in 2019-09-08 22:36:27.000000000 +0200 +++ new/openresolv-3.11.0/resolvconf.conf.5.in 2020-07-22 15:09:00.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2009-2016 Roy Marples +.\" Copyright (c) 2009-2020 Roy Marples .\" All rights reserved .\" .\" Redistribution and use in source and binary forms, with or without @@ -61,6 +61,10 @@ .Nm resolvconf from running any subscribers. Defaults to YES. +.It Sy allow_interfaces +If set, only these interfaces will be processed. +.It Sy deny_interfaces +If set, these interfaces will not be processed. .It Sy interface_order These interfaces will always be processed first. If unset, defaults to the following:- @@ -71,7 +75,7 @@ These interfaces will be processed next, unless they have a metric. If unset, defaults to the following:- .Bd -compact -literal -offset indent -tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]* +tap[0-9]* tun[0-9]* vpn vpn[0-9]* wg[0-9]* ppp[0-9]* ippp[0-9]* .Ed .It Sy inclusive_interfaces Ignore any exclusive marking for these interfaces. @@ -212,7 +216,7 @@ .Xr dnsmasq 8 , .Xr named 8 , .Xr pdnsd 8 , -.Xr pdns_recursor 8 , +.Xr pdns_recursor 1 , and .Xr unbound 8 . Each subscriber can create configuration files which should be included in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.9.2/resolvconf.in new/openresolv-3.11.0/resolvconf.in --- old/openresolv-3.9.2/resolvconf.in 2019-09-08 22:36:27.000000000 +0200 +++ new/openresolv-3.11.0/resolvconf.in 2020-07-22 15:09:00.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2007-2019 Roy Marples +# Copyright (c) 2007-2020 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.9.2" +OPENRESOLV_VERSION="3.11.0" SYSCONFDIR=@SYSCONFDIR@ LIBEXECDIR=@LIBEXECDIR@ VARDIR=@VARDIR@ @@ -34,7 +34,7 @@ if [ "$1" = "--version" ]; then echo "openresolv $OPENRESOLV_VERSION" - echo "Copyright (c) 2007-2016 Roy Marples" + echo "Copyright (c) 2007-2020 Roy Marples" exit 0 fi @@ -44,7 +44,7 @@ # If you change this, change the test in VFLAG and libc.in as well local_nameservers="127.* 0.0.0.0 255.255.255.255 ::1" -dynamic_order="tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]*" +dynamic_order="tap[0-9]* tun[0-9]* vpn vpn[0-9]* wg[0-9]* ppp[0-9]* ippp[0-9]*" interface_order="lo lo[0-9]*" name_server_blacklist="0.0.0.0" @@ -59,6 +59,7 @@ interface_order="$(cat "$SYSCONFDIR"/interface-order)" fi fi + IFACEDIR="$VARDIR/interfaces" METRICDIR="$VARDIR/metrics" PRIVATEDIR="$VARDIR/private" @@ -494,6 +495,23 @@ fi continue fi + + if ! $ALLIFACES; then + if [ -n "$allow_interfaces" ]; then + x=false + for j in $allow_interfaces; do + if [ "$i" = "$j" ]; then + x=true + fi + done + $x || continue + fi + for j in $deny_interfaces; do + if [ "$i" = "$j" ]; then + continue 2 + fi + done + fi if [ "$cmd" = i ] || [ "$cmd" = "-i" ]; then printf %s "$i " @@ -605,7 +623,7 @@ SEARCH= NAMESERVERS= LOCALNAMESERVERS= - + if [ -n "${name_servers}${search_domains}" ]; then eval "$(echo_prepend | parse_resolv)" fi @@ -700,9 +718,11 @@ # -l lists our resolv files, optionally for a specific interface if [ "$cmd" = l ] || [ "$cmd" = i ]; then + ALLIFACES=true list_resolv "$cmd" "$args" exit $? fi +ALLIFACES=false # Restart a service or echo the command to restart a service if [ "$cmd" = r ] || [ "$cmd" = R ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openresolv-3.9.2/unbound.in new/openresolv-3.11.0/unbound.in --- old/openresolv-3.9.2/unbound.in 2019-09-08 22:36:27.000000000 +0200 +++ new/openresolv-3.11.0/unbound.in 2020-07-22 15:09:00.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2009-2016 Roy Marples +# Copyright (c) 2009-2020 Roy Marples # All rights reserved # unbound subscriber for resolvconf
