Attachment 935236 Details for Bug 1136866 – patch

[patch] patch

0001-Don-t-depend-on-xinetd-anymore.patch (text/plain), 3.37 KB, created by Jan Synacek on 2014-09-08 06:38:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Synacek

Created: 2014-09-08 06:38:53 UTC

Size: 3.37 KB

patch

obsolete

>From 32aec007ed42f9a1a2b2f8ffe9e74d3129b799a5 Mon Sep 17 00:00:00 2001
>From: Jan Synacek <jsynacek@redhat.com>
>Date: Mon, 8 Sep 2014 08:29:09 +0200
>Subject: [PATCH] Don't depend on xinetd anymore
>
>Resolves: #1136866
>---
> tftp.service |  2 ++
> tftp.spec    | 28 +++++++++++++---------------
> 2 files changed, 15 insertions(+), 15 deletions(-)
>
>diff --git a/tftp.service b/tftp.service
>index cc5fdb8..9d86e85 100644
>--- a/tftp.service
>+++ b/tftp.service
>@@ -1,5 +1,7 @@
> [Unit]
> Description=Tftp Server
>+Requires=tftp.socket
>+Documentation=man:in.tftpd
> 
> [Service]
> ExecStart=/usr/sbin/in.tftpd -s /var/lib/tftpboot
>diff --git a/tftp.spec b/tftp.spec
>index cb887b6..821b2de 100644
>--- a/tftp.spec
>+++ b/tftp.spec
>@@ -4,7 +4,7 @@
> Summary: The client for the Trivial File Transfer Protocol (TFTP)
> Name: tftp
> Version: 5.2
>-Release: 11%{?dist}
>+Release: 12%{?dist}
> License: BSD
> Group: Applications/Internet
> URL: http://www.kernel.org/pub/software/network/tftp/
>@@ -34,20 +34,20 @@ and should not be enabled unless it is expressly needed.
> %package server
> Group: System Environment/Daemons
> Summary: The server for the Trivial File Transfer Protocol (TFTP)
>-Requires: xinetd systemd-units
>-Requires(post): /sbin/service, systemd-units
>-Requires(postun): /sbin/service, systemd-units
>+Requires: systemd-units
>+Requires(post): systemd-units
>+Requires(postun): systemd-units
> 
> %description server
> The Trivial File Transfer Protocol (TFTP) is normally used only for
> booting diskless workstations.  The tftp-server package provides the
> server for TFTP, which allows users to transfer files to and from a
> remote machine. TFTP provides very little security, and should not be
>-enabled unless it is expressly needed.  The TFTP server is run from
>-%{_sysconfdir}/xinetd.d/tftp, and is disabled by default.
>+enabled unless it is expressly needed.  The TFTP server is run by using
>+systemd socket activation, and is disabled by default.
> 
> %prep
>-%setup -q -n tftp-hpa-%{version} 
>+%setup -q -n tftp-hpa-%{version}
> %patch0 -p1 -b .zero
> %patch2 -p1 -b .tzfix
> %patch3 -p1 -b .tftpboot
>@@ -72,22 +72,18 @@ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/lib/tftpboot
> mkdir -p ${RPM_BUILD_ROOT}%{_unitdir}
> 
> make INSTALLROOT=${RPM_BUILD_ROOT} SBINDIR=%{_sbindir} MANDIR=%{_mandir} INSTALL='install -p' install
>-install -m755 -d -p ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d/ ${RPM_BUILD_ROOT}%{_localstatedir}/lib/tftpboot
>-sed -e 's:/var:%{_localstatedir}:' -e 's:/usr/sbin:%{_sbindir}:' \
>- tftp-xinetd > ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d/tftp
>-touch -r tftp-xinetd ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d/tftp
> 
> install -p -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_unitdir}
> install -p -m 644 %SOURCE2 ${RPM_BUILD_ROOT}%{_unitdir}
> 
> %post server
>-%systemd_post tftp.service
>+%systemd_post tftp.socket
> 
> %preun server
>-%systemd_preun tftp.service
>+%systemd_preun tftp.socket
> 
> %postun server
>-%systemd_postun_with_restart tftp.service
>+%systemd_postun_with_restart tftp.socket
> 
> 
> %clean
>@@ -100,13 +96,15 @@ rm -rf ${RPM_BUILD_ROOT}
> 
> %files server
> %doc README README.security CHANGES
>-%config(noreplace) %{_sysconfdir}/xinetd.d/tftp
> %dir %{_localstatedir}/lib/tftpboot
> %{_sbindir}/in.tftpd
> %{_mandir}/man8/*
> %{_unitdir}/*
> 
> %changelog
>+* Mon Sep  8 2014 Jan SynÃ¡Äek <jsynacek@redhat.com> - 5.2-12
>+- Don't depend on xinetd anymore (#1136866)
>+
> * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 5.2-11
> - Mass rebuild 2014-01-24
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1136866: 935236