diff options
Diffstat (limited to 'meta/recipes-connectivity/inetutils')
-rw-r--r-- | meta/recipes-connectivity/inetutils/inetutils/0001-ftpd-telnetd-Fix-multiple-definitions-of-errcatch-an.patch | 58 | ||||
-rw-r--r-- | meta/recipes-connectivity/inetutils/inetutils/fix-buffer-fortify-tfpt.patch | 25 | ||||
-rw-r--r-- | meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch | 85 | ||||
-rw-r--r-- | meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch | 27 | ||||
-rw-r--r-- | meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch | 25 | ||||
-rw-r--r-- | meta/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch | 37 | ||||
-rw-r--r-- | meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch | 49 | ||||
-rw-r--r-- | meta/recipes-connectivity/inetutils/inetutils_2.5.bb (renamed from meta/recipes-connectivity/inetutils/inetutils_2.0.bb) | 156 |
8 files changed, 81 insertions, 381 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/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 603d2baf9d..0000000000 --- a/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch +++ /dev/null | |||
@@ -1,85 +0,0 @@ | |||
1 | From c7c27ba763c613f83c1561e56448b49315c271c5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jackie Huang <jackie.huang@windriver.com> | ||
3 | Date: Wed, 6 Mar 2019 09:36:11 -0500 | ||
4 | Subject: [PATCH] Upstream: | ||
5 | http://www.mail-archive.com/bug-inetutils@gnu.org/msg02103.html | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
10 | |||
11 | --- | ||
12 | ping/ping_common.h | 20 ++++++++++++++++++++ | ||
13 | 1 file changed, 20 insertions(+) | ||
14 | |||
15 | diff --git a/ping/ping_common.h b/ping/ping_common.h | ||
16 | index 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 @@ | |||
1 | From f7f785c21306010b2367572250b2822df5bc7728 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] 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 | --- | ||
11 | lib/printf-parse.h | 3 +++ | ||
12 | 1 file changed, 3 insertions(+) | ||
13 | |||
14 | diff --git a/lib/printf-parse.h b/lib/printf-parse.h | ||
15 | index 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 @@ | |||
1 | From 9089c6eafbf5903174dce87b68476e35db80beb9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <martin.jansa@gmail.com> | ||
3 | Date: Wed, 6 Mar 2019 09:36:11 -0500 | ||
4 | Subject: [PATCH] inetutils: Import version 1.9.4 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | --- | ||
9 | lib/wchar.in.h | 3 +++ | ||
10 | 1 file changed, 3 insertions(+) | ||
11 | |||
12 | diff --git a/lib/wchar.in.h b/lib/wchar.in.h | ||
13 | index 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 @@ | |||
1 | From 101130f422dd5c01a1459645d7b2a5b8d19720ab Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <martin.jansa@gmail.com> | ||
3 | Date: Wed, 6 Mar 2019 09:36:11 -0500 | ||
4 | Subject: [PATCH] inetutils: define PATH_PROCNET_DEV if not already defined | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | this prevents the following compilation error : | ||
10 | system/linux.c:401:15: error: 'PATH_PROCNET_DEV' undeclared (first use in this function) | ||
11 | |||
12 | this patch comes from : | ||
13 | http://repository.timesys.com/buildsources/i/inetutils/inetutils-1.9/ | ||
14 | |||
15 | Upstream-Status: Inappropriate [not author] | ||
16 | |||
17 | Signed-of-by: Eric Bénard <eric@eukrea.com> | ||
18 | |||
19 | --- | ||
20 | ifconfig/system/linux.c | 4 ++++ | ||
21 | 1 file changed, 4 insertions(+) | ||
22 | |||
23 | diff --git a/ifconfig/system/linux.c b/ifconfig/system/linux.c | ||
24 | index 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 @@ | |||
1 | From 684e45b34a33186bb17bcee0b01814c549a60bf6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Kai Kang <kai.kang@windriver.com> | ||
3 | Date: Wed, 6 Mar 2019 09:36:11 -0500 | ||
4 | Subject: [PATCH] inetutils: Import version 1.9.4 | ||
5 | |||
6 | Only check security/pam_appl.h which is provided by package libpam when pam is | ||
7 | enabled. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
12 | |||
13 | --- | ||
14 | configure.ac | 15 ++++++++++++++- | ||
15 | 1 file changed, 14 insertions(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index 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 \ | ||
diff --git a/meta/recipes-connectivity/inetutils/inetutils_2.0.bb b/meta/recipes-connectivity/inetutils/inetutils_2.5.bb index a4d05b0542..afb0462c61 100644 --- a/meta/recipes-connectivity/inetutils/inetutils_2.0.bb +++ b/meta/recipes-connectivity/inetutils/inetutils_2.5.bb | |||
@@ -1,3 +1,4 @@ | |||
1 | SUMMARY = "The GNU inetutils are a collection of common networking utilities and servers." | ||
1 | DESCRIPTION = "The GNU inetutils are a collection of common \ | 2 | DESCRIPTION = "The GNU inetutils are a collection of common \ |
2 | networking utilities and servers including ftp, ftpd, rcp, \ | 3 | networking utilities and servers including ftp, ftpd, rcp, \ |
3 | rexec, rlogin, rlogind, rsh, rshd, syslog, syslogd, talk, \ | 4 | rexec, rlogin, rlogind, rsh, rshd, syslog, syslogd, talk, \ |
@@ -6,30 +7,23 @@ HOMEPAGE = "http://www.gnu.org/software/inetutils" | |||
6 | SECTION = "net" | 7 | SECTION = "net" |
7 | DEPENDS = "ncurses netbase readline virtual/crypt" | 8 | DEPENDS = "ncurses netbase readline virtual/crypt" |
8 | 9 | ||
9 | LICENSE = "GPLv3" | 10 | LICENSE = "GPL-3.0-only" |
10 | 11 | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7" |
12 | 13 | ||
14 | SRC_URI[sha256sum] = "87697d60a31e10b5cb86a9f0651e1ec7bee98320d048c0739431aac3d5764fb6" | ||
13 | SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.xz \ | 15 | SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.xz \ |
14 | file://inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch \ | 16 | file://rexec.xinetd.inetutils \ |
15 | file://inetutils-1.8-0003-wchar.patch \ | ||
16 | file://rexec.xinetd.inetutils \ | ||
17 | file://rlogin.xinetd.inetutils \ | 17 | file://rlogin.xinetd.inetutils \ |
18 | file://rsh.xinetd.inetutils \ | 18 | file://rsh.xinetd.inetutils \ |
19 | file://telnet.xinetd.inetutils \ | 19 | file://telnet.xinetd.inetutils \ |
20 | file://tftpd.xinetd.inetutils \ | 20 | file://tftpd.xinetd.inetutils \ |
21 | file://inetutils-1.9-PATH_PROCNET_DEV.patch \ | 21 | " |
22 | file://inetutils-only-check-pam_appl.h-when-pam-enabled.patch \ | ||
23 | " | ||
24 | |||
25 | SRC_URI[md5sum] = "5e1018502cd131ed8e42339f6b5c98aa" | ||
26 | 22 | ||
27 | inherit autotools gettext update-alternatives texinfo | 23 | inherit autotools gettext update-alternatives texinfo |
28 | 24 | ||
29 | acpaths = "-I ./m4" | 25 | acpaths = "-I ./m4" |
30 | 26 | ||
31 | SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', 'file://fix-disable-ipv6.patch', d)}" | ||
32 | |||
33 | PACKAGECONFIG ??= "ftp uucpd \ | 27 | PACKAGECONFIG ??= "ftp uucpd \ |
34 | ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ | 28 | ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ |
35 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6 ping6', '', d)} \ | 29 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6 ping6', '', d)} \ |
@@ -41,24 +35,36 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6 gl_cv_socket_ipv6=no," | |||
41 | PACKAGECONFIG[ping6] = "--enable-ping6,--disable-ping6," | 35 | PACKAGECONFIG[ping6] = "--enable-ping6,--disable-ping6," |
42 | 36 | ||
43 | EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR} \ | 37 | EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR} \ |
44 | inetutils_cv_path_login=${base_bindir}/login \ | ||
45 | --with-libreadline-prefix=${STAGING_LIBDIR} \ | 38 | --with-libreadline-prefix=${STAGING_LIBDIR} \ |
46 | --enable-rpath=no \ | 39 | --enable-rpath=no \ |
47 | " | 40 | --with-path-login=${base_bindir}/login \ |
41 | --with-path-cp=${base_bindir}/cp \ | ||
42 | --with-path-uucico=${libexecdir}/uuico \ | ||
43 | --with-path-procnet-dev=/proc/net/dev \ | ||
44 | " | ||
45 | |||
46 | EXTRA_OECONF:append:libc-musl = " --with-path-utmpx=/dev/null/utmpx --with-path-wtmpx=/dev/null/wtmpx" | ||
48 | 47 | ||
49 | # These are horrible for security, disable them | 48 | # These are horrible for security, disable them |
50 | EXTRA_OECONF_append = " --disable-rsh --disable-rshd --disable-rcp \ | 49 | EXTRA_OECONF:append = " --disable-rsh --disable-rshd --disable-rcp \ |
51 | --disable-rlogin --disable-rlogind --disable-rexec --disable-rexecd" | 50 | --disable-rlogin --disable-rlogind --disable-rexec --disable-rexecd" |
52 | 51 | ||
53 | do_configure_prepend () { | 52 | # The configure script guesses many paths in cross builds, check for this happening |
53 | do_configure_cross_check() { | ||
54 | if grep "may be incorrect because of cross-compilation" ${B}/config.log; then | ||
55 | bberror Default path values used, these must be set explicitly | ||
56 | fi | ||
57 | } | ||
58 | do_configure[postfuncs] += "do_configure_cross_check" | ||
59 | |||
60 | # The --with-path options are not actually options, so this check needs to be silenced | ||
61 | ERROR_QA:remove = "unknown-configure-option" | ||
62 | |||
63 | do_configure:prepend () { | ||
54 | export HELP2MAN='true' | 64 | export HELP2MAN='true' |
55 | cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}/build-aux/config.rpath | ||
56 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} | ||
57 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} | ||
58 | rm -f ${S}/glob/configure* | ||
59 | } | 65 | } |
60 | 66 | ||
61 | do_install_append () { | 67 | do_install:append () { |
62 | install -m 0755 -d ${D}${base_sbindir} | 68 | install -m 0755 -d ${D}${base_sbindir} |
63 | install -m 0755 -d ${D}${sbindir} | 69 | install -m 0755 -d ${D}${sbindir} |
64 | install -m 0755 -d ${D}${sysconfdir}/xinetd.d | 70 | install -m 0755 -d ${D}${sysconfdir}/xinetd.d |
@@ -74,23 +80,23 @@ do_install_append () { | |||
74 | mv ${D}${libexecdir}/telnetd ${D}${sbindir}/in.telnetd | 80 | mv ${D}${libexecdir}/telnetd ${D}${sbindir}/in.telnetd |
75 | if [ -e ${D}${libexecdir}/rexecd ]; then | 81 | if [ -e ${D}${libexecdir}/rexecd ]; then |
76 | mv ${D}${libexecdir}/rexecd ${D}${sbindir}/in.rexecd | 82 | mv ${D}${libexecdir}/rexecd ${D}${sbindir}/in.rexecd |
77 | cp ${WORKDIR}/rexec.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rexec | 83 | cp ${UNPACKDIR}/rexec.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rexec |
78 | fi | 84 | fi |
79 | if [ -e ${D}${libexecdir}/rlogind ]; then | 85 | if [ -e ${D}${libexecdir}/rlogind ]; then |
80 | mv ${D}${libexecdir}/rlogind ${D}${sbindir}/in.rlogind | 86 | mv ${D}${libexecdir}/rlogind ${D}${sbindir}/in.rlogind |
81 | cp ${WORKDIR}/rlogin.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rlogin | 87 | cp ${UNPACKDIR}/rlogin.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rlogin |
82 | fi | 88 | fi |
83 | if [ -e ${D}${libexecdir}/rshd ]; then | 89 | if [ -e ${D}${libexecdir}/rshd ]; then |
84 | mv ${D}${libexecdir}/rshd ${D}${sbindir}/in.rshd | 90 | mv ${D}${libexecdir}/rshd ${D}${sbindir}/in.rshd |
85 | cp ${WORKDIR}/rsh.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rsh | 91 | cp ${UNPACKDIR}/rsh.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rsh |
86 | fi | 92 | fi |
87 | if [ -e ${D}${libexecdir}/talkd ]; then | 93 | if [ -e ${D}${libexecdir}/talkd ]; then |
88 | mv ${D}${libexecdir}/talkd ${D}${sbindir}/in.talkd | 94 | mv ${D}${libexecdir}/talkd ${D}${sbindir}/in.talkd |
89 | fi | 95 | fi |
90 | mv ${D}${libexecdir}/uucpd ${D}${sbindir}/in.uucpd | 96 | mv ${D}${libexecdir}/uucpd ${D}${sbindir}/in.uucpd |
91 | mv ${D}${libexecdir}/* ${D}${bindir}/ | 97 | mv ${D}${libexecdir}/* ${D}${bindir}/ |
92 | cp ${WORKDIR}/telnet.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/telnet | 98 | cp ${UNPACKDIR}/telnet.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/telnet |
93 | cp ${WORKDIR}/tftpd.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/tftpd | 99 | cp ${UNPACKDIR}/tftpd.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/tftpd |
94 | 100 | ||
95 | sed -e 's,@SBINDIR@,${sbindir},g' -i ${D}/${sysconfdir}/xinetd.d/* | 101 | sed -e 's,@SBINDIR@,${sbindir},g' -i ${D}/${sysconfdir}/xinetd.d/* |
96 | if [ -e ${D}${libdir}/charset.alias ]; then | 102 | if [ -e ${D}${libdir}/charset.alias ]; then |
@@ -114,34 +120,34 @@ PACKAGES =+ "${PN}-tftpd-dbg ${PN}-telnetd-dbg ${PN}-rshd-dbg" | |||
114 | NOAUTOPACKAGEDEBUG = "1" | 120 | NOAUTOPACKAGEDEBUG = "1" |
115 | 121 | ||
116 | ALTERNATIVE_PRIORITY = "79" | 122 | ALTERNATIVE_PRIORITY = "79" |
117 | ALTERNATIVE_${PN} = "whois dnsdomainname" | 123 | ALTERNATIVE:${PN} = "whois dnsdomainname" |
118 | ALTERNATIVE_LINK_NAME[uucpd] = "${sbindir}/in.uucpd" | 124 | ALTERNATIVE_LINK_NAME[uucpd] = "${sbindir}/in.uucpd" |
119 | ALTERNATIVE_LINK_NAME[dnsdomainname] = "${base_bindir}/dnsdomainname" | 125 | ALTERNATIVE_LINK_NAME[dnsdomainname] = "${base_bindir}/dnsdomainname" |
120 | 126 | ||
121 | ALTERNATIVE_PRIORITY_${PN}-logger = "60" | 127 | ALTERNATIVE_PRIORITY_${PN}-logger = "60" |
122 | ALTERNATIVE_${PN}-logger = "logger" | 128 | ALTERNATIVE:${PN}-logger = "logger" |
123 | ALTERNATIVE_${PN}-syslogd = "syslogd" | 129 | ALTERNATIVE:${PN}-syslogd = "syslogd" |
124 | ALTERNATIVE_LINK_NAME[syslogd] = "${base_sbindir}/syslogd" | 130 | ALTERNATIVE_LINK_NAME[syslogd] = "${base_sbindir}/syslogd" |
125 | 131 | ||
126 | ALTERNATIVE_${PN}-ftp = "ftp" | 132 | ALTERNATIVE:${PN}-ftp = "ftp" |
127 | ALTERNATIVE_${PN}-ftpd = "ftpd" | 133 | ALTERNATIVE:${PN}-ftpd = "ftpd" |
128 | ALTERNATIVE_${PN}-tftp = "tftp" | 134 | ALTERNATIVE:${PN}-tftp = "tftp" |
129 | ALTERNATIVE_${PN}-tftpd = "tftpd" | 135 | ALTERNATIVE:${PN}-tftpd = "tftpd" |
130 | ALTERNATIVE_LINK_NAME[tftpd] = "${sbindir}/tftpd" | 136 | ALTERNATIVE_LINK_NAME[tftpd] = "${sbindir}/tftpd" |
131 | ALTERNATIVE_TARGET[tftpd] = "${sbindir}/in.tftpd" | 137 | ALTERNATIVE_TARGET[tftpd] = "${sbindir}/in.tftpd" |
132 | 138 | ||
133 | ALTERNATIVE_${PN}-telnet = "telnet" | 139 | ALTERNATIVE:${PN}-telnet = "telnet" |
134 | ALTERNATIVE_${PN}-telnetd = "telnetd" | 140 | ALTERNATIVE:${PN}-telnetd = "telnetd" |
135 | ALTERNATIVE_LINK_NAME[telnetd] = "${sbindir}/telnetd" | 141 | ALTERNATIVE_LINK_NAME[telnetd] = "${sbindir}/telnetd" |
136 | ALTERNATIVE_TARGET[telnetd] = "${sbindir}/in.telnetd" | 142 | ALTERNATIVE_TARGET[telnetd] = "${sbindir}/in.telnetd" |
137 | 143 | ||
138 | ALTERNATIVE_${PN}-inetd= "inetd" | 144 | ALTERNATIVE:${PN}-inetd= "inetd" |
139 | ALTERNATIVE_${PN}-traceroute = "traceroute" | 145 | ALTERNATIVE:${PN}-traceroute = "traceroute" |
140 | 146 | ||
141 | ALTERNATIVE_${PN}-hostname = "hostname" | 147 | ALTERNATIVE:${PN}-hostname = "hostname" |
142 | ALTERNATIVE_LINK_NAME[hostname] = "${base_bindir}/hostname" | 148 | ALTERNATIVE_LINK_NAME[hostname] = "${base_bindir}/hostname" |
143 | 149 | ||
144 | ALTERNATIVE_${PN}-doc = "hostname.1 dnsdomainname.1 logger.1 syslogd.8 \ | 150 | ALTERNATIVE:${PN}-doc = "hostname.1 dnsdomainname.1 logger.1 syslogd.8 \ |
145 | tftpd.8 tftp.1 telnetd.8" | 151 | tftpd.8 tftp.1 telnetd.8" |
146 | ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" | 152 | ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" |
147 | ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1" | 153 | ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1" |
@@ -151,62 +157,62 @@ ALTERNATIVE_LINK_NAME[telnetd.8] = "${mandir}/man8/telnetd.8" | |||
151 | ALTERNATIVE_LINK_NAME[tftpd.8] = "${mandir}/man8/tftpd.8" | 157 | ALTERNATIVE_LINK_NAME[tftpd.8] = "${mandir}/man8/tftpd.8" |
152 | ALTERNATIVE_LINK_NAME[tftp.1] = "${mandir}/man1/tftp.1" | 158 | ALTERNATIVE_LINK_NAME[tftp.1] = "${mandir}/man1/tftp.1" |
153 | 159 | ||
154 | ALTERNATIVE_${PN}-ifconfig = "ifconfig" | 160 | ALTERNATIVE:${PN}-ifconfig = "ifconfig" |
155 | ALTERNATIVE_LINK_NAME[ifconfig] = "${base_sbindir}/ifconfig" | 161 | ALTERNATIVE_LINK_NAME[ifconfig] = "${base_sbindir}/ifconfig" |
156 | 162 | ||
157 | ALTERNATIVE_${PN}-ping = "ping" | 163 | ALTERNATIVE:${PN}-ping = "ping" |
158 | ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" | 164 | ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" |
159 | 165 | ||
160 | ALTERNATIVE_${PN}-ping6 = "${@bb.utils.filter('PACKAGECONFIG', 'ping6', d)}" | 166 | ALTERNATIVE:${PN}-ping6 = "${@bb.utils.filter('PACKAGECONFIG', 'ping6', d)}" |
161 | ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6" | 167 | ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6" |
162 | 168 | ||
163 | 169 | ||
164 | FILES_${PN}-dbg += "${base_bindir}/.debug ${base_sbindir}/.debug ${bindir}/.debug ${sbindir}/.debug" | 170 | FILES:${PN}-dbg += "${base_bindir}/.debug ${base_sbindir}/.debug ${bindir}/.debug ${sbindir}/.debug" |
165 | FILES_${PN}-ping = "${base_bindir}/ping.${BPN}" | 171 | FILES:${PN}-ping = "${base_bindir}/ping.${BPN}" |
166 | FILES_${PN}-ping6 = "${base_bindir}/ping6.${BPN}" | 172 | FILES:${PN}-ping6 = "${base_bindir}/ping6.${BPN}" |
167 | FILES_${PN}-hostname = "${base_bindir}/hostname.${BPN}" | 173 | FILES:${PN}-hostname = "${base_bindir}/hostname.${BPN}" |
168 | FILES_${PN}-ifconfig = "${base_sbindir}/ifconfig.${BPN}" | 174 | FILES:${PN}-ifconfig = "${base_sbindir}/ifconfig.${BPN}" |
169 | FILES_${PN}-traceroute = "${bindir}/traceroute.${BPN}" | 175 | FILES:${PN}-traceroute = "${bindir}/traceroute.${BPN}" |
170 | FILES_${PN}-logger = "${bindir}/logger.${BPN}" | 176 | FILES:${PN}-logger = "${bindir}/logger.${BPN}" |
171 | 177 | ||
172 | FILES_${PN}-syslogd = "${base_sbindir}/syslogd.${BPN}" | 178 | FILES:${PN}-syslogd = "${base_sbindir}/syslogd.${BPN}" |
173 | RCONFLICTS_${PN}-syslogd = "rsyslog busybox-syslog sysklogd syslog-ng" | 179 | RCONFLICTS:${PN}-syslogd = "rsyslog busybox-syslog sysklogd syslog-ng" |
174 | 180 | ||
175 | FILES_${PN}-ftp = "${bindir}/ftp.${BPN}" | 181 | FILES:${PN}-ftp = "${bindir}/ftp.${BPN}" |
176 | 182 | ||
177 | FILES_${PN}-tftp = "${bindir}/tftp.${BPN}" | 183 | FILES:${PN}-tftp = "${bindir}/tftp.${BPN}" |
178 | FILES_${PN}-telnet = "${bindir}/telnet.${BPN}" | 184 | FILES:${PN}-telnet = "${bindir}/telnet.${BPN}" |
179 | 185 | ||
180 | # We make us of RCONFLICTS / RPROVIDES here rather than using the normal | 186 | # We make us of RCONFLICTS / RPROVIDES here rather than using the normal |
181 | # alternatives method as this leads to packaging QA issues when using | 187 | # alternatives method as this leads to packaging QA issues when using |
182 | # musl as that library does not provide what these applications need to | 188 | # musl as that library does not provide what these applications need to |
183 | # build. | 189 | # build. |
184 | FILES_${PN}-rsh = "${bindir}/rsh ${bindir}/rlogin ${bindir}/rexec ${bindir}/rcp" | 190 | FILES:${PN}-rsh = "${bindir}/rsh ${bindir}/rlogin ${bindir}/rexec ${bindir}/rcp" |
185 | RCONFLICTS_${PN}-rsh += "netkit-rsh-client" | 191 | RCONFLICTS:${PN}-rsh += "netkit-rsh-client" |
186 | RPROVIDES_${PN}-rsh = "rsh" | 192 | RPROVIDES:${PN}-rsh = "rsh" |
187 | 193 | ||
188 | FILES_${PN}-rshd = "${sbindir}/in.rshd ${sbindir}/in.rlogind ${sbindir}/in.rexecd \ | 194 | FILES:${PN}-rshd = "${sbindir}/in.rshd ${sbindir}/in.rlogind ${sbindir}/in.rexecd \ |
189 | ${sysconfdir}/xinetd.d/rsh ${sysconfdir}/xinetd.d/rlogin ${sysconfdir}/xinetd.d/rexec" | 195 | ${sysconfdir}/xinetd.d/rsh ${sysconfdir}/xinetd.d/rlogin ${sysconfdir}/xinetd.d/rexec" |
190 | FILES_${PN}-rshd-dbg = "${sbindir}/.debug/in.rshd ${sbindir}/.debug/in.rlogind ${sbindir}/.debug/in.rexecd" | 196 | FILES:${PN}-rshd-dbg = "${sbindir}/.debug/in.rshd ${sbindir}/.debug/in.rlogind ${sbindir}/.debug/in.rexecd" |
191 | RDEPENDS_${PN}-rshd += "xinetd tcp-wrappers" | 197 | RDEPENDS:${PN}-rshd += "xinetd tcp-wrappers" |
192 | RCONFLICTS_${PN}-rshd += "netkit-rshd-server" | 198 | RCONFLICTS:${PN}-rshd += "netkit-rshd-server" |
193 | RPROVIDES_${PN}-rshd = "rshd" | 199 | RPROVIDES:${PN}-rshd = "rshd" |
194 | 200 | ||
195 | FILES_${PN}-ftpd = "${bindir}/ftpd.${BPN}" | 201 | FILES:${PN}-ftpd = "${bindir}/ftpd.${BPN}" |
196 | FILES_${PN}-ftpd-dbg = "${bindir}/.debug/ftpd.${BPN}" | 202 | FILES:${PN}-ftpd-dbg = "${bindir}/.debug/ftpd.${BPN}" |
197 | RDEPENDS_${PN}-ftpd += "xinetd" | 203 | RDEPENDS:${PN}-ftpd += "xinetd" |
198 | 204 | ||
199 | FILES_${PN}-tftpd = "${sbindir}/in.tftpd ${sysconfdir}/xinetd.d/tftpd" | 205 | FILES:${PN}-tftpd = "${sbindir}/in.tftpd ${sysconfdir}/xinetd.d/tftpd" |
200 | FILES_${PN}-tftpd-dbg = "${sbindir}/.debug/in.tftpd" | 206 | FILES:${PN}-tftpd-dbg = "${sbindir}/.debug/in.tftpd" |
201 | RCONFLICTS_${PN}-tftpd += "netkit-tftpd" | 207 | RCONFLICTS:${PN}-tftpd += "netkit-tftpd" |
202 | RDEPENDS_${PN}-tftpd += "xinetd" | 208 | RDEPENDS:${PN}-tftpd += "xinetd" |
203 | 209 | ||
204 | FILES_${PN}-telnetd = "${sbindir}/in.telnetd ${sysconfdir}/xinetd.d/telnet" | 210 | FILES:${PN}-telnetd = "${sbindir}/in.telnetd ${sysconfdir}/xinetd.d/telnet" |
205 | FILES_${PN}-telnetd-dbg = "${sbindir}/.debug/in.telnetd" | 211 | FILES:${PN}-telnetd-dbg = "${sbindir}/.debug/in.telnetd" |
206 | RCONFLICTS_${PN}-telnetd += "netkit-telnet" | 212 | RCONFLICTS:${PN}-telnetd += "netkit-telnet" |
207 | RPROVIDES_${PN}-telnetd = "telnetd" | 213 | RPROVIDES:${PN}-telnetd = "telnetd" |
208 | RDEPENDS_${PN}-telnetd += "xinetd" | 214 | RDEPENDS:${PN}-telnetd += "xinetd" |
209 | 215 | ||
210 | FILES_${PN}-inetd = "${bindir}/inetd.${BPN}" | 216 | FILES:${PN}-inetd = "${bindir}/inetd.${BPN}" |
211 | 217 | ||
212 | RDEPENDS_${PN} = "xinetd" | 218 | RDEPENDS:${PN} = "xinetd" |