[Buildroot] [PATCH next v3] ptpd2: fix ptpd2-ptp2 build failure due to EVP_MD_CTX conflict and U64 missing

[Giulio Benetti]

Hello Thomas,

Il 10/10/2018 21:18, Thomas Petazzoni ha scritto:
> Hello,
> 
> On Sat,  1 Sep 2018 00:48:45 +0200, Giulio Benetti wrote:
>> In src/dep/ntpengine/ntp_isc_md5.* :
>> EVP_MD_CTX typedef conflicts with openssl same name typedef EVP_MD_CTX.
>> Referenced here:
>> https://github.com/ptpd/ptpd/issues/54
>> and here:
>> https://bugs.gentoo.org/664500
>>
>> In src/dep/snmp.c :
>> U64 can be missing or conflicts with new perl as reported here:
>> https://github.com/ptpd/ptpd/issues/25
>> Use Ad Hoc patch since the one proposed on upstream [1] is too new and can't
>> be applied to current version(2.3.1)
>>
>> Add 2 patches to package to:
>> - replace EVP_MD_CTX with PTPD_EVP_MD_CTX to avoid conflicts with openssl
>> - replace U64 with struct counter64 to avoid to miss it with certain
>> toolchains
>>
>> Fixes:
>> http://autobuild.buildroot.net/results/47b/47b99a6de256bfc0f5a8ae1484bb34e93b407237//
>> http://autobuild.buildroot.net/results/083/08365fc559dda74640b9750358c82e84600a68ea//
>> http://autobuild.buildroot.net/results/9b4/9b41c513500c63a9890973a0f17ffdb84d44d580//
>> http://autobuild.buildroot.net/results/2ed/2ed79d01635c9a5e1018229dc6f4b7240a995b87//
>> http://autobuild.buildroot.net/results/6d1/6d1b7e191f573334115684b85165f2bc27d75d8f//
>> http://autobuild.buildroot.net/results/f54/f54c6fd841b3ea77dc12048c81f3f2991b679252//
>> http://autobuild.buildroot.net/results/332/332bc77bcde0bef1b2fd7b9993409dd051c27cd6//
>> http://autobuild.buildroot.net/results/4b4/4b416edaec9528d75a82c9570b8f8297718ca62d//
>>
>> [1]: https://github.com/ptpd/ptpd/commit/99cbb146b6114fc5fd7b59a90ceb56c27e5ee700
>>
>> Signed-off-by: Giulio Benetti <giulio.benetti at micronovasrl.com>
> 
> So I've applied, but after reworking the commit log and the patch
> related to U64. The commit log was a bit messy to read, some URLs
> directly inline, some URLs as reference, and generally a bit difficult
> to read.

I'm sorry, I did some mess on this.
This is my first attempt using references, and yes commit log could be 
better.

> 
> You did not even mention that the first patch was merged upstream.

At the time I've submitted patch on BR, it wasn't upstreamed.
If it happens again this situation, do I need to produce a new patch 
with improved commit log pointing that the patch has been upstreamed?

> For the second patch, the reference to
> https://github.com/ptpd/ptpd/commit/99cbb146b6114fc5fd7b59a90ceb56c27e5ee700
> is not great as it's the merge commit. Pointing to
> https://github.com/ptpd/ptpd/commit/1886522b50fe44e5c0dedd01d13ac456b941f744
> makes more sense.

Ok

> Also, for this second patch, I don't understand why you reimplemented
> your own. Instead, I've simply taken the upstream commit, backported on
> the 2.3.1 version, fixing the conflicts along the way. This way, the
> original author and commit reference are preserved.

I didn't know it was possible. Thanks for pointing me.

> See the final commit at
> https://git.buildroot.org/buildroot/commit/?id=5b7bc560a5859d4b9f0c2a14c10e83c18fbd6bca.
> 
> Thanks for this work!

Thank you for all the jobs you've done to correct my patch

Kind regards
-- 
Giulio Benetti
CTO

MICRONOVA SRL
Sede: Via A. Niedda 3 - 35010 Vigonza (PD)
Tel. 049/8931563 - Fax 049/8931346
Cod.Fiscale - P.IVA 02663420285
Capitale Sociale € 26.000 i.v.
Iscritta al Reg. Imprese di Padova N. 02663420285
Numero R.E.A. 258642