openssh-selinux 9.4p1-4 update

5 files changed, 13 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9e2456327ab8..fdf21c1f8720 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openssh-selinux
 	pkgdesc = SSH protocol implementation for remote login, command execution and file transfer, with SELinux support
 	pkgver = 9.4p1
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.openssh.com/portable.html
 	arch = x86_64
 	arch = aarch64
@@ -29,8 +29,8 @@ pkgbase = openssh-selinux
 	optdepends = sh: for ssh-copy-id and findssl.sh
 	optdepends = x11-ssh-askpass: input passphrase in X
 	optdepends = xorg-xauth: X11 forwarding
-	provides = openssh=9.4p1-3
-	provides = selinux-openssh=9.4p1-3
+	provides = openssh=9.4p1-4
+	provides = selinux-openssh=9.4p1-4
 	conflicts = openssh
 	conflicts = selinux-openssh
 	backup = etc/pam.d/sshd
@@ -38,11 +38,10 @@ pkgbase = openssh-selinux
 	backup = etc/ssh/sshd_config
 	source = https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.4p1.tar.gz
 	source = https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.4p1.tar.gz.asc
-	source = 00-archlinux.conf
+	source = 99-archlinux.conf
 	source = sshdgenkeys.service
 	source = sshd.service
 	source = ssh-agent.service
-	source = ssh-agent.socket
 	source = sshd.conf
 	source = sshd.pam
 	validpgpkeys = 7168B983815A5EEF59A4ADFD2A3F414E736060BA
@@ -51,8 +50,7 @@ pkgbase = openssh-selinux
 	sha256sums = 78b806c38bc1e246daaa941bfe7880e6eb6f53f093bea5d5868525ae6d223d30
 	sha256sums = e5305767b2d317183ad1c5022a5f6705bd9014a8b22495a000fd482713738611
 	sha256sums = e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7
-	sha256sums = 5a9594548928fce7e8fc707c3a3b45c560b7f16473bbf73a00357184fadca61b
-	sha256sums = d09197d3891555cbee379541ff8cc439a8456722f0e8cb131966d4d12b0f2c2c
+	sha256sums = b3b1e4f7af169cd5fccdcdf9538ef37fc919c79a9905f797925153a94e723998
 	sha256sums = 76635a91526ce44571485e292e3a777ded6a439af78cb93514b999f91fb9b327
 	sha256sums = 64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846
 	b2sums = d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53
@@ -60,8 +58,7 @@ pkgbase = openssh-selinux
 	b2sums = 1ff8cd4ae22efed2b4260f1e518de919c4b290be4e0b5edbc8e2225ffe63788678d1961e6f863b85974c4697428ee827bcbabad371cfc91cc8b36eae9402eb97
 	b2sums = 09fad3648f48f13ee80195b90913feeba21240d121b1178e0ce62f4a17b1f7e58e8edc22c04403e377ab300f5022a804c848f5be132765d5ca26a38aab262e50
 	b2sums = 07ad5c7fb557411a6646ff6830bc9d564c07cbddc4ce819641d31c05dbdf677bfd8a99907cf529a7ee383b8c250936a6423f4b4b97ba0f1c14f627bbd629bd4e
-	b2sums = 3df44cc0a7baac8ad7606dd8a35b71f4ec0135f50e6432921f95d8be7db3d664ce6b3f59bedddd4bc132f47fb8d5f20cbc616717b76cc32ab6c0df179a3c4199
-	b2sums = edf7d6eb62af51e46e2cd04c7545bf57c59629a947c434d5ad65c8f06c36562c2bb96404c615f1a8379d3ae1c4a9b7278d3c7899d2cb308d89425fe37b72db21
+	b2sums = 046ea6bd6aa00440991e5f7998db33864a7baa353ec6071f96a3ccb5cca5b548cb9e75f9dee56022ca39daa977d18452851d91e6ba36a66028b84b375ded9bc5
 	b2sums = a3fd8f00430168f03dcbc4a5768ed788dd43140e365a882b601510f53f69704da04f24660157bb8a43125f5389528993732d99569d77d5f3358074e7ae36d4ca
 	b2sums = 557d015bca7008ce824111f235da67b7e0051a693aaab666e97b78e753ed7928b72274af03d7fde12033986b733d5f996faf2a4feb6ecf53f39accae31334930
 
diff --git a/00-archlinux.conf b/99-archlinux.conf
index 365f1151f2d9..365f1151f2d9 100644
--- a/00-archlinux.conf
+++ b/99-archlinux.conf
diff --git a/PKGBUILD b/PKGBUILD
index d0dd25e3f6c1..7fd1532f54b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 
 pkgname=openssh-selinux
 pkgver=9.4p1
-pkgrel=3
+pkgrel=4
 pkgdesc="SSH protocol implementation for remote login, command execution and file transfer, with SELinux support"
 arch=(x86_64 aarch64)
 url='https://www.openssh.com/portable.html'
@@ -54,11 +54,10 @@ provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}"
 groups=('selinux')
 source=(
   https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname/-selinux}-${pkgver}.tar.gz{,.asc}
-  00-archlinux.conf
+  99-archlinux.conf
   sshdgenkeys.service
   sshd.service
   ssh-agent.service
-  ssh-agent.socket
   sshd.conf
   sshd.pam
 )
@@ -67,8 +66,7 @@ sha256sums=('3608fd9088db2163ceb3e600c85ab79d0de3d221e59192ea1923e23263866a85'
             '78b806c38bc1e246daaa941bfe7880e6eb6f53f093bea5d5868525ae6d223d30'
             'e5305767b2d317183ad1c5022a5f6705bd9014a8b22495a000fd482713738611'
             'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'
-            '5a9594548928fce7e8fc707c3a3b45c560b7f16473bbf73a00357184fadca61b'
-            'd09197d3891555cbee379541ff8cc439a8456722f0e8cb131966d4d12b0f2c2c'
+            'b3b1e4f7af169cd5fccdcdf9538ef37fc919c79a9905f797925153a94e723998'
             '76635a91526ce44571485e292e3a777ded6a439af78cb93514b999f91fb9b327'
             '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846')
 b2sums=('d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53'
@@ -76,8 +74,7 @@ b2sums=('d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a
         '1ff8cd4ae22efed2b4260f1e518de919c4b290be4e0b5edbc8e2225ffe63788678d1961e6f863b85974c4697428ee827bcbabad371cfc91cc8b36eae9402eb97'
         '09fad3648f48f13ee80195b90913feeba21240d121b1178e0ce62f4a17b1f7e58e8edc22c04403e377ab300f5022a804c848f5be132765d5ca26a38aab262e50'
         '07ad5c7fb557411a6646ff6830bc9d564c07cbddc4ce819641d31c05dbdf677bfd8a99907cf529a7ee383b8c250936a6423f4b4b97ba0f1c14f627bbd629bd4e'
-        '3df44cc0a7baac8ad7606dd8a35b71f4ec0135f50e6432921f95d8be7db3d664ce6b3f59bedddd4bc132f47fb8d5f20cbc616717b76cc32ab6c0df179a3c4199'
-        'edf7d6eb62af51e46e2cd04c7545bf57c59629a947c434d5ad65c8f06c36562c2bb96404c615f1a8379d3ae1c4a9b7278d3c7899d2cb308d89425fe37b72db21'
+        '046ea6bd6aa00440991e5f7998db33864a7baa353ec6071f96a3ccb5cca5b548cb9e75f9dee56022ca39daa977d18452851d91e6ba36a66028b84b375ded9bc5'
         'a3fd8f00430168f03dcbc4a5768ed788dd43140e365a882b601510f53f69704da04f24660157bb8a43125f5389528993732d99569d77d5f3358074e7ae36d4ca'
         '557d015bca7008ce824111f235da67b7e0051a693aaab666e97b78e753ed7928b72274af03d7fde12033986b733d5f996faf2a4feb6ecf53f39accae31334930')
 validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA')  # Damien Miller <djm@mindrot.org>
@@ -132,7 +129,7 @@ package() {
 
   make DESTDIR="$pkgdir" install
 
-  install -vDm 644 ../00-archlinux.conf -t "$pkgdir/etc/ssh/sshd_config.d/"
+  install -vDm 644 ../99-archlinux.conf -t "$pkgdir/etc/ssh/sshd_config.d/"
   install -vdm 755 "$pkgdir/etc/ssh/ssh_config.d"
 
   ln -sf ssh.1.gz "$pkgdir"/usr/share/man/man1/slogin.1.gz
@@ -141,7 +138,6 @@ package() {
   install -Dm644 ../sshdgenkeys.service -t "$pkgdir"/usr/lib/systemd/system/
   install -Dm644 ../sshd.service -t "$pkgdir"/usr/lib/systemd/system/
   install -Dm644 ../ssh-agent.service -t "$pkgdir"/usr/lib/systemd/user/
-  install -Dm644 ../ssh-agent.socket -t "$pkgdir"/usr/lib/systemd/user/
   install -Dm644 ../sshd.conf -t "$pkgdir"/usr/lib/tmpfiles.d/
   install -Dm644 ../sshd.pam "$pkgdir"/etc/pam.d/sshd
 
diff --git a/ssh-agent.service b/ssh-agent.service
index 812303cb4769..4a5fe5543cce 100644
--- a/ssh-agent.service
+++ b/ssh-agent.service
@@ -1,19 +1,15 @@
-# Requires SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
-# set in environment, handled for example in plasma via
-# /etc/xdg/plasma-workspace/env/ssh-agent.sh
+# Requires SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket" to be set in environment
 [Unit]
 ConditionEnvironment=!SSH_AGENT_PID
 Description=OpenSSH key agent
 Documentation=man:ssh-agent(1) man:ssh-add(1) man:ssh(1)
-Requires=ssh-agent.socket
 
 [Service]
 Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket
-ExecStartPre=/usr/bin/rm -f $SSH_AUTH_SOCK
 ExecStart=/usr/bin/ssh-agent -D -a $SSH_AUTH_SOCK
 PassEnvironment=SSH_AGENT_PID
 SuccessExitStatus=2
 Type=simple
 
 [Install]
-Also=ssh-agent.socket
+WantedBy=default.target
diff --git a/ssh-agent.socket b/ssh-agent.socket
deleted file mode 100644
index d589cbc8ebb8..000000000000
--- a/ssh-agent.socket
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=OpenSSH key agent
-Documentation=man:ssh-agent(1) man:ssh-add(1) man:ssh(1)
-
-[Socket]
-ListenStream=%t/ssh-agent.socket
-Service=ssh-agent.service
-Priority=6
-Backlog=5
-SocketMode=0600
-DirectoryMode=0700
-
-[Install]
-WantedBy=sockets.target