From owner-freebsd-ports@freebsd.org Mon Jul 23 00:30:54 2018 Return-Path: Delivered-To: freebsd-ports@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F19B2103469B for ; Mon, 23 Jul 2018 00:30:53 +0000 (UTC) (envelope-from ml@vishwin.info) Received: from mailman.ysv.freebsd.org (mailman.ysv.freebsd.org [IPv6:2001:1900:2254:206a::50:5]) by mx1.freebsd.org (Postfix) with ESMTP id 69B698C168 for ; Mon, 23 Jul 2018 00:30:53 +0000 (UTC) (envelope-from ml@vishwin.info) Received: by mailman.ysv.freebsd.org (Postfix) id 2A3D4103469A; Mon, 23 Jul 2018 00:30:53 +0000 (UTC) Delivered-To: ports@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07B561034699 for ; Mon, 23 Jul 2018 00:30:53 +0000 (UTC) (envelope-from ml@vishwin.info) Received: from varun.vishwin.info (varun.vishwin.info [46.101.93.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "varun.vishwin.info", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5F2678C15E; Mon, 23 Jul 2018 00:30:52 +0000 (UTC) (envelope-from ml@vishwin.info) Received: from varun.vishwin.info (fd35:9eae:7575::2 [IPv6:fd35:9eae:7575::2]) by varun.vishwin.info (OpenSMTPD) with ESMTP id 627e7ac2; Sun, 22 Jul 2018 20:30:17 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=vishwin.info; h=subject :references:to:cc:from:message-id:date:mime-version:in-reply-to :content-type; s=fuccboi12; bh=qVrjL74l7p5x+69DHvdrLCcE4w0f9vrGa DuOUniubYM=; b=FubwO3Io0T1tBU0Tb6SK3CnCpkEzYXDl+YsH/7KejELQhhBuL oD9JuFkPNatToUrCX4TjJsAHNWcmmZXqq+5KNPpL7eTPW2PedZ0lYkOPBjy1JUlU YryiXkSDZKnXpWomMc7ojzQaiUCcB+2v0A/yVcUU8Mw8GMbjO/O6t5kebLQJoNul TYtDv+AZdXZbzo+e9UMfmHGAdeuRz0pFya4GeZDN1PQqFPUNZuV151x5xvva6FeZ H02xqHJoZNw15l6iC7Vx44Gc66nGmFAFzYV+/VS5Y35wKTAupT2tEZq/s1ujrEs5 4cGKgffFogLOMzAwWEDuWMDOdyGFpNEO83Glg== Received: from [IPv6:2001:470:8:6ca:cad7:19ff:fec0:a06d] (2001:470:8:6ca:cad7:19ff:fec0:a06d [IPv6:2001:470:8:6ca:cad7:19ff:fec0:a06d]) by varun.vishwin.info (OpenSMTPD) with ESMTPSA id 36082567 TLS version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO; Sun, 22 Jul 2018 20:30:16 -0400 (EDT) Subject: Re: lang/rust build failure on r475116 References: To: ports@freebsd.org Cc: rust@freebsd.org From: Charlie Li Openpgp: preference=signencrypt Autocrypt: addr=ml@vishwin.info; keydata= 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 FqGGsWKHymE= Message-ID: <610f4abf-56a2-602b-3cd6-0a3f0e979111@vishwin.info> Date: Sun, 22 Jul 2018 20:30:08 -0400 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:60.0) Gecko/20100101 Thunderbird/60.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="qQVAIhcqsNuKFjaya1nVlZp9JlvhUZ8mP" X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jul 2018 00:30:54 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --qQVAIhcqsNuKFjaya1nVlZp9JlvhUZ8mP Content-Type: multipart/mixed; boundary="TCWYMtrquTsdQZNy8hG49sFvFfuEdcfJZ"; protected-headers="v1" From: Charlie Li 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: In-Reply-To: --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--