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