9.7p1.hpn18.4.1

3 files changed, 19 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c6a96e93fe11..966071ee5bfb 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.7p1.hpn18.4.0
+	pkgver = 9.7p1.hpn18.4.1
 	pkgrel = 1
 	url = https://www.psc.edu/index.php/hpn-ssh/
 	arch = x86_64
@@ -24,7 +24,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/hpn-ssh/archive/hpn-18.4.0.tar.gz
+	source = https://github.com/rapier1/hpn-ssh/archive/hpn-18.4.1.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
@@ -36,8 +36,8 @@ pkgbase = openssh-hpn
 	source = ssh-agent.service
 	source = sshd.pam
 	source = sshd.conf
-	sha512sums = b33d5fabf2eaa3524ed624276442c5e4b2ea8e77eb61fcd18371ceea1158ce09c4729107ffc14c345c852d3c76be023c5a288341ec294180aedb5bdf8f97e2bc
-	sha512sums = 548788e48d12cbf924e6172d81878e9cab5caa82d3c91db043ae84697de9d95619a0c79bd8d1d91d2980b046615bb750e71457a590fa082d374dcd939a485bbf
+	sha512sums = 46b84dc2a23a20d86c770109ee20b170546966ee55b1636863d92873c2e42a68accfdf4ee6a77cfa1b0af71cee8e2f8e77cbc126330280dd4ca4a572c3cc0626
+	sha512sums = 478b239f19cdbaee913d1502e771ed99a1345e621697e3cbee6571b1ad3537a192db8365ca7a796ea1cd4e820ff6659befd554fcfb70096577c433e280be5fa4
 	sha512sums = 62e2d60fdd39243e6245d90a0940b67ac4e72d042d8146203d50cdaa2df51611d91831d3b152d42302490afd677ae3433a3eba975dee68dbf7c06728167bb6d4
 	sha512sums = aeee097dbf46aa22f411d78a49b9db7b2451dd0351bb5f57c7b3159c7ddc29aa994cd43046c187033c474f8fb2952165536197139eb7c495db99f6697f41637d
 	sha512sums = 6438c063d8785babb33e18ee082ea96168a56a4e02099b521015dfc764d3411b97d911e0cc577cdb9ac7a572e8cf0b86a9d4fa1e3c83166055690fa3f551dc7d
@@ -48,8 +48,8 @@ pkgbase = openssh-hpn
 	sha512sums = 1f1384d527a34ad2eaae604e93f5874c4df58a95505e8108df09fadfb8e67f90676845644eee73394981fd0dc8e888b78ac2caf761abea16be8213297ae62088
 	sha512sums = 7000f06ac19e87c48ba95d19c76a298d9532f3c9d706537a58382d4f70cfc8f9163156bf5b112e46a1f414d5bf0df26aab9b22c330d9c65ee52affe6488f130a
 	sha512sums = 838252ca7bfa69797cba8e31340321ece06a58428b47002cb835678d8e29c6f23f6521269a2b5b17820860a56df308185bc651484db24327cc58191e5f83222a
-	b2sums = dcd686c867642812fbf4090a74808f642b6a76aa47a95e1fbd9f891461d0b83634d28ae6aa5a7ed16015a5a62fdf0cf95bacf08ad4d3b917cb76d8bfbf7332d2
-	b2sums = eca67477c9002707f311618095ec1c971e7b20f52c6aac12dadb1f2c17d90fbb5d4494f650c376b54a0c20dd3914b232e6fbf4fff49eb4fbbfb04f08454e3878
+	b2sums = 53e54266dc10c15f936147cbf1bb917ce8c5e5a99c2e4ce43ee6387e1316964f5732fad59683f0d5f0e5120778a7736ff9dfd4402878443eafee0b3c622815af
+	b2sums = 0f3f5e732047b6c88306b71245d07c59c3a4cfd20c532bed1fc84bd84af72d3263c9c2800f867d775f64a8428a4d35c35c0d81d275aa02494ab419866fcb6519
 	b2sums = 1e6c8d39052bdc268c584488341e260a2695d4b9afabca41919710bb34833dd580ff1813c01b8ba91f2629273c8101ce0ed3b2749dabce054137b4ef37b2a548
 	b2sums = a6ff4e82a92e7dba08f0e6c14ad1d280ad2dbc1d5ebdc7dc70eaa1b7963ddd5d5491fdf4c83cde1bec183b335ed20edaf101ac8bdb3c0f480adc72d41251723b
 	b2sums = e6c672505b37fe915a4dd2f5a1503b8be88a124aed22cc736cccbc88573b23eba36e7702136b009c6209c1079f4520e4ee1233fa8a2bbb82f2ea1d8be388ea1f
diff --git a/PKGBUILD b/PKGBUILD
index 9b06389ff7b2..a370f3ea39c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -47,8 +47,8 @@ pkgname=(
 #git_rev="ab9495715b35116df3ee123d2d0f84013f79ca84"  # 9.3p2-hpn17v14
 openssh_rev="V_9_7_P1";
 _openssh_rev="${openssh_rev//V_/}"; _openssh_rev="${_openssh_rev//_P/p}";
-git_rev="hpn-18.4.0"
-pkgver="${_openssh_rev//_/.}.hpn18.4.0"
+git_rev="hpn-18.4.1"
+pkgver="${_openssh_rev//_/.}.${git_rev//-/}"
 pkgrel=1
 pkgdesc='A Secure SHell server/client fork with High Performance patches included'
 url='https://www.psc.edu/index.php/hpn-ssh/'
@@ -80,8 +80,8 @@ source=(
 )
 
 sha512sums=(
-  'b33d5fabf2eaa3524ed624276442c5e4b2ea8e77eb61fcd18371ceea1158ce09c4729107ffc14c345c852d3c76be023c5a288341ec294180aedb5bdf8f97e2bc'
-  '548788e48d12cbf924e6172d81878e9cab5caa82d3c91db043ae84697de9d95619a0c79bd8d1d91d2980b046615bb750e71457a590fa082d374dcd939a485bbf'
+  '46b84dc2a23a20d86c770109ee20b170546966ee55b1636863d92873c2e42a68accfdf4ee6a77cfa1b0af71cee8e2f8e77cbc126330280dd4ca4a572c3cc0626'
+  '478b239f19cdbaee913d1502e771ed99a1345e621697e3cbee6571b1ad3537a192db8365ca7a796ea1cd4e820ff6659befd554fcfb70096577c433e280be5fa4'
   '62e2d60fdd39243e6245d90a0940b67ac4e72d042d8146203d50cdaa2df51611d91831d3b152d42302490afd677ae3433a3eba975dee68dbf7c06728167bb6d4'
   #'5d96a288ae925584cdcde0305c511b18e3cfaed6cae49f5fc6f062f62100d10a087144e8263380d19a14dca71c745065ddaa0062542c2e2cfa1db04811d40dc7'
   #'a9ee92fd135c47a27ac260ab40c057f0e35c118efcb281e98e235158ffd8599acede67dcce6da4c2589b2a0bd794c587af80d4ce4f85c1b9823cb9acfbbe9050'
@@ -98,8 +98,8 @@ sha512sums=(
 )
 
 b2sums=(
-  'dcd686c867642812fbf4090a74808f642b6a76aa47a95e1fbd9f891461d0b83634d28ae6aa5a7ed16015a5a62fdf0cf95bacf08ad4d3b917cb76d8bfbf7332d2'
-  'eca67477c9002707f311618095ec1c971e7b20f52c6aac12dadb1f2c17d90fbb5d4494f650c376b54a0c20dd3914b232e6fbf4fff49eb4fbbfb04f08454e3878'
+  '53e54266dc10c15f936147cbf1bb917ce8c5e5a99c2e4ce43ee6387e1316964f5732fad59683f0d5f0e5120778a7736ff9dfd4402878443eafee0b3c622815af'
+  '0f3f5e732047b6c88306b71245d07c59c3a4cfd20c532bed1fc84bd84af72d3263c9c2800f867d775f64a8428a4d35c35c0d81d275aa02494ab419866fcb6519'
   '1e6c8d39052bdc268c584488341e260a2695d4b9afabca41919710bb34833dd580ff1813c01b8ba91f2629273c8101ce0ed3b2749dabce054137b4ef37b2a548'
   #'051b7c350333ce57a4a5e57ba0f693aed4491a241fd9e65cf2a861773571b44b8d4ffa06506a0c4a05399a46108ec05321e69f210637f32e25c76e683b224505'
   #'b46019363a19e2a0c397d66b6f1dc24d1c1219372b7fd699d92a9c382b24b02437b37cb12b3bba7e3ca97cfe98170ad21fff5871daf2070bc3d175fe0b31680b'
@@ -116,8 +116,8 @@ b2sums=(
 )
 
 b3sums=(
-  '1ec5f02c18f11af8a6fb03076d5762680762a1e2ce31b7b22f2e2e4a19bf1532'
-  'de325fceb3e1f657a4b7d8032dac66e10f75e678c241085dea4b90765b3f64b2'
+  '9f8af3c5459dab53a14a45655f4236b45fa050b63ba82698ccd71b50525d5ce9'
+  '7fd3495f70eac949d46dc49c4cced7adfea0c5a9f546af665125ad8d5883552e'
   'db9e75e396c8f45aacb0e14003aabdcf29b812e468a5a40b371957ffe9c7f52f'
   #'145f9d17920d7b3b1ef935e3a735171ac9783cbd94ee47eec86f3fb96a6a34c6'
   #'86f8ba9e3469c86c2ced236240d9ba9a253d82b8b6732d8592db481d984de258'
diff --git a/hpn-revert-default-port-2222.patch b/hpn-revert-default-port-2222.patch
index fa377b584238..de9e470c3a5a 100644
--- a/hpn-revert-default-port-2222.patch
+++ b/hpn-revert-default-port-2222.patch
@@ -25,8 +25,8 @@ index 5f9c04279..b85ec82c7 100644
 +++ b/readconf.c
 @@ -168,7 +168,7 @@ typedef enum {
  	oLocalCommand, oPermitLocalCommand, oRemoteCommand,
- 	oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize,
- 	oNoneEnabled, oNoneMacEnabled, oNoneSwitch, oHPNBufferLimit,
+ 	oTcpRcvBufPoll, oHPNDisabled,
+ 	oNoneEnabled, oNoneMacEnabled, oNoneSwitch,
 -	oMetrics, oMetricsPath, oMetricsInterval, oFallback, oFallbackPort,
 +	oMetrics, oMetricsPath, oMetricsInterval,
  	oVisualHostKey,
@@ -68,14 +68,14 @@ index 5f9c04279..b85ec82c7 100644
  	 * line or not. If it does then enable it otherwise fail.
  	 *  NONE should never be a default configuration.
 @@ -2511,8 +2501,6 @@ initialize_options(Options * options)
+ 	options->metrics_path = NULL;
+ 	options->metrics_interval = -1;
  	options->hpn_disabled = -1;
- 	options->hpn_buffer_size = -1;
- 	options->hpn_buffer_limit = -1;
 -	options->fallback = -1;
 -	options->fallback_port = -1;
  	options->tcp_rcv_buf_poll = -1;
- 	options->tcp_rcv_buf = -1;
  	options->session_type = -1;
+ 	options->stdin_null = -1;
 @@ -2725,10 +2713,6 @@ fill_default_options(Options * options)
  		options->metrics_interval = 5;
  	if (options->control_master == -1)