summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorredfish2019-03-02 01:00:35 -0500
committerredfish2019-03-02 01:02:07 -0500
commit0130d2e5b3db5b754918a92f27837bedf019ef2e (patch)
tree7be3eca5789b1222ba7ba8103cc42a6046e57579
parent2d5b3f848648afac220db694dd9263a634956789 (diff)
downloadaur-0130d2e5b3db5b754918a92f27837bedf019ef2e.tar.gz
update to 0.14.0.0
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD35
-rw-r--r--cmake-libsodium.patch12
3 files changed, 22 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c7ae65db075d..d05c2e90944e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun Nov 18 17:29:53 UTC 2018
+# Sat Mar 2 06:01:58 UTC 2019
pkgbase = monero-git
pkgdesc = Peer-to-peer anonymous digital currency (daemon, CLI wallet, and wallet API library)
- pkgver = 0.13.0.4
+ pkgver = 0.14.0.0
pkgrel = 1
url = https://getmonero.org/
arch = x86_64
@@ -22,9 +22,7 @@ pkgbase = monero-git
depends = zeromq
depends = pcsclite
source = monero::git+https://github.com/monero-project/monero.git
- source = cmake-libsodium.patch
sha256sums = SKIP
- sha256sums = fceaadde45f7fec587a8ce9456e23ca3d1500bc021aae5fdc7a7872362f8891e
pkgname = monero-git
install = monero.install
diff --git a/PKGBUILD b/PKGBUILD
index 54a1bfc6d886..abc09c24a4dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgbase=('monero-git')
pkgname=('monero-git' 'libmonero-wallet-git')
_gitname='monero'
-pkgver=0.13.0.4
+pkgver=0.14.0.0
pkgrel=1
arch=('x86_64' 'i686' 'armv7h' 'aarch64')
url="https://getmonero.org/"
@@ -15,8 +15,7 @@ makedepends=('git' 'cmake' 'boost' 'gtest' 'qt5-tools')
pkgdesc="Peer-to-peer anonymous digital currency (daemon, CLI wallet, and wallet API library)"
_upstream=https://github.com/monero-project/monero.git
-source=("$_gitname::git+$_upstream"
- "cmake-libsodium.patch")
+source=("$_gitname::git+$_upstream")
_builddir=build
@@ -105,16 +104,23 @@ package_monero-git() {
# Uncomment for a debug build
# options=(!strip debug)
- install -D -m755 "$srcdir/$_gitname/build/bin/monerod" "$pkgdir/usr/bin/monerod"
-
- install -D -m755 "$srcdir/$_gitname/build/bin/monero-wallet-cli" "$pkgdir/usr/bin/monero-wallet-cli"
- install -D -m755 "$srcdir/$_gitname/build/bin/monero-wallet-rpc" "$pkgdir/usr/bin/monero-wallet-rpc"
-
- install -D -m755 "$srcdir/$_gitname/build/bin/monero-blockchain-import" "$pkgdir/usr/bin/monero-blockchain-import"
- install -D -m755 "$srcdir/$_gitname/build/bin/monero-blockchain-export" "$pkgdir/usr/bin/monero-blockchain-export"
- install -D -m755 "$srcdir/$_gitname/build/bin/monero-blockchain-usage" "$pkgdir/usr/bin/monero-blockchain-usage"
-
- install -D -m755 "$srcdir/$_gitname/build/bin/monero-gen-trusted-multisig" "$pkgdir/usr/bin/monero-gen-trusted-multisig"
+ for b in \
+ monero-blockchain-ancestry \
+ monero-blockchain-depth \
+ monero-blockchain-export \
+ monero-blockchain-import \
+ monero-blockchain-mark-spent-outputs \
+ monero-blockchain-prune \
+ monero-blockchain-prune-known-spent-data \
+ monero-blockchain-stats \
+ monero-blockchain-usage \
+ monerod \
+ monero-gen-trusted-multisig \
+ monero-wallet-cli \
+ monero-wallet-rpc
+ do
+ install -D -m755 "$srcdir/$_gitname/build/bin/$b" "$pkgdir/usr/bin/$b"
+ done
install -Dm644 $srcdir/$_gitname/utils/systemd/monerod.service "${pkgdir}/usr/lib/systemd/system/monerod.service"
install -Dm644 "$srcdir/$_gitname/utils/conf/monerod.conf" "$pkgdir/etc/monerod.conf"
@@ -139,5 +145,4 @@ package_libmonero-wallet-git() {
cd $_stagedir
find usr/{include,lib} -type f -exec install -D -m 755 {} ${pkgdir}/{} \;
}
-sha256sums=('SKIP'
- 'fceaadde45f7fec587a8ce9456e23ca3d1500bc021aae5fdc7a7872362f8891e')
+sha256sums=('SKIP')
diff --git a/cmake-libsodium.patch b/cmake-libsodium.patch
deleted file mode 100644
index 49e50769c75e..000000000000
--- a/cmake-libsodium.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
-index 71dcedca..e2030905 100644
---- a/src/crypto/CMakeLists.txt
-+++ b/src/crypto/CMakeLists.txt
-@@ -79,6 +79,7 @@ target_link_libraries(cncrypto
- epee
- ${Boost_SYSTEM_LIBRARY}
- PRIVATE
-+ ${SODIUM_LIBRARY}
- ${EXTRA_LIBRARIES})
-
- if (ARM)