public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Dmitry Belyavskiy <dbelyavs@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/openssh] rawhide: Groom patches to reduce dependencies
Date: Mon, 10 Aug 2026 15:45:19 GMT [thread overview]
Message-ID: <178637671957.1.9741139167249249718.rpms-openssh-e67cea150260@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/openssh
Branch : rawhide
Commit : e67cea1502609918f09ecc5ce280de3bb4fb7f57
Author : Dmitry Belyavskiy <dbelyavs@redhat.com>
Date : 2026-08-10T17:44:46+02:00
Stats : +73/-105 in 43 file(s)
URL : https://src.fedoraproject.org/rpms/openssh/c/e67cea1502609918f09ecc5ce280de3bb4fb7f57?branch=rawhide
Log:
Groom patches to reduce dependencies
---
diff --git a/0013-openssh-9.6p1-gssapi-keyex.patch b/0013-openssh-9.6p1-gssapi-keyex.patch
index 457fce3..93f31fa 100644
--- a/0013-openssh-9.6p1-gssapi-keyex.patch
+++ b/0013-openssh-9.6p1-gssapi-keyex.patch
@@ -1,4 +1,4 @@
-From c4d7da173ac8b84dfef9d2310d615c0249bcd37a Mon Sep 17 00:00:00 2001
+From 54d6489ff716f31a156edcd9a027756f1d9131ea Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:28 +0200
Subject: [PATCH 13/54] openssh-9.6p1-gssapi-keyex
@@ -14,7 +14,7 @@ Subject: [PATCH 13/54] openssh-9.6p1-gssapi-keyex
canohost.h | 3 +
clientloop.c | 12 +
configure.ac | 24 ++
- gss-genr.c | 312 ++++++++++++++++++++-
+ gss-genr.c | 313 ++++++++++++++++++++-
gss-serv-krb5.c | 97 ++++++-
gss-serv.c | 200 ++++++++++++--
kex-names.c | 67 ++++-
@@ -46,7 +46,7 @@ Subject: [PATCH 13/54] openssh-9.6p1-gssapi-keyex
sshd_config.5 | 43 ++-
sshkey.c | 72 ++++-
sshkey.h | 1 +
- 42 files changed, 3007 insertions(+), 80 deletions(-)
+ 42 files changed, 3008 insertions(+), 80 deletions(-)
create mode 100644 kexgssc.c
create mode 100644 kexgsss.c
@@ -436,7 +436,7 @@ index d7e911e81..321adbab1 100644
AC_CHECK_DECL([AU_IPv4], [],
AC_DEFINE([AU_IPv4], [0], [System only supports IPv4 audit records])
diff --git a/gss-genr.c b/gss-genr.c
-index 7088d93b4..a07dbf512 100644
+index 7088d93b4..ec2c9c6dd 100644
--- a/gss-genr.c
+++ b/gss-genr.c
@@ -42,9 +42,33 @@
@@ -473,7 +473,7 @@ index 7088d93b4..a07dbf512 100644
/* sshbuf_get for gss_buffer_desc */
int
ssh_gssapi_get_buffer_desc(struct sshbuf *b, gss_buffer_desc *g)
-@@ -60,6 +84,169 @@ ssh_gssapi_get_buffer_desc(struct sshbuf *b, gss_buffer_desc *g)
+@@ -60,6 +84,170 @@ ssh_gssapi_get_buffer_desc(struct sshbuf *b, gss_buffer_desc *g)
return 0;
}
@@ -571,8 +571,9 @@ index 7088d93b4..a07dbf512 100644
+ enclen = __b64_ntop(digest,
+ ssh_digest_bytes(SSH_DIGEST_MD5), encoded,
+ ssh_digest_bytes(SSH_DIGEST_MD5) * 2);
-+
++#pragma GCC diagnostic ignored "-Wstringop-overflow"
+ cp = strncpy(s, kex, strlen(kex));
++#pragma GCC diagnostic pop
+ for ((p = strsep(&cp, ",")); p && *p != '\0';
+ (p = strsep(&cp, ","))) {
+ if (sshbuf_len(buf) != 0 &&
@@ -643,7 +644,7 @@ index 7088d93b4..a07dbf512 100644
/* Check that the OID in a data stream matches that in the context */
int
ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len)
-@@ -168,6 +355,7 @@ ssh_gssapi_build_ctx(Gssctxt **ctx)
+@@ -168,6 +356,7 @@ ssh_gssapi_build_ctx(Gssctxt **ctx)
(*ctx)->creds = GSS_C_NO_CREDENTIAL;
(*ctx)->client = GSS_C_NO_NAME;
(*ctx)->client_creds = GSS_C_NO_CREDENTIAL;
@@ -651,7 +652,7 @@ index 7088d93b4..a07dbf512 100644
}
/* Delete our context, providing it has been built correctly */
-@@ -193,6 +381,12 @@ ssh_gssapi_delete_ctx(Gssctxt **ctx)
+@@ -193,6 +382,12 @@ ssh_gssapi_delete_ctx(Gssctxt **ctx)
gss_release_name(&ms, &(*ctx)->client);
if ((*ctx)->client_creds != GSS_C_NO_CREDENTIAL)
gss_release_cred(&ms, &(*ctx)->client_creds);
@@ -664,7 +665,7 @@ index 7088d93b4..a07dbf512 100644
free(*ctx);
*ctx = NULL;
-@@ -216,7 +410,7 @@ ssh_gssapi_init_ctx(Gssctxt *ctx, int deleg_creds, gss_buffer_desc *recv_tok,
+@@ -216,7 +411,7 @@ ssh_gssapi_init_ctx(Gssctxt *ctx, int deleg_creds, gss_buffer_desc *recv_tok,
}
ctx->major = gss_init_sec_context(&ctx->minor,
@@ -673,7 +674,7 @@ index 7088d93b4..a07dbf512 100644
GSS_C_MUTUAL_FLAG | GSS_C_INTEG_FLAG | deleg_flag,
0, NULL, recv_tok, NULL, send_tok, flags, NULL);
-@@ -245,9 +439,43 @@ ssh_gssapi_import_name(Gssctxt *ctx, const char *host)
+@@ -245,9 +440,43 @@ ssh_gssapi_import_name(Gssctxt *ctx, const char *host)
return (ctx->major);
}
@@ -717,7 +718,7 @@ index 7088d93b4..a07dbf512 100644
if ((ctx->major = gss_get_mic(&ctx->minor, ctx->context,
GSS_C_QOP_DEFAULT, buffer, hash)))
ssh_gssapi_error(ctx);
-@@ -255,6 +483,19 @@ ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash)
+@@ -255,6 +484,19 @@ ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash)
return (ctx->major);
}
@@ -737,7 +738,7 @@ index 7088d93b4..a07dbf512 100644
void
ssh_gssapi_buildmic(struct sshbuf *b, const char *user, const char *service,
const char *context, const struct sshbuf *session_id)
-@@ -271,11 +512,16 @@ ssh_gssapi_buildmic(struct sshbuf *b, const char *user, const char *service,
+@@ -271,11 +513,16 @@ ssh_gssapi_buildmic(struct sshbuf *b, const char *user, const char *service,
}
int
@@ -755,7 +756,7 @@ index 7088d93b4..a07dbf512 100644
/* RFC 4462 says we MUST NOT do SPNEGO */
if (oid->length == spnego_oid.length &&
-@@ -285,6 +531,10 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
+@@ -285,6 +532,10 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
ssh_gssapi_build_ctx(ctx);
ssh_gssapi_set_oid(*ctx, oid);
major = ssh_gssapi_import_name(*ctx, host);
@@ -766,7 +767,7 @@ index 7088d93b4..a07dbf512 100644
if (!GSS_ERROR(major)) {
major = ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token,
NULL);
-@@ -294,10 +544,66 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
+@@ -294,10 +545,66 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
GSS_C_NO_BUFFER);
}
diff --git a/0014-openssh-6.6p1-force_krb.patch b/0014-openssh-6.6p1-force_krb.patch
index d0661df..99a2819 100644
--- a/0014-openssh-6.6p1-force_krb.patch
+++ b/0014-openssh-6.6p1-force_krb.patch
@@ -1,4 +1,4 @@
-From 1dea30d6fd38833e2a6b99d04ee551949082156b Mon Sep 17 00:00:00 2001
+From 2f007272e169c885bf152a8fe7ddcac127b8bc07 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:28 +0200
Subject: [PATCH 14/54] openssh-6.6p1-force_krb
diff --git a/0015-openssh-7.7p1-gssapi-new-unique.patch b/0015-openssh-7.7p1-gssapi-new-unique.patch
index 118faac..6c1df7d 100644
--- a/0015-openssh-7.7p1-gssapi-new-unique.patch
+++ b/0015-openssh-7.7p1-gssapi-new-unique.patch
@@ -1,10 +1,10 @@
-From e0b2b31b38e6e3d1ad810782d3777def81a87a86 Mon Sep 17 00:00:00 2001
+From bbff1e17bdb5d921ab8b8cc30891c5f29d04731e Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:28 +0200
Subject: [PATCH 15/54] openssh-7.7p1-gssapi-new-unique
---
- auth-krb5.c | 262 ++++++++++++++++++++++++++++++++++++++++++------
+ auth-krb5.c | 264 ++++++++++++++++++++++++++++++++++++++++++------
auth.h | 3 +-
gss-serv-krb5.c | 42 +++-----
gss-serv.c | 12 +--
@@ -14,10 +14,10 @@ Subject: [PATCH 15/54] openssh-7.7p1-gssapi-new-unique
ssh-gss.h | 4 +-
sshd-session.c | 2 +-
sshd_config.5 | 8 ++
- 10 files changed, 274 insertions(+), 71 deletions(-)
+ 10 files changed, 276 insertions(+), 71 deletions(-)
diff --git a/auth-krb5.c b/auth-krb5.c
-index 3c6dc0622..0de1aaf8d 100644
+index 3c6dc0622..863110910 100644
--- a/auth-krb5.c
+++ b/auth-krb5.c
@@ -51,6 +51,7 @@
@@ -125,7 +125,7 @@ index 3c6dc0622..0de1aaf8d 100644
if (authctxt->krb5_user) {
krb5_free_principal(authctxt->krb5_ctx, authctxt->krb5_user);
authctxt->krb5_user = NULL;
-@@ -238,36 +281,189 @@ krb5_cleanup_proc(Authctxt *authctxt)
+@@ -238,36 +281,191 @@ krb5_cleanup_proc(Authctxt *authctxt)
}
}
@@ -279,6 +279,7 @@ index 3c6dc0622..0de1aaf8d 100644
+ umask(old_umask);
+ if (tmpfd == -1) {
+ logit("mkstemp(): %.100s", strerror(oerrno));
++ free(ccname);
+ return oerrno;
+ }
+
@@ -286,6 +287,7 @@ index 3c6dc0622..0de1aaf8d 100644
+ oerrno = errno;
+ logit("fchmod(): %.100s", strerror(oerrno));
+ close(tmpfd);
++ free(ccname);
+ return oerrno;
+ }
+ /* make sure the KRB5CCNAME is set for non-standard location */
diff --git a/0016-openssh-7.2p2-k5login_directory.patch b/0016-openssh-7.2p2-k5login_directory.patch
index e9126fe..d4a07cb 100644
--- a/0016-openssh-7.2p2-k5login_directory.patch
+++ b/0016-openssh-7.2p2-k5login_directory.patch
@@ -1,4 +1,4 @@
-From f4e2f83ba316fa67ab8052489f428c1cbe8cf3f4 Mon Sep 17 00:00:00 2001
+From 9ef48ad3dc898461ee9577edc8e29401a13ee18e Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:28 +0200
Subject: [PATCH 16/54] openssh-7.2p2-k5login_directory
@@ -12,10 +12,10 @@ Subject: [PATCH 16/54] openssh-7.2p2-k5login_directory
4 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/auth-krb5.c b/auth-krb5.c
-index 0de1aaf8d..148242cbf 100644
+index 863110910..996b19738 100644
--- a/auth-krb5.c
+++ b/auth-krb5.c
-@@ -465,5 +465,21 @@ ssh_krb5_cc_new_unique(krb5_context ctx, krb5_ccache *ccache, int *need_environm
+@@ -467,5 +467,21 @@ ssh_krb5_cc_new_unique(krb5_context ctx, krb5_ccache *ccache, int *need_environm
return (krb5_cc_resolve(ctx, ccname, ccache));
}
}
diff --git a/0017-openssh-6.6p1-kuserok.patch b/0017-openssh-6.6p1-kuserok.patch
index 344ec8a..94d4a8b 100644
--- a/0017-openssh-6.6p1-kuserok.patch
+++ b/0017-openssh-6.6p1-kuserok.patch
@@ -1,4 +1,4 @@
-From 93b945d4af00e32012d3b401767e08bf2e5019a0 Mon Sep 17 00:00:00 2001
+From 1cf118c9a9f46b4ed0d0e5e6a7f70c4a450ed470 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:28 +0200
Subject: [PATCH 17/54] openssh-6.6p1-kuserok
@@ -13,7 +13,7 @@ Subject: [PATCH 17/54] openssh-6.6p1-kuserok
6 files changed, 133 insertions(+), 6 deletions(-)
diff --git a/auth-krb5.c b/auth-krb5.c
-index 148242cbf..287bdd35a 100644
+index 996b19738..2e3c1c80f 100644
--- a/auth-krb5.c
+++ b/auth-krb5.c
@@ -55,6 +55,21 @@
diff --git a/0018-openssh-6.4p1-fromto-remote.patch b/0018-openssh-6.4p1-fromto-remote.patch
index 90f0431..3229b2a 100644
--- a/0018-openssh-6.4p1-fromto-remote.patch
+++ b/0018-openssh-6.4p1-fromto-remote.patch
@@ -1,4 +1,4 @@
-From a19debf855d417dc8c309ff93ed6a98c61418b66 Mon Sep 17 00:00:00 2001
+From dd2ebdcbf7486fc9caf1f8f0edd52dbb372c19c6 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:28 +0200
Subject: [PATCH 18/54] openssh-6.4p1-fromto-remote
diff --git a/0019-openssh-6.6.1p1-log-in-chroot.patch b/0019-openssh-6.6.1p1-log-in-chroot.patch
index 864d920..a66d8aa 100644
--- a/0019-openssh-6.6.1p1-log-in-chroot.patch
+++ b/0019-openssh-6.6.1p1-log-in-chroot.patch
@@ -1,4 +1,4 @@
-From 1befa886920ae129c1fdae4bd0dcfa960c6196c4 Mon Sep 17 00:00:00 2001
+From 7eadf0e2a279538fa7e4b1bd5cbd2fc6917e4753 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:28 +0200
Subject: [PATCH 19/54] openssh-6.6.1p1-log-in-chroot
diff --git a/0020-openssh-6.6.1p1-scp-non-existing-directory.patch b/0020-openssh-6.6.1p1-scp-non-existing-directory.patch
index 2af4dd7..208229f 100644
--- a/0020-openssh-6.6.1p1-scp-non-existing-directory.patch
+++ b/0020-openssh-6.6.1p1-scp-non-existing-directory.patch
@@ -1,4 +1,4 @@
-From 2e7a638b1bbe7959f6e5b255c270fa50d2262ada Mon Sep 17 00:00:00 2001
+From 3e67dc83e590c370c9bdbf32a5e9d8fcc769b25c Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:28 +0200
Subject: [PATCH 20/54] openssh-6.6.1p1-scp-non-existing-directory
diff --git a/0021-openssh-6.6p1-GSSAPIEnablek5users.patch b/0021-openssh-6.6p1-GSSAPIEnablek5users.patch
index ac6135a..a2bfe19 100644
--- a/0021-openssh-6.6p1-GSSAPIEnablek5users.patch
+++ b/0021-openssh-6.6p1-GSSAPIEnablek5users.patch
@@ -1,4 +1,4 @@
-From 5784381d6d842e88a5a0ea896a9c723227757ee3 Mon Sep 17 00:00:00 2001
+From abea763fed511c64efaea276a6037fb7930dba8e Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:28 +0200
Subject: [PATCH 21/54] openssh-6.6p1-GSSAPIEnablek5users
diff --git a/0022-openssh-6.8p1-sshdT-output.patch b/0022-openssh-6.8p1-sshdT-output.patch
index 108791a..49a189d 100644
--- a/0022-openssh-6.8p1-sshdT-output.patch
+++ b/0022-openssh-6.8p1-sshdT-output.patch
@@ -1,4 +1,4 @@
-From a472781da7c8dc2ef699d87c0081870960c7bb06 Mon Sep 17 00:00:00 2001
+From 6c66287c50ba4d1aadf27bef9b2c5ca6e702b082 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:28 +0200
Subject: [PATCH 22/54] openssh-6.8p1-sshdT-output
diff --git a/0023-openssh-6.7p1-sftp-force-permission.patch b/0023-openssh-6.7p1-sftp-force-permission.patch
index 3a7d3cb..17aabe7 100644
--- a/0023-openssh-6.7p1-sftp-force-permission.patch
+++ b/0023-openssh-6.7p1-sftp-force-permission.patch
@@ -1,4 +1,4 @@
-From e0455cb1f98914322afe00c601e7b8677253399c Mon Sep 17 00:00:00 2001
+From 44beb498b44626a5b3896d832cd3a6ab63839253 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:28 +0200
Subject: [PATCH 23/54] openssh-6.7p1-sftp-force-permission
diff --git a/0024-openssh-7.2p2-s390-closefrom.patch b/0024-openssh-7.2p2-s390-closefrom.patch
index e60cf60..ed2a344 100644
--- a/0024-openssh-7.2p2-s390-closefrom.patch
+++ b/0024-openssh-7.2p2-s390-closefrom.patch
@@ -1,4 +1,4 @@
-From d4f7c3339ad03a74e739c9d5e6129a6161c5a071 Mon Sep 17 00:00:00 2001
+From 041006bcb50a819b4af2f49712a195cd89512dae Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:28 +0200
Subject: [PATCH 24/54] openssh-7.2p2-s390-closefrom
diff --git a/0025-openssh-7.5p1-sandbox.patch b/0025-openssh-7.5p1-sandbox.patch
index 1d5be7a..0e34eac 100644
--- a/0025-openssh-7.5p1-sandbox.patch
+++ b/0025-openssh-7.5p1-sandbox.patch
@@ -1,4 +1,4 @@
-From 7c814435d1c439bcbfb916c4e9962be59641d663 Mon Sep 17 00:00:00 2001
+From a1ad75cbcf9f01d521cd01f3c29219602cfd46da Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:28 +0200
Subject: [PATCH 25/54] openssh-7.5p1-sandbox
diff --git a/0026-openssh-7.8p1-scp-ipv6.patch b/0026-openssh-7.8p1-scp-ipv6.patch
index d96db05..08772dc 100644
--- a/0026-openssh-7.8p1-scp-ipv6.patch
+++ b/0026-openssh-7.8p1-scp-ipv6.patch
@@ -1,4 +1,4 @@
-From dffc82fcf7c31924fc79eea20561c8c4cc670452 Mon Sep 17 00:00:00 2001
+From a68d0c768bea17bfc1cc3133563e9dfa01124818 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:28 +0200
Subject: [PATCH 26/54] openssh-7.8p1-scp-ipv6
diff --git a/0027-openssh-8.0p1-crypto-policies.patch b/0027-openssh-8.0p1-crypto-policies.patch
index 63c23b9..f2e501c 100644
--- a/0027-openssh-8.0p1-crypto-policies.patch
+++ b/0027-openssh-8.0p1-crypto-policies.patch
@@ -1,4 +1,4 @@
-From 7a4fb1259e51621440fe0d0a27739ecf826b37bf Mon Sep 17 00:00:00 2001
+From 7a1bb302fbabeee5f740acc33b0be3df9aa9ef4a Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:28 +0200
Subject: [PATCH 27/54] openssh-8.0p1-crypto-policies
diff --git a/0028-openssh-8.0p1-openssl-kdf.patch b/0028-openssh-8.0p1-openssl-kdf.patch
index faeb93a..c518d7c 100644
--- a/0028-openssh-8.0p1-openssl-kdf.patch
+++ b/0028-openssh-8.0p1-openssl-kdf.patch
@@ -1,4 +1,4 @@
-From 2927324b981fd932b46fcb53e0399f701c528dc9 Mon Sep 17 00:00:00 2001
+From a7cce97da90aae29ee50dc223ac51e560640cde6 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:28 +0200
Subject: [PATCH 28/54] openssh-8.0p1-openssl-kdf
diff --git a/0029-openssh-8.2p1-visibility.patch b/0029-openssh-8.2p1-visibility.patch
index b762575..999c94d 100644
--- a/0029-openssh-8.2p1-visibility.patch
+++ b/0029-openssh-8.2p1-visibility.patch
@@ -1,4 +1,4 @@
-From 8ec6e23e9f608226d2a28c927deb8707c2c05d19 Mon Sep 17 00:00:00 2001
+From 67b12f7fcdb4183c48195e90920cb80d2d538b34 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:28 +0200
Subject: [PATCH 29/54] openssh-8.2p1-visibility
diff --git a/0030-openssh-8.2p1-x11-without-ipv6.patch b/0030-openssh-8.2p1-x11-without-ipv6.patch
index 24987be..8b33c5f 100644
--- a/0030-openssh-8.2p1-x11-without-ipv6.patch
+++ b/0030-openssh-8.2p1-x11-without-ipv6.patch
@@ -1,4 +1,4 @@
-From 4fe1b0e966089b0f073f11134b4745ccce463547 Mon Sep 17 00:00:00 2001
+From 228a3b51fbf3025bb1401dd885423206c8763266 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:28 +0200
Subject: [PATCH 30/54] openssh-8.2p1-x11-without-ipv6
diff --git a/0031-openssh-8.0p1-preserve-pam-errors.patch b/0031-openssh-8.0p1-preserve-pam-errors.patch
index 846cd7b..1ea83da 100644
--- a/0031-openssh-8.0p1-preserve-pam-errors.patch
+++ b/0031-openssh-8.0p1-preserve-pam-errors.patch
@@ -1,4 +1,4 @@
-From d02d2011c9fb5f078f854e59ff4cfae851ddc8a9 Mon Sep 17 00:00:00 2001
+From 28bf794f131e07b0ffac3a91de30dc7784ab3d52 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:29 +0200
Subject: [PATCH 31/54] openssh-8.0p1-preserve-pam-errors
diff --git a/0032-openssh-8.7p1-scp-kill-switch.patch b/0032-openssh-8.7p1-scp-kill-switch.patch
index ceff7db..3ae2ac3 100644
--- a/0032-openssh-8.7p1-scp-kill-switch.patch
+++ b/0032-openssh-8.7p1-scp-kill-switch.patch
@@ -1,4 +1,4 @@
-From 40e36d72995b4f013d65e4688bb6aa611e08b178 Mon Sep 17 00:00:00 2001
+From ae8886678b214115dfca68b692bdf1a5f76be5d2 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:29 +0200
Subject: [PATCH 32/54] openssh-8.7p1-scp-kill-switch
diff --git a/0033-openssh-8.7p1-recursive-scp.patch b/0033-openssh-8.7p1-recursive-scp.patch
index f6462c6..582c8c6 100644
--- a/0033-openssh-8.7p1-recursive-scp.patch
+++ b/0033-openssh-8.7p1-recursive-scp.patch
@@ -1,4 +1,4 @@
-From 1e6712a333655da6dd01f2b9d8b0b2688f99082a Mon Sep 17 00:00:00 2001
+From 96429d71685df973ecd1681527e25f34225088b8 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:29 +0200
Subject: [PATCH 33/54] openssh-8.7p1-recursive-scp
diff --git a/0034-openssh-8.7p1-ibmca.patch b/0034-openssh-8.7p1-ibmca.patch
index 58ae865..31f560a 100644
--- a/0034-openssh-8.7p1-ibmca.patch
+++ b/0034-openssh-8.7p1-ibmca.patch
@@ -1,4 +1,4 @@
-From 16d7ae47eddc85a0360b53c2e3063395348ccf3d Mon Sep 17 00:00:00 2001
+From 3d79ab8466d8a615eb0ae22574c809abebc569cd Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:29 +0200
Subject: [PATCH 34/54] openssh-8.7p1-ibmca
diff --git a/0035-openssh-7.6p1-audit.patch b/0035-openssh-7.6p1-audit.patch
index 44dd986..064e6f5 100644
--- a/0035-openssh-7.6p1-audit.patch
+++ b/0035-openssh-7.6p1-audit.patch
@@ -1,4 +1,4 @@
-From 134511907ac99564a417a5b45e3ea13d4afbf8ae Mon Sep 17 00:00:00 2001
+From d75558f24f6f6eae7b404d66e7ccee758880f5d8 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:29 +0200
Subject: [PATCH 35/54] openssh-7.6p1-audit
diff --git a/0036-openssh-7.1p2-audit-race-condition.patch b/0036-openssh-7.1p2-audit-race-condition.patch
index a2bec61..5865770 100644
--- a/0036-openssh-7.1p2-audit-race-condition.patch
+++ b/0036-openssh-7.1p2-audit-race-condition.patch
@@ -1,4 +1,4 @@
-From 89eacbbddf3f04349b37f9cfc75f0080f9d82b5d Mon Sep 17 00:00:00 2001
+From eb15cb2fc5cb181c68b4056c1af3caf4c9aff551 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:29 +0200
Subject: [PATCH 36/54] openssh-7.1p2-audit-race-condition
diff --git a/0037-openssh-9.0p1-audit-log.patch b/0037-openssh-9.0p1-audit-log.patch
index 19f1818..0e0b206 100644
--- a/0037-openssh-9.0p1-audit-log.patch
+++ b/0037-openssh-9.0p1-audit-log.patch
@@ -1,4 +1,4 @@
-From a5dc196b4c6d2462e87f5cb825e1b630b1217d06 Mon Sep 17 00:00:00 2001
+From 7c991a9d474fcd3eaf3fe5882f2bb9b5ffcf28d5 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:29 +0200
Subject: [PATCH 37/54] openssh-9.0p1-audit-log
diff --git a/0038-openssh-7.7p1-fips.patch b/0038-openssh-7.7p1-fips.patch
index 4eb8e2b..6d1a005 100644
--- a/0038-openssh-7.7p1-fips.patch
+++ b/0038-openssh-7.7p1-fips.patch
@@ -1,4 +1,4 @@
-From eb6be743509407de959ef3a5e95cd76815b48dca Mon Sep 17 00:00:00 2001
+From c52dd2530ff1ca90224cac3ecf9527b91f9b2b0a Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 28 Aug 2025 14:01:38 +0200
Subject: [PATCH 38/54] openssh-7.7p1-fips
diff --git a/0039-openssh-8.7p1-negotiate-supported-algs.patch b/0039-openssh-8.7p1-negotiate-supported-algs.patch
index 3b65c25..2b91968 100644
--- a/0039-openssh-8.7p1-negotiate-supported-algs.patch
+++ b/0039-openssh-8.7p1-negotiate-supported-algs.patch
@@ -1,4 +1,4 @@
-From caab11e7840ce22b21e88fdd6fac693cb897c0a8 Mon Sep 17 00:00:00 2001
+From d02ea85237706cc925f8c118d5ed6df86d30db99 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:29 +0200
Subject: [PATCH 39/54] openssh-8.7p1-negotiate-supported-algs
diff --git a/0040-openssh-9.0p1-evp-fips-kex.patch b/0040-openssh-9.0p1-evp-fips-kex.patch
index e5ae16d..c69ac69 100644
--- a/0040-openssh-9.0p1-evp-fips-kex.patch
+++ b/0040-openssh-9.0p1-evp-fips-kex.patch
@@ -1,4 +1,4 @@
-From 16878783113f7c49eaec1db60d2667f2cd36223e Mon Sep 17 00:00:00 2001
+From 363c1f888af1f55bf6f06ff561117c538774e2c3 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:29 +0200
Subject: [PATCH 40/54] openssh-9.0p1-evp-fips-kex
diff --git a/0041-openssh-8.7p1-nohostsha1proof.patch b/0041-openssh-8.7p1-nohostsha1proof.patch
index a5a6b4d..b683f9b 100644
--- a/0041-openssh-8.7p1-nohostsha1proof.patch
+++ b/0041-openssh-8.7p1-nohostsha1proof.patch
@@ -1,4 +1,4 @@
-From 54fa512753bac8db13eed233f5b421e2f733294d Mon Sep 17 00:00:00 2001
+From 0def8cfe7fc8b1b69ac7ae7d5889557f67833525 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:29 +0200
Subject: [PATCH 41/54] openssh-8.7p1-nohostsha1proof
diff --git a/0042-openssh-9.9p1-separate-keysign.patch b/0042-openssh-9.9p1-separate-keysign.patch
index 4d6e262..4eca3f8 100644
--- a/0042-openssh-9.9p1-separate-keysign.patch
+++ b/0042-openssh-9.9p1-separate-keysign.patch
@@ -1,4 +1,4 @@
-From cdea86618b12a8fbe9a6e57c8b56c15732a08ab0 Mon Sep 17 00:00:00 2001
+From 7f74e6176165e85858c1991b9f96d6da398c9e01 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:29 +0200
Subject: [PATCH 42/54] openssh-9.9p1-separate-keysign
diff --git a/0043-openssh-9.9p1-openssl-mlkem.patch b/0043-openssh-9.9p1-openssl-mlkem.patch
index 997a3fa..f6b653e 100644
--- a/0043-openssh-9.9p1-openssl-mlkem.patch
+++ b/0043-openssh-9.9p1-openssl-mlkem.patch
@@ -1,4 +1,4 @@
-From e82d981cb2d297bfb2097ee4c54b4b79af80561d Mon Sep 17 00:00:00 2001
+From c6d1e29ac2f702560a2dc01fe88333d786850fc6 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:29 +0200
Subject: [PATCH 43/54] openssh-9.9p1-openssl-mlkem
diff --git a/0044-openssh-9.9p2-error_processing.patch b/0044-openssh-9.9p2-error_processing.patch
index d5c5110..a97f873 100644
--- a/0044-openssh-9.9p2-error_processing.patch
+++ b/0044-openssh-9.9p2-error_processing.patch
@@ -1,4 +1,4 @@
-From 4223bd1e9bd103159b3e934d6060958c1d28548b Mon Sep 17 00:00:00 2001
+From 8f8e0b77fceaf7ffd015a69b4071d2c43e1c533a Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Fri, 16 May 2025 14:53:54 +0200
Subject: [PATCH 44/54] openssh-9.9p2-error_processing
diff --git a/0045-Ignore-bad-hostkeys-in-known_hosts-file.patch b/0045-Ignore-bad-hostkeys-in-known_hosts-file.patch
index 61be053..2694a20 100644
--- a/0045-Ignore-bad-hostkeys-in-known_hosts-file.patch
+++ b/0045-Ignore-bad-hostkeys-in-known_hosts-file.patch
@@ -1,4 +1,4 @@
-From 0ae45c6f50cd9eefdefa7251a61fdde30464a9a7 Mon Sep 17 00:00:00 2001
+From 5a6fdcd03c88dadadff28c078e8709a394332975 Mon Sep 17 00:00:00 2001
From: Zoltan Fridrich <zfridric@redhat.com>
Date: Mon, 5 May 2025 11:52:25 +0200
Subject: [PATCH 45/54] Ignore bad hostkeys in known_hosts file
diff --git a/0046-support-authentication-indicators-in-GSSAPI.patch b/0046-support-authentication-indicators-in-GSSAPI.patch
index 251f08a..a175fea 100644
--- a/0046-support-authentication-indicators-in-GSSAPI.patch
+++ b/0046-support-authentication-indicators-in-GSSAPI.patch
@@ -1,4 +1,4 @@
-From 202fc88521798b649497519cd037ee403d047fc9 Mon Sep 17 00:00:00 2001
+From 37022658e4c96b4ffc883f677cc1587f9bab4d00 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Sun, 12 Apr 2026 12:23:51 +0200
Subject: [PATCH 46/54] support authentication indicators in GSSAPI
diff --git a/0047-NIST-curves-hybrid-KEX-implementation.patch b/0047-NIST-curves-hybrid-KEX-implementation.patch
index 0783c35..7eba18a 100644
--- a/0047-NIST-curves-hybrid-KEX-implementation.patch
+++ b/0047-NIST-curves-hybrid-KEX-implementation.patch
@@ -1,4 +1,4 @@
-From 8b2e741ada618336f01c58f61524f8d4b28cac3a Mon Sep 17 00:00:00 2001
+From 93504cc2625494b096134f478b851f140dbd8926 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Mon, 20 Oct 2025 16:07:31 +0200
Subject: [PATCH 47/54] NIST curves hybrid KEX implementation
diff --git a/0048-openssh-7.3p1-x11-max-displays.patch b/0048-openssh-7.3p1-x11-max-displays.patch
index 394a226..569bde6 100644
--- a/0048-openssh-7.3p1-x11-max-displays.patch
+++ b/0048-openssh-7.3p1-x11-max-displays.patch
@@ -1,4 +1,4 @@
-From 764fa7ebd0f6d5f77ca501d0bd1feec71f811911 Mon Sep 17 00:00:00 2001
+From f442f305469242d587cdebc28e31ac5ad5252643 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Fri, 12 Dec 2025 15:35:14 +0100
Subject: [PATCH 48/54] openssh-7.3p1-x11-max-displays
diff --git a/0049-Fix-ssh-pkcs11-client-helper-termination.patch b/0049-Fix-ssh-pkcs11-client-helper-termination.patch
index fbbff16..446db4c 100644
--- a/0049-Fix-ssh-pkcs11-client-helper-termination.patch
+++ b/0049-Fix-ssh-pkcs11-client-helper-termination.patch
@@ -1,4 +1,4 @@
-From eedce865a314caca63838313c5de1f258bbfc7d0 Mon Sep 17 00:00:00 2001
+From 7c4e22aaa8d7651e9ba3bc4030f5235ebadf6714 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Mon, 13 Apr 2026 14:59:26 +0200
Subject: [PATCH 49/54] Fix ssh-pkcs11-client helper termination
diff --git a/0050-openssh-10.2p1-pam-auth.patch b/0050-openssh-10.2p1-pam-auth.patch
index 9f6956a..7e04b3e 100644
--- a/0050-openssh-10.2p1-pam-auth.patch
+++ b/0050-openssh-10.2p1-pam-auth.patch
@@ -1,4 +1,4 @@
-From e002da5afc245e3ed67f8319bd1c6ded83e959a4 Mon Sep 17 00:00:00 2001
+From 3cdcd8d81220883814af4436b7443d0e755f7bae Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Sun, 12 Apr 2026 12:25:04 +0200
Subject: [PATCH 50/54] openssh-10.2p1-pam-auth
diff --git a/0051-gssapi-s4u.patch b/0051-gssapi-s4u.patch
index 416e609..100401d 100644
--- a/0051-gssapi-s4u.patch
+++ b/0051-gssapi-s4u.patch
@@ -1,4 +1,4 @@
-From a952c4cfa579551fadae91dd224f43f768943167 Mon Sep 17 00:00:00 2001
+From 1002a35e98ba6d0ac275ccbce1a7352e01cdc0ed Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Sun, 12 Apr 2026 12:25:21 +0200
Subject: [PATCH 51/54] gssapi-s4u
@@ -17,10 +17,10 @@ Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
9 files changed, 851 insertions(+), 20 deletions(-)
diff --git a/auth-krb5.c b/auth-krb5.c
-index 287bdd35a..7d4fbcc3d 100644
+index 2e3c1c80f..9cd3618b2 100644
--- a/auth-krb5.c
+++ b/auth-krb5.c
-@@ -463,6 +463,19 @@ ssh_krb5_cc_new_unique(krb5_context ctx, krb5_ccache *ccache, int *need_environm
+@@ -465,6 +465,19 @@ ssh_krb5_cc_new_unique(krb5_context ctx, krb5_ccache *ccache, int *need_environm
* a primary cache for this collection, if it supports that (non-FILE)
*/
if (krb5_cc_support_switch(ctx, type)) {
diff --git a/0052-openssh-10.2p1-pkcs11-uri.patch b/0052-openssh-10.2p1-pkcs11-uri.patch
index 4408fe9..12c4506 100644
--- a/0052-openssh-10.2p1-pkcs11-uri.patch
+++ b/0052-openssh-10.2p1-pkcs11-uri.patch
@@ -1,4 +1,4 @@
-From bb9fdcfebdd652ea819b5fbf3316794e9a7ee9e2 Mon Sep 17 00:00:00 2001
+From 4580b0efc21a6965f304ae5e0ada4e8ce41eb7ae Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Mon, 15 Dec 2025 14:24:07 +0100
Subject: [PATCH 52/54] openssh-10.2p1-pkcs11-uri
diff --git a/0053-gssapi-tests.patch b/0053-gssapi-tests.patch
index 2d61145..da21bbe 100644
--- a/0053-gssapi-tests.patch
+++ b/0053-gssapi-tests.patch
@@ -1,4 +1,4 @@
-From 204bca10918d44cc8bb1fdd99b2bf651b7e77d4c Mon Sep 17 00:00:00 2001
+From ca19ae776b8ce786809f5778a7f08342ff87746d Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 15 May 2025 13:43:28 +0200
Subject: [PATCH 53/54] gssapi-tests
diff --git a/1000-openssh-6.7p1-coverity.patch b/1000-openssh-6.7p1-coverity.patch
index 648c42c..400c337 100644
--- a/1000-openssh-6.7p1-coverity.patch
+++ b/1000-openssh-6.7p1-coverity.patch
@@ -1,12 +1,9 @@
-From 20271efdf2801f1ddcc308a81db131548872b056 Mon Sep 17 00:00:00 2001
+From 8a56ff00539091507c57a3218641c6d96fcb89d6 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
-Date: Fri, 12 Dec 2025 14:25:41 +0100
+Date: Fri, 7 Aug 2026 17:25:07 +0200
Subject: [PATCH 54/54] openssh-6.7p1-coverity
-https://bugzilla.mindrot.org/show_bug.cgi?id=2581
---
- auth-krb5.c | 2 ++
- gss-genr.c | 3 ++-
krl.c | 3 +++
loginrec.c | 2 ++
misc.c | 3 +++
@@ -16,43 +13,8 @@ https://bugzilla.mindrot.org/show_bug.cgi?id=2581
readconf.c | 1 +
servconf.c | 5 +++--
serverloop.c | 2 +-
- 11 files changed, 24 insertions(+), 11 deletions(-)
+ 9 files changed, 20 insertions(+), 10 deletions(-)
-diff --git a/auth-krb5.c b/auth-krb5.c
-index 7d4fbcc3d..9cd3618b2 100644
---- a/auth-krb5.c
-+++ b/auth-krb5.c
-@@ -427,6 +427,7 @@ ssh_krb5_cc_new_unique(krb5_context ctx, krb5_ccache *ccache, int *need_environm
- umask(old_umask);
- if (tmpfd == -1) {
- logit("mkstemp(): %.100s", strerror(oerrno));
-+ free(ccname);
- return oerrno;
- }
-
-@@ -434,6 +435,7 @@ ssh_krb5_cc_new_unique(krb5_context ctx, krb5_ccache *ccache, int *need_environm
- oerrno = errno;
- logit("fchmod(): %.100s", strerror(oerrno));
- close(tmpfd);
-+ free(ccname);
- return oerrno;
- }
- /* make sure the KRB5CCNAME is set for non-standard location */
-diff --git a/gss-genr.c b/gss-genr.c
-index a07dbf512..ec2c9c6dd 100644
---- a/gss-genr.c
-+++ b/gss-genr.c
-@@ -178,8 +178,9 @@ ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check,
- enclen = __b64_ntop(digest,
- ssh_digest_bytes(SSH_DIGEST_MD5), encoded,
- ssh_digest_bytes(SSH_DIGEST_MD5) * 2);
--
-+#pragma GCC diagnostic ignored "-Wstringop-overflow"
- cp = strncpy(s, kex, strlen(kex));
-+#pragma GCC diagnostic pop
- for ((p = strsep(&cp, ",")); p && *p != '\0';
- (p = strsep(&cp, ","))) {
- if (sshbuf_len(buf) != 0 &&
diff --git a/krl.c b/krl.c
index 0e2b5f155..f2d105f23 100644
--- a/krl.c
diff --git a/openssh.spec b/openssh.spec
index c8789ba..dfe7ed5 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -39,7 +39,7 @@
Summary: An open source implementation of SSH protocol version 2
Name: openssh
Version: %{openssh_ver}
-Release: 3%{?dist}
+Release: 4%{?dist}
URL: http://www.openssh.com/portable.html
Source0: https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
Source1: https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -523,6 +523,9 @@ test -f %{sysconfig_anaconda} && \
%attr(0755,root,root) %{_libdir}/sshtest/sk-dummy.so
%changelog
+* Mon Aug 10 2026 Dmitry Belyavskiy <dbelyavs@redhat.com> - 10.4p1-4
+- Partially reduce the dependency between patches, avoiding patches to patches.
+
* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 10.4p1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
reply other threads:[~2026-08-10 15:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178637671957.1.9741139167249249718.rpms-openssh-e67cea150260@fedoraproject.org \
--to=dbelyavs@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox