diff options
| -rw-r--r-- | abs/core/inetutils/PKGBUILD | 25 | ||||
| -rw-r--r-- | abs/core/inetutils/ftpd.service | 2 | ||||
| -rw-r--r-- | abs/core/inetutils/inetutils.install | 19 |
3 files changed, 19 insertions, 27 deletions
diff --git a/abs/core/inetutils/PKGBUILD b/abs/core/inetutils/PKGBUILD index fd85ed1..f972945 100644 --- a/abs/core/inetutils/PKGBUILD +++ b/abs/core/inetutils/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 201551 2013-12-14 23:02:04Z eric $ +# $Id$ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=inetutils -pkgver=1.9.1.341 -pkgrel=2 +pkgver=1.9.4 +pkgrel=5 pkgdesc="A collection of common network programs" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://www.gnu.org/software/inetutils/" license=('GPL3') groups=('base') -depends=('pam') +depends=('pam' 'libcap') 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=(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' +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' - 'aa4730d662398b6c33df2b6fc116ab6b5c3cd120' + '026181500b71f0c09ef5c262450be718651e5658' '387b371cbaa3611b95d30f806c0dd08b621a584a' '6f9a304391610a17b8ae3ad35b742c78c86aee16' '0455126fa18d2a9422469d79b9e73dd928b15652' @@ -37,6 +37,7 @@ sha1sums=('eaccc1568c9cc624f6cda3a265fb92ec72c7304d' '0917dc6b5a80d914bf550065b1733b7da2c776f3' 'a7ac7bbe917ff80fd8cd4357fbc62fab50595c34' '2b2dd71eb3233e5090f4c2df8abe9b4924d323f3') +validpgpkeys=('4FBD67621082C4C502448E3B180551BAD95A3C35') build() { cd ${pkgname}-${pkgver} @@ -67,6 +68,8 @@ package() { cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install + chmod -s "${pkgdir}"/usr/bin/{rcp,rlogin,rsh} + 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" diff --git a/abs/core/inetutils/ftpd.service b/abs/core/inetutils/ftpd.service index 3020804..c1deb0d 100644 --- a/abs/core/inetutils/ftpd.service +++ b/abs/core/inetutils/ftpd.service @@ -6,7 +6,7 @@ After=network.target Type=forking PIDFile=/run/ftpd.pid ExecStart=/usr/bin/ftpd -D -ExecStopPost=/bin/rm -f /run/ftpd.pid +ExecStopPost=/usr/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 bd2a283..4776e7e 100644 --- a/abs/core/inetutils/inetutils.install +++ b/abs/core/inetutils/inetutils.install @@ -1,20 +1,9 @@ -infodir=usr/share/info -filelist=(inetutils.info.gz) - post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done + 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 $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done + post_install } |