summaryrefslogtreecommitdiff
path: root/pcr/openssh-knock/PKGBUILD
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2017-04-11 23:30:25 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2017-04-11 23:48:52 -0300
commit1bee863cc1464440bf111aa6d1baea4554895b94 (patch)
tree76285b30cb550e7e649cb26ab6c355f31068c8fa /pcr/openssh-knock/PKGBUILD
parent07d5048f6612db145f8d4d38a36aab1f5f2b0d30 (diff)
downloadabslibre-1bee863cc1464440bf111aa6d1baea4554895b94.tar.gz
abslibre-1bee863cc1464440bf111aa6d1baea4554895b94.tar.bz2
abslibre-1bee863cc1464440bf111aa6d1baea4554895b94.zip
openssh-knock-7.5p1-2: updating version
Diffstat (limited to 'pcr/openssh-knock/PKGBUILD')
-rw-r--r--pcr/openssh-knock/PKGBUILD46
1 files changed, 29 insertions, 17 deletions
diff --git a/pcr/openssh-knock/PKGBUILD b/pcr/openssh-knock/PKGBUILD
index 0873e5237..7da46bc2b 100644
--- a/pcr/openssh-knock/PKGBUILD
+++ b/pcr/openssh-knock/PKGBUILD
@@ -1,17 +1,19 @@
-# $Id: PKGBUILD 285009 2017-01-01 08:40:34Z bisson $
+# $Id: PKGBUILD 291134 2017-03-20 21:48:15Z bisson $
# Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org>
# Contributor (Arch): Aaron Griffin <aaron@archlinux.org>
# Contributor (Arch): judd <jvinet@zeroflux.org>
# Maintainer: André Silva <emulatorman@parabola.nu>
# Contributor: Márcio Silva <coadde@parabola.nu>
+# Contributor: Julian Kirsch <kirschju@sec.in.tum.de>
+# Contributor: Benoît <benoit@neviani.fr>
_pkgname=openssh
pkgname=openssh-knock
-pkgver=7.4p1
-_knockpatchver=7.4p1
+pkgver=7.5p1
+_knockpatchver=7.5p1
pkgrel=2
pkgdesc='Free version of the SSH connectivity tools, with support for stealth TCP sockets'
-url='http://www.openssh.org/portable.html'
+url='https://www.openssh.com/portable.html'
license=('custom:BSD')
arch=('i686' 'x86_64' 'armv7h')
conflicts=(${_pkgname})
@@ -22,29 +24,36 @@ optdepends=('xorg-xauth: X11 forwarding'
'x11-ssh-askpass: input passphrase in X')
validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30'
'C92BAA713B8D53D3CAE63FC9E6974752F9704456')
-source=("http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${_pkgname}-${pkgver}.tar.gz"{,.asc}
+source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${_pkgname}-${pkgver}.tar.gz"{,.asc}
#"http://gnunet.org/sites/default/files/${_pkgname}-linux-knock-patch_0.diff"
"https://repo.parabola.nu/other/knock/patches/openssh/${_pkgname}-${_knockpatchver}-linux-knock-patch.diff"{,.sig}
+ 'openssl-1.1.0.patch'
'sshdgenkeys.service'
'sshd@.service'
'sshd.service'
'sshd.socket'
'sshd.conf'
'sshd.pam')
-sha1sums=('2330bbf82ed08cf3ac70e0acf00186ef3eeb97e0' 'SKIP'
- '308b74f10fbf435cdfe5d5b1528685b05eca5953' 'SKIP'
- 'caaa801da59a5d14c0c29c43e9de5fef281ea03e'
- '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
- 'ec49c6beba923e201505f5669cea48cad29014db'
- 'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
- 'c9b2e4ce259cd62ddb00364d3ee6f00a8bf2d05f'
- 'd93dca5ebda4610ff7647187f8928a3de28703f3')
+sha256sums=('9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0'
+ 'SKIP'
+ '3d74bb413309e2254620628073bb23a918a8f3189705fbfd68feaa7cf3b212b8'
+ 'SKIP'
+ 'b895b5f8e9f7d3a60286bf0a5b313d0b2ae2891ee1358e4862f1a0f1ad0ddc7d'
+ '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
+ '69cc2abaaae0aa8071b8eac338b2df725f60ce73381843179b74eaac78ba7f1d'
+ 'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa'
+ 'de14363e9d4ed92848e524036d9e6b57b2d35cc77d377b7247c38111d2a3defd'
+ '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
+ '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846')
backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
prepare() {
cd "${srcdir}/${_pkgname}-${pkgver}"
- patch -p1 -i "${srcdir}"/${_pkgname}-${_knockpatchver}-linux-knock-patch.diff
+ patch -Np1 -i ../${_pkgname}-${_knockpatchver}-linux-knock-patch.diff
+
+ # OpenSSL 1.1.0 patch from http://vega.pgw.jp/~kabe/vsd/patch/openssh-7.4p1-openssl-1.1.0c.patch.html
+ patch -Np1 -i ../openssl-1.1.0.patch
}
build() {
@@ -73,10 +82,13 @@ build() {
check() {
cd "${srcdir}/${_pkgname}-${pkgver}"
-# make tests
+ # Tests require openssh to be already installed system-wide,
+ # also connectivity tests will fail under makechrootpkg since
+ # it runs as nobody which has /bin/false as login shell.
- # Connectivity tests will fail with makechrootpkg since
- # it runs as nobody which has /bin/false as login shell.
+ if [[ -e /usr/bin/scp && ! -e /.arch-chroot ]]; then
+ make tests
+ fi
}
package() {