Re: [PATCH] sha1dc: update from upstream

From: "Osipov, Michael" <michael.osipov@siemens.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>, git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] sha1dc: update from upstream
Date: Tue, 14 May 2019 13:17:27 +0200	[thread overview]
Message-ID: <09f64da1-b8aa-3cd7-89d7-475b8722e176@siemens.com> (raw)
In-Reply-To: <20190513221701.1837-1-avarab@gmail.com>

Hi,

Am 2019-05-14 um 00:17 schrieb Ævar Arnfjörð Bjarmason:
> Update sha1dc from the latest version by the upstream
> maintainer[1]. See 07a20f569b ("Makefile: fix unaligned loads in
> sha1dc with UBSan", 2019-03-12) for the last update.
> 
> This fixes an issue where HP-UX IA64 was wrongly detected as a
> Little-endian instead of a Big-endian system, see [2] and [3].
> 
> 1. https://github.com/cr-marcstevens/sha1collisiondetection/commit/855827c583bc30645ba427885caa40c5b81764d2
> 2. https://public-inbox.org/git/603989bd-f86d-c61d-c6f5-fb6748a65ba9@siemens.com/
> 3. https://github.com/cr-marcstevens/sha1collisiondetection/pull/50
> 
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
> 
> n Thu, May 09 2019, Osipov, Michael wrote:
> 
>> Hey there,
>>
>> Am 2019-05-09 um 09:32 schrieb Ævar Arnfjörð Bjarmason:
>>>
>>> On Wed, May 08 2019, Osipov, Michael wrote:
>>>
>>>> Hi folks,
>>>
>>> Hi see Documentation/SubmittingPatches for how to submit patches inline
>>> instead of as attachments.
>>
>> Do you want me to resend the configure.ac change as per wiki article?
>> I can also create a PR on GitHub. I am happy with both as long as I
>> don't have to retain the patch for myself only ;-)
> 
> Yeah that patch to git.git should be done separately. I see your PR
> went in upstream, here's a patch to update our code to match.

To avoid misunderstandings, I have factored out the Git patch and 
created a PR: https://github.com/git/git/pull/608

Looks good to me now:
> osipovmi@deblndw024v:~/git
> $ uname -a
> HP-UX deblndw0 B.11.31 U ia64 HP-UX
> osipovmi@deblndw024v:~/git
> $ ./git --version
> git version 2.22.0.rc0.dirty
> osipovmi@deblndw024v:~/git
> $ ldd ./git
> 
> ./git:
>         libz.so =>      /opt/ports/lib/hpux32/libz.so
>         libiconv.so.8 =>        /opt/ports/lib/hpux32/libiconv.so.8
>         libintl.so.9 => /opt/ports/lib/hpux32/libintl.so.9
>         libc.so.1 =>    /usr/lib/hpux32/libc.so.1
>         libc.so.1 =>    /usr/lib/hpux32/libc.so.1
>         libc.so.1 =>    /usr/lib/hpux32/libc.so.1
>         libc.so.1 =>    /usr/lib/hpux32/libc.so.1
>         libdl.so.1 =>   /usr/lib/hpux32/libdl.so.1

Looking forward for a merge.

Regards,

Michael