diff options
Diffstat (limited to 'meta/recipes-connectivity/inetutils/inetutils')
9 files changed, 0 insertions, 323 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/0001-rcp-fix-to-work-with-large-files.patch b/meta/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch deleted file mode 100644 index d4764f5867..0000000000 --- a/meta/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Subject: rcp: fix to work with large files | ||
4 | |||
5 | When we copy file by rcp command, if the file > 2GB, it will fail. | ||
6 | The cause is that it used incorrect data type on file size in sink() of rcp. | ||
7 | |||
8 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
9 | --- | ||
10 | src/rcp.c | 4 ++-- | ||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/src/rcp.c b/src/rcp.c | ||
14 | index 21f55b6..bafa35f 100644 | ||
15 | --- a/src/rcp.c | ||
16 | +++ b/src/rcp.c | ||
17 | @@ -876,9 +876,9 @@ sink (int argc, char *argv[]) | ||
18 | enum | ||
19 | { YES, NO, DISPLAYED } wrerr; | ||
20 | BUF *bp; | ||
21 | - off_t i, j; | ||
22 | + off_t i, j, size; | ||
23 | int amt, count, exists, first, mask, mode, ofd, omode; | ||
24 | - int setimes, size, targisdir, wrerrno; | ||
25 | + int setimes, targisdir, wrerrno; | ||
26 | char ch, *cp, *np, *targ, *vect[1], buf[BUFSIZ]; | ||
27 | const char *why; | ||
28 | |||
29 | -- | ||
30 | 1.9.1 | ||
31 | |||
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"); | ||
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 24c134fcac..0000000000 --- a/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch +++ /dev/null | |||
@@ -1,83 +0,0 @@ | |||
1 | Upstream: http://www.mail-archive.com/bug-inetutils@gnu.org/msg02103.html | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
6 | --- | ||
7 | ping/ping_common.h | 20 ++++++++++++++++++++ | ||
8 | 1 file changed, 20 insertions(+) | ||
9 | |||
10 | diff --git a/ping/ping_common.h b/ping/ping_common.h | ||
11 | index 1dfd1b5..3bfbd12 100644 | ||
12 | --- a/ping/ping_common.h | ||
13 | +++ b/ping/ping_common.h | ||
14 | @@ -17,10 +17,14 @@ | ||
15 | You should have received a copy of the GNU General Public License | ||
16 | along with this program. If not, see `http://www.gnu.org/licenses/'. */ | ||
17 | |||
18 | +#include <config.h> | ||
19 | + | ||
20 | #include <netinet/in_systm.h> | ||
21 | #include <netinet/in.h> | ||
22 | #include <netinet/ip.h> | ||
23 | +#ifdef HAVE_IPV6 | ||
24 | #include <netinet/icmp6.h> | ||
25 | +#endif | ||
26 | #include <icmp.h> | ||
27 | #include <error.h> | ||
28 | #include <progname.h> | ||
29 | @@ -62,7 +66,12 @@ struct ping_stat | ||
30 | want to follow the traditional behaviour of ping. */ | ||
31 | #define DEFAULT_PING_COUNT 0 | ||
32 | |||
33 | +#ifdef HAVE_IPV6 | ||
34 | #define PING_HEADER_LEN (USE_IPV6 ? sizeof (struct icmp6_hdr) : ICMP_MINLEN) | ||
35 | +#else | ||
36 | +#define PING_HEADER_LEN (ICMP_MINLEN) | ||
37 | +#endif | ||
38 | + | ||
39 | #define PING_TIMING(s) ((s) >= sizeof (struct timeval)) | ||
40 | #define PING_DATALEN (64 - PING_HEADER_LEN) /* default data length */ | ||
41 | |||
42 | @@ -74,13 +83,20 @@ struct ping_stat | ||
43 | (t).tv_usec = ((i)%PING_PRECISION)*(1000000/PING_PRECISION) ;\ | ||
44 | } while (0) | ||
45 | |||
46 | +#ifdef HAVE_IPV6 | ||
47 | /* FIXME: Adjust IPv6 case for options and their consumption. */ | ||
48 | #define _PING_BUFLEN(p, u) ((u)? ((p)->ping_datalen + sizeof (struct icmp6_hdr)) : \ | ||
49 | (MAXIPLEN + (p)->ping_datalen + ICMP_TSLEN)) | ||
50 | |||
51 | +#else | ||
52 | +#define _PING_BUFLEN(p, u) (MAXIPLEN + (p)->ping_datalen + ICMP_TSLEN) | ||
53 | +#endif | ||
54 | + | ||
55 | +#ifdef HAVE_IPV6 | ||
56 | typedef int (*ping_efp6) (int code, void *closure, struct sockaddr_in6 * dest, | ||
57 | struct sockaddr_in6 * from, struct icmp6_hdr * icmp, | ||
58 | int datalen); | ||
59 | +#endif | ||
60 | |||
61 | typedef int (*ping_efp) (int code, | ||
62 | void *closure, | ||
63 | @@ -89,13 +105,17 @@ typedef int (*ping_efp) (int code, | ||
64 | struct ip * ip, icmphdr_t * icmp, int datalen); | ||
65 | |||
66 | union event { | ||
67 | +#ifdef HAVE_IPV6 | ||
68 | ping_efp6 handler6; | ||
69 | +#endif | ||
70 | ping_efp handler; | ||
71 | }; | ||
72 | |||
73 | union ping_address { | ||
74 | struct sockaddr_in ping_sockaddr; | ||
75 | +#ifdef HAVE_IPV6 | ||
76 | struct sockaddr_in6 ping_sockaddr6; | ||
77 | +#endif | ||
78 | }; | ||
79 | |||
80 | typedef struct ping_data PING; | ||
81 | -- | ||
82 | 2.8.3 | ||
83 | |||
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 3da4e9f55a..0000000000 --- a/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 552a7d64ad4a7188a9b7cd89933ae7caf7ebfe90 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mike Frysinger <vapier at gentoo.org> | ||
3 | Date: Thu, 18 Nov 2010 16:59:14 -0500 | ||
4 | Subject: [PATCH gnulib] printf-parse: pull in features.h for __GLIBC__ | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Mike Frysinger <vapier at gentoo.org> | ||
9 | --- | ||
10 | lib/printf-parse.h | 3 +++ | ||
11 | 1 files changed, 3 insertions(+), 0 deletions(-) | ||
12 | |||
13 | diff --git a/lib/printf-parse.h b/lib/printf-parse.h | ||
14 | index 67a4a2a..3bd6152 100644 | ||
15 | --- a/lib/printf-parse.h | ||
16 | +++ b/lib/printf-parse.h | ||
17 | @@ -25,6 +25,9 @@ | ||
18 | |||
19 | #include "printf-args.h" | ||
20 | |||
21 | +#ifdef HAVE_FEATURES_H | ||
22 | +# include <features.h> /* for __GLIBC__ */ | ||
23 | +#endif | ||
24 | |||
25 | /* Flags */ | ||
26 | #define FLAG_GROUP 1 /* ' flag */ | ||
27 | -- | ||
28 | 1.7.3.2 | ||
29 | |||
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 b13bb9229f..0000000000 --- a/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | --- inetutils-1.8/lib/wchar.in.h | ||
4 | +++ inetutils-1.8/lib/wchar.in.h | ||
5 | @@ -70,6 +70,9 @@ | ||
6 | /* The include_next requires a split double-inclusion guard. */ | ||
7 | #if @HAVE_WCHAR_H@ | ||
8 | # @INCLUDE_NEXT@ @NEXT_WCHAR_H@ | ||
9 | +#else | ||
10 | +# include <stddef.h> | ||
11 | +# define MB_CUR_MAX 1 | ||
12 | #endif | ||
13 | |||
14 | #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 2592989a90..0000000000 --- a/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | inetutils: define PATH_PROCNET_DEV if not already defined | ||
2 | |||
3 | this prevents the following compilation error : | ||
4 | system/linux.c:401:15: error: 'PATH_PROCNET_DEV' undeclared (first use in this function) | ||
5 | |||
6 | this patch comes from : | ||
7 | http://repository.timesys.com/buildsources/i/inetutils/inetutils-1.9/ | ||
8 | |||
9 | Upstream-Status: Inappropriate [not author] | ||
10 | |||
11 | Signed-of-by: Eric BĂ©nard <eric@eukrea.com> | ||
12 | --- | ||
13 | diff -Naur inetutils-1.9.orig/ifconfig/system/linux.c inetutils-1.9/ifconfig/system/linux.c | ||
14 | --- inetutils-1.9.orig/ifconfig/system/linux.c 2012-01-04 16:31:36.000000000 -0500 | ||
15 | +++ inetutils-1.9/ifconfig/system/linux.c 2012-01-04 16:40:53.000000000 -0500 | ||
16 | @@ -49,6 +49,10 @@ | ||
17 | #include "../ifconfig.h" | ||
18 | |||
19 | |||
20 | +#ifndef PATH_PROCNET_DEV | ||
21 | + #define PATH_PROCNET_DEV "/proc/net/dev" | ||
22 | +#endif | ||
23 | + | ||
24 | /* ARPHRD stuff. */ | ||
25 | |||
26 | 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 ff3abd86aa..0000000000 --- a/meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | Only check security/pam_appl.h which is provided by package libpam when pam is | ||
2 | enabled. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
7 | --- | ||
8 | diff --git a/configure.ac b/configure.ac | ||
9 | index b35e672..e78a751 100644 | ||
10 | --- a/configure.ac | ||
11 | +++ b/configure.ac | ||
12 | @@ -195,6 +195,19 @@ fi | ||
13 | |||
14 | # See if we have libpam.a. Investigate PAM versus Linux-PAM. | ||
15 | if test "$with_pam" = yes ; then | ||
16 | + AC_CHECK_HEADERS([security/pam_appl.h], [], [], [ | ||
17 | +#include <sys/types.h> | ||
18 | +#ifdef HAVE_NETINET_IN_SYSTM_H | ||
19 | +# include <netinet/in_systm.h> | ||
20 | +#endif | ||
21 | +#include <netinet/in.h> | ||
22 | +#ifdef HAVE_NETINET_IP_H | ||
23 | +# include <netinet/ip.h> | ||
24 | +#endif | ||
25 | +#ifdef HAVE_SYS_PARAM_H | ||
26 | +# include <sys/param.h> | ||
27 | +#endif | ||
28 | +]) | ||
29 | AC_CHECK_LIB(dl, dlopen, LIBDL=-ldl) | ||
30 | AC_CHECK_LIB(pam, pam_authenticate, LIBPAM=-lpam) | ||
31 | if test "$ac_cv_lib_pam_pam_authenticate" = yes ; then | ||
32 | @@ -587,7 +600,7 @@ AC_HEADER_DIRENT | ||
33 | AC_CHECK_HEADERS([arpa/nameser.h errno.h fcntl.h features.h \ | ||
34 | glob.h memory.h netinet/ether.h netinet/in_systm.h \ | ||
35 | netinet/ip.h netinet/ip_icmp.h netinet/ip_var.h \ | ||
36 | - security/pam_appl.h shadow.h \ | ||
37 | + shadow.h \ | ||
38 | stdarg.h stdlib.h string.h stropts.h sys/tty.h \ | ||
39 | sys/utsname.h sys/ptyvar.h sys/msgbuf.h sys/filio.h \ | ||
40 | sys/ioctl_compat.h sys/cdefs.h sys/stream.h sys/mkdev.h \ | ||
diff --git a/meta/recipes-connectivity/inetutils/inetutils/version.patch b/meta/recipes-connectivity/inetutils/inetutils/version.patch deleted file mode 100644 index 532a0e5c08..0000000000 --- a/meta/recipes-connectivity/inetutils/inetutils/version.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | remove m4_esyscmd function | ||
4 | |||
5 | Signed-off-by: Chunrong Guo <b40290@freescale.com> | ||
6 | --- inetutils-1.9.1/configure.ac 2012-01-06 22:05:05.000000000 +0800 | ||
7 | +++ inetutils-1.9.1/configure.ac 2012-11-12 14:01:11.732957019 +0800 | ||
8 | @@ -20,8 +20,7 @@ | ||
9 | |||
10 | AC_PREREQ(2.59) | ||
11 | |||
12 | -AC_INIT([GNU inetutils], | ||
13 | - m4_esyscmd([build-aux/git-version-gen .tarball-version 's/inetutils-/v/;s/_/./g']), | ||
14 | +AC_INIT([GNU inetutils],[1.9.4], | ||
15 | [bug-inetutils@gnu.org]) | ||
16 | |||
17 | AC_CONFIG_SRCDIR([src/inetd.c]) | ||