[arch-commits] Commit in openssh/trunk (PKGBUILD install)

[Gaëtan Bisson]

    Date: Monday, February 17, 2020 @ 01:21:52
  Author: bisson
Revision: 375722

better fix

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/install

----------+
 PKGBUILD |    2 +-
 install  |   20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-17 01:13:30 UTC (rev 375721)
+++ PKGBUILD	2020-02-17 01:21:52 UTC (rev 375722)
@@ -4,7 +4,7 @@
 
 pkgname=openssh
 pkgver=8.2p1
-pkgrel=2
+pkgrel=3
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')

Modified: install
===================================================================
--- install	2020-02-17 01:13:30 UTC (rev 375721)
+++ install	2020-02-17 01:21:52 UTC (rev 375722)
@@ -1,12 +1,4 @@
 pre_upgrade() {
-	if (( $(vercmp $2 8.2p1-2) < 0 )); then
-		cat <<EOF
-==> Your current SSH daemon may be unable to accept new connections.
-==> To fix this, please restart it right now using:
-==>     systemctl restart sshd
-EOF
-	fi
-
 	# Remove socket activation. See: https://bugs.archlinux.org/task/62248
 	if (( $(vercmp $2 8.0p1-3) < 0 )); then
 	if systemctl is-enabled -q sshd.socket; then
@@ -26,3 +18,15 @@
 	fi
 	fi
 }
+
+post_upgrade() {
+	if (( $(vercmp $2 8.2p1-3) < 0 )); then
+		if systemctl is-active sshd.service >/dev/null; then
+			cat <<EOF
+==> After this upgrade, your existing SSH daemon may be unable to accept
+==> new connections. To fix this, your SSH daemon will now be restarted.
+EOF
+			systemctl restart sshd.service
+		fi
+	fi
+}