diff options
Diffstat (limited to 'meta/recipes-connectivity/inetutils/inetutils_2.4.bb')
-rw-r--r-- | meta/recipes-connectivity/inetutils/inetutils_2.4.bb | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/inetutils/inetutils_2.4.bb b/meta/recipes-connectivity/inetutils/inetutils_2.4.bb index 85e9f642b3..d3f9e9e5fa 100644 --- a/meta/recipes-connectivity/inetutils/inetutils_2.4.bb +++ b/meta/recipes-connectivity/inetutils/inetutils_2.4.bb | |||
@@ -20,7 +20,6 @@ SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.xz \ | |||
20 | file://rsh.xinetd.inetutils \ | 20 | file://rsh.xinetd.inetutils \ |
21 | file://telnet.xinetd.inetutils \ | 21 | file://telnet.xinetd.inetutils \ |
22 | file://tftpd.xinetd.inetutils \ | 22 | file://tftpd.xinetd.inetutils \ |
23 | file://inetutils-1.9-PATH_PROCNET_DEV.patch \ | ||
24 | file://inetutils-only-check-pam_appl.h-when-pam-enabled.patch \ | 23 | file://inetutils-only-check-pam_appl.h-when-pam-enabled.patch \ |
25 | file://0001-CVE-2023-40303-ftpd-rcp-rlogin-rsh-rshd-uucpd-fix-ch.patch \ | 24 | file://0001-CVE-2023-40303-ftpd-rcp-rlogin-rsh-rshd-uucpd-fix-ch.patch \ |
26 | file://0002-CVE-2023-40303-Indent-changes-in-previous-commit.patch \ | 25 | file://0002-CVE-2023-40303-Indent-changes-in-previous-commit.patch \ |
@@ -42,15 +41,31 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6 gl_cv_socket_ipv6=no," | |||
42 | PACKAGECONFIG[ping6] = "--enable-ping6,--disable-ping6," | 41 | PACKAGECONFIG[ping6] = "--enable-ping6,--disable-ping6," |
43 | 42 | ||
44 | EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR} \ | 43 | EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR} \ |
45 | inetutils_cv_path_login=${base_bindir}/login \ | ||
46 | --with-libreadline-prefix=${STAGING_LIBDIR} \ | 44 | --with-libreadline-prefix=${STAGING_LIBDIR} \ |
47 | --enable-rpath=no \ | 45 | --enable-rpath=no \ |
48 | " | 46 | --with-path-login=${base_bindir}/login \ |
47 | --with-path-cp=${base_bindir}/cp \ | ||
48 | --with-path-uucico=${libexecdir}/uuico \ | ||
49 | --with-path-procnet-dev=/proc/net/dev \ | ||
50 | " | ||
51 | |||
52 | EXTRA_OECONF:append:libc-musl = " --with-path-utmpx=/dev/null/utmpx --with-path-wtmpx=/dev/null/wtmpx" | ||
49 | 53 | ||
50 | # These are horrible for security, disable them | 54 | # These are horrible for security, disable them |
51 | EXTRA_OECONF:append = " --disable-rsh --disable-rshd --disable-rcp \ | 55 | EXTRA_OECONF:append = " --disable-rsh --disable-rshd --disable-rcp \ |
52 | --disable-rlogin --disable-rlogind --disable-rexec --disable-rexecd" | 56 | --disable-rlogin --disable-rlogind --disable-rexec --disable-rexecd" |
53 | 57 | ||
58 | # The configure script guesses many paths in cross builds, check for this happening | ||
59 | do_configure_cross_check() { | ||
60 | if grep "may be incorrect because of cross-compilation" ${B}/config.log; then | ||
61 | bberror Default path values used, these must be set explicitly | ||
62 | fi | ||
63 | } | ||
64 | do_configure[postfuncs] += "do_configure_cross_check" | ||
65 | |||
66 | # The --with-path options are not actually options, so this check needs to be silenced | ||
67 | ERROR_QA:remove = "unknown-configure-option" | ||
68 | |||
54 | do_configure:prepend () { | 69 | do_configure:prepend () { |
55 | export HELP2MAN='true' | 70 | export HELP2MAN='true' |
56 | cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}/build-aux/config.rpath | 71 | cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}/build-aux/config.rpath |