summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/inetutils/inetutils
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/inetutils/inetutils')
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils/0001-ftpd-telnetd-Fix-multiple-definitions-of-errcatch-an.patch58
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils/fix-buffer-fortify-tfpt.patch25
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch85
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch27
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch25
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch37
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch49
7 files changed, 0 insertions, 306 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 @@
1From 7d39930468e272c740b0eed3c7e5b7fb3abf29e8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 5 Aug 2020 10:36:22 -0700
4Subject: [PATCH] ftpd,telnetd: Fix multiple definitions of errcatch and not42
5
6This helps fix build failures when -fno-common option is used
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11Signed-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
18diff --git a/ftpd/extern.h b/ftpd/extern.h
19index 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;
31diff --git a/ftpd/ftpcmd.c b/ftpd/ftpcmd.c
32index 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;
43diff --git a/telnetd/utility.c b/telnetd/utility.c
44index 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--
572.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 @@
1tftpd: Fix abort on error path
2
3When trying to fetch a non existent file, the app crashes with:
4
5*** buffer overflow detected ***:
6Aborted
7
8
9Upstream-Status: Submitted [https://www.mail-archive.com/bug-inetutils@gnu.org/msg03036.html https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91205]
10Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
11diff --git a/src/tftpd.c b/src/tftpd.c
12index 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");
diff --git a/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch b/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch
deleted file mode 100644
index 603d2baf9d..0000000000
--- a/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch
+++ /dev/null
@@ -1,85 +0,0 @@
1From c7c27ba763c613f83c1561e56448b49315c271c5 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Wed, 6 Mar 2019 09:36:11 -0500
4Subject: [PATCH] Upstream:
5 http://www.mail-archive.com/bug-inetutils@gnu.org/msg02103.html
6
7Upstream-Status: Pending
8
9Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
10
11---
12 ping/ping_common.h | 20 ++++++++++++++++++++
13 1 file changed, 20 insertions(+)
14
15diff --git a/ping/ping_common.h b/ping/ping_common.h
16index 65e3e60..3e84db0 100644
17--- a/ping/ping_common.h
18+++ b/ping/ping_common.h
19@@ -18,10 +18,14 @@
20 You should have received a copy of the GNU General Public License
21 along with this program. If not, see `http://www.gnu.org/licenses/'. */
22
23+#include <config.h>
24+
25 #include <netinet/in_systm.h>
26 #include <netinet/in.h>
27 #include <netinet/ip.h>
28+#ifdef HAVE_IPV6
29 #include <netinet/icmp6.h>
30+#endif
31 #include <icmp.h>
32 #include <error.h>
33 #include <progname.h>
34@@ -63,7 +67,12 @@ struct ping_stat
35 want to follow the traditional behaviour of ping. */
36 #define DEFAULT_PING_COUNT 0
37
38+#ifdef HAVE_IPV6
39 #define PING_HEADER_LEN (USE_IPV6 ? sizeof (struct icmp6_hdr) : ICMP_MINLEN)
40+#else
41+#define PING_HEADER_LEN (ICMP_MINLEN)
42+#endif
43+
44 #define PING_TIMING(s) ((s) >= sizeof (struct timeval))
45 #define PING_DATALEN (64 - PING_HEADER_LEN) /* default data length */
46
47@@ -78,13 +87,20 @@ struct ping_stat
48
49 #define PING_MIN_USER_INTERVAL (200000/PING_PRECISION)
50
51+#ifdef HAVE_IPV6
52 /* FIXME: Adjust IPv6 case for options and their consumption. */
53 #define _PING_BUFLEN(p, u) ((u)? ((p)->ping_datalen + sizeof (struct icmp6_hdr)) : \
54 (MAXIPLEN + (p)->ping_datalen + ICMP_TSLEN))
55
56+#else
57+#define _PING_BUFLEN(p, u) (MAXIPLEN + (p)->ping_datalen + ICMP_TSLEN)
58+#endif
59+
60+#ifdef HAVE_IPV6
61 typedef int (*ping_efp6) (int code, void *closure, struct sockaddr_in6 * dest,
62 struct sockaddr_in6 * from, struct icmp6_hdr * icmp,
63 int datalen);
64+#endif
65
66 typedef int (*ping_efp) (int code,
67 void *closure,
68@@ -93,13 +109,17 @@ typedef int (*ping_efp) (int code,
69 struct ip * ip, icmphdr_t * icmp, int datalen);
70
71 union event {
72+#ifdef HAVE_IPV6
73 ping_efp6 handler6;
74+#endif
75 ping_efp handler;
76 };
77
78 union ping_address {
79 struct sockaddr_in ping_sockaddr;
80+#ifdef HAVE_IPV6
81 struct sockaddr_in6 ping_sockaddr6;
82+#endif
83 };
84
85 typedef struct ping_data PING;
diff --git a/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch b/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch
deleted file mode 100644
index 2974bd4f94..0000000000
--- a/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From f7f785c21306010b2367572250b2822df5bc7728 Mon Sep 17 00:00:00 2001
2From: Mike Frysinger <vapier at gentoo.org>
3Date: Thu, 18 Nov 2010 16:59:14 -0500
4Subject: [PATCH] printf-parse: pull in features.h for __GLIBC__
5
6Upstream-Status: Pending
7
8Signed-off-by: Mike Frysinger <vapier at gentoo.org>
9
10---
11 lib/printf-parse.h | 3 +++
12 1 file changed, 3 insertions(+)
13
14diff --git a/lib/printf-parse.h b/lib/printf-parse.h
15index e7d0f82..d7b4534 100644
16--- a/lib/printf-parse.h
17+++ b/lib/printf-parse.h
18@@ -28,6 +28,9 @@
19
20 #include "printf-args.h"
21
22+#ifdef HAVE_FEATURES_H
23+# include <features.h> /* for __GLIBC__ */
24+#endif
25
26 /* Flags */
27 #define FLAG_GROUP 1 /* ' flag */
diff --git a/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch b/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch
deleted file mode 100644
index 1ef7e21073..0000000000
--- a/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From 9089c6eafbf5903174dce87b68476e35db80beb9 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <martin.jansa@gmail.com>
3Date: Wed, 6 Mar 2019 09:36:11 -0500
4Subject: [PATCH] inetutils: Import version 1.9.4
5
6Upstream-Status: Pending
7
8---
9 lib/wchar.in.h | 3 +++
10 1 file changed, 3 insertions(+)
11
12diff --git a/lib/wchar.in.h b/lib/wchar.in.h
13index cdda680..043866a 100644
14--- a/lib/wchar.in.h
15+++ b/lib/wchar.in.h
16@@ -77,6 +77,9 @@
17 /* The include_next requires a split double-inclusion guard. */
18 #if @HAVE_WCHAR_H@
19 # @INCLUDE_NEXT@ @NEXT_WCHAR_H@
20+#else
21+# include <stddef.h>
22+# define MB_CUR_MAX 1
23 #endif
24
25 #undef _GL_ALREADY_INCLUDING_WCHAR_H
diff --git a/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch b/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch
deleted file mode 100644
index 460ddf9830..0000000000
--- a/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 101130f422dd5c01a1459645d7b2a5b8d19720ab Mon Sep 17 00:00:00 2001
2From: Martin Jansa <martin.jansa@gmail.com>
3Date: Wed, 6 Mar 2019 09:36:11 -0500
4Subject: [PATCH] inetutils: define PATH_PROCNET_DEV if not already defined
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9this prevents the following compilation error :
10system/linux.c:401:15: error: 'PATH_PROCNET_DEV' undeclared (first use in this function)
11
12this patch comes from :
13 http://repository.timesys.com/buildsources/i/inetutils/inetutils-1.9/
14
15Upstream-Status: Inappropriate [not author]
16
17Signed-of-by: Eric Bénard <eric@eukrea.com>
18
19---
20 ifconfig/system/linux.c | 4 ++++
21 1 file changed, 4 insertions(+)
22
23diff --git a/ifconfig/system/linux.c b/ifconfig/system/linux.c
24index e453b46..4268ca9 100644
25--- a/ifconfig/system/linux.c
26+++ b/ifconfig/system/linux.c
27@@ -53,6 +53,10 @@
28 #include "../ifconfig.h"
29
30
31+#ifndef PATH_PROCNET_DEV
32+ #define PATH_PROCNET_DEV "/proc/net/dev"
33+#endif
34+
35 /* ARPHRD stuff. */
36
37 static void
diff --git a/meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch b/meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch
deleted file mode 100644
index 7d5c087c9d..0000000000
--- a/meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From 684e45b34a33186bb17bcee0b01814c549a60bf6 Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com>
3Date: Wed, 6 Mar 2019 09:36:11 -0500
4Subject: [PATCH] inetutils: Import version 1.9.4
5
6Only check security/pam_appl.h which is provided by package libpam when pam is
7enabled.
8
9Upstream-Status: Pending
10
11Signed-off-by: Kai Kang <kai.kang@windriver.com>
12
13---
14 configure.ac | 15 ++++++++++++++-
15 1 file changed, 14 insertions(+), 1 deletion(-)
16
17diff --git a/configure.ac b/configure.ac
18index 86136fb..b220319 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -183,6 +183,19 @@ AC_SUBST(LIBUTIL)
22
23 # See if we have libpam.a. Investigate PAM versus Linux-PAM.
24 if test "$with_pam" = yes ; then
25+ AC_CHECK_HEADERS([security/pam_appl.h], [], [], [
26+#include <sys/types.h>
27+#ifdef HAVE_NETINET_IN_SYSTM_H
28+# include <netinet/in_systm.h>
29+#endif
30+#include <netinet/in.h>
31+#ifdef HAVE_NETINET_IP_H
32+# include <netinet/ip.h>
33+#endif
34+#ifdef HAVE_SYS_PARAM_H
35+# include <sys/param.h>
36+#endif
37+])
38 AC_CHECK_LIB(dl, dlopen, LIBDL=-ldl)
39 AC_CHECK_LIB(pam, pam_authenticate, LIBPAM=-lpam)
40 if test "$ac_cv_lib_pam_pam_authenticate" = yes ; then
41@@ -620,7 +633,7 @@ AC_HEADER_DIRENT
42 AC_CHECK_HEADERS([arpa/nameser.h arpa/tftp.h errno.h fcntl.h features.h \
43 glob.h memory.h netinet/ether.h netinet/in_systm.h \
44 netinet/ip.h netinet/ip_icmp.h netinet/ip_var.h \
45- security/pam_appl.h shadow.h \
46+ shadow.h \
47 stdarg.h stdlib.h string.h stropts.h sys/tty.h \
48 sys/utsname.h sys/ptyvar.h sys/msgbuf.h sys/filio.h \
49 sys/ioctl_compat.h sys/cdefs.h sys/stream.h sys/mkdev.h \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-02 17:51:22 +0000