2 files changed, 29 insertions, 19 deletions
diff --git a/libre/parabola-hackers/PKGBUILD b/libre/parabola-hackers/PKGBUILD
index 266c413e2..eeee1bd55 100644
--- a/libre/parabola-hackers/PKGBUILD
+++ b/libre/parabola-hackers/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgbase=parabola-hackers
-pkgname=(parabola-hackers nshd)
-pkgver=20160516
-_gitver=a99b31c556020859a5440ffce5409499034f8382
+pkgname=(parabola-hackers parabola-hackers-nshd)
+pkgver=20160518
+_gitver=fd98ee554c3c785ee83460e83027d56891fbd9b2
 pkgdesc='Programs for doing magic with hackers.git'
 url='https://projects.parabola.nu/packages/parabola-hackers.git/'
 license=('GPL')
@@ -12,7 +12,7 @@ pkgrel=1
 arch=('x86_64' 'i686')
 makedepends=('go')
 source=("https://repo.parabola.nu/other/$pkgbase/$pkgbase-$pkgver.tar.gz")
-md5sums=('4eb38ced2486ab2a3d2fc5b6c9b935c1')
+md5sums=('e89f4c3749cb4cf2fac081e339675f9f')
 
 # Don't use mksource=(git://...) because we need --recursive
 mksource() {
@@ -25,11 +25,15 @@ mksource() {
 
 build() {
 	cd "$srcdir/$pkgbase-$pkgver"
-	make \
+
+	printf '%s\n' \
 	    prefix='/usr' \
 	    bindir='$(libexecdir)/$(PACKAGE)' \
 	    libexecdir='$(libdir)' \
-	    sysconfdir='/etc'
+	    sysconfdir='/etc' \
+	    > config.mk
+
+	make
 }
 
 package_parabola-hackers() {
@@ -37,25 +41,21 @@ package_parabola-hackers() {
 	depends=('ruby')
 
 	cd "$srcdir/$pkgbase-$pkgver"
-	make DESTDIR="${pkgdir}" install \
-	     prefix='/usr' \
-	     bindir='$(libexecdir)/$(PACKAGE)' \
-	     libexecdir='$(libdir)' \
-	     sysconfdir='/etc'
-	find "$pkgdir" -type f -name 'nshd*' -delete
+	make DESTDIR="${pkgdir}" install
+	find "$pkgdir" -type f \( -name 'nshd*' -o -name shadow \) -delete
 	find "$pkgdir" -type d -empty -exec rmdir -p --ignore-fail-on-non-empty -- {} +
 }
 
-package_nshd() {
+package_parabola-hackers-nshd() {
 	pkgdesc='NSS and PAM integration for parabola-hackers'
 	depends=("parabola-hackers=$pkgver" 'nss-pam-ldapd')
+	backup=(etc/nshd/shadow)
+	install=parabola-hackers-nshd.install
+	replaces=(nshd)
+	conflicts=(nshd)
 
 	cd "$srcdir/$pkgbase-$pkgver"
-	make DESTDIR="${pkgdir}" install \
-	     prefix='/usr' \
-	     bindir='$(libexecdir)/$(PACKAGE)' \
-	     libexecdir='$(libdir)' \
-	     sysconfdir='/etc'
-	find "$pkgdir" -type f -not -name 'nshd*' -delete
+	make DESTDIR="${pkgdir}" install
+	find "$pkgdir" -type f -not \( -name 'nshd*' -o -name shadow \) -delete
 	find "$pkgdir" -type d -empty -exec rmdir -p --ignore-fail-on-non-empty -- {} +
 }
diff --git a/libre/parabola-hackers/parabola-hackers-nshd.install b/libre/parabola-hackers/parabola-hackers-nshd.install
new file mode 100644
index 000000000..26a0b8cda
--- /dev/null
+++ b/libre/parabola-hackers/parabola-hackers-nshd.install
@@ -0,0 +1,10 @@
+#!/hint/sh
+
+post_install() {
+	systemd-sysusers
+	chown -R nshd:nshd /etc/nshd
+}
+
+post_upgrade() {
+	post_install
+}