Date: Sun, 22 Jul 2018 20:30:08 -0400 From: Charlie Li <ml@vishwin.info> To: ports@freebsd.org Cc: rust@freebsd.org Subject: Re: lang/rust build failure on r475116 Message-ID: <610f4abf-56a2-602b-3cd6-0a3f0e979111@vishwin.info> In-Reply-To: <CAJuc1zMGuPhTLu84DeKZM-%2BRMQuBm3HfhmgUvnjUHdnyV8W18A@mail.gmail.com> References: <CAJuc1zMGuPhTLu84DeKZM-%2BRMQuBm3HfhmgUvnjUHdnyV8W18A@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--qQVAIhcqsNuKFjaya1nVlZp9JlvhUZ8mP
Content-Type: multipart/mixed; boundary="TCWYMtrquTsdQZNy8hG49sFvFfuEdcfJZ";
protected-headers="v1"
From: Charlie Li <ml@vishwin.info>
To: ports@freebsd.org
Cc: rust@freebsd.org
Message-ID: <610f4abf-56a2-602b-3cd6-0a3f0e979111@vishwin.info>
Subject: Re: lang/rust build failure on r475116
References: <CAJuc1zMGuPhTLu84DeKZM-+RMQuBm3HfhmgUvnjUHdnyV8W18A@mail.gmail.com>
In-Reply-To: <CAJuc1zMGuPhTLu84DeKZM-+RMQuBm3HfhmgUvnjUHdnyV8W18A@mail.gmail.com>
--TCWYMtrquTsdQZNy8hG49sFvFfuEdcfJZ
Content-Type: multipart/mixed;
boundary="------------44395395FD4A2BBCED9177B8"
Content-Language: en-GB-large
This is a multi-part message in MIME format.
--------------44395395FD4A2BBCED9177B8
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
On 22/07/2018 18:19, Jonathan Chen wrote:
> On a recent ports tree (r475116), lang/rust is failing on a synth build=
with:
>=20
> Building stage2 tool cargo (x86_64-unknown-freebsd)
> running: "/construction/xports/lang/rust/work/rustc-1.27.1-src/build/x8=
6_64-unknown-freebsd/stage0/bin/cargo"
> "build" "--target" "x86_64-unk
> nown-freebsd" "--release" "--frozen" "--manifest-path"
> "/construction/xports/lang/rust/work/rustc-1.27.1-src/src/tools/cargo/C=
argo.toml"
> "--
> features" "" "--message-format" "json"
> error: the listed checksum of
> `/construction/xports/lang/rust/work/rustc-1.27.1-src/src/vendor/libgit=
2-sys/libgit2/src/streams/openssl.c`
> ha
> s changed:
>=20
When dumbbell@ committed my patch in PR 226955, he didn't apply the
Makefile portion that changes the loop that regenerates the checksums.
Refer to the full patch I posted in the PR; this should fix things.
The libgit2-sys crate included in lang/rust currently in the tree is an
old version that includes an old version of libgit2, before patches
fixing builds with LibreSSL 2.7 were applied.
--=20
Charlie Li
Can't think of a witty .sigline today=E2=80=A6
(This email address is for mailing list use only; replace local-part
with vishwin for off-list communication)
--------------44395395FD4A2BBCED9177B8
Content-Type: text/x-patch;
name="rust-1.27.1-libressl2.7.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="rust-1.27.1-libressl2.7.patch"
diff --git lang/rust/Makefile lang/rust/Makefile
index f3a855c72b0e..361c567c0440 100644
--- lang/rust/Makefile
+++ lang/rust/Makefile
@@ -156,7 +156,7 @@ post-patch:
${WRKSRC}/src/stage0.txt
# After patching crates, we need to update their corresponding
# `.cargo-checksum.json` to reflect the new checksums verified by Cargo.=
- @for dir in "${WRKSRC}/src/vendor/libc" "${WRKSRC}/src/vendor/openssl" =
"${WRKSRC}/src/vendor/openssl-sys"; do \
+ @for dir in "${WRKSRC}/src/vendor/libc" "${WRKSRC}/src/vendor/libgit2-s=
ys"; do \
if ! test -d "$$dir"; then \
continue; \
fi; \
diff --git lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_strea=
ms_openssl.c lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_str=
eams_openssl.c
new file mode 100644
index 000000000000..30b3c6bd6673
--- /dev/null
+++ lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_streams_open=
ssl.c
@@ -0,0 +1,12 @@
+--- src/vendor/libgit2-sys/libgit2/src/streams/openssl.c.orig 2018-05-07=
18:50:07 UTC
++++ src/vendor/libgit2-sys/libgit2/src/streams/openssl.c
+@@ -104,7 +104,8 @@ int git_openssl_stream_global_init(void)
+ ssl_opts |=3D SSL_OP_NO_COMPRESSION;
+ #endif
+=20
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NU=
MBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20=
700000L)
+ SSL_load_error_strings();
+ OpenSSL_add_ssl_algorithms();
+ #else
diff --git lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_strea=
ms_openssl.h lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_str=
eams_openssl.h
new file mode 100644
index 000000000000..6e715ef874ab
--- /dev/null
+++ lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_streams_open=
ssl.h
@@ -0,0 +1,12 @@
+--- src/vendor/libgit2-sys/libgit2/src/streams/openssl.h.orig 2018-05-07=
18:50:07 UTC
++++ src/vendor/libgit2-sys/libgit2/src/streams/openssl.h
+@@ -31,7 +31,8 @@ extern int git_openssl__set_cert_location(const char *=
+=20
+=20
+=20
+-# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_N=
UMBER)
++# if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2=
0700000L)
+=20
+ GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name)
+ {
--------------44395395FD4A2BBCED9177B8--
--TCWYMtrquTsdQZNy8hG49sFvFfuEdcfJZ--
--qQVAIhcqsNuKFjaya1nVlZp9JlvhUZ8mP
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEE/RdyC3Asy49czZEGtQ4IJhNZSS0FAltVIZUACgkQtQ4IJhNZ
SS057A//dB4oIP2o9pF5i3sKsxPO9kTDziUakS/zJDx6UnOj8GxkkorFIw+8W3Ym
bu8OHXTQN5WqbVkV7BJsefp/HCuDHK4XnflIPOW80gYo8Xfqdu5ytjc4kv4BxLeK
+jFaJyQcUaeeA0+UjWVzlZbF/nemXMuu3am69CtfxqPOzkkaAU8iZ/QSvYJQYY4t
O0LYuYHIMQd85xLGh3j1ub5C16jgjB9lAKsKr5p8na4GEmuW2OkkC2fWdPLVLutG
6gsM2iaWsSiwtjupio5KntpT7Eh79xxi//rn83V0CQYUENaPMoKVhx/S0kVippLs
G1tcBr66dFTB2XvYphr9ELJGYE0SxhLs3q8hXoLZggOGDtlfFFqUfnz0jUHr0E41
vYxfUFywfW1c6UqNwveyWJU94J7OkJphgphLXxKDsRFh5OA8dAhaRJIxM+f7W5TI
CK+6uXxPf0OzJnE5voqmipHFgGpJddmWzFILQW5K6/GiY7JUAKAR7oSEpH8cM1i3
h8C2USzUcZf1qfc3MjiXYIW1i3K9bGeQzPDsIIJYKXQulMatsNp2H6QGw8c4ZS4U
gpW145XDsFq3YFJDZleNVNIDnE2BLP5D+68tQTsn4O9jZ291jyh04GIc/xEiixJt
b3b7+TN6eSZjUrRVbjxSTbMN5lJeFvBIVMY5HU+oqYp1gSkP+xc=
=lhEC
-----END PGP SIGNATURE-----
--qQVAIhcqsNuKFjaya1nVlZp9JlvhUZ8mP--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?610f4abf-56a2-602b-3cd6-0a3f0e979111>