summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2023-08-31 12:22:49 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-09-02 11:47:50 +0100
commitcc025f14a2c72fdd6015192a1c134489d53dce0e (patch)
tree2adaa5cbc56c5836a2cc8aed818e778b93be160f /meta/recipes-connectivity
parentda317d8dfc41a0112ad6b5f29681b17df1480cec (diff)
downloadpoky-cc025f14a2c72fdd6015192a1c134489d53dce0e.tar.gz
inetutils: remove obsolete patches
fix-disable-ipv6.patch: we don't support uclibc, and most libcs don't have optional support for IPv6. inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch and inetutils-1.8-0003-wchar.patch: these don't appear to be needed anymore. inetutils-only-check-pam_appl.h-when-pam-enabled.patch: configure.ac doesn't fail if PAM is disabled anymore. (From OE-Core rev: abcc8273a788981bd06867d141b78aa0cfedddf4) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-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-only-check-pam_appl.h-when-pam-enabled.patch49
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils_2.4.bb4
5 files changed, 0 insertions, 190 deletions
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-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 2343c03cb4..0000000000
--- a/meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From cc66e842e037fba9f06761f942abe5c4856492b8 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 5e16c3a..18510a8 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -182,6 +182,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@@ -617,7 +630,7 @@ AC_HEADER_DIRENT
42 AC_CHECK_HEADERS([arpa/nameser.h arpa/tftp.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 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 \
diff --git a/meta/recipes-connectivity/inetutils/inetutils_2.4.bb b/meta/recipes-connectivity/inetutils/inetutils_2.4.bb
index d3f9e9e5fa..a84fed1fbb 100644
--- a/meta/recipes-connectivity/inetutils/inetutils_2.4.bb
+++ b/meta/recipes-connectivity/inetutils/inetutils_2.4.bb
@@ -13,17 +13,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7"
13 13
14SRC_URI[sha256sum] = "1789d6b1b1a57dfe2a7ab7b533ee9f5dfd9cbf5b59bb1bb3c2612ed08d0f68b2" 14SRC_URI[sha256sum] = "1789d6b1b1a57dfe2a7ab7b533ee9f5dfd9cbf5b59bb1bb3c2612ed08d0f68b2"
15SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.xz \ 15SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.xz \
16 file://inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch \
17 file://inetutils-1.8-0003-wchar.patch \
18 file://rexec.xinetd.inetutils \ 16 file://rexec.xinetd.inetutils \
19 file://rlogin.xinetd.inetutils \ 17 file://rlogin.xinetd.inetutils \
20 file://rsh.xinetd.inetutils \ 18 file://rsh.xinetd.inetutils \
21 file://telnet.xinetd.inetutils \ 19 file://telnet.xinetd.inetutils \
22 file://tftpd.xinetd.inetutils \ 20 file://tftpd.xinetd.inetutils \
23 file://inetutils-only-check-pam_appl.h-when-pam-enabled.patch \
24 file://0001-CVE-2023-40303-ftpd-rcp-rlogin-rsh-rshd-uucpd-fix-ch.patch \ 21 file://0001-CVE-2023-40303-ftpd-rcp-rlogin-rsh-rshd-uucpd-fix-ch.patch \
25 file://0002-CVE-2023-40303-Indent-changes-in-previous-commit.patch \ 22 file://0002-CVE-2023-40303-Indent-changes-in-previous-commit.patch \
26 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', 'file://fix-disable-ipv6.patch', d)} \
27 " 23 "
28 24
29inherit autotools gettext update-alternatives texinfo 25inherit autotools gettext update-alternatives texinfo