Sender: =?UTF-8?Q?Timo_Ter=C3=A4s?= <timo.teras@gmail.com>
Date: Mon, 8 Jun 2015 21:54:22 +0300
From: Timo Teras <timo.teras@iki.fi>
To: Nathan Angelacos <nangel@alpinelinux.org>
Cc: alpine-aports@lists.alpinelinux.org
Subject: Re: [alpine-aports] [PATCH] main/kamailio   add new  mohqueue
 module not yet upstreamed
Message-ID: <20150608215422.235de4ed@vostro>
In-Reply-To: <1433784316-27929-1-git-send-email-nangel@alpinelinux.org>
References: <1433784316-27929-1-git-send-email-nangel@alpinelinux.org>
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

On Mon,  8 Jun 2015 17:25:16 +0000
Nathan Angelacos <nangel@alpinelinux.org> wrote:

> diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
> index ccf91bb..5d75f0c 100644
> --- a/main/kamailio/APKBUILD
> +++ b/main/kamailio/APKBUILD
> @@ -11,9 +11,10 @@ pkgname=kamailio
>  _giturl="git://github.com/$pkgname/$pkgname.git"
>  _gittag=HEAD
>  
> +_mohqueuever=v0.11
>  
>  pkgver=4.2.5
> -pkgrel=0
> +pkgrel=1
>  [ -z "${_gitcommit}" ] && _suffix="_src" || _suffix="-${_gitcommit}"
>  
>  pkgdesc="Open Source SIP Server"
> @@ -232,6 +233,7 @@
> source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}${_su 
>  	kamailio.cfg
>  	kamailio.initd
> +
> https://github.com/rdboisvert/mohqueue/archive/${_mohqueuever}.zip "

As minimum save-as feature should be used, so the file will not
conflict in builder cache. As in:
kamailio-mohqueue-${_mohqueuever}zip::https://github.com/rdboisvert/mohqueue/archive/${_mohqueuever}.zip

... but. I'm thinking it'd probably be more appropriate to just have
this as a patch? See below.

>  _builddir="$srcdir"/${pkgname}-fb-${_ver}
> @@ -254,6 +256,9 @@ snapshot() {
>  _builddir="$srcdir"/$pkgname-$pkgver
>  prepare() {
>  	cd "$_builddir"
> +
> +	cp -r "$srcdir"/mohqueue-${_mohqueuever}/* modules/mohqueue/
> +

This would not work e.g. if there's files removed with the changes.
It'll also happily downgrade when kamailio gets upgraded to version
containing that version + potentially other fixes done in kamalio git
only.

Thanks.


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---