| Message ID | 20190513221701.1837-1-avarab@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | sha1dc: update from upstream | expand |
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
On Tue, May 14 2019, Osipov, Michael wrote: > 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 Thanks. If you want to submit it for inclusion you'll need to submit it as a patch here to the ML as described here: https://github.com/git/git/blob/master/Documentation/SubmittingPatches Or you can use this pull-request-by-proxy thing: https://gitgitgadget.github.io/ Or if you don't want to deal with any of that crap just say and I'll E-Mail this to the list for you. Just want to give you a chance to do it :) > 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
Am 2019-05-15 um 13:48 schrieb Ævar Arnfjörð Bjarmason: > > On Tue, May 14 2019, Osipov, Michael wrote: > >> 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 > > Thanks. If you want to submit it for inclusion you'll need to submit it > as a patch here to the ML as described here: > https://github.com/git/git/blob/master/Documentation/SubmittingPatches > > Or you can use this pull-request-by-proxy thing: > https://gitgitgadget.github.io/ > > Or if you don't want to deal with any of that crap just say and I'll > E-Mail this to the list for you. Just want to give you a chance to do it > :) Yes, please do so. It seems like our corporate mail relay server does not allow sending emails outside of our dns namespace. I get bounces from mailer daemon. Michael
On Thu, May 16 2019, Osipov, Michael wrote: > Am 2019-05-15 um 13:48 schrieb Ævar Arnfjörð Bjarmason: >> >> On Tue, May 14 2019, Osipov, Michael wrote: >> >>> 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 >> >> Thanks. If you want to submit it for inclusion you'll need to submit it >> as a patch here to the ML as described here: >> https://github.com/git/git/blob/master/Documentation/SubmittingPatches >> >> Or you can use this pull-request-by-proxy thing: >> https://gitgitgadget.github.io/ >> >> Or if you don't want to deal with any of that crap just say and I'll >> E-Mail this to the list for you. Just want to give you a chance to do it >> :) > > Yes, please do so. It seems like our corporate mail relay server does > not allow sending emails outside of our dns namespace. I get bounces > from mailer daemon. Hi. No problem, but I just noticed your commit is missing a signed-off-by (required for inclusion in git.git), please "git commit --amend -s" it and re-push that PR, then I can pull it from there.
Am 2019-05-16 um 10:31 schrieb Ævar Arnfjörð Bjarmason: > > On Thu, May 16 2019, Osipov, Michael wrote: > >> Am 2019-05-15 um 13:48 schrieb Ævar Arnfjörð Bjarmason: >>> >>> On Tue, May 14 2019, Osipov, Michael wrote: >>> >>>> 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 >>> >>> Thanks. If you want to submit it for inclusion you'll need to submit it >>> as a patch here to the ML as described here: >>> https://github.com/git/git/blob/master/Documentation/SubmittingPatches >>> >>> Or you can use this pull-request-by-proxy thing: >>> https://gitgitgadget.github.io/ >>> >>> Or if you don't want to deal with any of that crap just say and I'll >>> E-Mail this to the list for you. Just want to give you a chance to do it >>> :) >> >> Yes, please do so. It seems like our corporate mail relay server does >> not allow sending emails outside of our dns namespace. I get bounces >> from mailer daemon. > > Hi. No problem, but I just noticed your commit is missing a > signed-off-by (required for inclusion in git.git), please "git commit > --amend -s" it and re-push that PR, then I can pull it from there. Done as requested! Michael
diff --git a/sha1collisiondetection b/sha1collisiondetection index 16033998da..855827c583 160000 --- a/sha1collisiondetection +++ b/sha1collisiondetection @@ -1 +1 @@ -Subproject commit 16033998da4b273aebd92c84b1e1b12e4aaf7009 +Subproject commit 855827c583bc30645ba427885caa40c5b81764d2 diff --git a/sha1dc/sha1.c b/sha1dc/sha1.c index 5931cf25d5..9d3cf81d4d 100644 --- a/sha1dc/sha1.c +++ b/sha1dc/sha1.c @@ -93,7 +93,7 @@ #define SHA1DC_BIGENDIAN /* Not under GCC-alike or glibc or *BSD or newlib or <processor whitelist> */ -#elif (defined(_AIX)) +#elif (defined(_AIX) || defined(__hpux)) /* * Defines Big Endian on a whitelist of OSs that are known to be Big
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. > That'd be much more work to extend configure.ac for that because is a > runtime check. Since there are no real products vailable on x86 for > HP-UX I'd neglect that. Our HPE salesman told us that this will be > available somewhere in the future. So, I think this is very good for > now. Sure, makes sense. I'm not familiar with HP/UX. So just thought I'd ask. sha1collisiondetection | 2 +- sha1dc/sha1.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)