From 9965ac1fcb6165f7365156cd7e0e3a675297a72a Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 14 Jul 2012 23:44:00 +0200
Subject: [PATCH] openssh-server: use make_dirs.

---
 srcpkgs/openssh/files/sshd.tmpfiles.d   | 1 -
 srcpkgs/openssh/openssh-server.template | 3 +--
 srcpkgs/openssh/template                | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)
 delete mode 100644 srcpkgs/openssh/files/sshd.tmpfiles.d

diff --git a/srcpkgs/openssh/files/sshd.tmpfiles.d b/srcpkgs/openssh/files/sshd.tmpfiles.d
deleted file mode 100644
index 075395151a..0000000000
--- a/srcpkgs/openssh/files/sshd.tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d /var/chroot/ssh 755 root root
diff --git a/srcpkgs/openssh/openssh-server.template b/srcpkgs/openssh/openssh-server.template
index 35ee92da89..84c53ac096 100644
--- a/srcpkgs/openssh/openssh-server.template
+++ b/srcpkgs/openssh/openssh-server.template
@@ -2,6 +2,7 @@
 #
 conf_files="/etc/ssh/sshd_config /etc/pam.d/sshd"
 systemd_services="sshd.socket on"
+make_dirs="/var/chroot/ssh 0755 root root"
 depends="openssh>=$version"
 short_desc="The OpenSSH server"
 long_desc="${long_desc}
@@ -20,6 +21,4 @@ do_install() {
 	vmkdir usr/lib/systemd/system
 	install -m644 ${FILESDIR}/*.{socket,service} \
 		${DESTDIR}/usr/lib/systemd/system
-	vinstall ${FILESDIR}/sshd.tmpfiles.d 644 \
-		usr/lib/tmpfiles.d sshd.conf
 }
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index d6960d01af..0f7251b0d0 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=6.0p1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh
 --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody --with-pam