Sun May 5 01:06:40 PDT 2013

4 files changed, 12 insertions, 59 deletions

diff --git a/extra/ypbind-mt/PKGBUILD b/extra/ypbind-mt/PKGBUILD
index d4ce1b4d9..56ade6c6c 100644
--- a/extra/ypbind-mt/PKGBUILD
+++ b/extra/ypbind-mt/PKGBUILD
@@ -1,32 +1,27 @@
-# $Id: PKGBUILD 162167 2012-06-22 13:00:20Z dreisner $
+# $Id: PKGBUILD 184214 2013-05-03 22:54:48Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ypbind-mt
-pkgver=1.33
-pkgrel=5
+pkgver=1.37.1
+pkgrel=4
 pkgdesc='Linux NIS daemon'
 url='http://www.linux-nis.org/nis/ypbind-mt/'
 license=('GPL2')
 arch=('i686' 'x86_64')
 makedepends=('networkmanager')
-depends=('rpcbind' 'openslp' 'dbus-glib' 'yp-tools')
-backup=('etc/yp.conf' 'etc/conf.d/ypbind' 'etc/conf.d/nisdomainname')
-#source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz"
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'nisdomainname.conf'
-        'ypbind.conf'
-        'ypbind'
+depends=('rpcbind' 'openslp' 'yp-tools')
+backup=('etc/yp.conf')
+source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
 	'ypbind.service')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	./configure \
-		--prefix=/usr \
-		--enable-dbus-nm \
+		--prefix=/usr
 
 	make
 }
@@ -37,14 +32,8 @@ package() {
 	make DESTDIR="${pkgdir}" install
 
 	install -D -m644 etc/yp.conf "${pkgdir}"/etc/yp.conf
-	install -D -m755 ../ypbind "${pkgdir}"/etc/rc.d/ypbind
-	install -D -m644 ../ypbind.conf "${pkgdir}"/etc/conf.d/ypbind
-	install -D -m644 ../nisdomainname.conf "${pkgdir}"/etc/conf.d/nisdomainname
 	install -D -m644 ../ypbind.service "${pkgdir}"/usr/lib/systemd/system/ypbind.service
 	install -d -m755 "${pkgdir}"/var/yp/binding
 }
-md5sums=('692f68ed0476762be4228ce543a5b791'
-         'e83a85291ea2ee152a78f2c16b0b1185'
-         '229309a989abad27703ac2e6d07dc7ae'
-         '1f7a4c80414d580c9afb3a08267beed0'
-         '88a721095e334cd442f4649a151ba9be')
+md5sums=('8af8d35e7b9a7fcc3a1576697a04bd82'
+         '9083debd16fc49c6645372caa25969b5')
diff --git a/extra/ypbind-mt/ypbind b/extra/ypbind-mt/ypbind
deleted file mode 100755
index 6a5ef11e3..000000000
--- a/extra/ypbind-mt/ypbind
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-. /etc/conf.d/ypbind
-. /etc/conf.d/nisdomainname
-
-name=ypbind
-PID=$(pidof -o %PPID /usr/sbin/ypbind)
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -n $NISDOMAINNAME ]] && /usr/bin/domainname "$NISDOMAINNAME" &>/dev/null
-	[[ -z "$PID" ]] && /usr/sbin/ypbind $YPBIND_ARGS &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && kill $PID &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart}"
-	exit 1
-	;;
-esac
diff --git a/extra/ypbind-mt/ypbind.conf b/extra/ypbind-mt/ypbind.conf
deleted file mode 100644
index fd0ebd491..000000000
--- a/extra/ypbind-mt/ypbind.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to ypbind
-#
-YPBIND_ARGS=""
diff --git a/extra/ypbind-mt/ypbind.service b/extra/ypbind-mt/ypbind.service
index c59231000..08e4fe14e 100644
--- a/extra/ypbind-mt/ypbind.service
+++ b/extra/ypbind-mt/ypbind.service
@@ -8,6 +8,9 @@ Before=systemd-user-sessions.service
 Type=forking
 PIDFile=/run/ypbind.pid
 ExecStart=/usr/sbin/ypbind
+# Terrible hack, upstream ypbind should sort something out
+# Wait for at most 10 seconds for a NIS master to become available
+ExecStartPost=/bin/sh -c "for i in 1 2 3 4 5 6 7 8 9 10; do ypwhich && break; sleep 1; done"
 
 [Install]
 WantedBy=multi-user.target