[rpms/tftp] rawhide: improve the tftp systemd service

[rpms/tftp] rawhide: improve the tftp systemd service

[@ 2026-09-14 8:20 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/tftp
            Branch : rawhide
            Commit : 0925ab9f09567652f2f8023f07476f19bebab433
            Author : Lukáš Zaoral <lzaoral@redhat.com>
            Date   : 2026-09-11T10:05:28+02:00
            Stats  : +20/-6 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/tftp/c/0925ab9f09567652f2f8023f07476f19bebab433?branch=rawhide

            Log:
            improve the tftp systemd service

- use the same verbosity level as older releases (-v is now necessary)
- execute transfers under tftpd user instead of nobody
- include a default map-file
- increase the default blocksize (1468) and windowsize (64)

---
diff --git a/tftp-server-sysusers.conf b/tftp-server-sysusers.conf
new file mode 100644
index 0000000..8f5f6aa
--- /dev/null
+++ b/tftp-server-sysusers.conf
@@ -0,0 +1 @@
+u tftpd - 'TFTP Daemon' - -

diff --git a/tftp.service b/tftp.service
index 0c88dd9..d3e080b 100644
--- a/tftp.service
+++ b/tftp.service
@@ -4,7 +4,7 @@ Requires=tftp.socket
 Documentation=man:in.tftpd
 
 [Service]
-ExecStart=/usr/sbin/in.tftpd --systemd -s /var/lib/tftpboot
+ExecStart=/usr/sbin/in.tftpd -v --user tftpd --systemd -s /var/lib/tftpboot --blocksize 1468 --windowsize 64 --map-file /etc/tftp/map-file
 
 [Install]
 Also=tftp.socket

diff --git a/tftp.spec b/tftp.spec
index 6692742..ce542a4 100644
--- a/tftp.spec
+++ b/tftp.spec
@@ -1,9 +1,7 @@
-%global _hardened_build 1
-
 Summary: The client for the Trivial File Transfer Protocol (TFTP)
 Name: tftp
 Version: 6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD-4-Clause-UC
 URL: http://www.kernel.org/pub/software/network/tftp/
 Source0: https://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{version}.tar.gz
@@ -13,7 +11,8 @@ Source1: https://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{version}.ta
 Source2: hpa.gpg
 Source3: tftp.socket
 Source4: tftp.service
-Source5: tftp-server-tmpfiles.conf
+Source5: tftp-server-sysusers.conf
+Source6: tftp-server-tmpfiles.conf
 
 # To-be upstreamed patches
 Patch: tftp-enhanced-logging.patch
@@ -65,7 +64,11 @@ gzip -cd '%{SOURCE0}' > 'tftp-hpa-%{version}.tar'
 mkdir -p %{buildroot}%{_localstatedir}/lib/tftpboot
 install -D -p -m 644 %SOURCE3 %{buildroot}%{_unitdir}/%{name}.socket
 install -D -p -m 644 %SOURCE4 %{buildroot}%{_unitdir}/%{name}.service
-install -D -p -m 644 %SOURCE5 %{buildroot}%{_tmpfilesdir}/%{name}.conf
+install -D -p -m 644 %SOURCE5 %{buildroot}%{_sysusersdir}/%{name}.conf
+install -D -p -m 644 %SOURCE6 %{buildroot}%{_tmpfilesdir}/%{name}.conf
+
+mkdir -p %{buildroot}%{_sysconfdir}/tftp
+echo '# See tftpd(8) for the definition of remap rules' > %{buildroot}%{_sysconfdir}/%{name}/map-file
 
 %post server
 %systemd_post tftp.socket
@@ -85,14 +88,24 @@ install -D -p -m 644 %SOURCE5 %{buildroot}%{_tmpfilesdir}/%{name}.conf
 %files server
 %doc README README.security CHANGES
 %dir %{_localstatedir}/lib/tftpboot
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/map-file
 %{_sbindir}/in.tftpd
 %{_mandir}/man8/in.tftpd.8*
 %{_mandir}/man8/tftpd.8*
+%{_sysusersdir}/%{name}.conf
 %{_tmpfilesdir}/%{name}.conf
 %{_unitdir}/tftp.service
 %{_unitdir}/tftp.socket
 
 %changelog
+* Fri Sep 11 2026 Lukáš Zaoral <lzaoral@redhat.com> - 6.1-2
+- tftp systemd service improvements
+  - use the same verbosity level as older releases (-v is now necessary)
+  - execute transfers under tftpd user instead of nobody
+  - include a default map-file
+  - increase the default blocksize (1468) and windowsize (64)
+
 * Mon Sep 07 2026 Lukáš Zaoral <lzaoral@redhat.com> - 6.1-1
 - rebase to the latest upstream release (rhbz#2529277)
 - use the native support for systemd socket activation in tftpd