wip: 9.1p1.hpn17v7

1 files changed, 15 insertions, 13 deletions

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