[sr-dev] pv module breakage in 4.2 branch

[Alex Balashov]

Ah, never mind. When I do a clean, manual 4.2 checkout, this problem 
does not appear.

The issue is that I had a deployment process on my side that 
cherry-picked the base64 transformation patch, from a time when it 
wasn't yet mainlined into a release. This is applied to the cloned 
source tree automatically. So, this is definitely on my side. Sorry 
about that!

On 10/16/2014 03:05 PM, Alex Balashov wrote:

> On 10/16/2014 02:57 PM, Juha Heinanen wrote:
>> Alex Balashov writes:
>>
>>> There appear to be some git merge droppings in modules/pv/pv_trans.h
>>> that prevent successful compilation:
>>
>> i compiled 4.2 based sip proxy about three hours ago and all went fine:
>>
>>    844 -rw-r--r-- 1 root root  862911 Oct 16 18:37 pv.so
>
> Well, every time I clone 4.2 since the release announcement, i.e.
>
>     git clone -b 4.2 git://git.sip-router.org/sip-router
>
> I encounter this when compiling. Here is what it seems to be:
>
> enum _tr_s_subtype {
> <<<<<<< HEAD
>          TR_S_NONE=0, TR_S_LEN, TR_S_INT, TR_S_MD5, TR_S_SHA256,
> TR_S_SHA384,
>          TR_S_SHA512, TR_S_SUBSTR, TR_S_SELECT, TR_S_ENCODEHEXA,
> TR_S_DECODEHEXA,
> =======
>          TR_S_NONE=0, TR_S_LEN, TR_S_INT, TR_S_MD5, TR_S_SUBSTR,
>          TR_S_SELECT, TR_S_ENCODEHEXA, TR_S_DECODEHEXA,
>  >>>>>>> 12f441f... pv: implement pv transformation {en,de}code.base64
>
> -- Alex
>


-- 
Alex Balashov - Principal
Evariste Systems LLC
Tel: +1-678-954-0670
Web: http://www.evaristesys.com/, http://www.alexbalashov.com/

Please be kind to the English language:

http://www.entrepreneur.com/article/232906