[arch-commits] Commit in openssh/trunk (5 files)

[Gaetan Bisson]

    Date: Thursday, May 16, 2013 @ 06:10:18
  Author: bisson
Revision: 185617

tentative update for [testing]: upstream update, move binaries to /usr/bin

Added:
  openssh/trunk/install
Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd.service
  openssh/trunk/sshd at .service
Deleted:
  openssh/trunk/sshd.close-sessions

---------------------+
 PKGBUILD            |   19 ++++++++-----------
 install             |   10 ++++++++++
 sshd.close-sessions |   17 -----------------
 sshd.service        |    2 +-
 sshd at .service       |    2 +-
 5 files changed, 20 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-16 03:22:07 UTC (rev 185616)
+++ PKGBUILD	2013-05-16 04:10:18 UTC (rev 185617)
@@ -4,7 +4,7 @@
 # Contributor: judd <jvinet at zeroflux.org>
 
 pkgname=openssh
-pkgver=6.2p1
+pkgver=6.2p2
 pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
@@ -15,27 +15,28 @@
 optdepends=('xorg-xauth: X11 forwarding'
             'x11-ssh-askpass: input passphrase in X')
 source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
-        'sshd.close-sessions'
         'sshdgenkeys.service'
         'sshd at .service'
         'sshd.service'
         'sshd.socket'
         'sshd.pam')
-sha1sums=('8824708c617cc781b2bb29fa20bd905fd3d2a43d'
-          '954bf1660aa32620c37034320877f4511b767ccb'
+sha1sums=('c2b4909eba6f5ec6f9f75866c202db47f3b501ba'
           '6df5be396f8c593bb511a249a1453294d18a01a6'
-          'bd6eae36c7ef9efb7147778baad7858b81f2d660'
-          'f9af4a442b804ab661cec0edb25dd76dee16d8d2'
+          '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
+          '2d87de52a6b2f764180f9f67cb9747392784b4a5'
           'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
           'd93dca5ebda4610ff7647187f8928a3de28703f3')
 
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
 
+install=install
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	./configure \
 		--prefix=/usr \
+		--sbindir=/usr/bin \
 		--libexecdir=/usr/lib/ssh \
 		--sysconfdir=/etc/ssh \
 		--with-ldns \
@@ -65,17 +66,13 @@
 
 	make DESTDIR="${pkgdir}" install
 
-	rm "${pkgdir}"/usr/share/man/man1/slogin.1
-	ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
-
+	ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1
 	install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
 
 	install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service
 	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 -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389
 	install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
 
 	install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh

Added: install
===================================================================
--- install	                        (rev 0)
+++ install	2013-05-16 04:10:18 UTC (rev 185617)
@@ -0,0 +1,10 @@
+post_upgrade() {
+	if [[ $2 -lt 6.2p2 ]]; then
+		cat <<EOF
+
+==> The sshd daemon has been moved to /usr/bin alongside all binaries.
+==> Please update this path in your scripts if applicable.
+
+EOF
+	fi
+}

Deleted: sshd.close-sessions
===================================================================
--- sshd.close-sessions	2013-05-16 03:22:07 UTC (rev 185616)
+++ sshd.close-sessions	2013-05-16 04:10:18 UTC (rev 185617)
@@ -1,17 +0,0 @@
-# Close sshd sessions before shutting down the network; see FS#17389.
-
-sshd_close_sessions () {
-	if ck_daemon sshd; then
-		return
-	fi
-	/etc/rc.d/sshd stop
-	stat_busy "Stopping Secure Shell Sessions"
-	for i in $(pgrep sshd); do
-		if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then
-			kill $i
-		fi
-	done &>/dev/null
-	stat_done
-}
-
-add_hook shutdown_start sshd_close_sessions

Modified: sshd.service
===================================================================
--- sshd.service	2013-05-16 03:22:07 UTC (rev 185616)
+++ sshd.service	2013-05-16 04:10:18 UTC (rev 185617)
@@ -4,7 +4,7 @@
 After=sshdgenkeys.service
 
 [Service]
-ExecStart=/usr/sbin/sshd -D
+ExecStart=/usr/bin/sshd -D
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=always

Modified: sshd at .service
===================================================================
--- sshd at .service	2013-05-16 03:22:07 UTC (rev 185616)
+++ sshd at .service	2013-05-16 04:10:18 UTC (rev 185617)
@@ -3,6 +3,6 @@
 After=sshdgenkeys.service
 
 [Service]
-ExecStart=-/usr/sbin/sshd -i
+ExecStart=-/usr/bin/sshd -i
 StandardInput=socket
 StandardError=syslog