inetutils: fix xinetd configs

/etc/xinetd.d, not /etc/xinet.d

Also, according to man 5 xinetd.conf,
config files in a directory processed with includedir, such
as /etc/xinetd.d, will be skipped if their names contain
a dot.  So strip the .xinetd suffix when installing.
This commit is contained in:
Christopher Brannon 2016-10-14 22:04:06 -07:00
parent 8459019a89
commit e7b085e727

View file

@ -1,7 +1,7 @@
# Template file for 'inetutils' # Template file for 'inetutils'
pkgname=inetutils pkgname=inetutils
version=1.9.4 version=1.9.4
revision=7 revision=8
build_style=gnu-configure build_style=gnu-configure
configure_args="--without-wrap --with-pam" configure_args="--without-wrap --with-pam"
makedepends="pam-devel readline-devel" makedepends="pam-devel readline-devel"
@ -107,67 +107,67 @@ inetutils-rcp_package() {
} }
inetutils-rexec_package() { inetutils-rexec_package() {
short_desc+=" - rexec client and server (remote exec)" short_desc+=" - rexec client and server (remote exec)"
conf_files="/etc/xinet.d/rexec.xinetd" conf_files="/etc/xinetd.d/rexec"
pkg_install() { pkg_install() {
vbin src/rexec vbin src/rexec
vman man/rexec.1 vman man/rexec.1
vbin src/rexecd vbin src/rexecd
vman man/rexecd.8 vman man/rexecd.8
vinstall ${FILESDIR}/rexec.xinetd 644 etc/xinet.d vinstall ${FILESDIR}/rexec.xinetd 644 etc/xinetd.d rexec
# TODO: write etc/inet.d/rexec.conf or add an etc/inetd.conf line # TODO: write etc/inet.d/rexec.conf or add an etc/inetd.conf line
} }
} }
inetutils-rlogin_package() { inetutils-rlogin_package() {
short_desc+=" - rlogin client and server (remote login)" short_desc+=" - rlogin client and server (remote login)"
conf_files="/etc/xinet.d/rlogin.xinetd" conf_files="/etc/xinetd.d/rlogin"
pkg_install() { pkg_install() {
vbin src/rlogin vbin src/rlogin
vman man/rlogin.1 vman man/rlogin.1
vbin src/rlogind vbin src/rlogind
vman man/rlogind.8 vman man/rlogind.8
vinstall ${FILESDIR}/rlogin.xinetd 644 etc/xinet.d vinstall ${FILESDIR}/rlogin.xinetd 644 etc/xinetd.d rlogin
# TODO: write etc/inet.d/rlogin.conf or add an etc/inetd.conf line # TODO: write etc/inet.d/rlogin.conf or add an etc/inetd.conf line
} }
} }
inetutils-rsh_package() { inetutils-rsh_package() {
short_desc+=" - rsh client and server (remote shell)" short_desc+=" - rsh client and server (remote shell)"
conf_files="/etc/xinet.d/rsh.xinetd" conf_files="/etc/xinetd.d/rsh"
pkg_install() { pkg_install() {
vbin src/rsh vbin src/rsh
vman man/rsh.1 vman man/rsh.1
vbin src/rshd vbin src/rshd
vman man/rshd.8 vman man/rshd.8
vinstall ${FILESDIR}/rsh.xinetd 644 etc/xinet.d vinstall ${FILESDIR}/rsh.xinetd 644 etc/xinetd.d rsh
# TODO: write etc/inet.d/rsh.conf or add an etc/inetd.conf line # TODO: write etc/inet.d/rsh.conf or add an etc/inetd.conf line
} }
} }
inetutils-talk_package() { inetutils-talk_package() {
short_desc+=" - talk client and server" short_desc+=" - talk client and server"
conf_files="/etc/xinet.d/talk.xinetd" conf_files="/etc/xinetd.d/talk"
pkg_install() { pkg_install() {
vbin talk/talk vbin talk/talk
vman man/talk.1 vman man/talk.1
vbin talkd/talkd vbin talkd/talkd
vman man/talkd.8 vman man/talkd.8
vinstall ${FILESDIR}/talk.xinetd 644 etc/xinet.d vinstall ${FILESDIR}/talk.xinetd 644 etc/xinetd.d talk
# TODO: write etc/inet.d/talk.conf or add an etc/inetd.conf line # TODO: write etc/inet.d/talk.conf or add an etc/inetd.conf line
} }
} }
inetutils-telnet_package() { inetutils-telnet_package() {
short_desc+=" - telnet client and server" short_desc+=" - telnet client and server"
conf_files="/etc/xinet.d/telnet.xinetd" conf_files="/etc/xinetd.d/telnet"
pkg_install() { pkg_install() {
vbin telnet/telnet vbin telnet/telnet
vman man/telnet.1 vman man/telnet.1
vbin telnetd/telnetd vbin telnetd/telnetd
vman man/telnetd.8 vman man/telnetd.8
vinstall ${FILESDIR}/telnet.xinetd 644 etc/xinet.d vinstall ${FILESDIR}/telnet.xinetd 644 etc/xinetd.d telnet
# TODO: write etc/inet.d/telnet.conf or add an etc/inetd.conf line # TODO: write etc/inet.d/telnet.conf or add an etc/inetd.conf line
} }
} }
inetutils-tftp_package() { inetutils-tftp_package() {
short_desc+="- tftp client and server (trivial file transfer protocol)" short_desc+="- tftp client and server (trivial file transfer protocol)"
conf_files="/etc/xinet.d/tftp.xinetd" conf_files="/etc/xinetd.d/tftp"
alternatives=" alternatives="
tftp:tftp:/usr/bin/${pkgname} tftp:tftp:/usr/bin/${pkgname}
tftp:tftp.1:/usr/share/man/man1/${pkgname}.1 tftp:tftp.1:/usr/share/man/man1/${pkgname}.1
@ -177,7 +177,7 @@ inetutils-tftp_package() {
vman man/tftp.1 ${pkgname}.1 vman man/tftp.1 ${pkgname}.1
vbin src/tftpd vbin src/tftpd
vman man/tftpd.8 vman man/tftpd.8
vinstall ${FILESDIR}/tftp.xinetd 644 etc/xinet.d vinstall ${FILESDIR}/tftp.xinetd 644 etc/xinetd.d tftp
# TODO: write etc/inet.d/tftp.conf or add an etc/inetd.conf line # TODO: write etc/inet.d/tftp.conf or add an etc/inetd.conf line
} }
} }
@ -227,11 +227,11 @@ inetutils-syslog_package() {
} }
inetutils-uucpd_package() { inetutils-uucpd_package() {
short_desc+=" - uucpd daemon (unix to unix copy)" short_desc+=" - uucpd daemon (unix to unix copy)"
conf_files="/etc/xinet.d/uucp.xinetd" conf_files="/etc/xinetd.d/uucp"
pkg_install() { pkg_install() {
vbin src/uucpd vbin src/uucpd
vman man/uucpd.8 vman man/uucpd.8
vinstall ${FILESDIR}/uucp.xinetd 644 etc/xinet.d vinstall ${FILESDIR}/uucp.xinetd 644 etc/xinetd.d uucp
# TODO: write etc/inet.d/uucp.conf or add an etc/inetd.conf line # TODO: write etc/inet.d/uucp.conf or add an etc/inetd.conf line
} }
} }