wok-next rev 21177
rsh: clarify recipe, add overrides
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Fri Apr 19 15:42:59 2019 +0300 (2019-04-19) |
parents | e752d7f70061 |
children | 11b666cf89c9 |
files | rsh-redone/receipt rsh/receipt rsh/stuff/overrides |
line diff
1.1 --- a/rsh-redone/receipt Fri Apr 19 15:19:14 2019 +0300 1.2 +++ b/rsh-redone/receipt Fri Apr 19 15:42:59 2019 +0300 1.3 @@ -27,11 +27,13 @@ 1.4 1.5 COPY_std="bin/" 1.6 PROVIDE_std="rsh rlogin" 1.7 +CONFIG_FILES_std="/etc/skel/.rhosts" 1.8 1.9 COPY_rshd_redone="@std @rm" 1.10 CAT_rshd_redone="network|rshd and rlogind" 1.11 DEPENDS_rshd_redone="pam" 1.12 PROVIDE_rshd_redone="rshd:pam rshd-pam" 1.13 +CONFIG_FILES_rshd_redone="/etc/skel/.rhosts" 1.14 1.15 post_install_rshd_redone() { 1.16 if ! grep -qs rlogind $1/etc/inetd.conf; then
2.1 --- a/rsh/receipt Fri Apr 19 15:19:14 2019 +0300 2.2 +++ b/rsh/receipt Fri Apr 19 15:42:59 2019 +0300 2.3 @@ -7,13 +7,15 @@ 2.4 MAINTAINER="pascal.bellard@slitaz.org" 2.5 LICENSE="BSD" 2.6 WEB_SITE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit" 2.7 -PROVIDE="rshd rlogin netkit-rsh" 2.8 2.9 TARBALL="netkit-$PACKAGE-$VERSION.tar.gz" 2.10 WGET_URL="http://ibiblio.org/pub/linux/system/network/netkit/$TARBALL" 2.11 2.12 BUILD_DEPENDS="ncurses-dev" 2.13 2.14 +PROVIDE="rshd rlogin netkit-rsh" 2.15 +CONFIG_FILES="/etc/skel/.rhosts" 2.16 + 2.17 compile_rules() { 2.18 sed \ 2.19 -e 's/union wait/int/' \ 2.20 @@ -31,19 +33,14 @@ 2.21 --without-pam \ 2.22 --installroot=$install && 2.23 make && 2.24 - make install 2.25 + make install || return 1 2.26 + 2.27 + mkdir -p $install/etc/skel/ 2.28 + touch $install/etc/skel/.rhosts 2.29 + chmod 600 $install/etc/skel/.rhosts 2.30 } 2.31 2.32 -genpkg_rules() { 2.33 - copy @std 2.34 - mkdir -p $fs/etc/skel 2.35 - touch $fs/etc/skel/.rhosts 2.36 - chmod 600 $fs/etc/skel/.rhosts 2.37 -} 2.38 - 2.39 -# Pre and post install commands for Tazpkg. 2.40 -post_install() 2.41 -{ 2.42 +post_install() { 2.43 if ! grep -qs rlogind $1/etc/inetd.conf; then 2.44 cat >> $1/etc/inetd.conf <<EOT 2.45 exec stream tcp nowait root /usr/sbin/in.execd execd 2.46 @@ -54,9 +51,7 @@ 2.47 fi 2.48 } 2.49 2.50 -# Pre and post install commands for Tazpkg. 2.51 -pre_remove() 2.52 -{ 2.53 +pre_remove() { 2.54 sed -i '/rlogind/d;/rshd/d;/rexec/d' $1/etc/inetd.conf 2.55 [ -n "$1" ] || killall -HUP inetd 2.56 }