[tftp/f15] update to latest upstream 5.2 fixes #739534 - TFTP to an IP alias of FC15 tftp server failed
Jiri Skala
jskala at fedoraproject.org
Wed Jan 4 09:57:51 UTC 2012
commit 200afe971d5a163a8af3cb0fcafd15940027fb56
Author: Jiri Skala <jskala at redhat.com>
Date: Wed Jan 4 10:57:46 2012 +0100
update to latest upstream 5.2
fixes #739534 - TFTP to an IP alias of FC15 tftp server failed
.gitignore | 1 +
sources | 2 +-
tftp-hpa-5.2-pktinfo.patch | 23 +++++++++++++++++++++++
tftp.spec | 10 ++++++++--
4 files changed, 33 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fcadda0..97b8b33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
tftp-hpa-0.49.tar.bz2
+/tftp-hpa-5.2.tar.bz2
diff --git a/sources b/sources
index d6e5fbf..ccce1be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-64b7db6525b189831a7df0565cdfab67 tftp-hpa-0.49.tar.bz2
+46c9bd20bbffa62f79c958c7b99aac21 tftp-hpa-5.2.tar.bz2
diff --git a/tftp-hpa-5.2-pktinfo.patch b/tftp-hpa-5.2-pktinfo.patch
new file mode 100644
index 0000000..d1fa75c
--- /dev/null
+++ b/tftp-hpa-5.2-pktinfo.patch
@@ -0,0 +1,23 @@
+diff -up tftp-hpa-5.2/tftpd/recvfrom.c.test tftp-hpa-5.2/tftpd/recvfrom.c
+--- tftp-hpa-5.2/tftpd/recvfrom.c.test 2011-12-11 23:13:52.000000000 +0100
++++ tftp-hpa-5.2/tftpd/recvfrom.c 2012-01-04 10:05:17.852042256 +0100
+@@ -149,16 +149,16 @@ myrecvfrom(int s, void *buf, int len, un
+
+ /* Try to enable getting the return address */
+ #ifdef IP_RECVDSTADDR
+- if (from->sa_family == AF_INET)
++ if (from->sa_family == AF_INET || !from->sa_family)
+ setsockopt(s, IPPROTO_IP, IP_RECVDSTADDR, &on, sizeof(on));
+ #endif
+ #ifdef IP_PKTINFO
+- if (from->sa_family == AF_INET)
++ if (from->sa_family == AF_INET || !from->sa_family)
+ setsockopt(s, IPPROTO_IP, IP_PKTINFO, &on, sizeof(on));
+ #endif
+ #ifdef HAVE_IPV6
+ #ifdef IPV6_RECVPKTINFO
+- if (from->sa_family == AF_INET6)
++ if (from->sa_family == AF_INET6 || !from->sa_family)
+ setsockopt(s, IPPROTO_IPV6, IPV6_RECVPKTINFO, &on, sizeof(on));
+ #endif
+ #endif
diff --git a/tftp.spec b/tftp.spec
index 55d39df..a97e763 100644
--- a/tftp.spec
+++ b/tftp.spec
@@ -1,7 +1,7 @@
Summary: The client for the Trivial File Transfer Protocol (TFTP)
Name: tftp
-Version: 0.49
-Release: 8%{?dist}
+Version: 5.2
+Release: 1%{?dist}
License: BSD
Group: Applications/Internet
Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{version}.tar.bz2
@@ -14,6 +14,7 @@ Patch4: tftp-0.49-chk_retcodes.patch
Patch5: tftp-hpa-0.49-fortify-strcpy-crash.patch
Patch6: tftp-0.49-cmd_arg.patch
Patch7: tftp-hpa-0.49-stats.patch
+Patch8: tftp-hpa-5.2-pktinfo.patch
BuildRequires: tcp_wrappers-devel readline-devel autoconf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,6 +50,7 @@ enabled unless it is expressly needed. The TFTP server is run from
%patch5 -p1 -b .fortify-strcpy-crash
%patch6 -p1 -b .cmd_arg
%patch7 -p1 -b .stats
+%patch8 -p1 -b .pktinfo
%build
autoreconf
@@ -94,6 +96,10 @@ rm -rf ${RPM_BUILD_ROOT}
%{_mandir}/man8/*
%changelog
+* Wed Jan 04 2012 Jiri Skala <jskala at redhat.com> - 5.2-1
+- update to latest upstream 5.2
+- fixes #739534 - TFTP to an IP alias of FC15 tftp server failed
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.49-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list