Tue Sep 4 00:04:04 UTC 2012

3 files changed, 13 insertions, 18 deletions

diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index fced1e18d..1269ba2d9 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 162326 2012-06-25 06:10:45Z bisson $
+# $Id: PKGBUILD 165852 2012-09-01 14:30:06Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=openssh
-pkgver=6.0p1
-pkgrel=3
+pkgver=6.1p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
 arch=('i686' 'x86_64')
+makedepends=('linux-headers')
 depends=('krb5' 'openssl' 'libedit' 'ldns')
 optdepends=('xorg-xauth: X11 forwarding'
             'x11-ssh-askpass: input passphrase in X')
@@ -19,20 +20,18 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}
         'sshd@.service'
         'sshd.service'
         'sshd.socket'
-        'tmpfiles.d'
         'sshd.confd'
         'sshd.pam'
         'sshd')
-sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422'
+sha1sums=('751c92c912310c3aa9cadc113e14458f843fc7b3'
           '954bf1660aa32620c37034320877f4511b767ccb'
           '6c71de2c2ca9622aa8e863acd94b135555e11125'
           'bd6eae36c7ef9efb7147778baad7858b81f2d660'
-          '83a257b8f6a62237383262cb0e2583e5609ddac0'
+          'f27617eeb694f4edd474638adf16733d8a793d85'
           'a30fb5fda6d0143345bae47684edaffb8d0a92a7'
-          'b5cf44205e8f4365c00bfbee110d7c0e563627aa'
           'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
           '659e3ee95c269014783ff8b318c6f50bf7496fbd'
-          'ed36e3a522f619ff6b13e253526596e4cca11e9f')
+          '1488d4ed33cf3037accf4b0e1c7a7e90b6a097c7')
 
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
 
@@ -60,13 +59,14 @@ build() {
 check() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	# The connect.sh test must be run by a user with a decent login shell;
-	# chroot builds use nobody with /bin/false.
-	make tests || true
+	make tests ||
+	grep $USER /etc/passwd | grep -q /bin/false
+	# connect.sh fails when run with stupid login shell
 }
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+
 	make DESTDIR="${pkgdir}" install
 
 	rm "${pkgdir}"/usr/share/man/man1/slogin.1
@@ -78,7 +78,6 @@ package() {
 	install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/sshd@.service
 	install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service
 	install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket
-	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/openssh.conf
 
 	install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389
 	install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd
diff --git a/core/openssh/sshd b/core/openssh/sshd
index 4bf4780f5..d60804e84 100755
--- a/core/openssh/sshd
+++ b/core/openssh/sshd
@@ -15,7 +15,6 @@ case "$1" in
 	start)
 		stat_busy 'Starting Secure Shell Daemon'
 		/usr/bin/ssh-keygen -A
-		[[ -d /var/empty ]] || mkdir -p /var/empty
 		[[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS
 		if [[ $? -gt 0 ]]; then
 			stat_fail
diff --git a/core/openssh/sshd.service b/core/openssh/sshd.service
index 7c8f88372..4a5910873 100644
--- a/core/openssh/sshd.service
+++ b/core/openssh/sshd.service
@@ -12,8 +12,5 @@ Restart=always
 WantedBy=multi-user.target
 Also=sshdgenkeys.service
 
-# Note that this is the service file for running a single SSH server for all
-# incoming connections, suitable only for systems with a large amount of SSH
-# traffic. In almost all other cases it is a better idea to use sshd.socket +
-# sshd@.service (i.e. the on-demand spawning version for one instance per
-# connection).
+# This service file runs an SSH daemon that forks for each incoming connection.
+# If you prefer to spawn on-demand daemons, use sshd.socket and sshd@.service.