Hello community,
here is the log from the commit of package tftp for openSUSE:Factory checked in
at 2012-12-08 15:53:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tftp (Old)
and /work/SRC/openSUSE:Factory/.tftp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tftp", Maintainer is "vci...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/tftp/tftp.changes 2012-09-06
09:06:51.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.tftp.new/tftp.changes 2012-12-08
15:53:47.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Dec 5 19:54:20 UTC 2012 - dims...@opensuse.org
+
+- Add systemd socket activation units.
+- Change inet-daemon to be recommended only, as we can now also
+ activate by means of systemd sockets.
+
+-------------------------------------------------------------------
New:
----
tftp.service
tftp.socket
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tftp.spec ++++++
--- /var/tmp/diff_new_pack.hVe3uv/_old 2012-12-08 15:53:48.000000000 +0100
+++ /var/tmp/diff_new_pack.hVe3uv/_new 2012-12-08 15:53:48.000000000 +0100
@@ -17,6 +17,12 @@
%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
+%if 0%{?suse_version} >= 1230
+%define _systemddir /usr/lib/systemd/
+%else
+%define _systemddir /lib/systemd/
+%endif
+%define _unitdir %{_systemddir}/system
Name: tftp
Version: 5.2
@@ -28,6 +34,8 @@
Source:
http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{version}.tar.bz2
Source1: tftp.xinetd
Source2: tftp.fw
+Source3: tftp.service
+Source4: tftp.socket
Patch0: tftp-hpa-0.43_include_sys_params.patch
Patch1: tftp-hpa-0.46_colon_check.patch
Patch4: tftp-hpa-0.49-fortify-strcpy-crash.patch
@@ -41,7 +49,7 @@
%if 0%{?suse_version} > 1110
BuildRequires: binutils-devel
%endif
-Requires: inet-daemon
+Recommends: inet-daemon
Requires: netcfg
Conflicts: atftp
@@ -77,6 +85,10 @@
install -m 644 %SOURCE2 $RPM_BUILD_ROOT/%{_fwdefdir}/tftp
install -d -m 0750 %{buildroot}/srv/tftpboot
+# Install systemd unit / socket (As an alternativ to xinetd activation)
+install -d %{buildroot}%{_unitdir}
+install -m 0644 %{S:3} %{S:4} %{buildroot}%{_unitdir}
+
%pre
# This group/user is shared with atftp, so please
# keep this in sync with atftp.spec
@@ -97,6 +109,10 @@
%{_mandir}/man1/tftp.1.gz
%{_mandir}/man8/in.tftpd.8.gz
%{_mandir}/man8/tftpd.8.gz
+%dir %{_systemddir}
+%dir %{_unitdir}
+%{_unitdir}/tftp.service
+%{_unitdir}/tftp.socket
%config(noreplace) %{_sysconfdir}/xinetd.d/tftp
%config %{_fwdefdir}/tftp
%dir %attr(0750,root,tftp) /srv/tftpboot
++++++ tftp.service ++++++
[Unit]
Description=Tftp Server
[Service]
ExecStart=/usr/sbin/in.tftpd -u tftp -s /srv/tftpboot
StandardInput=socket
++++++ tftp.socket ++++++
[Unit]
Description=Tftp Server Activation Socket
[Socket]
ListenDatagram=69
[Install]
WantedBy=sockets.target
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
