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

[Gaëtan Bisson]

    Date: Monday, September 16, 2019 @ 21:46:05
  Author: bisson
Revision: 362972

remove systemd socket, see FS#62248

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/PKGBUILD.snap
  openssh/trunk/sshd.service
Deleted:
  openssh/trunk/sshd.socket
  openssh/trunk/sshd at .service

---------------+
 PKGBUILD      |   12 ++++--------
 PKGBUILD.snap |    8 +-------
 sshd.service  |    3 ---
 sshd.socket   |   10 ----------
 sshd at .service |    9 ---------
 5 files changed, 5 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-16 21:42:31 UTC (rev 362971)
+++ PKGBUILD	2019-09-16 21:46:05 UTC (rev 362972)
@@ -4,7 +4,7 @@
 
 pkgname=openssh
 pkgver=8.0p1
-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')
@@ -16,22 +16,20 @@
 validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
 source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
         'sshdgenkeys.service'
-        'sshd at .service'
         'sshd.service'
-        'sshd.socket'
         'sshd.conf'
         'sshd.pam')
 sha256sums=('bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68'
             'SKIP'
             '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
-            '3a0845737207f4eda221c9c9fb64e766ade9684562d8ba4f705f7ae6826886e5'
-            'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa'
-            'de14363e9d4ed92848e524036d9e6b57b2d35cc77d377b7247c38111d2a3defd'
+            'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'
             '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
             '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846')
 
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
 
+install=install
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
@@ -75,9 +73,7 @@
 	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 -Dm644 ../sshd.conf "${pkgdir}"/usr/lib/tmpfiles.d/sshd.conf
 	install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
 

Modified: PKGBUILD.snap
===================================================================
--- PKGBUILD.snap	2019-09-16 21:42:31 UTC (rev 362971)
+++ PKGBUILD.snap	2019-09-16 21:46:05 UTC (rev 362972)
@@ -18,9 +18,7 @@
 #source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
 source=("http://www.mindrot.org/openssh_snap/openssh-SNAP-$_YMD.tar.gz"
         'sshdgenkeys.service'
-        'sshd at .service'
         'sshd.service'
-        'sshd.socket'
         'sshd.conf'
         'sshd.pam')
 #sha256sums=('6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad3'
@@ -27,9 +25,7 @@
 #            'SKIP'
 sha256sums=('6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad'
             '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
-            '3a0845737207f4eda221c9c9fb64e766ade9684562d8ba4f705f7ae6826886e5'
-            'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa'
-            'de14363e9d4ed92848e524036d9e6b57b2d35cc77d377b7247c38111d2a3defd'
+            'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'
             '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
             '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846')
 
@@ -81,9 +77,7 @@
 	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 -Dm644 ../sshd.conf "${pkgdir}"/usr/lib/tmpfiles.d/sshd.conf
 	install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
 

Modified: sshd.service
===================================================================
--- sshd.service	2019-09-16 21:42:31 UTC (rev 362971)
+++ sshd.service	2019-09-16 21:46:05 UTC (rev 362972)
@@ -12,6 +12,3 @@
 
 [Install]
 WantedBy=multi-user.target
-
-# 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: sshd.socket
===================================================================
--- sshd.socket	2019-09-16 21:42:31 UTC (rev 362971)
+++ sshd.socket	2019-09-16 21:46:05 UTC (rev 362972)
@@ -1,10 +0,0 @@
-[Unit]
-Conflicts=sshd.service
-Wants=sshdgenkeys.service
-
-[Socket]
-ListenStream=22
-Accept=yes
-
-[Install]
-WantedBy=sockets.target

Deleted: sshd at .service
===================================================================
--- sshd at .service	2019-09-16 21:42:31 UTC (rev 362971)
+++ sshd at .service	2019-09-16 21:46:05 UTC (rev 362972)
@@ -1,9 +0,0 @@
-[Unit]
-Description=OpenSSH Per-Connection Daemon
-After=sshdgenkeys.service
-
-[Service]
-ExecStart=-/usr/bin/sshd -i
-StandardInput=socket
-StandardError=syslog
-KillMode=process