On Wed, Jul 05, 2023 at 09:59:21AM +0100, Chavdar Ivanov wrote:
> On Tue, 4 Jul 2023 at 18:48, Jonathan Perkin <jperkin%mnx.io@localhost> wrote:
> >
> > * On 2023-07-04 at 17:11 BST, Chavdar Ivanov wrote:
> >
> > >On Sun, 2 Jul 2023 at 14:37, Jonathan Perkin <jperkin%mnx.io@localhost> wrote:
> > >>
> > >> * On 2023-06-30 at 22:28 BST, Jan-Hinrich Fessel wrote:
> > >>
> > >> >warning: libssh2/src/kex.c: In function 'diffie_hellman_sha_algo':
> > >> >warning: libssh2/src/kex.c:259:34: error: 'LIBSSH2_DH_MAX_MODULUS_BITS' undeclared (first use in this function); did you mean 'OPENSSL_DH_MAX_MODULUS_BITS'?
> > >> >warning: 259 | if(_libssh2_bn_bits(p) > LIBSSH2_DH_MAX_MODULUS_BITS) {
> > >> >warning: | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> > >> >warning: | OPENSSL_DH_MAX_MODULUS_BITS
> > >> >[...]
> > >> >error: failed to run custom build command for `libssh2-sys v0.2.23`
> > >> >[...]
> > >>
> > >> Yes I see this in some of my builds too ever since libssh2 was updated.
> > >
> > >Here as well.
> >
> > I fixed this yesterday.
>
> Where? It still fails for the same way.
> ....
> warning: libssh2/src/kex.c: In function 'diffie_hellman_sha_algo':
>
> warning: libssh2/src/kex.c:259:34: error:
> 'LIBSSH2_DH_MAX_MODULUS_BITS' undeclared (first use in this function);
> did you mean 'OPENSSL_DH_MAX_MODULUS_BITS'? warning: 259 |
> if(_libssh2_bn_bits(p) > LIBSSH2_DH_MAX_MODULUS_BITS) {
> warning:
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> warning: |
> OPENSSL_DH_MAX_MODULUS_BITS
> warning:
> libssh2/src/kex.c:259:34: note: each undeclared identifier is reported
> only once for each function it appears in
> warning: libssh2/src/kex.c:588:30: error: 'LIBSSH2_DH_GEX_MINGROUP'
> undeclared (first use in this function); did you mean
> 'LIBSSH2_DH_GEX_NEW'? warning: 588 |
> LIBSSH2_DH_GEX_MINGROUP);
> warning: |
> ^~~~~~~~~~~~~~~~~~~~~~~
>
> warning: | LIBSSH2_DH_GEX_NEW
> warning: libssh2/src/kex.c:590:30: error: 'LIBSSH2_DH_GEX_OPTGROUP'
> undeclared (first use in this function); did you mean
> 'LIBSSH2_DH_GEX_NEW'?
> warning: 590 |
> LIBSSH2_DH_GEX_OPTGROUP);
> warning: |
> ^~~~~~~~~~~~~~~~~~~~~~~
> warning:
> | LIBSSH2_DH_GEX_NEW
> warning: libssh2/src/kex.c:592:30: error: 'LIBSSH2_DH_GEX_MAXGROUP'
> undeclared (first use in this function); did you mean
> 'LIBSSH2_DH_GEX_NEW'?
> warning: 592 |
> LIBSSH2_DH_GEX_MAXGROUP);
> warning: |
> ^~~~~~~~~~~~~~~~~~~~~~~
> warning:
> | LIBSSH2_DH_GEX_NEW
> warning: libssh2/src/kex.c: In function
> 'kex_method_diffie_hellman_group_exchange_sha1_key_exchange':
> warning:
> libssh2/src/kex.c:1345:50: error: 'LIBSSH2_DH_GEX_MINGROUP' undeclared
> (first use in this function); did you mean 'LIBSSH2_DH_GEX_NEW'?
> ....
I guess he meant the attached commit.
Thomas--- Begin Message ---
- To: pkgsrc-changes%NetBSD.org@localhost
- Subject: CVS commit: pkgsrc/lang/rust
- From: "Jonathan Perkin" <jperkin%netbsd.org@localhost>
- Date: Mon, 3 Jul 2023 20:38:21 +0000
Module Name: pkgsrc Committed By: jperkin Date: Mon Jul 3 20:38:21 UTC 2023 Modified Files: pkgsrc/lang/rust: Makefile Log Message: rust: Ensure libssh2 is not buildlinked. To generate a diff of this commit: cvs rdiff -u -r1.285 -r1.286 pkgsrc/lang/rust/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.Modified files: Index: pkgsrc/lang/rust/Makefile diff -u pkgsrc/lang/rust/Makefile:1.285 pkgsrc/lang/rust/Makefile:1.286 --- pkgsrc/lang/rust/Makefile:1.285 Fri Jun 30 12:38:40 2023 +++ pkgsrc/lang/rust/Makefile Mon Jul 3 20:38:20 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.285 2023/06/30 12:38:40 mef Exp $ +# $NetBSD: Makefile,v 1.286 2023/07/03 20:38:20 jperkin Exp $ DISTNAME= rustc-1.69.0-src PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} @@ -64,9 +64,12 @@ CONFIGURE_ARGS+= --enable-vendor # cargo defaults to using the number of available CPUs MAKE_ENV+= CARGO_BUILD_JOBS=${_MAKE_JOBS_N} -# Ensure we use a bundled lzma rather than relying on finding one, and avoid -# xz being buildlinked if it's pulled in via dependencies. -BUILDLINK_FILES_CMD.xz= ${TRUE} +# Rust builds some bundled components with strict version requirements, ensure +# that any conflicting packages pulled in via dependencies are not buildlinked. +BUILDLINK_FILES_CMD.libssh2= ${TRUE} +BUILDLINK_FILES_CMD.xz= ${TRUE} + +# Use the bundled lzma. MAKE_ENV+= LZMA_API_STATIC=1 # MacOS X 10.7 is the oldest supported version. See
--- End Message ---