diff --git a/inetutils/PKGBUILD b/inetutils/PKGBUILD index c8e05b72db..50bed846d0 100644 --- a/inetutils/PKGBUILD +++ b/inetutils/PKGBUILD @@ -3,24 +3,24 @@ pkgname=inetutils pkgver=1.9.4 -pkgrel=7 +pkgrel=8 pkgdesc="A collection of common network programs" -arch=('x86_64' 'powerpc64le') -url="http://www.gnu.org/software/inetutils/" +arch=(x86_64 powerpc64le) +url="https://www.gnu.org/software/inetutils/" license=('GPL3') -groups=('base') depends=('pam' 'libcap') -#makedepends=('help2man') +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=("https://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.xz" +source=("https://ftp.gnu.org/gnu/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=('5e515cc9da142cb73bb1beda137b4c2dcf2b528c' + 'SKIP' '026181500b71f0c09ef5c262450be718651e5658' '387b371cbaa3611b95d30f806c0dd08b621a584a' '6f9a304391610a17b8ae3ad35b742c78c86aee16' diff --git a/inetutils/ftpd.service b/inetutils/ftpd.service new file mode 100644 index 0000000000..c1deb0d52a --- /dev/null +++ b/inetutils/ftpd.service @@ -0,0 +1,12 @@ +[Unit] +Description=FTPD Daemon +After=network.target + +[Service] +Type=forking +PIDFile=/run/ftpd.pid +ExecStart=/usr/bin/ftpd -D +ExecStopPost=/usr/bin/rm -f /run/ftpd.pid + +[Install] +WantedBy=multi-user.target diff --git a/inetutils/inetutils.install b/inetutils/inetutils.install new file mode 100644 index 0000000000..4776e7e04b --- /dev/null +++ b/inetutils/inetutils.install @@ -0,0 +1,9 @@ +post_install() { + setcap cap_net_bind_service=+ep usr/bin/rcp 2>/dev/null || chmod +s usr/bin/rcp + setcap cap_net_bind_service=+ep usr/bin/rlogin 2>/dev/null || chmod +s usr/bin/rlogin + setcap cap_net_bind_service=+ep usr/bin/rsh 2>/dev/null || chmod +s usr/bin/rsh +} + +post_upgrade() { + post_install +} diff --git a/inetutils/rlogin.pam b/inetutils/rlogin.pam new file mode 100644 index 0000000000..d92a5da404 --- /dev/null +++ b/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/inetutils/rlogin.socket b/inetutils/rlogin.socket new file mode 100644 index 0000000000..c8c276c59e --- /dev/null +++ b/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/inetutils/rlogin.xinetd b/inetutils/rlogin.xinetd new file mode 100644 index 0000000000..bffdb90116 --- /dev/null +++ b/inetutils/rlogin.xinetd @@ -0,0 +1,10 @@ +service login +{ + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/bin/rlogind + log_on_failure += USERID + disable = yes +} diff --git a/inetutils/rlogin@.service b/inetutils/rlogin@.service new file mode 100644 index 0000000000..77c18caa92 --- /dev/null +++ b/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/inetutils/rsh.pam b/inetutils/rsh.pam new file mode 100644 index 0000000000..3c04bc7d68 --- /dev/null +++ b/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/inetutils/rsh.socket b/inetutils/rsh.socket new file mode 100644 index 0000000000..4d44b99eb8 --- /dev/null +++ b/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/inetutils/rsh.xinetd b/inetutils/rsh.xinetd new file mode 100644 index 0000000000..c8848ce7f8 --- /dev/null +++ b/inetutils/rsh.xinetd @@ -0,0 +1,10 @@ +service shell +{ + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/bin/rshd + log_on_failure += USERID + disable = yes +} diff --git a/inetutils/rsh@.service b/inetutils/rsh@.service new file mode 100644 index 0000000000..403754a9fe --- /dev/null +++ b/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/inetutils/talk.service b/inetutils/talk.service new file mode 100644 index 0000000000..25eb6732d6 --- /dev/null +++ b/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/inetutils/talk.socket b/inetutils/talk.socket new file mode 100644 index 0000000000..b09e07cbb8 --- /dev/null +++ b/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/inetutils/talk.xinetd b/inetutils/talk.xinetd new file mode 100644 index 0000000000..b62e563107 --- /dev/null +++ b/inetutils/talk.xinetd @@ -0,0 +1,10 @@ +service ntalk +{ + flags = REUSE + socket_type = dgram + wait = yes + user = root + server = /usr/bin/talkd + log_on_failure += USERID + disable = yes +} diff --git a/inetutils/telnet.socket b/inetutils/telnet.socket new file mode 100644 index 0000000000..811b6725fa --- /dev/null +++ b/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/inetutils/telnet.xinetd b/inetutils/telnet.xinetd new file mode 100644 index 0000000000..c56f339851 --- /dev/null +++ b/inetutils/telnet.xinetd @@ -0,0 +1,10 @@ +service telnet +{ + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/bin/telnetd + log_on_failure += USERID + disable = yes +} diff --git a/inetutils/telnet@.service b/inetutils/telnet@.service new file mode 100644 index 0000000000..d92af371ba --- /dev/null +++ b/inetutils/telnet@.service @@ -0,0 +1,7 @@ +[Unit] +Description=Telnet Server +After=local-fs.target + +[Service] +ExecStart=-/usr/bin/telnetd +StandardInput=socket