Hello community, here is the log from the commit of package tftp for openSUSE:Factory checked in at 2014-03-31 20:43:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tftp (Old) and /work/SRC/openSUSE:Factory/.tftp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tftp" Changes: -------- --- /work/SRC/openSUSE:Factory/tftp/tftp.changes 2013-04-23 11:40:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tftp.new/tftp.changes 2014-03-31 20:43:04.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Mar 25 23:35:16 UTC 2014 - crrodriguez@opensuse.org + +- drop tftp-hpa-0.43_old-autoconf.diff not needed for any + product still in active maintenance. +- Use correct systemd macros in %pre, %post.. +- config.h must be included *everywhere* (tftp-config_h.patch) +- tftp.service: + * This service needs to be started after network.target + * Use PrivateDevices=yes + +------------------------------------------------------------------- Old: ---- tftp-hpa-0.43_old-autoconf.diff New: ---- tftp-config_h.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tftp.spec ++++++ --- /var/tmp/diff_new_pack.5qUMsE/_old 2014-03-31 20:43:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5qUMsE/_new 2014-03-31 20:43:05.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package tftp # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,6 @@ %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 @@ -40,13 +34,14 @@ Patch1: tftp-hpa-0.46_colon_check.patch Patch4: tftp-hpa-0.49-fortify-strcpy-crash.patch Patch5: tftp-hpa-0.48-tzfix.patch -Patch42: tftp-hpa-0.43_old-autoconf.diff +Patch43: tftp-config_h.patch Provides: tftp(client) Provides: tftp(server) PreReq: pwdutils BuildRequires: autoconf BuildRequires: pwdutils BuildRequires: tcpd-devel +BuildRequires: pkgconfig(systemd) BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1110 BuildRequires: binutils-devel @@ -54,6 +49,7 @@ Recommends: inet-daemon Requires: netcfg Conflicts: atftp +%{?systemd_requires} %description The Trivial File Transfer Protocol (TFTP) is normally used only for @@ -69,14 +65,13 @@ %if 0%{?suse_version} < 1030 %patch42 %endif - +%patch43 -p1 %build autoreconf -fi %configure \ --enable-largefile \ --with-tcpwrappers \ --with-remap \ - --without-editline \ --with-ipv6 make @@ -100,6 +95,17 @@ %{_sbindir}/useradd -c "TFTP account" -d /srv/tftpboot -G tftp -g tftp \ -r -s /bin/false tftp 2>/dev/null || : +%service_add_pre %{name}.service %{name}.socket + +%post +%service_add_post %{name}.service %{name}.socket + +%preun +%service_del_preun %{name}.service %{name}.socket + +%postun +%service_del_postun %{name}.service %{name}.socket + %clean rm -rf %{buildroot}; @@ -111,8 +117,6 @@ %{_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 ++++++ tftp-config_h.patch ++++++ --- tftp-hpa-5.2.orig/MCONFIG.in +++ tftp-hpa-5.2/MCONFIG.in @@ -51,7 +51,7 @@ INSTALL_DATA = @INSTALL_DATA@ # Compiler and compiler flags CC = @CC@ -CFLAGS = @CFLAGS@ -I$(SRCROOT) +CFLAGS = @CFLAGS@ -I$(SRCROOT) -include config.h # Link flags LDFLAGS = @LDFLAGS@ --- tftp-hpa-5.2.orig/tftp/Makefile +++ tftp-hpa-5.2/tftp/Makefile @@ -9,7 +9,7 @@ OBJS = tftp.$(O) main.$(O) all: tftp$(X) tftp.1 tftp$(X): $(OBJS) - $(CC) $(LDFLAGS) $^ $(TFTP_LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $^ $(TFTP_LIBS) -o $@ $(OBJS): ../common/tftpsubs.h --- tftp-hpa-5.2.orig/tftpd/Makefile +++ tftp-hpa-5.2/tftpd/Makefile @@ -9,7 +9,7 @@ OBJS = tftpd.$(O) recvfrom.$(O) misc.$(O all: tftpd$(X) tftpd.8 tftpd$(X): $(OBJS) - $(CC) $(LDFLAGS) $^ $(TFTPD_LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $^ $(TFTPD_LIBS) -o $@ $(OBJS): ../common/tftpsubs.h ++++++ tftp.service ++++++ --- /var/tmp/diff_new_pack.5qUMsE/_old 2014-03-31 20:43:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5qUMsE/_new 2014-03-31 20:43:05.000000000 +0200 @@ -1,7 +1,9 @@ [Unit] Description=Tftp Server +Wants=network.target +After=network.target [Service] ExecStart=/usr/sbin/in.tftpd -u tftp -s /srv/tftpboot StandardInput=socket - +PrivateDevices=yes -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org