update to libnsl version

3 files changed, 48 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index afc75164a604..aae193916b46 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,32 @@
 pkgbase = ypserv
 	pkgdesc = Linux NIS Server
-	pkgver = 2.32.1
+	pkgver = 4.0
 	pkgrel = 1
-	url = http://www.linux-nis.org/nis/ypserv/
+	url = https://github.com/thkukuk/ypserv
 	arch = i686
 	arch = x86_64
 	license = GPL2
-	depends = gdbm
-	depends = openslp
-	depends = inetutils
+	makedepends = libxslt
+	makedepends = libxml2
+	makedepends = docbook-xml
+	makedepends = docbook-xsl
+	depends = gawk
 	depends = yp-tools
-	optdepends = gawk: for printcap support
+	depends = libsystemd
 	backup = etc/ypserv.conf
 	backup = etc/netgroup
-	backup = var/yp/securenets
-	source = http://www.linux-nis.org/download/ypserv/ypserv-2.32.1.tar.bz2
+	backup = etc/securenets
+	backup = etc/yp/Makefile
+	source = https://github.com/thkukuk/ypserv/archive/ypserv-4.0.tar.gz
 	source = ypxfrd.service
 	source = yppasswdd.service
 	source = ypserv.service
-	md5sums = 21695231a816d150685eae870087291c
+	source = ypserv.conf
+	md5sums = 0b2cf49154881b65d37e44f89e163071
 	md5sums = 0639cc2e8f667272335649eeede77206
 	md5sums = 9ff147310a5b83749357b6587cccdf34
 	md5sums = 89b8b608c81fd01bb81cdb551854833f
+	md5sums = 9a3d6ce34139003f1188b9e39dd9a8e8
 
 pkgname = ypserv
 
diff --git a/PKGBUILD b/PKGBUILD
index 2bab5da82c9d..85319c86a068 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,3 +1,4 @@
+# vim: set et sw=2:
 # Maintainer: Brian Bidulock <bidulock@openss7.org>
 # Contributor: Tom Gundersen <teg@jklm.no>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
@@ -5,38 +6,48 @@
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ypserv
-pkgver=2.32.1
+pkgver=4.0
 pkgrel=1
 pkgdesc='Linux NIS Server'
 arch=('i686' 'x86_64')
-url='http://www.linux-nis.org/nis/ypserv/'
+url='https://github.com/thkukuk/ypserv'
 license=('GPL2')
-depends=('gdbm' 'openslp' 'inetutils' 'yp-tools')
-optdepends=('gawk: for printcap support')
-backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets')
-source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+makedepends=('libxslt' 'libxml2' 'docbook-xml' 'docbook-xsl')
+depends=('gawk' 'yp-tools' 'libsystemd')
+backup=('etc/ypserv.conf' 'etc/netgroup' 'etc/securenets' 'etc/yp/Makefile')
+source=("$url/archive/$pkgname-$pkgver.tar.gz"
         'ypxfrd.service'
         'yppasswdd.service'
-	'ypserv.service')
+	'ypserv.service'
+        'ypserv.conf')
+
+prepare() {
+  cd $pkgname-$pkgname-$pkgver
+  ./autogen.sh
+}
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --sbindir=/usr/bin
-	make
+  cd $pkgname-$pkgname-$pkgver
+  ./configure --prefix=/usr --sbindir=/usr/bin
+  make V=0
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m644 etc/netgroup "${pkgdir}"/etc/netgroup
-	install -D -m644 etc/ypserv.conf "${pkgdir}"/etc/ypserv.conf
-	install -D -m644 etc/securenets "${pkgdir}"/var/yp/securenets
-	install -D -m644 ../ypxfrd.service "${pkgdir}"/usr/lib/systemd/system/ypxfrd.service
-	install -D -m644 ../ypserv.service "${pkgdir}"/usr/lib/systemd/system/ypserv.service
-	install -D -m644 ../yppasswdd.service "${pkgdir}"/usr/lib/systemd/system/yppasswdd.service
+  cd $pkgname-$pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 etc/netgroup "${pkgdir}"/etc/netgroup
+  install -D -m644 etc/ypserv.conf "${pkgdir}"/etc/ypserv.conf
+  install -D -m644 etc/securenets "${pkgdir}"/etc/securenets
+  install -D -m644 ../ypxfrd.service "${pkgdir}"/usr/lib/systemd/system/ypxfrd.service
+  install -D -m644 ../ypserv.service "${pkgdir}"/usr/lib/systemd/system/ypserv.service
+  install -D -m644 ../yppasswdd.service "${pkgdir}"/usr/lib/systemd/system/yppasswdd.service
+  install -D -m644 "${pkgdir}"/var/yp/Makefile "${pkgdir}"/etc/yp/Makefile
+  install -D -m644 ../ypserv.conf "${pkgdir}"/usr/lib/tmpfiles.d/ypserv.conf
+  rm -fr "${pkgdir}/var"
 }
-md5sums=('21695231a816d150685eae870087291c'
+
+md5sums=('0b2cf49154881b65d37e44f89e163071'
          '0639cc2e8f667272335649eeede77206'
          '9ff147310a5b83749357b6587cccdf34'
-         '89b8b608c81fd01bb81cdb551854833f')
+         '89b8b608c81fd01bb81cdb551854833f'
+         '9a3d6ce34139003f1188b9e39dd9a8e8')
diff --git a/ypserv.conf b/ypserv.conf
new file mode 100644
index 000000000000..0e7084666705
--- /dev/null
+++ b/ypserv.conf
@@ -0,0 +1,2 @@
+F /var/yp/securenets 0644 - - - /etc/securenets
+F /var/yp/Makefile 0644 - - - /etc/yp/Makefile