8.9p1.hpn17v0

6 files changed, 76 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4dee38219edd..ad62787ef532 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 = 8.8p1.hpn15v5
+	pkgver = 8.9p1.hpn17v0
 	pkgrel = 1
 	url = https://www.psc.edu/index.php/hpn-ssh/
 	install = openssh-hpn.install
@@ -21,13 +21,11 @@ pkgbase = openssh-hpn
 	optdepends = xorg-xauth: X11 forwarding
 	optdepends = x11-ssh-askpass: input passphrase in X
 	optdepends = libfido2: FIDO/U2F support
-	provides = openssh
-	conflicts = openssh
 	conflicts = openssh-hpn-git
 	backup = etc/ssh/ssh_config
 	backup = etc/ssh/sshd_config
 	backup = etc/pam.d/sshd
-	source = https://github.com/rapier1/openssh-portable/archive/hpn-8_8_P1.tar.gz
+	source = https://github.com/rapier1/openssh-portable/archive/hpn-8_9_P1.tar.gz
 	source = http://www.eworm.de/download/linux/openssh-tests-scp.patch
 	source = glibc-2.31.patch
 	source = sshdgenkeys.service
@@ -35,21 +33,21 @@ pkgbase = openssh-hpn
 	source = sshd.service
 	source = sshd.socket
 	source = sshd.pam
-	sha512sums = aac8c71ed3f02c7b5bf22d5aeb6ef3cfb5d6f1beb55ccb7b0722e0cfceae4ff78279942840d1d1c494c92b9f7edfa47c41b87c77f09e021a29df4aef76412782
+	sha512sums = 190e4261a76ce5b31f8cdc76bc149c3c240611410461dd400e41ca55f4be4d5675473f16edbd648eaeb6d373136b831d61a9ae9f59c4e38ef8ecde738fda7880
 	sha512sums = 62e2d60fdd39243e6245d90a0940b67ac4e72d042d8146203d50cdaa2df51611d91831d3b152d42302490afd677ae3433a3eba975dee68dbf7c06728167bb6d4
 	sha512sums = aeee097dbf46aa22f411d78a49b9db7b2451dd0351bb5f57c7b3159c7ddc29aa994cd43046c187033c474f8fb2952165536197139eb7c495db99f6697f41637d
-	sha512sums = d5866e37d3e0449f26c5783298c60c188648722d215dfdc3783d4ac09cf023bf95a8ac4b25d15aa6314b187ab3723b697d4ed8c0b7beb3d2d46956e985ce90bf
-	sha512sums = d63bfaa08225a4c467945b7b849747ce33f1c10e2e34ed4dbb8f02b31d392ba3a7f3c96377222ba25bfb9eec5beebfe9130358790bfd853c180c63015b4ec249
-	sha512sums = fbf8ba29eefef98a0596d255e7dab24790d828d466f06f209c63280d31a25950c88cc354296c0da9a5bd085384fa59f296809cad1ab8db6712d8158ac74da343
-	sha512sums = ea1d31d84ca30fffa60b6eb06d1f532c75ff5a8acec893479cbe0f3669c62e5da9ee81be8549bae75d63e4b6fe69a4ffe6dfd4e3008e731e320d6da4bc4beae9
+	sha512sums = f2f0d0f964a3e1a1ad2ab05d59c81c3dd330fa68970030f98c33bd14c5e635aa8f2b35d81ac79678d3dbd107471b5375d240a630ad70e419bf88d2df1df9c87e
+	sha512sums = 6d7b6ad90f09fd6ab395b485c30921696b617318e6f6d587a18438f292a2c4c33f6d6150b19393e89c4c5c582b9632aea8b7b6aa220af29c084f5e5bfeade611
+	sha512sums = 3abe76d3ed971f4ef69013732f5be4cdfb8de0a12705b5d7190907a543c6d044bf064ff637f4511e4d95fbab58066ede8d0cce996d1adb1c2ec917be980f228a
+	sha512sums = 6ebf291ada773fcc73661b2065ce75f95718bc9c562d14323faf6802a4d45e42f49689a4a1fc470530fa183d4973468d9a5b18acf90f7ada8b008f0f61038d14
 	sha512sums = 298e47a21c337101974fa5237b3110aa3c7638b5fa53bd07661413236c8ed3212b431abaeffd875af6c9a72b4f8e1c8512e1e1960cbfff15bfee62b32d305fc3
-	b2sums = adfdbba09c244b67007570958a15ac06fc5edd6d54a07d9efe60a58fac1e932341ca1c91f85b6a7f762a9f6a4ee4e98c306875b6ca7123003fcff5de9881b705
+	b2sums = 867fc8e0c7d8c4f24982910c0c207c5afe6e082df83dbcd3c0ec2c9b439050e2289c626f6e59ef6ab12c8f65522c7e24949d6abb611037e943013eaf7144c905
 	b2sums = 1e6c8d39052bdc268c584488341e260a2695d4b9afabca41919710bb34833dd580ff1813c01b8ba91f2629273c8101ce0ed3b2749dabce054137b4ef37b2a548
 	b2sums = a6ff4e82a92e7dba08f0e6c14ad1d280ad2dbc1d5ebdc7dc70eaa1b7963ddd5d5491fdf4c83cde1bec183b335ed20edaf101ac8bdb3c0f480adc72d41251723b
-	b2sums = be20c26e65fa602a14dcf1d325dbd83a230b1ca4afc7393d35ae9bd278667fb2f400dd6b34cf601199b7b0318c56248a62fb97153cc2663a64836fa05dc3144f
-	b2sums = 95089ed180537f516214b5ba1d6a6d50ecb30277ffa67abbd3f0f32f95469d187f8e77ae19536c06563b7ac0a930ed9427485c6e400a08be3c6180607c1400cb
-	b2sums = ffb96a24fe6179f939b0776496bf93ff666fae9144a36fe70b3a8acd69c053221385c5e3527132123285fb0aaeefc50148e806d53692b41acf0668ed5c7172f7
-	b2sums = 3d47ff65d0e69ec76e7390ab52c33a7ec39e403fc86dd9c0546b8a876ef69f44d60f4d833ac18c007b776a202eb33d08369165670857e718589c6f4f8a51a564
+	b2sums = aa3abf3e68dfb07785e0c2fa63264d2fab8b67946ffb4b93ce8fe044f57e7197c1d9bd4c322f22ac01dab10ff273f178b5eedf0bfd8ad46a7b6bb7dd1398e51a
+	b2sums = 0a4c47fa2e3e62edfeef4f7d1b94167f26d83ccadb94af6dc467785edd4e9a1c810b05e824abacb1088afc0fe3cc102ef14141fac1d9aac1497855cc8748cf9b
+	b2sums = 211234dd60995873e00952c29fcb77ee6f1e9519fda5abce0b1f3a26193f580ad0c948482fcc66769abf55e347f95a6e4ba2dde98257e6ddb97b6a18550aff5b
+	b2sums = 3935bed214408537fe436c6015377561d2429f467f32b6e391068b1a9ef06566de51fba06d4ece393d68d3ba9fdc13f39ecdbdcd543602d308bcb980fa568d51
 	b2sums = 557d015bca7008ce824111f235da67b7e0051a693aaab666e97b78e753ed7928b72274af03d7fde12033986b733d5f996faf2a4feb6ecf53f39accae31334930
 
 pkgname = openssh-hpn
diff --git a/PKGBUILD b/PKGBUILD
index 82118422c5e6..d1eebc308ecc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -40,8 +40,8 @@
 # This package should probably follow chutzpah@gentoo's patches in the future
 
 pkgname=openssh-hpn
-_openssh_ver=8.8p1
-_hpn_ver=hpn15v5
+_openssh_ver=8.9p1
+_hpn_ver=hpn17v0
 #_pkgver="`sed -e 's/\./_/' -e 's/p/_P/' <<< ${_openssh_ver}`_new"
 _pkgver="`sed -e 's/\./_/' -e 's/p/_P/' <<< ${_openssh_ver}`"
 pkgver="${_openssh_ver}.${_hpn_ver}"
@@ -55,8 +55,11 @@ makedepends=('git' 'libfido2')
 optdepends=('xorg-xauth: X11 forwarding'
             'x11-ssh-askpass: input passphrase in X'
             'libfido2: FIDO/U2F support')
-provides=('openssh')
-conflicts=('openssh' 'openssh-hpn-git')
+#provides=('openssh')
+conflicts=(
+  #'openssh'
+  'openssh-hpn-git'
+)
 source=(
   "https://github.com/rapier1/openssh-portable/archive/hpn-${_pkgver}.tar.gz"
   'http://www.eworm.de/download/linux/openssh-tests-scp.patch'
@@ -74,33 +77,47 @@ backup=('etc/ssh/ssh_config'
         'etc/pam.d/sshd')
 
 sha512sums=(
-  'aac8c71ed3f02c7b5bf22d5aeb6ef3cfb5d6f1beb55ccb7b0722e0cfceae4ff78279942840d1d1c494c92b9f7edfa47c41b87c77f09e021a29df4aef76412782'
+  '190e4261a76ce5b31f8cdc76bc149c3c240611410461dd400e41ca55f4be4d5675473f16edbd648eaeb6d373136b831d61a9ae9f59c4e38ef8ecde738fda7880'
   '62e2d60fdd39243e6245d90a0940b67ac4e72d042d8146203d50cdaa2df51611d91831d3b152d42302490afd677ae3433a3eba975dee68dbf7c06728167bb6d4'
   #'5d96a288ae925584cdcde0305c511b18e3cfaed6cae49f5fc6f062f62100d10a087144e8263380d19a14dca71c745065ddaa0062542c2e2cfa1db04811d40dc7'
   #'a9ee92fd135c47a27ac260ab40c057f0e35c118efcb281e98e235158ffd8599acede67dcce6da4c2589b2a0bd794c587af80d4ce4f85c1b9823cb9acfbbe9050'
   'aeee097dbf46aa22f411d78a49b9db7b2451dd0351bb5f57c7b3159c7ddc29aa994cd43046c187033c474f8fb2952165536197139eb7c495db99f6697f41637d'
   #'beaa201496c1c670f5fe1e99b88308fff16502ed5ac0d6dce3077be9ea44f6e30d5cd0946e5bf5f11c4b174f9afe372fa198c8ef278f5c5511aa2410d3441ec2'
-  'd5866e37d3e0449f26c5783298c60c188648722d215dfdc3783d4ac09cf023bf95a8ac4b25d15aa6314b187ab3723b697d4ed8c0b7beb3d2d46956e985ce90bf'
-  'd63bfaa08225a4c467945b7b849747ce33f1c10e2e34ed4dbb8f02b31d392ba3a7f3c96377222ba25bfb9eec5beebfe9130358790bfd853c180c63015b4ec249'
-  'fbf8ba29eefef98a0596d255e7dab24790d828d466f06f209c63280d31a25950c88cc354296c0da9a5bd085384fa59f296809cad1ab8db6712d8158ac74da343'
-  'ea1d31d84ca30fffa60b6eb06d1f532c75ff5a8acec893479cbe0f3669c62e5da9ee81be8549bae75d63e4b6fe69a4ffe6dfd4e3008e731e320d6da4bc4beae9'
+  'f2f0d0f964a3e1a1ad2ab05d59c81c3dd330fa68970030f98c33bd14c5e635aa8f2b35d81ac79678d3dbd107471b5375d240a630ad70e419bf88d2df1df9c87e'
+  '6d7b6ad90f09fd6ab395b485c30921696b617318e6f6d587a18438f292a2c4c33f6d6150b19393e89c4c5c582b9632aea8b7b6aa220af29c084f5e5bfeade611'
+  '3abe76d3ed971f4ef69013732f5be4cdfb8de0a12705b5d7190907a543c6d044bf064ff637f4511e4d95fbab58066ede8d0cce996d1adb1c2ec917be980f228a'
+  '6ebf291ada773fcc73661b2065ce75f95718bc9c562d14323faf6802a4d45e42f49689a4a1fc470530fa183d4973468d9a5b18acf90f7ada8b008f0f61038d14'
   '298e47a21c337101974fa5237b3110aa3c7638b5fa53bd07661413236c8ed3212b431abaeffd875af6c9a72b4f8e1c8512e1e1960cbfff15bfee62b32d305fc3'
 )
 
 b2sums=(
-  'adfdbba09c244b67007570958a15ac06fc5edd6d54a07d9efe60a58fac1e932341ca1c91f85b6a7f762a9f6a4ee4e98c306875b6ca7123003fcff5de9881b705'
+  '867fc8e0c7d8c4f24982910c0c207c5afe6e082df83dbcd3c0ec2c9b439050e2289c626f6e59ef6ab12c8f65522c7e24949d6abb611037e943013eaf7144c905'
   '1e6c8d39052bdc268c584488341e260a2695d4b9afabca41919710bb34833dd580ff1813c01b8ba91f2629273c8101ce0ed3b2749dabce054137b4ef37b2a548'
   #'051b7c350333ce57a4a5e57ba0f693aed4491a241fd9e65cf2a861773571b44b8d4ffa06506a0c4a05399a46108ec05321e69f210637f32e25c76e683b224505'
   #'b46019363a19e2a0c397d66b6f1dc24d1c1219372b7fd699d92a9c382b24b02437b37cb12b3bba7e3ca97cfe98170ad21fff5871daf2070bc3d175fe0b31680b'
   'a6ff4e82a92e7dba08f0e6c14ad1d280ad2dbc1d5ebdc7dc70eaa1b7963ddd5d5491fdf4c83cde1bec183b335ed20edaf101ac8bdb3c0f480adc72d41251723b'
   #'74fc72fe0f028e7b495b2a96df26ef9fd76648f2701bbfc2b271f5b55968b82951f1b7232435c2bdf9e92b74a69f0d8cf804c8ef1be7f9c226896cb17ba57166'
-  'be20c26e65fa602a14dcf1d325dbd83a230b1ca4afc7393d35ae9bd278667fb2f400dd6b34cf601199b7b0318c56248a62fb97153cc2663a64836fa05dc3144f'
-  '95089ed180537f516214b5ba1d6a6d50ecb30277ffa67abbd3f0f32f95469d187f8e77ae19536c06563b7ac0a930ed9427485c6e400a08be3c6180607c1400cb'
-  'ffb96a24fe6179f939b0776496bf93ff666fae9144a36fe70b3a8acd69c053221385c5e3527132123285fb0aaeefc50148e806d53692b41acf0668ed5c7172f7'
-  '3d47ff65d0e69ec76e7390ab52c33a7ec39e403fc86dd9c0546b8a876ef69f44d60f4d833ac18c007b776a202eb33d08369165670857e718589c6f4f8a51a564'
+  'aa3abf3e68dfb07785e0c2fa63264d2fab8b67946ffb4b93ce8fe044f57e7197c1d9bd4c322f22ac01dab10ff273f178b5eedf0bfd8ad46a7b6bb7dd1398e51a'
+  '0a4c47fa2e3e62edfeef4f7d1b94167f26d83ccadb94af6dc467785edd4e9a1c810b05e824abacb1088afc0fe3cc102ef14141fac1d9aac1497855cc8748cf9b'
+  '211234dd60995873e00952c29fcb77ee6f1e9519fda5abce0b1f3a26193f580ad0c948482fcc66769abf55e347f95a6e4ba2dde98257e6ddb97b6a18550aff5b'
+  '3935bed214408537fe436c6015377561d2429f467f32b6e391068b1a9ef06566de51fba06d4ece393d68d3ba9fdc13f39ecdbdcd543602d308bcb980fa568d51'
   '557d015bca7008ce824111f235da67b7e0051a693aaab666e97b78e753ed7928b72274af03d7fde12033986b733d5f996faf2a4feb6ecf53f39accae31334930'
 )
 
+b3sums=(
+  'b1062781708190c745913221a19e8b70b06884a7af980f20214c27d39517748a'
+  'db9e75e396c8f45aacb0e14003aabdcf29b812e468a5a40b371957ffe9c7f52f'
+  #'145f9d17920d7b3b1ef935e3a735171ac9783cbd94ee47eec86f3fb96a6a34c6'
+  #'86f8ba9e3469c86c2ced236240d9ba9a253d82b8b6732d8592db481d984de258'
+  'f76459d09d1cfd92acc212ae1d4fee73b31ab795ff605c8717b3ee0a6fa9dcf9'
+  #'bb4b93c1ffa13df6d5d5441646cd6acb49464d5512ee8f36a7bc0e6f5097edb4'
+  'adae3429d7e5491ce03d784c4b980c8e9830682708b70eccf4b06cf1e8cebbd2'
+  '9976a6c0ee11772d6d146fb5b1ab57f2df57a24158a0c87985a50d65deec52ed'
+  '7f766a97ab867f1f7c5c2fc2770c0d7c7831a6422dfbc89e47f69d4d786a233f'
+  '087e1f6c13658326117bef1b09693940d67322ea1635136fc6baeeff132cb1b1'
+  'f417610d7bdc942b79ee6fcc59c37e3d68ca09069a021e62a33fabe259dcc3af'
+)
+
 install=$pkgname.install
 
 build() {
@@ -125,8 +142,8 @@ build() {
   ./configure \
     --prefix=/usr \
     --sbindir=/usr/bin \
-    --libexecdir=/usr/lib/ssh \
-    --sysconfdir=/etc/ssh \
+    --libexecdir=/usr/lib/hpnssh \
+    --sysconfdir=/etc \
     --disable-strip \
     --with-ldns \
     --with-libedit \
@@ -148,23 +165,23 @@ package() {
 
   make DESTDIR="${pkgdir}" install
 
-  ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
+  #ln -sf hpnssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
   install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
 
-  install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service
-  install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/sshd@.service
-  install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service
-  install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket
-  install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
+  install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/hpnsshdgenkeys.service
+  install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/hpnsshd@.service
+  install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/hpnsshd.service
+  install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/hpnsshd.socket
+  install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/hpnsshd
 
-  install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh
-  install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
-  install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1
+  install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/hpnfindssl.sh
+  install -Dm755 contrib/hpnssh-copy-id "${pkgdir}"/usr/bin/hpnssh-copy-id
+  install -Dm644 contrib/hpnssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/hpnssh-copy-id.1
 
   sed \
     -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \
     -e '/^#PrintMotd yes$/c PrintMotd no # pam does that' \
     -e '/^#UsePAM no$/c UsePAM yes' \
-    -i "${pkgdir}"/etc/ssh/sshd_config
+    -i "${pkgdir}"/etc/hpnssh/sshd_config
 }
 
diff --git a/sshd.service b/sshd.service
index 55ed95322da7..0e531bb005d4 100644
--- a/sshd.service
+++ b/sshd.service
@@ -1,11 +1,11 @@
 [Unit]
-Description=OpenSSH Daemon
-Wants=sshdgenkeys.service
-After=sshdgenkeys.service
+Description=OpenSSH-HPN Daemon
+Wants=hpnsshdgenkeys.service
+After=hpnsshdgenkeys.service
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/sshd -D
+ExecStart=/usr/bin/hpnsshd -D
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=always
diff --git a/sshd.socket b/sshd.socket
index e09e328690fd..5fa2e343974c 100644
--- a/sshd.socket
+++ b/sshd.socket
@@ -1,6 +1,6 @@
 [Unit]
-Conflicts=sshd.service
-Wants=sshdgenkeys.service
+Conflicts=hpnsshd.service
+Wants=hpnsshdgenkeys.service
 
 [Socket]
 ListenStream=22
diff --git a/sshd@.service b/sshd@.service
index 7ce3d37baa43..ead31d9f41fd 100644
--- a/sshd@.service
+++ b/sshd@.service
@@ -1,8 +1,8 @@
 [Unit]
-Description=OpenSSH Per-Connection Daemon
-After=sshdgenkeys.service
+Description=OpenSSH-HPN Per-Connection Daemon
+After=hpnsshdgenkeys.service
 
 [Service]
-ExecStart=-/usr/bin/sshd -i
+ExecStart=-/usr/bin/hpnsshd -i
 StandardInput=socket
 StandardError=syslog
diff --git a/sshdgenkeys.service b/sshdgenkeys.service
index d1e154692c5d..c8c6ce3d2824 100644
--- a/sshdgenkeys.service
+++ b/sshdgenkeys.service
@@ -1,17 +1,17 @@
 [Unit]
-Description=SSH Key Generation
-ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key
-ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_key
-ConditionPathExists=|!/etc/ssh/ssh_host_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub
+Description=SSH-HPN Key Generation
+ConditionPathExists=|!/etc/hpnssh/ssh_host_dsa_key
+ConditionPathExists=|!/etc/hpnssh/ssh_host_dsa_key.pub
+ConditionPathExists=|!/etc/hpnssh/ssh_host_ecdsa_key
+ConditionPathExists=|!/etc/hpnssh/ssh_host_ecdsa_key.pub
+ConditionPathExists=|!/etc/hpnssh/ssh_host_ed25519_key
+ConditionPathExists=|!/etc/hpnssh/ssh_host_ed25519_key.pub
+ConditionPathExists=|!/etc/hpnssh/ssh_host_key
+ConditionPathExists=|!/etc/hpnssh/ssh_host_key.pub
+ConditionPathExists=|!/etc/hpnssh/ssh_host_rsa_key
+ConditionPathExists=|!/etc/hpnssh/ssh_host_rsa_key.pub
 
 [Service]
-ExecStart=/usr/bin/ssh-keygen -A
+ExecStart=/usr/bin/hpnssh-keygen -A
 Type=oneshot
 RemainAfterExit=yes