Date: Monday, April 27, 2020 @ 06:01:49 Author: tensor5 Revision: 621788
upgpkg: zcash 2.1.2-1 Modified: zcash/trunk/PKGBUILD zcash/trunk/use-system-qpid-proton.patch zcash/trunk/use-system-rust.patch ------------------------------+ PKGBUILD | 96 +++++------------------------------------ use-system-qpid-proton.patch | 2 use-system-rust.patch | 34 +++++--------- 3 files changed, 27 insertions(+), 105 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-04-27 04:29:04 UTC (rev 621787) +++ PKGBUILD 2020-04-27 06:01:49 UTC (rev 621788) @@ -1,8 +1,8 @@ # Maintainer: Nicola Squartini <tens...@gmail.com> pkgname=zcash -pkgver=2.1.1_1 -_commit=5cb77119e4327a652908e4fede9b3816d37487f3 +pkgver=2.1.2 +_commit=ff1e8ebe2fe86394739e3190a06e5ea7fd85ace0 pkgrel=1 pkgdesc='Permissionless financial system employing zero-knowledge security' arch=('x86_64') @@ -10,14 +10,14 @@ license=('MIT') depends=('boost-libs' 'libevent' 'qpid-proton' 'zeromq') makedepends=('boost' 'cmake' 'git' 'gmock' 'python' 'rust' 'wget') -checkdepends=('python2-pyblake2' 'python2-pyzmq' 'python2-qpid-proton') +checkdepends=('python-pyblake2' 'python-pyzmq' 'python-requests' 'python-simplejson') source=("git+https://github.com/zcash/zcash.git#commit=${_commit}" 'use-system-qpid-proton.patch' 'use-system-rust.patch' 'zcashd.service') sha512sums=('SKIP' - '2d877820a16c4cd89f5506e59575e23088df418f8cb8a0cf78d28365704b1ada5154bb13ab645a00cfda1329c25b4dcc8e3c0851302e788087c932adf98a9090' - 'e905707b3fbbce732c77ff0c831b33a4778d62f4c0404f93c587d20a9c893b141c2acbde80a10ced98631668d62c9689b8faef3163aeb178b20391e06833a360' + '0d9c089e1b9eddc127936dbc12984804f3ad65c35845a336368cc9fce22ae784fb486a9a74b5cf34f42739779b42c18084f0558c9c1c74f18c6d8999596c7af6' + '1267fc174df81a80a1b0f2e1a6bbaaa6fa95402c83bc6a8678b582ed6c7f7a02eeed0f61c9600496aa782f9fb9fec6dc9ac419d366d059306a5c4f97a5a166f0' '2fb8b0a636ca9c7ee15f0fd2c47046c8323ade3de9562f393da7541eee50dd14b12107dd29b0e1ee90ff88963e2f7e25b12435166a1812df5c88c579c12dde88') prepare() { @@ -34,77 +34,9 @@ cd ${pkgname} cd depends - rust_crates=( - crate_aes - crate_aesni - crate_aes_soft - crate_arrayref - crate_arrayvec - crate_autocfg - crate_bech32 - crate_bit_vec - crate_blake2b_simd - crate_blake2s_simd - crate_block_buffer - crate_block_cipher_trait - crate_block_padding - crate_byte_tools - crate_byteorder - crate_c2_chacha - crate_cfg_if - crate_constant_time_eq - crate_crossbeam_channel - crate_crossbeam_deque - crate_crossbeam_epoch - crate_crossbeam_queue - crate_crossbeam_utils - crate_crossbeam - crate_crypto_api_chachapoly - crate_crypto_api - crate_digest - crate_directories - crate_fake_simd - crate_fpe - crate_futures_cpupool - crate_futures - crate_generic_array - crate_getrandom - crate_hex - crate_lazy_static - crate_libc - crate_log - crate_memoffset - crate_nodrop - crate_num_bigint - crate_num_cpus - crate_num_integer - crate_num_traits - crate_opaque_debug - crate_ppv_lite86 - crate_proc_macro2 - crate_quote - crate_rand_chacha - crate_rand_core - crate_rand_hc - crate_rand_os - crate_rand_xorshift - crate_rand - crate_rustc_version - crate_scopeguard - crate_semver_parser - crate_semver - crate_sha2 - crate_syn - crate_typenum - crate_unicode_xid - crate_wasi - crate_winapi_i686_pc_windows_gnu - crate_winapi - crate_winapi_x86_64_pc_windows_gnu - ) make install \ native_packages='' \ - packages="bdb ${rust_crates[*]} librustzcash" + packages="bdb utfcpp" cd .. BUILD="$(./depends/config.guess)" @@ -112,26 +44,24 @@ LDFLAGS="${LDFLAGS} -L${PWD}/depends/${BUILD}/lib" ./autogen.sh - depends_prefix="${PWD}/depends/${BUILD}" ./configure --prefix=/usr - make + depends_prefix="${PWD}/depends/${BUILD}" ./configure --prefix=/usr \ + --enable-online-rust \ + --enable-proton + make RUST_TARGET="${BUILD}" } check() { cd ${pkgname} - # Tests require python2 - mkdir "${srcdir}/python" - ln -s /usr/bin/python2 "${srcdir}/python/python" - export PATH="${srcdir}/python:${PATH}" - ./zcutil/fetch-params.sh --testnet - # ./qa/zcash/full_test_suite.py + export RUST_TARGET="$(./depends/config.guess)" + ./qa/zcash/full_test_suite.py || true } package() { cd ${pkgname} - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" RUST_TARGET="$(./depends/config.guess)" install for ext in '-cli' '-tx' 'd'; do install -Dm644 contrib/zcash${ext}.bash-completion \ Modified: use-system-qpid-proton.patch =================================================================== --- use-system-qpid-proton.patch 2020-04-27 04:29:04 UTC (rev 621787) +++ use-system-qpid-proton.patch 2020-04-27 06:01:49 UTC (rev 621788) @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -598,17 +598,13 @@ +@@ -672,17 +672,13 @@ [], [AC_MSG_WARN([Proton headers not found, disabling Proton support]) use_proton=no]) Modified: use-system-rust.patch =================================================================== --- use-system-rust.patch 2020-04-27 04:29:04 UTC (rev 621787) +++ use-system-rust.patch 2020-04-27 06:01:49 UTC (rev 621788) @@ -1,22 +1,14 @@ ---- a/depends/packages/librustzcash.mk -+++ b/depends/packages/librustzcash.mk -@@ -5,9 +5,8 @@ - $(package)_download_file=$($(package)_git_commit).tar.gz - $(package)_sha256_hash=dfb80e9a57d944a91092094a423a8a6631e38b602b337aad5f98dc21002ca6dc - $(package)_git_commit=a57dc7f47807ea50cb0a5deec9b84b3e7da11bc0 --$(package)_dependencies=rust - ifeq ($(LIBRUSTZCASH_OVERRIDE),) --$(package)_dependencies+=$(rust_crates) -+$(package)_dependencies=$(rust_crates) - $(package)_patches=cargo.config remove-dev-dependencies.diff - endif +--- a/qa/zcash/full_test_suite.py ++++ b/qa/zcash/full_test_suite.py +@@ -133,9 +133,9 @@ -@@ -60,7 +59,7 @@ - endef - - define $(package)_build_cmds -- $(host_prefix)/native/bin/cargo build --package librustzcash $($(package)_build_opts) -+ cargo build --package librustzcash $($(package)_build_opts) - endef - - define $(package)_stage_cmds + if os.path.isdir(depends_dir): + rust_env = os.environ.copy() +- rust_env['RUSTC'] = os.path.join(depends_dir, 'native', 'bin', 'rustc') ++ rust_env['RUSTC'] = 'rustc' + return subprocess.call([ +- os.path.join(depends_dir, 'native', 'bin', 'cargo'), ++ 'cargo', + 'test', + '--manifest-path', + os.path.join(REPOROOT, 'Cargo.toml'),