8.1p1.hpn14v20

3 files changed, 16 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a6b368f10fca..011fdf62fa45 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 = 8.0p1.hpn14v18
-	pkgrel = 3
+	pkgver = 8.1p1.hpn14v20
+	pkgrel = 1
 	url = https://www.psc.edu/index.php/hpn-ssh/
 	install = openssh-hpn.install
 	arch = i686
@@ -24,18 +24,16 @@ pkgbase = openssh-hpn
 	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_0_P1_new.tar.gz
+	source = https://github.com/rapier1/openssh-portable/archive/hpn-8_1_P1.tar.gz
 	source = http://www.eworm.de/download/linux/openssh-tests-scp.patch
-	source = openssl11.patch
-	source = hpn14v18-banner.patch
+	source = hpn-banner.patch
 	source = sshdgenkeys.service
 	source = sshd@.service
 	source = sshd.service
 	source = sshd.socket
 	source = sshd.pam
-	sha256sums = 3648a3f3497814478104fdece2ce667887d66d99b1f246c55c5741ee524610f1
+	sha256sums = e159af51f51e6f78634b9fea0b8a4fe2c9e4f98609a07e1fe815e710f104c779
 	sha256sums = 007a8888855570296c36716df18e986b7265c283e8fc8f6dfd4b3c411905fdb3
-	sha256sums = 6c6deb799fc918b4d90899d664a23b3a99e2973d61b5a2cf68e1ea9a6604ca9a
 	sha256sums = 57bb8c4800afc5314ad1f3ac24bc838f1f63c626171d3c5ad4b843bfef2391fe
 	sha256sums = ff3cbdd0e59ff7dac4dc797d5c0f2b1db4117ddbb49d52f1c4f1771961903878
 	sha256sums = 69cc2abaaae0aa8071b8eac338b2df725f60ce73381843179b74eaac78ba7f1d
diff --git a/PKGBUILD b/PKGBUILD
index 02d7c42e92a4..505b780d152b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -40,11 +40,12 @@
 # This package should probably follow chutzpah@gentoo's patches in the future
 
 pkgname=openssh-hpn
-_openssh_ver=8.0p1
-_hpn_ver=hpn14v18
-_pkgver="`sed -e 's/\./_/' -e 's/p/_P/' <<< ${_openssh_ver}`_new"
+_openssh_ver=8.1p1
+_hpn_ver=hpn14v20
+#_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}"
-pkgrel=3
+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')
@@ -60,8 +61,8 @@ 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'
-        'openssl11.patch'
-        'hpn14v18-banner.patch'
+        #'openssl11.patch'
+        'hpn-banner.patch'
         'sshdgenkeys.service'
         'sshd@.service'
         'sshd.service'
@@ -71,9 +72,9 @@ backup=('etc/ssh/ssh_config'
         'etc/ssh/sshd_config'
         'etc/pam.d/sshd')
 
-sha256sums=('3648a3f3497814478104fdece2ce667887d66d99b1f246c55c5741ee524610f1'
+sha256sums=('e159af51f51e6f78634b9fea0b8a4fe2c9e4f98609a07e1fe815e710f104c779'
             '007a8888855570296c36716df18e986b7265c283e8fc8f6dfd4b3c411905fdb3'
-            '6c6deb799fc918b4d90899d664a23b3a99e2973d61b5a2cf68e1ea9a6604ca9a'
+            #'6c6deb799fc918b4d90899d664a23b3a99e2973d61b5a2cf68e1ea9a6604ca9a'
             '57bb8c4800afc5314ad1f3ac24bc838f1f63c626171d3c5ad4b843bfef2391fe'
             'ff3cbdd0e59ff7dac4dc797d5c0f2b1db4117ddbb49d52f1c4f1771961903878'
             '69cc2abaaae0aa8071b8eac338b2df725f60ce73381843179b74eaac78ba7f1d'
@@ -91,8 +92,8 @@ build() {
     patch -Np1 < ${srcdir}/openssh-tests-scp.patch
   fi
   # https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=371794f20c7eb2b88cae2619b6fa3444452aafb4
-  patch -Np1 < ${srcdir}/openssl11.patch
-  patch -Np1 < ${srcdir}/hpn14v18-banner.patch
+  #patch -Np1 < ${srcdir}/openssl11.patch
+  patch -Np1 < ${srcdir}/hpn-banner.patch
   autoreconf -fi
 
   ./configure \
diff --git a/hpn14v18-banner.patch b/hpn-banner.patch
index 2dec50a1eceb..2dec50a1eceb 100644
--- a/hpn14v18-banner.patch
+++ b/hpn-banner.patch