1

[alpine-aports] [PATCH] testing/pure-ftpd: added pure-ftpd-doc pkg, added configure params, added --with-extauth to configure line, fixed license to BSD

Josh Jameson
Details
Message ID
<14c966e1-448a-43d8-812e-59b4769c1f2f@getmailbird.com>
Sender timestamp
1454877202
DKIM signature
missing
Download raw message
See attached file

Re: [alpine-aports] testing/pure-ftpd: added pure-ftpd-doc pkg, added configure params, added --with-extauth to configure line, fixed license to BSD

Timo Teras
Details
Message ID
<20160223134930.4ac47644@vostro.util.wtbts.net>
In-Reply-To
<14c966e1-448a-43d8-812e-59b4769c1f2f@getmailbird.com> (view parent)
Sender timestamp
1456228170
DKIM signature
missing
Download raw message
Hi,

On Sun, 07 Feb 2016 20:33:22 +0000
Josh Jameson <josh@servebyte.com> wrote:

> Subject: [PATCH] testing/pure-ftpd: added pure-ftpd-doc pkg, added
> configure params, added --with-extauth to configure line, fixed
> license to BSD
> 
> https://www.pureftpd.org
> Pure FTPD FTP daemon
> ---
>  testing/pure-ftpd/APKBUILD | 53
> ++++++++++++++++++++++------------------------ 1 file changed, 25
> insertions(+), 28 deletions(-)
> 
> diff --git a/testing/pure-ftpd/APKBUILD b/testing/pure-ftpd/APKBUILD
> index 8ea894f..f81a1c4 100644
> --- a/testing/pure-ftpd/APKBUILD
> +++ b/testing/pure-ftpd/APKBUILD
> @@ -1,22 +1,20 @@
> -# Contributor: Douglas Haber <me@douglashaber.com>
> -# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
> +# Contributor: Josh Jameson <josh@servebyte.com>
> +# Maintainer: Josh Jameson <josh@servebyte.com>

Please leave old Contributors in; and if changing maintainers leave the
old maintainer as contributor.

>  pkgname=pure-ftpd
> -pkgver=1.0.36
> +pkgver=1.0.42
>  pkgrel=0
> -pkgdesc="Pure FTPD FTP daemon"
> -url="http://pureftpd.org"
> -arch="all"
> -license="GPL"
> -depends=
> -depends_dev=
> +pkgdesc="Pure FTPD FTP daemon with ext-auth enabled"
> +url="https://www.pureftpd.org"
> +arch="x86_64"

Is there something in the new release that makes it not work on x86 or
arm? It would be better to leave arch as 'all' unless there's a reason.

> +license="BSD"
> +depends="musl"

Dependency on musl is implicit, it's not needed here. abuild picks
all .so dependencies automatic.

> +depends_dev=""
>  makedepends="$depends_dev"
>  install=""
> -subpackages=""
> -source="http://download.pureftpd.org/pub/pure-ftpd/releases/$pkgname-$pkgver.tar.gz
> -       pure-ftpd.initd
> -       pure-ftpd.confd"

Why are you removing the init.d and conf.d scripts?

> +subpackages="$pkgname-doc"
> +source="https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-$pkgver.tar.gz"
>  
> -_builddir="$srcdir/$pkgname-$pkgver"
> +_builddir="$srcdir"/"$pkgname"-"$pkgver"
>  prepare() {
>         local i
>         cd "$_builddir"
> @@ -30,24 +28,23 @@ prepare() {
>  build() {
>         cd "$_builddir"
>         ./configure --prefix=/usr \
> -               --without-humor \
> -               --without-unicode \
> -               --with-minimal \
> -               --with-throttling  \
> -               || return 1
> +       --sysconfdir=/etc \
> +       --mandir=/usr/share/man \
> +       --infodir=/usr/share/info \
> +       --localstatedir=/var \
> +        --without-humor \
> +        --without-unicode \
> +        --with-minimal \
> +       --with-throttling \
> +       --with-extauth || return 1
>         make || return 1

Please fix white space there. We prefer tabs, not spaces.

>  }
>  
>  package() {
>         cd "$_builddir"
>         make DESTDIR="$pkgdir" install || return 1
> -        install -m755 -D ../$pkgname.initd \
> -                "$pkgdir"/etc/init.d/$pkgname || return 1
> -
> -        install -m644 -D ../$pkgname.confd \
> -                "$pkgdir"/etc/conf.d/$pkgname || return 1
> +       rm -rf "$pkgdir"/usr/local
>  }
> -

This hunk has issues described above.

Could you please fix the mentioned issues, or explain in more detail
why they are needed and re-submit.

Thanks,
Timo


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---