[arch-commits] Commit in inetutils/trunk (4 files)

[Eric Bélanger]

    Date: Wednesday, April 25, 2012 @ 15:43:22
  Author: eric
Revision: 157203

upgpkg: inetutils 1.9.1-2

Remove rexec and rexecd (close FS#28819), Remove domainname wrapper and fixed dnsdomainname (close FS#29529), Remove provides/conflicts/replaces arrays

Modified:
  inetutils/trunk/PKGBUILD
  inetutils/trunk/dnsdomainname
Deleted:
  inetutils/trunk/domainname
  inetutils/trunk/rexec.xinetd

---------------+
 PKGBUILD      |   18 +++++-------------
 dnsdomainname |    2 +-
 domainname    |    3 ---
 rexec.xinetd  |   10 ----------
 4 files changed, 6 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-25 17:31:31 UTC (rev 157202)
+++ PKGBUILD	2012-04-25 19:43:22 UTC (rev 157203)
@@ -3,33 +3,28 @@
 
 pkgname=inetutils
 pkgver=1.9.1
-pkgrel=1
+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')
-provides=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
-conflicts=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
-replaces=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
 backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \
-        'etc/xinetd.d/rexec' 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh')
+        'etc/xinetd.d/rlogin' 'etc/xinetd.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 rexec.xinetd rlogin.xinetd rsh.xinetd \
-        dnsdomainname domainname)
+        ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \
+        dnsdomainname)
 sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90'
           'ff0aad9946a38915580b094dadf67e790e8a2f87'
           '84dc802b5e57b5e04c847572225a3b9612017155'
           '68a590083b45997dfdb80e666b2de762f494ba74'
           'bfad98a4a62f1fff8779f076c6019ed07f9111af'
           '27d99b910eec0fc26bd79ccc2c1de26608330298'
-          '87aa4f38ebee9dac5dcaa04cbc3f2f0906bec605'
           '81f10b3b688e3952f793b35bcef63b5bf257a92b'
           '81f4a8da823cf0bb14284fc71ee6108849691eda'
-          'ac69756d6cc50157d430d863db04a5aac4688380'
           'eb952b0b9c3e3d429d8e21b110249e495f0e0e63')
 
 build() {
@@ -42,8 +37,8 @@
     --enable-talk --enable-talkd \
     --enable-rlogin --enable-rlogind \
     --enable-rsh --enable-rshd \
-    --enable-rexec --enable-rexecd \
     --enable-rcp --enable-hostname \
+    --disable-rexec --disable-rexecd \
     --disable-tftp --disable-tftpd \
     --disable-ping --disable-ping6 \
     --disable-logger --disable-syslogd \
@@ -63,15 +58,12 @@
 
   install -d "${pkgdir}/bin"
   ln -s /usr/bin/hostname "${pkgdir}/bin/hostname"
-  install -D -m755 "${srcdir}/domainname" "${pkgdir}/bin/domainname"
   install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/bin/dnsdomainname"
-  echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/domainname.1"
   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}/rexec.xinetd" "${pkgdir}/etc/xinetd.d/rexec"
   install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin"
   install -D -m644 "${srcdir}/rsh.xinetd" "${pkgdir}/etc/xinetd.d/rsh"
 }

Modified: dnsdomainname
===================================================================
--- dnsdomainname	2012-04-25 17:31:31 UTC (rev 157202)
+++ dnsdomainname	2012-04-25 19:43:22 UTC (rev 157203)
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec /usr/bin/hostname -y "$@"
+exec /usr/bin/hostname -d "$@"

Deleted: domainname
===================================================================
--- domainname	2012-04-25 17:31:31 UTC (rev 157202)
+++ domainname	2012-04-25 19:43:22 UTC (rev 157203)
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/hostname -d "$@"

Deleted: rexec.xinetd
===================================================================
--- rexec.xinetd	2012-04-25 17:31:31 UTC (rev 157202)
+++ rexec.xinetd	2012-04-25 19:43:22 UTC (rev 157203)
@@ -1,10 +0,0 @@
-service exec
-{
-        flags                   = REUSE
-        socket_type             = stream
-        wait                    = no
-        user                    = root
-        server                  = /usr/sbin/rexecd
-        log_on_failure          += USERID
-        disable                 = yes
-}