Bug#982705: openssh: FTBFS: sha2.h:57:16: error: redefinition of ‘struct _SHA2_CTX’

2021-02-15 Thread Colin Watson
On Mon, Feb 15, 2021 at 11:31:45AM +0100, Andreas Henriksson wrote: > On Mon, Feb 15, 2021 at 09:41:30AM +, Colin Watson wrote: > > FWIW, I think your patch in > > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=982705#25 is correct > > (even if I prefer to take a different approach as a

Bug#982705: openssh: FTBFS: sha2.h:57:16: error: redefinition of ‘struct _SHA2_CTX’

2021-02-15 Thread Andreas Henriksson
On Mon, Feb 15, 2021 at 09:41:30AM +, Colin Watson wrote: [...] > FWIW, I think your patch in > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=982705#25 is correct > (even if I prefer to take a different approach as a workaround for the > packaging) and could be forwarded upstream. Would

Bug#982705: openssh: FTBFS: sha2.h:57:16: error: redefinition of ‘struct _SHA2_CTX’

2021-02-15 Thread Colin Watson
On Mon, Feb 15, 2021 at 01:52:59AM +0100, Andreas Henriksson wrote: > On Sun, Feb 14, 2021 at 01:05:11PM +, Colin Watson wrote: > > How about this approach instead? Given the choice between a > > packaging-only change and one that requires another patch against > > upstream, I have a slight

Bug#982705: openssh: FTBFS: sha2.h:57:16: error: redefinition of ‘struct _SHA2_CTX’

2021-02-14 Thread Andreas Henriksson
Hello Colin Watson, On Sun, Feb 14, 2021 at 01:05:11PM +, Colin Watson wrote: > Thanks for digging into this. > > How about this approach instead? Given the choice between a > packaging-only change and one that requires another patch against > upstream, I have a slight preference for the

Bug#982705: openssh: FTBFS: sha2.h:57:16: error: redefinition of ‘struct _SHA2_CTX’

2021-02-14 Thread Colin Watson
On Sun, Feb 14, 2021 at 12:49:29PM +0100, Andreas Henriksson wrote: > Attached is a possibly upstreamable patch that solves our problem > (but the base problem still exists in the code for anyone wishing to > build with openssl disabled). Thanks for digging into this. How about this approach

Bug#982705: openssh: FTBFS: sha2.h:57:16: error: redefinition of ‘struct _SHA2_CTX’

2021-02-14 Thread Andreas Henriksson
Control: tags -1 + patch Hi again, Attached is a possibly upstreamable patch that solves our problem (but the base problem still exists in the code for anyone wishing to build with openssl disabled). See description in patch itself. Regards, Andreas Henriksson Description: sk-usbhid.c: Only

Bug#982705: openssh: FTBFS: sha2.h:57:16: error: redefinition of ‘struct _SHA2_CTX’

2021-02-14 Thread Andreas Henriksson
Hi, On Sun, Feb 14, 2021 at 09:18:25AM +0100, Andreas Henriksson wrote: > On Sun, Feb 14, 2021 at 08:32:58AM +0100, Andreas Henriksson wrote: > > Hello, > > > > On Sat, Feb 13, 2021 at 06:04:32PM +0100, Lucas Nussbaum wrote: > > > Source: openssh > > > Version: 1:8.4p1-3 > > > Severity: serious

Bug#982705: openssh: FTBFS: sha2.h:57:16: error: redefinition of ‘struct _SHA2_CTX’

2021-02-14 Thread Andreas Henriksson
On Sun, Feb 14, 2021 at 08:32:58AM +0100, Andreas Henriksson wrote: > Hello, > > On Sat, Feb 13, 2021 at 06:04:32PM +0100, Lucas Nussbaum wrote: > > Source: openssh > > Version: 1:8.4p1-3 > > Severity: serious > > Justification: FTBFS on amd64 [...] > (Which in turn makes me wonder if something

Bug#982705: openssh: FTBFS: sha2.h:57:16: error: redefinition of ‘struct _SHA2_CTX’

2021-02-13 Thread Andreas Henriksson
Hello, On Sat, Feb 13, 2021 at 06:04:32PM +0100, Lucas Nussbaum wrote: > Source: openssh > Version: 1:8.4p1-3 > Severity: serious > Justification: FTBFS on amd64 [...] > > In file included from ../../sk-usbhid.c:30: > > /usr/include/sha2.h:57:16: error: redefinition of ‘struct _SHA2_CTX’ [...] >

Bug#982705: openssh: FTBFS: sha2.h:57:16: error: redefinition of ‘struct _SHA2_CTX’

2021-02-13 Thread Lucas Nussbaum
Source: openssh Version: 1:8.4p1-3 Severity: serious Justification: FTBFS on amd64 Tags: bullseye sid ftbfs Usertags: ftbfs-20210213 ftbfs-bullseye Hi, During a rebuild of all packages in sid, your package failed to build on amd64. Relevant part (hopefully): > cc -g -O2 -ffile-prefix-map=/<>=.