CVS commit: pkgsrc/lang/rust

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jan 22 09:17:15 UTC 2019

Modified Files:
        pkgsrc/lang/rust: Makefile distinfo
Added Files:
        pkgsrc/lang/rust/patches: patch-vendor_rand_src_rngs_os.rs

Log Message:
rust: Put back SunOS fix lost in previous update.


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/lang/rust/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/lang/rust/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/rust/patches/patch-vendor_rand_src_rngs_os.rs

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.75 pkgsrc/lang/rust/Makefile:1.76
--- pkgsrc/lang/rust/Makefile:1.75      Sun Jan 20 17:12:31 2019
+++ pkgsrc/lang/rust/Makefile   Tue Jan 22 09:17:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2019/01/20 17:12:31 jperkin Exp $
+# $NetBSD: Makefile,v 1.76 2019/01/22 09:17:15 jperkin Exp $
 
 DISTNAME=      rustc-1.32.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -280,6 +280,9 @@ post-extract:
                ${TOOLS_BASH} ./install.sh --prefix=${RUST_BOOTSTRAP_PATH};     \
        fi
 # patch(1) in NetBSD does not handle .cargo-checksum.json like long width file.
+       ${CP} ${WRKSRC}/vendor/rand/.cargo-checksum.json \
+             ${WRKSRC}/vendor/rand/.cargo-checksum.json.orig
+       ${SED} -e 's/cb94a0b54e47022b2e9b58b45e0196785c61d083760333276226da435cc040d9/bcb195562cf830c9e2078757e6d0976f86ede59816ff305e21a2764a4a4cf43e/' 
${WRKSRC}/vendor/rand/.cargo-checksum.json.orig > ${WRKSRC}/vendor/rand/.cargo-checksum.json
 
 .if ${OPSYS} == "NetBSD"
        SDIR=${WRKDIR}/scripts; \

Index: pkgsrc/lang/rust/distinfo
diff -u pkgsrc/lang/rust/distinfo:1.52 pkgsrc/lang/rust/distinfo:1.53
--- pkgsrc/lang/rust/distinfo:1.52      Sat Jan 19 12:44:08 2019
+++ pkgsrc/lang/rust/distinfo   Tue Jan 22 09:17:15 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.52 2019/01/19 12:44:08 ryoon Exp $
+$NetBSD: distinfo,v 1.53 2019/01/22 09:17:15 jperkin Exp $
 
 SHA1 (rust-1.31.0-x86_64-sun-solaris.tar.gz) = 782763ddcfb58df6d522aa8b66286e01451c6cb5
 RMD160 (rust-1.31.0-x86_64-sun-solaris.tar.gz) = ad93cf10e3b21c63989310b49ea6874520062400
@@ -116,3 +116,4 @@ SHA1 (patch-src_tools_cargo_tests_testsu
 SHA1 (patch-src_tools_rls_src_cmd.rs) = 754bfb8806e209cb0ef01690b48bf4b145017ab9
 SHA1 (patch-src_tools_rls_src_server_io.rs) = 74b90c1aeb70b0c3a20709145d6568ddf4647877
 SHA1 (patch-src_tools_rust-installer_install-template.sh) = f2ec6dced2be1fa23773d5827503ad07d0913dc2
+SHA1 (patch-vendor_rand_src_rngs_os.rs) = 7a1c6d91d9418e1f8e378c4baca33045cc768f2d

Added files:

Index: pkgsrc/lang/rust/patches/patch-vendor_rand_src_rngs_os.rs
diff -u /dev/null pkgsrc/lang/rust/patches/patch-vendor_rand_src_rngs_os.rs:1.1
--- /dev/null   Tue Jan 22 09:17:15 2019
+++ pkgsrc/lang/rust/patches/patch-vendor_rand_src_rngs_os.rs   Tue Jan 22 09:17:15 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-vendor_rand_src_rngs_os.rs,v 1.1 2019/01/22 09:17:15 jperkin Exp $
+
+Explicitly disable getrandom support on SunOS, the test fails.
+https://github.com/rust-random/rand/issues/637
+
+--- vendor/rand/src/rngs/os.rs.orig    2019-01-16 11:06:08.000000000 +0000
++++ vendor/rand/src/rngs/os.rs
+@@ -675,6 +675,7 @@ mod imp {
+     }
+ 
+     fn getrandom(buf: &mut [u8], blocking: bool) -> libc::c_long {
++        return -1;
+         extern "C" {
+             fn syscall(number: libc::c_long, ...) -> libc::c_long;
+         }