[oe-commits] [meta-openembedded] 31/58: inetutils: Disable rsh, rcp, rlogin on musl
git at git.openembedded.org
git at git.openembedded.org
Tue Nov 29 09:13:22 UTC 2016
martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.
commit dc1e359c94fd9415b4d1d7b7fd52780f1bf94cf1
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Sat Nov 12 09:45:09 2016 +0000
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 <raj.khem at gmail.com>
---
.../recipes-connectivity/inetutils/inetutils_1.9.4.bb | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
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 8db6b74..6d841fa 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"
@@ -46,6 +47,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
@@ -64,9 +67,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
@@ -76,7 +85,9 @@ do_install_append () {
cp ${WORKDIR}/tftpd.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/tftpd
sed -e 's, at 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
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list