diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /net-ftp/atftp | |
parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'net-ftp/atftp')
-rw-r--r-- | net-ftp/atftp/Manifest | 13 | ||||
-rw-r--r-- | net-ftp/atftp/atftp-0.7-r6.ebuild | 78 | ||||
-rw-r--r-- | net-ftp/atftp/atftp-0.7.2-r1.ebuild | 2 | ||||
-rw-r--r-- | net-ftp/atftp/files/atftp-0.7-CFLAGS.patch | 32 | ||||
-rw-r--r-- | net-ftp/atftp/files/atftp-0.7-blockno.patch | 136 | ||||
-rw-r--r-- | net-ftp/atftp/files/atftp-0.7-glibc24.patch | 22 | ||||
-rw-r--r-- | net-ftp/atftp/files/atftp-0.7-illreply.patch | 12 | ||||
-rw-r--r-- | net-ftp/atftp/files/atftp-0.7-password.patch | 94 | ||||
-rw-r--r-- | net-ftp/atftp/files/atftp-0.7-pcre.patch | 14 | ||||
-rw-r--r-- | net-ftp/atftp/files/atftp-0.7-spaced_filename.patch | 96 | ||||
-rw-r--r-- | net-ftp/atftp/files/atftp-0.7-tests.patch | 23 |
11 files changed, 2 insertions, 520 deletions
diff --git a/net-ftp/atftp/Manifest b/net-ftp/atftp/Manifest index ab093f3a723e..ea1a3b29812f 100644 --- a/net-ftp/atftp/Manifest +++ b/net-ftp/atftp/Manifest @@ -1,19 +1,8 @@ -AUX atftp-0.7-CFLAGS.patch 619 BLAKE2B 8749303ede615e0ff4ac26a5a6349ed768ae15aac99fedcdeed3202f986290b81d856097a3a276d7450f1420a77c2e0b5930e4cd4b05f72b4f3612c3d821c1ff SHA512 9227354689ea504f0500c244335a83d8a77dcb74c876ada1065c955f414e1f51e06dafcdb5d99f1fbb22036a074f9e46cada7378824d70f677ff6db931a35289 -AUX atftp-0.7-blockno.patch 5686 BLAKE2B dc8f2c2c9305d8432264f55964988f5cecacb5eeda0f5456994ac5efb562d9c5bfd882f7202eac2ba5d14b561b116620d5890821efcadbabedd3afa78718c9d2 SHA512 f91e7a7811a1a08268f2ca378eb4e473838e0c07c3cb8c6e6fec1e0e4e9068705451d8d0ae5f3d184a9455d5035bb656176fa3ed09b50fecb6c2d42e8dc73e1d -AUX atftp-0.7-glibc24.patch 778 BLAKE2B 47dce340676636a2f2ca647e9efd7fcbc203dca73197d38a8d5d8ef687706a06dfff8627615237abd7c3a1a566abbaf3a33e80aa86939e2db1f199794a917c4a SHA512 1000972a84d3462a0924a4189b240160a9ae5e1429365b329e0be582fdd6593611a59d3f7f955956269144f4c764bb378e04aecc5c18405d340f7cd60efb4e5a -AUX atftp-0.7-illreply.patch 382 BLAKE2B 67893950b43b34b48152475f08d7fd7020eaa09deaa9b16bfaa7c0ddc3b0c3bb70c7c354129d26bf61c16c37125fc0c5924f99759e7fdb1caa12461264e6e3fb SHA512 42efdd402a6fb07bd02286afb41c8eb14d68595454e882a967e40453ec85e59214e635537ea8d580259f1bfdb0524bcaba29e8af321136c3e2d973f22b08b467 -AUX atftp-0.7-password.patch 3906 BLAKE2B beb8fadcbc9b42689c5ebfbb41e234d79f742d5995157eab7d37330bc9aec7d3c3e7d84ee44fb56b79da53aeee5cb2c5fa1dd0ebf646b98dcd348057b71a02ac SHA512 5f04d4d54aaf5f459e1aa87f56b3920fc039303f6c1c6d0f205bc1937b9c5263e5a51224838ee7aab1b73e0df6c312620caeba9dd2388e1b5b7bdf8253a56fc0 -AUX atftp-0.7-pcre.patch 661 BLAKE2B 39080ad1cd36f434c0405fd42605cba4890ff912a63c1aea079cb0ae2c078e3d81b6c0b203d4a7c0ce1f81acf62ebb278000dc4ebb590e2e488151094d58012e SHA512 773ecc9aa63a9ffb2774ca5454daf573813f988defa6e6f8e9f99cfcc88c7984632b6d1944994c2dd6426200057a552743b9c30d5c158f469a9a74b3cd0c5dff -AUX atftp-0.7-spaced_filename.patch 2395 BLAKE2B 5f0ab736e05094fa42fa891990a3664fdf0033b9ec23479945a419df909e7963fb1013b1d48668d0554704c7adf647b409745dcd68f623a68d0d311d90cb7894 SHA512 f6b352105d40fd4de2b079e847c7e6230ebeef3d2c5568aa260f7c74b22962c168928b38a244e3784e6ba282b47ae09d28b572c36944360f5bf8d880d16aeb64 -AUX atftp-0.7-tests.patch 582 BLAKE2B e0eb7fe0dbd78ea164e65b320b6b4d7047becfea6c25655639c411af06d2c127102d3bb0b2eb5afcd3ec33b27d5362dfe62f417e71823e798689341cb77a5142 SHA512 93863aed523c9787f37b671caa894a92e864b009dd5c028066f7e10e50cefce955f3cf9a24ecc702c3ce572bd88fa6a47d524af08ecbaa6ff116487a68393ea8 AUX atftp-0.7.2-CFLAGS.patch 611 BLAKE2B a897ae1d9f03387283826c5b9795028b9190ca5a55e9db795d6a3753c7ce45ccd75a8d37eb2de228bd1b8fc57472fb3f662860c0f1efdc5a0ceab2d1a178c1dc SHA512 b020e761af2b73193e0bc3ef0e11e293babdfaedeac5429f3ad89079d686ce9c69737a4f74e147a023a92a2424241d61f17574feaadc39a5b6bd361245886c8a AUX atftp.confd 105 BLAKE2B 6672479bce2240d4c34c70853227a769fa45c06e4b5c04f7d5aebdbceb0987316a9ec906182cacf5337fce5190aeac3bfc4cda0be72b8d48e99a5b2cbc2eca0e SHA512 cdbd63df16c2cee7491209de8ec44e05e10beccc6286cf7cb1c5dc7731c616d41bc94ce4d6c020b4ac8bb77b27956e9ee36d9b5703dcd3477e8b14927d154b91 AUX atftp.init 438 BLAKE2B 1783431801dbf04353bde6c3766c7d0acdd06b8ec853c8fba5cf1bbfe6c7020b55305f44992e3921a63654f290a28c28373dd94f925188c72105c8a3dd047dca SHA512 b64f78658d2da17a4fe4237835c0a6a0cc59d0b7278e8f6f49673ffd8a97a9473e4773b43bcc70d312043ee4324d8105c50f0cfcf6055c0755ce598c9d7e5a23 AUX atftp.service 233 BLAKE2B 4c9a1a8041ffc4cdf71a24800494f340121beb9bde9760fa090b9e515ef0b2aa7dd73173543c75fde465dbf9cc229b04acc9e72c296fa27cace2063128de06c6 SHA512 533372c4863e39d6139ddc491c2b2b2051f1094a90d9854879f28bae7975c8dc997696318794cd1136f9cc542a8f418ad8361b87dd6b3455445d8528d2cc993a AUX atftp.service.conf 45 BLAKE2B dd52bd3ef0d72f28d2e317282026d354b6023f8b51634d0374623c782afacae1284f5385967dfa91026553845f9283be59b4c7d96031da85261067b7be6544f7 SHA512 661befb6873eee6c0ed25fd5cb156e3d7c4ef801d2f58cda8df0f0c5fd851c7eb28089a9399529164c61505963e9d10143df2195d57ff66f85ad0e2750fbbd57 DIST atftp-0.7.2.tar.gz 248038 BLAKE2B 3ca44624bf989009c2ebd0ae97927b0784e3c617a79a1bd00212a72a185302cf84f51c8bcda2012981d67cfed4d241b70f8719e78155207608f07a2227e6c437 SHA512 d602bb69451175a36e619abcff412ab1f6d0e7baf8c3f9a2b32081530fbc5816157404b80d42a8b6caa89cc83675b5cbeefcd57a5d98b8f5b43c6254b20ef28b -DIST atftp-0.7.dfsg.tar.gz 187992 BLAKE2B 8196c333ea8042879196ca9f9c656b4d60a332ed1d64a5738870e1d4fd5f108716da6769bf52759626ad3efce11946b5d6285ac9fbe46cb63e6e2d051fc7aeb3 SHA512 40d231c0bc0478fedb3eff9b4c540c62dd9bd6c40d9738e2db1813797a5d48e201720d43a48970ce250f1bb5b15460bb9b3d631c06f96c1a74775ecfb6d13f82 -DIST atftp_0.7-11.diff.gz 26055 BLAKE2B c9be58836b5a7e3943dd28dd4661abab5e86b1941c9a2b58786eebe702ab515cf1bc08bf44c8ab4157584a437e861e24eb0c833c1fa1bc774f7f8a2134b6cd27 SHA512 28747f8f3ef2fc3b122361f682fe26ba93acf09b190f61efb3cfcbb6bdeef78cfe1348aeaf1699003a7e02586579be670d85b65baad1b1165a4bec9a9279adb5 -EBUILD atftp-0.7-r6.ebuild 1831 BLAKE2B 076b4853e8a1066d359b8ebac48eb9551e9b9b8083833752b4ba050e67b05e971b9979b95878e7e6176e193a243768544a16c9acf48e18b88a3167f4fdd45003 SHA512 e0f2cfe21ac0d293620850cba2994d2436fc33812e6e04b42cb719458c5c2aa5ec1075f70cc388ae7ecb328666aad87d88c8a48c562e009da5a0d71ec2da800c -EBUILD atftp-0.7.2-r1.ebuild 1459 BLAKE2B 4a5059d8c4f4d47fa934a3f185a9cc2a37281d6d3822070c0f7dfeb5cb92a202f433d28c91c47232c874c33ed532b618731bbb37e7f06517ad68946d0f20351e SHA512 76286fe573e6958b61a55e2c3e3f1e1829cea7ef0b822600b9248930cea6836d4b302a4d18f165151e6fa550060a6f7cadcf1e975af3c5015c437129edbd3909 +EBUILD atftp-0.7.2-r1.ebuild 1454 BLAKE2B 1dd9278366a7bbc136e6f7fcf584a7f52076de01a53cdf2b65e486bd1582c75211cca6e7380ddc8978f3760a369be5b580dfcac99c4d5672e9a86a8478ff8450 SHA512 a7f27b1c0087aceb9f8c4e9e645cc932b9d69faecc0a7d51529f8395017a2a8ea8a25f9a882f2d128fbd0cb4a51b53cc351b2310b12ae207e543047bc32801c0 MISC metadata.xml 418 BLAKE2B 882119fa041eaa33650c5e3efaa440e3ed25056f05dda4667a150a8646f32f620b3479821b0e6c3220541afd811f35b6060127aa58b98e7604fc498536e8c724 SHA512 cff57d66fe14a48905bd9280e15f794a66df58f83fff73290db3dc7a8d2196c5ffba05693d9e8909e3bf710bb05b72e00001747bd9d92379a7cdfc0dbaba57cb diff --git a/net-ftp/atftp/atftp-0.7-r6.ebuild b/net-ftp/atftp/atftp-0.7-r6.ebuild deleted file mode 100644 index 64badd5fa1e9..000000000000 --- a/net-ftp/atftp/atftp-0.7-r6.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools flag-o-matic systemd - -DEBIAN_PV="11" -DEBIAN_A="${PN}_${PV}-${DEBIAN_PV}.diff" - -DESCRIPTION="Advanced TFTP implementation client/server" -HOMEPAGE="https://sourceforge.net/projects/atftp/" -SRC_URI="mirror://sourceforge/${PN}/${P}.dfsg.tar.gz - mirror://debian/pool/main/a/${PN}/${DEBIAN_A}.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 ~s390 sparc x86" -IUSE="selinux tcpd readline pcre" - -DEPEND="tcpd? ( sys-apps/tcp-wrappers ) - readline? ( sys-libs/readline:0= ) - pcre? ( dev-libs/libpcre )" -RDEPEND="${DEPEND} - !net-ftp/netkit-tftp - !net-ftp/tftp-hpa - !net-ftp/uftpd - selinux? ( sec-policy/selinux-tftp )" - -PATCHES=( - "${WORKDIR}/${DEBIAN_A}" - "${FILESDIR}/${P}-pcre.patch" - "${FILESDIR}/${P}-password.patch" - "${FILESDIR}/${P}-tests.patch" - "${FILESDIR}/${P}-glibc24.patch" - "${FILESDIR}/${P}-blockno.patch" - "${FILESDIR}/${P}-spaced_filename.patch" - "${FILESDIR}/${P}-illreply.patch" - "${FILESDIR}/${P}-CFLAGS.patch" -) - -src_unpack() { - default - mv atftp-0.7.dfsg atftp-0.7 || die -} - -src_prepare() { - append-cppflags -D_REENTRANT -DRATE_CONTROL - # fix #561720 by restoring pre-GCC5 inline semantics - append-cflags -std=gnu89 - - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable tcpd libwrap) \ - $(use_enable readline libreadline) \ - $(use_enable pcre libpcre) \ - --enable-mtftp -} - -src_install() { - default - - newinitd "${FILESDIR}"/atftp.init atftp - newconfd "${FILESDIR}"/atftp.confd atftp - - systemd_dounit "${FILESDIR}"/atftp.service - systemd_install_serviced "${FILESDIR}"/atftp.service.conf - - dodoc README* BUGS FAQ Changelog INSTALL TODO - dodoc "${S}"/docs/* - - docinto test - cd "${S}"/test || die - dodoc load.sh mtftp.conf pcre_pattern.txt test.sh test_suite.txt -} diff --git a/net-ftp/atftp/atftp-0.7.2-r1.ebuild b/net-ftp/atftp/atftp-0.7.2-r1.ebuild index 5a2c3723d44a..ed32bfa406cf 100644 --- a/net-ftp/atftp/atftp-0.7.2-r1.ebuild +++ b/net-ftp/atftp/atftp-0.7.2-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/atftp/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="amd64 arm ppc ppc64 ~s390 ~sparc x86" IUSE="selinux tcpd readline pcre" DEPEND="tcpd? ( sys-apps/tcp-wrappers ) diff --git a/net-ftp/atftp/files/atftp-0.7-CFLAGS.patch b/net-ftp/atftp/files/atftp-0.7-CFLAGS.patch deleted file mode 100644 index 566c1791c591..000000000000 --- a/net-ftp/atftp/files/atftp-0.7-CFLAGS.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- atftp-0.7/configure.ac -+++ atftp-0.7/configure.ac -@@ -66,29 +66,6 @@ - dnl Check for AIX - AC_AIX - --CFLAGS="-g -Wall -D_REENTRANT" -- --if test x$debug = xtrue; then -- CFLAGS="$CFLAGS -O0 -DDEBUG" --else -- if test -n "$auto_cflags"; then -- if test -n "$GCC"; then -- CFLAGS="$CFLAGS -g -O2 -Wall -Wno-implicit" -- else -- case "$host_os" in -- *hpux*) CFLAGS="$CFLAGS +O3" -- ;; -- *ultrix* | *osf*) CFLAGS="$CFLAGS -O -Olimit 2000" -- ;; -- *) CFLAGS="$CFLAGS -O2" -- ;; -- esac -- fi -- else -- CFLAGS="$CFLAGS -O2" -- fi --fi -- - AC_PROG_MAKE_SET - AC_PROG_INSTALL - diff --git a/net-ftp/atftp/files/atftp-0.7-blockno.patch b/net-ftp/atftp/files/atftp-0.7-blockno.patch deleted file mode 100644 index 6a3184f98bec..000000000000 --- a/net-ftp/atftp/files/atftp-0.7-blockno.patch +++ /dev/null @@ -1,136 +0,0 @@ ---- atftp-0.7/tftp_file.c~ 2010-05-27 13:05:12.000000000 -0500 -+++ atftp-0.7/tftp_file.c 2010-05-27 12:50:05.000000000 -0500 -@@ -133,19 +133,21 @@ - int mcast_sockfd = 0; - struct sockaddr_in sa_mcast; - struct ip_mreq mreq; - struct hostent *host; - int master_client = 0; - unsigned int file_bitmap[NB_BLOCK]; - int prev_bitmap_hole = -1; /* the previous hole found in the bitmap */ - char string[MAXLEN]; -+ int rx_block_number; - - int prev_block_number = 0; /* needed to support netascii convertion */ - int temp = 0; -+ size_t ignore; - - data->file_size = 0; - tftp_cancel = 0; - from.sin_addr.s_addr = 0; - - memset(&sa_mcast, 0, sizeof(struct sockaddr_in)); - memset(&file_bitmap, 0, sizeof(file_bitmap)); - -@@ -300,17 +302,17 @@ - { - connect(sockfd, (struct sockaddr *)&sa, sizeof(sa)); - connected = 1; - } - state = S_OACK_RECEIVED; - break; - case GET_ERROR: - fprintf(stderr, "tftp: error received from server <"); -- fwrite(tftphdr->th_msg, 1, data_size - 4 - 1, stderr); -+ ignore = fwrite(tftphdr->th_msg, 1, data_size - 4 - 1, stderr); - fprintf(stderr, ">\n"); - state = S_ABORT; - break; - case GET_DATA: - number_of_timeout = 0; - /* if the socket if not connected, connect it */ - if (!connected) - { -@@ -513,21 +515,24 @@ - state = S_WAIT_PACKET; - break; - case S_DATA_RECEIVED: - if ((multicast && master_client) || (!multicast)) - timeout_state = S_SEND_ACK; - else - timeout_state = S_WAIT_PACKET; - -- block_number = ntohs(tftphdr->th_block); -+ rx_block_number = ntohs(tftphdr->th_block); - if (data->trace) - fprintf(stderr, "received DATA <block: %d, size: %d>\n", - ntohs(tftphdr->th_block), data_size - 4); - -+ if ((uint16_t)rx_block_number == (uint16_t)(block_number+1)) -+ ++block_number; -+ - if (tftp_file_write(fp, tftphdr->th_data, data->data_buffer_size - 4, block_number, - data_size - 4, convert, &prev_block_number, &temp) - != data_size - 4) - { - - fprintf(stderr, "tftp: error writing to file %s\n", - data->local_file); - tftp_send_error(sockfd, &sa, ENOSPACE, data->data_buffer, -@@ -613,19 +618,21 @@ - int connected; /* 1 when sockfd is connected */ - struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; - FILE *fp; /* the local file pointer */ - int number_of_timeout = 0; - struct stat file_stat; - int convert = 0; /* if true, do netascii convertion */ - char string[MAXLEN]; - -+ int ack_block_number; - int prev_block_number = 0; /* needed to support netascii convertion */ - int prev_file_pos = 0; - int temp = 0; -+ size_t ignore; - - data->file_size = 0; - tftp_cancel = 0; - from.sin_addr.s_addr = 0; - - /* make sure the socket is not connected */ - sa.sin_family = AF_UNSPEC; - connect(sockfd, (struct sockaddr *)&sa, sizeof(sa)); -@@ -759,20 +766,23 @@ - case GET_ACK: - number_of_timeout = 0; - /* if the socket if not connected, connect it */ - if (!connected) - { - //connect(sockfd, (struct sockaddr *)&sa, sizeof(sa)); - connected = 1; - } -- block_number = ntohs(tftphdr->th_block); -+ ack_block_number = ntohs(tftphdr->th_block); -+ if ((uint16_t)(block_number+1) == ack_block_number) -+ ++block_number; - if (data->trace) - fprintf(stderr, "received ACK <block: %d>\n", -- block_number); -+ ack_block_number); -+ - if ((last_block != -1) && (block_number > last_block)) - { - state = S_END; - break; - } - state = S_SEND_DATA; - break; - case GET_OACK: -@@ -782,17 +792,17 @@ - { - //connect(sockfd, (struct sockaddr *)&sa, sizeof(sa)); - connected = 1; - } - state = S_OACK_RECEIVED; - break; - case GET_ERROR: - fprintf(stderr, "tftp: error received from server <"); -- fwrite(tftphdr->th_msg, 1, data_size - 4 - 1, stderr); -+ ignore = fwrite(tftphdr->th_msg, 1, data_size - 4 - 1, stderr); - fprintf(stderr, ">\n"); - state = S_ABORT; - break; - case GET_DISCARD: - /* consider discarded packet as timeout to make sure when don't lock up - if routing is broken */ - number_of_timeout++; - fprintf(stderr, "tftp: packet discard <%s:%d>.\n", diff --git a/net-ftp/atftp/files/atftp-0.7-glibc24.patch b/net-ftp/atftp/files/atftp-0.7-glibc24.patch deleted file mode 100644 index 195aec69b021..000000000000 --- a/net-ftp/atftp/files/atftp-0.7-glibc24.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- atftp-0.7/stats.c.org -+++ atftp-0.7/stats.c -@@ -18,6 +18,7 @@ - - #include <limits.h> - #include <string.h> -+#include <unistd.h> - #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-illreply.patch b/net-ftp/atftp/files/atftp-0.7-illreply.patch deleted file mode 100644 index 0f1cacd9b955..000000000000 --- a/net-ftp/atftp/files/atftp-0.7-illreply.patch +++ /dev/null @@ -1,12 +0,0 @@ -*** atftp-0.7/tftp_def.old.c 2009-02-28 17:56:12.000000000 +0100 ---- atftp-0.7/tftp_def.c 2009-02-28 17:57:02.000000000 +0100 -*************** -*** 141,146 **** ---- 141,147 ---- - */ - inline char *Strncpy(char *to, const char *from, size_t size) - { -+ if (size <= 0) { *to = '\000'; return to; } - to[size-1] = '\000'; - return strncpy(to, from, size - 1); - } diff --git a/net-ftp/atftp/files/atftp-0.7-password.patch b/net-ftp/atftp/files/atftp-0.7-password.patch deleted file mode 100644 index 26b59085dde5..000000000000 --- a/net-ftp/atftp/files/atftp-0.7-password.patch +++ /dev/null @@ -1,94 +0,0 @@ -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 <file> : local file name\n" - " -r, --remote-file <file> : remote file name\n" -+ " -P, --password <password>: specify password (Linksys ext.)\n" - " --tftp-timeout <value> : delay before retransmission, client side\n" - #if 0 - " t, --timeout <value> : 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 deleted file mode 100644 index 1f24b67471e2..000000000000 --- a/net-ftp/atftp/files/atftp-0.7-pcre.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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-spaced_filename.patch b/net-ftp/atftp/files/atftp-0.7-spaced_filename.patch deleted file mode 100644 index da96d9f6b820..000000000000 --- a/net-ftp/atftp/files/atftp-0.7-spaced_filename.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- atftp-0.7/tftp.c~ 2010-06-03 08:51:14.000000000 -0500 -+++ atftp-0.7/tftp.c 2010-06-03 09:40:56.000000000 -0500 -@@ -18,16 +18,17 @@ - #include "config.h" - - #include <stdio.h> - #include <stdlib.h> - #include <string.h> - #include <unistd.h> - #include <getopt.h> - #include <string.h> -+#include <stdarg.h> - - #include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> - #include <arpa/inet.h> - #include <netdb.h> - - #include <signal.h> -@@ -344,16 +345,41 @@ - - /* If no names matched, then return NULL. */ - return NULL; - } - # endif - #endif - - /* -+ * set argc/argv from variadic string arguments -+*/ -+void make_arg_vector(int *argc, char***argv, ...) -+{ -+ char **p; -+ char *s; -+ va_list argp; -+ -+ // how many args? -+ *argc = 0; -+ va_start(argp, argv); -+ while ( (s=va_arg(argp, char*)) ) -+ ++*argc; -+ -+ // allocate storage -+ *argv = malloc(*argc * sizeof (char*)); -+ -+ // store args -+ p = *argv; -+ va_start(argp, argv); -+ while ( (s=va_arg(argp, char*)) ) -+ *p++ = s; -+} -+ -+/* - * Split a string into args. - */ - void make_arg(char *string, int *argc, char ***argv) - { - static char *tmp = NULL; - size_t argz_len; - - /* split the string to an argz vector */ -@@ -1142,30 +1168,26 @@ - argv[optind+1]); - make_arg(string, &ac, &av); - process_cmd(ac, av); - } - - if (!interactive) - { - if (action == PUT) -- snprintf(string, sizeof(string), "put %s %s", local_file, -- remote_file); -+ make_arg_vector(&ac,&av,"put",local_file,remote_file,NULL); - else if (action == GET) -- snprintf(string, sizeof(string), "get %s %s", remote_file, -- local_file); -+ make_arg_vector(&ac,&av,"get",remote_file,local_file,NULL); - else if (action == MGET) -- snprintf(string, sizeof(string), "mget %s %s", remote_file, -- local_file); -+ make_arg_vector(&ac,&av,"mget",remote_file,local_file,NULL); - else - { - fprintf(stderr, "No action specified in batch mode!\n"); - exit(ERR); - } -- make_arg(string, &ac, &av); - if (process_cmd(ac, av) == ERR) - exit(ERR); - } - return OK; - } - - void tftp_usage(void) - { diff --git a/net-ftp/atftp/files/atftp-0.7-tests.patch b/net-ftp/atftp/files/atftp-0.7-tests.patch deleted file mode 100644 index 9e087950e659..000000000000 --- a/net-ftp/atftp/files/atftp-0.7-tests.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 <tsize:" out | sed -e "s/[^0-9]//g"` - if [ "$TSIZE" != "2048" ]; then - echo "ERROR (server report $TSIZE bytes but it should be 2048)" -+ ERROR=1 - else - echo "OK" -- ERROR=1 - fi - - # |