Tue May 14 01:18:40 PDT 2013

4 files changed, 13 insertions, 62 deletions

diff --git a/community/oidentd/PKGBUILD b/community/oidentd/PKGBUILD
index 8841f76cc..b93d89d74 100644
--- a/community/oidentd/PKGBUILD
+++ b/community/oidentd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75286 2012-08-17 22:22:42Z heftig $
+# $Id: PKGBUILD 90524 2013-05-13 00:06:48Z eric $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: simo <simo@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
@@ -6,33 +6,30 @@
 
 pkgname=oidentd
 pkgver=2.0.8
-pkgrel=7
+pkgrel=8
 pkgdesc='An RFC1413 compliant ident daemon'
 arch=('i686' 'x86_64')
 url="http://dev.ojnk.net/"
 license=('GPL')
 depends=('glibc' 'bash')
-source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz
-        rc.d conf.d service socket)
+source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz{,.asc}
+        service socket)
 md5sums=('c3d9a56255819ef8904b867284386911'
-         '93cbf742cdd0b053f67482273d715f25'
-         '603307525771724b0f55a2c34fbc3f3e'
-         'b215bee5764cdecb0939f44d5d2dccbe'
+         'SKIP'
+         'f54c5ed2a532a559c837af18735a28f1'
          '4442fb9fc10754914568e6ffc3d5fc42')
 
 build() {
-	cd $srcdir/$pkgname-$pkgver
-	./configure --prefix=/usr
+	cd $pkgname-$pkgver
+	./configure --prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man
 	make
 }
 
 package() {
-	cd $srcdir/$pkgname-$pkgver
-	make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man install
+	cd $pkgname-$pkgver
+	make DESTDIR="$pkgdir" install
 
-    install -D -m644 $srcdir/conf.d $pkgdir/etc/conf.d/oidentd
-	install -D -m755 $srcdir/rc.d $pkgdir/etc/rc.d/oidentd
-	install -D -m644 $srcdir/service $pkgdir/usr/lib/systemd/system/oidentd@.service
-	install -D -m644 $srcdir/socket $pkgdir/usr/lib/systemd/system/oidentd.socket
+	install -D -m644 "$srcdir/service" "$pkgdir/usr/lib/systemd/system/oidentd@.service"
+	install -D -m644 "$srcdir/socket" "$pkgdir/usr/lib/systemd/system/oidentd.socket"
 }
 
diff --git a/community/oidentd/conf.d b/community/oidentd/conf.d
deleted file mode 100644
index 5eefa80e2..000000000
--- a/community/oidentd/conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-USER=nobody
-GROUP=nobody
-OPTS=""
-# You will need this, when you want oidentd listen both on IPv4 and IPv6
-# OPTS="-a ::"
diff --git a/community/oidentd/rc.d b/community/oidentd/rc.d
deleted file mode 100644
index 8b3c04c45..000000000
--- a/community/oidentd/rc.d
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/oidentd
-
-# no daemon check needed for oidentd, and no pid nesecary.
-case "$1" in
-  start)
-    stat_busy "Starting oidentd Daemon..."
-    # oidentd is smart enough to only run one copy of
-    # itsself, no check nesecary, and no pidfile
-    /usr/sbin/oidentd -u ${USER} -g ${GROUP} ${OPTS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon oidentd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping oidentd Daemon..."
-    # kill the process by it's full name, or the init script
-    # will terminate as well, wreaking havok.
-    killall /usr/sbin/oidentd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon oidentd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/oidentd/service b/community/oidentd/service
index 3688298c1..72ca7c244 100644
--- a/community/oidentd/service
+++ b/community/oidentd/service
@@ -2,7 +2,7 @@
 Description=Ident (RFC 1413) per-connection server
 
 [Service]
-ExecStart=/usr/sbin/oidentd -I -u nobody -g nobody
+ExecStart=/usr/bin/oidentd -I -u nobody -g nobody
 ExecReload=/bin/kill -HUP $MAINPID
 StandardInput=socket
 StandardError=syslog