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
This commit is contained in:
parent
795e2c20fe
commit
cc174dd54f
@ -4,7 +4,7 @@ IPv4LL in SUSE Linux
|
|||||||
IPv4LL provides support of peer to peer address assignment from a
|
IPv4LL provides support of peer to peer address assignment from a
|
||||||
special link local IP range.
|
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
|
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
|
IPv4LL assigned by dhcpcd
|
||||||
=========================
|
=========================
|
||||||
|
|
||||||
|
@ -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
|
|
@ -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
|
|
@ -1,9 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 19 12:16:12 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
- 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 <kukuk@suse.com>
|
Thu Dec 8 15:23:06 UTC 2022 - Thorsten Kukuk <kukuk@suse.com>
|
||||||
|
|
||||||
- Remove avahi-daemon-check-dns.sh, avahi-daemon-check-dns-suse.patch
|
- Remove avahi-daemon-check-dns.sh, avahi-daemon-check-dns-suse.patch
|
||||||
and avahi-daemon.if-up
|
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
|
fresh default installation anymore
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
|
12
avahi.spec
12
avahi.spec
@ -67,8 +67,6 @@ Source4: avahi-glib-gettext.m4
|
|||||||
Source5: avahi.sysconfig
|
Source5: avahi.sysconfig
|
||||||
Source6: avahi-autoipd.sysconfig
|
Source6: avahi-autoipd.sysconfig
|
||||||
Source9: avahi-autoipd.README.SUSE
|
Source9: avahi-autoipd.README.SUSE
|
||||||
Source10: avahi-autoipd.if-up
|
|
||||||
Source11: avahi-autoipd.if-down
|
|
||||||
Source13: avahi.sysusers
|
Source13: avahi.sysusers
|
||||||
Source14: avahi-autoipd.sysusers
|
Source14: avahi-autoipd.sysusers
|
||||||
# File missing from 0.8 tarball
|
# 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
|
# This is the avahi-discover command, only provided for the primary python3 flavor
|
||||||
%package -n python3-avahi-gtk
|
%package -n python3-avahi-gtk
|
||||||
Summary: A set of Avahi utilities written in Python Using python-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
|
cp -a %{SOURCE5} sysconfig.avahi
|
||||||
sed "s:@docdir@:%{_docdir}:g" <%{SOURCE6} >sysconfig.avahi-autoipd
|
sed "s:@docdir@:%{_docdir}:g" <%{SOURCE6} >sysconfig.avahi-autoipd
|
||||||
cp -a %{SOURCE9} avahi-autoipd/README.SUSE
|
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
|
sed -ie "s/libevent-[0-9\.]*/libevent/" avahi-libevent.pc.in
|
||||||
cp -a %{SOURCE12} service-type-database/build-db
|
cp -a %{SOURCE12} service-type-database/build-db
|
||||||
%patch0
|
%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-libdns_sd/dns_sd.h %{buildroot}/%{_includedir}/
|
||||||
ln -s avahi-compat-howl.pc %{buildroot}/%{_libdir}/pkgconfig/howl.pc
|
ln -s avahi-compat-howl.pc %{buildroot}/%{_libdir}/pkgconfig/howl.pc
|
||||||
install -d %{buildroot}/%{_prefix}/lib/avahi
|
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
|
install -d %{buildroot}/%{_localstatedir}/lib/avahi-autoipd
|
||||||
mkdir -p %{buildroot}/%{_sbindir}
|
mkdir -p %{buildroot}/%{_sbindir}
|
||||||
ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcavahi-daemon
|
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
|
%attr(-,avahi-autoipd,avahi-autoipd)%{_localstatedir}/lib/avahi-autoipd
|
||||||
%{_sbindir}/avahi-autoipd
|
%{_sbindir}/avahi-autoipd
|
||||||
%{_sysconfdir}/avahi/avahi-autoipd.action
|
%{_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
|
%{_fillupdir}/sysconfig.avahi-autoipd
|
||||||
%{_sysusersdir}/avahi-autoipd.conf
|
%{_sysusersdir}/avahi-autoipd.conf
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user