[arch-commits] Commit in inetutils/trunk (9 files)
Eric Bélanger
eric at nymeria.archlinux.org
Sun Dec 8 00:06:47 UTC 2013
Date: Sunday, December 8, 2013 @ 01:06:46
Author: eric
Revision: 201284
upgpkg: inetutils 1.9.1.341-2
Add systemd units for rsh, rlogin, talk and telnet servers (close FS#37604), Fix ftpd service file (close FS#32546), Add pam config for rsh and rlogin
Added:
inetutils/trunk/rlogin.pam
inetutils/trunk/rlogin.socket
inetutils/trunk/rsh.pam
inetutils/trunk/rsh.socket
inetutils/trunk/talk.service
inetutils/trunk/talk.socket
inetutils/trunk/telnet.socket
Modified:
inetutils/trunk/PKGBUILD
inetutils/trunk/ftpd.service
---------------+
PKGBUILD | 41 +++++++++++++++++++++++++++++++++--------
ftpd.service | 4 +++-
rlogin.pam | 13 +++++++++++++
rlogin.socket | 9 +++++++++
rsh.pam | 11 +++++++++++
rsh.socket | 9 +++++++++
talk.service | 12 ++++++++++++
talk.socket | 9 +++++++++
telnet.socket | 10 ++++++++++
9 files changed, 109 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-12-07 19:40:42 UTC (rev 201283)
+++ PKGBUILD 2013-12-08 00:06:46 UTC (rev 201284)
@@ -3,7 +3,7 @@
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 @@
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 at .service rlogin.socket rlogin.xinetd
+ rsh.pam rsh at .service rsh.socket rsh.xinetd talk.service talk.socket talk.xinetd
+ telnet at .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 @@
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 at .service" "${pkgdir}/usr/lib/systemd/system/rlogin at .service"
+ install -D -m644 "${srcdir}/rlogin.socket" "${pkgdir}/usr/lib/systemd/system/rlogin.socket"
+ install -D -m644 "${srcdir}/rsh at .service" "${pkgdir}/usr/lib/systemd/system/rsh at .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 at .service" "${pkgdir}/usr/lib/systemd/system/telnet at .service"
+ install -D -m644 "${srcdir}/telnet.socket" "${pkgdir}/usr/lib/systemd/system/telnet.socket"
}
Modified: ftpd.service
===================================================================
--- ftpd.service 2013-12-07 19:40:42 UTC (rev 201283)
+++ ftpd.service 2013-12-08 00:06:46 UTC (rev 201284)
@@ -3,8 +3,10 @@
After=network.target
[Service]
+Type=forking
+PIDFile=/run/ftpd.pid
ExecStart=/usr/bin/ftpd -D
-Type=forking
+ExecStopPost=/bin/rm -f /run/ftpd.pid
[Install]
WantedBy=multi-user.target
Added: rlogin.pam
===================================================================
--- rlogin.pam (rev 0)
+++ rlogin.pam 2013-12-08 00:06:46 UTC (rev 201284)
@@ -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
Added: rlogin.socket
===================================================================
--- rlogin.socket (rev 0)
+++ rlogin.socket 2013-12-08 00:06:46 UTC (rev 201284)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Remote Login Facilities Activation Socket
+
+[Socket]
+ListenStream=513
+Accept=true
+
+[Install]
+WantedBy=sockets.target
Added: rsh.pam
===================================================================
--- rsh.pam (rev 0)
+++ rsh.pam 2013-12-08 00:06:46 UTC (rev 201284)
@@ -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
Added: rsh.socket
===================================================================
--- rsh.socket (rev 0)
+++ rsh.socket 2013-12-08 00:06:46 UTC (rev 201284)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Remote Shell Facilities Activation Socket
+
+[Socket]
+ListenStream=514
+Accept=true
+
+[Install]
+WantedBy=sockets.target
Added: talk.service
===================================================================
--- talk.service (rev 0)
+++ talk.service 2013-12-08 00:06:46 UTC (rev 201284)
@@ -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
Added: talk.socket
===================================================================
--- talk.socket (rev 0)
+++ talk.socket 2013-12-08 00:06:46 UTC (rev 201284)
@@ -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
Added: telnet.socket
===================================================================
--- telnet.socket (rev 0)
+++ telnet.socket 2013-12-08 00:06:46 UTC (rev 201284)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Telnet Server Activation Socket
+Documentation=man:telnetd(8)
+
+[Socket]
+ListenStream=23
+Accept=true
+
+[Install]
+WantedBy=sockets.target
More information about the arch-commits
mailing list