diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2023-05-24 09:53:18 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-25 12:36:00 +0100 |
| commit | 55703b38d14812124735170b72db0fb7a54b926c (patch) | |
| tree | c3a7c2c528543761cc716b215838dcaf25b9650d /meta | |
| parent | 38c8b079808327ae6bc91484f19e32acf796a2d5 (diff) | |
| download | poky-55703b38d14812124735170b72db0fb7a54b926c.tar.gz | |
inetutils: remove unused patch files
* they were removed from SRC_URI in:
https://git.openembedded.org/openembedded-core/commit/?id=a21e8fdf1b66961ddae5929d393daa08800bb748
(From OE-Core rev: e2030f2a651920435787b4a580dd18894c1bc02c)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
2 files changed, 0 insertions, 83 deletions
diff --git a/meta/recipes-connectivity/inetutils/inetutils/0001-ftpd-telnetd-Fix-multiple-definitions-of-errcatch-an.patch b/meta/recipes-connectivity/inetutils/inetutils/0001-ftpd-telnetd-Fix-multiple-definitions-of-errcatch-an.patch deleted file mode 100644 index 49d319f59d..0000000000 --- a/meta/recipes-connectivity/inetutils/inetutils/0001-ftpd-telnetd-Fix-multiple-definitions-of-errcatch-an.patch +++ /dev/null | |||
| @@ -1,58 +0,0 @@ | |||
| 1 | From 7d39930468e272c740b0eed3c7e5b7fb3abf29e8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Wed, 5 Aug 2020 10:36:22 -0700 | ||
| 4 | Subject: [PATCH] ftpd,telnetd: Fix multiple definitions of errcatch and not42 | ||
| 5 | |||
| 6 | This helps fix build failures when -fno-common option is used | ||
| 7 | |||
| 8 | Upstream-Status: Pending | ||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 10 | |||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | --- | ||
| 13 | ftpd/extern.h | 2 +- | ||
| 14 | ftpd/ftpcmd.c | 1 + | ||
| 15 | telnetd/utility.c | 2 +- | ||
| 16 | 3 files changed, 3 insertions(+), 2 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/ftpd/extern.h b/ftpd/extern.h | ||
| 19 | index ab33cf3..91dbbee 100644 | ||
| 20 | --- a/ftpd/extern.h | ||
| 21 | +++ b/ftpd/extern.h | ||
| 22 | @@ -90,7 +90,7 @@ extern void user (const char *); | ||
| 23 | extern char *sgetsave (const char *); | ||
| 24 | |||
| 25 | /* Exported from ftpd.c. */ | ||
| 26 | -jmp_buf errcatch; | ||
| 27 | +extern jmp_buf errcatch; | ||
| 28 | extern struct sockaddr_storage data_dest; | ||
| 29 | extern socklen_t data_dest_len; | ||
| 30 | extern struct sockaddr_storage his_addr; | ||
| 31 | diff --git a/ftpd/ftpcmd.c b/ftpd/ftpcmd.c | ||
| 32 | index beb1f06..d272e9d 100644 | ||
| 33 | --- a/ftpd/ftpcmd.c | ||
| 34 | +++ b/ftpd/ftpcmd.c | ||
| 35 | @@ -106,6 +106,7 @@ | ||
| 36 | #endif | ||
| 37 | |||
| 38 | off_t restart_point; | ||
| 39 | +jmp_buf errcatch; | ||
| 40 | |||
| 41 | static char cbuf[512]; /* Command Buffer. */ | ||
| 42 | static char *fromname; | ||
| 43 | diff --git a/telnetd/utility.c b/telnetd/utility.c | ||
| 44 | index e7ffb8e..46bf91e 100644 | ||
| 45 | --- a/telnetd/utility.c | ||
| 46 | +++ b/telnetd/utility.c | ||
| 47 | @@ -63,7 +63,7 @@ static int ncc; | ||
| 48 | static char ptyibuf[BUFSIZ], *ptyip; | ||
| 49 | static int pcc; | ||
| 50 | |||
| 51 | -int not42; | ||
| 52 | +extern int not42; | ||
| 53 | |||
| 54 | static int | ||
| 55 | readstream (int p, char *ibuf, int bufsize) | ||
| 56 | -- | ||
| 57 | 2.28.0 | ||
| 58 | |||
diff --git a/meta/recipes-connectivity/inetutils/inetutils/fix-buffer-fortify-tfpt.patch b/meta/recipes-connectivity/inetutils/inetutils/fix-buffer-fortify-tfpt.patch deleted file mode 100644 index a91913cb51..0000000000 --- a/meta/recipes-connectivity/inetutils/inetutils/fix-buffer-fortify-tfpt.patch +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | tftpd: Fix abort on error path | ||
| 2 | |||
| 3 | When trying to fetch a non existent file, the app crashes with: | ||
| 4 | |||
| 5 | *** buffer overflow detected ***: | ||
| 6 | Aborted | ||
| 7 | |||
| 8 | |||
| 9 | Upstream-Status: Submitted [https://www.mail-archive.com/bug-inetutils@gnu.org/msg03036.html https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91205] | ||
| 10 | Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com> | ||
| 11 | diff --git a/src/tftpd.c b/src/tftpd.c | ||
| 12 | index 56002a0..144012f 100644 | ||
| 13 | --- a/src/tftpd.c | ||
| 14 | +++ b/src/tftpd.c | ||
| 15 | @@ -864,9 +864,8 @@ nak (int error) | ||
| 16 | pe->e_msg = strerror (error - 100); | ||
| 17 | tp->th_code = EUNDEF; /* set 'undef' errorcode */ | ||
| 18 | } | ||
| 19 | - strcpy (tp->th_msg, pe->e_msg); | ||
| 20 | length = strlen (pe->e_msg); | ||
| 21 | - tp->th_msg[length] = '\0'; | ||
| 22 | + memcpy(tp->th_msg, pe->e_msg, length + 1); | ||
| 23 | length += 5; | ||
| 24 | if (sendto (peer, buf, length, 0, (struct sockaddr *) &from, fromlen) != length) | ||
| 25 | syslog (LOG_ERR, "nak: %m\n"); | ||
