update to 0.15.0.0

5 files changed, 89 insertions, 120 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c1719cbe5231..5c42f39868fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,45 +1,32 @@
 pkgbase = monero-bin
 	pkgdesc = Monero: the secure, private, untraceable currency - CLI release version (includes daemon, wallet and miner)
-	pkgver = 0.14.1.2
-	pkgrel = 2
+	pkgver = 0.15.0.0
+	pkgrel = 1
 	url = https://getmonero.org/
 	arch = x86_64
 	arch = i686
 	arch = armv7h
 	arch = aarch64
 	license = custom:Cryptonote
-	provides = monerod=0.14.1.2
-	provides = monero-blockchain-export=0.14.1.2
-	provides = monero-blockchain-import=0.14.1.2
-	provides = monero-utils-deserialize=0.14.1.2
-	provides = monero-wallet-cli=0.14.1.2
-	provides = monero-wallet-rpc=0.14.1.2
+	provides = monero=0.15.0.0
 	conflicts = monero
-	conflicts = monerod
-	conflicts = monero-blockchain-export
-	conflicts = monero-blockchain-import
-	conflicts = monero-utils-deserialize
-	conflicts = monero-wallet-cli
-	conflicts = monero-wallet-rpc
 	backup = etc/monerod.conf
 	source = monerod.conf
 	source = monerod.service
-	source = LICENSE
 	source = monero.sysusers
 	source = monero.tmpfiles
-	sha256sums = 829445fe9acc00681f94f7b9ca6ce39713e377970b0a3d6f88c37991e1aa61b2
-	sha256sums = 0b66160a5448dedd8e84c38ba2243187217b214b1552f504b05de120b671f121
-	sha256sums = 0e24d8f4b8758ff33612a17f3bb72a69497b74b32d12bbe5d647d954fcef59ad
+	sha256sums = 4cad39767c033a056e4154518e4a56579fca6e57d74495e7bcc7c12bc1f0412b
+	sha256sums = 95da8471566386ca33c493bd3e6fce94b4c9c301009f4689d0a8aa4872afce3f
 	sha256sums = 57f4c4c54c7a27f2de874c00034995ce14811aca81dd3f30317ae5066c84bb0d
 	sha256sums = 88e80a3bbda159a22e034461e03ab8f0c1108cfb0a7475a2c94de47730493d7f
-	source_x86_64 = https://downloads.getmonero.org/cli/monero-linux-x64-v0.14.1.2.tar.bz2
-	sha256sums_x86_64 = a4d1ddb9a6f36fcb985a3c07101756f544a5c9f797edd0885dab4a9de27a6228
-	source_i686 = https://downloads.getmonero.org/cli/monero-linux-x86-v0.14.1.2.tar.bz2
-	sha256sums_i686 = ede3b29d085d25058268cea932190c77c276618d97fd2a859002dc01de0c54cb
-	source_armv7h = https://downloads.getmonero.org/cli/monero-linux-armv7-v0.14.1.2.tar.bz2
-	sha256sums_armv7h = 7f040bf1d0fec4f76064f5c8af249f1df9d5a6decd6846c3080bd749b2516280
-	source_aarch64 = https://downloads.getmonero.org/cli/monero-linux-armv8-v0.14.1.2.tar.bz2
-	sha256sums_aarch64 = d462fd0f2e4010b6717de2cf6aa8d04a50e56a8fdfd3735230a2a36e63cdb9fb
+	source_x86_64 = https://downloads.getmonero.org/cli/monero-linux-x64-v0.15.0.0.tar.bz2
+	sha256sums_x86_64 = 53d9da55137f83b1e7571aef090b0784d9f04a980115b5c391455374729393f3
+	source_i686 = https://downloads.getmonero.org/cli/monero-linux-x86-v0.15.0.0.tar.bz2
+	sha256sums_i686 = 2197d04f4ffad4e1344b2648273f0be152de637bafc5d940cdf215cbc50e1f79
+	source_armv7h = https://downloads.getmonero.org/cli/monero-linux-armv7-v0.15.0.0.tar.bz2
+	sha256sums_armv7h = 326f783ffde78694b2820c95aa310ead00bb5876937ed4edf9c1abd6b6aadc02
+	source_aarch64 = https://downloads.getmonero.org/cli/monero-linux-armv8-v0.15.0.0.tar.bz2
+	sha256sums_aarch64 = f92f0acbc49076ad57337b5928981cd72c01aabe6a8eb69a1782f7fa1388fb77
 
 pkgname = monero-bin
 
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 733f09f2328f..000000000000
--- a/LICENSE
+++ /dev/null
@@ -1,31 +0,0 @@
-Copyright (c) 2014-2018, The Monero Project
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
-may be used to endorse or promote products derived from this software without
-specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Parts of the project are originally copyright (c) 2012-2013 The Cryptonote
-developers
diff --git a/PKGBUILD b/PKGBUILD
index 19c55ad5767a..397147a3cca1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,74 +3,72 @@
 # Contributor: Crotok <crotok [at] mailbox [dot] org>
 
 pkgname=monero-bin
-pkgver=0.14.1.2
-pkgrel=2
+pkgver=0.15.0.0
+pkgrel=1
 pkgdesc="Monero: the secure, private, untraceable currency - CLI release version (includes daemon, wallet and miner)"
-arch=('x86_64' 'i686' 'armv7h' 'aarch64')
-conflicts=("${pkgname%-bin}"
-           "monerod"
-           "monero-blockchain-export"
-           "monero-blockchain-import"
-           "monero-utils-deserialize"
-           "monero-wallet-cli"
-           "monero-wallet-rpc"
-) # TODO
+arch=("x86_64" "i686" "armv7h" "aarch64")
+conflicts=("monero")
 url="https://getmonero.org/"
 license=("custom:Cryptonote")
 backup=("etc/monerod.conf")
-provides=("monerod=${pkgver}"
-          "monero-blockchain-export=${pkgver}"
-          "monero-blockchain-import=${pkgver}"
-          "monero-utils-deserialize=${pkgver}"
-          "monero-wallet-cli=${pkgver}"
-          "monero-wallet-rpc=${pkgver}"
-) # TODO
+provides=("monero=${pkgver}")
 source_x86_64=("https://downloads.getmonero.org/cli/monero-linux-x64-v${pkgver}.tar.bz2")
 source_i686=("https://downloads.getmonero.org/cli/monero-linux-x86-v${pkgver}.tar.bz2")
 source_armv7h=("https://downloads.getmonero.org/cli/monero-linux-armv7-v${pkgver}.tar.bz2")
 source_aarch64=("https://downloads.getmonero.org/cli/monero-linux-armv8-v${pkgver}.tar.bz2")
-source=("monerod.conf"
-        "monerod.service"
-        "LICENSE"
-        "monero.sysusers"
-        "monero.tmpfiles"
+source=(
+    "monerod.conf"
+    "monerod.service"
+    "monero.sysusers"
+    "monero.tmpfiles"
 )
-sha256sums=('829445fe9acc00681f94f7b9ca6ce39713e377970b0a3d6f88c37991e1aa61b2'
-            '0b66160a5448dedd8e84c38ba2243187217b214b1552f504b05de120b671f121'
-            '0e24d8f4b8758ff33612a17f3bb72a69497b74b32d12bbe5d647d954fcef59ad'
-            '57f4c4c54c7a27f2de874c00034995ce14811aca81dd3f30317ae5066c84bb0d'
-            '88e80a3bbda159a22e034461e03ab8f0c1108cfb0a7475a2c94de47730493d7f')
-sha256sums_x86_64=('a4d1ddb9a6f36fcb985a3c07101756f544a5c9f797edd0885dab4a9de27a6228')
-sha256sums_i686=('ede3b29d085d25058268cea932190c77c276618d97fd2a859002dc01de0c54cb')
-sha256sums_armv7h=('7f040bf1d0fec4f76064f5c8af249f1df9d5a6decd6846c3080bd749b2516280')
-sha256sums_aarch64=('d462fd0f2e4010b6717de2cf6aa8d04a50e56a8fdfd3735230a2a36e63cdb9fb')
 
+sha256sums=(
+    "4cad39767c033a056e4154518e4a56579fca6e57d74495e7bcc7c12bc1f0412b"
+    "95da8471566386ca33c493bd3e6fce94b4c9c301009f4689d0a8aa4872afce3f"
+    "57f4c4c54c7a27f2de874c00034995ce14811aca81dd3f30317ae5066c84bb0d"
+    "88e80a3bbda159a22e034461e03ab8f0c1108cfb0a7475a2c94de47730493d7f"
+)
+sha256sums_x86_64=("53d9da55137f83b1e7571aef090b0784d9f04a980115b5c391455374729393f3")
+sha256sums_i686=("2197d04f4ffad4e1344b2648273f0be152de637bafc5d940cdf215cbc50e1f79")
+sha256sums_armv7h=("326f783ffde78694b2820c95aa310ead00bb5876937ed4edf9c1abd6b6aadc02")
+sha256sums_aarch64=("f92f0acbc49076ad57337b5928981cd72c01aabe6a8eb69a1782f7fa1388fb77")
+
+_translate_arch() {
+    case "$CARCH" in
+    "x86_64")
+        echo "x86_64-linux-gnu"
+        ;;
+    "i686")
+        echo "i686-linux-gnu"
+        ;;
+    "armv7h")
+        echo "arm-linux-gnueabihf"
+        ;;
+    "aarch64")
+        echo "aarch64-linux-gnu"
+        ;;
+    esac
+}
 
 package() {
-    # Monero build system renamed the extracted folders to non version specific names
-    if [ -e "${srcdir}/monero-v${pkgver}" ]; then
-        echo "WARNING: Using existing files. To clean build run 'rm -r ${srcdir}/monero-v${pkgver}' and try again."
-    else
-        [ "$CARCH" == "x86_64" ] && mv "${srcdir}/monero-x86_64-linux-gnu" "${srcdir}/monero-v${pkgver}"
-        [ "$CARCH" == "i686" ] && mv "${srcdir}/monero-i686-linux-gnu" "${srcdir}/monero-v${pkgver}"
-        [ "$CARCH" == "armv7h" ] && mv "${srcdir}/monero-arm-linux-gnueabihf" "${srcdir}/monero-v${pkgver}"
-        [ "$CARCH" == "aarch64" ] && mv "${srcdir}/monero-aarch64-linux-gnu" "${srcdir}/monero-v${pkgver}"
-    fi
+    _arch="$(_translate_arch)"
 
     # Binary file
-    install -Dm755 "${srcdir}/monero-v${pkgver}/monero-blockchain-ancestry" "${pkgdir}/usr/bin/monero-blockchain-ancestry"
-    install -Dm755 "${srcdir}/monero-v${pkgver}/monero-blockchain-depth" "${pkgdir}/usr/bin/monero-blockchain-depth"
-    install -Dm755 "${srcdir}/monero-v${pkgver}/monero-blockchain-export" "${pkgdir}/usr/bin/monero-blockchain-export"
-    install -Dm755 "${srcdir}/monero-v${pkgver}/monero-blockchain-import" "${pkgdir}/usr/bin/monero-blockchain-import"
-    install -Dm755 "${srcdir}/monero-v${pkgver}/monero-blockchain-mark-spent-outputs" "${pkgdir}/usr/bin/monero-blockchain-mark-spent-outputs"
-    install -Dm755 "${srcdir}/monero-v${pkgver}/monero-blockchain-prune" "${pkgdir}/usr/bin/monero-blockchain-prune"
-    install -Dm755 "${srcdir}/monero-v${pkgver}/monero-blockchain-prune-known-spent-data" "${pkgdir}/usr/bin/monero-blockchain-prune-known-spent-data"
-    install -Dm755 "${srcdir}/monero-v${pkgver}/monero-blockchain-stats" "${pkgdir}/usr/bin/monero-blockchain-stats"
-    install -Dm755 "${srcdir}/monero-v${pkgver}/monero-blockchain-usage" "${pkgdir}/usr/bin/monero-blockchain-usage"
-    install -Dm755 "${srcdir}/monero-v${pkgver}/monerod" "${pkgdir}/usr/bin/monerod"
-    install -Dm755 "${srcdir}/monero-v${pkgver}/monero-gen-trusted-multisig" "${pkgdir}/usr/bin/"
-    install -Dm755 "${srcdir}/monero-v${pkgver}/monero-wallet-cli" "${pkgdir}/usr/bin/monero-wallet-cli"
-    install -Dm755 "${srcdir}/monero-v${pkgver}/monero-wallet-rpc" "${pkgdir}/usr/bin/monero-wallet-rpc"
+    install -Dm755 "${srcdir}/monero-${_arch}-v${pkgver}/monerod" "${pkgdir}/usr/bin/monerod"
+    install -Dm755 "${srcdir}/monero-${_arch}-v${pkgver}/monero-blockchain-ancestry" "${pkgdir}/usr/bin/monero-blockchain-ancestry"
+    install -Dm755 "${srcdir}/monero-${_arch}-v${pkgver}/monero-blockchain-depth" "${pkgdir}/usr/bin/monero-blockchain-depth"
+    install -Dm755 "${srcdir}/monero-${_arch}-v${pkgver}/monero-blockchain-export" "${pkgdir}/usr/bin/monero-blockchain-export"
+    install -Dm755 "${srcdir}/monero-${_arch}-v${pkgver}/monero-blockchain-import" "${pkgdir}/usr/bin/monero-blockchain-import"
+    install -Dm755 "${srcdir}/monero-${_arch}-v${pkgver}/monero-blockchain-mark-spent-outputs" "${pkgdir}/usr/bin/monero-blockchain-mark-spent-outputs"
+    install -Dm755 "${srcdir}/monero-${_arch}-v${pkgver}/monero-blockchain-prune" "${pkgdir}/usr/bin/monero-blockchain-prune"
+    install -Dm755 "${srcdir}/monero-${_arch}-v${pkgver}/monero-blockchain-prune-known-spent-data" "${pkgdir}/usr/bin/monero-blockchain-prune-known-spent-data"
+    install -Dm755 "${srcdir}/monero-${_arch}-v${pkgver}/monero-blockchain-stats" "${pkgdir}/usr/bin/monero-blockchain-stats"
+    install -Dm755 "${srcdir}/monero-${_arch}-v${pkgver}/monero-blockchain-usage" "${pkgdir}/usr/bin/monero-blockchain-usage"
+    install -Dm755 "${srcdir}/monero-${_arch}-v${pkgver}/monero-gen-ssl-cert" "${pkgdir}/usr/bin/monero-gen-ssl-cert"
+    install -Dm755 "${srcdir}/monero-${_arch}-v${pkgver}/monero-gen-trusted-multisig" "${pkgdir}/usr/bin/monero-gen-trusted-multisig"
+    install -Dm755 "${srcdir}/monero-${_arch}-v${pkgver}/monero-wallet-cli" "${pkgdir}/usr/bin/monero-wallet-cli"
+    install -Dm755 "${srcdir}/monero-${_arch}-v${pkgver}/monero-wallet-rpc" "${pkgdir}/usr/bin/monero-wallet-rpc"
 
     # Configuration and service file
     install -Dm644 "${srcdir}/monero.sysusers" "${pkgdir}/usr/lib/sysusers.d/monero.conf"
@@ -79,5 +77,5 @@ package() {
     install -Dm644 "${srcdir}/monerod.service" "${pkgdir}/usr/lib/systemd/system/monerod.service"
 
     # License file
-    install -Dm 0644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/monero/LICENSE"
+    install -Dm 0644 "${srcdir}/monero-${_arch}-v${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/monero/LICENSE"
 }
diff --git a/monerod.conf b/monerod.conf
index 9b391dfa1c10..d019576c60b2 100644
--- a/monerod.conf
+++ b/monerod.conf
@@ -1,5 +1,6 @@
 # Configuration for monerod
 # Syntax: any command line option may be specified as 'clioptionname=value'.
+#         Boolean options such as 'no-igd' are specified as 'no-igd=1'.
 # See 'monerod --help' for all available options.
 
 data-dir=/var/lib/monero
diff --git a/monerod.service b/monerod.service
index 182878ebb2ad..5f37e54b23c0 100644
--- a/monerod.service
+++ b/monerod.service
@@ -6,17 +6,31 @@ After=network.target
 User=monero
 Group=monero
 WorkingDirectory=~
+RuntimeDirectory=monero
 
+# Clearnet config
+#
 Type=forking
-ExecStart=/usr/bin/monerod --config-file /etc/monerod.conf --detach
+PIDFile=/run/monero/monerod.pid
+ExecStart=/usr/bin/monerod --config-file /etc/monerod.conf \
+    --detach --pidfile /run/monero/monerod.pid
 
-# This is necessary because monerod does not yet support
-# writing a PID file, which means systemd tries to guess the PID
-# by default, but it guesses wrong (sometimes, depending on
-# random timing of events), because the daemon forks twice.
-# The ultimate fix is for the daemon to write a PID file, and
-# a workaround is to disable the guessing feature in systemd.
-GuessMainPID=no
+# Tor config
+#
+## We have to use simple, not forking, because we cannot pass --detach
+## because stderr/stdout is not available when detached, but torsocks
+## attempts to write to it, and fails with 'invalid argument', causing
+## monerod to fail.
+#Type=simple
+#Environment=DNS_PUBLIC=tcp
+## The following is needed only when accessing wallet from a different
+## host in the LAN, VPN, etc, the RPC must bind to 0.0.0.0, but
+## by default torsocks only allows binding to localhost.
+#Environment=TORSOCKS_ALLOW_INBOUND=1
+#ExecStart=/usr/bin/torsocks /usr/bin/monerod --config-file /etc/monerod.conf \
+#    --non-interactive
+
+Restart=always
 
 [Install]
 WantedBy=multi-user.target