Hello community, here is the log from the commit of package tftp for openSUSE:Factory checked in at 2017-06-23 09:16:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tftp (Old) and /work/SRC/openSUSE:Factory/.tftp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tftp" Fri Jun 23 09:16:42 2017 rev:33 rq:504145 version:5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/tftp/tftp.changes 2015-11-06 00:10:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tftp.new/tftp.changes 2017-06-23 09:16:44.488197854 +0200 @@ -1,0 +2,5 @@ +Fri Jun 16 08:54:54 UTC 2017 - [email protected] + +- Removed xinetd service + +------------------------------------------------------------------- Old: ---- tftp.xinetd ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tftp.spec ++++++ --- /var/tmp/diff_new_pack.pG20S8/_old 2017-06-23 09:16:45.580043578 +0200 +++ /var/tmp/diff_new_pack.pG20S8/_new 2017-06-23 09:16:45.580043578 +0200 @@ -1,7 +1,7 @@ # # spec file for package tftp # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,7 @@ # -%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services - +%define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services Name: tftp Version: 5.2 Release: 0 @@ -26,7 +25,6 @@ Group: Productivity/Networking/Ftp/Clients Url: http://www.kernel.org/pub/software/network/tftp/ 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 @@ -35,25 +33,24 @@ Patch1: tftp-hpa-0.46_colon_check.patch Patch4: tftp-hpa-0.49-fortify-strcpy-crash.patch Patch5: tftp-hpa-0.48-tzfix.patch -Patch43: tftp-config_h.patch Patch6: tftp-multi-addresses.patch Patch7: tftp-hpa-0.48-macros-crash.patch Patch8: tftp-hpa-0.48-macros-v6mapped.patch -Provides: tftp(client) -Provides: tftp(server) -PreReq: pwdutils +Patch43: tftp-config_h.patch BuildRequires: autoconf +BuildRequires: pkgconfig BuildRequires: pwdutils +BuildRequires: systemd-rpm-macros BuildRequires: tcpd-devel -BuildRequires: pkgconfig(systemd) -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1110 -BuildRequires: binutils-devel -%endif -Recommends: inet-daemon Requires: netcfg +Requires(pre): pwdutils +Recommends: inet-daemon Conflicts: atftp +Provides: tftp(client) +Provides: tftp(server) +BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} +BuildRequires: binutils-devel %description The Trivial File Transfer Protocol (TFTP) is normally used only for @@ -61,7 +58,7 @@ component configuration files. %prep -%setup -n %{name}-hpa-%{version} +%setup -q -n %{name}-hpa-%{version} %patch0 %patch1 %patch4 -p1 @@ -69,10 +66,8 @@ %patch6 -p1 %patch7 %patch8 -%if 0%{?suse_version} < 1030 -%patch42 -%endif %patch43 -p1 + %build autoreconf -fi %configure \ @@ -80,19 +75,19 @@ --with-tcpwrappers \ --with-remap \ --with-ipv6 -make +make %{?_smp_mflags} %install -%makeinstall INSTALLROOT=%{buildroot} MANDIR="%{_mandir}" -install -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/xinetd.d/tftp -mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir} -install -m 644 %SOURCE2 $RPM_BUILD_ROOT/%{_fwdefdir}/tftp +%make_install INSTALLROOT=%{buildroot} MANDIR="%{_mandir}" +mkdir -p %{buildroot}/%{_fwdefdir} +install -m 644 %{SOURCE2} %{buildroot}/%{_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} +install -m 0644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_unitdir} install -D -m 0644 %{SOURCE5} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.tftp +ln -sv %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} %pre # This group/user is shared with atftp, so please @@ -115,20 +110,18 @@ %postun %service_del_postun %{name}.service %{name}.socket -%clean -rm -rf %{buildroot}; - %files %defattr(-,root,root) %doc README README.security tftpd/sample.rules %{_bindir}/tftp %{_sbindir}/in.tftpd -%{_mandir}/man1/tftp.1.gz -%{_mandir}/man8/in.tftpd.8.gz -%{_mandir}/man8/tftpd.8.gz +%{_sbindir}/rctftp +%{_mandir}/man1/tftp.1%{ext_man} +%{_mandir}/man8/in.tftpd.8%{ext_man} +%{_mandir}/man8/tftpd.8%{ext_man} %{_unitdir}/tftp.service %{_unitdir}/tftp.socket -%config(noreplace) %{_sysconfdir}/xinetd.d/tftp + %config %{_fwdefdir}/tftp %dir %attr(0750,tftp,tftp) /srv/tftpboot %{_localstatedir}/adm/fillup-templates/sysconfig.tftp
