summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/inetutils
diff options
context:
space:
mode:
authorOleksandr Kravchuk <open.source@oleksandr-kravchuk.com>2021-02-06 19:28:36 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-08 14:47:16 +0000
commitbf64a62bfd6ec580788070e9e18626a4e4d70f81 (patch)
tree368b476ac31037a9f72c070cae98a1b0a4c16379 /meta/recipes-connectivity/inetutils
parentc5d80f154de30a6f59f28d4d9d05edcd78469765 (diff)
downloadpoky-bf64a62bfd6ec580788070e9e18626a4e4d70f81.tar.gz
inetutils: update to 2.0
Removed upstreamed patches and refreshed q few other. (From OE-Core rev: a21e8fdf1b66961ddae5929d393daa08800bb748) Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/inetutils')
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch31
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch24
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch16
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch17
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch21
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch17
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils/version.patch17
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils_2.0.bb (renamed from meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb)9
8 files changed, 65 insertions, 87 deletions
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 @@
1Upstream-Status: Pending
2
3Subject: rcp: fix to work with large files
4
5When we copy file by rcp command, if the file > 2GB, it will fail.
6The cause is that it used incorrect data type on file size in sink() of rcp.
7
8Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
9---
10 src/rcp.c | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/src/rcp.c b/src/rcp.c
14index 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--
301.9.1
31
diff --git a/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch b/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch
index 24c134fcac..603d2baf9d 100644
--- a/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch
+++ b/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch
@@ -1,17 +1,22 @@
1Upstream: http://www.mail-archive.com/bug-inetutils@gnu.org/msg02103.html 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
2 6
3Upstream-Status: Pending 7Upstream-Status: Pending
4 8
5Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 9Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
10
6--- 11---
7 ping/ping_common.h | 20 ++++++++++++++++++++ 12 ping/ping_common.h | 20 ++++++++++++++++++++
8 1 file changed, 20 insertions(+) 13 1 file changed, 20 insertions(+)
9 14
10diff --git a/ping/ping_common.h b/ping/ping_common.h 15diff --git a/ping/ping_common.h b/ping/ping_common.h
11index 1dfd1b5..3bfbd12 100644 16index 65e3e60..3e84db0 100644
12--- a/ping/ping_common.h 17--- a/ping/ping_common.h
13+++ b/ping/ping_common.h 18+++ b/ping/ping_common.h
14@@ -17,10 +17,14 @@ 19@@ -18,10 +18,14 @@
15 You should have received a copy of the GNU General Public License 20 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/'. */ 21 along with this program. If not, see `http://www.gnu.org/licenses/'. */
17 22
@@ -26,7 +31,7 @@ index 1dfd1b5..3bfbd12 100644
26 #include <icmp.h> 31 #include <icmp.h>
27 #include <error.h> 32 #include <error.h>
28 #include <progname.h> 33 #include <progname.h>
29@@ -62,7 +66,12 @@ struct ping_stat 34@@ -63,7 +67,12 @@ struct ping_stat
30 want to follow the traditional behaviour of ping. */ 35 want to follow the traditional behaviour of ping. */
31 #define DEFAULT_PING_COUNT 0 36 #define DEFAULT_PING_COUNT 0
32 37
@@ -39,9 +44,9 @@ index 1dfd1b5..3bfbd12 100644
39 #define PING_TIMING(s) ((s) >= sizeof (struct timeval)) 44 #define PING_TIMING(s) ((s) >= sizeof (struct timeval))
40 #define PING_DATALEN (64 - PING_HEADER_LEN) /* default data length */ 45 #define PING_DATALEN (64 - PING_HEADER_LEN) /* default data length */
41 46
42@@ -74,13 +83,20 @@ struct ping_stat 47@@ -78,13 +87,20 @@ struct ping_stat
43 (t).tv_usec = ((i)%PING_PRECISION)*(1000000/PING_PRECISION) ;\ 48
44 } while (0) 49 #define PING_MIN_USER_INTERVAL (200000/PING_PRECISION)
45 50
46+#ifdef HAVE_IPV6 51+#ifdef HAVE_IPV6
47 /* FIXME: Adjust IPv6 case for options and their consumption. */ 52 /* FIXME: Adjust IPv6 case for options and their consumption. */
@@ -60,7 +65,7 @@ index 1dfd1b5..3bfbd12 100644
60 65
61 typedef int (*ping_efp) (int code, 66 typedef int (*ping_efp) (int code,
62 void *closure, 67 void *closure,
63@@ -89,13 +105,17 @@ typedef int (*ping_efp) (int code, 68@@ -93,13 +109,17 @@ typedef int (*ping_efp) (int code,
64 struct ip * ip, icmphdr_t * icmp, int datalen); 69 struct ip * ip, icmphdr_t * icmp, int datalen);
65 70
66 union event { 71 union event {
@@ -78,6 +83,3 @@ index 1dfd1b5..3bfbd12 100644
78 }; 83 };
79 84
80 typedef struct ping_data PING; 85 typedef struct ping_data PING;
81--
822.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
index 3da4e9f55a..2974bd4f94 100644
--- 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
@@ -1,20 +1,21 @@
1From 552a7d64ad4a7188a9b7cd89933ae7caf7ebfe90 Mon Sep 17 00:00:00 2001 1From f7f785c21306010b2367572250b2822df5bc7728 Mon Sep 17 00:00:00 2001
2From: Mike Frysinger <vapier at gentoo.org> 2From: Mike Frysinger <vapier at gentoo.org>
3Date: Thu, 18 Nov 2010 16:59:14 -0500 3Date: Thu, 18 Nov 2010 16:59:14 -0500
4Subject: [PATCH gnulib] printf-parse: pull in features.h for __GLIBC__ 4Subject: [PATCH] printf-parse: pull in features.h for __GLIBC__
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
8Signed-off-by: Mike Frysinger <vapier at gentoo.org> 8Signed-off-by: Mike Frysinger <vapier at gentoo.org>
9
9--- 10---
10 lib/printf-parse.h | 3 +++ 11 lib/printf-parse.h | 3 +++
11 1 files changed, 3 insertions(+), 0 deletions(-) 12 1 file changed, 3 insertions(+)
12 13
13diff --git a/lib/printf-parse.h b/lib/printf-parse.h 14diff --git a/lib/printf-parse.h b/lib/printf-parse.h
14index 67a4a2a..3bd6152 100644 15index e7d0f82..d7b4534 100644
15--- a/lib/printf-parse.h 16--- a/lib/printf-parse.h
16+++ b/lib/printf-parse.h 17+++ b/lib/printf-parse.h
17@@ -25,6 +25,9 @@ 18@@ -28,6 +28,9 @@
18 19
19 #include "printf-args.h" 20 #include "printf-args.h"
20 21
@@ -24,6 +25,3 @@ index 67a4a2a..3bd6152 100644
24 25
25 /* Flags */ 26 /* Flags */
26 #define FLAG_GROUP 1 /* ' flag */ 27 #define FLAG_GROUP 1 /* ' flag */
27--
281.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
index b13bb9229f..1ef7e21073 100644
--- a/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch
+++ b/meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch
@@ -1,8 +1,19 @@
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
1Upstream-Status: Pending 6Upstream-Status: Pending
2 7
3--- inetutils-1.8/lib/wchar.in.h 8---
4+++ inetutils-1.8/lib/wchar.in.h 9 lib/wchar.in.h | 3 +++
5@@ -70,6 +70,9 @@ 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 @@
6 /* The include_next requires a split double-inclusion guard. */ 17 /* The include_next requires a split double-inclusion guard. */
7 #if @HAVE_WCHAR_H@ 18 #if @HAVE_WCHAR_H@
8 # @INCLUDE_NEXT@ @NEXT_WCHAR_H@ 19 # @INCLUDE_NEXT@ @NEXT_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
index 2592989a90..460ddf9830 100644
--- 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
@@ -1,4 +1,10 @@
1inetutils: define PATH_PROCNET_DEV if not already defined 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
2 8
3this prevents the following compilation error : 9this prevents the following compilation error :
4system/linux.c:401:15: error: 'PATH_PROCNET_DEV' undeclared (first use in this function) 10system/linux.c:401:15: error: 'PATH_PROCNET_DEV' undeclared (first use in this function)
@@ -9,11 +15,16 @@ this patch comes from :
9Upstream-Status: Inappropriate [not author] 15Upstream-Status: Inappropriate [not author]
10 16
11Signed-of-by: Eric Bénard <eric@eukrea.com> 17Signed-of-by: Eric Bénard <eric@eukrea.com>
18
12--- 19---
13diff -Naur inetutils-1.9.orig/ifconfig/system/linux.c inetutils-1.9/ifconfig/system/linux.c 20 ifconfig/system/linux.c | 4 ++++
14--- inetutils-1.9.orig/ifconfig/system/linux.c 2012-01-04 16:31:36.000000000 -0500 21 1 file changed, 4 insertions(+)
15+++ inetutils-1.9/ifconfig/system/linux.c 2012-01-04 16:40:53.000000000 -0500 22
16@@ -49,6 +49,10 @@ 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 @@
17 #include "../ifconfig.h" 28 #include "../ifconfig.h"
18 29
19 30
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
index ff3abd86aa..7d5c087c9d 100644
--- 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
@@ -1,15 +1,24 @@
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
1Only check security/pam_appl.h which is provided by package libpam when pam is 6Only check security/pam_appl.h which is provided by package libpam when pam is
2enabled. 7enabled.
3 8
4Upstream-Status: Pending 9Upstream-Status: Pending
5 10
6Signed-off-by: Kai Kang <kai.kang@windriver.com> 11Signed-off-by: Kai Kang <kai.kang@windriver.com>
12
7--- 13---
14 configure.ac | 15 ++++++++++++++-
15 1 file changed, 14 insertions(+), 1 deletion(-)
16
8diff --git a/configure.ac b/configure.ac 17diff --git a/configure.ac b/configure.ac
9index b35e672..e78a751 100644 18index 86136fb..b220319 100644
10--- a/configure.ac 19--- a/configure.ac
11+++ b/configure.ac 20+++ b/configure.ac
12@@ -195,6 +195,19 @@ fi 21@@ -183,6 +183,19 @@ AC_SUBST(LIBUTIL)
13 22
14 # See if we have libpam.a. Investigate PAM versus Linux-PAM. 23 # See if we have libpam.a. Investigate PAM versus Linux-PAM.
15 if test "$with_pam" = yes ; then 24 if test "$with_pam" = yes ; then
@@ -29,8 +38,8 @@ index b35e672..e78a751 100644
29 AC_CHECK_LIB(dl, dlopen, LIBDL=-ldl) 38 AC_CHECK_LIB(dl, dlopen, LIBDL=-ldl)
30 AC_CHECK_LIB(pam, pam_authenticate, LIBPAM=-lpam) 39 AC_CHECK_LIB(pam, pam_authenticate, LIBPAM=-lpam)
31 if test "$ac_cv_lib_pam_pam_authenticate" = yes ; then 40 if test "$ac_cv_lib_pam_pam_authenticate" = yes ; then
32@@ -587,7 +600,7 @@ AC_HEADER_DIRENT 41@@ -620,7 +633,7 @@ AC_HEADER_DIRENT
33 AC_CHECK_HEADERS([arpa/nameser.h errno.h fcntl.h features.h \ 42 AC_CHECK_HEADERS([arpa/nameser.h arpa/tftp.h errno.h fcntl.h features.h \
34 glob.h memory.h netinet/ether.h netinet/in_systm.h \ 43 glob.h memory.h netinet/ether.h netinet/in_systm.h \
35 netinet/ip.h netinet/ip_icmp.h netinet/ip_var.h \ 44 netinet/ip.h netinet/ip_icmp.h netinet/ip_var.h \
36- security/pam_appl.h shadow.h \ 45- security/pam_appl.h shadow.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 @@
1Upstream-Status: Pending
2
3remove m4_esyscmd function
4
5Signed-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])
diff --git a/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/meta/recipes-connectivity/inetutils/inetutils_2.0.bb
index 09a196ad9d..a4d05b0542 100644
--- a/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
+++ b/meta/recipes-connectivity/inetutils/inetutils_2.0.bb
@@ -10,8 +10,7 @@ LICENSE = "GPLv3"
10 10
11LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7" 11LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7"
12 12
13SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \ 13SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.xz \
14 file://version.patch \
15 file://inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch \ 14 file://inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch \
16 file://inetutils-1.8-0003-wchar.patch \ 15 file://inetutils-1.8-0003-wchar.patch \
17 file://rexec.xinetd.inetutils \ 16 file://rexec.xinetd.inetutils \
@@ -21,13 +20,9 @@ SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \
21 file://tftpd.xinetd.inetutils \ 20 file://tftpd.xinetd.inetutils \
22 file://inetutils-1.9-PATH_PROCNET_DEV.patch \ 21 file://inetutils-1.9-PATH_PROCNET_DEV.patch \
23 file://inetutils-only-check-pam_appl.h-when-pam-enabled.patch \ 22 file://inetutils-only-check-pam_appl.h-when-pam-enabled.patch \
24 file://0001-rcp-fix-to-work-with-large-files.patch \
25 file://fix-buffer-fortify-tfpt.patch \
26 file://0001-ftpd-telnetd-Fix-multiple-definitions-of-errcatch-an.patch \
27" 23"
28 24
29SRC_URI[md5sum] = "04852c26c47cc8c6b825f2b74f191f52" 25SRC_URI[md5sum] = "5e1018502cd131ed8e42339f6b5c98aa"
30SRC_URI[sha256sum] = "be8f75eff936b8e41b112462db51adf689715658a1b09e0d6b05d11ec92cc616"
31 26
32inherit autotools gettext update-alternatives texinfo 27inherit autotools gettext update-alternatives texinfo
33 28