diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-01-21 21:57:43 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-01-21 21:57:43 +0000 |
| commit | 122d005c9ce9e2bd73cc2190a2f4d998b2a19e65 (patch) | |
| tree | 7a3fb5dc1c44adf4ede32782dc5b7cbd60ff238d | |
| parent | b1588e4ff0077c319a347b2d278d2cc17e2554c8 (diff) | |
| download | packages-122d005c9ce9e2bd73cc2190a2f4d998b2a19e65.tar.gz packages-122d005c9ce9e2bd73cc2190a2f4d998b2a19e65.tar.bz2 packages-122d005c9ce9e2bd73cc2190a2f4d998b2a19e65.tar.xz packages-122d005c9ce9e2bd73cc2190a2f4d998b2a19e65.zip | |
system/openssh: split -openrc properly, don't split /etc/ssh from -server
| -rw-r--r-- | system/openssh/APKBUILD | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/system/openssh/APKBUILD b/system/openssh/APKBUILD index 4394eb5c2..015e59192 100644 --- a/system/openssh/APKBUILD +++ b/system/openssh/APKBUILD @@ -4,7 +4,7 @@ pkgname=openssh pkgver=7.9_p1 _myver=${pkgver%_*}${pkgver#*_} -pkgrel=0 +pkgrel=1 pkgdesc="Port of OpenBSD's free SSH release" url="http://www.openssh.org/portable.html" arch="all" @@ -20,8 +20,8 @@ subpackages="$pkgname-doc $pkgname-client $pkgname-keysign $pkgname-sftp-server:sftp - $pkgname-server-common:server_common:noarch $pkgname-server + $pkgname-openrc " source="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar.gz @@ -131,26 +131,21 @@ sftp() { "$subpkgdir"/usr/lib/ssh/ } -server_common() { - pkgdesc="OpenSSH server configuration files" - depends="" - for i in etc/ssh/sshd_config \ - etc/init.d/sshd \ - etc/conf.d/sshd; do - - install -d "$subpkgdir"/${i%/*} - mv "$pkgdir"/$i \ - "$subpkgdir"/${i%/*}/ - - done -} - server() { pkgdesc="OpenSSH server" - depends="openssh-keygen openssh-server-common" + depends="openssh-keygen" + replaces="openssh-server-common" cd "$builddir" install -d "$subpkgdir"/usr/sbin + install -d "$subpkgdir"/etc/ssh mv "$pkgdir"/usr/sbin/sshd "$subpkgdir"/usr/sbin/ + mv "$pkgdir"/etc/ssh/sshd_config "$subpkgdir"/etc/ssh/ +} + +openrc() { + default_openrc + depends="openssh-server" + install_if="openssh-server=$pkgver-r$pkgrel openrc" } sha512sums="0412c9c429c9287f0794023951469c8e6ec833cdb55821bfa0300dd90d0879ff60484f620cffd93372641ab69bf0b032c2d700ccc680950892725fb631b7708e openssh-7.9p1.tar.gz |