summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzer0def2022-05-13 20:18:30 +0200
committerzer0def2022-05-13 20:19:37 +0200
commit1337db30306e03f52d1ed9943ec67b0bcdfc5934 (patch)
tree5d233b5f6a805cc47468a902e383ce96f974c8c5
parent2e7f19046d0309022df6f3a47761fe92f885e75f (diff)
downloadaur-1337db30306e03f52d1ed9943ec67b0bcdfc5934.tar.gz
Configuration backup fixes
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD13
2 files changed, 8 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9d5b35bb475b..42bc32a5558d 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 = 3
+ pkgrel = 4
url = https://www.psc.edu/index.php/hpn-ssh/
install = openssh-hpn.install
arch = x86_64
@@ -22,6 +22,9 @@ pkgbase = openssh-hpn
optdepends = x11-ssh-askpass: input passphrase in X
optdepends = libfido2: FIDO/U2F support
conflicts = openssh-hpn-git
+ backup = etc/ssh/ssh_config
+ backup = etc/ssh/sshd_config
+ backup = etc/pam.d/sshd
backup = etc/hpnssh/ssh_config
backup = etc/hpnssh/sshd_config
backup = etc/pam.d/hpnsshd
@@ -60,9 +63,3 @@ pkgname = openssh-hpn-shim
provides = openssh
conflicts = openssh
conflicts = openssh-hpn-git
- backup = etc/ssh/ssh_config
- backup = etc/ssh/sshd_config
- backup = etc/pam.d/sshd
- backup = etc/hpnssh/ssh_config
- backup = etc/hpnssh/sshd_config
- backup = etc/pam.d/hpnsshd
diff --git a/PKGBUILD b/PKGBUILD
index 72fc1ca0fb14..31a1c3de68e3 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=3
+pkgrel=4
pkgdesc='A Secure SHell server/client fork with High Performance patches included'
url='https://www.psc.edu/index.php/hpn-ssh/'
license=('custom:BSD')
@@ -76,6 +76,9 @@ source=(
'sshd.conf'
)
backup=(
+ 'etc/ssh/ssh_config'
+ 'etc/ssh/sshd_config'
+ 'etc/pam.d/sshd'
'etc/hpnssh/ssh_config'
'etc/hpnssh/sshd_config'
'etc/pam.d/hpnsshd'
@@ -215,14 +218,6 @@ package_openssh-hpn-shim(){
depends=('openssh-hpn')
provides=('openssh')
conflicts=('openssh' 'openssh-hpn-git')
- backup=(
- 'etc/ssh/ssh_config'
- 'etc/ssh/sshd_config'
- 'etc/pam.d/sshd'
- 'etc/hpnssh/ssh_config'
- 'etc/hpnssh/sshd_config'
- 'etc/pam.d/hpnsshd'
- )
cd "${srcdir}/openssh-portable-hpn-${_pkgver}/"