[tftp/f16] updated to latest upstream - 5.1
Jiri Skala
jskala at fedoraproject.org
Thu Oct 6 09:22:20 UTC 2011
commit e6e51ffa1428fb20f5aa3aefc63cfe47f42581a5
Author: Jiri Skala <jskala at redhat.com>
Date: Thu Oct 6 11:22:17 2011 +0200
updated to latest upstream - 5.1
.gitignore | 1 +
sources | 2 +-
tftp-hpa-0.39-tzfix.patch | 2 +-
tftp-hpa-0.49-buf_over.patch | 265 ------------------------------------------
tftp.spec | 9 +-
5 files changed, 8 insertions(+), 271 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fcadda0..f876367 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
tftp-hpa-0.49.tar.bz2
+/tftp-hpa-5.1.tar.bz2
diff --git a/sources b/sources
index d6e5fbf..0860a41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-64b7db6525b189831a7df0565cdfab67 tftp-hpa-0.49.tar.bz2
+86ddd4e33395b0ae43b3ddce78605d8d tftp-hpa-5.1.tar.bz2
diff --git a/tftp-hpa-0.39-tzfix.patch b/tftp-hpa-0.39-tzfix.patch
index 47458dc..ded02ef 100644
--- a/tftp-hpa-0.39-tzfix.patch
+++ b/tftp-hpa-0.39-tzfix.patch
@@ -2,7 +2,7 @@ diff -up tftp-hpa-0.49/tftpd/tftpd.c.tzfix tftp-hpa-0.49/tftpd/tftpd.c
--- tftp-hpa-0.49/tftpd/tftpd.c.tzfix 2008-10-20 18:08:31.000000000 -0400
+++ tftp-hpa-0.49/tftpd/tftpd.c 2008-11-25 11:45:27.000000000 -0500
@@ -350,6 +350,14 @@ int main(int argc, char **argv)
- #endif
+ const char *pidfile = NULL;
u_short tp_opcode;
+ time_t my_time = 0;
diff --git a/tftp.spec b/tftp.spec
index 1c18c42..61c1e7e 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: 9%{?dist}
+Version: 5.1
+Release: 1%{?dist}
License: BSD
Group: Applications/Internet
Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{version}.tar.bz2
@@ -14,7 +14,6 @@ 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-0.49-buf_over.patch
BuildRequires: tcp_wrappers-devel readline-devel autoconf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,7 +49,6 @@ 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 .buf_over
%build
autoreconf
@@ -96,6 +94,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_mandir}/man8/*
%changelog
+* Thu Oct 06 2011 Jiri Skala <jskala at redhat.com> - 5.1-1
+- updated to latest upstream - 5.1
+
* Mon Jun 20 2011 Jiri Skala <jskala at redhat.com> - 0.49-9
- fixes #714261 - CVE-2011-2199: buffer overflow when setting utimeout option
More information about the scm-commits
mailing list