[rpms/gsi-openssh] epel8: Based on openssh-8.0p1-30.el8_10

[rpms/gsi-openssh] epel8: Based on openssh-8.0p1-30.el8_10

[Mattias Ellert]

A new commit has been pushed.

Repo   : rpms/gsi-openssh
Branch : epel8
Commit : dd09fc204115e55d1d4b9c628ef2b45d875039f5
Author : Mattias Ellert <mattias.ellert@physics.uu.se>
Date   : 2026-07-09T15:59:24+02:00
Stats  : +16/-11 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/gsi-openssh/c/dd09fc204115e55d1d4b9c628ef2b45d875039f5?branch=epel8

Log:
Based on openssh-8.0p1-30.el8_10

---
diff --git a/gsi-openssh.spec b/gsi-openssh.spec
index 3b675aa..a44f3af 100644
--- a/gsi-openssh.spec
+++ b/gsi-openssh.spec
@@ -31,7 +31,7 @@
 %global ldap 1
 
 %global openssh_ver 8.0p1
-%global openssh_rel 18
+%global openssh_rel 19
 
 Summary: An implementation of the SSH protocol with GSI authentication
 Name: gsi-openssh
@@ -659,6 +659,9 @@ getent passwd sshd >/dev/null || \
 %attr(0644,root,root) %{_tmpfilesdir}/gsissh.conf
 
 %changelog
+* Thu Jul 09 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 8.0p1-19
+- Based on openssh-8.0p1-30.el8_10
+
 * Fri May 29 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 8.0p1-18
 - Based on openssh-8.0p1-29.el8_10
 

diff --git a/openssh-7.2p2-x11.patch b/openssh-7.2p2-x11.patch
index 48ce840..b5ca9c1 100644
--- a/openssh-7.2p2-x11.patch
+++ b/openssh-7.2p2-x11.patch
@@ -30,7 +30,7 @@ diff -up openssh-7.2p2/channels.c.x11 openssh-7.2p2/channels.c
  	return -1;
  }
  
-@@ -4012,8 +4015,18 @@ static int
+@@ -4668,8 +4671,19 @@ static int
  connect_local_xsocket(u_int dnr)
  {
  	char buf[1024];
@@ -39,10 +39,11 @@ diff -up openssh-7.2p2/channels.c.x11 openssh-7.2p2/channels.c
 +	int len, ret;
 +	len = snprintf(buf + 1, sizeof (buf) - 1, _PATH_UNIX_X, dnr);
 +#ifdef linux
-+	/* try abstract socket first */
-+	buf[0] = '\0';
-+	if ((ret = connect_local_xsocket_path(buf, len + 1)) >= 0)
-+		return ret;
++	if (getenv("SSH_INSECURE_ABSTRACT_SOCKET_ENABLED") != NULL) {
++		buf[0] = '\0';
++		if ((ret = connect_local_xsocket_path(buf, len + 1)) >= 0)
++			return ret;
++	}
 +#endif
 +	if ((ret = connect_local_xsocket_path(buf + 1, len)) >= 0)
 +		return ret;

diff --git a/openssh-7.7p1-fips.patch b/openssh-7.7p1-fips.patch
index 0cbd22f..3a80074 100644
--- a/openssh-7.7p1-fips.patch
+++ b/openssh-7.7p1-fips.patch
@@ -116,17 +116,18 @@ diff -up openssh-7.9p1/kexgexc.c.fips openssh-7.9p1/kexgexc.c
  #include <sys/types.h>
  
  #include <openssl/dh.h>
-@@ -118,6 +119,10 @@ input_kex_dh_gex_group(int type, u_int32
- 		r = SSH_ERR_ALLOC_FAIL;
- 		goto out;
+@@ -115,6 +116,11 @@ input_kex_dh_gex_group(int type, u_int32
  	}
+ 	p = g = NULL; /* belong to kex->dh now */
+ 
 +	if (FIPS_mode() && dh_is_known_group(kex->dh) == 0) {
 +		r = SSH_ERR_INVALID_ARGUMENT;
 +		goto out;
 +	}
- 	p = g = NULL; /* belong to kex->dh now */
- 
++
  	/* generate and send 'e', client DH public key */
+ 	if ((r = dh_gen_key(kex->dh, kex->we_need * 8)) != 0)
+ 		goto out;
 diff -up openssh-7.9p1/myproposal.h.fips openssh-7.9p1/myproposal.h
 --- openssh-7.9p1/myproposal.h.fips	2018-10-17 02:01:20.000000000 +0200
 +++ openssh-7.9p1/myproposal.h	2019-03-11 17:06:37.621878041 +0100