9.2p1.hpn17v11

3 files changed, 18 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a1dd75f5c0a6..3d06fa1e2082 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openssh-hpn
 	pkgdesc = A Secure SHell server/client fork with High Performance patches included
-	pkgver = 9.1p1.hpn17v10
+	pkgver = 9.2p1.hpn17v11
 	pkgrel = 1
 	url = https://www.psc.edu/index.php/hpn-ssh/
 	arch = x86_64
@@ -21,7 +21,7 @@ pkgbase = openssh-hpn
 	optdepends = x11-ssh-askpass: input passphrase in X
 	optdepends = libfido2: FIDO/U2F support
 	conflicts = openssh-hpn-git
-	source = https://github.com/rapier1/openssh-portable/archive/hpn-9_1_P1.tar.gz
+	source = https://github.com/rapier1/openssh-portable/archive/hpn-9_2_P1.tar.gz
 	source = hpn-revert-default-port-2222.patch
 	source = http://www.eworm.de/download/linux/openssh-tests-scp.patch
 	source = glibc-2.31.patch
@@ -31,8 +31,8 @@ pkgbase = openssh-hpn
 	source = sshd.service
 	source = sshd.pam
 	source = sshd.conf
-	sha512sums = c0047d47570e3dde4b3531ca99d506d5d415fa608994875740d1e0b0f3a73237150b3a45de6c62071a2ea92e8915e80b73c340ecb20f14d098ccf9e95199bd51
-	sha512sums = c13f8d8dbbf28e4edbe0c82822d5651f56ed2a683b2e9d12b541657e5b0ba002b6a4b60eb9a6067ac28295ef529f65a2a728e0d5974d87dc7fe76d1d5b946fc0
+	sha512sums = 5f7440db42a25b77aeb306c7e289a35d1eeac5b74ea4ddf85fe224b188bf7c39bad38c5f96fe6b2454cdac5b7a4424c2999baaa5cb74955d6c505c2642e53f4c
+	sha512sums = 6b97f9e955745ef424ecf6e37b96942f3a528f800046ec6edc040e626a07e9ac1724dabb956cd00750164329af98b2c2b41eacd4c3ba27d29ab5cece4b60bc61
 	sha512sums = 62e2d60fdd39243e6245d90a0940b67ac4e72d042d8146203d50cdaa2df51611d91831d3b152d42302490afd677ae3433a3eba975dee68dbf7c06728167bb6d4
 	sha512sums = aeee097dbf46aa22f411d78a49b9db7b2451dd0351bb5f57c7b3159c7ddc29aa994cd43046c187033c474f8fb2952165536197139eb7c495db99f6697f41637d
 	sha512sums = 6438c063d8785babb33e18ee082ea96168a56a4e02099b521015dfc764d3411b97d911e0cc577cdb9ac7a572e8cf0b86a9d4fa1e3c83166055690fa3f551dc7d
@@ -41,8 +41,8 @@ pkgbase = openssh-hpn
 	sha512sums = aaa3f0e9ee686b7208ef94e373007a57e5f62020339399d6abbbeba276acedb1868d62c0401c901fd021f9287b263347b699c0d4b65f503fa57bafef5f4b8829
 	sha512sums = 298e47a21c337101974fa5237b3110aa3c7638b5fa53bd07661413236c8ed3212b431abaeffd875af6c9a72b4f8e1c8512e1e1960cbfff15bfee62b32d305fc3
 	sha512sums = 838252ca7bfa69797cba8e31340321ece06a58428b47002cb835678d8e29c6f23f6521269a2b5b17820860a56df308185bc651484db24327cc58191e5f83222a
-	b2sums = a9eee5c2189ae4fb5b8cfc0f9f4022fdd6b2f42b3356e6cb7c0e947bd3240bb2a42b0e3f48df035034563d0625bb16ae410cb3fffa39976828347d0181fbe501
-	b2sums = cbfde6e66551722222ef3aaa38f9be9d3b256be23308e6aaf8f8bcbe7c79b67d7b91ff7a06cf5807182dbbfb9cda89130f9945cc5e1d9576580fed3a879f3e5b
+	b2sums = 782c05b8bf54630bc105392fdedda3a6a5a95561cab522a5df3b0f3499bf33b74775f33fccb8bb4ad2bc0e26ee8c544f8dfc57542ba7e8699d45bc855e24c220
+	b2sums = 4b2e8334ec2176fcd778f2ca0b7794fedbbc5323bd4db5a5b73c5f446631a170b0f02456a2f1f857df4149c7b08196fbf05c0482c32dec6029cd5c751d0a659c
 	b2sums = 1e6c8d39052bdc268c584488341e260a2695d4b9afabca41919710bb34833dd580ff1813c01b8ba91f2629273c8101ce0ed3b2749dabce054137b4ef37b2a548
 	b2sums = a6ff4e82a92e7dba08f0e6c14ad1d280ad2dbc1d5ebdc7dc70eaa1b7963ddd5d5491fdf4c83cde1bec183b335ed20edaf101ac8bdb3c0f480adc72d41251723b
 	b2sums = e6c672505b37fe915a4dd2f5a1503b8be88a124aed22cc736cccbc88573b23eba36e7702136b009c6209c1079f4520e4ee1233fa8a2bbb82f2ea1d8be388ea1f
diff --git a/PKGBUILD b/PKGBUILD
index 7311ea5212ff..1968f52b7f2d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -44,8 +44,8 @@ pkgname=(
   openssh-hpn
   openssh-hpn-shim
 )
-_openssh_ver=9.1p1
-_hpn_ver=hpn17v10
+_openssh_ver=9.2p1
+_hpn_ver=hpn17v11
 #_pkgver="$(sed -e 's/\./_/' -e 's/p/_P/' <<< ${_openssh_ver})_new"
 _pkgver="$(sed -e 's/\./_/' -e 's/p/_P/' <<< ${_openssh_ver})"
 git_rev="hpn-${_pkgver}"
@@ -80,8 +80,8 @@ source=(
 )
 
 sha512sums=(
-  'c0047d47570e3dde4b3531ca99d506d5d415fa608994875740d1e0b0f3a73237150b3a45de6c62071a2ea92e8915e80b73c340ecb20f14d098ccf9e95199bd51'
-  'c13f8d8dbbf28e4edbe0c82822d5651f56ed2a683b2e9d12b541657e5b0ba002b6a4b60eb9a6067ac28295ef529f65a2a728e0d5974d87dc7fe76d1d5b946fc0'
+  '5f7440db42a25b77aeb306c7e289a35d1eeac5b74ea4ddf85fe224b188bf7c39bad38c5f96fe6b2454cdac5b7a4424c2999baaa5cb74955d6c505c2642e53f4c'
+  '6b97f9e955745ef424ecf6e37b96942f3a528f800046ec6edc040e626a07e9ac1724dabb956cd00750164329af98b2c2b41eacd4c3ba27d29ab5cece4b60bc61'
   '62e2d60fdd39243e6245d90a0940b67ac4e72d042d8146203d50cdaa2df51611d91831d3b152d42302490afd677ae3433a3eba975dee68dbf7c06728167bb6d4'
   #'5d96a288ae925584cdcde0305c511b18e3cfaed6cae49f5fc6f062f62100d10a087144e8263380d19a14dca71c745065ddaa0062542c2e2cfa1db04811d40dc7'
   #'a9ee92fd135c47a27ac260ab40c057f0e35c118efcb281e98e235158ffd8599acede67dcce6da4c2589b2a0bd794c587af80d4ce4f85c1b9823cb9acfbbe9050'
@@ -96,8 +96,8 @@ sha512sums=(
 )
 
 b2sums=(
-  'a9eee5c2189ae4fb5b8cfc0f9f4022fdd6b2f42b3356e6cb7c0e947bd3240bb2a42b0e3f48df035034563d0625bb16ae410cb3fffa39976828347d0181fbe501'
-  'cbfde6e66551722222ef3aaa38f9be9d3b256be23308e6aaf8f8bcbe7c79b67d7b91ff7a06cf5807182dbbfb9cda89130f9945cc5e1d9576580fed3a879f3e5b'
+  '782c05b8bf54630bc105392fdedda3a6a5a95561cab522a5df3b0f3499bf33b74775f33fccb8bb4ad2bc0e26ee8c544f8dfc57542ba7e8699d45bc855e24c220'
+  '4b2e8334ec2176fcd778f2ca0b7794fedbbc5323bd4db5a5b73c5f446631a170b0f02456a2f1f857df4149c7b08196fbf05c0482c32dec6029cd5c751d0a659c'
   '1e6c8d39052bdc268c584488341e260a2695d4b9afabca41919710bb34833dd580ff1813c01b8ba91f2629273c8101ce0ed3b2749dabce054137b4ef37b2a548'
   #'051b7c350333ce57a4a5e57ba0f693aed4491a241fd9e65cf2a861773571b44b8d4ffa06506a0c4a05399a46108ec05321e69f210637f32e25c76e683b224505'
   #'b46019363a19e2a0c397d66b6f1dc24d1c1219372b7fd699d92a9c382b24b02437b37cb12b3bba7e3ca97cfe98170ad21fff5871daf2070bc3d175fe0b31680b'
@@ -112,8 +112,8 @@ b2sums=(
 )
 
 b3sums=(
-  '930a5fa7d9a91ff26f9148a08dad1268ab54188a171cfcfb66e3ad92b5303a83'
-  '0c09e8a6b87c79b8d9669f0bbe7469e86a7543fc149c986d21d68347e14eb670'
+  '581b379146d1c983ab85053a9ac52e52ab85916d8844b2f0adc0d4a0b157fe1e'
+  '2ccf62429dc1e4f11361a50c1419f10029388e75ccadcb19fe0a1b531de925cc'
   'db9e75e396c8f45aacb0e14003aabdcf29b812e468a5a40b371957ffe9c7f52f'
   #'145f9d17920d7b3b1ef935e3a735171ac9783cbd94ee47eec86f3fb96a6a34c6'
   #'86f8ba9e3469c86c2ced236240d9ba9a253d82b8b6732d8592db481d984de258'
diff --git a/hpn-revert-default-port-2222.patch b/hpn-revert-default-port-2222.patch
index 69a5f7baa1fd..fe91703410ff 100644
--- a/hpn-revert-default-port-2222.patch
+++ b/hpn-revert-default-port-2222.patch
@@ -130,7 +130,7 @@ diff --git a/ssh.c b/ssh.c
 index 24758239d15..e1162dc54d2 100644
 --- a/ssh.c
 +++ b/ssh.c
-@@ -1549,36 +1549,10 @@ main(int ac, char **av)
+@@ -1562,36 +1562,10 @@ main(int ac, char **av)
  		timeout_ms = options.connection_timeout * 1000;
  
  	/* Open a connection to the remote host. */
@@ -140,9 +140,9 @@ index 24758239d15..e1162dc54d2 100644
 -	 * -cjr 8/17/2022
 -	 */
 -tryagain:
- 	if (ssh_connect(ssh, host, host_arg, addrs, &hostaddr, options.port,
--	    options.connection_attempts, &timeout_ms,
--	    options.tcp_keep_alive) != 0) {
+ 	if (ssh_connect(ssh, host, options.host_arg, addrs, &hostaddr,
+ 	    options.port, options.connection_attempts,
+-	    &timeout_ms, options.tcp_keep_alive) != 0) {
 -		/* could not connect. If the port requested is the same as
 -		 * hpnssh default port then fallback. Otherwise, exit */
 -		if ((options.port == default_ssh_port()) && options.fallback) {
@@ -162,7 +162,6 @@ index 24758239d15..e1162dc54d2 100644
 -		} else {
 -			exit(255);
 -		}
-+	    options.connection_attempts,
 +	    &timeout_ms, options.tcp_keep_alive) != 0)
  		exit(255);
 -	}