Date: Friday, March 16, 2018 @ 08:46:59 Author: tensor5 Revision: 308800
archrelease: copy trunk to community-x86_64 Added: zcash/repos/community-x86_64/PKGBUILD (from rev 308799, zcash/trunk/PKGBUILD) zcash/repos/community-x86_64/boost-no-mt-suffix.patch (from rev 308799, zcash/trunk/boost-no-mt-suffix.patch) zcash/repos/community-x86_64/libsnark-no-gtest.patch (from rev 308799, zcash/trunk/libsnark-no-gtest.patch) zcash/repos/community-x86_64/use-system-rust.patch (from rev 308799, zcash/trunk/use-system-rust.patch) zcash/repos/community-x86_64/zcashd.service (from rev 308799, zcash/trunk/zcashd.service) Deleted: zcash/repos/community-x86_64/PKGBUILD zcash/repos/community-x86_64/boost-no-mt-suffix.patch zcash/repos/community-x86_64/use-system-rust.patch zcash/repos/community-x86_64/zcashd.service --------------------------+ PKGBUILD | 144 +++++++++++++++++++++++---------------------- boost-no-mt-suffix.patch | 33 ++++++---- libsnark-no-gtest.patch | 22 ++++++ use-system-rust.patch | 20 +++--- zcashd.service | 18 ++--- 5 files changed, 137 insertions(+), 100 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-03-16 08:45:30 UTC (rev 308799) +++ PKGBUILD 2018-03-16 08:46:59 UTC (rev 308800) @@ -1,70 +0,0 @@ -# $Id$ -# Maintainer: Nicola Squartini <tens...@gmail.com> - -pkgname=zcash -pkgver=1.0.14 -_commit=1ddecf644f6bab29545bb6333889fb059eb7970e -pkgrel=2 -pkgdesc='Permissionless financial system employing zero-knowledge security' -arch=('x86_64') -url='https://z.cash/' -license=('MIT') -depends=('boost-libs' 'libevent' 'zeromq') -makedepends=('boost' 'cargo' 'cmake' 'git' 'gmock' 'python' 'wget') -checkdepends=('python' 'python2' 'python2-pyzmq') -source=("git+https://github.com/zcash/zcash.git#commit=${_commit}" - "boost-no-mt-suffix.patch" - "use-system-rust.patch" - 'zcashd.service') -sha512sums=('SKIP' - 'fa9ac59839ba6c6aabefb24296ae29914acf7089487377e7948fd684e32b1b499e8e15daccd10baf968905ec69ad2da8b91ff2c8d4724412d8143428ed4de23d' - '3663373af04318aa72d877f399f0c9e956d289ac876583e70afa2933bf4171f7441a399e043b2d29b1df6d19d29390bb69d4053cad4b75bef903a8685fcd23bf' - '2fb8b0a636ca9c7ee15f0fd2c47046c8323ade3de9562f393da7541eee50dd14b12107dd29b0e1ee90ff88963e2f7e25b12435166a1812df5c88c579c12dde88') - -prepare() { - cd ${pkgname} - - # Set gitattributes on src/clientversion.cpp - git archive --format=tar ${_commit} -- src/clientversion.cpp | tar -xf - - - patch -Np1 -i ../boost-no-mt-suffix.patch - patch -Np1 -i ../use-system-rust.patch -} - -build() { - cd ${pkgname} - - cd depends - make install \ - native_packages='' \ - packages='bdb librustzcash proton' - cd .. - - CPPFLAGS="${CPPFLAGS} -I$PWD/depends/${CARCH}-unknown-linux-gnu/include" - LDFLAGS="${LDFLAGS} -L${PWD}/depends/${CARCH}-unknown-linux-gnu/lib -L${PWD}/depends/x86_64-unknown-linux-gnu/lib64" - - ./autogen.sh - depends_prefix="${PWD}/depends/x86_64-unknown-linux-gnu" ./configure --prefix=/usr - make -} - -check() { - cd ${pkgname} - - # ./zcutil/fetch-params.sh - # ./qa/zcash/full_test_suite.py -} - -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 308799, zcash/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-03-16 08:46:59 UTC (rev 308800) @@ -0,0 +1,74 @@ +# $Id$ +# Maintainer: Nicola Squartini <tens...@gmail.com> + +pkgname=zcash +pkgver=1.0.15 +_commit=93332d6e84590cdcb8c64282f9b525152c3f1b2f +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=('python' 'python2' 'python2-pyzmq') +source=("git+https://github.com/zcash/zcash.git#commit=${_commit}" + "boost-no-mt-suffix.patch" + 'libsnark-no-gtest.patch' + "use-system-rust.patch" + 'zcashd.service') +sha512sums=('SKIP' + '7019ef6162be0083db7399ec2ec3059b669b4f05247d6f038603ba3541a864d180ca41d5d971993f0d9c028410f811f31a31c39faa7c62cbad23ca65a4a4662c' + 'ba59e6f94ac7fa94429203e32b9804e6d741e60099e2dd052813ed879ad5a10c46e816dc8d4a5d59444c35c7eaf9a40434fd93b7e392fd535c041c89274375f0' + '3663373af04318aa72d877f399f0c9e956d289ac876583e70afa2933bf4171f7441a399e043b2d29b1df6d19d29390bb69d4053cad4b75bef903a8685fcd23bf' + '2fb8b0a636ca9c7ee15f0fd2c47046c8323ade3de9562f393da7541eee50dd14b12107dd29b0e1ee90ff88963e2f7e25b12435166a1812df5c88c579c12dde88') + +prepare() { + cd ${pkgname} + + # Set gitattributes on src/clientversion.cpp + git archive --format=tar ${_commit} -- src/clientversion.cpp | tar -xf - + + patch -Np1 -i ../boost-no-mt-suffix.patch + patch -Np1 -i ../libsnark-no-gtest.patch + patch -Np1 -i ../use-system-rust.patch +} + +build() { + cd ${pkgname} + + cd depends + make install \ + native_packages='' \ + packages='bdb 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 +} + +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: boost-no-mt-suffix.patch =================================================================== --- boost-no-mt-suffix.patch 2018-03-16 08:45:30 UTC (rev 308799) +++ boost-no-mt-suffix.patch 2018-03-16 08:46:59 UTC (rev 308800) @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -720,7 +720,7 @@ - AX_CHECK_COMPILE_FLAG([-fno-strict-aliasing],[CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"]) - AX_CHECK_COMPILE_FLAG([-Wno-builtin-declaration-mismatch],[CXXFLAGS="$CXXFLAGS -Wno-builtin-declaration-mismatch"],,[[$CXXFLAG_WERROR]]) - --LIBZCASH_LIBS="-lgmp -lgmpxx -lboost_system-mt -lcrypto -lsodium $RUST_LIBS" -+LIBZCASH_LIBS="-lgmp -lgmpxx -lboost_system -lcrypto -lsodium $RUST_LIBS" - - AC_MSG_CHECKING([whether to build bitcoind]) - AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) Copied: zcash/repos/community-x86_64/boost-no-mt-suffix.patch (from rev 308799, zcash/trunk/boost-no-mt-suffix.patch) =================================================================== --- boost-no-mt-suffix.patch (rev 0) +++ boost-no-mt-suffix.patch 2018-03-16 08:46:59 UTC (rev 308800) @@ -0,0 +1,22 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -720,7 +720,7 @@ + AX_CHECK_COMPILE_FLAG([-fno-strict-aliasing],[CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"]) + AX_CHECK_COMPILE_FLAG([-Wno-builtin-declaration-mismatch],[CXXFLAGS="$CXXFLAGS -Wno-builtin-declaration-mismatch"],,[[$CXXFLAG_WERROR]]) + +-LIBZCASH_LIBS="-lgmp -lgmpxx -lboost_system-mt -lcrypto -lsodium $RUST_LIBS" ++LIBZCASH_LIBS="-lgmp -lgmpxx -lboost_system -lcrypto -lsodium $RUST_LIBS" + + AC_MSG_CHECKING([whether to build bitcoind]) + AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) +--- a/src/snark/Makefile ++++ b/src/snark/Makefile +@@ -19,7 +19,7 @@ DEPINST = depinst + + CXXFLAGS += -I$(DEPINST)/include -Ilibsnark + LDFLAGS += -L$(DEPINST)/lib -Wl,-rpath,$(DEPINST)/lib +-LDLIBS += -lgmpxx -lgmp -lboost_program_options-mt -lsodium ++LDLIBS += -lgmpxx -lgmp -lboost_program_options -lsodium + # List of .a files to include within libsnark.a and libsnark.so: + AR_LIBS = + # List of library files to install: Copied: zcash/repos/community-x86_64/libsnark-no-gtest.patch (from rev 308799, zcash/trunk/libsnark-no-gtest.patch) =================================================================== --- libsnark-no-gtest.patch (rev 0) +++ libsnark-no-gtest.patch 2018-03-16 08:46:59 UTC (rev 308800) @@ -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 +@@ -172,7 +172,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-03-16 08:45:30 UTC (rev 308799) +++ use-system-rust.patch 2018-03-16 08:46:59 UTC (rev 308800) @@ -1,10 +0,0 @@ ---- a/depends/packages/librustzcash.mk -+++ b/depends/packages/librustzcash.mk -@@ -5,7 +5,6 @@ - $(package)_download_file=$($(package)_git_commit).tar.gz - $(package)_sha256_hash=a5760a90d4a1045c8944204f29fa2a3cf2f800afee400f88bf89bbfe2cce1279 - $(package)_git_commit=91348647a86201a9482ad4ad68398152dc3d635e --$(package)_dependencies=rust - - define $(package)_build_cmds - cargo build --release Copied: zcash/repos/community-x86_64/use-system-rust.patch (from rev 308799, zcash/trunk/use-system-rust.patch) =================================================================== --- use-system-rust.patch (rev 0) +++ use-system-rust.patch 2018-03-16 08:46:59 UTC (rev 308800) @@ -0,0 +1,10 @@ +--- a/depends/packages/librustzcash.mk ++++ b/depends/packages/librustzcash.mk +@@ -5,7 +5,6 @@ + $(package)_download_file=$($(package)_git_commit).tar.gz + $(package)_sha256_hash=a5760a90d4a1045c8944204f29fa2a3cf2f800afee400f88bf89bbfe2cce1279 + $(package)_git_commit=91348647a86201a9482ad4ad68398152dc3d635e +-$(package)_dependencies=rust + + define $(package)_build_cmds + cargo build --release Deleted: zcashd.service =================================================================== --- zcashd.service 2018-03-16 08:45:30 UTC (rev 308799) +++ zcashd.service 2018-03-16 08:46:59 UTC (rev 308800) @@ -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 308799, zcash/trunk/zcashd.service) =================================================================== --- zcashd.service (rev 0) +++ zcashd.service 2018-03-16 08:46:59 UTC (rev 308800) @@ -0,0 +1,9 @@ +[Unit] +Description=Zcash daemon +After=network.target + +[Service] +ExecStart=/usr/bin/zcashd + +[Install] +WantedBy=default.target