[arch-commits] Commit in zcash/repos/community-x86_64 (9 files)

Nicola Squartini tensor5 at archlinux.org
Tue Jun 18 03:00:14 UTC 2019


    Date: Tuesday, June 18, 2019 @ 03:00:13
  Author: tensor5
Revision: 482063

archrelease: copy trunk to community-x86_64

Added:
  zcash/repos/community-x86_64/PKGBUILD
    (from rev 482062, zcash/trunk/PKGBUILD)
  zcash/repos/community-x86_64/libsnark-no-gtest.patch
    (from rev 482062, zcash/trunk/libsnark-no-gtest.patch)
  zcash/repos/community-x86_64/use-system-qpid-proton.patch
    (from rev 482062, zcash/trunk/use-system-qpid-proton.patch)
  zcash/repos/community-x86_64/use-system-rust.patch
    (from rev 482062, zcash/trunk/use-system-rust.patch)
  zcash/repos/community-x86_64/zcashd.service
    (from rev 482062, zcash/trunk/zcashd.service)
Deleted:
  zcash/repos/community-x86_64/PKGBUILD
  zcash/repos/community-x86_64/libsnark-no-gtest.patch
  zcash/repos/community-x86_64/use-system-rust.patch
  zcash/repos/community-x86_64/zcashd.service

------------------------------+
 PKGBUILD                     |  239 ++++++++++++++++++++---------------------
 libsnark-no-gtest.patch      |   44 +++----
 use-system-qpid-proton.patch |   26 ++++
 use-system-rust.patch        |   31 +++--
 zcashd.service               |   18 +--
 5 files changed, 198 insertions(+), 160 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-18 02:59:09 UTC (rev 482062)
+++ PKGBUILD	2019-06-18 03:00:13 UTC (rev 482063)
@@ -1,118 +0,0 @@
-# Maintainer: Nicola Squartini <tensor5 at gmail.com>
-
-pkgname=zcash
-pkgver=2.0.4
-_commit=be1d68ef763ce405d4d04d7f4d3dfbbdd9084687
-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' 'cmake' 'git' 'gmock' 'python' 'rust' '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'
-            '3c002c9d721853089f02cc397e2bc4130574a9c06b1118824338efedc476daa5bdbdcf55bf6beba69fb9c4bd065b871b3111259fa1e25828f333056d340282a1'
-            'dba24a8a99da58c856bf346631b675b5b2512514384c85a3ffbbacd4c51df808d127de926850eeb36993597f31a0052ac758d065c9cecbb05a87c079555e0a54'
-            '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_aes
-      crate_aesni
-      crate_aes_soft 
-      crate_arrayvec
-      crate_bellman
-      crate_bitflags
-      crate_bit_vec
-      crate_blake2_rfc
-      crate_block_cipher_trait
-      crate_byte_tools
-      crate_byteorder
-      crate_constant_time_eq
-      crate_crossbeam
-      crate_digest
-      crate_fpe
-      crate_fuchsia_zircon
-      crate_fuchsia_zircon_sys
-      crate_futures_cpupool
-      crate_futures
-      crate_generic_array
-      crate_lazy_static
-      crate_libc
-      crate_nodrop
-      crate_num_bigint
-      crate_num_cpus
-      crate_num_integer
-      crate_num_traits
-      crate_opaque_debug
-      crate_pairing
-      crate_rand
-      crate_sapling_crypto
-      crate_stream_cipher
-      crate_typenum
-      crate_winapi_i686_pc_windows_gnu
-      crate_winapi
-      crate_winapi_x86_64_pc_windows_gnu
-      crate_zip32
-    )
-    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}
-
-    # 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
-    # ./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-x86_64/PKGBUILD (from rev 482062, zcash/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-06-18 03:00:13 UTC (rev 482063)
@@ -0,0 +1,121 @@
+# Maintainer: Nicola Squartini <tensor5 at gmail.com>
+
+pkgname=zcash
+pkgver=2.0.5_2
+_commit=9e833b39ee3e771d16f8124d9d5ee812a48d0cde
+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' 'cmake' 'git' 'gmock' 'python' 'rust' '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-qpid-proton.patch'
+        'use-system-rust.patch'
+        'zcashd.service')
+sha512sums=('SKIP'
+            '3c002c9d721853089f02cc397e2bc4130574a9c06b1118824338efedc476daa5bdbdcf55bf6beba69fb9c4bd065b871b3111259fa1e25828f333056d340282a1'
+            '019870971a0cec093d0552585f4140f39dd65f90cb56b97e512bbaf0d79c0f1574295e722310d4e1762af12ff693802fc465765d4d1410d209e259326f307d6a'
+            'e2bdf46696e70a93ffcb45bf4e081c780cda8f11f6fa346b6807731f7c739f18c689c4e78a71f8bd7099874108b6b6584b8a96395bbca8d5441f7600a3fe0ebe'
+            '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-qpid-proton.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_aes
+      crate_aesni
+      crate_aes_soft 
+      crate_arrayvec
+      crate_bellman
+      crate_bitflags
+      crate_bit_vec
+      crate_blake2_rfc
+      crate_block_cipher_trait
+      crate_byte_tools
+      crate_byteorder
+      crate_constant_time_eq
+      crate_crossbeam
+      crate_digest
+      crate_fpe
+      crate_fuchsia_zircon
+      crate_fuchsia_zircon_sys
+      crate_futures_cpupool
+      crate_futures
+      crate_generic_array
+      crate_lazy_static
+      crate_libc
+      crate_nodrop
+      crate_num_bigint
+      crate_num_cpus
+      crate_num_integer
+      crate_num_traits
+      crate_opaque_debug
+      crate_pairing
+      crate_rand
+      crate_sapling_crypto
+      crate_stream_cipher
+      crate_typenum
+      crate_winapi_i686_pc_windows_gnu
+      crate_winapi
+      crate_winapi_x86_64_pc_windows_gnu
+      crate_zip32
+    )
+    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}
+
+    # 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
+    # ./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	2019-06-18 02:59:09 UTC (rev 482062)
+++ libsnark-no-gtest.patch	2019-06-18 03:00:13 UTC (rev 482063)
@@ -1,22 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -55,7 +55,7 @@ $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
- 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
- 
- LIBSNARK_CXXFLAGS = $(AM_CXXFLAGS) $(PIC_FLAGS) -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-x86_64/libsnark-no-gtest.patch (from rev 482062, zcash/trunk/libsnark-no-gtest.patch)
===================================================================
--- libsnark-no-gtest.patch	                        (rev 0)
+++ libsnark-no-gtest.patch	2019-06-18 03:00:13 UTC (rev 482063)
@@ -0,0 +1,22 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -55,7 +55,7 @@ $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
+ 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+ 
+ LIBSNARK_CXXFLAGS = $(AM_CXXFLAGS) $(PIC_FLAGS) -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-x86_64/use-system-qpid-proton.patch (from rev 482062, zcash/trunk/use-system-qpid-proton.patch)
===================================================================
--- use-system-qpid-proton.patch	                        (rev 0)
+++ use-system-qpid-proton.patch	2019-06-18 03:00:13 UTC (rev 482063)
@@ -0,0 +1,26 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -587,17 +587,13 @@
+     [],
+     [AC_MSG_WARN([Proton headers not found, disabling Proton support])
+     use_proton=no])
+- AC_CHECK_LIB([qpid-proton-cpp-static], [main],
+-    [PROTON_LIBS="-lqpid-proton-cpp-static"],
+-    [AC_MSG_WARN([Proton qpid-proton-cpp-static library not found, disabling Proton support])
++ AC_CHECK_LIB([qpid-proton-cpp], [main],
++    [PROTON_LIBS="-lqpid-proton-cpp"],
++    [AC_MSG_WARN([Proton qpid-proton-cpp library not found, disabling Proton support])
+     use_proton=no])
+- AC_CHECK_LIB([qpid-proton-core-static], [main],
+-    [PROTON_LIBS+=" -lqpid-proton-core-static"],
+-    [AC_MSG_WARN([Proton qpid-proton-core-static library not found, disabling Proton support])
+-    use_proton=no])
+- AC_CHECK_LIB([qpid-proton-static], [main],
+-    [PROTON_LIBS+=" -lqpid-proton-static"],
+-    [AC_MSG_WARN([Proton qpid-proton-static library not found, disabling Proton support])
++ AC_CHECK_LIB([qpid-proton-core], [main],
++    [PROTON_LIBS+=" -lqpid-proton-core"],
++    [AC_MSG_WARN([Proton qpid-proton-core library not found, disabling Proton support])
+     use_proton=no])
+ fi
+ if test x$use_proton = xyes; then

Deleted: use-system-rust.patch
===================================================================
--- use-system-rust.patch	2019-06-18 02:59:09 UTC (rev 482062)
+++ use-system-rust.patch	2019-06-18 03:00:13 UTC (rev 482063)
@@ -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=9909ec59fa7a411c2071d6237b3363a0bc6e5e42358505cf64b7da0f58a7ff5a
- $(package)_git_commit=06da3b9ac8f278e5d4ae13088cf0a4c03d2c13f5
--$(package)_dependencies=rust $(rust_crates)
-+$(package)_dependencies=$(rust_crates)
- $(package)_patches=cargo.config 0001-Start-using-cargo-clippy-for-CI.patch remove-dev-dependencies.diff
- 
- ifeq ($(host_os),mingw32)

Copied: zcash/repos/community-x86_64/use-system-rust.patch (from rev 482062, zcash/trunk/use-system-rust.patch)
===================================================================
--- use-system-rust.patch	                        (rev 0)
+++ use-system-rust.patch	2019-06-18 03:00:13 UTC (rev 482063)
@@ -0,0 +1,20 @@
+--- 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=9909ec59fa7a411c2071d6237b3363a0bc6e5e42358505cf64b7da0f58a7ff5a
+ $(package)_git_commit=06da3b9ac8f278e5d4ae13088cf0a4c03d2c13f5
+-$(package)_dependencies=rust $(rust_crates)
++$(package)_dependencies=$(rust_crates)
+ $(package)_patches=cargo.config 0001-Start-using-cargo-clippy-for-CI.patch remove-dev-dependencies.diff
+ 
+ $(package)_rust_target=$(if $(rust_rust_target_$(canonical_host)),$(rust_rust_target_$(canonical_host)),$(canonical_host))
+@@ -33,7 +33,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

Deleted: zcashd.service
===================================================================
--- zcashd.service	2019-06-18 02:59:09 UTC (rev 482062)
+++ zcashd.service	2019-06-18 03:00:13 UTC (rev 482063)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Zcash daemon
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/zcashd
-
-[Install]
-WantedBy=default.target

Copied: zcash/repos/community-x86_64/zcashd.service (from rev 482062, zcash/trunk/zcashd.service)
===================================================================
--- zcashd.service	                        (rev 0)
+++ zcashd.service	2019-06-18 03:00:13 UTC (rev 482063)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Zcash daemon
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/zcashd
+
+[Install]
+WantedBy=default.target


More information about the arch-commits mailing list