summaryrefslogtreecommitdiff
path: root/core/inetutils
diff options
context:
space:
mode:
Diffstat (limited to 'core/inetutils')
-rw-r--r--core/inetutils/PKGBUILD43
-rw-r--r--core/inetutils/ftpd.service4
-rw-r--r--core/inetutils/rlogin.pam13
-rw-r--r--core/inetutils/rlogin.socket9
-rw-r--r--core/inetutils/rlogin@.service7
-rw-r--r--core/inetutils/rsh.pam11
-rw-r--r--core/inetutils/rsh.socket9
-rw-r--r--core/inetutils/rsh@.service7
-rw-r--r--core/inetutils/talk.service12
-rw-r--r--core/inetutils/talk.socket9
-rw-r--r--core/inetutils/telnet.socket10
-rw-r--r--core/inetutils/telnet@.service7
12 files changed, 131 insertions, 10 deletions
diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD
index f4296de2b..fd85ed111 100644
--- a/core/inetutils/PKGBUILD
+++ b/core/inetutils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 194664 2013-09-20 17:37:51Z eric $
+# $Id: PKGBUILD 201551 2013-12-14 23:02:04Z eric $
# Maintainer: Eric BĂ©langer <eric@archlinux.org>
pkgname=inetutils
pkgver=1.9.1.341
-pkgrel=1
+pkgrel=2
pkgdesc="A collection of common network programs"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/inetutils/"
@@ -11,19 +11,32 @@ license=('GPL3')
groups=('base')
depends=('pam')
makedepends=('help2man')
-backup=('etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \
- 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh')
+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=(ftp://ftp.archlinux.org/other/packages/inetutils/${pkgname}-${pkgver}.tar.xz{,.sig} \
- telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd ftpd.service)
+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'
- '2b2dd71eb3233e5090f4c2df8abe9b4924d323f3'
- 'b15ab4faa9d97652e182c98c1e3a3b3cbbf6383c'
+ 'aa4730d662398b6c33df2b6fc116ab6b5c3cd120'
+ '387b371cbaa3611b95d30f806c0dd08b621a584a'
+ '6f9a304391610a17b8ae3ad35b742c78c86aee16'
+ '0455126fa18d2a9422469d79b9e73dd928b15652'
'd9b8f8aab094ecb779d0f16f21b4683ab327516f'
+ '556b5372cbab8794e931e110b896fa8a61628bb1'
+ '828da7bce49ffc4e9645288759b275a98a2fbc40'
+ '7071da32d42a133ead039197ed891b518bb0f773'
'26763ae31b8a5be256666a0ba55746941d75d6ee'
- 'e4a764828b57f1e907ec96f4ae0e0cf0d3e2e802')
+ '4486c966d28736897bce1280d85d139bd10a5689'
+ 'd1813d42c5c9d2c60f03ebe33961de357a4b8b43'
+ 'b15ab4faa9d97652e182c98c1e3a3b3cbbf6383c'
+ '0917dc6b5a80d914bf550065b1733b7da2c776f3'
+ 'a7ac7bbe917ff80fd8cd4357fbc62fab50595c34'
+ '2b2dd71eb3233e5090f4c2df8abe9b4924d323f3')
build() {
cd ${pkgname}-${pkgver}
@@ -58,5 +71,17 @@ package() {
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/core/inetutils/ftpd.service b/core/inetutils/ftpd.service
index 57549c088..3020804b0 100644
--- a/core/inetutils/ftpd.service
+++ b/core/inetutils/ftpd.service
@@ -3,8 +3,10 @@ Description=FTPD Daemon
After=network.target
[Service]
-ExecStart=/usr/bin/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/core/inetutils/rlogin.pam b/core/inetutils/rlogin.pam
new file mode 100644
index 000000000..d92a5da40
--- /dev/null
+++ b/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/core/inetutils/rlogin.socket b/core/inetutils/rlogin.socket
new file mode 100644
index 000000000..c8c276c59
--- /dev/null
+++ b/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/core/inetutils/rlogin@.service b/core/inetutils/rlogin@.service
new file mode 100644
index 000000000..77c18caa9
--- /dev/null
+++ b/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/core/inetutils/rsh.pam b/core/inetutils/rsh.pam
new file mode 100644
index 000000000..3c04bc7d6
--- /dev/null
+++ b/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/core/inetutils/rsh.socket b/core/inetutils/rsh.socket
new file mode 100644
index 000000000..4d44b99eb
--- /dev/null
+++ b/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/core/inetutils/rsh@.service b/core/inetutils/rsh@.service
new file mode 100644
index 000000000..403754a9f
--- /dev/null
+++ b/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/core/inetutils/talk.service b/core/inetutils/talk.service
new file mode 100644
index 000000000..25eb6732d
--- /dev/null
+++ b/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/core/inetutils/talk.socket b/core/inetutils/talk.socket
new file mode 100644
index 000000000..b09e07cbb
--- /dev/null
+++ b/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/core/inetutils/telnet.socket b/core/inetutils/telnet.socket
new file mode 100644
index 000000000..811b6725f
--- /dev/null
+++ b/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/core/inetutils/telnet@.service b/core/inetutils/telnet@.service
new file mode 100644
index 000000000..d92af371b
--- /dev/null
+++ b/core/inetutils/telnet@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Telnet Server
+After=local-fs.target
+
+[Service]
+ExecStart=-/usr/bin/telnetd
+StandardInput=socket