diff options
author | Mingli Yu <mingli.yu@windriver.com> | 2016-01-27 16:43:03 +0800 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2016-02-22 15:51:19 -0500 |
commit | 8895bd0b73cd6b7ed933737506fd03cf44e42530 (patch) | |
tree | e72c99be6b21c3141c4afa199bfea3a78ba1fbfa /meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb | |
parent | d780562322092894f8f0545ab751cc34133f9b91 (diff) | |
download | meta-openembedded-contrib-8895bd0b73cd6b7ed933737506fd03cf44e42530.tar.gz |
netkit-rsh: add two patches and some fixes.
* Update the checksum of the license text to include all the
license text to instead of the previous only from two to
three line.
* Customize compile option such as CFLAGS= -D_GNU_SOURCE
and the specific install folder.
* Customize pam configuration file for rsh, rexec.
and rlogin to make them work.
* Update the line "server = /usr/bin/tcpd" to
"server = /usr/sbin/tcpd" for /etc/xinetd.d/{rexec,rlogin,rsh}.
* Fix some typo such as replace RPROVIDES_${PN}-rshd = "rshd"
to RPROVIDES_${PN}-server = "rshd"
* Fix host variable when rsh is renamed to other.
* Add rexec to support ipv6.
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb')
-rw-r--r-- | meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb index f14a45157c..e29369c495 100644 --- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb +++ b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb @@ -4,7 +4,7 @@ HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit" LICENSE = "BSD-4-Clause" DEPENDS = "xinetd libgcrypt" -LIC_FILES_CHKSUM = "file://rsh/rsh.c;beginline=2;endline=3;md5=25737e9d21d9df251dd26b7dcbd8ee29" +LIC_FILES_CHKSUM = "file://rsh/rsh.c;endline=32;md5=487b3c637bdc181d32b2a8543d41b606" SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-rsh/netkit-rsh_${PV}.orig.tar.gz;name=archive \ ${DEBIAN_MIRROR}/main/n/netkit-rsh/netkit-rsh_${PV}-15.diff.gz;name=patch15 \ @@ -13,6 +13,8 @@ SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-rsh/netkit-rsh_${PV}.orig.tar.gz;name= file://rexec.xinetd.netkit \ file://rlogin.xinetd.netkit \ file://rsh.xinetd.netkit \ + file://netkit-rsh-0.17-rexec-ipv6.patch \ + file://fix-host-variable.patch \ " SRC_URI[archive.md5sum] = "65f5f28e2fe22d9ad8b17bb9a10df096" @@ -20,6 +22,12 @@ SRC_URI[archive.sha256sum] = "edcac7fa18015f0bc04e573f3f54ae3b638d71335df1ad7dae SRC_URI[patch15.md5sum] = "655efc0d541b03ca5de0ae506c805ea3" SRC_URI[patch15.sha256sum] = "2bc071c438e8b0ed42a0bd2db2d8b681b27a1e9b1798694d9874733293bc2aa9" +# Other support files +PAM_SRC_URI = "file://rexec.pam \ + file://rlogin.pam \ + file://rsh.pam" +SRC_URI += "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" + inherit pkgconfig CFLAGS += " -D_GNU_SOURCE -Wno-deprecated-declarations" @@ -30,7 +38,7 @@ PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "pam", "pam", "", d)} PACKAGECONFIG[pam] = " , --without-pam, libpam, libpam" do_configure () { - ./configure --prefix=${prefix} + ./configure --prefix=${prefix} --exec-prefix=${exec_prefix} echo "INSTALLROOT=${D}" > MCONFIG if [ "${@base_contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then @@ -58,9 +66,9 @@ do_install () { if [ "${@base_contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then install -d ${D}${sysconfdir}/pam.d install -m 0644 debian/hosts.equiv ${D}/${sysconfdir} - install -m 0644 debian/pam.d/rexec ${D}/${sysconfdir}/pam.d - install -m 0644 debian/pam.d/rlogin ${D}/${sysconfdir}/pam.d - install -m 0644 debian/pam.d/rsh ${D}/${sysconfdir}/pam.d + install -m 0644 ${WORKDIR}/rexec.pam ${D}/${sysconfdir}/pam.d/rexec + install -m 0644 ${WORKDIR}/rlogin.pam ${D}/${sysconfdir}/pam.d/rlogin + install -m 0664 ${WORKDIR}/rsh.pam ${D}/${sysconfdir}/pam.d/rsh fi cp ${WORKDIR}/rexec.xinetd.netkit ${D}/${sysconfdir}/xinetd.d/rexec cp ${WORKDIR}/rlogin.xinetd.netkit ${D}/${sysconfdir}/xinetd.d/rlogin @@ -85,7 +93,8 @@ ALTERNATIVE_TARGET[rexecd] = "${sbindir}/in.rexecd" ALTERNATIVE_LINK_NAME[rlogind] = "${bindir}/rlogind" ALTERNATIVE_TARGET[rlogind] = "${sbindir}/in.rlogind" -RCONFLICTS_${PN}-client += "inetutils-rshd" -RPROVIDES_${PN}-rshd = "rshd" +RCONFLICTS_${PN}-server += "inetutils-rshd" +RPROVIDES_${PN}-server = "rshd" -RDEPENDS_${PN} = "xinetd" +RDEPENDS_${PN}-server = "xinetd" +RDEPENDS_${PN}-server += "tcp-wrappers" |