diff --git a/avahi-glib2.spec b/avahi-glib2.spec index dc1b025..fc6f8a3 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-glib2 # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -644,6 +644,10 @@ cd avahi-qt %make_install # do not install sysv init scripts rm -rf %{buildroot}%{_sysconfdir}/init.d/ +# Do not install ssh and sftp services +rm -rf %{buildroot}%{_sysconfdir}/avahi/services/ssh.service +rm -rf %{buildroot}%{_sysconfdir}/avahi/services/sftp-ssh.service + %if !%{build_core} cd .. %make_build install-pkgconfigDATA DESTDIR=%{buildroot} @@ -826,7 +830,7 @@ find %{_localstatedir}/lib/avahi-autoipd -user avahi -exec chown avahi-autoipd:a %files %license LICENSE -%doc docs/* +%doc docs/* avahi-daemon/sftp-ssh.service avahi-daemon/ssh.service %dir %{_libdir}/avahi/ # Note: This file is intentionally packaged here. It is needed for python3-avahi and avahi-utils: %{_libdir}/avahi/service-types.db @@ -844,7 +848,6 @@ find %{_localstatedir}/lib/avahi-autoipd -user avahi -exec chown avahi-autoipd:a %config %{_sysconfdir}/avahi/avahi-daemon.conf %{_sysconfdir}/avahi/avahi-dnsconfd.action %dir %{_sysconfdir}/avahi/services -%{_sysconfdir}/avahi/services/*.service %config(noreplace) %{_sysconfdir}/avahi/hosts %{_sysconfdir}/dbus-1/system.d/*.conf %{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml diff --git a/avahi-mono.spec b/avahi-mono.spec index d1323a7..4adc6f8 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-mono # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -643,6 +643,10 @@ cd avahi-qt %make_install # do not install sysv init scripts rm -rf %{buildroot}%{_sysconfdir}/init.d/ +# Do not install ssh and sftp services +rm -rf %{buildroot}%{_sysconfdir}/avahi/services/ssh.service +rm -rf %{buildroot}%{_sysconfdir}/avahi/services/sftp-ssh.service + %if !%{build_core} cd .. %make_build install-pkgconfigDATA DESTDIR=%{buildroot} @@ -825,7 +829,7 @@ find %{_localstatedir}/lib/avahi-autoipd -user avahi -exec chown avahi-autoipd:a %files %license LICENSE -%doc docs/* +%doc docs/* avahi-daemon/sftp-ssh.service avahi-daemon/ssh.service %dir %{_libdir}/avahi/ # Note: This file is intentionally packaged here. It is needed for python3-avahi and avahi-utils: %{_libdir}/avahi/service-types.db @@ -843,7 +847,6 @@ find %{_localstatedir}/lib/avahi-autoipd -user avahi -exec chown avahi-autoipd:a %config %{_sysconfdir}/avahi/avahi-daemon.conf %{_sysconfdir}/avahi/avahi-dnsconfd.action %dir %{_sysconfdir}/avahi/services -%{_sysconfdir}/avahi/services/*.service %config(noreplace) %{_sysconfdir}/avahi/hosts %{_sysconfdir}/dbus-1/system.d/*.conf %{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml diff --git a/avahi-qt5.spec b/avahi-qt5.spec index 435c2f0..65f933b 100644 --- a/avahi-qt5.spec +++ b/avahi-qt5.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-qt5 # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -644,6 +644,10 @@ cd avahi-qt %make_install # do not install sysv init scripts rm -rf %{buildroot}%{_sysconfdir}/init.d/ +# Do not install ssh and sftp services +rm -rf %{buildroot}%{_sysconfdir}/avahi/services/ssh.service +rm -rf %{buildroot}%{_sysconfdir}/avahi/services/sftp-ssh.service + %if !%{build_core} cd .. %make_build install-pkgconfigDATA DESTDIR=%{buildroot} @@ -826,7 +830,7 @@ find %{_localstatedir}/lib/avahi-autoipd -user avahi -exec chown avahi-autoipd:a %files %license LICENSE -%doc docs/* +%doc docs/* avahi-daemon/sftp-ssh.service avahi-daemon/ssh.service %dir %{_libdir}/avahi/ # Note: This file is intentionally packaged here. It is needed for python3-avahi and avahi-utils: %{_libdir}/avahi/service-types.db @@ -844,7 +848,6 @@ find %{_localstatedir}/lib/avahi-autoipd -user avahi -exec chown avahi-autoipd:a %config %{_sysconfdir}/avahi/avahi-daemon.conf %{_sysconfdir}/avahi/avahi-dnsconfd.action %dir %{_sysconfdir}/avahi/services -%{_sysconfdir}/avahi/services/*.service %config(noreplace) %{_sysconfdir}/avahi/hosts %{_sysconfdir}/dbus-1/system.d/*.conf %{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml diff --git a/avahi.changes b/avahi.changes index 6c99686..0309d1b 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 12 14:33:21 UTC 2022 - Michael Gorse + +- Move sftp-ssh and ssh services to the doc directory. They allow + a host's up/down status to be easily discovered and should not + be enabled by default (boo#1179060). + ------------------------------------------------------------------- Mon Oct 25 13:20:49 UTC 2021 - Yifan Jiang diff --git a/avahi.spec b/avahi.spec index c722c21..2f62a12 100644 --- a/avahi.spec +++ b/avahi.spec @@ -1,7 +1,7 @@ # # spec file for package avahi # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -639,6 +639,10 @@ cd avahi-qt %make_install # do not install sysv init scripts rm -rf %{buildroot}%{_sysconfdir}/init.d/ +# Do not install ssh and sftp services +rm -rf %{buildroot}%{_sysconfdir}/avahi/services/ssh.service +rm -rf %{buildroot}%{_sysconfdir}/avahi/services/sftp-ssh.service + %if !%{build_core} cd .. %make_build install-pkgconfigDATA DESTDIR=%{buildroot} @@ -821,7 +825,7 @@ find %{_localstatedir}/lib/avahi-autoipd -user avahi -exec chown avahi-autoipd:a %files %license LICENSE -%doc docs/* +%doc docs/* avahi-daemon/sftp-ssh.service avahi-daemon/ssh.service %dir %{_libdir}/avahi/ # Note: This file is intentionally packaged here. It is needed for python3-avahi and avahi-utils: %{_libdir}/avahi/service-types.db @@ -839,7 +843,6 @@ find %{_localstatedir}/lib/avahi-autoipd -user avahi -exec chown avahi-autoipd:a %config %{_sysconfdir}/avahi/avahi-daemon.conf %{_sysconfdir}/avahi/avahi-dnsconfd.action %dir %{_sysconfdir}/avahi/services -%{_sysconfdir}/avahi/services/*.service %config(noreplace) %{_sysconfdir}/avahi/hosts %{_sysconfdir}/dbus-1/system.d/*.conf %{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml