[arch-commits] Commit in oidentd/trunk (PKGBUILD conf.d rc.d service)
Eric Bélanger
eric at nymeria.archlinux.org
Mon May 13 00:05:58 UTC 2013
Date: Monday, May 13, 2013 @ 02:05:58
Author: eric
Revision: 90523
upgpkg: oidentd 2.0.8-8
Remove initscripts support, Move binaries in /usr/sbin to /usr/bin
Modified:
oidentd/trunk/PKGBUILD
oidentd/trunk/service
Deleted:
oidentd/trunk/conf.d
oidentd/trunk/rc.d
----------+
PKGBUILD | 25 +++++++++++--------------
conf.d | 5 -----
rc.d | 41 -----------------------------------------
service | 2 +-
4 files changed, 12 insertions(+), 61 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-05-13 00:02:04 UTC (rev 90522)
+++ PKGBUILD 2013-05-13 00:05:58 UTC (rev 90523)
@@ -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 at .service
- install -D -m644 $srcdir/socket $pkgdir/usr/lib/systemd/system/oidentd.socket
+ install -D -m644 "$srcdir/service" "$pkgdir/usr/lib/systemd/system/oidentd at .service"
+ install -D -m644 "$srcdir/socket" "$pkgdir/usr/lib/systemd/system/oidentd.socket"
}
Deleted: conf.d
===================================================================
--- conf.d 2013-05-13 00:02:04 UTC (rev 90522)
+++ conf.d 2013-05-13 00:05:58 UTC (rev 90523)
@@ -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 ::"
Deleted: rc.d
===================================================================
--- rc.d 2013-05-13 00:02:04 UTC (rev 90522)
+++ rc.d 2013-05-13 00:05:58 UTC (rev 90523)
@@ -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
Modified: service
===================================================================
--- service 2013-05-13 00:02:04 UTC (rev 90522)
+++ service 2013-05-13 00:05:58 UTC (rev 90523)
@@ -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
More information about the arch-commits
mailing list