From 29ec29ab8b736ba38e1050d86114038513f3cfb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radek=20Vok=C3=A1l?= <rvokal@fedoraproject.org>
Date: Wed, 22 Mar 2006 11:04:02 +0000
Subject: [PATCH] - fix double free error when hitting ^C (#186201)

---
 tftp-hpa-0.42-sigjmp.patch | 16 ++++++++++++++++
 tftp.spec                  |  7 ++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 tftp-hpa-0.42-sigjmp.patch

diff --git a/tftp-hpa-0.42-sigjmp.patch b/tftp-hpa-0.42-sigjmp.patch
new file mode 100644
index 0000000..0bcb89f
--- /dev/null
+++ b/tftp-hpa-0.42-sigjmp.patch
@@ -0,0 +1,16 @@
+--- tftp-hpa-0.42/tftp/main.c.old	2006-02-16 18:45:22.000000000 +0100
++++ tftp-hpa-0.42/tftp/main.c	2006-03-22 11:52:10.000000000 +0100
+@@ -304,9 +305,11 @@
+     (*c->handler)(pargc, pargv);
+     exit(0);
+   }
+-  if (sigsetjmp(toplevel,1) != 0)
++  /*
++  if (sigsetjmp(toplevel,1) != 0) {
+     (void)putchar('\n');
+-  
++  }
++  */
+ #ifdef WITH_READLINE
+ #ifdef HAVE_READLINE_HISTORY_H
+   using_history();
diff --git a/tftp.spec b/tftp.spec
index 309903c..bf68c2f 100644
--- a/tftp.spec
+++ b/tftp.spec
@@ -3,11 +3,12 @@
 Summary: The client for the Trivial File Transfer Protocol (TFTP).
 Name: tftp
 Version: %{tftp_hpa_version}
-Release: 1
+Release: 2
 License: BSD
 Group: Applications/Internet
 Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{tftp_hpa_version}.tar.gz
 Patch0: tftp-0.40-remap.patch
+Patch1: tftp-hpa-0.42-sigjmp.patch
 BuildPreReq: tcp_wrappers
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -34,6 +35,7 @@ enabled unless it is expressly needed.  The TFTP server is run from
 %prep
 %setup -q -n tftp-hpa-%{version} 
 %patch0 -p1 -b .zero
+%patch1 -p1 -b .sigjmp
 
 %build
 
@@ -76,6 +78,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*
 
 %changelog
+* Wed Mar 22 2006 Radek Vokál <rvokal@redhat.com> 0.42-2
+- fix double free error when hitting ^C (#186201)
+
 * Wed Feb 22 2006 Radek Vokál <rvokal@redhat.com> 0.42-1
 - upgrade to 0.42