Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	core/dbus/PKGBUILD
	extra/opus/PKGBUILD
	extra/ypbind-mt/PKGBUILD

4 files changed, 22 insertions, 9 deletions

diff --git a/extra/yp-tools/PKGBUILD b/extra/yp-tools/PKGBUILD
index f9a1a377c..ca81d3f20 100644
--- a/extra/yp-tools/PKGBUILD
+++ b/extra/yp-tools/PKGBUILD
@@ -1,20 +1,22 @@
-# $Id: PKGBUILD 165833 2012-08-31 12:24:13Z tomegun $
+# $Id: PKGBUILD 184213 2013-05-03 22:54:47Z tomegun $
 # Mantainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=yp-tools
-pkgver=2.12
-pkgrel=4
+pkgver=2.14
+pkgrel=2
 pkgdesc='Linux NIS Tools'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.linux-nis.org/nis/yp-tools/'
 license=('GPL2')
 depends=('ypbind-mt')
-#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"
-	'domainname.service')
+backup=('etc/nisdomainname')
+install=yp-tools.install
+source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+	'domainname.service'
+	'domainname.conf')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -25,7 +27,9 @@ build() {
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
+	install -D -m644 ../domainname.conf "${pkgdir}/etc/nisdomainname"
 	install -D -m644 ../domainname.service "${pkgdir}/usr/lib/systemd/system/domainname.service"
 }
-md5sums=('ce1e06d86caa285fa8cd76fdf103f51e'
-         '8d354b76eb0df9a3b06637bfff87453b')
+md5sums=('ba1f121c17e3ad65368be173b977cd13'
+         '5a78cd2218936241133e5f61383a2dc8'
+         '74298e047121f528a2a5c221afd783ab')
diff --git a/extra/yp-tools/domainname.conf b/extra/yp-tools/domainname.conf
new file mode 100644
index 000000000..d43d5f53e
--- /dev/null
+++ b/extra/yp-tools/domainname.conf
@@ -0,0 +1,4 @@
+#
+# NIS domain to be set by domainname.service
+#
+NISDOMAINNAME=""
diff --git a/extra/yp-tools/domainname.service b/extra/yp-tools/domainname.service
index 035f767c8..7a1705688 100644
--- a/extra/yp-tools/domainname.service
+++ b/extra/yp-tools/domainname.service
@@ -3,7 +3,7 @@ Description=NIS Domainname
 
 [Service]
 Type=oneshot
-EnvironmentFile=/etc/conf.d/nisdomainname
+EnvironmentFile=/etc/nisdomainname
 ExecStart=/usr/bin/nisdomainname $NISDOMAINNAME
 RemainAfterExit=true
 
diff --git a/extra/yp-tools/yp-tools.install b/extra/yp-tools/yp-tools.install
new file mode 100644
index 000000000..19e8ecaf4
--- /dev/null
+++ b/extra/yp-tools/yp-tools.install
@@ -0,0 +1,5 @@
+post_upgrade() {
+	if [ "$(vercmp 2.14-2 "$2")" -eq 1 ]; then
+		printf '===> Configure your NIS domain name in /etc/nisdomainname\n'
+	fi
+}