From 29083ac442ef74d6d1e198bd7488bd3d9c72d0dc Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <dbelyavs@redhat.com>
Date: Jun 02 2023 16:56:58 +0000
Subject: Remove unused patch


---

diff --git a/openssh-8.7p1-CVE-2023-25136.patch b/openssh-8.7p1-CVE-2023-25136.patch
deleted file mode 100644
index ca661ee..0000000
--- a/openssh-8.7p1-CVE-2023-25136.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/compat.c b/compat.c
-index 46dfe3a9c2e..478a9403eea 100644
---- a/compat.c
-+++ b/compat.c
-@@ -190,26 +190,26 @@ compat_pkalg_proposal(struct ssh *ssh, char *pkalg_prop)
- char *
- compat_kex_proposal(struct ssh *ssh, char *p)
- {
--	char *cp = NULL;
-+	char *cp = NULL, *cp2 = NULL;
- 
- 	if ((ssh->compat & (SSH_BUG_CURVE25519PAD|SSH_OLD_DHGEX)) == 0)
- 		return xstrdup(p);
- 	debug2_f("original KEX proposal: %s", p);
- 	if ((ssh->compat & SSH_BUG_CURVE25519PAD) != 0)
--		if ((p = match_filter_denylist(p,
-+		if ((cp = match_filter_denylist(p,
- 		    "curve25519-sha256@libssh.org")) == NULL)
- 			fatal("match_filter_denylist failed");
- 	if ((ssh->compat & SSH_OLD_DHGEX) != 0) {
--		cp = p;
--		if ((p = match_filter_denylist(p,
-+		if ((cp2 = match_filter_denylist(cp ? cp : p,
- 		    "diffie-hellman-group-exchange-sha256,"
- 		    "diffie-hellman-group-exchange-sha1")) == NULL)
- 			fatal("match_filter_denylist failed");
- 		free(cp);
-+		cp = cp2;
- 	}
--	debug2_f("compat KEX proposal: %s", p);
--	if (*p == '\0')
-+	if (cp == NULL || *cp == '\0')
- 		fatal("No supported key exchange algorithms found");
--	return p;
-+	debug2_f("compat KEX proposal: %s", cp);
-+	return cp;
- }
- 
diff --git a/openssh.spec b/openssh.spec
index d431c49..e7b588d 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -47,7 +47,7 @@
 
 # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
 %global openssh_ver 9.3p1
-%global openssh_rel 1
+%global openssh_rel 2
 %global pam_ssh_agent_ver 0.10.4
 %global pam_ssh_agent_rel 9
 
@@ -748,7 +748,10 @@ test -f %{sysconfig_anaconda} && \
 %endif
 
 %changelog
-* Fri Apr 21 2023 Dmitry Belyavskiy <dbelyavs@redhat.com> - 9.3p1-1 + 0.10.4-9
+* Fri Jun 02 2023 Dmitry Belyavskiy <dbelyavs@redhat.com> - 9.3p1-2
+- Remove unused patch
+
+* Thu Jun 01 2023 Dmitry Belyavskiy <dbelyavs@redhat.com> - 9.3p1-1 + 0.10.4-9
 - Rebase OpenSSH to 9.3p1
 
 * Wed May 24 2023 Norbert Pocs <npocs@redhat.com> - 9.0p1-18