summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzer0def2022-05-14 11:49:07 +0200
committerzer0def2022-05-14 11:49:07 +0200
commitb8c61297184156a734eebd51237b0700e88dca2a (patch)
tree6a5a98f85e2432409c7324a3ade3bfc2308fe63a
parent8f8ca45258a3d5decd8892f8b0799839c003ba31 (diff)
downloadaur-b8c61297184156a734eebd51237b0700e88dca2a.tar.gz
Fix SSH helper linkage in sshd shim
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD9
2 files changed, 8 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 03b20629ec83..0c2977331b44 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.9p1.hpn17v0
- pkgrel = 5
+ pkgrel = 6
url = https://www.psc.edu/index.php/hpn-ssh/
install = openssh-hpn.install
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 12f9325bb081..010ca5a82060 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -49,7 +49,7 @@ _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}"
-pkgrel=5
+pkgrel=6
pkgdesc='A Secure SHell server/client fork with High Performance patches included'
url='https://www.psc.edu/index.php/hpn-ssh/'
license=('custom:BSD')
@@ -221,10 +221,15 @@ package_openssh-hpn-shim(){
cd "${srcdir}/openssh-portable-hpn-${_pkgver}/"
- install -dm0755 "${pkgdir}/usr/bin"; pushd "${pkgdir}/usr/bin"
+ install -dm0755 "${pkgdir}/usr/bin" "${pkgdir}/usr/lib/ssh";
+ pushd "${pkgdir}/usr/bin"
for i in findssl.sh scp sftp ssh ssh-add ssh-agent ssh-copy-id ssh-keygen ssh-keyscan sshd; do
ln -s "hpn${i}" "${i}"
done; popd
+ pushd "${pkgdir}/usr/lib/ssh"
+ for i in sftp-server ssh-keysign ssh-pkcs11-helper ssh-sk-helper; do
+ ln -s "../hpnssh/hpn${i}" "${i}"
+ done; popd
install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service
install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service