From 3fd1690a73bc8ac0b952a8783c739f91b474f7d4 Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Mon, 6 Oct 2025 14:33:08 +0000
Subject: [PATCH] gnu: openssh: Update to 10.2p1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/ssh.scm (openssh): Updatet to 10.2p1.

* gnu/packages/patches/openssh-trust-guix-store-directory.patch:
  Regenerate.

Change-Id: I7214d91bd8ffd0528c4150c92abc995bd3355f0e
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 .../patches/openssh-trust-guix-store-directory.patch   | 10 +++++-----
 gnu/packages/ssh.scm                                   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/patches/openssh-trust-guix-store-directory.patch b/gnu/packages/patches/openssh-trust-guix-store-directory.patch
index d190740f10025bc9a323dc32531a7ed2ff3d7b3a..75854361e02d174756f44154a43da113a824b2c2 100644
--- a/gnu/packages/patches/openssh-trust-guix-store-directory.patch
+++ b/gnu/packages/patches/openssh-trust-guix-store-directory.patch
@@ -16,15 +16,15 @@ diff --git a/misc.c b/misc.c
 index dd0bd032a..6b866464c 100644
 --- a/misc.c
 +++ b/misc.c
-@@ -2254,6 +2254,7 @@ int
+@@ -2271,6 +2271,7 @@
  safe_path(const char *name, struct stat *stp, const char *pw_dir,
      uid_t uid, char *err, size_t errlen)
  {
 +        static const char guix_store[] = @STORE_DIRECTORY@;
- 	char buf[PATH_MAX], homedir[PATH_MAX];
+ 	char buf[PATH_MAX], buf2[PATH_MAX], homedir[PATH_MAX];
  	char *cp;
  	int comparehome = 0;
-@@ -2271,6 +2272,11 @@ safe_path(const char *name, struct stat *stp, const char *pw_dir,
+@@ -2288,6 +2289,11 @@
  		snprintf(err, errlen, "%s is not a regular file", buf);
  		return -1;
  	}
@@ -40,7 +40,7 @@ diff --git a/readconf.c b/readconf.c
 index 7cbe7d2c2..40a5f1ace 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -2566,6 +2566,7 @@ read_config_file_depth(const char *filename, struct passwd *pw,
+@@ -2602,6 +2602,7 @@
  {
  	FILE *f;
  	char *line = NULL;
@@ -48,7 +48,7 @@ index 7cbe7d2c2..40a5f1ace 100644
  	size_t linesize = 0;
  	int linenum;
  	int bad_options = 0;
-@@ -2581,9 +2582,9 @@ read_config_file_depth(const char *filename, struct passwd *pw,
+@@ -2617,9 +2618,9 @@
  
  		if (fstat(fileno(f), &sb) == -1)
  			fatal("fstat %s: %s", filename, strerror(errno));
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 245237fc0dd3a617166ec8245ac23723f8721c82..975eace5ac4a9260d64951f8090da2a2a388c4b3 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -225,7 +225,7 @@ a server that supports the SSH-2 protocol.")
 (define-public openssh
   (package
    (name "openssh")
-   (version "10.0p1")
+   (version "10.2p1")
    (source
     (origin
       (method url-fetch)
@@ -233,7 +233,7 @@ a server that supports the SSH-2 protocol.")
                           "openssh-" version ".tar.gz"))
       (patches (search-patches "openssh-trust-guix-store-directory.patch"))
       (sha256
-       (base32 "0p6qp47gkkjrxlqaignsvn81lh80wnlxasr5n5845pqfk9q2w6h2"))))
+       (base32 "1clqyxh6mrbwjg964df0hjwmd361mxnx3nx17wk5jyck3422ri6c"))))
    (build-system gnu-build-system)
    (arguments
     (list