Bump to v0.12.0.0

4 files changed, 38 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f61c193723e..21f3c760483f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Nov  8 00:49:47 UTC 2017
+# Wed Mar 28 00:57:35 UTC 2018
 pkgbase = monero
 	pkgdesc = Monero: the secure, private, untraceable currency - release version (includes daemon, wallet and miner)
-	pkgver = 0.11.1.0
-	pkgrel = 3
+	pkgver = 0.12.0.0
+	pkgrel = 1
 	url = https://getmonero.org/
 	arch = x86_64
 	arch = i686
@@ -14,21 +14,20 @@ pkgbase = monero
 	makedepends = cmake
 	makedepends = boost
 	makedepends = gtest
+	makedepends = qt5-tools
 	depends = boost-libs
 	depends = unbound
 	depends = miniupnpc
 	depends = libunwind
 	depends = openssl
+	depends = readline
+	depends = zeromq
 	provides = monero
 	provides = libmonero-wallet
 	conflicts = bitmonero-git
 	conflicts = libmonero-wallet-git
-	source = https://github.com/monero-project/monero/archive/v0.11.1.0.tar.gz
-	source = monerod.service
-	source = cmake-wallet.patch
-	sha256sums = b5b48d3e5317c599e1499278580e9a6ba3afc3536f4064fcf7b20840066a509b
-	sha256sums = 59fc670cf92960832d03038968270f81beacea7d6819c71ec5bcf15c6030e3c9
-	sha256sums = 50cee20da90c920762c464beebaf550a70548ad942c35f5632fa37706ccf9b23
+	source = https://github.com/monero-project/monero/archive/v0.12.0.0.tar.gz
+	sha256sums = 5e8303900a39e296c4ebaa41d957ab9ee04e915704e1049f82a9cbd4eedc8ffb
 
 pkgname = monero
 	install = monero.install
diff --git a/PKGBUILD b/PKGBUILD
index 010a8b2e816d..e8dfd63dfd1f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,34 +4,24 @@
 
 pkgbase=('monero')
 pkgname=('monero' 'libmonero-wallet')
-pkgver=0.11.1.0
-pkgrel=3
+pkgver=0.12.0.0
+pkgrel=1
 pkgdesc="Monero: the secure, private, untraceable currency - release version (includes daemon, wallet and miner)"
 license=('custom:Cryptonote')
 arch=('x86_64' 'i686' 'armv7h' 'aarch64')
 url="https://getmonero.org/"
-depends=('boost-libs' 'unbound' 'miniupnpc' 'libunwind' 'openssl')
-makedepends=('git' 'cmake' 'boost' 'gtest')
+depends=('boost-libs' 'unbound' 'miniupnpc' 'libunwind' 'openssl' 'readline' 'zeromq')
+makedepends=('git' 'cmake' 'boost' 'gtest' 'qt5-tools')
 provides=('monero' 'libmonero-wallet')
 conflicts=('bitmonero-git' 'libmonero-wallet-git')
 
-source=("https://github.com/monero-project/monero/archive/v${pkgver}.tar.gz"
-        "monerod.service"
-        "cmake-wallet.patch")
+source=("https://github.com/monero-project/monero/archive/v${pkgver}.tar.gz")
 
-sha256sums+=('b5b48d3e5317c599e1499278580e9a6ba3afc3536f4064fcf7b20840066a509b'
-             '59fc670cf92960832d03038968270f81beacea7d6819c71ec5bcf15c6030e3c9'
-             '50cee20da90c920762c464beebaf550a70548ad942c35f5632fa37706ccf9b23')
+sha256sums+=('5e8303900a39e296c4ebaa41d957ab9ee04e915704e1049f82a9cbd4eedc8ffb')
 
 _monero="${pkgbase}-${pkgver}"
 _build=build
 
-prepare()
-{
-  cd "${srcdir}/${_monero}"
-  patch -Np1 -i "${srcdir}/cmake-wallet.patch"
-}
-
 build() {
   cd "${srcdir}/${_monero}"
   CMAKE_FLAGS+=" -DCMAKE_BUILD_TYPE=Release "
@@ -52,7 +42,7 @@ check() {
   #  * coretests takes too long (~25000s)
   #  * libwallet_api_tests fail (Issue #895)
   #  * unit_tests were run separately above
-  CTEST_ARGS+="-E 'coretests|libwallet_api_tests|unit_tests'"
+  CTEST_ARGS+="-E 'core_tests|libwallet_api_tests|unit_tests'"
   echo ">>> NOTE: some tests excluded: $CTEST_ARGS"
 
   make ARGS="$CTEST_ARGS" test
@@ -65,19 +55,22 @@ package_monero() {
   # Uncomment for a debug build
   # options=(!strip debug)
 
+  install -Dm644 "${srcdir}/${_monero}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+  install -Dm644 "${srcdir}/${_monero}/utils/conf/monerod.conf" "${pkgdir}/etc/monerod.conf"
+  install -Dm644 "${srcdir}/${_monero}/utils/systemd/monerod.service" "${pkgdir}/usr/lib/systemd/system/monerod.service"
+
+  install -Dm755 "${srcdir}/${_monero}/build/bin/monero-blockchain-blackball" "${pkgdir}/usr/bin/monero-blockchain-blackball"
   install -Dm755 "${srcdir}/${_monero}/build/bin/monero-blockchain-export" "${pkgdir}/usr/bin/monero-blockchain-export"
   install -Dm755 "${srcdir}/${_monero}/build/bin/monero-blockchain-import" "${pkgdir}/usr/bin/monero-blockchain-import"
-  install -Dm755 "${srcdir}/${_monero}/build/bin/monero-wallet-cli" "${pkgdir}/usr/bin/monero-wallet-cli"
-  install -Dm755 "${srcdir}/${_monero}/build/bin/monero-wallet-rpc" "${pkgdir}/usr/bin/monero-wallet-rpc"
-  install -Dm755 "${srcdir}/${_monero}/build/bin/monerod" "${pkgdir}/usr/bin/monerod"
+  install -Dm755 "${srcdir}/${_monero}/build/bin/monero-blockchain-usage" "${pkgdir}/usr/bin/monero-blockchain-usage"
 
-  install -Dm644 "${srcdir}/${_monero}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm755 "${srcdir}/${_monero}/build/bin/monero-gen-trusted-multisig" "${pkgdir}/usr/bin/monero-gen-trusted-multisig"
 
-  install -Dm644 "${srcdir}/${_monero}/utils/conf/monerod.conf" "${pkgdir}/etc/monerod.conf"
-  # TODO(anonimal): new, working, systemd service file was not merged into monero branch v0.11.1.0 - so we've git-add'd it ourselves
-  #install -Dm644 "${srcdir}/${_monero}/utils/systemd/monerod.service" "${pkgdir}/usr/lib/systemd/system/monerod.service"
-  install -Dm644 "${srcdir}/monerod.service" "${pkgdir}/usr/lib/systemd/system/monerod.service"
+  install -Dm755 "${srcdir}/${_monero}/build/bin/monero-wallet-cli" "${pkgdir}/usr/bin/monero-wallet-cli"
+  install -Dm755 "${srcdir}/${_monero}/build/bin/monero-wallet-rpc" "${pkgdir}/usr/bin/monero-wallet-rpc"
 
+  install -Dm755 "${srcdir}/${_monero}/build/bin/monerod" "${pkgdir}/usr/bin/monerod"
 }
 
 package_libmonero-wallet() {
diff --git a/monero.install b/monero.install
index 1517ca0e2f32..504bdf0c7cdc 100644
--- a/monero.install
+++ b/monero.install
@@ -1,10 +1,20 @@
 create_user() {
+  _lib="/var/lib/monero"
+  _log="/var/log/monero"
+
   getent passwd monero &>/dev/null || {
     echo -n ">>> Creating monero user... "
-    useradd --system --user-group -m --home /var/lib/monero monero
+    useradd --system --user-group -m --home "$_lib" monero
     echo "done"
   } # NOTE: we do not autoremove user due to security concerns (Arch policy)
-  mkdir -p /var/log/monero && chown monero:monero /var/log/monero
+
+  # If data dir was removed after adding user
+  if [[ ! -d "$_lib" ]]; then
+    mkdir "$_lib" && chown monero:monero "$_lib" && chmod go-rwx "$_lib"
+  fi
+
+  # Ensure log dir
+  mkdir -p "$_log" && chown -R monero:monero "$_log" && chmod -R go-rwx "$_log"
 }
 
 post_install() {
diff --git a/monerod.service b/monerod.service
deleted file mode 100644
index 96e88a2d30b5..000000000000
--- a/monerod.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Monero Full Node
-After=network.target
-
-[Service]
-User=monero
-Group=monero
-WorkingDirectory=~
-RuntimeDirectory=monero
-
-Type=forking
-PIDFile=/run/monero/monerod.pid
-
-ExecStart=/usr/bin/monerod --config-file /etc/monerod.conf \
-    --detach --pidfile /run/monero/monerod.pid
-
-[Install]
-WantedBy=multi-user.target