From 4c085354e94cf574d3f5e25be55cc2edd5a4c345 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Fri, 26 May 2006 21:46:53 +0000 Subject: Major fixups, bugs: #104218 - password extension for linksys gear, #109638 - pcre fix and more features, #109912 - 64bit fixes, #110591 - test fixes, #126520 - glibc 2.4 support. Package-Manager: portage-2.1_rc2 --- net-ftp/atftp/ChangeLog | 12 +++- net-ftp/atftp/Manifest | 61 ++++++++++++++++-- net-ftp/atftp/atftp-0.7-r1.ebuild | 64 +++++++++++++++++++ net-ftp/atftp/files/atftp-0.7-glibc24.patch | 22 +++++++ net-ftp/atftp/files/atftp-0.7-password.patch | 94 ++++++++++++++++++++++++++++ net-ftp/atftp/files/atftp-0.7-pcre.patch | 14 +++++ net-ftp/atftp/files/atftp-0.7-tests.patch | 23 +++++++ net-ftp/atftp/files/digest-atftp-0.6.2 | 2 + net-ftp/atftp/files/digest-atftp-0.7 | 2 + net-ftp/atftp/files/digest-atftp-0.7-r1 | 6 ++ 10 files changed, 294 insertions(+), 6 deletions(-) create mode 100644 net-ftp/atftp/atftp-0.7-r1.ebuild create mode 100644 net-ftp/atftp/files/atftp-0.7-glibc24.patch create mode 100644 net-ftp/atftp/files/atftp-0.7-password.patch create mode 100644 net-ftp/atftp/files/atftp-0.7-pcre.patch create mode 100644 net-ftp/atftp/files/atftp-0.7-tests.patch create mode 100644 net-ftp/atftp/files/digest-atftp-0.7-r1 (limited to 'net-ftp') diff --git a/net-ftp/atftp/ChangeLog b/net-ftp/atftp/ChangeLog index 0464e374dfff..abd751276b81 100644 --- a/net-ftp/atftp/ChangeLog +++ b/net-ftp/atftp/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-ftp/atftp # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/atftp/ChangeLog,v 1.12 2006/01/21 15:28:20 pylon Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/atftp/ChangeLog,v 1.13 2006/05/26 21:46:53 robbat2 Exp $ + +*atftp-0.7-r1 (26 May 2006) + + 26 May 2006; Robin H. Johnson + +files/atftp-0.7-glibc24.patch, +files/atftp-0.7-password.patch, + +files/atftp-0.7-pcre.patch, +files/atftp-0.7-tests.patch, + +atftp-0.7-r1.ebuild: + Major fixups, bugs: #104218 - password extension for linksys gear, #109638 - + pcre fix and more features, #109912 - 64bit fixes, #110591 - test fixes, + #126520 - glibc 2.4 support. 21 Jan 2006; Lars Weiler atftp-0.7.ebuild: Stable on ppc. diff --git a/net-ftp/atftp/Manifest b/net-ftp/atftp/Manifest index fe5934bfa6cb..5f716f5c9868 100644 --- a/net-ftp/atftp/Manifest +++ b/net-ftp/atftp/Manifest @@ -1,9 +1,60 @@ -MD5 f443c2ed93b42cfa3efd7e9c7869cc0b ChangeLog 2782 -MD5 6f53cf043ccea8c37c9bba4d68703c16 atftp-0.6.2.ebuild 1039 -MD5 cc5b35a0f64f5009cf13ea9d959caea6 atftp-0.7.ebuild 961 +AUX atftp-0.6-security.patch 1019 RMD160 a9e343455a2ea4600846aacea7f2b6a001bcb824 SHA1 621dd41ed4b92cbee404edbf6cdfbefa28a434d0 SHA256 aa7b7046728b9c94ebf56a02ff41d20e0bb85e5cdce1f74f0cbc2048cffe54dc MD5 ef1244d13cccdfbe2dff44442e0c3d1f files/atftp-0.6-security.patch 1019 +RMD160 a9e343455a2ea4600846aacea7f2b6a001bcb824 files/atftp-0.6-security.patch 1019 +SHA256 aa7b7046728b9c94ebf56a02ff41d20e0bb85e5cdce1f74f0cbc2048cffe54dc files/atftp-0.6-security.patch 1019 +AUX atftp-0.7-gcc.patch 540 RMD160 f3a646f0efee4cc63887a9a39623237d33dcb226 SHA1 0b0cccc6f8f3b832ac72d4d0bd3bf4be2f97928f SHA256 c1ea9eb2f42fbd151e1c82bb2cd431c85bddbaa2413f297a4d285269d1d080d6 MD5 0adc9648a64aa6a05a55bf822eec7265 files/atftp-0.7-gcc.patch 540 +RMD160 f3a646f0efee4cc63887a9a39623237d33dcb226 files/atftp-0.7-gcc.patch 540 +SHA256 c1ea9eb2f42fbd151e1c82bb2cd431c85bddbaa2413f297a4d285269d1d080d6 files/atftp-0.7-gcc.patch 540 +AUX atftp-0.7-glibc24.patch 778 RMD160 753a813c7ac9cbf7a28f4d7af98f11c986d008b4 SHA1 b34c7b216b5ec5ecdb55e42e4ac2f47b26bc09f9 SHA256 d2bec90943b330db84cd6af089a67e476f45271d9f33095ef3fc281c83eb7ed5 +MD5 6e583b9de1ede8c8dbd4d9ae0f84418d files/atftp-0.7-glibc24.patch 778 +RMD160 753a813c7ac9cbf7a28f4d7af98f11c986d008b4 files/atftp-0.7-glibc24.patch 778 +SHA256 d2bec90943b330db84cd6af089a67e476f45271d9f33095ef3fc281c83eb7ed5 files/atftp-0.7-glibc24.patch 778 +AUX atftp-0.7-password.patch 3906 RMD160 c637ec04fe4940fd84d27787ab6174d14daae5ff SHA1 f5fc938e0ff7762999f1d446b73ebb344c2ed71b SHA256 e56637318c9baa9e85525dc92c6be170713529af834a5bb6871238d374c0a365 +MD5 4e1d17927ceb57831184032ff1dd4333 files/atftp-0.7-password.patch 3906 +RMD160 c637ec04fe4940fd84d27787ab6174d14daae5ff files/atftp-0.7-password.patch 3906 +SHA256 e56637318c9baa9e85525dc92c6be170713529af834a5bb6871238d374c0a365 files/atftp-0.7-password.patch 3906 +AUX atftp-0.7-pcre.patch 661 RMD160 28f934bf041339487998f3d49f505f6ced10f409 SHA1 a1cd8f0387691336fe924f1b6302b95b2d6d19df SHA256 53cb989038e1c5520104c837cb086ffbb20afb6555f42782f78fd05bcea9f304 +MD5 f8688224653f97e64024e57133203ebd files/atftp-0.7-pcre.patch 661 +RMD160 28f934bf041339487998f3d49f505f6ced10f409 files/atftp-0.7-pcre.patch 661 +SHA256 53cb989038e1c5520104c837cb086ffbb20afb6555f42782f78fd05bcea9f304 files/atftp-0.7-pcre.patch 661 +AUX atftp-0.7-tests.patch 582 RMD160 104c31709aeead26d9d7e8c1e61f316911b3c72e SHA1 d562036b5cc429437585d33b0a31a91de513c42d SHA256 00e04546214265b0e9d03a0f8182837909825fef111e53a7b23d9e6a382a9d54 +MD5 422f36f2339ed5d058f9742460bb8c8e files/atftp-0.7-tests.patch 582 +RMD160 104c31709aeead26d9d7e8c1e61f316911b3c72e files/atftp-0.7-tests.patch 582 +SHA256 00e04546214265b0e9d03a0f8182837909825fef111e53a7b23d9e6a382a9d54 files/atftp-0.7-tests.patch 582 +AUX atftp.confd 105 RMD160 9c0b9cc23e749e95dc1b19375860e15e14d3004c SHA1 f8e2d6b120ff3302334c01d35a0ed2fc5c6dd742 SHA256 a2dc012a0ecd94f27950901b18a54ecc744630da4c7cd8939b3f11be07685645 MD5 939f5bfbb9b7a728330cc124175c39e3 files/atftp.confd 105 +RMD160 9c0b9cc23e749e95dc1b19375860e15e14d3004c files/atftp.confd 105 +SHA256 a2dc012a0ecd94f27950901b18a54ecc744630da4c7cd8939b3f11be07685645 files/atftp.confd 105 +AUX atftp.init 437 RMD160 83808c852164b4d368da5c9da95474dbbcd1e651 SHA1 8f8d7fac163aabec794acb12bd59162547aeb8ee SHA256 4970eb720ab838c1855b33b2437e0f8f44356e9b6f5a7225c99e2a29d6311b34 MD5 f3d1e03f8ce70ea8ed775de7407304f3 files/atftp.init 437 -MD5 e14c6bca387e9af7d2734fb9f08a67ee files/digest-atftp-0.6.2 63 -MD5 401c2182f70ea502b2b13567dee9daf9 files/digest-atftp-0.7 61 +RMD160 83808c852164b4d368da5c9da95474dbbcd1e651 files/atftp.init 437 +SHA256 4970eb720ab838c1855b33b2437e0f8f44356e9b6f5a7225c99e2a29d6311b34 files/atftp.init 437 +DIST atftp-0.6.2.tar.gz 125405 RMD160 0715a2e6e87a9dcd256a39df9d1336ab8573e08c SHA1 8896863053446107897164560a4e94ead43f1a9f SHA256 80f65157b7b7fd281e26d220387e15fa3d9b2426d3b6410a341a9ac2b760b5fa +DIST atftp-0.7.tar.gz 202234 RMD160 06bd2ba663a87fabb79e1536275ad23f60c68636 SHA1 83726e552ca10a164f1a7b344b0c51ca33423fe9 SHA256 9c548c44d3cfdf259118d9fd4e468e1fe4567456dbff8ff59838c5f70ef62ea3 +DIST atftp_0.7-11.diff.gz 26055 RMD160 b078ce6715faec118b9524be67b9ed1fa6bb9fc2 SHA1 76d8cae2c0744298649c66cafa24afd977ef9643 SHA256 77accd1f5b5d4759fe9572f7a917c629e35692e484ac4dc6fd4415fe745036ff +EBUILD atftp-0.6.2.ebuild 1039 RMD160 2744c2d448f2db7235a4dc331a817b5685e7421f SHA1 23bf6127d26ecfa8c8ef7dd5c43a9c056627dd72 SHA256 bf937095820b08f666ace3da5ccfe898709cc12a54536ee9dbe73fd727a006cf +MD5 6f53cf043ccea8c37c9bba4d68703c16 atftp-0.6.2.ebuild 1039 +RMD160 2744c2d448f2db7235a4dc331a817b5685e7421f atftp-0.6.2.ebuild 1039 +SHA256 bf937095820b08f666ace3da5ccfe898709cc12a54536ee9dbe73fd727a006cf atftp-0.6.2.ebuild 1039 +EBUILD atftp-0.7-r1.ebuild 1779 RMD160 9104662ae3e8db09bd41ddd5ee5f2d90872134b4 SHA1 5beada72422a2afd527ad589a8b1c2b290f2086c SHA256 22515f7299a2389c444ef1e00a1e6d08c2866c7a9ccc95690fc6bc2ffbb2ad03 +MD5 b1832a4575c8d93fac6de3c76819009b atftp-0.7-r1.ebuild 1779 +RMD160 9104662ae3e8db09bd41ddd5ee5f2d90872134b4 atftp-0.7-r1.ebuild 1779 +SHA256 22515f7299a2389c444ef1e00a1e6d08c2866c7a9ccc95690fc6bc2ffbb2ad03 atftp-0.7-r1.ebuild 1779 +EBUILD atftp-0.7.ebuild 961 RMD160 be269b40d06bcc28786c937bdc7babf8e445f411 SHA1 36a1e1acbd141267e829969bff75d7156324d296 SHA256 666ebcd6d3caee5bdfd48f8eca9759243b443565d30cc8aef81c3f46565de4f8 +MD5 cc5b35a0f64f5009cf13ea9d959caea6 atftp-0.7.ebuild 961 +RMD160 be269b40d06bcc28786c937bdc7babf8e445f411 atftp-0.7.ebuild 961 +SHA256 666ebcd6d3caee5bdfd48f8eca9759243b443565d30cc8aef81c3f46565de4f8 atftp-0.7.ebuild 961 +MISC ChangeLog 3204 RMD160 0552874950bc5712d244f34b5b1b54114583eff4 SHA1 ccc303f8abd8b5c7066cc46667b9f3494be6f14a SHA256 c59856c690a59d1178b7229cd8a6880baafa78875f9908f783b58fbc9d6756bd +MD5 a083775c13a57473b364b0bf0bb928fe ChangeLog 3204 +RMD160 0552874950bc5712d244f34b5b1b54114583eff4 ChangeLog 3204 +SHA256 c59856c690a59d1178b7229cd8a6880baafa78875f9908f783b58fbc9d6756bd ChangeLog 3204 +MD5 464793414eb60f3223535e0a4a18031e files/digest-atftp-0.6.2 235 +RMD160 844cffa76a378621199b38abc0d4f5a2b2734c63 files/digest-atftp-0.6.2 235 +SHA256 fdcd8c74f8a1a514aa35e35e0dad5a5ac7cc496668b71dd4040ca9cfe5d50bb7 files/digest-atftp-0.6.2 235 +MD5 081d559da23a0dbd95e52f391093ec5a files/digest-atftp-0.7 229 +RMD160 76d656cc051529eafb3f09f27eaa1fb2e810013b files/digest-atftp-0.7 229 +SHA256 dbc8fe06c6a67d7bfa588ab29d5b01442e8394510ff28009008e888aed5be297 files/digest-atftp-0.7 229 +MD5 88d65cf56c2591c0dcbe2b1b7e654a37 files/digest-atftp-0.7-r1 467 +RMD160 ca1d65b34ce76ba0e55ff7b141610694031d2e7a files/digest-atftp-0.7-r1 467 +SHA256 92fbdda589f1106549a093a393b8f82dc90f799352b612f64871b02ad35d20cf files/digest-atftp-0.7-r1 467 diff --git a/net-ftp/atftp/atftp-0.7-r1.ebuild b/net-ftp/atftp/atftp-0.7-r1.ebuild new file mode 100644 index 000000000000..e0d539a433a8 --- /dev/null +++ b/net-ftp/atftp/atftp-0.7-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-ftp/atftp/atftp-0.7-r1.ebuild,v 1.1 2006/05/26 21:46:53 robbat2 Exp $ + +inherit eutils flag-o-matic + +DEBIAN_PV="11" +DEBIAN_A="${PN}_${PV}-${DEBIAN_PV}.diff.gz" + +DESCRIPTION="Advanced TFTP implementation client/server" +HOMEPAGE="ftp://ftp.mamalinux.com/pub/atftp/" +SRC_URI="ftp://ftp.mamalinux.com/pub/atftp/${P}.tar.gz + http://ftp.debian.org/debian/pool/main/a/${PN}/${DEBIAN_A}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" +IUSE="selinux tcpd readline pcre" + +RDEPEND="tcpd? ( sys-apps/tcp-wrappers ) + selinux? ( sec-policy/selinux-tftpd ) + readline? ( sys-libs/readline ) + pcre? ( dev-libs/libpcre )" +DEPEND="${RDEPEND} + !virtual/tftp" +PROVIDE="virtual/tftp" + +src_unpack() { + unpack ${P}.tar.gz + cd "${S}" + epatch "${DISTDIR}"/${DEBIAN_A} + epatch "${FILESDIR}"/${P}-pcre.patch + epatch "${FILESDIR}"/${P}-password.patch + epatch "${FILESDIR}"/${P}-tests.patch + epatch "${FILESDIR}"/${P}-glibc24.patch + # remove upstream's broken CFLAGS + sed -i.orig -e \ + '/^CFLAGS="-g -Wall -D_REENTRANT"/s,".*","",g' \ + ${S}/configure +} + +src_compile() { + append-flags -D_REENTRANT -DRATE_CONTROL + econf \ + $(use_enable tcpd libwrap) \ + $(use_enable readline libreadline) \ + $(use_enable pcre libpcre) \ + --enable-mtftp \ + || die "./configure failed" + emake CFLAGS="${CFLAGS}" || die +} + +src_install() { + emake install DESTDIR="${D}" || die "Installation failed" + newinitd "${FILESDIR}"/atftp.init atftp + newconfd "${FILESDIR}"/atftp.confd atftp + + dodoc README* BUGS FAQ Changelog INSTALL TODO + dodoc ${S}/docs/* + + docinto test + cd ${S}/test + dodoc load.sh mtftp.conf pcre_pattern.txt test.sh test_suite.txt +} diff --git a/net-ftp/atftp/files/atftp-0.7-glibc24.patch b/net-ftp/atftp/files/atftp-0.7-glibc24.patch new file mode 100644 index 000000000000..195aec69b021 --- /dev/null +++ b/net-ftp/atftp/files/atftp-0.7-glibc24.patch @@ -0,0 +1,22 @@ +--- atftp-0.7/stats.c.org ++++ atftp-0.7/stats.c +@@ -18,6 +18,7 @@ + + #include + #include ++#include + #include "tftp_def.h" + #include "stats.h" + #include "logger.h" +@@ -157,8 +158,9 @@ + + logger(LOG_INFO, " Load measurements:"); ++ long sc_clk_tck = sysconf(_SC_CLK_TCK); + logger(LOG_INFO, " User: %8.3fs Sys:%8.3fs", +- (double)(s_stats.tms.tms_utime) / CLK_TCK, +- (double)(s_stats.tms.tms_stime) / CLK_TCK); ++ (double)(s_stats.tms.tms_utime) / sc_clk_tck, ++ (double)(s_stats.tms.tms_stime) / sc_clk_tck); + logger(LOG_INFO, " Total:%8.3fs CPU:%8.3f%%", + (double)(tmp.tv_sec + tmp.tv_usec * 1e-6), + (double)(s_stats.tms.tms_utime + s_stats.tms.tms_stime) / diff --git a/net-ftp/atftp/files/atftp-0.7-password.patch b/net-ftp/atftp/files/atftp-0.7-password.patch new file mode 100644 index 000000000000..26b59085dde5 --- /dev/null +++ b/net-ftp/atftp/files/atftp-0.7-password.patch @@ -0,0 +1,94 @@ +diff -Naur atftp-0.7.orig/tftp.c atftp-0.7/tftp.c +--- atftp-0.7.orig/tftp.c 2004-03-15 18:55:56.000000000 -0500 ++++ atftp-0.7/tftp.c 2005-08-29 21:40:06.000000000 -0400 +@@ -525,6 +525,10 @@ + fprintf(stderr, " multicast: enabled\n"); + else + fprintf(stderr, " multicast: disabled\n"); ++ if (data.tftp_options[OPT_PASSWORD].specified) ++ fprintf(stderr, " password: enabled\n"); ++ else ++ fprintf(stderr, " password: disabled\n"); + return ERR; + } + /* if disabling an option */ +@@ -971,6 +975,7 @@ + { "put", 0, NULL, 'p'}, + { "local-file", 1, NULL, 'l'}, + { "remote-file", 1, NULL, 'r'}, ++ { "password", 1, NULL, 'P'}, + { "tftp-timeout", 1, NULL, 'T'}, + { "mode", 1, NULL, 'M'}, + { "option", 1, NULL, 'O'}, +@@ -993,7 +998,7 @@ + }; + + /* Support old argument until 0.8 */ +- while ((c = getopt_long(argc, argv, /*"gpl:r:Vh"*/ "gpl:r:Vht:b:sm", ++ while ((c = getopt_long(argc, argv, /*"gpl:r:Vh"*/ "gpl:r:Vht:b:smP:", + options, &option_index)) != EOF) + { + switch (c) +@@ -1028,6 +1033,11 @@ + else + action = PUT; + break; ++ case 'P': ++ snprintf(string, sizeof(string), "option password %s", optarg); ++ make_arg(string, &ac, &av); ++ process_cmd(ac, av); ++ break; + case 'l': + interactive = 0; + Strncpy(local_file, optarg, MAXLEN); +@@ -1169,6 +1179,7 @@ + " -p, --put : put file\n" + " -l, --local-file : local file name\n" + " -r, --remote-file : remote file name\n" ++ " -P, --password : specify password (Linksys ext.)\n" + " --tftp-timeout : delay before retransmission, client side\n" + #if 0 + " t, --timeout : delay before retransmission, " +diff -Naur atftp-0.7.orig/tftp_def.c atftp-0.7/tftp_def.c +--- atftp-0.7.orig/tftp_def.c 2004-02-12 22:16:09.000000000 -0500 ++++ atftp-0.7/tftp_def.c 2005-08-29 21:36:57.000000000 -0400 +@@ -37,6 +37,7 @@ + { "timeout", "5", 0, 1 }, /* 2348, 2349, 2090. */ + { "blksize", "512", 0, 1 }, /* This is the default option */ + { "multicast", "", 0, 1 }, /* structure */ ++ { "password", "", 0, 1}, /* password */ + { "", "", 0, 0} + }; + +diff -Naur atftp-0.7.orig/tftp_def.h atftp-0.7/tftp_def.h +--- atftp-0.7.orig/tftp_def.h 2004-02-12 22:16:09.000000000 -0500 ++++ atftp-0.7/tftp_def.h 2005-08-29 20:16:27.000000000 -0400 +@@ -40,6 +40,7 @@ + #define OPT_TIMEOUT 3 + #define OPT_BLKSIZE 4 + #define OPT_MULTICAST 5 ++#define OPT_PASSWORD 6 + #define OPT_NUMBER 7 + + #define OPT_SIZE 12 +diff -Naur atftp-0.7.orig/tftp_io.c atftp-0.7/tftp_io.c +--- atftp-0.7.orig/tftp_io.c 2004-02-18 20:30:00.000000000 -0500 ++++ atftp-0.7/tftp_io.c 2005-08-29 22:05:11.000000000 -0400 +@@ -70,10 +70,13 @@ + break; + if (tftp_options[i].enabled && tftp_options[i].specified) + { +- Strncpy(data_buffer + buf_index, tftp_options[i].option, +- data_buffer_size - buf_index); +- buf_index += strlen(tftp_options[i].option); +- buf_index++; ++ if (i != OPT_PASSWORD) ++ { ++ Strncpy(data_buffer + buf_index, tftp_options[i].option, ++ data_buffer_size - buf_index); ++ buf_index += strlen(tftp_options[i].option); ++ buf_index++; ++ } + Strncpy(data_buffer + buf_index, tftp_options[i].value, + data_buffer_size - buf_index); + buf_index += strlen(tftp_options[i].value); diff --git a/net-ftp/atftp/files/atftp-0.7-pcre.patch b/net-ftp/atftp/files/atftp-0.7-pcre.patch new file mode 100644 index 000000000000..1f24b67471e2 --- /dev/null +++ b/net-ftp/atftp/files/atftp-0.7-pcre.patch @@ -0,0 +1,14 @@ +--- atftp-0.7/tftpd_pcre.c~ 2005-10-17 23:14:52.000000000 +0200 ++++ atftp-0.7/tftpd_pcre.c 2005-10-17 23:14:52.000000000 +0200 +@@ -211,9 +211,9 @@ + chp++; /* point to value indicating substring */ + rc = pcre_get_substring(str, ovector, matches, *chp - 0x30, &tmpstr); + /* found string */ +- if (rc > 0) ++ if (rc > 0 && outchp - outstr + rc+1 < outsize) + { +- Strncpy(outchp, tmpstr, rc); ++ Strncpy(outchp, tmpstr, rc+1); + outchp += rc; + pcre_free_substring(tmpstr); + continue; diff --git a/net-ftp/atftp/files/atftp-0.7-tests.patch b/net-ftp/atftp/files/atftp-0.7-tests.patch new file mode 100644 index 000000000000..9e087950e659 --- /dev/null +++ b/net-ftp/atftp/files/atftp-0.7-tests.patch @@ -0,0 +1,23 @@ +diff -Naur atftp-0.7.orig/test/test.sh atftp-0.7/test/test.sh +--- atftp-0.7.orig/test/test.sh 2003-04-28 21:59:51.000000000 -0400 ++++ atftp-0.7/test/test.sh 2005-10-26 22:42:15.000000000 -0400 +@@ -151,7 +151,7 @@ + test_blocksize 1428 + test_blocksize 16000 + test_blocksize 64000 +-test_blocksize 65465 ++test_blocksize 65464 + + # + # testing fot tsize +@@ -162,9 +162,9 @@ + TSIZE=`grep "OACK