From 491c8b2f071b301649adad499b81c18a3e9d1e07 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 23:54:41 +0100 Subject: [PATCH] path fixes for x86_64 [release 1.9.2-5mamba;Mon Jan 19 2015] --- ftpd.service | 2 +- inetutils.spec | 53 +++++++++++++++++++++++++++---------------------- rlogin.service | 2 +- talk.service | 2 +- telnet@.service | 2 +- tftpd.service | 9 +++++++++ tftpd.socket | 1 - tftpd@.service | 7 ------- 8 files changed, 42 insertions(+), 36 deletions(-) create mode 100644 tftpd.service delete mode 100644 tftpd@.service diff --git a/ftpd.service b/ftpd.service index 7e393b5..0cc7773 100644 --- a/ftpd.service +++ b/ftpd.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking PIDFile=/run/ftpd.pid -ExecStart=/usr/libexec/ftpd -D +ExecStart=@libexecdir@/ftpd -D ExecStopPost=/bin/rm -f /run/ftpd.pid [Install] diff --git a/inetutils.spec b/inetutils.spec index 0ed5332..3f6b91e 100644 --- a/inetutils.spec +++ b/inetutils.spec @@ -1,6 +1,6 @@ Name: inetutils Version: 1.9.2 -Release: 4mamba +Release: 5mamba Summary: A collection of common network programs Group: Applications/Networking Vendor: openmamba @@ -18,16 +18,16 @@ Source7: talk.service Source8: talk.socket Source9: telnet.socket Source10: telnet@.service -Source11: tftpd@.service +Source11: tftpd.service Source12: tftpd.socket License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel BuildRequires: libncurses-devel +BuildRequires: libpam-devel BuildRequires: libreadline-devel BuildRequires: libtermcap-devel BuildRequires: libwrap-devel -BuildRequires: pam-devel ## AUTOBUILDREQ-END Requires(post):%{__install_info} Provides: ftp @@ -117,17 +117,19 @@ rm -f %{buildroot}%{_mandir}/man1/logger.1* mkdir -p %{buildroot}/var/lib/tftpboot -install -D -m0644 %{SOURCE2} %{buildroot}/lib/systemd/system/ftpd.service -install -D -m0644 %{SOURCE3} %{buildroot}/lib/systemd/system/rlogin.socket -install -D -m0644 %{SOURCE4} %{buildroot}/lib/systemd/system/rlogin.service -install -D -m0644 %{SOURCE5} %{buildroot}/lib/systemd/system/rsh.socket -install -D -m0644 %{SOURCE6} %{buildroot}/lib/systemd/system/rsh@.service -install -D -m0644 %{SOURCE7} %{buildroot}/lib/systemd/system/talk.service -install -D -m0644 %{SOURCE8} %{buildroot}/lib/systemd/system/talk.socket -install -D -m0644 %{SOURCE9} %{buildroot}/lib/systemd/system/telnet.socket -install -D -m0644 %{SOURCE10} %{buildroot}/lib/systemd/system/telnet@.service -install -D -m0644 %{SOURCE11} %{buildroot}/lib/systemd/system/tftpd@.service -install -D -m0644 %{SOURCE12} %{buildroot}/lib/systemd/system/tftpd.socket +install -D -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/ftpd.service +install -D -m0644 %{SOURCE3} %{buildroot}%{_unitdir}/rlogin.socket +install -D -m0644 %{SOURCE4} %{buildroot}%{_unitdir}/rlogin.service +install -D -m0644 %{SOURCE5} %{buildroot}%{_unitdir}/rsh.socket +install -D -m0644 %{SOURCE6} %{buildroot}%{_unitdir}/rsh@.service +install -D -m0644 %{SOURCE7} %{buildroot}%{_unitdir}/talk.service +install -D -m0644 %{SOURCE8} %{buildroot}%{_unitdir}/talk.socket +install -D -m0644 %{SOURCE9} %{buildroot}%{_unitdir}/telnet.socket +install -D -m0644 %{SOURCE10} %{buildroot}%{_unitdir}/telnet@.service +install -D -m0644 %{SOURCE11} %{buildroot}%{_unitdir}/tftpd.service +install -D -m0644 %{SOURCE12} %{buildroot}%{_unitdir}/tftpd.socket + +sed -i "s|@libexecdir@|%{_libexecdir}|" %{buildroot}%{_unitdir}/*.service %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -211,15 +213,15 @@ fi %{_libexecdir}/talkd %{_libexecdir}/telnetd %{_libexecdir}/uucpd -/lib/systemd/system/ftpd.service -/lib/systemd/system/rlogin.service -/lib/systemd/system/rlogin.socket -/lib/systemd/system/rsh.socket -/lib/systemd/system/rsh@.service -/lib/systemd/system/talk.service -/lib/systemd/system/talk.socket -/lib/systemd/system/telnet.socket -/lib/systemd/system/telnet@.service +%{_unitdir}/ftpd.service +%{_unitdir}/rlogin.service +%{_unitdir}/rlogin.socket +%{_unitdir}/rsh.socket +%{_unitdir}/rsh@.service +%{_unitdir}/talk.service +%{_unitdir}/talk.socket +%{_unitdir}/telnet.socket +%{_unitdir}/telnet@.service %{_mandir}/man8/ftpd.8* %{_mandir}/man8/inetd.8* %{_mandir}/man8/rexecd.8* @@ -233,11 +235,14 @@ fi %defattr(-,root,root) %{_libexecdir}/tftpd /lib/systemd/system/tftpd.socket -/lib/systemd/system/tftpd@.service +/lib/systemd/system/tftpd.service %{_mandir}/man8/tftpd.8* %dir %attr(0750,root,root) %{_localstatedir}/lib/tftpboot %changelog +* Mon Jan 19 2015 Silvan Calarco 1.9.2-5mamba +- path fixes for x86_64 + * Sat Jun 21 2014 Silvan Calarco 1.9.2-4mamba - disable traceroute and require better external package diff --git a/rlogin.service b/rlogin.service index 31167c9..af01568 100644 --- a/rlogin.service +++ b/rlogin.service @@ -3,5 +3,5 @@ Description=Remote Login Facilities Server After=local-fs.target [Service] -ExecStart=-/usr/libexec/rlogind +ExecStart=-@libexecdir@/rlogind StandardInput=socket diff --git a/talk.service b/talk.service index f3b1ddd..705ba86 100644 --- a/talk.service +++ b/talk.service @@ -5,7 +5,7 @@ Documentation=man:talkd(8) man:talk(1) [Service] User=nobody Group=tty -ExecStart=/usr/libexec/talkd +ExecStart=@libexecdir@/talkd StandardInput=socket [Install] diff --git a/telnet@.service b/telnet@.service index 2685ca9..bf15444 100644 --- a/telnet@.service +++ b/telnet@.service @@ -3,5 +3,5 @@ Description=Telnet Server After=local-fs.target [Service] -ExecStart=-/usr/libexec/telnetd +ExecStart=-@libexecdir@/telnetd StandardInput=socket diff --git a/tftpd.service b/tftpd.service new file mode 100644 index 0000000..30b2b71 --- /dev/null +++ b/tftpd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Trivial FTP Server +After=local-fs.target + +[Service] +ExecStart=-@libexecdir@/tftpd /var/lib/tftpboot +StandardInput=socket +StandardOutput=inherit +StandardError=journal diff --git a/tftpd.socket b/tftpd.socket index 0a751b9..38ed095 100644 --- a/tftpd.socket +++ b/tftpd.socket @@ -3,7 +3,6 @@ Description=Trivial FTP Daemon (tftp) Activation Socket [Socket] ListenDatagram=69 -Accept=true [Install] WantedBy=sockets.target diff --git a/tftpd@.service b/tftpd@.service deleted file mode 100644 index f6cd3c6..0000000 --- a/tftpd@.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Trivial FTP Server -After=local-fs.target - -[Service] -ExecStart=-/usr/libexec/tftpd /var/lib/tftpboot -StandardInput=socket