diff options
| author | Johannes Löthberg <johannes@kyriasis.com> | 2014-08-07 23:40:25 +0100 |
|---|---|---|
| committer | Johannes Löthberg <johannes@kyriasis.com> | 2015-06-01 16:03:41 +0200 |
| commit | d59a1cc68f4291da41693d7952b86e45c8e4cd69 (patch) | |
| tree | 94ab7e56cf83feaf1a6e6530e0e429eef9dcee4b | |
| parent | 415d616004de7a6d999a38d93bbbc5a34b460751 (diff) | |
| download | pkgbuilds-d59a1cc68f4291da41693d7952b86e45c8e4cd69.tar.xz | |
openssh-princ-fp: remove conflicts, fix source
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 11 |
2 files changed, 8 insertions, 10 deletions
@@ -1,5 +1,5 @@ # Generated by makepkg 4.2.1 -# Mon Jun 1 14:54:07 UTC 2015 +# Mon Jun 1 14:54:08 UTC 2015 pkgbase = openssh-princ-fp pkgdesc = Free version of the SSH connectivity tools pkgver = 6.6p1 @@ -17,12 +17,11 @@ pkgbase = openssh-princ-fp optdepends = xorg-xauth: X11 forwarding optdepends = x11-ssh-askpass: input passphrase in X conflicts = openssh - replaces = openssh backup = etc/ssh/ssh_config backup = etc/ssh/sshd_config backup = etc/pam.d/sshd - source = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-princ-fp-6.6p1.tar.gz - source = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-princ-fp-6.6p1.tar.gz.asc + source = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-6.6p1.tar.gz + source = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-6.6p1.tar.gz.asc source = GSS_AUTH_KRB5_PRINC-env4openssh.diff source = pubkey_fingerprint.patch source = curve25519pad.patch @@ -13,13 +13,12 @@ optdepends=('xorg-xauth: X11 forwarding' makedepends=('linux-headers') conflicts=('openssh') -replaces=('openssh') backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd') install=install -source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc} +source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${pkgver}.tar.gz"{,.asc} 'GSS_AUTH_KRB5_PRINC-env4openssh.diff' 'pubkey_fingerprint.patch' 'curve25519pad.patch' @@ -39,14 +38,14 @@ sha1sums=('b850fd1af704942d9b3c2eff7ef6b3a59b6a6b6e' 'SKIP' 'd93dca5ebda4610ff7647187f8928a3de28703f3') prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd openssh-$pkgver patch -p0 -i ../GSS_AUTH_KRB5_PRINC-env4openssh.diff patch -p0 -i ../pubkey_fingerprint.patch patch -p0 -i ../curve25519pad.patch } build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd openssh-$pkgver ./configure \ --prefix=/usr \ @@ -68,7 +67,7 @@ build() { } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd openssh-$pkgver make tests || true # hard to suitably test connectivity: @@ -77,7 +76,7 @@ check() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd openssh-$pkgver make DESTDIR="${pkgdir}" install |