wip: 9.1p1.hpn17v7

3 files changed, 213 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3beed75c5da..d4fd8a049d16 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openssh-hpn
 	pkgdesc = A Secure SHell server/client fork with High Performance patches included
-	pkgver = 9.0p1.hpn17v4
-	pkgrel = 4
+	pkgver = 9.1p1.hpn17v7
+	pkgrel = 1
 	url = https://www.psc.edu/index.php/hpn-ssh/
 	arch = x86_64
 	arch = i486
@@ -21,8 +21,8 @@ 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_0_P1.tar.gz
-	source = hpn-revert-default-port-2222.patch::https://github.com/zer0def/openssh-portable/commit/04c6e9a9ab483f770d7d591ff8d40fb8cf2ee5ac.patch
+	source = https://github.com/rapier1/openssh-portable/archive/1fb7466a7a8c43e8b4ea4587ecb16d7b725a0d8e.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
 	source = hpnsshdgenkeys.service
@@ -31,7 +31,7 @@ pkgbase = openssh-hpn
 	source = sshd.service
 	source = sshd.pam
 	source = sshd.conf
-	sha512sums = 28fe761ea2caef7a00365e6f16539defc27e24cc2e9d7ba3246654e6b632c24cddc54adae4daa4cc18ea1fe2b2ac92703e705ce97511eadae799227fc06e1867
+	sha512sums = 45e1c7042814eddf5a9aa747636b2e7639838cac1514400f98f809693426b724b70661568712f31fa5b19abdb530079ed617e5671d6dd11025288d7ae225a7f0
 	sha512sums = c13f8d8dbbf28e4edbe0c82822d5651f56ed2a683b2e9d12b541657e5b0ba002b6a4b60eb9a6067ac28295ef529f65a2a728e0d5974d87dc7fe76d1d5b946fc0
 	sha512sums = 62e2d60fdd39243e6245d90a0940b67ac4e72d042d8146203d50cdaa2df51611d91831d3b152d42302490afd677ae3433a3eba975dee68dbf7c06728167bb6d4
 	sha512sums = aeee097dbf46aa22f411d78a49b9db7b2451dd0351bb5f57c7b3159c7ddc29aa994cd43046c187033c474f8fb2952165536197139eb7c495db99f6697f41637d
@@ -41,7 +41,7 @@ pkgbase = openssh-hpn
 	sha512sums = aaa3f0e9ee686b7208ef94e373007a57e5f62020339399d6abbbeba276acedb1868d62c0401c901fd021f9287b263347b699c0d4b65f503fa57bafef5f4b8829
 	sha512sums = 298e47a21c337101974fa5237b3110aa3c7638b5fa53bd07661413236c8ed3212b431abaeffd875af6c9a72b4f8e1c8512e1e1960cbfff15bfee62b32d305fc3
 	sha512sums = 838252ca7bfa69797cba8e31340321ece06a58428b47002cb835678d8e29c6f23f6521269a2b5b17820860a56df308185bc651484db24327cc58191e5f83222a
-	b2sums = 275cda60223ca33d00c7218ca360ae8ba34a6825aa46dd25c32f04f7cfc5caa8766d771f8da5e6f2071dc8f689917a3efc39b3e64bdaeb2a937df9766e764fc7
+	b2sums = 8534e0f03a01054017de53015feca1c704e22092df4f85089732181800a417e2cf3ea6f40de7128f34441e3876ca253bd03d8a6eb34092461d150b9ba46b7986
 	b2sums = cbfde6e66551722222ef3aaa38f9be9d3b256be23308e6aaf8f8bcbe7c79b67d7b91ff7a06cf5807182dbbfb9cda89130f9945cc5e1d9576580fed3a879f3e5b
 	b2sums = 1e6c8d39052bdc268c584488341e260a2695d4b9afabca41919710bb34833dd580ff1813c01b8ba91f2629273c8101ce0ed3b2749dabce054137b4ef37b2a548
 	b2sums = a6ff4e82a92e7dba08f0e6c14ad1d280ad2dbc1d5ebdc7dc70eaa1b7963ddd5d5491fdf4c83cde1bec183b335ed20edaf101ac8bdb3c0f480adc72d41251723b
diff --git a/PKGBUILD b/PKGBUILD
index 512a8d647bde..2c42c44c6f8e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -44,12 +44,14 @@ pkgname=(
   openssh-hpn
   openssh-hpn-shim
 )
-_openssh_ver=9.0p1
-_hpn_ver=hpn17v4
+_openssh_ver=9.1p1
+_hpn_ver=hpn17v7
 #_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}"
+git_rev="1fb7466a7a8c43e8b4ea4587ecb16d7b725a0d8e"  # 9.1p1-hpn17v7
 pkgver="${_openssh_ver}.${_hpn_ver}"
-pkgrel=4
+pkgrel=1
 pkgdesc='A Secure SHell server/client fork with High Performance patches included'
 url='https://www.psc.edu/index.php/hpn-ssh/'
 license=('custom:BSD')
@@ -61,8 +63,8 @@ optdepends=('xorg-xauth: X11 forwarding'
             'libfido2: FIDO/U2F support')
 conflicts=('openssh-hpn-git')
 source=(
-  "https://github.com/rapier1/openssh-portable/archive/hpn-${_pkgver}.tar.gz"
-  "hpn-revert-default-port-2222.patch::https://github.com/zer0def/openssh-portable/commit/04c6e9a9ab483f770d7d591ff8d40fb8cf2ee5ac.patch"
+  "https://github.com/rapier1/openssh-portable/archive/${git_rev}.tar.gz"
+  "hpn-revert-default-port-2222.patch"
   'http://www.eworm.de/download/linux/openssh-tests-scp.patch'
   #'openssl11.patch'
   #'hpn-banner.patch'
@@ -78,7 +80,7 @@ source=(
 )
 
 sha512sums=(
-  '28fe761ea2caef7a00365e6f16539defc27e24cc2e9d7ba3246654e6b632c24cddc54adae4daa4cc18ea1fe2b2ac92703e705ce97511eadae799227fc06e1867'
+  '45e1c7042814eddf5a9aa747636b2e7639838cac1514400f98f809693426b724b70661568712f31fa5b19abdb530079ed617e5671d6dd11025288d7ae225a7f0'
   'c13f8d8dbbf28e4edbe0c82822d5651f56ed2a683b2e9d12b541657e5b0ba002b6a4b60eb9a6067ac28295ef529f65a2a728e0d5974d87dc7fe76d1d5b946fc0'
   '62e2d60fdd39243e6245d90a0940b67ac4e72d042d8146203d50cdaa2df51611d91831d3b152d42302490afd677ae3433a3eba975dee68dbf7c06728167bb6d4'
   #'5d96a288ae925584cdcde0305c511b18e3cfaed6cae49f5fc6f062f62100d10a087144e8263380d19a14dca71c745065ddaa0062542c2e2cfa1db04811d40dc7'
@@ -94,7 +96,7 @@ sha512sums=(
 )
 
 b2sums=(
-  '275cda60223ca33d00c7218ca360ae8ba34a6825aa46dd25c32f04f7cfc5caa8766d771f8da5e6f2071dc8f689917a3efc39b3e64bdaeb2a937df9766e764fc7'
+  '8534e0f03a01054017de53015feca1c704e22092df4f85089732181800a417e2cf3ea6f40de7128f34441e3876ca253bd03d8a6eb34092461d150b9ba46b7986'
   'cbfde6e66551722222ef3aaa38f9be9d3b256be23308e6aaf8f8bcbe7c79b67d7b91ff7a06cf5807182dbbfb9cda89130f9945cc5e1d9576580fed3a879f3e5b'
   '1e6c8d39052bdc268c584488341e260a2695d4b9afabca41919710bb34833dd580ff1813c01b8ba91f2629273c8101ce0ed3b2749dabce054137b4ef37b2a548'
   #'051b7c350333ce57a4a5e57ba0f693aed4491a241fd9e65cf2a861773571b44b8d4ffa06506a0c4a05399a46108ec05321e69f210637f32e25c76e683b224505'
@@ -110,7 +112,7 @@ b2sums=(
 )
 
 b3sums=(
-  'b8e7a8b0409f8e63e3c6c6f77751cac0296f3a41bf07a075f1a1b2e599c5af67'
+  '90302f11f395383d9950b9639e4cfdcdd31fdcfdd6d552ae2cc76315df875f1e'
   '0c09e8a6b87c79b8d9669f0bbe7469e86a7543fc149c986d21d68347e14eb670'
   'db9e75e396c8f45aacb0e14003aabdcf29b812e468a5a40b371957ffe9c7f52f'
   #'145f9d17920d7b3b1ef935e3a735171ac9783cbd94ee47eec86f3fb96a6a34c6'
@@ -126,7 +128,7 @@ b3sums=(
 )
 
 prepare() {
-  cd "${srcdir}/openssh-portable-hpn-${_pkgver}/"
+  cd "${srcdir}/openssh-portable-${git_rev}/"
 
   # fix building if scp is not installed on host
   if [ ! -x /usr/bin/scp ]; then
@@ -149,7 +151,7 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/openssh-portable-hpn-${_pkgver}/"
+  cd "${srcdir}/openssh-portable-${git_rev}/"
 
   autoreconf -fi
   ./configure \
@@ -174,7 +176,7 @@ build() {
 }
 
 #check() {
-#  cd "${srcdir}/openssh-portable-hpn-${_pkgver}/"
+#  cd "${srcdir}/openssh-portable-${git_rev}/"
 #
 #  # Tests require openssh to be already installed system-wide,
 #  # also connectivity tests will fail under makechrootpkg since
@@ -192,7 +194,7 @@ package_openssh-hpn() {
     'etc/hpnssh/sshd_config'
     'etc/pam.d/hpnsshd'
   )
-  cd "${srcdir}/openssh-portable-hpn-${_pkgver}/"
+  cd "${srcdir}/openssh-portable-${git_rev}/"
 
   make DESTDIR="${pkgdir}" install
 
@@ -226,7 +228,7 @@ package_openssh-hpn-shim(){
     'etc/pam.d/sshd'
   )
 
-  cd "${srcdir}/openssh-portable-hpn-${_pkgver}/"
+  cd "${srcdir}/openssh-portable-${git_rev}/"
 
   install -dm0755 "${pkgdir}/usr/bin" "${pkgdir}/usr/share/man/man1"
   for i in scp sftp ssh ssh-add ssh-agent ssh-copy-id ssh-keygen ssh-keyscan; do
diff --git a/hpn-revert-default-port-2222.patch b/hpn-revert-default-port-2222.patch
new file mode 100644
index 000000000000..69a5f7baa1fd
--- /dev/null
+++ b/hpn-revert-default-port-2222.patch
@@ -0,0 +1,192 @@
+From 04c6e9a9ab483f770d7d591ff8d40fb8cf2ee5ac Mon Sep 17 00:00:00 2001
+From: zer0def <zer0def@zer0def.0>
+Date: Fri, 30 Sep 2022 07:38:41 +0200
+Subject: [PATCH] Revert default port change commits
+
+"as per MWD's suggestion I've added the ability": ca10ab6e0d9c606efdd49de6ea7275dc0304fb85.
+"Changed default port of clients to 2222 as opposed to 22.": dd59488357d1e734331a8d18d684457a6201fd10.
+
+This reverts commits:
+- ca10ab6e0d9c606efdd49de6ea7275dc0304fb85
+- dd59488357d1e734331a8d18d684457a6201fd10
+---
+ HPN-README | 10 ----------
+ readconf.c | 22 +++-------------------
+ readconf.h |  6 ++----
+ ssh.c      | 32 +++-----------------------------
+ ssh.h      |  1 -
+ 5 files changed, 8 insertions(+), 63 deletions(-)
+
+diff --git a/HPN-README b/HPN-README
+index a54e9d9b729..45b2c008194 100644
+--- a/HPN-README
++++ b/HPN-README
+@@ -1,15 +1,5 @@
+ Notes:
+ 
+-Automatic Port Fallback (in version 17v3)
+-The hpnssh client now uses TCP port 2222 to connect automatically as this is the
+-default hpnsshd port. However, we understand that many users will be end up connecting
+-standard SSH servers on port 22. To make the easier for users the client will fall back to
+-port 22 in the event that there is no hpnssh server running on port 2222. The behaviour can
+-be modifed as follows:
+--oFallback=[yes|no] will enable or disable port fallback. Default is yes.
+--oFallbackPort=[N] where N is the port number that should be used for fall back.
+-    Default is 22.
+-
+ TCP_INFO Metrics
+ This features allows the client to request tcp networking information from the
+ TCP_INFO struct. This includes data on retransmits, round trip time, lost packets,
+diff --git a/readconf.c b/readconf.c
+index ef16765c5ec..d128128ddcd 100644
+--- a/readconf.c
++++ b/readconf.c
+@@ -170,7 +170,7 @@ typedef enum {
+ 	oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize,
+ 	oNoneEnabled, oNoneMacEnabled, oNoneSwitch,
+ 	oDisableMTAES, oHPNBufferLimit,
+-	oMetrics, oMetricsPath, oMetricsInterval, oFallback, oFallbackPort,
++	oMetrics, oMetricsPath, oMetricsInterval,
+ 	oVisualHostKey,
+ 	oKexAlgorithms, oIPQoS, oRequestTTY, oSessionType, oStdinNull,
+ 	oForkAfterAuthentication, oIgnoreUnknown, oProxyUseFdpass,
+@@ -311,8 +311,6 @@ static struct {
+ 	{ "metrics", oMetrics },
+ 	{ "metricspath", oMetricsPath },
+ 	{ "metricsinterval", oMetricsInterval },
+-	{ "fallback", oFallback },
+-	{ "fallbackport", oFallbackPort },
+ 	{ "sessiontype", oSessionType },
+ 	{ "stdinnull", oStdinNull },
+ 	{ "forkafterauthentication", oForkAfterAuthentication },
+@@ -530,7 +528,7 @@ default_ssh_port(void)
+ 
+ 	if (port == 0) {
+ 		sp = getservbyname(SSH_SERVICE_NAME, "tcp");
+-		port = sp ? ntohs(sp->s_port) : HPNSSH_DEFAULT_PORT;
++		port = sp ? ntohs(sp->s_port) : SSH_DEFAULT_PORT;
+ 	}
+ 	return port;
+ }
+@@ -1194,15 +1192,7 @@ process_config_line_depth(Options *options, struct passwd *pw, const char *host,
+ 		options->metrics = 1;
+ 		goto parse_string;
+ 
+-	case oFallback:
+-		intptr = &options->fallback;
+-		goto parse_flag;
+-
+-	case oFallbackPort:
+-		intptr = &options->fallback_port;
+-		goto parse_int;
+-
+-	/*
++	 /*
+ 	 * We check to see if the command comes from the command
+ 	 * line or not. If it does then enable it otherwise fail.
+ 	 *  NONE should never be a default configuration.
+@@ -2519,8 +2509,6 @@ initialize_options(Options * options)
+ 	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;
+@@ -2733,10 +2721,6 @@ fill_default_options(Options * options)
+ 		options->metrics_interval = 5;
+ 	if (options->control_master == -1)
+ 		options->control_master = 0;
+-	if (options->fallback == -1)
+-		options->fallback = 1;
+-	if (options->fallback_port == -1)
+-		options->fallback_port = SSH_DEFAULT_PORT;
+ 	if (options->control_persist == -1) {
+ 		options->control_persist = 0;
+ 		options->control_persist_timeout = 0;
+diff --git a/readconf.h b/readconf.h
+index 85a1e62e03f..af31c8f2b1f 100644
+--- a/readconf.h
++++ b/readconf.h
+@@ -125,14 +125,12 @@ typedef struct {
+ 	int64_t rekey_limit;
+ 	int     none_switch;    /* Use none cipher */
+ 	int     none_enabled;   /* Allow none to be used */
+-	int     nonemac_enabled;   /* Allow none to be used */
++	int     nonemac_enabled;   /* Allow none to be used */	
+ 	int     disable_multithreaded; /*disable multithreaded aes-ctr*/
+         int     metrics; /* enable metrics */
+         int     metrics_interval; /* time in seconds between polls */
+         char   *metrics_path; /* path for the metrics files */
+-	int     fallback; /* en|disable fallback port (def: true) */
+-	int     fallback_port; /* port to fallback to (def: 22) */
+-	int	rekey_interval;
++        int	rekey_interval;
+ 
+ 	int	no_host_authentication_for_localhost;
+ 	int	identities_only;
+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)
+ 		timeout_ms = options.connection_timeout * 1000;
+ 
+ 	/* Open a connection to the remote host. */
+-	/* we try initially on the default hpnssh port returned by
+-	 * default_ssh_port() which now returns HPNSSH_DEFAULT_PORT
+-	 * if that fails we reset the port to SSH_DEFAULT_PORT
+-	 * -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) {
+-		/* 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) {
+-			int port = options.fallback_port;
+-			options.port = port;
+-			fprintf(stderr, "HPNSSH server not available on default port %d\n",
+-				default_ssh_port());
+-			if (port == 22)
+-				fprintf(stderr, "Falling back to OpenSSH default port %d\n",
+-					port);
+-			else
+-				fprintf(stderr, "Falling back to user defined port %d\n",
+-					port);
+-			addrs = resolve_host(host, port, 1,
+-					     cname, sizeof(cname));
+-			goto tryagain;
+-		} else {
+-			exit(255);
+-		}
++	    options.connection_attempts,
++	    &timeout_ms, options.tcp_keep_alive) != 0)
+ 		exit(255);
+-	}
+ 
+ 	if (addrs != NULL)
+ 		freeaddrinfo(addrs);
+@@ -2201,7 +2175,7 @@ ssh_session2_open(struct ssh *ssh)
+ 	if (options.hpn_buffer_limit)
+ 		c->hpn_buffer_limit = 1;
+ 
+-
++		
+ 	debug3_f("channel_new: %d", c->self);
+ 
+ 	channel_send_open(ssh, c->self);
+diff --git a/ssh.h b/ssh.h
+index c639115452c..8aa1633a6c3 100644
+--- a/ssh.h
++++ b/ssh.h
+@@ -17,7 +17,6 @@
+ 
+ /* Default port number. */
+ #define SSH_DEFAULT_PORT	22
+-#define HPNSSH_DEFAULT_PORT    2222
+ 
+ /*
+  * Maximum number of certificate files that can be specified