Index: head/lang/rust/Makefile =================================================================== --- head/lang/rust/Makefile (revision 454937) +++ head/lang/rust/Makefile (revision 454938) @@ -1,392 +1,392 @@ # Created by: Jyun-Yan You # $FreeBSD$ PORTNAME= rust -PORTVERSION?= 1.21.0 -PORTREVISION= 1 +PORTVERSION?= 1.22.1 CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/:src \ LOCAL/dumbbell/rust:rust_bootstrap \ https://static.rust-lang.org/dist/:rust_bootstrap \ LOCAL/dumbbell/rust:cargo_bootstrap \ https://static.rust-lang.org/dist/:cargo_bootstrap \ https://s3.amazonaws.com/rust-lang-ci/cargo-builds/:cargo_bootstrap \ LOCAL/marino:bootstrap DISTNAME?= ${PORTNAME}c-${PORTVERSION}-src DISTFILES?= ${DISTNAME}${EXTRACT_SUFX}:src \ ${RUSTC_BOOTSTRAP}:rust_bootstrap \ ${RUST_STD_BOOTSTRAP}:rust_bootstrap \ ${CARGO_BOOTSTRAP}:cargo_bootstrap DIST_SUBDIR?= rust EXTRACT_ONLY?= ${DISTFILES:N*\:*bootstrap:C/:.*//} MAINTAINER= rust@FreeBSD.org COMMENT= Language with a focus on memory safety and concurrency LICENSE= APACHE20 \ MIT LICENSE_COMB= dual # APACHE20 license is standard, see Templates/Licenses/APACHE20 LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT BUILD_DEPENDS= cmake:devel/cmake LIB_DEPENDS= libcurl.so:ftp/curl \ libssh2.so:security/libssh2 ONLY_FOR_ARCHS?= aarch64 amd64 i386 ONLY_FOR_ARCHS_REASON= requires prebuilt bootstrap compiler # FIXME: The bootstrapped rustc adds -L/usr/local/lib in front of # the LDFLAGS. When stage0's rustc is linked, it picks the installed # librust*so and fails. #CONFLICTS_BUILD?= rust-nightly #CONFLICTS_BUILD+= ${PKGBASE} CONFLICTS_INSTALL?= rust-nightly -BOOTSTRAPS_DATE?= 2017-08-31 +BOOTSTRAPS_DATE?= 2017-10-12 -RUST_BOOTSTRAP_VERSION?= 1.20.0 +RUST_BOOTSTRAP_VERSION?= 1.21.0 RUSTC_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz RUST_STD_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz -CARGO_BOOTSTRAP_VERSION?= 0.21.0 +CARGO_BOOTSTRAP_VERSION?= 0.22.0 CARGO_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${RUST_TARGET}${EXTRACT_SUFX} RUST_CHANNEL= ${PKGNAMESUFFIX:Ustable:S/^-//} # Rust's target arch string is different from *BSD arch strings RUST_ARCH_aarch64= aarch64 RUST_ARCH_amd64= x86_64 RUST_ARCH_i386= i686 RUST_ARCH_x86_64= x86_64 # dragonfly RUST_TARGET= ${RUST_ARCH_${ARCH}}-unknown-${OPSYS:tl} PLIST_SUB+= RUST_TARGET=${RUST_TARGET} USES= compiler gmake libedit pkgconfig python:2.7,build ssl OPTIONS_DEFINE= DOCS GDB LLNEXTGEN PORT_LLVM SOURCES GDB_DESC= Install ports gdb (necessary for debugging rust programs) LLNEXTGEN_DESC= Build with grammar verification SOURCES_DESC= Install source files GDB_RUN_DEPENDS= ${LOCALBASE}/bin/gdb:devel/gdb LLNEXTGEN_BUILD_DEPENDS= LLnextgen:devel/llnextgen # Rust may pass more regression tests with bundled LLVM PORT_LLVM_DESC= Build against devel/llvm${LLVM_VER} instead of bundled version PORT_LLVM_BUILD_DEPENDS= ${LOCALBASE}/bin/FileCheck${LLVM_VER}:devel/llvm${LLVM_VER} LLVM_VER?= 40 LLVM_CONFIG= ${LOCALBASE}/bin/llvm-config${LLVM_VER} # Rust manifests list all files and directories installed by rust-installer. # We use them in: # - pre-install to cleanup the ${STAGEDIR} # - post-install to populate the ${TMPPLIST} RUST_MANIFESTS= lib/rustlib/manifest-cargo \ lib/rustlib/manifest-rls-preview \ lib/rustlib/manifest-rustc \ lib/rustlib/manifest-rust-analysis-${RUST_TARGET} \ lib/rustlib/manifest-rust-std-${RUST_TARGET} RUST_DOCS_MANIFEST= lib/rustlib/manifest-rust-docs RUST_SRC_MANIFEST= lib/rustlib/manifest-rust-src DOCS_VARS= rust_manifests+=${RUST_DOCS_MANIFEST} SOURCES_VARS= rust_manifests+=${RUST_SRC_MANIFEST} PLIST_FILES= lib/rustlib/components \ lib/rustlib/rust-installer-version .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200031 EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ino64 .endif X_PY_ENV= HOME="${WRKDIR}" \ OPENSSL_DIR="${OPENSSLBASE}" X_PY_CMD= ${PYTHON_CMD} ${WRKSRC}/x.py CRATES_PATCHED_BY_FBSD10_FIX= src/vendor/libssh2-sys \ src/vendor/lzma-sys pre-fetch: # FIXME: This is the same check for CONFLICTS as the standard # one, except port origins are not compared. This allows # the port to conflict with itself, because Rust would pick # installed Rust libraries instead of freshly built ones. @conflicts_with=$$( \ { ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} 2>/dev/null || : ; } \ | while read pkgname prfx orgn; do \ if [ "/${PREFIX}" = "/$${prfx}" ]; then \ ${ECHO_CMD} -n " $${pkgname}"; \ fi; \ done); \ if [ -n "$${conflicts_with}" ]; then \ ${ECHO_MSG}; \ ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package(s): "; \ for entry in $${conflicts_with}; do \ ${ECHO_MSG} " $${entry}"; \ done; \ ${ECHO_MSG}; \ ${ECHO_MSG} " They will not build together."; \ ${ECHO_MSG} " Please remove them first with pkg delete."; \ exit 1;\ fi RUST_STD_DIR= ${RUST_STD_BOOTSTRAP:T:R:R} -LIBSTD_SUFFIX_aarch64= 8eed00280b051035 -LIBSTD_SUFFIX_amd64= fdf1c4a03a15a71f -LIBSTD_SUFFIX_i386= aaa09cdd21ad338f +LIBSTD_SUFFIX_aarch64= 0b5479f9b944419b +LIBSTD_SUFFIX_amd64= d5600fa473bb2268 +LIBSTD_SUFFIX_i386= 7c10a38de31dc096 LIBSTD= ${RUST_STD_DIR}/rust-std-${RUST_TARGET}/lib/rustlib/${RUST_TARGET}/lib/libstd-${LIBSTD_SUFFIX_${ARCH}:U${LIBSTD_SUFFIX}}.rlib STDF= ${LIBSTD:T:R:S/lib//}.0.o post-extract: @${MKDIR} \ ${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}} \ ${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}} ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUSTC_BOOTSTRAP} \ ${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}} .if ${OPSYS} != FreeBSD || ${OSVERSION} < 1200031 ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUST_STD_BOOTSTRAP} \ ${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}} .endif ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${CARGO_BOOTSTRAP} \ ${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}} .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200031 ${TAR} -x -C ${WRKSRC} -f ${DISTDIR}/${DIST_SUBDIR}/${RUST_STD_BOOTSTRAP} ${CC} ${CFLAGS} -fPIC -c -o ${WRKSRC}/old_fstat.o ${FILESDIR}/old_fstat.c (cd ${WRKSRC} && ${AR} x ${WRKSRC}/${LIBSTD} ${STDF}) ${LD} -r -o ${WRKSRC}/std.xx.o ${WRKSRC}/${STDF} ${WRKSRC}/old_fstat.o ${MV} ${WRKSRC}/std.xx.o ${WRKSRC}/${STDF} (cd ${WRKSRC} && ${AR} r ${WRKSRC}/${LIBSTD} ${STDF}) ${TAR} -cy --format=ustar -C ${WRKSRC} -f ${WRKSRC}/rustc.tbz ${RUST_STD_DIR} ${MV} ${WRKSRC}/rustc.tbz ${WRKSRC}/build/cache/${RUST_STD_BOOTSTRAP} .endif post-patch: @${REINPLACE_CMD} -e 's|gdb|${LOCALBASE}/bin/gdb|' \ ${WRKSRC}/src/etc/rust-gdb # If we override the versions and date of the bootstraps (for instance # on aarch64 where we provide our own bootstraps), we need to update # places where they are recorded. @if test "${BOOTSTRAPS_DATE_${ARCH}}" && \ test "${BOOTSTRAPS_DATE_${ARCH}}" != "${BOOTSTRAPS_DATE}"; then \ ${REINPLACE_CMD} -e \ 's|^date:.*|date: ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}|' \ ${WRKSRC}/src/stage0.txt; \ fi @if test "${RUST_BOOTSTRAP_VERSION_${ARCH}}" && \ test "${RUST_BOOTSTRAP_VERSION_${ARCH}}" != "${RUST_BOOTSTRAP_VERSION}"; then \ ${REINPLACE_CMD} -e \ 's|^rustc:.*|rustc: ${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}|' \ ${WRKSRC}/src/stage0.txt; \ fi @if test "${CARGO_BOOTSTRAP_VERSION_${ARCH}}" && \ test "${CARGO_BOOTSTRAP_VERSION_${ARCH}}" != "${CARGO_BOOTSTRAP_VERSION}"; then \ ${REINPLACE_CMD} -e \ 's|^cargo:.*|cargo: ${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}|' \ ${WRKSRC}/src/stage0.txt; \ fi # 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 \ cd "$$dir"; \ for file in $$(${FIND} * -name "*.orig"); do \ old_checksum=$$(${SHA256} -q "$$file"); \ new_checksum=$$(${SHA256} -q "$${file%%.orig}"); \ regex="$$regex -e s|\"$${file%%.orig}\":\"$$old_checksum\"|\"$${file%%.orig}\":\"$$new_checksum\"|"; \ done; \ if test "$$regex"; then \ ${REINPLACE_CMD} -E $$regex .cargo-checksum.json; \ fi; \ done # We make a backup of a few files before the FreeBSD 10 autotools # fix is applied. We'll need them in `do-configure` to update the # `.cargo-checksum.json` files. @for crate in ${CRATES_PATCHED_BY_FBSD10_FIX}; do \ for file in $$(${FIND} "${WRKSRC}/$$crate" -name "config.rpath"); do \ ${CP} "$$file" "$$file.orig"; \ done; \ done do-configure: ${SED} -E \ -e 's,%PREFIX%,${PREFIX},' \ -e 's,%SYSCONFDIR%,${PREFIX}/etc,' \ -e 's,%MANDIR%,${MANPREFIX}/man,' \ -e 's,%PYTHON_CMD%,${PYTHON_CMD},' \ -e 's,%CHANNEL%,${RUST_CHANNEL},' \ -e 's,%TARGET%,${RUST_TARGET},' \ < ${FILESDIR}/config.toml \ > ${WRKSRC}/config.toml # The FreeBSD 10 autotools fix may modify some files just before # `do-configure`. Like after `extra-path-ino64`, we need to update # `.cargo-checksum.json`. @for crate in ${CRATES_PATCHED_BY_FBSD10_FIX}; do \ cd "${WRKSRC}/$$crate"; \ for file in $$(${FIND} * -name "*.orig"); do \ old_checksum=$$(${SHA256} -q "$$file"); \ new_checksum=$$(${SHA256} -q "$${file%%.orig}"); \ regex="$$regex -e s|\"$${file%%.orig}\":\"$$old_checksum\"|\"$${file%%.orig}\":\"$$new_checksum\"|"; \ done; \ if test "$$regex"; then \ ${REINPLACE_CMD} -E $$regex .cargo-checksum.json; \ fi; \ done post-configure-DOCS-on: ${REINPLACE_CMD} -e 's,%DOCS%,true,' ${WRKSRC}/config.toml post-configure-DOCS-off: ${REINPLACE_CMD} -e 's,%DOCS%,false,' ${WRKSRC}/config.toml post-configure-PORT_LLVM-on: ${REINPLACE_CMD} -e 's,%LLVM_CONFIG%,${LLVM_CONFIG},' ${WRKSRC}/config.toml post-configure-PORT_LLVM-off: ${REINPLACE_CMD} -e '/%LLVM_CONFIG%/d' ${WRKSRC}/config.toml do-build: cd ${WRKSRC} && \ ${SETENV} ${X_PY_ENV} \ ${X_PY_CMD} build \ --verbose \ --config ./config.toml \ --jobs ${MAKE_JOBS_NUMBER} # In case the previous "make stage" failed, this ensures rust's # install.sh won't backup previously staged files before reinstalling # new ones. Otherwise, the staging directory is polluted with unneeded # files. pre-install: @for f in ${RUST_MANIFESTS} ${RUST_DOCS_MANIFEST} ${RUST_SRC_MANIFEST}; do \ if test -f "${STAGEDIR}${PREFIX}/$$f"; then \ ${SED} -E -e 's,^(file|dir):,${STAGEDIR},' \ < "${STAGEDIR}${PREFIX}/$$f" \ | ${XARGS} ${RM} -r; \ ${RM} "${STAGEDIR}${PREFIX}/$$f"; \ fi; \ done @for f in ${PLIST_FILES}; do \ ${RM} "${STAGEDIR}${PREFIX}/$$f"; \ done do-install: cd ${WRKSRC} && \ ${SETENV} ${X_PY_ENV} \ DESTDIR=${STAGEDIR} \ ${X_PY_CMD} install \ --verbose \ --config ./config.toml \ --jobs ${MAKE_JOBS_NUMBER} # In post-install, we use the manifests generated during Rust install # to in turn generate the PLIST. We do that, instead of the regular # `pkg-plist`, because several libraries have a computed filename based # on the absolute path of the source files. As it is user-specific, we # can't know their filename in advance. # # Both rustc and Cargo components install the same README.md and LICENSE # files. The install process backs up the first copy to install the # second. Thus here, we need to remove those backups. We also need to # dedup the entries in the generated PLIST, because both components' # manifests list them. # # We fix manpage entries in the generated manifests because Rust # installs them uncompressed but the Ports framework compresses them. post-install: for f in ${RUST_MANIFESTS}; do \ ${REINPLACE_CMD} -E \ -e 's|:${STAGEDIR}|:|' \ -e 's|(man/man[1-9]/.*\.[0-9])|\1.gz|' \ ${STAGEDIR}${PREFIX}/$$f; \ ${RM} ${STAGEDIR}${PREFIX}/$$f.bak; \ ${ECHO} "${PREFIX}/$$f" >> ${TMPPLIST}; \ ${AWK} '\ /^file:/ { \ file=$$0; \ sub(/^file:/, "", file); \ print file; \ } \ /^dir:/ { \ dir=$$0; \ sub(/^dir:/, "", dir); \ system("find ${STAGEDIR}" dir " -type f | ${SED} -E -e \"s|${STAGEDIR}||\""); \ }' \ ${STAGEDIR}${PREFIX}/$$f >> ${TMPPLIST}; \ done ${RM} ${STAGEDIR}${PREFIX}/share/doc/rust/*.old ${SORT} -u < ${TMPPLIST} > ${TMPPLIST}.uniq ${MV} ${TMPPLIST}.uniq ${TMPPLIST} @${RM} \ ${STAGEDIR}${PREFIX}/lib/rustlib/install.log \ ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh # FIXME: Static libraries in lib/rustlib/*/lib/*.rlib are not stripped, # but they contain non-object files which make strip(1) unhappy. @${STRIP_CMD} \ ${STAGEDIR}${PREFIX}/bin/cargo \ ${STAGEDIR}${PREFIX}/bin/rls \ ${STAGEDIR}${PREFIX}/bin/rustc \ ${STAGEDIR}${PREFIX}/bin/rustdoc \ ${STAGEDIR}${PREFIX}/lib/*.so \ ${STAGEDIR}${PREFIX}/lib/rustlib/*/lib/*.so # We set `extended = true` in config.toml because we want to build # Cargo at the same time. However, this installs the rust-src component # as well. If the user doesn't want that, I don't know how to prevent # its install. So for now, use the rust-src manifest to remove it from # ${STAGEDIR}. post-install-SOURCES-off: if test -f "${STAGEDIR}${PREFIX}/${RUST_SRC_MANIFEST}"; then \ ${SED} -E -e 's,^(file|dir):,,' \ < "${STAGEDIR}${PREFIX}/${RUST_SRC_MANIFEST}" \ | ${XARGS} ${RM} -r; \ ${RM} "${STAGEDIR}${PREFIX}/${RUST_SRC_MANIFEST}"; \ ${RM} -r "${STAGEDIR}${PREFIX}/lib/rustlib/src"; \ fi # Note that make test does not work when rust is already installed. do-test: cd ${WRKSRC} && \ ${SETENV} ${X_PY_ENV} \ ALLOW_NONZERO_RLIMIT_CORE=1 \ ${X_PY_CMD} test \ --verbose \ --config ./config.toml \ --jobs ${MAKE_JOBS_NUMBER} BOOTSTRAPS_SOURCE_PKG_FBSDVER= 10 BOOTSTRAPS_SOURCE_PKG_FBSDVER_aarch64= 11 -BOOTSTRAPS_SOURCE_PKG_URL= http://pkg.freebsd.org/FreeBSD:${BOOTSTRAPS_SOURCE_PKG_FBSDVER_${ARCH}:U${BOOTSTRAPS_SOURCE_PKG_FBSDVER}}:${ARCH}/latest/All/rust-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}.txz +BOOTSTRAPS_SOURCE_PKG_REV= _1 +BOOTSTRAPS_SOURCE_PKG_URL= http://pkg.freebsd.org/FreeBSD:${BOOTSTRAPS_SOURCE_PKG_FBSDVER_${ARCH}:U${BOOTSTRAPS_SOURCE_PKG_FBSDVER}}:${ARCH}/latest/All/rust-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}${BOOTSTRAPS_SOURCE_PKG_REV}.txz BOOTSTRAPS_SOURCE_PKG= ${_DISTDIR}/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${ARCH}.txz package-to-bootstraps: ${BOOTSTRAPS_SOURCE_PKG} ${MKDIR} ${WRKDIR}/bootstraps ${RM} -r ${WRKDIR}/bootstraps/usr ${EXTRACT_CMD} \ -C ${WRKDIR}/bootstraps \ --strip-components 3 \ ${EXTRACT_BEFORE_ARGS} ${BOOTSTRAPS_SOURCE_PKG} ${LOCALBASE} # `rustc` bootstrap. ${RM} -r ${WRKDIR}/bootstraps/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET} ${MKDIR} ${WRKDIR}/bootstraps/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET} cd ${WRKDIR}/bootstraps/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET} && \ ${MKDIR} rustc/bin rustc/lib && \ ${MV} ${WRKDIR}/bootstraps/bin/rust* rustc/bin && \ ${MV} ${WRKDIR}/bootstraps/lib/*.so rustc/lib ${TAR} -cz --format=ustar -C ${WRKDIR}/bootstraps \ -f ${_DISTDIR}/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz \ rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET} # `rust-std` bootstrap. ${RM} -r ${WRKDIR}/bootstraps/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET} ${MKDIR} ${WRKDIR}/bootstraps/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET} cd ${WRKDIR}/bootstraps/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET} && \ ${MKDIR} rust-std-${RUST_TARGET}/lib/rustlib/${RUST_TARGET} && \ ${MV} ${WRKDIR}/bootstraps/lib/rustlib/${RUST_TARGET}/lib rust-std-${RUST_TARGET}/lib/rustlib/${RUST_TARGET} ${TAR} -cz --format=ustar -C ${WRKDIR}/bootstraps \ -f ${_DISTDIR}/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz \ rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET} ${BOOTSTRAPS_SOURCE_PKG}: ${MKDIR} ${@:H} ${FETCH_CMD} -o $@ ${BOOTSTRAPS_SOURCE_PKG_URL} .include Index: head/lang/rust/distinfo =================================================================== --- head/lang/rust/distinfo (revision 454937) +++ head/lang/rust/distinfo (revision 454938) @@ -1,21 +1,21 @@ -TIMESTAMP = 1508970863 -SHA256 (rust/rustc-1.21.0-src.tar.gz) = 1707c142244b5bd909993559c6116c81987c1de21d6207c05d3ecbe5bba548fa -SIZE (rust/rustc-1.21.0-src.tar.gz) = 52555346 -SHA256 (rust/2017-08-31/rustc-1.20.0-aarch64-unknown-freebsd.tar.gz) = 6703e3205c5d7075ea49acb5a0a2bf4fb1dfe3a10daf160a67a1c4376e37e530 -SIZE (rust/2017-08-31/rustc-1.20.0-aarch64-unknown-freebsd.tar.gz) = 42731935 -SHA256 (rust/2017-08-31/rust-std-1.20.0-aarch64-unknown-freebsd.tar.gz) = 9da54867a9b65e708f7e31c615f7a31bfacad2d9fe5459e570575118f29a122c -SIZE (rust/2017-08-31/rust-std-1.20.0-aarch64-unknown-freebsd.tar.gz) = 59365419 -SHA256 (rust/2017-08-31/cargo-0.21.0-aarch64-unknown-freebsd.tar.gz) = 9d556e11ea2f391bfa382f08818185c5d05bf94966ff35ae24e53a510f7ae5da -SIZE (rust/2017-08-31/cargo-0.21.0-aarch64-unknown-freebsd.tar.gz) = 2915815 -SHA256 (rust/2017-08-31/rustc-1.20.0-i686-unknown-freebsd.tar.gz) = 58c8c4f73c9170cd0e81071147cd0772fc5e8512f4fcfb6fd08ad2c60b69177d -SIZE (rust/2017-08-31/rustc-1.20.0-i686-unknown-freebsd.tar.gz) = 44170684 -SHA256 (rust/2017-08-31/rust-std-1.20.0-i686-unknown-freebsd.tar.gz) = 3426262d596ab8bf41b818965f995588256ae7008c162a39f83eed93ce3c42f8 -SIZE (rust/2017-08-31/rust-std-1.20.0-i686-unknown-freebsd.tar.gz) = 60720005 -SHA256 (rust/2017-08-31/cargo-0.21.0-i686-unknown-freebsd.tar.gz) = cad85e8beb87eeacfa80944b63653ed00a60b9d6f7e423ea0c58a83db8a2ea4a -SIZE (rust/2017-08-31/cargo-0.21.0-i686-unknown-freebsd.tar.gz) = 5134986 -SHA256 (rust/2017-08-31/rustc-1.20.0-x86_64-unknown-freebsd.tar.gz) = d7f06662a29023043e21f598d24803d6c2f0d801635016abb32636b55ca14535 -SIZE (rust/2017-08-31/rustc-1.20.0-x86_64-unknown-freebsd.tar.gz) = 43348607 -SHA256 (rust/2017-08-31/rust-std-1.20.0-x86_64-unknown-freebsd.tar.gz) = aa1773ec1049247ef0730195eb83a7a73f22df556fe759029679aabe0235a3d3 -SIZE (rust/2017-08-31/rust-std-1.20.0-x86_64-unknown-freebsd.tar.gz) = 60215051 -SHA256 (rust/2017-08-31/cargo-0.21.0-x86_64-unknown-freebsd.tar.gz) = 522592cdee824d8d7b7c3472f29ded39d10f1fb3d07f3b3ea0673b8edf6d5b66 -SIZE (rust/2017-08-31/cargo-0.21.0-x86_64-unknown-freebsd.tar.gz) = 5183277 +TIMESTAMP = 1511741686 +SHA256 (rust/rustc-1.22.1-src.tar.gz) = 8b7a42bdd6eb205a8c533eb41b5c42389a88158d060aed1e0f461f68c1fd3fd3 +SIZE (rust/rustc-1.22.1-src.tar.gz) = 54935620 +SHA256 (rust/2017-10-12/rustc-1.21.0-aarch64-unknown-freebsd.tar.gz) = 6302769f6ec103bcfe4c41134c1e76747371261288059195dc9ff8a44e67601f +SIZE (rust/2017-10-12/rustc-1.21.0-aarch64-unknown-freebsd.tar.gz) = 44419411 +SHA256 (rust/2017-10-12/rust-std-1.21.0-aarch64-unknown-freebsd.tar.gz) = 92bc37314a1bc044ce25df95ffa4f5222a96017da968e0e4256de02efa83e2a4 +SIZE (rust/2017-10-12/rust-std-1.21.0-aarch64-unknown-freebsd.tar.gz) = 59227300 +SHA256 (rust/2017-10-12/cargo-0.22.0-aarch64-unknown-freebsd.tar.gz) = df4127117966f55146624c4c198394754bdbe17a3ca6575b3f64d45b87929506 +SIZE (rust/2017-10-12/cargo-0.22.0-aarch64-unknown-freebsd.tar.gz) = 3072402 +SHA256 (rust/2017-10-12/rustc-1.21.0-i686-unknown-freebsd.tar.gz) = 166f977785da34b06d683d9c1b7a3618dd608832e862e9f8ea31c3362026e365 +SIZE (rust/2017-10-12/rustc-1.21.0-i686-unknown-freebsd.tar.gz) = 44398731 +SHA256 (rust/2017-10-12/rust-std-1.21.0-i686-unknown-freebsd.tar.gz) = db47d7f9f6f36d23c7cdc0369f1ca10335f9460e71552043a8c8753bb30733e4 +SIZE (rust/2017-10-12/rust-std-1.21.0-i686-unknown-freebsd.tar.gz) = 59018318 +SHA256 (rust/2017-10-12/cargo-0.22.0-i686-unknown-freebsd.tar.gz) = b2a27147d3ca741cb740f73a7651b9d816d583d7d89be189cae3b7eecff9104e +SIZE (rust/2017-10-12/cargo-0.22.0-i686-unknown-freebsd.tar.gz) = 5314447 +SHA256 (rust/2017-10-12/rustc-1.21.0-x86_64-unknown-freebsd.tar.gz) = 39324408009725e4e8c3c4baeece26063d461d1c946d448351ce60add591d328 +SIZE (rust/2017-10-12/rustc-1.21.0-x86_64-unknown-freebsd.tar.gz) = 43542981 +SHA256 (rust/2017-10-12/rust-std-1.21.0-x86_64-unknown-freebsd.tar.gz) = f76b49330c15cbcfa14865e38a05de672501688b913d0ae7ded0be2937e1b795 +SIZE (rust/2017-10-12/rust-std-1.21.0-x86_64-unknown-freebsd.tar.gz) = 58481493 +SHA256 (rust/2017-10-12/cargo-0.22.0-x86_64-unknown-freebsd.tar.gz) = 8b1d824ca94d7737f526ad4e73f482dfae40c1346fdbdf83d5c23f03657fe01d +SIZE (rust/2017-10-12/cargo-0.22.0-x86_64-unknown-freebsd.tar.gz) = 5378813 Index: head/lang/rust/files/patch-src_vendor_openssl-sys_src_lib.rs =================================================================== --- head/lang/rust/files/patch-src_vendor_openssl-sys_src_lib.rs (revision 454937) +++ head/lang/rust/files/patch-src_vendor_openssl-sys_src_lib.rs (nonexistent) @@ -1,19 +0,0 @@ ---- src/vendor/openssl-sys/src/lib.rs.orig 2017-10-09 21:52:49 UTC -+++ src/vendor/openssl-sys/src/lib.rs -@@ -1225,10 +1225,15 @@ pub const SSL_VERIFY_NONE: c_int = 0; - pub const SSL_VERIFY_PEER: c_int = 1; - pub const SSL_VERIFY_FAIL_IF_NO_PEER_CERT: c_int = 2; - --#[cfg(not(ossl101))] -+#[cfg(not(any(libressl261, libressl262, libressl263, ossl101)))] - pub const SSL_OP_TLSEXT_PADDING: c_ulong = 0x00000010; -+#[cfg(any(libressl261, libressl262, libressl263))] -+pub const SSL_OP_TLSEXT_PADDING: c_ulong = 0x0; - pub const SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: c_ulong = 0x00000800; -+#[cfg(not(any(libressl261, libressl262, libressl263)))] - pub const SSL_OP_CRYPTOPRO_TLSEXT_BUG: c_ulong = 0x80000000; -+#[cfg(any(libressl261, libressl262, libressl263))] -+pub const SSL_OP_CRYPTOPRO_TLSEXT_BUG: c_ulong = 0x0; - pub const SSL_OP_LEGACY_SERVER_CONNECT: c_ulong = 0x00000004; - #[cfg(not(libressl))] - pub const SSL_OP_SAFARI_ECDHE_ECDSA_BUG: c_ulong = 0x00000040; Property changes on: head/lang/rust/files/patch-src_vendor_openssl-sys_src_lib.rs ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/rust/files/patch-src_vendor_openssl-sys_build.rs =================================================================== --- head/lang/rust/files/patch-src_vendor_openssl-sys_build.rs (revision 454937) +++ head/lang/rust/files/patch-src_vendor_openssl-sys_build.rs (nonexistent) @@ -1,89 +0,0 @@ ---- src/vendor/openssl-sys/build.rs.orig 2017-10-09 21:52:49 UTC -+++ src/vendor/openssl-sys/build.rs -@@ -307,8 +307,14 @@ fn validate_headers(include_dirs: &[PathBuf]) -> Versi - #include - #include - --#if LIBRESSL_VERSION_NUMBER >= 0x20601000 -+#if LIBRESSL_VERSION_NUMBER >= 0x20604000 - RUST_LIBRESSL_NEW -+#elif LIBRESSL_VERSION_NUMBER >= 0x20603000 -+RUST_LIBRESSL_263 -+#elif LIBRESSL_VERSION_NUMBER >= 0x20602000 -+RUST_LIBRESSL_262 -+#elif LIBRESSL_VERSION_NUMBER >= 0x20601000 -+RUST_LIBRESSL_261 - #elif LIBRESSL_VERSION_NUMBER >= 0x20600000 - RUST_LIBRESSL_260 - #elif LIBRESSL_VERSION_NUMBER >= 0x20506000 -@@ -403,42 +409,70 @@ See rust-openssl README for more information: - println!("cargo:rustc-cfg=libressl"); - println!("cargo:rustc-cfg=libressl250"); - println!("cargo:libressl=true"); -+ println!("cargo:libressl_version=250"); - println!("cargo:version=101"); - Version::Libressl - } else if expanded.contains("RUST_LIBRESSL_251") { - println!("cargo:rustc-cfg=libressl"); - println!("cargo:rustc-cfg=libressl251"); - println!("cargo:libressl=true"); -+ println!("cargo:libressl_version=251"); - println!("cargo:version=101"); - Version::Libressl - } else if expanded.contains("RUST_LIBRESSL_252") { - println!("cargo:rustc-cfg=libressl"); - println!("cargo:rustc-cfg=libressl252"); - println!("cargo:libressl=true"); -+ println!("cargo:libressl_version=252"); - println!("cargo:version=101"); - Version::Libressl - } else if expanded.contains("RUST_LIBRESSL_253") { - println!("cargo:rustc-cfg=libressl"); - println!("cargo:rustc-cfg=libressl253"); - println!("cargo:libressl=true"); -+ println!("cargo:libressl_version=253"); - println!("cargo:version=101"); - Version::Libressl - } else if expanded.contains("RUST_LIBRESSL_254") { - println!("cargo:rustc-cfg=libressl"); - println!("cargo:rustc-cfg=libressl254"); - println!("cargo:libressl=true"); -+ println!("cargo:libressl_version=254"); - println!("cargo:version=101"); - Version::Libressl - } else if expanded.contains("RUST_LIBRESSL_255") { - println!("cargo:rustc-cfg=libressl"); - println!("cargo:rustc-cfg=libressl255"); - println!("cargo:libressl=true"); -+ println!("cargo:libressl_version=255"); - println!("cargo:version=101"); - Version::Libressl - } else if expanded.contains("RUST_LIBRESSL_260") { - println!("cargo:rustc-cfg=libressl"); - println!("cargo:rustc-cfg=libressl260"); - println!("cargo:libressl=true"); -+ println!("cargo:libressl_version=260"); -+ println!("cargo:version=101"); -+ Version::Libressl -+ } else if expanded.contains("RUST_LIBRESSL_261") { -+ println!("cargo:rustc-cfg=libressl"); -+ println!("cargo:rustc-cfg=libressl261"); -+ println!("cargo:libressl=true"); -+ println!("cargo:libressl_version=261"); -+ println!("cargo:version=101"); -+ Version::Libressl -+ } else if expanded.contains("RUST_LIBRESSL_262") { -+ println!("cargo:rustc-cfg=libressl"); -+ println!("cargo:rustc-cfg=libressl262"); -+ println!("cargo:libressl=true"); -+ println!("cargo:libressl_version=262"); -+ println!("cargo:version=101"); -+ Version::Libressl -+ } else if expanded.contains("RUST_LIBRESSL_263") { -+ println!("cargo:rustc-cfg=libressl"); -+ println!("cargo:rustc-cfg=libressl263"); -+ println!("cargo:libressl=true"); -+ println!("cargo:libressl_version=263"); - println!("cargo:version=101"); - Version::Libressl - } else if expanded.contains("RUST_OPENSSL_110F") { Property changes on: head/lang/rust/files/patch-src_vendor_openssl-sys_build.rs ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/rust/files/patch-src_vendor_openssl_src_ssl_mod.rs =================================================================== --- head/lang/rust/files/patch-src_vendor_openssl_src_ssl_mod.rs (revision 454937) +++ head/lang/rust/files/patch-src_vendor_openssl_src_ssl_mod.rs (nonexistent) @@ -1,18 +0,0 @@ ---- src/vendor/openssl/src/ssl/mod.rs.orig 2017-10-09 21:52:52 UTC -+++ src/vendor/openssl/src/ssl/mod.rs -@@ -652,6 +652,7 @@ impl SslContextBuilder { - - /// Set the protocols to be used during Next Protocol Negotiation (the protocols - /// supported by the application). -+ #[cfg(not(any(libressl261, libressl262, libressl263)))] - pub fn set_npn_protocols(&mut self, protocols: &[&[u8]]) -> Result<(), ErrorStack> { - // Firstly, convert the list of protocols to a byte-array that can be passed to OpenSSL - // APIs -- a list of length-prefixed strings. -@@ -1310,6 +1311,7 @@ impl SslRef { - /// - /// The protocol's name is returned is an opaque sequence of bytes. It is up to the client - /// to interpret it. -+ #[cfg(not(any(libressl261, libressl262, libressl263)))] - pub fn selected_npn_protocol(&self) -> Option<&[u8]> { - unsafe { - let mut data: *const c_uchar = ptr::null(); Property changes on: head/lang/rust/files/patch-src_vendor_openssl_src_ssl_mod.rs ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/rust/files/patch-src_vendor_openssl_src_ssl_tests_mod.rs =================================================================== --- head/lang/rust/files/patch-src_vendor_openssl_src_ssl_tests_mod.rs (revision 454937) +++ head/lang/rust/files/patch-src_vendor_openssl_src_ssl_tests_mod.rs (nonexistent) @@ -1,36 +0,0 @@ ---- src/vendor/openssl/src/ssl/tests/mod.rs.orig 2017-10-09 23:52:52.000000000 +0200 -+++ src/vendor/openssl/src/ssl/tests/mod.rs 2017-11-09 13:42:46.721625000 +0100 -@@ -503,6 +503,7 @@ - /// Tests that connecting with the client using NPN, but the server not does not - /// break the existing connection behavior. - #[test] -+#[cfg(not(any(libressl261, libressl262, libressl263)))] - fn test_connect_with_unilateral_npn() { - let (_s, stream) = Server::new(); - let mut ctx = SslContext::builder(SslMethod::tls()).unwrap(); -@@ -615,6 +616,7 @@ - /// Tests that when the `SslStream` is created as a server stream, the protocols - /// are correctly advertised to the client. - #[test] -+#[cfg(not(any(libressl261, libressl262, libressl263)))] - fn test_npn_server_advertise_multiple() { - let listener = TcpListener::bind("127.0.0.1:0").unwrap(); - let localhost = listener.local_addr().unwrap(); -@@ -1239,7 +1241,7 @@ - } - - #[test] --#[cfg(any(all(feature = "v101", ossl101), all(feature = "v102", ossl102)))] -+#[cfg(any(all(feature = "v101", ossl101, not(any(libressl261, libressl262, libressl263))), all(feature = "v102", ossl102)))] - fn tmp_ecdh_callback() { - use ec::EcKey; - use nid; -@@ -1306,7 +1308,7 @@ - } - - #[test] --#[cfg(any(all(feature = "v101", ossl101), all(feature = "v102", ossl102)))] -+#[cfg(any(all(feature = "v101", ossl101, not(any(libressl261, libressl262, libressl263))), all(feature = "v102", ossl102)))] - fn tmp_ecdh_callback_ssl() { - use ec::EcKey; - use nid; Property changes on: head/lang/rust/files/patch-src_vendor_openssl_src_ssl_tests_mod.rs ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_mod.rs =================================================================== --- head/lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_mod.rs (revision 454937) +++ head/lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_mod.rs (nonexistent) @@ -1,22 +0,0 @@ ---- src/vendor/openssl-sys/src/libressl/mod.rs.orig 2017-10-09 21:52:49 UTC -+++ src/vendor/openssl-sys/src/libressl/mod.rs -@@ -345,6 +345,9 @@ pub const SSL_CTRL_OPTIONS: c_int = 32; - pub const SSL_CTRL_CLEAR_OPTIONS: c_int = 77; - pub const SSL_CTRL_SET_ECDH_AUTO: c_int = 94; - -+#[cfg(any(libressl261, libressl262, libressl263))] -+pub const SSL_OP_ALL: c_ulong = 0x4; -+#[cfg(not(any(libressl261, libressl262, libressl263)))] - pub const SSL_OP_ALL: c_ulong = 0x80000014; - pub const SSL_OP_CISCO_ANYCONNECT: c_ulong = 0x0; - pub const SSL_OP_NO_COMPRESSION: c_ulong = 0x0; -@@ -357,6 +360,9 @@ pub const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: c_ulong = - pub const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: c_ulong = 0x0; - pub const SSL_OP_TLS_D5_BUG: c_ulong = 0x0; - pub const SSL_OP_TLS_BLOCK_PADDING_BUG: c_ulong = 0x0; -+#[cfg(any(libressl261, libressl262, libressl263))] -+pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x0; -+#[cfg(not(any(libressl261, libressl262, libressl263)))] - pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x00080000; - pub const SSL_OP_SINGLE_DH_USE: c_ulong = 0x00100000; - pub const SSL_OP_NO_SSLv2: c_ulong = 0x0; Property changes on: head/lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_mod.rs ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/rust/files/patch-src_vendor_openssl_build.rs =================================================================== --- head/lang/rust/files/patch-src_vendor_openssl_build.rs (revision 454937) +++ head/lang/rust/files/patch-src_vendor_openssl_build.rs (nonexistent) @@ -1,13 +0,0 @@ ---- src/vendor/openssl/build.rs.orig 2017-10-10 20:21:28 UTC -+++ src/vendor/openssl/build.rs -@@ -20,6 +20,10 @@ fn main() { - println!("cargo:rustc-cfg=libressl"); - } - -+ if let Ok(v) = env::var("DEP_OPENSSL_LIBRESSL_VERSION") { -+ println!("cargo:rustc-cfg=libressl{}", v); -+ } -+ - if let Ok(vars) = env::var("DEP_OPENSSL_CONF") { - for var in vars.split(",") { - println!("cargo:rustc-cfg=osslconf=\"{}\"", var); Property changes on: head/lang/rust/files/patch-src_vendor_openssl_build.rs ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property