OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/atftp?expand=0&rev=2

atftp-0.7_bug-213384_OPT_NUMBER.patch

@@ -0,0 +1,45 @@
+---
+ options.h  |    2 +-
+ tftp_def.c |    2 +-
+ tftp_def.h |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+Index: options.h
+===================================================================
+--- options.h.orig	2001-07-07 01:35:18.000000000 +0200
++++ options.h	2007-01-22 18:27:05.238498611 +0100
+@@ -27,7 +27,7 @@ struct tftp_opt {
+      int enabled;               /* enabled for use by server or client */
+ };
+ 
+-extern struct tftp_opt tftp_default_options[OPT_NUMBER];
++extern struct tftp_opt tftp_default_options[OPT_NUMBER + 1];
+ 
+ int opt_parse_request(char *data, int data_size, struct tftp_opt *options);
+ int opt_parse_options(char *data, int data_size, struct tftp_opt *options);
+Index: tftp_def.c
+===================================================================
+--- tftp_def.c.orig	2004-03-06 21:41:41.000000000 +0100
++++ tftp_def.c	2007-01-22 18:27:05.254499542 +0100
+@@ -30,7 +30,7 @@
+  */
+ 
+ // FIXME: is there a way to use TIMEOUT and SEGSIZE here?
+-struct tftp_opt tftp_default_options[OPT_NUMBER] = {
++struct tftp_opt tftp_default_options[OPT_NUMBER + 1] = {
+      { "filename", "", 0, 1},   /* file to transfer */
+      { "mode", "octet", 0, 1},  /* mode for transfer */
+      { "tsize", "0", 0, 1 },    /* RFC1350 options. See RFC2347, */
+Index: tftp_def.h
+===================================================================
+--- tftp_def.h.orig	2004-03-06 21:41:41.000000000 +0100
++++ tftp_def.h	2007-01-22 18:27:05.274500706 +0100
+@@ -40,7 +40,7 @@
+ #define OPT_TIMEOUT   3
+ #define OPT_BLKSIZE   4
+ #define OPT_MULTICAST 5
+-#define OPT_NUMBER    7
++#define OPT_NUMBER    6
+ 
+ #define OPT_SIZE     12
+ #define VAL_SIZE     MAXLEN

atftp.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 22 18:33:44 CET 2007 - mrueckert@suse.de
+
+- added atftp-0.7_bug-213384_OPT_NUMBER.patch:
+  "atftpd incorrectly sends OACK (option acknowledge) packets"
+  (#213384,#80441)
+
 -------------------------------------------------------------------
 Mon Jul 31 16:16:43 CEST 2006 - mrueckert@suse.de
 

atftp.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package atftp (Version 0.7.0)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -13,8 +13,8 @@
 Name:           atftp
 %define pkg_version 0.7
 Version:        0.7.0
-Release:        2
-License:        GPL
+Release:        27
+License:        GNU General Public License (GPL)
 Group:          System/Daemons
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  readline-devel tcpd-devel
@@ -29,6 +29,8 @@ Patch2:         atftp-CLK_TCK.diff
 Patch3:         atftp-0.7_compiler_warnings.patch
 Patch4:         atftp-0.7_thread_crash.patch
 Patch5:         atftp-0.7_sol_ip.patch
+Patch6:         atftp-0.7_bug-213384_OPT_NUMBER.patch
+#
 Summary:        Advanced TFTP Server and Client
 
 %description
@@ -54,6 +56,7 @@ Authors:
 %patch3
 %patch4
 %patch5
+%patch6
 
 %build
 autoreconf -fi
@@ -96,6 +99,10 @@ autoreconf -fi
 %dir %attr(-,nobody,nogroup) /var/run/atftpd/
 
 %changelog -n atftp
+* Mon Jan 22 2007 - mrueckert@suse.de
+- added atftp-0.7_bug-213384_OPT_NUMBER.patch:
+  "atftpd incorrectly sends OACK (option acknowledge) packets"
+  (#213384,#80441)
 * Mon Jul 31 2006 - mrueckert@suse.de
 - added /var/run/atftpd/ (0755,nobody,nogroup):
   at ftp can finally create pid files
@@ -148,7 +155,7 @@ autoreconf -fi
 - Adjust to new glibc __THROW define
 * Mon Apr 12 2004 - nashif@suse.de
 - update to 0.7 final
-- when called in batch mode, return right exit code if
+  - when called in batch mode, return right exit code if
   operation fails.
 * Tue Mar 09 2004 - ms@suse.de
 - include timeout patch: