commit tftp for openSUSE:Factory

2020-10-26 Thread root 
Hello community,

here is the log from the commit of package tftp for openSUSE:Factory checked in 
at 2020-10-26 16:12:00

Comparing /work/SRC/openSUSE:Factory/tftp (Old)
 and  /work/SRC/openSUSE:Factory/.tftp.new.3463 (New)


Package is "tftp"

Mon Oct 26 16:12:00 2020 rev:42 rq:843407 version:5.2

Changes:

--- /work/SRC/openSUSE:Factory/tftp/tftp.changes2020-10-03 
18:55:22.769474114 +0200
+++ /work/SRC/openSUSE:Factory/.tftp.new.3463/tftp.changes  2020-10-26 
16:12:32.586728922 +0100
@@ -1,0 +2,9 @@
+Tue Oct 13 11:00:10 UTC 2020 - Jan Engelhardt 
+
+- Do not suppress errors from useradd.
+- Replace some old specfile constructs. To that end, patches were
+  refreshed: tftp-hpa-0.43_include_sys_params.patch,
+  tftp-hpa-0.46_colon_check.patch, tftp-hpa-0.48-macros-crash.patch,
+  tftp-hpa-0.48-macros-v6mapped.patch.
+
+---



Other differences:
--
++ tftp.spec ++
--- /var/tmp/diff_new_pack.BGywN7/_old  2020-10-26 16:12:34.394730586 +0100
+++ /var/tmp/diff_new_pack.BGywN7/_new  2020-10-26 16:12:34.398730590 +0100
@@ -58,15 +58,7 @@
 component configuration files.
 
 %prep
-%setup -q -n %{name}-hpa-%{version}
-%patch0
-%patch1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7
-%patch8
-%patch43 -p1
+%autosetup -p1 -n %{name}-hpa-%{version}
 
 %build
 autoreconf -fi
@@ -76,7 +68,7 @@
   --with-tcpwrappers \
   --with-remap \
   --with-ipv6
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install INSTALLROOT=%{buildroot} MANDIR="%{_mandir}"
@@ -92,10 +84,11 @@
 # This group/user is shared with atftp, so please
 # keep this in sync with atftp.spec
 # add group
-%{_sbindir}/groupadd -r tftp 2>/dev/null || :
+getent group tftp >/dev/null || %{_sbindir}/groupadd -r tftp
 # add user
-%{_sbindir}/useradd -c "TFTP account" -d /srv/tftpboot -G tftp -g tftp \
-  -r -s /bin/false tftp 2>/dev/null || :
+getent passwd tftp >/dev/null || \
+   %{_sbindir}/useradd -c "TFTP account" -d /srv/tftpboot -G tftp \
+   -g tftp -r -s /bin/false tftp
 
 %service_add_pre %{name}.service %{name}.socket
 

++ tftp-hpa-0.43_include_sys_params.patch ++
--- /var/tmp/diff_new_pack.BGywN7/_old  2020-10-26 16:12:34.438730626 +0100
+++ /var/tmp/diff_new_pack.BGywN7/_new  2020-10-26 16:12:34.442730630 +0100
@@ -1,7 +1,11 @@
-Index: tftp/main.c
+---
+ tftp/main.c |1 +
+ 1 file changed, 1 insertion(+)
+
+Index: tftp-hpa-5.2/tftp/main.c
 ===
 tftp/main.c.orig
-+++ tftp/main.c
+--- tftp-hpa-5.2.orig/tftp/main.c
 tftp-hpa-5.2/tftp/main.c
 @@ -39,6 +39,7 @@
   * TFTP User Program -- Command Interface.
   */

++ tftp-hpa-0.46_colon_check.patch ++
--- /var/tmp/diff_new_pack.BGywN7/_old  2020-10-26 16:12:34.454730641 +0100
+++ /var/tmp/diff_new_pack.BGywN7/_new  2020-10-26 16:12:34.454730641 +0100
@@ -1,7 +1,11 @@
-Index: tftp/main.c
+---
+ tftp/main.c |7 +--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+Index: tftp-hpa-5.2/tftp/main.c
 ===
 tftp/main.c.orig
-+++ tftp/main.c
+--- tftp-hpa-5.2.orig/tftp/main.c
 tftp-hpa-5.2/tftp/main.c
 @@ -308,7 +308,7 @@ int main(int argc, char *argv[])
  
  bsd_signal(SIGINT, intr);

++ tftp-hpa-0.48-macros-crash.patch ++
--- /var/tmp/diff_new_pack.BGywN7/_old  2020-10-26 16:12:34.470730656 +0100
+++ /var/tmp/diff_new_pack.BGywN7/_new  2020-10-26 16:12:34.470730656 +0100
@@ -1,7 +1,12 @@
-diff -up tftpd/tftpd.c.orig-len tftpd/tftpd.c
 tftpd/tftpd.c.orig-len 2012-12-11 16:31:29.658043427 +0100
-+++ tftpd/tftpd.c  2012-12-11 16:32:22.234018253 +0100
-@@ -1287,24 +1287,24 @@ static int rewrite_macros(char macro, ch
+---
+ tftpd/tftpd.c |   26 +-
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+Index: tftp-hpa-5.2/tftpd/tftpd.c
+===
+--- tftp-hpa-5.2.orig/tftpd/tftpd.c
 tftp-hpa-5.2/tftpd/tftpd.c
+@@ -1377,24 +1377,24 @@ static int rewrite_macros(char macro, ch
  return strlen(p);
  
  case 'x':

++ tftp-hpa-0.48-macros-v6mapped.patch ++
--- /var/tmp/diff_new_pack.BGywN7/_old  2020-10-26 16:12:34.478730663 +0100
+++ /var/tmp/diff_new_pack.BGywN7/_new  2020-10-26 16:12:34.482730667 +0100
@@ -1,7 +1,12 @@
-diff -up tftpd/tftpd.c.orig-v6map tftpd/tftpd.c
 tftpd/tftpd.c.orig-v6map   2012-12-11 17:06:53.156624476 +0100
-+++ tftpd/tftpd.c  2012-12-11 17:13:08.705298341 +0100
-@@ -1263,6 +1263,21 @@ static void do_opt(const char *opt, cons
+---
+ tftpd/tftpd.c |   33 +
+ 1 file changed, 29 insertions(+), 4 deletions(-)
+
+Index:

commit tftp for openSUSE:Factory

2020-10-03 Thread root 
Hello community,

here is the log from the commit of package tftp for openSUSE:Factory checked in 
at 2020-10-03 18:55:07

Comparing /work/SRC/openSUSE:Factory/tftp (Old)
 and  /work/SRC/openSUSE:Factory/.tftp.new.4249 (New)


Package is "tftp"

Sat Oct  3 18:55:07 2020 rev:41 rq:838787 version:5.2

Changes:

--- /work/SRC/openSUSE:Factory/tftp/tftp.changes2020-01-12 
23:15:50.058626402 +0100
+++ /work/SRC/openSUSE:Factory/.tftp.new.4249/tftp.changes  2020-10-03 
18:55:22.769474114 +0200
@@ -1,0 +2,9 @@
+Tue Sep  1 15:15:15 UTC 2020 - o...@aepfle.de
+
+- Remove bogus comment about directory assumptions
+  in.tftpd assumes nothing, exactly one directory must be specified
+  when option -s is used
+- Reorder command line options
+  Optional admin options come before the final directory option
+
+---



Other differences:
--
++ tftp.service ++
--- /var/tmp/diff_new_pack.iLAAlL/_old  2020-10-03 18:55:23.397474809 +0200
+++ /var/tmp/diff_new_pack.iLAAlL/_new  2020-10-03 18:55:23.397474809 +0200
@@ -6,6 +6,6 @@
 
 [Service]
 EnvironmentFile=/etc/sysconfig/tftp
-ExecStart=/usr/sbin/in.tftpd -u $TFTP_USER -s $TFTP_DIRECTORY $TFTP_OPTIONS
+ExecStart=/usr/sbin/in.tftpd -u $TFTP_USER -s $TFTP_OPTIONS $TFTP_DIRECTORY
 StandardInput=socket
 PrivateDevices=yes

++ tftp.sysconfig ++
--- /var/tmp/diff_new_pack.iLAAlL/_old  2020-10-03 18:55:23.425474840 +0200
+++ /var/tmp/diff_new_pack.iLAAlL/_new  2020-10-03 18:55:23.425474840 +0200
@@ -21,6 +21,5 @@
 ## "/tftpboot" is not allowed anymore in FHS 2.2.
 #
 #  TFTP directory must be a world readable/writable directory.
-#  By default /srv/tftpboot is assumed.
 #
 TFTP_DIRECTORY="/srv/tftpboot"

commit tftp for openSUSE:Factory

2020-01-12 Thread root 
Hello community,

here is the log from the commit of package tftp for openSUSE:Factory checked in 
at 2020-01-12 23:15:44

Comparing /work/SRC/openSUSE:Factory/tftp (Old)
 and  /work/SRC/openSUSE:Factory/.tftp.new.6675 (New)


Package is "tftp"

Sun Jan 12 23:15:44 2020 rev:40 rq:761757 version:5.2

Changes:

--- /work/SRC/openSUSE:Factory/tftp/tftp.changes2019-10-18 
14:30:23.032715921 +0200
+++ /work/SRC/openSUSE:Factory/.tftp.new.6675/tftp.changes  2020-01-12 
23:15:50.058626402 +0100
@@ -1,0 +2,5 @@
+Wed Jan  8 08:36:25 UTC 2020 - Tomáš Chvátal 
+
+- Pass fcommon to cflags wrt bsc#1160297
+
+---



Other differences:
--
++ tftp.spec ++
--- /var/tmp/diff_new_pack.cGLdgg/_old  2020-01-12 23:15:50.686626635 +0100
+++ /var/tmp/diff_new_pack.cGLdgg/_new  2020-01-12 23:15:50.694626637 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package tftp
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,16 +18,15 @@
 
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
-  %define _fillupdir /var/adm/fillup-templates
+  %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
-
 Name:   tftp
 Version:5.2
 Release:0
 Summary:Trivial File Transfer Protocol (TFTP)
 License:BSD-3-Clause
 Group:  Productivity/Networking/Ftp/Clients
-Url:http://www.kernel.org/pub/software/network/tftp/
+URL:https://www.kernel.org/pub/software/network/tftp/
 Source: 
http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{version}.tar.bz2
 Source3:tftp.service
 Source4:tftp.socket
@@ -41,18 +40,17 @@
 Patch8: tftp-hpa-0.48-macros-v6mapped.patch
 Patch43:tftp-config_h.patch
 BuildRequires:  autoconf
+BuildRequires:  binutils-devel
 BuildRequires:  pkgconfig
 BuildRequires:  shadow
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  tcpd-devel
 Requires:   netcfg
-Requires(pre):  pwdutils
+Requires(pre):  shadow
 Recommends: inet-daemon
 Conflicts:  atftp
 Provides:   tftp(client)
 Provides:   tftp(server)
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  binutils-devel
 
 %description
 The Trivial File Transfer Protocol (TFTP) is normally used only for
@@ -72,6 +70,7 @@
 
 %build
 autoreconf -fi
+export CFLAGS="%{optflags} -fcommon"
 %configure \
   --enable-largefile \
   --with-tcpwrappers \
@@ -111,14 +110,13 @@
 %service_del_postun %{name}.service %{name}.socket
 
 %files
-%defattr(-,root,root)
 %doc README README.security tftpd/sample.rules
 %{_bindir}/tftp
 %{_sbindir}/in.tftpd
 %{_sbindir}/rctftp
-%{_mandir}/man1/tftp.1%{ext_man}
-%{_mandir}/man8/in.tftpd.8%{ext_man}
-%{_mandir}/man8/tftpd.8%{ext_man}
+%{_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

commit tftp for openSUSE:Factory

2019-10-18 Thread root 
Hello community,

here is the log from the commit of package tftp for openSUSE:Factory checked in 
at 2019-10-18 14:30:20

Comparing /work/SRC/openSUSE:Factory/tftp (Old)
 and  /work/SRC/openSUSE:Factory/.tftp.new.2352 (New)


Package is "tftp"

Fri Oct 18 14:30:20 2019 rev:39 rq:738539 version:5.2

Changes:

--- /work/SRC/openSUSE:Factory/tftp/tftp.changes2019-07-16 
08:37:27.415184394 +0200
+++ /work/SRC/openSUSE:Factory/.tftp.new.2352/tftp.changes  2019-10-18 
14:30:23.032715921 +0200
@@ -1,0 +2,5 @@
+Mon Oct 14 16:52:20 UTC 2019 - Pedro Monreal Gonzalez 

+
+- Add tftp.socket requirement to the service unit section [bsc#1153625]
+
+---



Other differences:
--
++ tftp.spec ++
--- /var/tmp/diff_new_pack.SYH8O8/_old  2019-10-18 14:30:23.936713567 +0200
+++ /var/tmp/diff_new_pack.SYH8O8/_new  2019-10-18 14:30:23.940713556 +0200
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 

++ tftp.service ++
--- /var/tmp/diff_new_pack.SYH8O8/_old  2019-10-18 14:30:24.016713359 +0200
+++ /var/tmp/diff_new_pack.SYH8O8/_new  2019-10-18 14:30:24.020713348 +0200
@@ -2,6 +2,7 @@
 Description=Tftp Server
 Wants=network.target
 After=network.target
+Requires=tftp.socket
 
 [Service]
 EnvironmentFile=/etc/sysconfig/tftp

commit tftp for openSUSE:Factory

2019-07-16 Thread root 
Hello community,

here is the log from the commit of package tftp for openSUSE:Factory checked in 
at 2019-07-16 08:37:25

Comparing /work/SRC/openSUSE:Factory/tftp (Old)
 and  /work/SRC/openSUSE:Factory/.tftp.new.1887 (New)


Package is "tftp"

Tue Jul 16 08:37:25 2019 rev:38 rq:714582 version:5.2

Changes:

--- /work/SRC/openSUSE:Factory/tftp/tftp.changes2019-05-03 
22:35:57.725403788 +0200
+++ /work/SRC/openSUSE:Factory/.tftp.new.1887/tftp.changes  2019-07-16 
08:37:27.415184394 +0200
@@ -1,0 +2,6 @@
+Thu Jul 11 05:55:20 UTC 2019 - antoine.belv...@opensuse.org
+
+- Remove SuSEfirewall2 service, since SuSEfirewall2 has been
+  replaced by firewalld (which already provides a tftp service).
+
+---

Old:

  tftp.fw



Other differences:
--
++ tftp.spec ++
--- /var/tmp/diff_new_pack.NUSWqm/_old  2019-07-16 08:37:28.059178170 +0200
+++ /var/tmp/diff_new_pack.NUSWqm/_new  2019-07-16 08:37:28.063178132 +0200
@@ -21,7 +21,6 @@
   %define _fillupdir /var/adm/fillup-templates
 %endif
 
-%define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
 Name:   tftp
 Version:5.2
 Release:0
@@ -30,7 +29,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
-Source2:tftp.fw
 Source3:tftp.service
 Source4:tftp.socket
 Source5:tftp.sysconfig
@@ -83,8 +81,6 @@
 
 %install
 %make_install INSTALLROOT=%{buildroot} MANDIR="%{_mandir}"
-mkdir -p %{buildroot}/%{_fwdefdir}
-install -m 644 %{SOURCE2} %{buildroot}/%{_fwdefdir}/tftp
 install -d -m 0755 %{buildroot}/srv/tftpboot
 
 # Install systemd unit / socket (As an alternativ to xinetd activation)
@@ -126,7 +122,6 @@
 %{_unitdir}/tftp.service
 %{_unitdir}/tftp.socket
 
-%config %{_fwdefdir}/tftp
 %dir %attr(0755,tftp,tftp) /srv/tftpboot
 %{_fillupdir}/sysconfig.tftp

commit tftp for openSUSE:Factory

2019-05-03 Thread root 
Hello community,

here is the log from the commit of package tftp for openSUSE:Factory checked in 
at 2019-05-03 22:35:56

Comparing /work/SRC/openSUSE:Factory/tftp (Old)
 and  /work/SRC/openSUSE:Factory/.tftp.new.5148 (New)


Package is "tftp"

Fri May  3 22:35:56 2019 rev:37 rq:698145 version:5.2

Changes:

--- /work/SRC/openSUSE:Factory/tftp/tftp.changes2018-07-13 
10:20:56.734426336 +0200
+++ /work/SRC/openSUSE:Factory/.tftp.new.5148/tftp.changes  2019-05-03 
22:35:57.725403788 +0200
@@ -1,0 +2,5 @@
+Fri Apr 26 10:39:23 UTC 2019 - mvet...@suse.com
+
+- bsc#1130588: Require shadow instead of old pwdutils
+
+---



Other differences:
--
++ tftp.spec ++
--- /var/tmp/diff_new_pack.ixAqJp/_old  2019-05-03 22:35:58.205404946 +0200
+++ /var/tmp/diff_new_pack.ixAqJp/_new  2019-05-03 22:35:58.209404957 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package tftp
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -44,7 +44,7 @@
 Patch43:tftp-config_h.patch
 BuildRequires:  autoconf
 BuildRequires:  pkgconfig
-BuildRequires:  pwdutils
+BuildRequires:  shadow
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  tcpd-devel
 Requires:   netcfg

commit tftp for openSUSE:Factory

2018-07-13 Thread root 
Hello community,

here is the log from the commit of package tftp for openSUSE:Factory checked in 
at 2018-07-13 10:19:42

Comparing /work/SRC/openSUSE:Factory/tftp (Old)
 and  /work/SRC/openSUSE:Factory/.tftp.new (New)


Package is "tftp"

Fri Jul 13 10:19:42 2018 rev:36 rq:621875 version:5.2

Changes:

--- /work/SRC/openSUSE:Factory/tftp/tftp.changes2017-11-29 
10:49:32.123451516 +0100
+++ /work/SRC/openSUSE:Factory/.tftp.new/tftp.changes   2018-07-13 
10:20:56.734426336 +0200
@@ -1,0 +2,6 @@
+Tue Jul 10 11:51:31 CEST 2018 - ku...@suse.de
+
+- Don't require systemd explicit, spec file can handle both cases
+  correct and in containers we don't have systemd.
+
+---



Other differences:
--
++ tftp.spec ++
--- /var/tmp/diff_new_pack.YLjW4X/_old  2018-07-13 10:20:57.346427068 +0200
+++ /var/tmp/diff_new_pack.YLjW4X/_new  2018-07-13 10:20:57.350427073 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package tftp
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -54,7 +54,6 @@
 Provides:   tftp(client)
 Provides:   tftp(server)
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-%{?systemd_requires}
 BuildRequires:  binutils-devel
 
 %description

commit tftp for openSUSE:Factory

2017-11-29 Thread root 
Hello community,

here is the log from the commit of package tftp for openSUSE:Factory checked in 
at 2017-11-29 10:49:28

Comparing /work/SRC/openSUSE:Factory/tftp (Old)
 and  /work/SRC/openSUSE:Factory/.tftp.new (New)


Package is "tftp"

Wed Nov 29 10:49:28 2017 rev:35 rq:545047 version:5.2

Changes:

--- /work/SRC/openSUSE:Factory/tftp/tftp.changes2017-10-05 
11:53:01.609212304 +0200
+++ /work/SRC/openSUSE:Factory/.tftp.new/tftp.changes   2017-11-29 
10:49:32.123451516 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 13:39:09 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
+---



Other differences:
--
++ tftp.spec ++
--- /var/tmp/diff_new_pack.ApqXL9/_old  2017-11-29 10:49:33.615397391 +0100
+++ /var/tmp/diff_new_pack.ApqXL9/_new  2017-11-29 10:49:33.619397245 +0100
@@ -16,6 +16,11 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 %define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
 Name:   tftp
 Version:5.2
@@ -86,7 +91,7 @@
 # Install systemd unit / socket (As an alternativ to xinetd activation)
 install -d %{buildroot}%{_unitdir}
 install -m 0644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_unitdir}
-install -D -m 0644 %{SOURCE5} 
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.tftp
+install -D -m 0644 %{SOURCE5} %{buildroot}%{_fillupdir}/sysconfig.tftp
 ln -sv %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 
 %pre
@@ -124,6 +129,6 @@
 
 %config %{_fwdefdir}/tftp
 %dir %attr(0755,tftp,tftp) /srv/tftpboot
-%{_localstatedir}/adm/fillup-templates/sysconfig.tftp
+%{_fillupdir}/sysconfig.tftp
 
 %changelog

commit tftp for openSUSE:Factory

2017-10-05 Thread root 
Hello community,

here is the log from the commit of package tftp for openSUSE:Factory checked in 
at 2017-10-05 11:52:53

Comparing /work/SRC/openSUSE:Factory/tftp (Old)
 and  /work/SRC/openSUSE:Factory/.tftp.new (New)


Package is "tftp"

Thu Oct  5 11:52:53 2017 rev:34 rq:522872 version:5.2

Changes:

--- /work/SRC/openSUSE:Factory/tftp/tftp.changes2017-06-23 
09:16:44.488197854 +0200
+++ /work/SRC/openSUSE:Factory/.tftp.new/tftp.changes   2017-10-05 
11:53:01.609212304 +0200
@@ -1,0 +2,5 @@
+Fri Sep  8 13:26:47 UTC 2017 - pmonrealgonza...@suse.com
+
+- Changed permissions of /srv/tftpboot to be readable [bsc#940608]
+
+---



Other differences:
--
++ tftp.spec ++
--- /var/tmp/diff_new_pack.xwXd3U/_old  2017-10-05 11:53:05.772626485 +0200
+++ /var/tmp/diff_new_pack.xwXd3U/_new  2017-10-05 11:53:05.772626485 +0200
@@ -81,7 +81,7 @@
 %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 -d -m 0755 %{buildroot}/srv/tftpboot
 
 # Install systemd unit / socket (As an alternativ to xinetd activation)
 install -d %{buildroot}%{_unitdir}
@@ -123,7 +123,7 @@
 %{_unitdir}/tftp.socket
 
 %config %{_fwdefdir}/tftp
-%dir %attr(0750,tftp,tftp) /srv/tftpboot
+%dir %attr(0755,tftp,tftp) /srv/tftpboot
 %{_localstatedir}/adm/fillup-templates/sysconfig.tftp
 
 %changelog

commit tftp for openSUSE:Factory

2017-06-23 Thread root 
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.changes2015-11-06 
00:10:18.0 +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 - jh...@suse.com
+
+- 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)

commit tftp for openSUSE:Factory

2015-11-05 Thread h_root 
Hello community,

here is the log from the commit of package tftp for openSUSE:Factory checked in 
at 2015-11-06 00:10:17

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.changes2015-09-24 
07:17:50.0 +0200
+++ /work/SRC/openSUSE:Factory/.tftp.new/tftp.changes   2015-11-06 
00:10:18.0 +0100
@@ -1,0 +2,7 @@
+Mon Nov  2 12:36:26 UTC 2015 - vci...@suse.com
+
+- add a sysconfig file to allow passing parameters to the service
+  (requested in bsc#951591)
+  * added tftp.sysconfig
+
+---

New:

  tftp.sysconfig



Other differences:
--
++ tftp.spec ++
--- /var/tmp/diff_new_pack.96azK9/_old  2015-11-06 00:10:19.0 +0100
+++ /var/tmp/diff_new_pack.96azK9/_new  2015-11-06 00:10:19.0 +0100
@@ -30,6 +30,7 @@
 Source2:tftp.fw
 Source3:tftp.service
 Source4:tftp.socket
+Source5:tftp.sysconfig
 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
@@ -91,6 +92,7 @@
 # Install systemd unit / socket (As an alternativ to xinetd activation)
 install -d %{buildroot}%{_unitdir}
 install -m 0644 %{S:3} %{S:4} %{buildroot}%{_unitdir}
+install -D -m 0644 %{SOURCE5} 
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.tftp
 
 %pre
 # This group/user is shared with atftp, so please
@@ -105,6 +107,7 @@
 
 %post
 %service_add_post %{name}.service %{name}.socket
+%{fillup_only -n tftp}
 
 %preun
 %service_del_preun %{name}.service %{name}.socket
@@ -128,5 +131,6 @@
 %config(noreplace) %{_sysconfdir}/xinetd.d/tftp
 %config %{_fwdefdir}/tftp
 %dir %attr(0750,tftp,tftp) /srv/tftpboot
+%{_localstatedir}/adm/fillup-templates/sysconfig.tftp
 
 %changelog

++ tftp.service ++
--- /var/tmp/diff_new_pack.96azK9/_old  2015-11-06 00:10:19.0 +0100
+++ /var/tmp/diff_new_pack.96azK9/_new  2015-11-06 00:10:19.0 +0100
@@ -4,6 +4,7 @@
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/in.tftpd -u tftp -s /srv/tftpboot
+EnvironmentFile=/etc/sysconfig/tftp
+ExecStart=/usr/sbin/in.tftpd -u $TFTP_USER -s $TFTP_DIRECTORY $TFTP_OPTIONS
 StandardInput=socket
 PrivateDevices=yes

++ tftp.sysconfig ++
## Description: TFTP Configuration
## Type:string
## Default: "tftp"
#
#  daemon user (tftp)
#
TFTP_USER="tftp"

## Type:string
## Default: ""
##
## INFO:
#
# tftp options
#
TFTP_OPTIONS=""

## Type:string
## Default: "/srv/tftpboot"
## was "/tftpboot" but
## "/tftpboot" is not allowed anymore in FHS 2.2.
#
#  TFTP directory must be a world readable/writable directory.
#  By default /srv/tftpboot is assumed.
#
TFTP_DIRECTORY="/srv/tftpboot"

commit tftp for openSUSE:Factory

2015-09-23 Thread h_root 
Hello community,

here is the log from the commit of package tftp for openSUSE:Factory checked in 
at 2015-09-24 07:17:49

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.changes2014-03-31 
20:43:04.0 +0200
+++ /work/SRC/openSUSE:Factory/.tftp.new/tftp.changes   2015-09-24 
07:17:50.0 +0200
@@ -1,0 +2,17 @@
+Fri Sep 18 13:23:21 UTC 2015 - vci...@suse.com
+
+- respond from the destination address taken from the first udp
+  message's ancillary data (bnc#928283)
+  * added tftp-multi-addresses.patch
+
+---
+Fri Sep 18 13:22:12 UTC 2015 - vci...@suse.com
+
+- tftp-hpa-0.48-macros-crash.patch:
+  prevent buffer overflow in handling of \x macro (bnc#793883)
+- tftp-hpa-0.48-macros-v6mapped.patch:
+  for \i and \x, expand v6-mapped addresses as native IPv4
+  (bnc#793883)
+- patches come from Michal Kubecek
+
+---

New:

  tftp-hpa-0.48-macros-crash.patch
  tftp-hpa-0.48-macros-v6mapped.patch
  tftp-multi-addresses.patch



Other differences:
--
++ tftp.spec ++
--- /var/tmp/diff_new_pack.NDnMhh/_old  2015-09-24 07:17:51.0 +0200
+++ /var/tmp/diff_new_pack.NDnMhh/_new  2015-09-24 07:17:51.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package tftp
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -35,6 +35,9 @@
 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
@@ -62,6 +65,9 @@
 %patch1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7
+%patch8
 %if 0%{?suse_version} < 1030
 %patch42
 %endif

++ tftp-hpa-0.48-macros-crash.patch ++
diff -up tftpd/tftpd.c.orig-len tftpd/tftpd.c
--- tftpd/tftpd.c.orig-len  2012-12-11 16:31:29.658043427 +0100
+++ tftpd/tftpd.c   2012-12-11 16:32:22.234018253 +0100
@@ -1287,24 +1287,24 @@ static int rewrite_macros(char macro, ch
 return strlen(p);
 
 case 'x':
-if (output) {
-if (from.sa.sa_family == AF_INET) {
+if (from.sa.sa_family == AF_INET) {
+if (output)
 sprintf(output, "%08lX",
 (unsigned long)ntohl(from.si.sin_addr.s_addr));
-l = 8;
+l = 8;
 #ifdef HAVE_IPV6
-} else {
-unsigned char *c = (unsigned char *)SOCKADDR_P();
-p = tb;
-for (l = 0; l < 16; l++) {
-sprintf(p, "%02X", *c);
-c++;
-p += 2;
-}
+} else {
+unsigned char *c = (unsigned char *)SOCKADDR_P();
+p = tb;
+for (l = 0; l < 16; l++) {
+sprintf(p, "%02X", *c);
+c++;
+p += 2;
+}
+if (output)
 strcpy(output, tb);
-l = strlen(tb);
+l = strlen(tb);
 #endif
-}
 }
 return l;
 
++ tftp-hpa-0.48-macros-v6mapped.patch ++
diff -up tftpd/tftpd.c.orig-v6map tftpd/tftpd.c
--- tftpd/tftpd.c.orig-v6map2012-12-11 17:06:53.156624476 +0100
+++ tftpd/tftpd.c   2012-12-11 17:13:08.705298341 +0100
@@ -1263,6 +1263,21 @@ static void do_opt(const char *opt, cons
 
 #ifdef WITH_REGEX
 
+#ifdef HAVE_IPV6
+static inline int is_v6_mapped(const union sock_addr* pa)
+{
+const char v6_mapped[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0xFF, 0xFF };
+
+if (from.sa.sa_family != AF_INET6)
+return 0;
+if (memcmp(>s6.sin6_addr.s6_addr, v6_mapped, sizeof(v6_mapped)))
+return 0;
+
+return 1;
+}
+#endif
+
 /*
  * This is called by the remap engine when it encounters macros such
  * as \i.  It should write the output in "output" if non-NULL, and
@@ -1274,10 +1289,20 @@ static int rewrite_macros(char macro, ch
 {
 char *p, tb[INET6_ADDRSTRLEN];
 int l=0;
+const union sock_addr *pfrom = 
+
+#ifdef HAVE_IPV6
+union sock_addr ipv4_from;
+if (is_v6_mapped()) {
+ipv4_from.si.sin_family = AF_INET;
+

commit tftp for openSUSE:Factory

2014-03-31 Thread h_root 
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.changes2013-04-23 
11:40:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.tftp.new/tftp.changes   2014-03-31 
20:43:04.0 +0200
@@ -1,0 +2,11 @@
+Tue Mar 25 23:35:16 UTC 2014 - crrodrig...@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.0 +0200
+++ /var/tmp/diff_new_pack.5qUMsE/_new  2014-03-31 20:43:05.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.5qUMsE/_new  2014-03-31 20:43:05.0 +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
-

commit tftp for openSUSE:Factory

2013-04-23 Thread h_root 
Hello community,

here is the log from the commit of package tftp for openSUSE:Factory checked in 
at 2013-04-23 11:40:37

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.changes2013-02-14 
21:15:45.0 +0100
+++ /work/SRC/openSUSE:Factory/.tftp.new/tftp.changes   2013-04-23 
11:40:40.0 +0200
@@ -1,0 +2,6 @@
+Thu Apr 18 09:57:36 UTC 2013 - vci...@suse.com
+
+- change ownership of /srv/tftpboot to tftp:tftp, otherwise tftp
+  daemon can't write there (bnc#813226)
+
+---



Other differences:
--
++ tftp.spec ++
--- /var/tmp/diff_new_pack.Fb6Fue/_old  2013-04-23 11:40:42.0 +0200
+++ /var/tmp/diff_new_pack.Fb6Fue/_new  2013-04-23 11:40:42.0 +0200
@@ -117,6 +117,6 @@
 %{_unitdir}/tftp.socket
 %config(noreplace) %{_sysconfdir}/xinetd.d/tftp
 %config %{_fwdefdir}/tftp
-%dir %attr(0750,root,tftp) /srv/tftpboot
+%dir %attr(0750,tftp,tftp) /srv/tftpboot
 
 %changelog

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit tftp for openSUSE:Factory

2013-02-14 Thread h_root 
Hello community,

here is the log from the commit of package tftp for openSUSE:Factory checked in 
at 2013-02-14 21:15:44

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.changes2012-12-08 
15:53:47.0 +0100
+++ /work/SRC/openSUSE:Factory/.tftp.new/tftp.changes   2013-02-14 
21:15:45.0 +0100
@@ -1,0 +2,6 @@
+Thu Feb  7 13:07:03 UTC 2013 - vci...@suse.com
+
+- create capabilites provided by both tftp and atftp
+  (bnc#801481 or bnc#725378)
+
+---



Other differences:
--
++ tftp.spec ++
--- /var/tmp/diff_new_pack.Hl765r/_old  2013-02-14 21:15:46.0 +0100
+++ /var/tmp/diff_new_pack.Hl765r/_new  2013-02-14 21:15:46.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package tftp
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -41,6 +41,8 @@
 Patch4: tftp-hpa-0.49-fortify-strcpy-crash.patch
 Patch5: tftp-hpa-0.48-tzfix.patch
 Patch42:tftp-hpa-0.43_old-autoconf.diff
+Provides:   tftp(client)
+Provides:   tftp(server)
 PreReq: pwdutils
 BuildRequires:  autoconf
 BuildRequires:  pwdutils

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit tftp for openSUSE:Factory

2012-12-08 Thread h_root 
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.changes2012-09-06 
09:06:51.0 +0200
+++ /work/SRC/openSUSE:Factory/.tftp.new/tftp.changes   2012-12-08 
15:53:47.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.hVe3uv/_new  2012-12-08 15:53:48.0 +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

commit tftp for openSUSE:Factory

2012-09-06 Thread h_root 
Hello community,

here is the log from the commit of package tftp for openSUSE:Factory checked in 
at 2012-09-06 09:06:44

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.changes2011-12-26 
16:29:42.0 +0100
+++ /work/SRC/openSUSE:Factory/.tftp.new/tftp.changes   2012-09-06 
09:06:51.0 +0200
@@ -1,0 +2,7 @@
+Tue Sep  4 13:09:09 UTC 2012 - vci...@suse.com
+
+- update to 5.2
+  - fixes a breakage with recent Linux kernel versions when a
+single interface has multiple IP addresses (bnc#774861)
+
+---

Old:

  tftp-hpa-5.1.tar.bz2

New:

  tftp-hpa-5.2.tar.bz2



Other differences:
--
++ tftp.spec ++
--- /var/tmp/diff_new_pack.6TPHtQ/_old  2012-09-06 09:06:52.0 +0200
+++ /var/tmp/diff_new_pack.6TPHtQ/_new  2012-09-06 09:06:52.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package tftp
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -15,10 +15,11 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
 
 Name:   tftp
-Version:5.1
+Version:5.2
 Release:0
 Summary:Trivial File Transfer Protocol (TFTP)
 License:BSD-3-Clause

++ tftp-hpa-5.1.tar.bz2 - tftp-hpa-5.2.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/tftp-hpa-5.1/CHANGES new/tftp-hpa-5.2/CHANGES
--- old/tftp-hpa-5.1/CHANGES2011-06-23 01:32:56.0 +0200
+++ new/tftp-hpa-5.2/CHANGES2011-12-11 23:13:52.0 +0100
@@ -1,3 +1,8 @@
+Changes in 5.2:
+   Fix breakage on newer Linux when a single interface has
+   multiple IP addresses.
+
+
 Changes in 5.1:
Add -P option to write a PID file.  Patch by Ferenc Wagner.
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/tftp-hpa-5.1/tftp.spec new/tftp-hpa-5.2/tftp.spec
--- old/tftp-hpa-5.1/tftp.spec  2011-06-23 01:33:28.0 +0200
+++ new/tftp-hpa-5.2/tftp.spec  2011-12-11 23:13:53.0 +0100
@@ -1,6 +1,6 @@
 Summary: The client for the Trivial File Transfer Protocol (TFTP).
 Name: tftp
-Version: 5.1
+Version: 5.2
 Release: 1
 License: BSD
 Group: Applications/Internet
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/tftp-hpa-5.1/tftpd/recvfrom.c 
new/tftp-hpa-5.2/tftpd/recvfrom.c
--- old/tftp-hpa-5.1/tftpd/recvfrom.c   2011-06-23 01:32:56.0 +0200
+++ new/tftp-hpa-5.2/tftpd/recvfrom.c   2011-12-11 23:13:52.0 +0100
@@ -51,52 +51,59 @@
 #endif
 
 /*
- * Check to see if this is a valid local address.  If so, we should
- * end up having the same local and remote address when trying to
- * bind to it.
+ * Check to see if this is a valid local address, meaning that we can
+ * legally bind to it.
  */
 static int address_is_local(const union sock_addr *addr)
 {
-union sock_addr sa;
+union sock_addr sa1, sa2;
 int sockfd = -1;
 int e;
 int rv = 0;
 socklen_t addrlen;
 
+memcpy(sa1, addr, sizeof sa1);
+
 /* Multicast or universal broadcast address? */
-if (addr-sa.sa_family == AF_INET) {
-if (ntohl(addr-si.sin_addr.s_addr) = (224UL  24))
+if (sa1.sa.sa_family == AF_INET) {
+if (ntohl(sa1.si.sin_addr.s_addr) = (224UL  24))
 return 0;
+   sa1.si.sin_port = 0;/* Any port */
 }
 #ifdef HAVE_IPV6
-else if (addr-sa.sa_family == AF_INET6) {
-if (IN6_IS_ADDR_MULTICAST(addr-s6.sin6_addr))
+else if (sa1.sa.sa_family == AF_INET6) {
+if (IN6_IS_ADDR_MULTICAST(sa1.s6.sin6_addr))
 return 0;
+   sa1.s6.sin6_port = 0;   /* Any port */
 }
 #endif
 else
 return 0;
 
-sockfd = socket(addr-sa.sa_family, SOCK_DGRAM, 0);
+sockfd = socket(sa1.sa.sa_family, SOCK_DGRAM, 0);
 if (sockfd  0)
 goto err;
 
-if (connect(sockfd, addr-sa, SOCKLEN(addr)))
+if (bind(sockfd, sa1.sa, SOCKLEN(sa1)))
 goto err;
 
 addrlen = SOCKLEN(addr);
-if (getsockname(sockfd, (struct sockaddr *)sa, addrlen))
+if (getsockname(sockfd, (struct sockaddr *)sa2, addrlen))
 goto err;
 
-if (addr-sa.sa_family == AF_INET)
-rv = sa.si.sin_addr.s_addr == addr-si.sin_addr.s_addr;
+if

commit tftp for openSUSE:Factory

2011-12-26 Thread h_root 
Hello community,

here is the log from the commit of package tftp for openSUSE:Factory checked in 
at 2011-12-26 16:29:40

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.changes2011-09-23 
12:48:08.0 +0200
+++ /work/SRC/openSUSE:Factory/.tftp.new/tftp.changes   2011-12-26 
16:29:42.0 +0100
@@ -1,0 +2,11 @@
+Tue Dec 20 20:30:25 UTC 2011 - co...@suse.com
+
+- add autoconf as buildrequire to avoid implicit dependency
+
+---
+Fri Nov 11 14:51:55 UTC 2011 - vci...@suse.com
+
+- added rules for SuSEfirewall2 (bnc#729793)
+  thanks to Lukas Ocilka
+
+---
@@ -256,3 +267,3 @@
-  � Further improvement of error messages
-  � Configuration fix: readline needs termcap
-  � Support running the tftp client from the command line
+  * Further improvement of error messages
+  * Configuration fix: readline needs termcap
+  * Support running the tftp client from the command line

New:

  tftp.fw



Other differences:
--
++ tftp.spec ++
--- /var/tmp/diff_new_pack.fiBwt8/_old  2011-12-26 16:29:43.0 +0100
+++ /var/tmp/diff_new_pack.fiBwt8/_new  2011-12-26 16:29:43.0 +0100
@@ -15,23 +15,25 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
+%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
 
 Name:   tftp
 Version:5.1
-Release:3
-License:BSD3c
+Release:0
 Summary:Trivial File Transfer Protocol (TFTP)
-Url:http://www.kernel.org/pub/software/network/tftp/
+License:BSD-3-Clause
 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
 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
 Patch5: tftp-hpa-0.48-tzfix.patch
 Patch42:tftp-hpa-0.43_old-autoconf.diff
 PreReq: pwdutils
+BuildRequires:  autoconf
 BuildRequires:  pwdutils
 BuildRequires:  tcpd-devel
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -70,6 +72,8 @@
 %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
 install -d -m 0750 %{buildroot}/srv/tftpboot
 
 %pre
@@ -93,6 +97,7 @@
 %{_mandir}/man8/in.tftpd.8.gz
 %{_mandir}/man8/tftpd.8.gz
 %config(noreplace) %{_sysconfdir}/xinetd.d/tftp
+%config %{_fwdefdir}/tftp
 %dir %attr(0750,root,tftp) /srv/tftpboot
 
 %changelog

++ tftp.fw ++
## Name: TFTP Server
## Description: Opens ports for tftp service.

# space separated list of allowed UDP ports
UDP=tftp
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit tftp for openSUSE:Factory

2011-09-09 Thread h_root 

Hello community,

here is the log from the commit of package tftp for openSUSE:Factory
checked in at Fri Sep 9 11:55:24 CEST 2011.




--- tftp/tftp.changes   2011-06-24 09:14:08.0 +0200
+++ /mounts/work_src_done/STABLE/tftp/tftp.changes  2011-09-06 
15:02:55.0 +0200
@@ -1,0 +2,5 @@
+Tue Sep  6 13:01:31 UTC 2011 - vci...@suse.com
+
+- added missing PreReq: pwdutils
+
+---

calling whatdependson for head-i586




Other differences:
--
++ tftp.spec ++
--- /var/tmp/diff_new_pack.Yn9Pi0/_old  2011-09-09 11:55:18.0 +0200
+++ /var/tmp/diff_new_pack.Yn9Pi0/_new  2011-09-09 11:55:18.0 +0200
@@ -19,7 +19,7 @@
 
 Name:   tftp
 Version:5.1
-Release:1
+Release:3
 License:BSD3c
 Summary:Trivial File Transfer Protocol (TFTP)
 Url:http://www.kernel.org/pub/software/network/tftp/
@@ -31,6 +31,7 @@
 Patch4: tftp-hpa-0.49-fortify-strcpy-crash.patch
 Patch5: tftp-hpa-0.48-tzfix.patch
 Patch42:tftp-hpa-0.43_old-autoconf.diff
+PreReq: pwdutils
 BuildRequires:  pwdutils
 BuildRequires:  tcpd-devel
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -75,10 +76,10 @@
 # This group/user is shared with atftp, so please
 # keep this in sync with atftp.spec
 # add group
-%{_sbindir}/groupadd -r %{name} 2/dev/null || :
+%{_sbindir}/groupadd -r tftp 2/dev/null || :
 # add user
-%{_sbindir}/useradd -c TFTP account -d /srv/tftpboot -G %{name} -g %{name} \
-  -r -s /bin/false %{name} 2/dev/null || :
+%{_sbindir}/useradd -c TFTP account -d /srv/tftpboot -G tftp -g tftp \
+  -r -s /bin/false tftp 2/dev/null || :
 
 %clean
 rm -rf %{buildroot};






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit tftp for openSUSE:Factory

2011-06-24 Thread h_root 

Hello community,

here is the log from the commit of package tftp for openSUSE:Factory
checked in at Fri Jun 24 09:56:51 CEST 2011.




--- tftp/tftp.changes   2010-12-11 01:00:45.0 +0100
+++ /mounts/work_src_done/STABLE/tftp/tftp.changes  2011-06-24 
09:14:08.0 +0200
@@ -1,0 +2,19 @@
+Fri Jun 24 07:09:50 UTC 2011 - pu...@novell.com
+
+- unbreak tftp by changing to user to run as in tftpd itself,
+  not via xinetd (bnc#682340)
+
+---
+Thu Jun 23 12:17:37 UTC 2011 - pu...@novell.com
+
+- update to version-5.1
+  - Add -P option to write a PID file.  Patch by Ferenc Wagner.
+  - Bounce the syslog socket in standalone mode, in case the
+syslog daemon has been restarted.  Patch by Ferenc Wagner.
+  - Build fixes.
+  - Fix handling of block number wraparound after a successful
+options negotiation.
+  - Fix a buffer overflow in option parsing.
+- fixes bnc#699714, CVE-2011-2199
+
+---

calling whatdependson for head-i586


Old:

  tftp-hpa-5.0.tar.bz2

New:

  tftp-hpa-5.1.tar.bz2



Other differences:
--
++ tftp.spec ++
--- /var/tmp/diff_new_pack.LhGDcW/_old  2011-06-24 09:54:44.0 +0200
+++ /var/tmp/diff_new_pack.LhGDcW/_new  2011-06-24 09:54:44.0 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package tftp (Version 5.0)
+# spec file for package tftp
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -18,13 +18,13 @@
 
 
 Name:   tftp
-Version:5.0
+Version:5.1
 Release:1
 License:BSD3c
 Summary:Trivial File Transfer Protocol (TFTP)
 Url:http://www.kernel.org/pub/software/network/tftp/
 Group:  Productivity/Networking/Ftp/Clients
-Source: tftp-hpa-%{version}.tar.bz2
+Source: 
http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{version}.tar.bz2
 Source1:tftp.xinetd
 Patch0: tftp-hpa-0.43_include_sys_params.patch
 Patch1: tftp-hpa-0.46_colon_check.patch
@@ -68,7 +68,7 @@
 
 %install
 %makeinstall INSTALLROOT=%{buildroot} MANDIR=%{_mandir}
-install -D -m 0644 %{S:1} %{buildroot}%{_sysconfdir}/xinetd.d/tftp
+install -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/xinetd.d/tftp
 install -d -m 0750 %{buildroot}/srv/tftpboot
 
 %pre

++ tftp-hpa-0.48-tzfix.patch ++
--- /var/tmp/diff_new_pack.LhGDcW/_old  2011-06-24 09:54:44.0 +0200
+++ /var/tmp/diff_new_pack.LhGDcW/_new  2011-06-24 09:54:44.0 +0200
@@ -1,9 +1,9 @@
-Index: tftp-hpa-git-0.48/tftpd/tftpd.c
+Index: tftp-hpa-5.1/tftpd/tftpd.c
 ===
 tftp-hpa-git-0.48.orig/tftpd/tftpd.c
-+++ tftp-hpa-git-0.48/tftpd/tftpd.c
-@@ -350,6 +350,14 @@ int main(int argc, char **argv)
- #endif
+--- tftp-hpa-5.1.orig/tftpd/tftpd.c
 tftp-hpa-5.1/tftpd/tftpd.c
+@@ -384,6 +384,14 @@ int main(int argc, char **argv)
+ const char *pidfile = NULL;
  u_short tp_opcode;
  
 +time_t my_time = 0;

++ tftp-hpa-5.0.tar.bz2 - tftp-hpa-5.1.tar.bz2 ++
 20789 lines of diff (skipped)
retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/tftp-hpa-5.0/CHANGES new/tftp-hpa-5.1/CHANGES
--- old/tftp-hpa-5.0/CHANGES2009-02-16 23:51:22.0 +0100
+++ new/tftp-hpa-5.1/CHANGES2011-06-23 01:32:56.0 +0200
@@ -1,3 +1,17 @@
+Changes in 5.1:
+   Add -P option to write a PID file.  Patch by Ferenc Wagner.
+
+   Bounce the syslog socket in standalone mode, in case the
+   syslog daemon has been restarted.  Patch by Ferenc Wagner.
+
+   Build fixes.
+
+   Fix handling of block number wraparound after a successful
+   options negotiation.
+
+   Fix a buffer overflow in option parsing.
+
+
 Changes in 5.0:
Try to on platforms with getaddrinfo() without AI_ADDRCONFIG or
AI_CANONNAME.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/tftp-hpa-5.0/MCONFIG.in new/tftp-hpa-5.1/MCONFIG.in
--- old/tftp-hpa-5.0/MCONFIG.in 2009-02-16 23:51:22.0 +0100
+++