summaryrefslogtreecommitdiff
path: root/net-ftp/linksys-tftp
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-01-08 11:28:34 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-01-08 11:28:34 +0000
commit24fd814c326e282c4321965c31f341dad77e270d (patch)
tree033d63b33c21a3209964ab56005bb9bdd523630d /net-ftp/linksys-tftp
parent129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)
gentoo resync : 08.01.2021
Diffstat (limited to 'net-ftp/linksys-tftp')
-rw-r--r--net-ftp/linksys-tftp/Manifest4
-rw-r--r--net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-clang.patch196
-rw-r--r--net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-fno-common.patch11
-rw-r--r--net-ftp/linksys-tftp/linksys-tftp-1.2.1-r3.ebuild21
4 files changed, 221 insertions, 11 deletions
diff --git a/net-ftp/linksys-tftp/Manifest b/net-ftp/linksys-tftp/Manifest
index d6bbabfb0e07..674765ebf4bb 100644
--- a/net-ftp/linksys-tftp/Manifest
+++ b/net-ftp/linksys-tftp/Manifest
@@ -1,5 +1,7 @@
AUX linksys-tftp-1.2.1-r1-Makefile.patch 734 BLAKE2B 3ac66fa3b8f2693d072836031785726fbe1ab23d762ce8aad70fcba06cc262bc5e10b65f2464adcb03fe56a44cf4303d52668172d22a4008c3d8151489c93c1f SHA512 ebb5288cf4774550f7bcc090efd43873c631ff6a029e17fcbaffe9150d71b37a4f3f317744958c3a8864f0e64042f4bfcd144aecd6ee6bf245d8c34a63c875a3
+AUX linksys-tftp-1.2.1-r1-clang.patch 4206 BLAKE2B bf7fda154ac8341bd15c6c3ee8998451e08aaf612c0361c2c2dd89d8f2a809c8428d5e8d1097857fa5d32cc9ffed31a52714f53ef83b4f2eea03100651b1c571 SHA512 4c513621e535f72cfda5fe80277ee28597dcdc8ded9a902cb08e71c38ec84e200da83a7b37fa4f387f13b81e9e70f4e3d6718f924e21a84196676cb84272207a
+AUX linksys-tftp-1.2.1-r1-fno-common.patch 231 BLAKE2B 412c90ea110ded87aca95df6132d1825189b0f21ce2be21ac57a754980f5c99dfbfb426a093a58d179e9562cc2e4d2a09bfdcae9d47100ad7a7899a9bcd1ea3f SHA512 ed36e569a8d5d75c4c1674591a44f9b83eb40b9a3b29e847f8760417c4dbce62b2e7e95e65f9513d40d1e996dc6061d538d11f76995d81ab91f30e9f6472974e
AUX linksys-tftp-1.2.1-r1-header.patch 959 BLAKE2B 7db548e0ecc70528c0ca974ca6cc1244615138aaead1f7f0e6384e35217532493f1e6d5fc167e54ab44e36cf241e5e821400cd60ec1ac900aee217e7e8478725 SHA512 8d59f13f16b9b512488d5773904ac0f617d2bbbff567040e009e8033012435c713d0ebac5ea145add5adb8881a66eefef4926a8aab2adc6590826744549356f7
DIST linksys-tftp-1.2.1.tar.bz2 11124 BLAKE2B 44a3bb1a11c9dae6014c3ec5f0c56c2a056e542f2f7f1d7a805479925beedebe9a79a8cddc64ce2455b459d8fa4436f16d52c6d86d8595fa1f05aa747f14bc78 SHA512 7d99cd7cc2144396fe008ed0fbc21053ef4e614021d6d2e24adca799d8eabd1b3c177b4bee20e14034170bc234d36e9eeaaf8e825513ef6f37e73643b91667fc
-EBUILD linksys-tftp-1.2.1-r3.ebuild 616 BLAKE2B b7a96d3a5ecaa211600678e7ffe96b25c2ae51a7eb059fe565a3a0828241801a1b424d0ef19d7afe760094e83c2cfb6d8959c0722ac5a565190675f8bb049995 SHA512 e116e13d1ed342dbfae4ebb2f8e4288ea35990bf7ac08738958e8b177398fb09ab5b87724d2ab9791a03bdd11e6743e48885ce52db18fbeea27f051adf3e03d1
+EBUILD linksys-tftp-1.2.1-r3.ebuild 642 BLAKE2B 10ff536014310c4c5200381566968e0b4c6fd66b66948e61f923b6edc58947e4560f8b09d39cc4440f7931122d599cd7d1b974f62ea745a32ce551d1a58a689b SHA512 6ad9d3c50bed561d3a02fff787b61c7eefb3d318f78382ad09fbd08498c55336e2f48026930ed0361104b4c8cbb15858e041e0aba72f398f8cd19a74a973360b
MISC metadata.xml 257 BLAKE2B c0414223216e6f9feab05fa4f6837713d195308a1c2cb561240dc05f212872da091cccb2d2dba14263dc989d67a756e0b6e7e06089544301b0ff04b0416fc2a7 SHA512 4c898784a8a98208bf3efdfed832bd66ece4f6af70d271946741e23947c080d850073f3859b8859717ba2ea74aa032cdd17e5950fe08bd26b45d30b6c636eff6
diff --git a/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-clang.patch b/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-clang.patch
new file mode 100644
index 000000000000..94ccee0c9eef
--- /dev/null
+++ b/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-clang.patch
@@ -0,0 +1,196 @@
+--- a/main.c
++++ b/main.c
+@@ -159,7 +159,7 @@ setpeer(argc, argv)
+
+ if (!argv[1]) {
+ printf("usage: %s host-name [port] (Default port is 69/udp)\n", argv[0]);
+- return;
++ return 0;
+ }
+ host = gethostbyname(argv[1]);
+ if (host) {
+@@ -172,7 +172,7 @@ setpeer(argc, argv)
+ if (sin.sin_addr.s_addr == -1) {
+ connected = 0;
+ printf("%s: unknown host\n", argv[1]);
+- return;
++ return 0;
+ }
+ strcpy(hostname, argv[1]);
+ }
+@@ -182,7 +182,7 @@ setpeer(argc, argv)
+ if (port < 0) {
+ printf("%s: bad port number\n", argv[2]);
+ connected = 0;
+- return;
++ return 0;
+ }
+ port = htons(port);
+ }
+@@ -209,7 +209,7 @@ modecmd(argc, argv)
+
+ if (argc < 2) {
+ printf("Using %s mode to transfer files.\n", mode);
+- return;
++ return 0;
+ }
+ if (argc == 2) {
+ for (p = modes; p->m_name; p++)
+@@ -217,7 +217,7 @@ modecmd(argc, argv)
+ break;
+ if (p->m_name) {
+ setmode(p->m_mode);
+- return;
++ return 0;
+ }
+ printf("%s: unknown mode\n", argv[1]);
+ /* drop through and print usage message */
+@@ -231,7 +231,7 @@ modecmd(argc, argv)
+ sep = " | ";
+ }
+ printf(" ]\n");
+- return;
++ return 0;
+ }
+
+ setbinary(argc, argv)
+@@ -265,31 +265,32 @@ put(argc, argv)
+
+ if (argc < 3) {
+ putusage(argv[0]);
+- return;
++ return 0;
+ }
+ linkpass = argv[2];
+ if (!connected) {
+ fprintf(stderr,"No target machine specified.\n");
+- return;
++ return 0;
+ }
+ cp = argv[1];
+ fd = open(cp, O_RDONLY);
+ if (fd < 0) {
+ fprintf(stderr, "tftp: "); perror(cp);
+- return;
++ return 0;
+ }
+ if (verbose)
+ printf("putting %s to %s:%s [%s] AUTH %s\n",
+ cp, hostname, cp, mode, linkpass);
+ sin.sin_port = port;
+ sendfile(fd, cp, mode, linkpass);
+- return;
++ return 0;
+ }
+
+ putusage(s)
+ char *s;
+ {
+ printf("usage: %s file [linksys pass] (you must be connected)\n", s);
++ return 0;
+ }
+
+ /*
+@@ -304,18 +305,18 @@ get(argc, argv)
+
+ if (argc < 3) {
+ getusage(argv[0]);
+- return;
++ return 0;
+ }
+ linkpass = argv[2];
+ if (!connected) {
+ fprintf(stderr,"No target machine specified.\n");
+- return;
++ return 0;
+ }
+ cp = argv[1];
+ fd = creat(cp, 0644);
+ if (fd < 0) {
+ fprintf(stderr, "tftp: "); perror(cp);
+- return;
++ return 0;
+ }
+ if (verbose)
+ printf("getting from %s:%s to %s [%s] AUTH %s\n",
+@@ -323,7 +324,7 @@ get(argc, argv)
+ sin.sin_port = port;
+ recvfile(fd, cp, mode, linkpass);
+
+- return;
++ return 0;
+ }
+
+ getusage(s)
+@@ -349,7 +350,7 @@ setrexmt(argc, argv)
+ }
+ if (argc != 2) {
+ printf("usage: %s value\n", argv[0]);
+- return;
++ return 0;
+ }
+ t = atoi(argv[1]);
+ if (t < 0)
+@@ -375,7 +376,7 @@ settimeout(argc, argv)
+ }
+ if (argc != 2) {
+ printf("usage: %s value\n", argv[0]);
+- return;
++ return 0;
+ }
+ t = atoi(argv[1]);
+ if (t < 0)
+@@ -450,7 +451,7 @@ getcmd(name)
+ longest = 0;
+ nmatches = 0;
+ found = 0;
+- if(!name) return;
++ if(!name) return 0;
+ for (c = cmdtab; p = c->name; c++) {
+ for (q = name; *q == *p++; q++)
+ if (*q == 0) /* exact match? */
+@@ -513,7 +514,7 @@ help(argc, argv)
+ printf("Commands may be abbreviated. Commands are:\n\n");
+ for (c = cmdtab; c->name; c++)
+ printf("%-*s\t%s\n", HELPINDENT, c->name, c->help);
+- return;
++ return 0;
+ }
+ while (--argc > 0) {
+ register char *arg;
+@@ -557,7 +558,7 @@ setblocksize(argc, argv)
+ }
+ if (argc != 2) {
+ printf("usage: %s value\n", argv[0]);
+- return;
++ return 0;
+ }
+ t = atoi(argv[1]);
+ if (t < 8 || t > 1432)
+@@ -570,5 +571,5 @@ banner() {
+ printf("Mike Lynn\tabaddon [at] 802.11ninja.net\n");
+ printf("Linksys TFTP Client for *BSD/Linux\tThe Firmware gets sexier\n");
+ printf("Modified Berkeley TFTP client Release: %s\n\n",svers);
+- return;
++ return 0;
+ }
+--- a/tftpsubs.c
++++ b/tftpsubs.c
+@@ -116,7 +116,7 @@ read_ahead(file, convert)
+
+ b = &bfs[nextone]; /* look at "next" buffer */
+ if (b->counter != BF_FREE) /* nop if not free */
+- return;
++ return 0;
+ nextone = !nextone; /* "incr" next buffer ptr */
+
+ dp = (struct tftphdr *)b->buf;
+@@ -131,7 +131,7 @@ read_ahead(file, convert)
+ b->counter += i;
+ } while (i != 0 && !(i < 0 && errno != EINTR) &&
+ b->counter < segsize);
+- return;
++ return 0;
+ }
+
+ p = dp->th_data;
diff --git a/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-fno-common.patch b/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-fno-common.patch
new file mode 100644
index 000000000000..a63977619845
--- /dev/null
+++ b/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/tftp.c
++++ b/tftp.c
+@@ -50,7 +50,7 @@ extern int segsize;
+ #define PKTSIZE (1432+4) /* SEGSIZE+4 */
+ char ackbuf[PKTSIZE];
+ int timeout;
+-jmp_buf toplevel;
++extern jmp_buf toplevel;
+ jmp_buf timeoutbuf;
+
+ #ifndef OACK
diff --git a/net-ftp/linksys-tftp/linksys-tftp-1.2.1-r3.ebuild b/net-ftp/linksys-tftp/linksys-tftp-1.2.1-r3.ebuild
index b265bc6ee05c..ba390c758671 100644
--- a/net-ftp/linksys-tftp/linksys-tftp-1.2.1-r3.ebuild
+++ b/net-ftp/linksys-tftp/linksys-tftp-1.2.1-r3.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="TFTP client suitable for uploading to the Linksys WRT54G Wireless Router"
-HOMEPAGE="https://www.redsand.net/solutions/linksys_tftp.html"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="https://www.redsand.net/solutions/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-src_prepare() {
- epatch "${FILESDIR}"/${P}-r1-header.patch
- epatch "${FILESDIR}"/${P}-r1-Makefile.patch
-}
+PATCHES=(
+ "${FILESDIR}/${P}-r1-header.patch"
+ "${FILESDIR}/${P}-r1-Makefile.patch"
+ "${FILESDIR}/${P}-r1-fno-common.patch"
+ "${FILESDIR}/${P}-r1-clang.patch"
+)
src_compile() {
emake CC="$(tc-getCC)"
@@ -25,5 +26,5 @@ src_compile() {
src_install() {
dobin linksys-tftp
- dodoc README
+ einstalldocs
}