From 559eefa8ae61fc0924ac62a91a813fc867593daf Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sun, 16 Feb 2014 17:50:05 -0600 Subject: inetutils: update binary path to /usr/bin refs #961 --- abs/core/inetutils/PKGBUILD | 79 +++++++++++++++++++++--------------- abs/core/inetutils/dnsdomainname | 3 -- abs/core/inetutils/ftpd.conf | 4 -- abs/core/inetutils/ftpd.rc | 37 ----------------- abs/core/inetutils/ftpd.service | 4 +- abs/core/inetutils/inetutils.install | 2 +- abs/core/inetutils/rlogin.pam | 13 ++++++ abs/core/inetutils/rlogin.socket | 9 ++++ abs/core/inetutils/rlogin.xinetd | 2 +- abs/core/inetutils/rlogin@.service | 7 ++++ abs/core/inetutils/rsh.pam | 11 +++++ abs/core/inetutils/rsh.socket | 9 ++++ abs/core/inetutils/rsh.xinetd | 2 +- abs/core/inetutils/rsh@.service | 7 ++++ abs/core/inetutils/talk.service | 12 ++++++ abs/core/inetutils/talk.socket | 9 ++++ abs/core/inetutils/talk.xinetd | 2 +- abs/core/inetutils/telnet.socket | 10 +++++ abs/core/inetutils/telnet.xinetd | 2 +- abs/core/inetutils/telnet@.service | 7 ++++ 20 files changed, 149 insertions(+), 82 deletions(-) delete mode 100644 abs/core/inetutils/dnsdomainname delete mode 100644 abs/core/inetutils/ftpd.conf delete mode 100644 abs/core/inetutils/ftpd.rc create mode 100644 abs/core/inetutils/rlogin.pam create mode 100644 abs/core/inetutils/rlogin.socket create mode 100644 abs/core/inetutils/rlogin@.service create mode 100644 abs/core/inetutils/rsh.pam create mode 100644 abs/core/inetutils/rsh.socket create mode 100644 abs/core/inetutils/rsh@.service create mode 100644 abs/core/inetutils/talk.service create mode 100644 abs/core/inetutils/talk.socket create mode 100644 abs/core/inetutils/telnet.socket create mode 100644 abs/core/inetutils/telnet@.service diff --git a/abs/core/inetutils/PKGBUILD b/abs/core/inetutils/PKGBUILD index 38c9cfc..fd85ed1 100644 --- a/abs/core/inetutils/PKGBUILD +++ b/abs/core/inetutils/PKGBUILD @@ -1,45 +1,54 @@ -# $Id: PKGBUILD 165908 2012-09-03 17:29:57Z eric $ +# $Id: PKGBUILD 201551 2013-12-14 23:02:04Z eric $ # Maintainer: Eric Bélanger pkgname=inetutils -pkgver=1.9.1 -pkgrel=4 +pkgver=1.9.1.341 +pkgrel=2 pkgdesc="A collection of common network programs" arch=('i686' 'x86_64') url="http://www.gnu.org/software/inetutils/" license=('GPL3') groups=('base') -depends=('readline' 'ncurses' 'pam') -backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \ - 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh') +depends=('pam') +makedepends=('help2man') +backup=('etc/xinetd.d/telnet' 'etc/xinetd.d/talk' + 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh' + 'etc/pam.d/rlogin' 'etc/pam.d/rsh') options=('!emptydirs') install=inetutils.install -source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz{,.sig} \ - ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \ - ftpd.service dnsdomainname) -sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90' - 'ff0aad9946a38915580b094dadf67e790e8a2f87' - '84dc802b5e57b5e04c847572225a3b9612017155' - '68a590083b45997dfdb80e666b2de762f494ba74' - 'bfad98a4a62f1fff8779f076c6019ed07f9111af' - '27d99b910eec0fc26bd79ccc2c1de26608330298' - '81f10b3b688e3952f793b35bcef63b5bf257a92b' - '81f4a8da823cf0bb14284fc71ee6108849691eda' - 'fb607dafe177f074e14891dd887ef9e9ab67a875' - 'eb952b0b9c3e3d429d8e21b110249e495f0e0e63') +source=(ftp://ftp.archlinux.org/other/packages/inetutils/${pkgname}-${pkgver}.tar.xz{,.sig} + ftpd.service rlogin.pam rlogin@.service rlogin.socket rlogin.xinetd + rsh.pam rsh@.service rsh.socket rsh.xinetd talk.service talk.socket talk.xinetd + telnet@.service telnet.socket telnet.xinetd) +sha1sums=('eaccc1568c9cc624f6cda3a265fb92ec72c7304d' + 'SKIP' + 'aa4730d662398b6c33df2b6fc116ab6b5c3cd120' + '387b371cbaa3611b95d30f806c0dd08b621a584a' + '6f9a304391610a17b8ae3ad35b742c78c86aee16' + '0455126fa18d2a9422469d79b9e73dd928b15652' + 'd9b8f8aab094ecb779d0f16f21b4683ab327516f' + '556b5372cbab8794e931e110b896fa8a61628bb1' + '828da7bce49ffc4e9645288759b275a98a2fbc40' + '7071da32d42a133ead039197ed891b518bb0f773' + '26763ae31b8a5be256666a0ba55746941d75d6ee' + '4486c966d28736897bce1280d85d139bd10a5689' + 'd1813d42c5c9d2c60f03ebe33961de357a4b8b43' + 'b15ab4faa9d97652e182c98c1e3a3b3cbbf6383c' + '0917dc6b5a80d914bf550065b1733b7da2c776f3' + 'a7ac7bbe917ff80fd8cd4357fbc62fab50595c34' + '2b2dd71eb3233e5090f4c2df8abe9b4924d323f3') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|_GL_WARN_ON_USE (gets|//_GL_WARN_ON_USE (gets|' lib/stdio.in.h - ./configure --prefix=/usr --libexec=/usr/sbin --localstatedir=/var \ - --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info \ + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --libexec=/usr/bin \ + --localstatedir=/var --sysconfdir=/etc \ --without-wrap --with-pam \ --enable-ftp --enable-ftpd \ --enable-telnet --enable-telnetd \ --enable-talk --enable-talkd \ --enable-rlogin --enable-rlogind \ --enable-rsh --enable-rshd \ - --enable-rcp --enable-hostname \ + --enable-rcp --enable-hostname --enable-dnsdomainname \ --disable-rexec --disable-rexecd \ --disable-tftp --disable-tftpd \ --disable-ping --disable-ping6 \ @@ -50,23 +59,29 @@ build() { } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - install -d "${pkgdir}/bin" - ln -s /usr/bin/hostname "${pkgdir}/bin/hostname" - install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/bin/dnsdomainname" - echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1" - install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd" - install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd" install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet" install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk" install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin" install -D -m644 "${srcdir}/rsh.xinetd" "${pkgdir}/etc/xinetd.d/rsh" + + install -D -m644 "${srcdir}/rlogin.pam" "${pkgdir}/etc/pam.d/rlogin" + install -D -m644 "${srcdir}/rsh.pam" "${pkgdir}/etc/pam.d/rsh" + install -D -m644 "${srcdir}/ftpd.service" "${pkgdir}/usr/lib/systemd/system/ftpd.service" + install -D -m644 "${srcdir}/rlogin@.service" "${pkgdir}/usr/lib/systemd/system/rlogin@.service" + install -D -m644 "${srcdir}/rlogin.socket" "${pkgdir}/usr/lib/systemd/system/rlogin.socket" + install -D -m644 "${srcdir}/rsh@.service" "${pkgdir}/usr/lib/systemd/system/rsh@.service" + install -D -m644 "${srcdir}/rsh.socket" "${pkgdir}/usr/lib/systemd/system/rsh.socket" + install -D -m644 "${srcdir}/talk.service" "${pkgdir}/usr/lib/systemd/system/talk.service" + install -D -m644 "${srcdir}/talk.socket" "${pkgdir}/usr/lib/systemd/system/talk.socket" + install -D -m644 "${srcdir}/telnet@.service" "${pkgdir}/usr/lib/systemd/system/telnet@.service" + install -D -m644 "${srcdir}/telnet.socket" "${pkgdir}/usr/lib/systemd/system/telnet.socket" } diff --git a/abs/core/inetutils/dnsdomainname b/abs/core/inetutils/dnsdomainname deleted file mode 100644 index a1b8a8c..0000000 --- a/abs/core/inetutils/dnsdomainname +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec /usr/bin/hostname -d "$@" diff --git a/abs/core/inetutils/ftpd.conf b/abs/core/inetutils/ftpd.conf deleted file mode 100644 index f660f00..0000000 --- a/abs/core/inetutils/ftpd.conf +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to ftpd -# -FTPD_ARGS="" diff --git a/abs/core/inetutils/ftpd.rc b/abs/core/inetutils/ftpd.rc deleted file mode 100644 index 3d0d344..0000000 --- a/abs/core/inetutils/ftpd.rc +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/ftpd - -PID=$(pidof -o %PPID /usr/sbin/ftpd) -case "$1" in - start) - stat_busy "Starting ftpd" - [ -z "$PID" ] && /usr/sbin/ftpd -D $FTPD_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ftpd - stat_done - fi - ;; - stop) - stat_busy "Stopping ftpd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ftpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/core/inetutils/ftpd.service b/abs/core/inetutils/ftpd.service index 5708bdf..3020804 100644 --- a/abs/core/inetutils/ftpd.service +++ b/abs/core/inetutils/ftpd.service @@ -3,8 +3,10 @@ Description=FTPD Daemon After=network.target [Service] -ExecStart=/usr/sbin/ftpd -D Type=forking +PIDFile=/run/ftpd.pid +ExecStart=/usr/bin/ftpd -D +ExecStopPost=/bin/rm -f /run/ftpd.pid [Install] WantedBy=multi-user.target diff --git a/abs/core/inetutils/inetutils.install b/abs/core/inetutils/inetutils.install index b338fa4..bd2a283 100644 --- a/abs/core/inetutils/inetutils.install +++ b/abs/core/inetutils/inetutils.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(inetutils.info.gz) post_install() { diff --git a/abs/core/inetutils/rlogin.pam b/abs/core/inetutils/rlogin.pam new file mode 100644 index 0000000..d92a5da --- /dev/null +++ b/abs/core/inetutils/rlogin.pam @@ -0,0 +1,13 @@ +#%PAM-1.0 +# For root login to succeed here with pam_securetty, "rlogin" must be +# listed in /etc/securetty. +auth required pam_nologin.so +auth required pam_securetty.so +auth required pam_env.so +auth sufficient pam_rhosts.so +auth include system-auth +account include system-auth +password include system-auth +session optional pam_keyinit.so force revoke +session required pam_loginuid.so +session include system-auth diff --git a/abs/core/inetutils/rlogin.socket b/abs/core/inetutils/rlogin.socket new file mode 100644 index 0000000..c8c276c --- /dev/null +++ b/abs/core/inetutils/rlogin.socket @@ -0,0 +1,9 @@ +[Unit] +Description=Remote Login Facilities Activation Socket + +[Socket] +ListenStream=513 +Accept=true + +[Install] +WantedBy=sockets.target diff --git a/abs/core/inetutils/rlogin.xinetd b/abs/core/inetutils/rlogin.xinetd index 5c72f86..bffdb90 100644 --- a/abs/core/inetutils/rlogin.xinetd +++ b/abs/core/inetutils/rlogin.xinetd @@ -4,7 +4,7 @@ service login socket_type = stream wait = no user = root - server = /usr/sbin/rlogind + server = /usr/bin/rlogind log_on_failure += USERID disable = yes } diff --git a/abs/core/inetutils/rlogin@.service b/abs/core/inetutils/rlogin@.service new file mode 100644 index 0000000..77c18ca --- /dev/null +++ b/abs/core/inetutils/rlogin@.service @@ -0,0 +1,7 @@ +[Unit] +Description=Remote Login Facilities Server +After=local-fs.target + +[Service] +ExecStart=-/usr/bin/rlogind +StandardInput=socket diff --git a/abs/core/inetutils/rsh.pam b/abs/core/inetutils/rsh.pam new file mode 100644 index 0000000..3c04bc7 --- /dev/null +++ b/abs/core/inetutils/rsh.pam @@ -0,0 +1,11 @@ +#%PAM-1.0 +# For root login to succeed here with pam_securetty, "rsh" must be +# listed in /etc/securetty. +auth required pam_nologin.so +auth required pam_securetty.so +auth required pam_env.so +auth required pam_rhosts.so +account include system-auth +session optional pam_keyinit.so force revoke +session required pam_loginuid.so +session include system-auth diff --git a/abs/core/inetutils/rsh.socket b/abs/core/inetutils/rsh.socket new file mode 100644 index 0000000..4d44b99 --- /dev/null +++ b/abs/core/inetutils/rsh.socket @@ -0,0 +1,9 @@ +[Unit] +Description=Remote Shell Facilities Activation Socket + +[Socket] +ListenStream=514 +Accept=true + +[Install] +WantedBy=sockets.target diff --git a/abs/core/inetutils/rsh.xinetd b/abs/core/inetutils/rsh.xinetd index a13738c..c8848ce 100644 --- a/abs/core/inetutils/rsh.xinetd +++ b/abs/core/inetutils/rsh.xinetd @@ -4,7 +4,7 @@ service shell socket_type = stream wait = no user = root - server = /usr/sbin/rshd + server = /usr/bin/rshd log_on_failure += USERID disable = yes } diff --git a/abs/core/inetutils/rsh@.service b/abs/core/inetutils/rsh@.service new file mode 100644 index 0000000..403754a --- /dev/null +++ b/abs/core/inetutils/rsh@.service @@ -0,0 +1,7 @@ +[Unit] +Description=Remote Shell Facilities Server +After=local-fs.target + +[Service] +ExecStart=-/usr/bin/rshd +StandardInput=socket diff --git a/abs/core/inetutils/talk.service b/abs/core/inetutils/talk.service new file mode 100644 index 0000000..25eb673 --- /dev/null +++ b/abs/core/inetutils/talk.service @@ -0,0 +1,12 @@ +[Unit] +Description=Talk Server +Documentation=man:talkd(8) man:talk(1) + +[Service] +User=nobody +Group=tty +ExecStart=/usr/bin/talkd +StandardInput=socket + +[Install] +Also=talk.socket diff --git a/abs/core/inetutils/talk.socket b/abs/core/inetutils/talk.socket new file mode 100644 index 0000000..b09e07c --- /dev/null +++ b/abs/core/inetutils/talk.socket @@ -0,0 +1,9 @@ +[Unit] +Description=Talk Server Activation Socket +Documentation=man:talkd(8) man:talk(1) + +[Socket] +ListenDatagram=0.0.0.0:518 + +[Install] +WantedBy=sockets.target diff --git a/abs/core/inetutils/talk.xinetd b/abs/core/inetutils/talk.xinetd index 6abef35..b62e563 100644 --- a/abs/core/inetutils/talk.xinetd +++ b/abs/core/inetutils/talk.xinetd @@ -4,7 +4,7 @@ service ntalk socket_type = dgram wait = yes user = root - server = /usr/sbin/talkd + server = /usr/bin/talkd log_on_failure += USERID disable = yes } diff --git a/abs/core/inetutils/telnet.socket b/abs/core/inetutils/telnet.socket new file mode 100644 index 0000000..811b672 --- /dev/null +++ b/abs/core/inetutils/telnet.socket @@ -0,0 +1,10 @@ +[Unit] +Description=Telnet Server Activation Socket +Documentation=man:telnetd(8) + +[Socket] +ListenStream=23 +Accept=true + +[Install] +WantedBy=sockets.target diff --git a/abs/core/inetutils/telnet.xinetd b/abs/core/inetutils/telnet.xinetd index bd3a5e4..c56f339 100644 --- a/abs/core/inetutils/telnet.xinetd +++ b/abs/core/inetutils/telnet.xinetd @@ -4,7 +4,7 @@ service telnet socket_type = stream wait = no user = root - server = /usr/sbin/telnetd + server = /usr/bin/telnetd log_on_failure += USERID disable = yes } diff --git a/abs/core/inetutils/telnet@.service b/abs/core/inetutils/telnet@.service new file mode 100644 index 0000000..d92af37 --- /dev/null +++ b/abs/core/inetutils/telnet@.service @@ -0,0 +1,7 @@ +[Unit] +Description=Telnet Server +After=local-fs.target + +[Service] +ExecStart=-/usr/bin/telnetd +StandardInput=socket -- cgit v0.12