From 4fec08f9b090ffb4185dedabd93f3bfa4347a85c Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Mon, 7 Jan 2013 15:22:41 +0100
Subject: [PATCH] main/openssh: add contrib scripts
---
main/openssh/APKBUILD | 32 +++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD
index ca48771889a5..d74cde643a03 100644
--- a/main/openssh/APKBUILD
+++ b/main/openssh/APKBUILD
@@ -2,7 +2,7 @@
pkgname=openssh
pkgver=6.1_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"
@@ -38,8 +38,7 @@ prepare() {
}
-build ()
-{
+build () {
cd "$_builddir"
./configure --prefix=/usr \
--with-mantype=man \
@@ -57,15 +56,19 @@ build ()
--without-tcp-wrappers \
--without-pam \
|| return 1
- make
+ make || return 1
}
package() {
cd "$_builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install || return 1
mkdir -p "$pkgdir"/var/empty
- install -D -m755 "$srcdir"/sshd.initd "$pkgdir"/etc/init.d/sshd
- install -D -m644 "$srcdir"/sshd.confd "$pkgdir"/etc/conf.d/sshd
+ install -D -m755 "$srcdir"/sshd.initd \
+ "$pkgdir"/etc/init.d/sshd || return 1
+ install -D -m644 "$srcdir"/sshd.confd \
+ "$pkgdir"/etc/conf.d/sshd || return 1
+ install -Dm644 "$_builddir"/contrib/ssh-copy-id.1 \
+ "$pkgdir"/usr/share/man/man1/ssh-copy-id.1 || return 1
}
client() {
@@ -78,10 +81,17 @@ client() {
"$subpkgdir"/var/run \
"$subpkgdir"/var/empty
- mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/
- mv "$pkgdir"/usr/lib/ssh/ssh-keysign "$subpkgdir"/usr/lib/ssh/
- mv "$pkgdir"/etc/ssh/ssh_config "$pkgdir"/etc/ssh/moduli \
- "$subpkgdir"/etc/ssh/
+ 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
+ install -Dm755 "$_builddir"/contrib/findssl.sh \
+ "$subpkgdir"/usr/bin/findssl.sh || return 1
+ install -Dm755 "$_builddir"/contrib/ssh-copy-id \
+ "$subpkgdir"/usr/bin/ssh-copy-id || return 1
}
md5sums="3345cbf4efe90ffb06a78670ab2d05d5 openssh-6.1p1.tar.gz
--
GitLab