update 1.0.15-1

5 files changed, 137 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 430b2714d8b7..ee2314be6917 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,41 @@
 pkgbase = koto
 	pkgdesc = Decentralized and open source cryptocurrency
-	pkgver = 1.0.14
-	pkgrel = 2
+	pkgver = 1.0.15
+	pkgrel = 1
 	url = https://koto.cash
 	install = koto.install
-	arch = i686
 	arch = x86_64
 	license = MIT
+	checkdepends = python
+	checkdepends = python2
+	checkdepends = python2-pyzmq
+	makedepends = boost
+	makedepends = cargo
+	makedepends = cmake
+	makedepends = git
+	makedepends = gmock
+	makedepends = python
 	makedepends = wget
-	makedepends = unzip
 	depends = bash
+	depends = boost-libs
+	depends = libevent
+	depends = qpid-proton
+	depends = zeromq
 	provides = kotod
 	provides = koto-cli
 	provides = koto-tx
 	provides = koto-fetch-params
-	source = koto-180210.tar.gz::https://github.com/koto-dev/koto/archive/180210.tar.gz
+	source = koto-1.0.15.tar.gz::https://github.com/koto-dev/koto/archive/dev-1.0.15.tar.gz
 	source = 0001-fetch-param-directory-env.patch
+	source = 0002-boost-no-mt-suffix.patch
+	source = 0003-libsnark-no-gtest.patch
+	source = 0004-use-system-rust.patch
 	source = koto.install
-	sha1sums = 0ceb84cdd7087ec7bcd91a3fe1c2e7b941fb4fa3
+	sha1sums = 1cff15114e759b7246ccb5142857c3c6925d62da
 	sha1sums = e27ee657c0652137537c1bb9b48ce1730cba3423
+	sha1sums = 9110b57e8eb569ad35992efd83b9cd70d6d2244a
+	sha1sums = a9a7250c1a3c9a620dd21f9b5406027c05e7ddad
+	sha1sums = a89b0e4b137881e27a89bd0c78f9caff087b501e
 	sha1sums = e1e1155f7618c4da3c51517ba6530178f33cee28
 
 pkgname = koto
diff --git a/0002-boost-no-mt-suffix.patch b/0002-boost-no-mt-suffix.patch
new file mode 100644
index 000000000000..21a2d11d5cb6
--- /dev/null
+++ b/0002-boost-no-mt-suffix.patch
@@ -0,0 +1,26 @@
+diff --git a/configure.ac b/configure.ac
+index aedf8f4d..bf82ce26 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -721,7 +721,7 @@ AX_CHECK_COMPILE_FLAG([-fwrapv],[CXXFLAGS="$CXXFLAGS -fwrapv"])
+ 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])
+diff --git a/src/snark/Makefile b/src/snark/Makefile
+index b865f992..ad9f0fa0 100644
+--- 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:
diff --git a/0003-libsnark-no-gtest.patch b/0003-libsnark-no-gtest.patch
new file mode 100644
index 000000000000..c543283548f2
--- /dev/null
+++ b/0003-libsnark-no-gtest.patch
@@ -0,0 +1,26 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index ffde9b8e..511166b3 100644
+--- 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
+diff --git a/src/snark/Makefile b/src/snark/Makefile
+index b865f992..bb715625 100644
+--- 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)
diff --git a/0004-use-system-rust.patch b/0004-use-system-rust.patch
new file mode 100644
index 000000000000..9fa9153eaa1c
--- /dev/null
+++ b/0004-use-system-rust.patch
@@ -0,0 +1,12 @@
+diff --git a/depends/packages/librustzcash.mk b/depends/packages/librustzcash.mk
+index e27adec2..1defaefc 100644
+--- a/depends/packages/librustzcash.mk
++++ b/depends/packages/librustzcash.mk
+@@ -5,7 +5,6 @@ $(package)_file_name=$(package)-$($(package)_git_commit).tar.gz
+ $(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
diff --git a/PKGBUILD b/PKGBUILD
index 5167e1f326cb..e9bc45d58b5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,59 @@
 # Maintainer: Koutarou Tanaka <from.kyushu.island@gmail.com>
 
 pkgname=koto
-pkgver=1.0.14
-_tag=180210
-pkgrel=2
+pkgver=1.0.15
+pkgrel=1
 pkgdesc="Decentralized and open source cryptocurrency"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="https://koto.cash"
 license=(MIT)
-depends=('bash')
-makedepends=('wget' 'unzip')
+depends=('bash' 'boost-libs' 'libevent' 'qpid-proton' 'zeromq')
+makedepends=('boost' 'cargo' 'cmake' 'git' 'gmock' 'python' 'wget')
+checkdepends=('python' 'python2' 'python2-pyzmq')
 provides=('kotod' 'koto-cli' 'koto-tx' 'koto-fetch-params')
-source=("${pkgname}-${_tag}.tar.gz::https://github.com/koto-dev/koto/archive/${_tag}.tar.gz"
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/koto-dev/koto/archive/dev-${pkgver}.tar.gz"
         "0001-fetch-param-directory-env.patch"
+        "0002-boost-no-mt-suffix.patch"
+        "0003-libsnark-no-gtest.patch"
+        "0004-use-system-rust.patch"
         "koto.install")
-sha1sums=('0ceb84cdd7087ec7bcd91a3fe1c2e7b941fb4fa3'
+sha1sums=('1cff15114e759b7246ccb5142857c3c6925d62da'
           'e27ee657c0652137537c1bb9b48ce1730cba3423'
+          '9110b57e8eb569ad35992efd83b9cd70d6d2244a'
+          'a9a7250c1a3c9a620dd21f9b5406027c05e7ddad'
+          'a89b0e4b137881e27a89bd0c78f9caff087b501e'
           'e1e1155f7618c4da3c51517ba6530178f33cee28')
 install=koto.install
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${_tag}"
+  cd "${srcdir}/${pkgname}-dev-${pkgver}"
 
   patch -p1 -i "${srcdir}/0001-fetch-param-directory-env.patch"
+  patch -p1 -i "${srcdir}/0002-boost-no-mt-suffix.patch"
+  patch -p1 -i "${srcdir}/0003-libsnark-no-gtest.patch"
+  patch -p1 -i "${srcdir}/0004-use-system-rust.patch"
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${_tag}"
-  ./zcutil/build.sh
+  cd "${srcdir}/${pkgname}-dev-${pkgver}"
+
+  cd depends
+  make install \
+      native_packages='' \
+      packages='bdb librustzcash libgmp libsodium'
+  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 "${srcdir}/${pkgname}-dev-${pkgver}"
 }
 
 package() {
@@ -37,21 +63,21 @@ package() {
   mkdir -p "${pkgdir}/usr/share/man/man1"
   mkdir -p "${pkgdir}/usr/share/bash-completion/completions"
 
-  install -Dm755 "${srcdir}/${pkgname}-${_tag}/src/koto-cli" "${pkgdir}/usr/bin/koto-cli"
-  install -Dm755 "${srcdir}/${pkgname}-${_tag}/src/kotod" "${pkgdir}/usr/bin/kotod"
-  install -Dm755 "${srcdir}/${pkgname}-${_tag}/src/koto-tx" "${pkgdir}/usr/bin/koto-tx"
-  install -Dm755 "${srcdir}/${pkgname}-${_tag}/zcutil/fetch-params.sh" "${pkgdir}/usr/bin/koto-fetch-params"
+  install -Dm755 "${srcdir}/${pkgname}-dev-${pkgver}/src/koto-cli" "${pkgdir}/usr/bin/koto-cli"
+  install -Dm755 "${srcdir}/${pkgname}-dev-${pkgver}/src/kotod" "${pkgdir}/usr/bin/kotod"
+  install -Dm755 "${srcdir}/${pkgname}-dev-${pkgver}/src/koto-tx" "${pkgdir}/usr/bin/koto-tx"
+  install -Dm755 "${srcdir}/${pkgname}-dev-${pkgver}/zcutil/fetch-params.sh" "${pkgdir}/usr/bin/koto-fetch-params"
 
-  install -Dm644 "${srcdir}/${pkgname}-${_tag}/doc/release-notes/release-notes-1.0.14.md" "${pkgdir}/usr/share/doc/koto/changelog"
-  install -Dm644 "${srcdir}/${pkgname}-${_tag}/contrib/debian/copyright" "${pkgdir}/usr/share/doc/koto/copyright"
-  install -Dm755 "${srcdir}/${pkgname}-${_tag}/contrib/debian/examples/koto.conf" "${pkgdir}/usr/share/doc/koto/examples/koto.conf"
+  install -Dm644 "${srcdir}/${pkgname}-dev-${pkgver}/doc/release-notes/release-notes-1.0.14.md" "${pkgdir}/usr/share/doc/${pkgname}/changelog"
+  install -Dm644 "${srcdir}/${pkgname}-dev-${pkgver}/contrib/debian/copyright" "${pkgdir}/usr/share/doc/${pkgname}/copyright"
+  install -Dm755 "${srcdir}/${pkgname}-dev-${pkgver}/contrib/debian/examples/koto.conf" "${pkgdir}/usr/share/doc/${pkgname}/examples/koto.conf"
 
-  install -Dm644 "${srcdir}/${pkgname}-${_tag}/COPYING" "${pkgdir}/usr/share/licenses/koto/COPYING"
+  install -Dm644 "${srcdir}/${pkgname}-dev-${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 
-  install -Dm644 "${srcdir}/${pkgname}-${_tag}/doc/man/kotod.1" "${pkgdir}/usr/share/man/man1/kotod.1"
-  install -Dm644 "${srcdir}/${pkgname}-${_tag}/doc/man/koto-cli.1" "${pkgdir}/usr/share/man/man1/koto-cli.1"
-  install -Dm644 "${srcdir}/${pkgname}-${_tag}/doc/man/koto-fetch-params.1" "${pkgdir}/usr/share/man/man1/koto-fetch-params.1"
+  install -Dm644 "${srcdir}/${pkgname}-dev-${pkgver}/doc/man/kotod.1" "${pkgdir}/usr/share/man/man1/kotod.1"
+  install -Dm644 "${srcdir}/${pkgname}-dev-${pkgver}/doc/man/koto-cli.1" "${pkgdir}/usr/share/man/man1/koto-cli.1"
+  install -Dm644 "${srcdir}/${pkgname}-dev-${pkgver}/doc/man/koto-fetch-params.1" "${pkgdir}/usr/share/man/man1/koto-fetch-params.1"
 
-  install -Dm644 "${srcdir}/${pkgname}-${_tag}/contrib/kotod.bash-completion" "${pkgdir}/usr/share/bash-completion/completions/kotod"
-  install -Dm644 "${srcdir}/${pkgname}-${_tag}/contrib/koto-cli.bash-completion" "${pkgdir}/usr/share/bash-completion/completions/koto-cli"
+  install -Dm644 "${srcdir}/${pkgname}-dev-${pkgver}/contrib/kotod.bash-completion" "${pkgdir}/usr/share/bash-completion/completions/kotod"
+  install -Dm644 "${srcdir}/${pkgname}-dev-${pkgver}/contrib/koto-cli.bash-completion" "${pkgdir}/usr/share/bash-completion/completions/koto-cli"
 }