From 3773725982e9160d7ddf20c3a8e31fd6fa04c549 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 14 Dec 2016 18:09:35 -0800 Subject: inetutils: Disable rsh, rcp, rlogin on musl They all need rcmd() API from rpc implementation and while glibc provides it bundled, musl does not so we disable these apps Signed-off-by: Khem Raj Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- .../recipes-connectivity/inetutils/inetutils_1.9.4.bb | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'meta-networking/recipes-connectivity') diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb index a35e0b4a7..a8c40254b 100644 --- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb +++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb @@ -5,6 +5,7 @@ talkd, telnet, telnetd, tftp, tftpd, and uucpd." HOMEPAGE = "http://www.gnu.org/software/inetutils" SECTION = "net" DEPENDS = "ncurses netbase readline" + LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7" @@ -48,6 +49,8 @@ EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR} \ --enable-rpath=no \ " +EXTRA_OECONF_append_libc-musl = " --disable-rsh --disable-rcp --disable-rlogin " + do_configure_prepend () { export HELP2MAN='true' cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}/build-aux/config.rpath @@ -66,9 +69,15 @@ do_install_append () { mv ${D}${libexecdir}/tftpd ${D}${sbindir}/in.tftpd mv ${D}${libexecdir}/telnetd ${D}${sbindir}/in.telnetd mv ${D}${libexecdir}/rexecd ${D}${sbindir}/in.rexecd - mv ${D}${libexecdir}/rlogind ${D}${sbindir}/in.rlogind - mv ${D}${libexecdir}/rshd ${D}${sbindir}/in.rshd - mv ${D}${libexecdir}/talkd ${D}${sbindir}/in.talkd + if [ -e ${D}${libexecdir}/rlogind ]; then + mv ${D}${libexecdir}/rlogind ${D}${sbindir}/in.rlogind + fi + if [ -e ${D}${libexecdir}/rshd ]; then + mv ${D}${libexecdir}/rshd ${D}${sbindir}/in.rshd + fi + if [ -e ${D}${libexecdir}/talkd ]; then + mv ${D}${libexecdir}/talkd ${D}${sbindir}/in.talkd + fi mv ${D}${libexecdir}/uucpd ${D}${sbindir}/in.uucpd mv ${D}${libexecdir}/* ${D}${bindir}/ cp ${WORKDIR}/rexec.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rexec @@ -78,7 +87,9 @@ do_install_append () { cp ${WORKDIR}/tftpd.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/tftpd sed -e 's,@SBINDIR@,${sbindir},g' -i ${D}/${sysconfdir}/xinetd.d/* - + if [ -e ${D}${libdir}/charset.alias ]; then + rm -rf ${D}${libdir}/charset.alias + fi rm -rf ${D}${libexecdir}/ # remove usr/lib if empty rmdir ${D}${libdir} || true -- cgit v1.2.3-54-g00ecf