Fri May 17 01:52:35 PDT 2013

9 files changed, 30 insertions, 70 deletions

diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD
index 38c9cfc82..a25f1a53b 100644
--- a/core/inetutils/PKGBUILD
+++ b/core/inetutils/PKGBUILD
@@ -1,38 +1,40 @@
-# $Id: PKGBUILD 165908 2012-09-03 17:29:57Z eric $
+# $Id: PKGBUILD 185637 2013-05-16 17:56:59Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=inetutils
 pkgver=1.9.1
-pkgrel=4
+pkgrel=5
 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')
-backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \
+depends=('pam')
+backup=('etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \
         '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 rlogin.xinetd rsh.xinetd \
+        telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \
         ftpd.service dnsdomainname)
 sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90'
-          'ff0aad9946a38915580b094dadf67e790e8a2f87'
-          '84dc802b5e57b5e04c847572225a3b9612017155'
-          '68a590083b45997dfdb80e666b2de762f494ba74'
-          'bfad98a4a62f1fff8779f076c6019ed07f9111af'
-          '27d99b910eec0fc26bd79ccc2c1de26608330298'
-          '81f10b3b688e3952f793b35bcef63b5bf257a92b'
-          '81f4a8da823cf0bb14284fc71ee6108849691eda'
-          'fb607dafe177f074e14891dd887ef9e9ab67a875'
+          'SKIP'
+          '2b2dd71eb3233e5090f4c2df8abe9b4924d323f3'
+          'b15ab4faa9d97652e182c98c1e3a3b3cbbf6383c'
+          'd9b8f8aab094ecb779d0f16f21b4683ab327516f'
+          '26763ae31b8a5be256666a0ba55746941d75d6ee'
+          'e4a764828b57f1e907ec96f4ae0e0cf0d3e2e802'
           'eb952b0b9c3e3d429d8e21b110249e495f0e0e63')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
   sed -i 's|_GL_WARN_ON_USE (gets|//_GL_WARN_ON_USE (gets|' lib/stdio.in.h
-  ./configure --prefix=/usr --libexec=/usr/sbin --localstatedir=/var \
-    --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info \
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --libexec=/usr/bin \
+    --localstatedir=/var --sysconfdir=/etc \
     --without-wrap --with-pam \
     --enable-ftp --enable-ftpd \
     --enable-telnet --enable-telnetd \
@@ -50,20 +52,19 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -d "${pkgdir}/bin"
-  ln -s /usr/bin/hostname "${pkgdir}/bin/hostname"
-  install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/bin/dnsdomainname"
+  ln -s ../usr/bin/hostname "${pkgdir}/bin/hostname"
+  ln -s ../usr/bin/dnsdomainname "${pkgdir}/bin/dnsdomainname"
+  install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/usr/bin/dnsdomainname"
   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}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin"
diff --git a/core/inetutils/ftpd.conf b/core/inetutils/ftpd.conf
deleted file mode 100644
index f660f0035..000000000
--- a/core/inetutils/ftpd.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to ftpd
-#
-FTPD_ARGS=""
diff --git a/core/inetutils/ftpd.rc b/core/inetutils/ftpd.rc
deleted file mode 100644
index 3d0d34421..000000000
--- a/core/inetutils/ftpd.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/ftpd
-
-PID=$(pidof -o %PPID /usr/sbin/ftpd)
-case "$1" in
-  start)
-    stat_busy "Starting ftpd"
-    [ -z "$PID" ] && /usr/sbin/ftpd -D $FTPD_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon ftpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ftpd"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon ftpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/core/inetutils/ftpd.service b/core/inetutils/ftpd.service
index 5708bdfd1..57549c088 100644
--- a/core/inetutils/ftpd.service
+++ b/core/inetutils/ftpd.service
@@ -3,7 +3,7 @@ Description=FTPD Daemon
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/ftpd -D
+ExecStart=/usr/bin/ftpd -D
 Type=forking
 
 [Install]
diff --git a/core/inetutils/inetutils.install b/core/inetutils/inetutils.install
index b338fa498..bd2a283b8 100644
--- a/core/inetutils/inetutils.install
+++ b/core/inetutils/inetutils.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(inetutils.info.gz)
 
 post_install() {
diff --git a/core/inetutils/rlogin.xinetd b/core/inetutils/rlogin.xinetd
index 5c72f86df..bffdb9011 100644
--- a/core/inetutils/rlogin.xinetd
+++ b/core/inetutils/rlogin.xinetd
@@ -4,7 +4,7 @@ service login
         socket_type             = stream
         wait                    = no
         user                    = root
-        server                  = /usr/sbin/rlogind
+        server                  = /usr/bin/rlogind
         log_on_failure          += USERID
         disable                 = yes
 }
diff --git a/core/inetutils/rsh.xinetd b/core/inetutils/rsh.xinetd
index a13738c31..c8848ce7f 100644
--- a/core/inetutils/rsh.xinetd
+++ b/core/inetutils/rsh.xinetd
@@ -4,7 +4,7 @@ service shell
         socket_type             = stream
         wait                    = no
         user                    = root
-        server                  = /usr/sbin/rshd
+        server                  = /usr/bin/rshd
         log_on_failure          += USERID
         disable                 = yes
 }
diff --git a/core/inetutils/talk.xinetd b/core/inetutils/talk.xinetd
index 6abef359c..b62e56310 100644
--- a/core/inetutils/talk.xinetd
+++ b/core/inetutils/talk.xinetd
@@ -4,7 +4,7 @@ service ntalk
 	socket_type		= dgram
 	wait			= yes
 	user			= root
-	server			= /usr/sbin/talkd
+	server			= /usr/bin/talkd
 	log_on_failure		+= USERID
 	disable			= yes
 }
diff --git a/core/inetutils/telnet.xinetd b/core/inetutils/telnet.xinetd
index bd3a5e4b1..c56f33985 100644
--- a/core/inetutils/telnet.xinetd
+++ b/core/inetutils/telnet.xinetd
@@ -4,7 +4,7 @@ service telnet
 	socket_type		= stream
 	wait			= no
 	user			= root
-	server			= /usr/sbin/telnetd
+	server			= /usr/bin/telnetd
 	log_on_failure		+= USERID
 	disable			= yes
 }