From cc174dd54f306dc1cf66985b2ccad11369ca944af37c3a32883e9d441d2f0860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 20 Dec 2022 17:56:10 +0000 Subject: [PATCH] Accepting request 1043760 from GNOME:Next - Drop %{_sysconfdir}/sysconfig/network/if-{up,down}.d scripts: they are not used, or supported, in a while already. Doesn't work since about 9 years and will not be executed on a OBS-URL: https://build.opensuse.org/request/show/1043760 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=215 --- avahi-autoipd.README.SUSE | 25 +------------------------ avahi-autoipd.if-down | 11 ----------- avahi-autoipd.if-up | 16 ---------------- avahi.changes | 8 +++++++- avahi.spec | 12 ++---------- 5 files changed, 10 insertions(+), 62 deletions(-) delete mode 100644 avahi-autoipd.if-down delete mode 100644 avahi-autoipd.if-up diff --git a/avahi-autoipd.README.SUSE b/avahi-autoipd.README.SUSE index c1409d2..79f0c56 100644 --- a/avahi-autoipd.README.SUSE +++ b/avahi-autoipd.README.SUSE @@ -4,7 +4,7 @@ IPv4LL in SUSE Linux IPv4LL provides support of peer to peer address assignment from a special link local IP range. -SUSE Linux contains three implementations of IPv4LL autoip protocol: +SUSE Linux contains two implementations of IPv4LL autoip protocol: avahi-autoipd from avahi-autoipd package from avahi project @@ -60,29 +60,6 @@ Disadvantage: -autoip from sysconfig package -============================= - -autoip is not bound to sysconfig scripts and it is not called during -as sysconfig is using an own implementation. To enable you have to -set AVAHI_AUTOIPD_ENABLE=yes in /etc/sysconfig/avahi. Note, that it -starts unconditionally then and breaks bridges,vlan,bond, ... - -If DHCP adrress is assigned, autoip ends immediately. Only if no DHCP -address is assigned, it stays running as a daemon and provides IPv4LL -address. - - -Activate autoip implementation ------------------------------- - -- Do not install avahi-autoipd package or set System/Zeroconf - AVAHI_AUTOIPD_FORCE_BIND sysconfig key to "no". - -- Set Zeroconf the address settings in the YaST network configuration. - - - IPv4LL assigned by dhcpcd ========================= diff --git a/avahi-autoipd.if-down b/avahi-autoipd.if-down deleted file mode 100644 index 5225eaf..0000000 --- a/avahi-autoipd.if-down +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -[ "$2" != "lo" ] || exit 0 - -if test -f /etc/sysconfig/avahi ; then - . /etc/sysconfig/avahi -fi - -if test "$AVAHI_AUTOIPD_ENABLE" = "yes" ; then - @sbindir@/avahi-autoipd -k $2 2> /dev/null || exit 0 -fi diff --git a/avahi-autoipd.if-up b/avahi-autoipd.if-up deleted file mode 100644 index 3d456ce..0000000 --- a/avahi-autoipd.if-up +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -[ "$2" != "lo" ] || exit 0 - -if test -f /etc/sysconfig/avahi ; then - . /etc/sysconfig/avahi -fi - -if test "$AVAHI_AUTOIPD_ENABLE" = "yes" ; then - if test "$AVAHI_AUTOIPD_FORCE_BIND" = "yes" ; then - FORCE=" --force-bind" - else - FORCE="" - fi - @sbindir@/avahi-autoipd -wD$FORCE $2 2> /dev/null || exit 0 -fi diff --git a/avahi.changes b/avahi.changes index 63353ab..aff0cc7 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,9 +1,15 @@ +------------------------------------------------------------------- +Mon Dec 19 12:16:12 UTC 2022 - Dominique Leuenberger + +- Drop %{_sysconfdir}/sysconfig/network/if-{up,down}.d scripts: + they are not used, or supported, in a while already. + ------------------------------------------------------------------- Thu Dec 8 15:23:06 UTC 2022 - Thorsten Kukuk - Remove avahi-daemon-check-dns.sh, avahi-daemon-check-dns-suse.patch and avahi-daemon.if-up - Doesn't work since about 9 years and will not be executed on a + Doesn't work since about 9 years and will not be executed on a fresh default installation anymore ------------------------------------------------------------------- diff --git a/avahi.spec b/avahi.spec index 843137b..8145ad4 100644 --- a/avahi.spec +++ b/avahi.spec @@ -67,8 +67,6 @@ Source4: avahi-glib-gettext.m4 Source5: avahi.sysconfig Source6: avahi-autoipd.sysconfig Source9: avahi-autoipd.README.SUSE -Source10: avahi-autoipd.if-up -Source11: avahi-autoipd.if-down Source13: avahi.sysusers Source14: avahi-autoipd.sysusers # File missing from 0.8 tarball @@ -417,6 +415,8 @@ DNS specifications for Zeroconf Computing. + + # This is the avahi-discover command, only provided for the primary python3 flavor %package -n python3-avahi-gtk Summary: A set of Avahi utilities written in Python Using python-gtk @@ -495,8 +495,6 @@ specifications for Zeroconf Computing. cp -a %{SOURCE5} sysconfig.avahi sed "s:@docdir@:%{_docdir}:g" <%{SOURCE6} >sysconfig.avahi-autoipd cp -a %{SOURCE9} avahi-autoipd/README.SUSE -sed "s:@sbindir@:%{_sbindir}:g" <%{SOURCE10} >avahi-autoipd/avahi-autoipd.if-up -sed "s:@sbindir@:%{_sbindir}:g" <%{SOURCE11} >avahi-autoipd/avahi-autoipd.if-down sed -ie "s/libevent-[0-9\.]*/libevent/" avahi-libevent.pc.in cp -a %{SOURCE12} service-type-database/build-db %patch0 @@ -632,9 +630,6 @@ install -d %{buildroot}/%{_localstatedir}/run/avahi-daemon ln -s avahi-compat-libdns_sd/dns_sd.h %{buildroot}/%{_includedir}/ ln -s avahi-compat-howl.pc %{buildroot}/%{_libdir}/pkgconfig/howl.pc install -d %{buildroot}/%{_prefix}/lib/avahi -install -d %{buildroot}%{_sysconfdir}/sysconfig/network/if-{up,down}.d -install avahi-autoipd/avahi-autoipd.if-up %{buildroot}%{_sysconfdir}/sysconfig/network/if-up.d/avahi-autoipd -install avahi-autoipd/avahi-autoipd.if-down %{buildroot}%{_sysconfdir}/sysconfig/network/if-down.d/avahi-autoipd install -d %{buildroot}/%{_localstatedir}/lib/avahi-autoipd mkdir -p %{buildroot}/%{_sbindir} ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcavahi-daemon @@ -840,9 +835,6 @@ find %{_localstatedir}/lib/avahi-autoipd -user avahi -exec chown avahi-autoipd:a %attr(-,avahi-autoipd,avahi-autoipd)%{_localstatedir}/lib/avahi-autoipd %{_sbindir}/avahi-autoipd %{_sysconfdir}/avahi/avahi-autoipd.action -%dir %{_sysconfdir}/sysconfig/network -%dir %{_sysconfdir}/sysconfig/network/if-{down,up}.d -%{_sysconfdir}/sysconfig/network/*/avahi-autoipd %{_fillupdir}/sysconfig.avahi-autoipd %{_sysusersdir}/avahi-autoipd.conf