diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-07-16 10:16:48 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-07-16 10:16:48 +0000 |
| commit | 301d9f5bc0fbea976c584231706864eb3ef6af08 (patch) | |
| tree | 4f23a6148e32129c7686763fa6db82076b56b93f | |
| parent | b1ff465dd8f928900b35d1f0b06abb56879f48d2 (diff) | |
| download | packages-301d9f5bc0fbea976c584231706864eb3ef6af08.tar.gz packages-301d9f5bc0fbea976c584231706864eb3ef6af08.tar.bz2 packages-301d9f5bc0fbea976c584231706864eb3ef6af08.tar.xz packages-301d9f5bc0fbea976c584231706864eb3ef6af08.zip | |
system/openssh: ensure the -server subpkg is always functional
At least scp(1) requires the client stuff to be present on the server.
| -rw-r--r-- | system/openssh/APKBUILD | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/system/openssh/APKBUILD b/system/openssh/APKBUILD index 1239de8b8..38d947585 100644 --- a/system/openssh/APKBUILD +++ b/system/openssh/APKBUILD @@ -4,7 +4,7 @@ pkgname=openssh pkgver=7.9_p1 _myver=${pkgver%_*}${pkgver#*_} -pkgrel=3 +pkgrel=4 pkgdesc="Port of OpenBSD's free SSH release" url="https://www.openssh.com/portable.html" arch="all" @@ -54,7 +54,6 @@ source="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.ta builddir="$srcdir"/$pkgname-$_myver build() { - cd "$builddir" export LD="$CC" LIBS="-lutmps -lskarnet" ./configure --build=$CBUILD \ --host=$CHOST \ @@ -78,7 +77,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install mkdir -p "$pkgdir"/var/empty install -D -m755 "$srcdir"/sshd.initd \ @@ -91,7 +89,7 @@ package() { keygen() { pkgdesc="Helper program for generating SSH keys" - depends= + depends="" install -d "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/ssh-keygen \ "$subpkgdir"/usr/bin/ @@ -136,7 +134,7 @@ sftp() { server() { pkgdesc="OpenSSH server" - depends="openssh-keygen" + depends="openssh-client openssh-keygen" replaces="openssh-server-common" cd "$builddir" install -d "$subpkgdir"/usr/sbin |