Date: Friday, June 1, 2018 @ 23:33:31 Author: tensor5 Revision: 337031
archrelease: copy trunk to community-staging-x86_64 Added: zcash/repos/community-staging-x86_64/PKGBUILD (from rev 337030, zcash/trunk/PKGBUILD) zcash/repos/community-staging-x86_64/libsnark-no-gtest.patch (from rev 337030, zcash/trunk/libsnark-no-gtest.patch) zcash/repos/community-staging-x86_64/use-system-rust.patch (from rev 337030, zcash/trunk/use-system-rust.patch) zcash/repos/community-staging-x86_64/zcashd.service (from rev 337030, zcash/trunk/zcashd.service) Deleted: zcash/repos/community-staging-x86_64/PKGBUILD zcash/repos/community-staging-x86_64/libsnark-no-gtest.patch zcash/repos/community-staging-x86_64/use-system-rust.patch zcash/repos/community-staging-x86_64/zcashd.service -------------------------+ PKGBUILD | 177 ++++++++++++++++++++++++++-------------------- libsnark-no-gtest.patch | 44 +++++------ use-system-rust.patch | 22 ++--- zcashd.service | 18 ++-- 4 files changed, 144 insertions(+), 117 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-06-01 23:33:13 UTC (rev 337030) +++ PKGBUILD 2018-06-01 23:33:31 UTC (rev 337031) @@ -1,75 +0,0 @@ -# $Id$ -# Maintainer: Nicola Squartini <tens...@gmail.com> - -pkgname=zcash -pkgver=1.1.0 -_commit=42e30252372b39f2b8da655ebeca03565dc02de4 -pkgrel=3 -pkgdesc='Permissionless financial system employing zero-knowledge security' -arch=('x86_64') -url='https://z.cash/' -license=('MIT') -depends=('boost-libs' 'libevent' 'qpid-proton' 'zeromq') -makedepends=('boost' 'cargo' 'cmake' 'git' 'gmock' 'python' 'wget') -checkdepends=('python2-pyblake2' 'python2-pyzmq' 'python2-qpid-proton') -source=("git+https://github.com/zcash/zcash.git#commit=${_commit}" - 'libsnark-no-gtest.patch' - "use-system-rust.patch" - 'zcashd.service') -sha512sums=('SKIP' - '04d397a29f6c1916ba494069fa79a65e7760d95d67174ae113b1ebc2b71233c7ded24f74bec591546ee49cff2c20e45c762aa50bf3fc3b47789f8aa34e42f930' - 'ce98eb983956704af4fc05d0c0959bb3538127432e64b1ea1482f345a15b9d4fc6b41f631705cd5aa1e09aeea608781106e7915ddbc57f314811d262ae361c50' - '2fb8b0a636ca9c7ee15f0fd2c47046c8323ade3de9562f393da7541eee50dd14b12107dd29b0e1ee90ff88963e2f7e25b12435166a1812df5c88c579c12dde88') - -prepare() { - cd ${pkgname} - - # Set gitattributes on src/clientversion.cpp - git archive --format=tar ${_commit} -- src/clientversion.cpp | tar -xf - - - patch -Np1 -i ../libsnark-no-gtest.patch - patch -Np1 -i ../use-system-rust.patch - - # Runs forever - sed -e '/prioritisetransaction.py/d' -i qa/pull-tester/rpc-tests.sh -} - -build() { - cd ${pkgname} - - cd depends - make install \ - native_packages='' \ - packages='bdb crate_libc librustzcash' - cd .. - - BUILD="$(./depends/config.guess)" - CPPFLAGS="${CPPFLAGS} -I${PWD}/depends/${BUILD}/include" - LDFLAGS="${LDFLAGS} -L${PWD}/depends/${BUILD}/lib" - - ./autogen.sh - depends_prefix="${PWD}/depends/${BUILD}" ./configure --prefix=/usr - make -} - -check() { - cd ${pkgname} - - ./zcutil/fetch-params.sh - # ./qa/zcash/full_test_suite.py - ./qa/pull-tester/rpc-tests.sh -} - -package() { - cd ${pkgname} - - make DESTDIR="${pkgdir}" install - - for ext in '-cli' '-tx' 'd'; do - install -Dm644 contrib/zcash${ext}.bash-completion \ - "${pkgdir}"/usr/share/bash-completion/completions/zcash${ext} - done - - install -Dm644 -t "${pkgdir}"/usr/lib/systemd/user ../zcashd.service - install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING -} Copied: zcash/repos/community-staging-x86_64/PKGBUILD (from rev 337030, zcash/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-06-01 23:33:31 UTC (rev 337031) @@ -0,0 +1,102 @@ +# $Id$ +# Maintainer: Nicola Squartini <tens...@gmail.com> + +pkgname=zcash +pkgver=1.1.1 +_commit=047b0bf94a2018a5f842219d3d5cdc157f9a52da +pkgrel=1 +pkgdesc='Permissionless financial system employing zero-knowledge security' +arch=('x86_64') +url='https://z.cash/' +license=('MIT') +depends=('boost-libs' 'libevent' 'qpid-proton' 'zeromq') +makedepends=('boost' 'cargo' 'cmake' 'git' 'gmock' 'python' 'wget') +checkdepends=('python2-pyblake2' 'python2-pyzmq' 'python2-qpid-proton') +source=("git+https://github.com/zcash/zcash.git#commit=${_commit}" + 'libsnark-no-gtest.patch' + "use-system-rust.patch" + 'zcashd.service') +sha512sums=('SKIP' + '04d397a29f6c1916ba494069fa79a65e7760d95d67174ae113b1ebc2b71233c7ded24f74bec591546ee49cff2c20e45c762aa50bf3fc3b47789f8aa34e42f930' + '720e3f43f5d9093981148e181f8621224a678dab2e8923e5d3fce05e0eda9eb0e2677f5b8c2c19062eff5b5c277d85962ce11fd966438f3238d4b6df75c55aa8' + '2fb8b0a636ca9c7ee15f0fd2c47046c8323ade3de9562f393da7541eee50dd14b12107dd29b0e1ee90ff88963e2f7e25b12435166a1812df5c88c579c12dde88') + +prepare() { + cd ${pkgname} + + # Set gitattributes on src/clientversion.cpp + git archive --format=tar ${_commit} -- src/clientversion.cpp | tar -xf - + + patch -Np1 -i ../libsnark-no-gtest.patch + patch -Np1 -i ../use-system-rust.patch + + # Runs forever + sed -e '/prioritisetransaction.py/d' -i qa/pull-tester/rpc-tests.sh +} + +build() { + cd ${pkgname} + + cd depends + rust_crates=( + crate_arrayvec + crate_bellman + crate_bitflags + crate_bit_vec + crate_blake2_rfc + crate_byteorder + crate_constant_time_eq + crate_crossbeam + crate_digest + crate_fuchsia_zircon + crate_fuchsia_zircon_sys + crate_futures_cpupool + crate_futures + crate_generic_array + crate_lazy_static + crate_libc + crate_nodrop + crate_num_cpus + crate_pairing + crate_rand + crate_sapling_crypto + crate_typenum + crate_winapi_i686_pc_windows_gnu + crate_winapi + crate_winapi_x86_64_pc_windows_gnu + ) + make install \ + native_packages='' \ + packages="bdb ${rust_crates[*]} librustzcash" + cd .. + + BUILD="$(./depends/config.guess)" + CPPFLAGS="${CPPFLAGS} -I${PWD}/depends/${BUILD}/include" + LDFLAGS="${LDFLAGS} -L${PWD}/depends/${BUILD}/lib" + + ./autogen.sh + depends_prefix="${PWD}/depends/${BUILD}" ./configure --prefix=/usr + make +} + +check() { + cd ${pkgname} + + ./zcutil/fetch-params.sh --testnet + # ./qa/zcash/full_test_suite.py + ./qa/pull-tester/rpc-tests.sh +} + +package() { + cd ${pkgname} + + make DESTDIR="${pkgdir}" install + + for ext in '-cli' '-tx' 'd'; do + install -Dm644 contrib/zcash${ext}.bash-completion \ + "${pkgdir}"/usr/share/bash-completion/completions/zcash${ext} + done + + install -Dm644 -t "${pkgdir}"/usr/lib/systemd/user ../zcashd.service + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING +} Deleted: libsnark-no-gtest.patch =================================================================== --- libsnark-no-gtest.patch 2018-06-01 23:33:13 UTC (rev 337030) +++ libsnark-no-gtest.patch 2018-06-01 23:33:31 UTC (rev 337031) @@ -1,22 +0,0 @@ ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -42,7 +42,7 @@ $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*) - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) - - LIBSNARK_CXXFLAGS = -fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1 -fstack-protector-all --LIBSNARK_CONFIG_FLAGS = CURVE=ALT_BN128 NO_PROCPS=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT NO_COPY_DEPINST=1 NO_COMPILE_LIBGTEST=1 -+LIBSNARK_CONFIG_FLAGS = CURVE=ALT_BN128 NO_PROCPS=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT NO_COPY_DEPINST=1 NO_COMPILE_LIBGTEST=1 NO_GTEST=1 - if HAVE_OPENMP - LIBSNARK_CONFIG_FLAGS += MULTICORE=1 - endif ---- a/src/snark/Makefile -+++ b/src/snark/Makefile -@@ -175,7 +175,7 @@ EXEC_OBJS =$(patsubst %,%.o,$(EXECUTABLES) $(EXECUTABLES_WITH_GTEST) $(EXECUTABL - GTEST_OBJS =$(patsubst %.cpp,%.o,$(GTEST_SRCS)) - - all: \ -- $(if $(NO_GTEST),,$(EXECUTABLES_WITH_GTEST) $(GTEST_TESTS)) \ -+ $(if $(NO_GTEST),$(LIBSNARK_A),$(EXECUTABLES_WITH_GTEST) $(GTEST_TESTS)) \ - $(if $(NO_SUPERCOP),,$(EXECUTABLES_WITH_SUPERCOP)) \ - $(EXECUTABLES) \ - $(if $(NO_DOCS),,doc) Copied: zcash/repos/community-staging-x86_64/libsnark-no-gtest.patch (from rev 337030, zcash/trunk/libsnark-no-gtest.patch) =================================================================== --- libsnark-no-gtest.patch (rev 0) +++ libsnark-no-gtest.patch 2018-06-01 23:33:31 UTC (rev 337031) @@ -0,0 +1,22 @@ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -42,7 +42,7 @@ $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*) + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) + + LIBSNARK_CXXFLAGS = -fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1 -fstack-protector-all +-LIBSNARK_CONFIG_FLAGS = CURVE=ALT_BN128 NO_PROCPS=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT NO_COPY_DEPINST=1 NO_COMPILE_LIBGTEST=1 ++LIBSNARK_CONFIG_FLAGS = CURVE=ALT_BN128 NO_PROCPS=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT NO_COPY_DEPINST=1 NO_COMPILE_LIBGTEST=1 NO_GTEST=1 + if HAVE_OPENMP + LIBSNARK_CONFIG_FLAGS += MULTICORE=1 + endif +--- a/src/snark/Makefile ++++ b/src/snark/Makefile +@@ -175,7 +175,7 @@ EXEC_OBJS =$(patsubst %,%.o,$(EXECUTABLES) $(EXECUTABLES_WITH_GTEST) $(EXECUTABL + GTEST_OBJS =$(patsubst %.cpp,%.o,$(GTEST_SRCS)) + + all: \ +- $(if $(NO_GTEST),,$(EXECUTABLES_WITH_GTEST) $(GTEST_TESTS)) \ ++ $(if $(NO_GTEST),$(LIBSNARK_A),$(EXECUTABLES_WITH_GTEST) $(GTEST_TESTS)) \ + $(if $(NO_SUPERCOP),,$(EXECUTABLES_WITH_SUPERCOP)) \ + $(EXECUTABLES) \ + $(if $(NO_DOCS),,doc) Deleted: use-system-rust.patch =================================================================== --- use-system-rust.patch 2018-06-01 23:33:13 UTC (rev 337030) +++ use-system-rust.patch 2018-06-01 23:33:31 UTC (rev 337031) @@ -1,11 +0,0 @@ ---- a/depends/packages/librustzcash.mk -+++ b/depends/packages/librustzcash.mk -@@ -5,7 +5,7 @@ - $(package)_download_file=$($(package)_git_commit).tar.gz - $(package)_sha256_hash=a5760a90d4a1045c8944204f29fa2a3cf2f800afee400f88bf89bbfe2cce1279 - $(package)_git_commit=91348647a86201a9482ad4ad68398152dc3d635e --$(package)_dependencies=rust $(rust_crates) -+$(package)_dependencies=$(rust_crates) - $(package)_patches=cargo.config - - define $(package)_preprocess_cmds Copied: zcash/repos/community-staging-x86_64/use-system-rust.patch (from rev 337030, zcash/trunk/use-system-rust.patch) =================================================================== --- use-system-rust.patch (rev 0) +++ use-system-rust.patch 2018-06-01 23:33:31 UTC (rev 337031) @@ -0,0 +1,11 @@ +--- a/depends/packages/librustzcash.mk ++++ b/depends/packages/librustzcash.mk +@@ -5,7 +5,7 @@ + $(package)_download_file=$($(package)_git_commit).tar.gz + $(package)_sha256_hash=1fb331a92b63da41e95ef9db671982d243a13bcd6d25570760c9ca83b8996887 + $(package)_git_commit=36d7acf3f37570f499fc8fe79fda372e5eb873ca +-$(package)_dependencies=rust $(rust_crates) ++$(package)_dependencies=$(rust_crates) + $(package)_patches=cargo.config + + define $(package)_preprocess_cmds Deleted: zcashd.service =================================================================== --- zcashd.service 2018-06-01 23:33:13 UTC (rev 337030) +++ zcashd.service 2018-06-01 23:33:31 UTC (rev 337031) @@ -1,9 +0,0 @@ -[Unit] -Description=Zcash daemon -After=network.target - -[Service] -ExecStart=/usr/bin/zcashd - -[Install] -WantedBy=default.target Copied: zcash/repos/community-staging-x86_64/zcashd.service (from rev 337030, zcash/trunk/zcashd.service) =================================================================== --- zcashd.service (rev 0) +++ zcashd.service 2018-06-01 23:33:31 UTC (rev 337031) @@ -0,0 +1,9 @@ +[Unit] +Description=Zcash daemon +After=network.target + +[Service] +ExecStart=/usr/bin/zcashd + +[Install] +WantedBy=default.target