Mail archive
alpine-aports

Re: [alpine-aports] [PATCH 2/3] main/dropbear: use configure options from newapkbuild autoconf template

From: Natanael Copa <ncopa_at_alpinelinux.org>
Date: Mon, 26 Oct 2015 10:22:59 +0100

On Sun, 25 Oct 2015 14:44:19 +0100
Sören Tempel <soeren+git_at_soeren-tempel.net> wrote:

> ---
> main/dropbear/APKBUILD | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/main/dropbear/APKBUILD b/main/dropbear/APKBUILD
> index 49dd67c..bbbff79 100644
> --- a/main/dropbear/APKBUILD
> +++ b/main/dropbear/APKBUILD
> _at_@ -1,3 +1,4 @@
> +# Contributor: Sören Tempel <soeren+alpine_at_soeren-tempel.net>
> # Contributor: Carlo Landmeter <clandmeter_at_gmail.com>
> # Maintainer: Natanael Copa <ncopa_at_alpinelinux.org>
> pkgname=dropbear
> _at_@ -6,16 +7,16 @@ pkgrel=1
> pkgdesc="small SSH 2 client/server designed for small memory environments"
> url="http://matt.ucc.asn.au/dropbear/dropbear.html"
> arch="all"
> -license='MIT'
> -depends=
> +license="MIT"
> +depends=""
> +depends_dev=""
> makedepends="zlib-dev linux-headers"
> subpackages="$pkgname-doc $pkgname-scp:_scp"
> source="http://matt.ucc.asn.au/dropbear/releases/${pkgname}-${pkgver}.tar.bz2
> dropbear.initd
> dropbear.confd
> dropbear-0.53.1-static_build_fix.patch
> - dropbear-options_sftp-server_path.patch
> - "
> + dropbear-options_sftp-server_path.patch"

FWIW, having the closing " on separate line makes it easier to
add/remove patches (eg stable maintenance). If an update in future
include the dropbear-options_sftp-server_path.patch then I just 'dd' in
vim and move on. Now I will have to 'dd' and then append a closing ".

I know it is a nit-pick, but after adding/removing 1000+ patches those
trivial extra file edits becomes annoying.

> _builddir="$srcdir"/$pkgname-$pkgver
> _progs="dropbear dbclient dropbearkey dropbearconvert scp"
> _at_@ -36,6 +37,10 @@ build() {
> --build=$CBUILD \
> --host=$CHOST \
> --prefix=/usr \
> + --sysconfdir=/etc \
> + --mandir=/usr/share/man \
> + --infodir=/usr/share/info \

I'm not really sure about the value of adding infodir since its not
used anyway. We should probably remove it from the newapkbuild template.

> + --localstatedir=/var \
> || return 1
> make PROGRAMS="$_progs" MULTI=1 || return 1
> }



---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Mon Oct 26 2015 - 10:22:59 GMT