[Buildroot] [git commit] ptpd2: fix patch 0002 so that it applies properly

[Giulio Benetti]

Il 11/10/2018 23:06, Giulio Benetti ha scritto:
> Hello Thomas,
> 
> Il 11/10/2018 22:22, Thomas Petazzoni ha scritto:
>> commit: https://git.buildroot.net/buildroot/commit/?id=d60973af00c5ad7dc15049597cf03bd1ad538041
>> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
>>
>> The patch
>> 0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch added in
>> commit 5b7bc560a5859d4b9f0c2a14c10e83c18fbd6bca ("ptpd2: fix build
>> failures due to EVP_MD_CTX conflict and U64 missing") was broken and
>> did not apply correctly.
>>
>> This commit fixes the patch so that it applies properly.
>>
>> Fixes:
>>
>>     http://autobuild.buildroot.net/results/ffa28ee2cecc77d66d934fdb03e1f2014189e45b/
>>
>> Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
>> ---
>>    .../0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch | 8 ++++----
>>    1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch b/package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch
>> index 9a9beacf90..e655ff3354 100644
>> --- a/package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch
>> +++ b/package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch
>> @@ -1,4 +1,4 @@
>> -From 838b985510c360e651d18134e64f258f2f4c6e7c Mon Sep 17 00:00:00 2001
>> +From af1d16d90ff273413a57cd02689f4fb005403609 Mon Sep 17 00:00:00 2001
>>    From: Giulio Benetti <giulio.benetti at micronovasrl.com>
>>    Date: Fri, 31 Aug 2018 18:46:56 +0200
>>    Subject: [PATCH] ntp_isc_md5: rename EVP_MD_CTX into PTPD_EVP_MD_CTX
>> @@ -16,7 +16,7 @@ Signed-off-by: Giulio Benetti <giulio.benetti at micronovasrl.com>
>>     2 files changed, 2 insertions(+), 2 deletions(-)
>>    
>>    diff --git a/src/dep/ntpengine/ntp_isc_md5.c b/src/dep/ntpengine/ntp_isc_md5.c
>> -index 7d04467..e4e34ac 100644
>> +index 850d004..3216de8 100644
>>    --- a/src/dep/ntpengine/ntp_isc_md5.c
>>    +++ b/src/dep/ntpengine/ntp_isc_md5.c
>>    @@ -262,7 +262,7 @@ MD5authencrypt(
>> @@ -25,7 +25,7 @@ index 7d04467..e4e34ac 100644
>>     	u_int	len;
>>    -	EVP_MD_CTX ctx;
>>    +	PTPD_EVP_MD_CTX ctx;
>> -         pkt[length / 4] = htonl(keyid);
>> +         pkt[length / 4] = htonl(keyid);
> 
> I've tried to diff your BR patch, but the only diff I find is a new
> trailing whitespace after:
> "+         pkt[length / 4] = htonl(keyid);"
> 
> To understand, is that the change for patch to apply or something else?

I'm reproducing the problem by myself to understand, using latest 
autobuild failure.

No need to explain me.

Sorry but *high temperature* makes me feel strange :)

-- 
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