From faaf829725a47f24ef605b3240d374e4c407e2f4 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 27 Aug 2014 08:51:44 +0000
Subject: main/openssh: move ssh-keysign to separate subpackage

This is a helper utility for host-based authentication, which is
disabled by default and normally not needed.

We move it to subpackage because it is suid root.

fixes #3311
---
 main/openssh/APKBUILD | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'main/openssh')

diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD
index a94a79cbcb..0a9a9ba3ea 100644
--- a/main/openssh/APKBUILD
+++ b/main/openssh/APKBUILD
@@ -2,14 +2,15 @@
 pkgname=openssh
 pkgver=6.6_p1
 _myver=${pkgver%_*}${pkgver#*_}
-pkgrel=3
+pkgrel=4
 pkgdesc="Port of OpenBSD's free SSH release"
 url="http://www.openssh.org/portable.html"
 arch="all"
 license="as-is"
+options="suid"
 depends="openssh-client"
 makedepends="openssl-dev zlib-dev"
-subpackages="$pkgname-doc $pkgname-client"
+subpackages="$pkgname-doc $pkgname-client $pkgname-keysign"
 source="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar.gz
 	openssh6.6-dynwindows.diff
 	openssh6.5-peaktput.diff
@@ -91,8 +92,6 @@ client() {
 
 	mv "$pkgdir"/usr/bin/* \
 		"$subpkgdir"/usr/bin/ || return 1
-	mv "$pkgdir"/usr/lib/ssh/ssh-keysign \
-		"$subpkgdir"/usr/lib/ssh/ || return 1
 	mv "$pkgdir"/etc/ssh/ssh_config \
 		"$pkgdir"/etc/ssh/moduli \
 		"$subpkgdir"/etc/ssh/ || return 1
@@ -102,6 +101,13 @@ client() {
 		"$subpkgdir"/usr/bin/ssh-copy-id || return 1
 }
 
+keysign() {
+	pkgdesc="ssh helper program for host-based authentication"
+	install -d "$subpkgdir"/usr/lib/ssh || return 1
+	mv "$pkgdir"/usr/lib/ssh/ssh-keysign \
+		"$subpkgdir"/usr/lib/ssh/ || return 1
+}
+
 md5sums="3e9800e6bca1fbac0eea4d41baa7f239  openssh-6.6p1.tar.gz
 776fca63396b534736d26f776d1dca7b  openssh6.6-dynwindows.diff
 cd52fe99cb4b7d0d847bf5d710d93564  openssh6.5-peaktput.diff
-- 
cgit v1.2.3