hpn-8_3_P1 tag update including double-define patch and addressing comment remarks

2 files changed, 32 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a5a6535ee4df..a3fbbc5421c6 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.3p1.hpn14v22
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.psc.edu/index.php/hpn-ssh/
 	install = openssh-hpn.install
 	arch = x86_64
@@ -32,21 +32,27 @@ pkgbase = openssh-hpn
 	source = https://github.com/rapier1/openssh-portable/archive/hpn-8_3_P1.tar.gz
 	source = http://www.eworm.de/download/linux/openssh-tests-scp.patch
 	source = glibc-2.31.patch
-	source = hpn14v22-globals-cleanup.patch
 	source = sshdgenkeys.service
 	source = sshd@.service
 	source = sshd.service
 	source = sshd.socket
 	source = sshd.pam
-	sha256sums = 6478c70d4c0cabaf51550b9d8bc8931553efcca3e7572adde5a2d8e3c5ec9912
+	sha256sums = 99eb35ef529859e082dfdf004d227ad3d080e305782b1864531e1f877bdcc98d
 	sha256sums = 007a8888855570296c36716df18e986b7265c283e8fc8f6dfd4b3c411905fdb3
 	sha256sums = 25b4a4d9e2d9d3289ef30636a30e85fa1c71dd930d5efd712cca1a01a5019f93
-	sha256sums = 9c5a150fa3d7c23699a3f37980603e220783fc12595fdf25db9ef7eb4e91ff96
 	sha256sums = ff3cbdd0e59ff7dac4dc797d5c0f2b1db4117ddbb49d52f1c4f1771961903878
 	sha256sums = 69cc2abaaae0aa8071b8eac338b2df725f60ce73381843179b74eaac78ba7f1d
 	sha256sums = c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa
 	sha256sums = de14363e9d4ed92848e524036d9e6b57b2d35cc77d377b7247c38111d2a3defd
 	sha256sums = 64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846
+	b2sums = 9ba0717bee12cd3b9d5eadbdce539b75bf0ab4fc48f7199e8d78815e5ac2e984181d883dd38a20f3cb7dc2b94726bf3510f5bee57f64c5e6f3c6f8a2a7151fc1
+	b2sums = 1e6c8d39052bdc268c584488341e260a2695d4b9afabca41919710bb34833dd580ff1813c01b8ba91f2629273c8101ce0ed3b2749dabce054137b4ef37b2a548
+	b2sums = a6ff4e82a92e7dba08f0e6c14ad1d280ad2dbc1d5ebdc7dc70eaa1b7963ddd5d5491fdf4c83cde1bec183b335ed20edaf101ac8bdb3c0f480adc72d41251723b
+	b2sums = be20c26e65fa602a14dcf1d325dbd83a230b1ca4afc7393d35ae9bd278667fb2f400dd6b34cf601199b7b0318c56248a62fb97153cc2663a64836fa05dc3144f
+	b2sums = 95089ed180537f516214b5ba1d6a6d50ecb30277ffa67abbd3f0f32f95469d187f8e77ae19536c06563b7ac0a930ed9427485c6e400a08be3c6180607c1400cb
+	b2sums = ffb96a24fe6179f939b0776496bf93ff666fae9144a36fe70b3a8acd69c053221385c5e3527132123285fb0aaeefc50148e806d53692b41acf0668ed5c7172f7
+	b2sums = 3d47ff65d0e69ec76e7390ab52c33a7ec39e403fc86dd9c0546b8a876ef69f44d60f4d833ac18c007b776a202eb33d08369165670857e718589c6f4f8a51a564
+	b2sums = 557d015bca7008ce824111f235da67b7e0051a693aaab666e97b78e753ed7928b72274af03d7fde12033986b733d5f996faf2a4feb6ecf53f39accae31334930
 
 pkgname = openssh-hpn
 
diff --git a/PKGBUILD b/PKGBUILD
index d07a92ee2ff4..578e383f8ff7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -45,7 +45,7 @@ _hpn_ver=hpn14v22
 #_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=1
+pkgrel=2
 pkgdesc='A Secure SHell server/client fork with High Performance patches included'
 url='https://www.psc.edu/index.php/hpn-ssh/'
 license=('custom:BSD')
@@ -66,7 +66,7 @@ source=(
   #'openssl11.patch'
   #'hpn-banner.patch'
   'glibc-2.31.patch'
-  'hpn14v22-globals-cleanup.patch'
+  #'hpn14v22-globals-cleanup.patch'
   'sshdgenkeys.service'
   'sshd@.service'
   'sshd.service'
@@ -77,12 +77,12 @@ backup=('etc/ssh/ssh_config'
         'etc/pam.d/sshd')
 
 sha256sums=(
-  '6478c70d4c0cabaf51550b9d8bc8931553efcca3e7572adde5a2d8e3c5ec9912'
+  '99eb35ef529859e082dfdf004d227ad3d080e305782b1864531e1f877bdcc98d'
   '007a8888855570296c36716df18e986b7265c283e8fc8f6dfd4b3c411905fdb3'
   #'6c6deb799fc918b4d90899d664a23b3a99e2973d61b5a2cf68e1ea9a6604ca9a'
   #'57bb8c4800afc5314ad1f3ac24bc838f1f63c626171d3c5ad4b843bfef2391fe'
   '25b4a4d9e2d9d3289ef30636a30e85fa1c71dd930d5efd712cca1a01a5019f93'
-  '9c5a150fa3d7c23699a3f37980603e220783fc12595fdf25db9ef7eb4e91ff96'
+  #'9c5a150fa3d7c23699a3f37980603e220783fc12595fdf25db9ef7eb4e91ff96'
   'ff3cbdd0e59ff7dac4dc797d5c0f2b1db4117ddbb49d52f1c4f1771961903878'
   '69cc2abaaae0aa8071b8eac338b2df725f60ce73381843179b74eaac78ba7f1d'
   'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa'
@@ -90,6 +90,20 @@ sha256sums=(
   '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846'
 )
 
+b2sums=(
+  '9ba0717bee12cd3b9d5eadbdce539b75bf0ab4fc48f7199e8d78815e5ac2e984181d883dd38a20f3cb7dc2b94726bf3510f5bee57f64c5e6f3c6f8a2a7151fc1'
+  '1e6c8d39052bdc268c584488341e260a2695d4b9afabca41919710bb34833dd580ff1813c01b8ba91f2629273c8101ce0ed3b2749dabce054137b4ef37b2a548'
+  #'051b7c350333ce57a4a5e57ba0f693aed4491a241fd9e65cf2a861773571b44b8d4ffa06506a0c4a05399a46108ec05321e69f210637f32e25c76e683b224505'
+  #'b46019363a19e2a0c397d66b6f1dc24d1c1219372b7fd699d92a9c382b24b02437b37cb12b3bba7e3ca97cfe98170ad21fff5871daf2070bc3d175fe0b31680b'
+  'a6ff4e82a92e7dba08f0e6c14ad1d280ad2dbc1d5ebdc7dc70eaa1b7963ddd5d5491fdf4c83cde1bec183b335ed20edaf101ac8bdb3c0f480adc72d41251723b'
+  #'74fc72fe0f028e7b495b2a96df26ef9fd76648f2701bbfc2b271f5b55968b82951f1b7232435c2bdf9e92b74a69f0d8cf804c8ef1be7f9c226896cb17ba57166'
+  'be20c26e65fa602a14dcf1d325dbd83a230b1ca4afc7393d35ae9bd278667fb2f400dd6b34cf601199b7b0318c56248a62fb97153cc2663a64836fa05dc3144f'
+  '95089ed180537f516214b5ba1d6a6d50ecb30277ffa67abbd3f0f32f95469d187f8e77ae19536c06563b7ac0a930ed9427485c6e400a08be3c6180607c1400cb'
+  'ffb96a24fe6179f939b0776496bf93ff666fae9144a36fe70b3a8acd69c053221385c5e3527132123285fb0aaeefc50148e806d53692b41acf0668ed5c7172f7'
+  '3d47ff65d0e69ec76e7390ab52c33a7ec39e403fc86dd9c0546b8a876ef69f44d60f4d833ac18c007b776a202eb33d08369165670857e718589c6f4f8a51a564'
+  '557d015bca7008ce824111f235da67b7e0051a693aaab666e97b78e753ed7928b72274af03d7fde12033986b733d5f996faf2a4feb6ecf53f39accae31334930'
+)
+
 install=$pkgname.install
 
 build() {
@@ -106,9 +120,11 @@ build() {
   #patch -Np1 < ${srcdir}/hpn-banner.patch
 
   patch -Np1 < ${srcdir}/glibc-2.31.patch
-  patch -Np1 < ${srcdir}/hpn14v22-globals-cleanup.patch
-  autoreconf -fi
 
+  # double define fixed upstream in 4afe5ad21dd5a9a01cda3007cdd0af5bbe6b608c for 8.3p1-hpn14v22 on 2020-09-24
+  #patch -Np1 < ${srcdir}/hpn14v22-globals-cleanup.patch
+
+  autoreconf -fi
   ./configure \
     --prefix=/usr \
     --sbindir=/usr/bin \