Received: from vikavolt.denkimushi.com (vikavolt.denkimushi.com [212.159.101.34]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id B6B45782EC2 for ; Sat, 25 Jan 2020 16:36:25 +0000 (UTC) Content-Type: text/plain; charset=utf-8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denkimushi.com; s=mail; t=1579970183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BB2sXQuPZEGRQsjfsu5dvrWtYy8FsbQcNRhtGd7PTOQ=; b=Sh/rwRBZFFdFRjjbmnr03c5KQE4PUeGpc0daySWUdC+oOGwZ4cPSlisyll6jqd/dWsfto7 4NcVxPFZdwt21Fh9fGMf5jdI6VdwhrxXNwrH/oTDf2qRNkUqkb4mTAxoFoiNhK4BISmrxu 2+MWya2/TpyhEwU1ReRBmboWAukHsTM= Content-Transfer-Encoding: quoted-printable From: Dunk Mime-Version: 1.0 (1.0) Subject: Re: [PATCH] add dcc-servers.net dcc to testing, with sub packages for dccif and dccm Date: Sat, 25 Jan 2020 16:36:22 +0000 Message-Id: <17698872-D7AE-48DB-9C0A-8905E36D707C@denkimushi.com> References: <20200125152838.GB1055246@alpha> Cc: alpine-aports@lists.alpinelinux.org In-Reply-To: <20200125152838.GB1055246@alpha> To: Kevin Daudt Hi Kevin, Thanks for the feedback, I will edit and resubmit. I submitted an rspamd patch as well to update to 2.2 and tried to amend the c= ommit after I found some typos but it kept submitting the old patch with new= subject. Thanks, Duncan > On 25 Jan 2020, at 15:28, Kevin Daudt wrote: >=20 > =EF=BB=BFHello Duncan, >=20 > Welcome to the Alpine Linux community, and thank you for your > contribution. I have placed some feedback inline. >=20 > Besides that, aport uses a specific standard for commit messages: >=20 > 1) A generally followed commit standard where you have a short commit > subject soft limitted to about 50 characters, followed by a blank line, > and then more details about the commit (focussing more on why than what. > See this [post][commit-message] for more information. > 2) Commit messages for packages are prefixed with the repo and package > name like this: 'testing/dcc: '. >=20 > So the commit message for this patch would be: >=20 > ``` > testing/dcc: new aport > ``` >=20 > The fact that there are subpackages is not that interesting (most > packages will have subpackages). >=20 > I hope this is clear, otherwise, feel free to ask questions. >=20 > Kind regards, Kevin. >=20 >> On Fri, Jan 24, 2020 at 09:46:54PM +0000, Duncan Bellamy wrote: >> --- >> testing/dcc/APKBUILD | 61 ++++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 61 insertions(+) >> create mode 100644 testing/dcc/APKBUILD >>=20 >> diff --git a/testing/dcc/APKBUILD b/testing/dcc/APKBUILD >> new file mode 100644 >> index 0000000000..6efcfd6e3b >> --- /dev/null >> +++ b/testing/dcc/APKBUILD >> @@ -0,0 +1,61 @@ >> +# Contributor: Duncan Bellamy >> +# Maintainer: Duncan Bellamy >> +pkgname=3D"dcc" >> +pkgver=3D"2.3.167" >> +pkgrel=3D1 >> +pkgdesc=3D"Distributed Checksum Clearinghouses or DCC spam filter" >> +url=3D"https://www.dcc-servers.net/dcc/" >> +arch=3D"all" >> +license=3D"Distributed Checksum Clearinghouse" >=20 > If the license is not on the [spdx][spdx] list, this should be `custom`. >=20 >> +pkgusers=3D"_dcc" >> +pkggroups=3D"_dcc" >=20 > Any reason why these are prefixed with an '_'? In any case, this just > makes sure that they exist during building. You still need to add a > pre-install script to make sure they exist on the target system. >=20 >> +depends=3D"wget" >> +makedepends=3D"libmilter-dev" >> +subpackages=3D"$pkgname-dccifd $pkgname-dccm $pkgname-doc" >> +source=3D"https://www.dcc-servers.net/src/dcc/old/dcc-2.3.167.tar.Z" >> +options=3D"!check" >> + >> +prepare() { >> + default_prepare >=20 > Inconsistent indentation here >=20 >> + sed -i 's+DCC_UNIX+DCC_UNIX\n#include +g' "$srcdir"/$p= kgname-$pkgver/include/dcc_types.h >=20 > Dependending how much is changed, we prefer using patches instead of > `sed -i`. >=20 >> +} >> + >> +unpack() { >=20 > Please call default_unpack here as well, as it also includes some other > functionality that is missing now. >=20 > Another option is to specify the archive name when downloading in the > source variable: >=20 > ```sh > source=3D"$pkgname-$pkgver.tar.gz::https://www.dcc-servers.net/src/dcc/old= /dcc-2.3.167.tar.Z" > ``` >=20 > Then the default behaviour should suffice. >=20 >> + cd "$srcdir" >> + tar -xzf dcc*.tar.Z >> +} >> + >> +build() { >> + ./configure \ >> + --with-installroot=3D"$pkgdir" \ >> + --bindir=3D"/usr/bin" \ >> + --mandir=3D"/usr/man" \ >> + --with-uid=3D_dcc >> + make >> +} >> + >> +package() { >> + make install >> + install -Dm644 "$builddir"/LICENSE \ >> + "$pkgdir"/usr/share/licenses/$pkgname/LICENSE >> + >> + chmod 755 "$pkgdir"/var/dcc/libexec/dccsight >> + cd "$pkgdir"/usr/bin >> + chmod 755 cdcc dccproc >> +} >> + >> +dccifd() { >> + depends=3D"dcc" >> + mkdir -p "$subpkgdir"/var/dcc/libexec >> + cd "$pkgdir"/var/dcc/libexec >> + mv dccifd start-dccifd "$subpkgdir"/var/dcc/libexec/ >=20 > abuild now has a function called `amove` that makes this easier. The > above 3 lines can be replaced with: >=20 > ```sh > amove var/dcc/libexec/dccifd var/dcc/libexec/start-dccifd > ``` >=20 >> +} >> + >> +dccm() { >> + depends=3D"dcc" >> + mkdir -p "$subpkgdir"/var/dcc/libexec >> + cd "$pkgdir"/var/dcc/libexec >> + mv dccm start-dccm "$subpkgdir"/var/dcc/libexec/ >=20 > `amove` can be used here as well. >=20 >> +} >> + >> +sha512sums=3D"384a572e5b18bed6aed08dce6ebc468d5737b0cb4774fe502f527b101a= 38b4bec1fdd73384c6fb437c21ae46aa56ae04c5c459737cdda6ab3ce186ff4f77cf98 dcc-= 2.3.167.tar.Z" >> --=20 >> 2.24.1 >=20 > [commit-message]:https://chris.beams.io/posts/git-commit/ > [spdx]:https://spdx.org/licenses/