mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-02 18:32:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

inetutils: remove unused patch files

Browse Source 
* they were removed from SRC_URI in:
  https://git.openembedded.org/openembedded-core/commit/?id=a21e8fdf1b66961ddae5929d393daa08800bb748

(From OE-Core rev: de86594c102e04aa55208b39d63c0593ade14b7c)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e2030f2a651920435787b4a580dd18894c1bc02c)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Martin Jansa
2023-05-24 09:53:18 +02:00
committed by Steve Sakoman
parent 87e6f439be
commit 60b79a980b
2 changed files with 0 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
meta/recipes-connectivity/inetutils/inetutils/0001-ftpd-telnetd-Fix-multiple-definitions-of-errcatch-an.patch
View File

@@ -1,58 +0,0 @@
From 7d39930468e272c740b0eed3c7e5b7fb3abf29e8 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 5 Aug 2020 10:36:22 -0700
Subject: [PATCH] ftpd,telnetd: Fix multiple definitions of errcatch and not42
This helps fix build failures when -fno-common option is used
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
ftpd/extern.h | 2 +-
ftpd/ftpcmd.c | 1 +
telnetd/utility.c | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ftpd/extern.h b/ftpd/extern.h
index ab33cf3..91dbbee 100644
--- a/ftpd/extern.h
+++ b/ftpd/extern.h
@@ -90,7 +90,7 @@ extern void user (const char *);
extern char *sgetsave (const char *);
/* Exported from ftpd.c. */
-jmp_buf errcatch;
+extern jmp_buf errcatch;
extern struct sockaddr_storage data_dest;
extern socklen_t data_dest_len;
extern struct sockaddr_storage his_addr;
diff --git a/ftpd/ftpcmd.c b/ftpd/ftpcmd.c
index beb1f06..d272e9d 100644
--- a/ftpd/ftpcmd.c
+++ b/ftpd/ftpcmd.c
@@ -106,6 +106,7 @@
#endif
off_t restart_point;
+jmp_buf errcatch;
static char cbuf[512]; /* Command Buffer. */
static char *fromname;
diff --git a/telnetd/utility.c b/telnetd/utility.c
index e7ffb8e..46bf91e 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -63,7 +63,7 @@ static int ncc;
static char ptyibuf[BUFSIZ], *ptyip;
static int pcc;
-int not42;
+extern int not42;
static int
readstream (int p, char *ibuf, int bufsize)
--
2.28.0

25
meta/recipes-connectivity/inetutils/inetutils/fix-buffer-fortify-tfpt.patch
View File

@@ -1,25 +0,0 @@
tftpd: Fix abort on error path
When trying to fetch a non existent file, the app crashes with:
*** buffer overflow detected ***:
Aborted
Upstream-Status: Submitted [https://www.mail-archive.com/bug-inetutils@gnu.org/msg03036.html https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91205]
Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
diff --git a/src/tftpd.c b/src/tftpd.c
index 56002a0..144012f 100644
--- a/src/tftpd.c
+++ b/src/tftpd.c
@@ -864,9 +864,8 @@ nak (int error)
pe->e_msg = strerror (error - 100);
tp->th_code = EUNDEF; /* set 'undef' errorcode */
}
- strcpy (tp->th_msg, pe->e_msg);
length = strlen (pe->e_msg);
- tp->th_msg[length] = '\0';
+ memcpy(tp->th_msg, pe->e_msg, length + 1);
length += 5;
if (sendto (peer, buf, length, 0, (struct sockaddr *) &from, fromlen) != length)
syslog (LOG_ERR, "nak: %m\n");