Sun Jun 24 00:04:11 UTC 2012

5 files changed, 83 insertions, 14 deletions

diff --git a/community/oidentd/PKGBUILD b/community/oidentd/PKGBUILD
index b2eed2962..18807fdf7 100644
--- a/community/oidentd/PKGBUILD
+++ b/community/oidentd/PKGBUILD
@@ -1,33 +1,38 @@
-# $Id: PKGBUILD 64895 2012-02-18 19:49:45Z bpiotrowski $
-# Maintainer: simo <simo@archlinux.org>
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
+# $Id: PKGBUILD 72791 2012-06-22 12:51:10Z dreisner $
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: simo <simo@archlinux.org>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=oidentd
 pkgver=2.0.8
-pkgrel=5
-pkgdesc="An ident (rfc1413 compliant) daemon that runs on Linux"
+pkgrel=6
+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/oidentd-$pkgver.tar.gz
-	    oidentd.rc
-	    oidentd.default)
+source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz
+        rc.d conf.d service socket)
 md5sums=('c3d9a56255819ef8904b867284386911'
          '93cbf742cdd0b053f67482273d715f25'
-         '603307525771724b0f55a2c34fbc3f3e')
+         '603307525771724b0f55a2c34fbc3f3e'
+         'b215bee5764cdecb0939f44d5d2dccbe'
+         '651c2ef45d1d345d95056ef0787e29e6')
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd $srcdir/$pkgname-$pkgver
 	./configure --prefix=/usr
 	make
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make prefix="$pkgdir"/usr mandir="$pkgdir"/usr/share/man install
-	install -D -m 755 "$srcdir"/$pkgname.rc "$pkgdir"/etc/rc.d/oidentd
-	install -D -m 644 "$srcdir"/$pkgname.default "$pkgdir"/etc/conf.d/oidentd
+	cd $srcdir/$pkgname-$pkgver
+	make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man 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
 }
 
diff --git a/community/oidentd/conf.d b/community/oidentd/conf.d
new file mode 100644
index 000000000..5eefa80e2
--- /dev/null
+++ b/community/oidentd/conf.d
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 000000000..8b3c04c45
--- /dev/null
+++ b/community/oidentd/rc.d
@@ -0,0 +1,41 @@
+#!/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
new file mode 100644
index 000000000..3688298c1
--- /dev/null
+++ b/community/oidentd/service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Ident (RFC 1413) per-connection server
+
+[Service]
+ExecStart=/usr/sbin/oidentd -I -u nobody -g nobody
+ExecReload=/bin/kill -HUP $MAINPID
+StandardInput=socket
+StandardError=syslog
diff --git a/community/oidentd/socket b/community/oidentd/socket
new file mode 100644
index 000000000..63df7036e
--- /dev/null
+++ b/community/oidentd/socket
@@ -0,0 +1,10 @@
+[Unit]
+Description=Ident (RFC 1413) socket
+Conflicts=oidentd.service
+
+[Socket]
+ListenStream=113
+Accept=yes
+
+[Install]
+WantedBy=sockets.target