[arch-commits] Commit in openssh/trunk (PKGBUILD sshd sshd.service tmpfiles.d)

[Gaetan Bisson]

    Date: Thursday, July 5, 2012 @ 22:47:50
  Author: bisson
Revision: 163029

make check() matter, /var/empty now in filesystem, clean up sshd.service comment

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd
  openssh/trunk/sshd.service
Deleted:
  openssh/trunk/tmpfiles.d

--------------+
 PKGBUILD     |   14 +++++---------
 sshd         |    1 -
 sshd.service |    7 ++-----
 tmpfiles.d   |    1 -
 4 files changed, 7 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-06 01:27:22 UTC (rev 163028)
+++ PKGBUILD	2012-07-06 02:47:50 UTC (rev 163029)
@@ -19,7 +19,6 @@
         'sshd at .service'
         'sshd.service'
         'sshd.socket'
-        'tmpfiles.d'
         'sshd.confd'
         'sshd.pam'
         'sshd')
@@ -27,12 +26,11 @@
           '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')
 
@@ -59,10 +57,9 @@
 
 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() {
@@ -78,7 +75,6 @@
 	install -Dm644 ../sshd at .service "${pkgdir}"/usr/lib/systemd/system/sshd at .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

Modified: sshd
===================================================================
--- sshd	2012-07-06 01:27:22 UTC (rev 163028)
+++ sshd	2012-07-06 02:47:50 UTC (rev 163029)
@@ -15,7 +15,6 @@
 	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

Modified: sshd.service
===================================================================
--- sshd.service	2012-07-06 01:27:22 UTC (rev 163028)
+++ sshd.service	2012-07-06 02:47:50 UTC (rev 163029)
@@ -12,8 +12,5 @@
 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 at .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 at .service.

Deleted: tmpfiles.d
===================================================================
--- tmpfiles.d	2012-07-06 01:27:22 UTC (rev 163028)
+++ tmpfiles.d	2012-07-06 02:47:50 UTC (rev 163029)
@@ -1 +0,0 @@
-d /var/empty 0755 root root -