Attachment 574621 Details for Bug 809239 – Remove the ssh.service file from default install

[patch] Remove the ssh.service file from default install

0001-Remove-the-correct-ssh.service-example-file.patch (text/plain), 2.04 KB, created by Stef Walter on 2012-04-02 20:18:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stef Walter

Created: 2012-04-02 20:18:08 UTC

Size: 2.04 KB

patch

obsolete

>From 7b4d604eda6809c1e5510efb782df6d40ca82bde Mon Sep 17 00:00:00 2001
>From: Stef Walter <stefw@gnome.org>
>Date: Mon, 2 Apr 2012 21:58:43 +0200
>Subject: [PATCH] Remove the correct ssh.service example file
>
> * There was a command to remove the /etc/avahi/services/ssh.service
>   file but it referenced the incorrect path.
> * In any case, there's no guarantee that openssh-server is installed
>   and enabled, so we shouldn't be installing this file just because
>   avahi is present.
>---
> avahi.spec |    8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/avahi.spec b/avahi.spec
>index f83307f..0c1dc69 100644
>--- a/avahi.spec
>+++ b/avahi.spec
>@@ -332,6 +332,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
> rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
> 
> # remove example
>+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/avahi/services/ssh.service
> rm -f $RPM_BUILD_ROOT%{_sysconfdir}/avahi/services/sftp-ssh.service
> 
> # create /var/run/avahi-daemon to ensure correct selinux policy for it:
>@@ -472,7 +473,7 @@ fi
> 
> %files -f %{name}.lang
> %defattr(0644,root,root,0755)
>-%doc docs/* avahi-daemon/example.service avahi-daemon/sftp-ssh.service
>+%doc docs/* avahi-daemon/example.service avahi-daemon/sftp-ssh.service avahi-daemon/ssh.service
> %dir %{_sysconfdir}/avahi
> %dir %{_sysconfdir}/avahi/etc
> %ghost %{_sysconfdir}/avahi/etc/localtime
>@@ -480,7 +481,6 @@ fi
> %dir %{_sysconfdir}/avahi/services
> %ghost %attr(0755,avahi,avahi) %dir %{_localstatedir}/run/avahi-daemon
> %config(noreplace) %{_sysconfdir}/avahi/avahi-daemon.conf
>-%config(noreplace) %{_sysconfdir}/avahi/services/ssh.service
> %config(noreplace) %{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf
> %attr(0755,root,root) %{_sbindir}/avahi-daemon
> %dir %{_datadir}/avahi
>@@ -655,6 +655,10 @@ fi
> %endif
> 
> %changelog
>+* Mon Apr 2 2012 Stef Walter <stefw@redhat.com>
>+- Don't ship ssh service by default file since openssh-server isn't
>+  installed by default
>+
> * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.30-7
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
> 
>-- 
>1.7.9.3
>

Actions: View | Diff

Attachments on bug 809239: 574621